wip; use the latest promkit

Author: ynqa

Cargo.lock

@@ -28,7 +28,8 @@ jaq-std = "2.1.2"
 
 [dependencies.promkit-widgets]
 version = "0.5.0"
-features = ["jsonstream", "listbox", "serde", "spinner", "status", "texteditor"]
+path = "../promkit/promkit-widgets"
+features = ["jsontree", "listbox", "serde", "spinner", "status", "texteditor"]
 default-features = false
 
 # The profile that 'cargo dist' will build with

Cargo.toml

@@ -1,6 +1,6 @@
 use std::collections::HashSet;
 
-use promkit_widgets::{core::crossterm::event::Event, jsonstream, listbox, text_editor};
+use promkit_widgets::{core::crossterm::event::Event, json_tree, listbox, text_editor};
 use serde::{Deserialize, Serialize};
 use termcfg::crossterm_config::event_set_serde;
 use tokio::time::Duration;
@@ -17,7 +17,7 @@ pub struct EditorConfig {
 #[derive(Serialize, Deserialize)]
 pub struct JsonConfig {
     pub max_streams: Option<usize>,
-    pub stream: jsonstream::Config,
+    pub stream: json_tree::Config,
 }
 
 #[derive(Serialize, Deserialize)]

src/config.rs

@@ -5,7 +5,7 @@ use jaq_core::{
 use jaq_json::Val;
 
 use promkit_widgets::{
-    jsonstream::jsonz,
+    json_tree::jsonz,
     serde_json::{self, Deserializer, Value},
 };
 

src/json.rs

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use promkit_widgets::{
     core::{crossterm::event::Event, grapheme::StyledGraphemes, render::SharedRenderer, Widget},
-    jsonstream::{self, JsonStream},
+    json_tree::{self, JsonTree},
     serde_json::{self, Value},
 };
 use tokio::{
@@ -30,7 +30,7 @@ pub enum RenderTrigger {
 /// JSON viewer that maintains the state of JSON stream
 /// and handles user interactions and query processing.
 pub struct JsonViewer {
-    state: jsonstream::State,
+    state: json_tree::State,
     json: Vec<serde_json::Value>,
     keybinds: JsonViewerKeybinds,
 }
@@ -40,43 +40,43 @@ pub type SharedJsonViewer = Arc<Mutex<JsonViewer>>;
 impl JsonViewer {
     /// Get the formatted content of current JSON stream.
     pub fn formatted_content(&self) -> String {
-        self.state.config.format_raw_json(self.state.stream.rows())
+        self.state.render_pretty_json()
     }
 
     /// Handle user event and update the viewer state accordingly.
     fn handle_user_event(&mut self, event: &Event) {
         match event {
             // Move up.
             event if self.keybinds.up.contains(event) => {
-                self.state.stream.up();
+                self.state.tree.up();
             }
 
             // Move down.
             event if self.keybinds.down.contains(event) => {
-                self.state.stream.down();
+                self.state.tree.down();
             }
 
             // Move to head
             event if self.keybinds.move_to_head.contains(event) => {
-                self.state.stream.head();
+                self.state.tree.head();
             }
 
             // Move to tail
             event if self.keybinds.move_to_tail.contains(event) => {
-                self.state.stream.tail();
+                self.state.tree.tail();
             }
 
             // Toggle collapse/expand
             event if self.keybinds.toggle.contains(event) => {
-                self.state.stream.toggle();
+                self.state.tree.toggle();
             }
 
             event if self.keybinds.expand.contains(event) => {
-                self.state.stream.set_nodes_visibility(false);
+                self.state.tree.set_nodes_visibility(false);
             }
 
             event if self.keybinds.collapse.contains(event) => {
-                self.state.stream.set_nodes_visibility(true);
+                self.state.tree.set_nodes_visibility(true);
             }
 
             _ => (),
@@ -95,15 +95,15 @@ impl JsonViewer {
                 if ret.iter().all(|val| *val == Value::Null) {
                     guide = Some(GuideMessage::JqReturnedNull(input));
 
-                    self.state.stream = JsonStream::new(self.json.iter());
+                    self.state.tree = JsonTree::new(self.json.iter());
                 } else {
-                    self.state.stream = JsonStream::new(ret.iter());
+                    self.state.tree = JsonTree::new(ret.iter());
                 }
 
                 (guide, Some(self.state.create_graphemes(area.0, area.1)))
             }
             Err(e) => {
-                self.state.stream = JsonStream::new(self.json.iter());
+                self.state.tree = JsonTree::new(self.json.iter());
 
                 (
                     Some(GuideMessage::JqFailed(e.to_string())),
@@ -132,9 +132,9 @@ pub async fn initialize(
     }
 
     let input_stream = json::deserialize(input, config.max_streams)?;
-    let stream = JsonStream::new(input_stream.iter());
-    let state = jsonstream::State {
-        stream,
+    let tree = JsonTree::new(input_stream.iter());
+    let state = json_tree::State {
+        tree,
         config: config.stream,
     };