chore: use promkit-widgets v0.2.0 and remove promkit-core crate, render.rs

Author: ynqa

Cargo.lock

@@ -12,21 +12,23 @@ readme = "README.md"
 anyhow = "1.0.97"
 arboard = { version = "3.4.1", features =  ["wayland-data-control"] }
 async-trait = "0.1.88"
-clap = { version = "4.5.34", features = ["derive"] }
+clap = { version = "4.5.41", features = ["derive"] }
 duration-string = { version = "0.5.2", features = ["serde"] }
 derive_builder = "0.20.2"
 dirs = "6.0.0"
 futures = "0.3.30"
+promkit-widgets = { version = "0.2.0", features = ["jsonstream", "listbox", "text", "texteditor"] }
+serde = "1.0.219"
+tokio = { version = "1.44.1", features = ["full"] }
+tokio-stream = "0.1.16"
+toml = "0.9.2"
+
+# jaq dependencies
+# TODO: bump up to v2.x.x
 jaq-core = "1.2.1"
 jaq-interpret = "1.2.1"
 jaq-parse = "1.0.2"
 jaq-std = "1.2.1"
-promkit-core = "0.1.0"
-promkit-widgets = { version = "0.1.0", features = ["jsonstream", "listbox", "text", "texteditor"] }
-serde = "1.0.219"
-tokio = { version = "1.44.1", features = ["full"] }
-tokio-stream = "0.1.16"
-toml = "0.8.20"
 
 # The profile that 'cargo dist' will build with
 [profile.dist]

Cargo.toml

@@ -1,10 +1,12 @@
 use std::collections::HashSet;
 
-use promkit_core::crossterm::{
-    event::{KeyCode, KeyModifiers},
-    style::{Attribute, Attributes, Color, ContentStyle},
+use promkit_widgets::{
+    core::crossterm::{
+        event::{KeyCode, KeyModifiers},
+        style::{Attribute, Attributes, Color, ContentStyle},
+    },
+    text_editor::Mode,
 };
-use promkit_widgets::text_editor::Mode;
 use serde::{Deserialize, Serialize};
 use tokio::time::Duration;
 

src/config.rs

@@ -1,4 +1,4 @@
-use promkit_core::crossterm::style::{Attribute, Attributes, Color, ContentStyle};
+use promkit_widgets::core::crossterm::style::{Attribute, Attributes, Color, ContentStyle};
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize)]

src/config/content_style.rs

@@ -1,6 +1,6 @@
 use std::collections::HashSet;
 
-use promkit_core::crossterm::event::{
+use promkit_widgets::core::crossterm::event::{
     Event, KeyCode, KeyEvent, KeyModifiers, MouseEvent, MouseEventKind,
 };
 use serde::{Deserialize, Serialize};

src/config/event.rs

@@ -1,13 +1,13 @@
 use std::{future::Future, pin::Pin};
 
-use promkit_core::{
-    crossterm::{
-        event::{Event, KeyCode, KeyEvent, KeyEventKind, KeyEventState, KeyModifiers},
-        style::{Color, ContentStyle},
-    },
-    Pane, PaneFactory,
-};
 use promkit_widgets::{
+    core::{
+        crossterm::{
+            event::{Event, KeyCode, KeyEvent, KeyEventKind, KeyEventState, KeyModifiers},
+            style::{Color, ContentStyle},
+        },
+        Pane, PaneFactory,
+    },
     text::{self, Text},
     text_editor,
 };

src/editor.rs

@@ -1,14 +1,14 @@
 use jaq_interpret::{Ctx, FilterT, ParseCtx, RcIter, Val};
-use promkit_core::{
-    crossterm::{
-        event::Event,
-        style::{Attribute, Attributes, Color, ContentStyle},
-    },
-    pane::Pane,
-    PaneFactory,
-};
 
 use promkit_widgets::{
+    core::{
+        crossterm::{
+            event::Event,
+            style::{Attribute, Attributes, Color, ContentStyle},
+        },
+        pane::Pane,
+        PaneFactory,
+    },
     jsonstream::{self, format::RowFormatter, jsonz, JsonStream},
     serde_json::{self, Deserializer, Value},
     text::{self, Text},

src/json.rs

@@ -7,8 +7,8 @@ use std::{
 use anyhow::anyhow;
 use clap::Parser;
 use config::Config;
-use promkit_core::crossterm::style::Attribute;
 use promkit_widgets::{
+    core::crossterm::style::Attribute,
     jsonstream::format::RowFormatter,
     listbox::{self, Listbox},
     text_editor::{self, TextEditor},
@@ -25,8 +25,6 @@ use processor::{
     ViewProvider, Visualizer,
 };
 mod prompt;
-mod render;
-use render::{PaneIndex, Renderer, EMPTY_PANE};
 mod search;
 use search::{IncrementalSearcher, SearchProvider};
 

src/main.rs

@@ -1,12 +1,17 @@
 use std::sync::Arc;
 
 use async_trait::async_trait;
-use promkit_core::{crossterm::event::Event, pane::Pane};
+use promkit_widgets::core::{
+    crossterm::event::Event,
+    pane::{Pane, EMPTY_PANE},
+    render::SharedRenderer,
+};
 use tokio::{sync::Mutex, task::JoinHandle};
 
-use crate::{PaneIndex, Renderer, EMPTY_PANE};
 pub mod init;
 pub use init::ViewProvider;
+
+use crate::prompt::Index;
 pub mod monitor;
 pub mod spinner;
 
@@ -58,7 +63,7 @@ impl Processor {
         &self,
         query: String,
         shared_visualizer: Arc<Mutex<impl Visualizer>>,
-        shared_renderer: Arc<Mutex<Renderer>>,
+        shared_renderer: SharedRenderer<Index>,
     ) -> JoinHandle<()> {
         let shared = self.shared.clone();
         tokio::spawn(async move {
@@ -83,16 +88,16 @@ impl Processor {
             }
             {
                 // TODO: error handling
-                let _ = shared_renderer.lock().await.update_and_draw([
-                    (
-                        PaneIndex::Guide,
-                        maybe_guide.unwrap_or(EMPTY_PANE.to_owned()),
-                    ),
-                    (
-                        PaneIndex::Processor,
-                        maybe_resp.unwrap_or(EMPTY_PANE.to_owned()),
-                    ),
-                ]);
+                let _ = shared_renderer
+                    .update([
+                        (Index::Guide, maybe_guide.unwrap_or(EMPTY_PANE.to_owned())),
+                        (
+                            Index::Processor,
+                            maybe_resp.unwrap_or(EMPTY_PANE.to_owned()),
+                        ),
+                    ])
+                    .render()
+                    .await;
             }
         })
     }
@@ -102,7 +107,7 @@ impl Processor {
         shared_visualizer: Arc<Mutex<impl Visualizer>>,
         area: (u16, u16),
         query: String,
-        shared_renderer: Arc<Mutex<Renderer>>,
+        shared_renderer: SharedRenderer<Index>,
     ) {
         {
             let mut shared_state = self.shared.lock().await;
@@ -124,7 +129,7 @@ impl Processor {
         &self,
         shared_visualizer: Arc<Mutex<impl Visualizer>>,
         query: String,
-        shared_renderer: Arc<Mutex<Renderer>>,
+        shared_renderer: SharedRenderer<Index>,
     ) {
         {
             let mut shared_state = self.shared.lock().await;

src/processor.rs

@@ -1,10 +1,11 @@
 use std::sync::Arc;
 
 use async_trait::async_trait;
+use promkit_widgets::core::render::SharedRenderer;
 use tokio::sync::Mutex;
 
 use super::{Context, State, Visualizer};
-use crate::{config::JsonViewerKeybinds, PaneIndex, Renderer};
+use crate::{config::JsonViewerKeybinds, prompt::Index};
 
 #[async_trait]
 pub trait ViewProvider {
@@ -29,7 +30,7 @@ impl ViewInitializer {
         provider: &'a mut T,
         item: &'static str,
         area: (u16, u16),
-        shared_renderer: Arc<Mutex<Renderer>>,
+        shared_renderer: SharedRenderer<Index>,
         keybinds: JsonViewerKeybinds,
     ) -> anyhow::Result<impl Visualizer + 'a> {
         {
@@ -51,9 +52,9 @@ impl ViewInitializer {
         {
             // TODO: error handling
             let _ = shared_renderer
-                .lock()
-                .await
-                .update_and_draw([(PaneIndex::Processor, pane)]);
+                .update([(Index::Processor, pane)])
+                .render()
+                .await;
         }
 
         Ok(visualizer)