on-err: use promkit-{core, widgets} and need to fix to use ContentStyle instead of StyleBuilder

Author: ynqa

Cargo.lock

@@ -15,15 +15,14 @@ async-trait = "0.1.88"
 clap = { version = "4.5.34", features = ["derive"] }
 duration-string = { version = "0.5.2", features = ["serde"] }
 derive_builder = "0.20.2"
-# See https://github.com/crossterm-rs/crossterm/issues/935
-crossterm = { version = "0.28.1", features = ["use-dev-tty", "event-stream", "libc", "serde"] }
 dirs = "6.0.0"
 futures = "0.3.30"
 jaq-core = "1.2.1"
 jaq-interpret = "1.2.1"
 jaq-parse = "1.0.2"
 jaq-std = "1.2.1"
-promkit = "0.8.0"
+promkit-core = { path = "../promkit/promkit-core", version = "0.1.0" }
+promkit-widgets = { path = "../promkit/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"

Cargo.toml

@@ -1,10 +1,10 @@
 use std::collections::HashSet;
 
-use crossterm::{
+use promkit_core::crossterm::{
     event::{KeyCode, KeyModifiers},
     style::{Attribute, Attributes, Color, ContentStyle},
 };
-use promkit::{style::StyleBuilder, 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 crossterm::style::{Attribute, Attributes, Color, ContentStyle};
+use promkit_core::crossterm::style::{Attribute, Attributes, Color, ContentStyle};
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize)]

src/config/content_style.rs

@@ -1,6 +1,8 @@
 use std::collections::HashSet;
 
-use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers, MouseEvent, MouseEventKind};
+use promkit_core::crossterm::event::{
+    Event, KeyCode, KeyEvent, KeyModifiers, MouseEvent, MouseEventKind,
+};
 use serde::{Deserialize, Serialize};
 
 pub trait Matcher<T> {

src/config/event.rs

@@ -1,4 +1,4 @@
-use promkit::text_editor::Mode;
+use promkit_widgets::text_editor::Mode;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
 pub mod text_editor_mode_serde {

src/config/text_editor.rs

@@ -1,14 +1,15 @@
 use std::{future::Future, pin::Pin};
 
-use crossterm::{
-    event::{Event, KeyCode, KeyEvent, KeyEventKind, KeyEventState, KeyModifiers},
-    style::Color,
+use promkit_core::{
+    crossterm::{
+        event::{Event, KeyCode, KeyEvent, KeyEventKind, KeyEventState, KeyModifiers},
+        style::Color,
+    },
+    Pane, PaneFactory,
 };
-use promkit::{
-    pane::Pane,
-    style::StyleBuilder,
+use promkit_widgets::{
     text::{self, Text},
-    text_editor, PaneFactory,
+    text_editor,
 };
 
 use crate::{

src/editor.rs

@@ -1,17 +1,17 @@
-use crossterm::{
-    event::Event,
-    style::{Attribute, Attributes},
-};
 use jaq_interpret::{Ctx, FilterT, ParseCtx, RcIter, Val};
-use promkit::{
-    crossterm::style::Color,
-    jsonstream::{self, JsonStream},
-    jsonz::{self, format::RowFormatter},
+use promkit_core::{
+    crossterm::{
+        event::Event,
+        style::{Attribute, Attributes, Color, ContentStyle},
+    },
     pane::Pane,
+    PaneFactory,
+};
+
+use promkit_widgets::{
+    jsonstream::{self, format::RowFormatter, jsonz, JsonStream},
     serde_json::{self, Deserializer, Value},
-    style::StyleBuilder,
     text::{self, Text},
-    PaneFactory,
 };
 
 use crate::{
@@ -112,10 +112,11 @@ impl Visualizer for Json {
                 if ret.iter().all(|val| *val == Value::Null) {
                     guide = Some(text::State {
                         text: Text::from(format!("jq returned 'null', which may indicate a typo or incorrect filter: `{}`", input)),
-                        style: StyleBuilder::new()
-                            .fgc(Color::Yellow)
-                            .attrs(Attributes::from(Attribute::Bold))
-                            .build(),
+                        style: ContentStyle {
+                            foreground_color: Some(Color::Yellow),
+                            attributes: Attributes::from(Attribute::Bold),
+                            ..Default::default()
+                        },
                         ..Default::default()
                     }.create_pane(area.0, area.1));
                 }
@@ -128,10 +129,11 @@ impl Visualizer for Json {
                 Some(
                     text::State {
                         text: Text::from(format!("jq failed: `{}`", e)),
-                        style: StyleBuilder::new()
-                            .fgc(Color::Red)
-                            .attrs(Attributes::from(Attribute::Bold))
-                            .build(),
+                        style: ContentStyle {
+                            foreground_color: Some(Color::Red),
+                            attributes: Attributes::from(Attribute::Bold),
+                            ..Default::default()
+                        },
                         ..Default::default()
                     }
                     .create_pane(area.0, area.1),

src/json.rs

@@ -7,9 +7,9 @@ use std::{
 use anyhow::anyhow;
 use clap::Parser;
 use config::Config;
-use crossterm::style::Attribute;
-use promkit::{
-    jsonz::format::RowFormatter,
+use promkit_core::crossterm::style::Attribute;
+use promkit_widgets::{
+    jsonstream::format::RowFormatter,
     listbox::{self, Listbox},
     text_editor::{self, TextEditor},
 };

src/main.rs

@@ -1,8 +1,7 @@
 use std::sync::Arc;
 
 use async_trait::async_trait;
-use crossterm::event::Event;
-use promkit::pane::Pane;
+use promkit_core::{crossterm::event::Event, pane::Pane};
 use tokio::{sync::Mutex, task::JoinHandle};
 
 use crate::{PaneIndex, Renderer, EMPTY_PANE};

src/processor.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use promkit::pane::Pane;
+use promkit_core::{grapheme::StyledGraphemes, Pane};
 use tokio::{sync::Mutex, task::JoinHandle, time::Duration};
 
 use super::{Context, State};
@@ -38,12 +38,7 @@ impl SpinnerSpawner {
 
                 frame_index = (frame_index + 1) % LOADING_FRAMES.len();
 
-                let pane = Pane::new(
-                    vec![promkit::grapheme::StyledGraphemes::from(
-                        LOADING_FRAMES[frame_index],
-                    )],
-                    0,
-                );
+                let pane = Pane::new(vec![StyledGraphemes::from(LOADING_FRAMES[frame_index])], 0);
                 {
                     // TODO: error handling
                     let _ = shared_renderer

src/processor/spinner.rs

@@ -1,19 +1,18 @@
 use std::{io, sync::Arc, time::Duration};
 
 use arboard::Clipboard;
-use crossterm::{
-    self, cursor,
-    event::{Event, EventStream, KeyCode, KeyEvent, KeyEventKind, KeyEventState, KeyModifiers},
-    execute,
-    style::Color,
-    terminal::{self, disable_raw_mode, enable_raw_mode},
-};
 use futures::StreamExt;
-use promkit::{
-    style::StyleBuilder,
-    text::{self, Text},
+use promkit_core::{
+    crossterm::{
+        cursor,
+        event::{Event, EventStream, KeyCode, KeyEvent, KeyEventKind, KeyEventState, KeyModifiers},
+        execute,
+        style::{Color, ContentStyle},
+        terminal::{self, disable_raw_mode, enable_raw_mode},
+    },
     PaneFactory,
 };
+use promkit_widgets::text::{self, Text};
 use tokio::{
     sync::{mpsc, Mutex, RwLock},
     task::JoinHandle,
@@ -57,12 +56,18 @@ fn copy_to_clipboard(content: &str) -> text::State {
         Ok(mut clipboard) => match clipboard.set_text(content) {
             Ok(_) => text::State {
                 text: Text::from("Copied to clipboard"),
-                style: StyleBuilder::new().fgc(Color::Green).build(),
+                style: ContentStyle {
+                    foreground_color: Some(Color::Green),
+                    ..Default::default()
+                },
                 ..Default::default()
             },
             Err(e) => text::State {
                 text: Text::from(format!("Failed to copy to clipboard: {}", e)),
-                style: StyleBuilder::new().fgc(Color::Red).build(),
+                style: ContentStyle {
+                    foreground_color: Some(Color::Red),
+                    ..Default::default()
+                },
                 ..Default::default()
             },
         },

src/prompt.rs

@@ -1,7 +1,6 @@
 use std::sync::LazyLock;
 
-use crossterm::{self, cursor};
-use promkit::{pane::Pane, terminal::Terminal};
+use promkit_core::{crossterm::cursor, pane::Pane, terminal::Terminal};
 
 // TODO: One Guide is sufficient.
 #[derive(Debug, PartialEq)]

src/render.rs

@@ -2,11 +2,8 @@ use std::{collections::BTreeSet, sync::Arc};
 
 use anyhow::anyhow;
 use async_trait::async_trait;
-use promkit::{
-    listbox::{self, Listbox},
-    pane::Pane,
-    PaneFactory,
-};
+use promkit_core::{pane::Pane, PaneFactory};
+use promkit_widgets::listbox::{self, Listbox};
 use tokio::{
     sync::{Mutex, RwLock},
     task::JoinHandle,