integrated --style-mode from upstream htty PR: 25

Author: MatrixManAtYrService

docs/htty-core/htty_core.html

@@ -2,9 +2,9 @@
 htty-core: A thin wrapper around a forked [ht](https://github.com/andyk/ht) binary for use with [htty](https://matrixmanatyrservice.github.io/htty/htty.html).
 """
 
-from .core import Cols, Command, HtArgs, HtEvent, Rows, find_ht_binary, run
+from .core import Cols, Command, HtArgs, HtEvent, Rows, StyleMode, find_ht_binary, run
 
-__all__ = ["HtArgs", "HtEvent", "find_ht_binary", "run", "Command", "Rows", "Cols", "__version__"]
+__all__ = ["HtArgs", "HtEvent", "find_ht_binary", "run", "Command", "Rows", "Cols", "StyleMode", "__version__"]
 # [[[cog
 # import os
 # cog.out(f'__version__ = "{os.environ["HTTY_VERSION"]}"')

docs/htty-core/search.js

@@ -18,6 +18,14 @@ class StrEnum(str, Enum):
 # Import constants for type alias annotations
 from .constants import DEFAULT_TERMINAL_COLS, DEFAULT_TERMINAL_ROWS
 
+
+class StyleMode(StrEnum):
+    """Style mode for terminal output."""
+
+    PLAIN = "plain"
+    STYLED = "styled"
+
+
 # Type aliases for common parameters
 Command = Annotated[Union[str, list[str]], "run this command (as a subprocess of ht)"]
 Rows = Annotated[
@@ -146,11 +154,13 @@ def __init__(
         subscribes: Optional[list[HtEvent]] = None,
         rows: Rows = None,
         cols: Cols = None,
+        style_mode: Optional[StyleMode] = None,
     ) -> None:
         self.command = command
         self.subscribes = subscribes or []
         self.rows = rows
         self.cols = cols
+        self.style_mode = style_mode
 
     def get_command(self, ht_binary: Optional[str] = None) -> list[str]:
         """Build the command line arguments for running ht.
@@ -175,6 +185,10 @@ def get_command(self, ht_binary: Optional[str] = None) -> list[str]:
         if self.rows is not None and self.cols is not None:
             cmd_args.extend(["--size", f"{self.cols}x{self.rows}"])
 
+        # Add style mode if specified
+        if self.style_mode is not None:
+            cmd_args.extend(["--style-mode", self.style_mode])
+
         # Add separator and the command to run
         cmd_args.append("--")
         if isinstance(self.command, str):

docs/htty.html

@@ -86,7 +86,7 @@ async fn alis_message(
     use session::Event::*;
 
     match event {
-        Ok(Init(time, cols, rows, _pid, seq, _text)) => Some(Ok(json_message(json!({
+        Ok(Init(time, cols, rows, _pid, seq, _text, _)) => Some(Ok(json_message(json!({
             "time": time,
             "cols": cols,
             "rows": rows,
@@ -101,7 +101,7 @@ async fn alis_message(
             format!("{cols}x{rows}")
         ])))),
 
-        Ok(Snapshot(_, _, _, _)) => None,
+        Ok(Snapshot(_, _, _, _, _)) => None,
 
         Ok(Pid(_, _)) => None,
 
@@ -169,7 +169,7 @@ async fn event_stream_message(
         Ok(e @ Init(..)) if sub.init => Some(Ok(json_message(e.to_json()))),
         Ok(e @ Output(_, _)) if sub.output => Some(Ok(json_message(e.to_json()))),
         Ok(e @ Resize(_, _, _)) if sub.resize => Some(Ok(json_message(e.to_json()))),
-        Ok(e @ Snapshot(_, _, _, _)) if sub.snapshot => Some(Ok(json_message(e.to_json()))),
+        Ok(e @ Snapshot(_, _, _, _, _)) if sub.snapshot => Some(Ok(json_message(e.to_json()))),
         Ok(e @ Pid(_, _)) if sub.pid => Some(Ok(json_message(e.to_json()))),
         Ok(e @ ExitCode(_, _)) if sub.exit_code => Some(Ok(json_message(e.to_json()))),
         Ok(e @ Debug(_, _)) if sub.debug => Some(Ok(json_message(e.to_json()))),

docs/search.js

@@ -1,4 +1,5 @@
 use super::Subscription;
+use crate::cli::StyleMode;
 use crate::command::{self, Command, InputSeq};
 use crate::session;
 use anyhow::Result;
@@ -24,6 +25,11 @@ struct ResizeArgs {
     rows: usize,
 }
 
+#[derive(Debug, Deserialize)]
+struct SetStyleModeArgs {
+    mode: String,
+}
+
 pub async fn start(
     command_tx: mpsc::Sender<Command>,
     clients_tx: mpsc::Sender<session::Client>,
@@ -88,7 +94,7 @@ pub async fn start(
                         println!("{}", e.to_json());
                     }
 
-                    Some(Ok(e @ Snapshot(_, _, _, _))) if sub.snapshot => {
+                    Some(Ok(e @ Snapshot(_, _, _, _, _))) if sub.snapshot => {
                         println!("{}", e.to_json());
                     }
 
@@ -153,6 +159,13 @@ fn build_command(value: serde_json::Value) -> Result<Command, String> {
 
         Some("takeSnapshot") => Ok(Command::Snapshot),
 
+        Some("setStyleMode") => {
+            let args: SetStyleModeArgs = args_from_json_value(value)?;
+            let style_mode = args.mode.parse::<StyleMode>()
+                .map_err(|e| format!("invalid style mode: {}", e))?;
+            Ok(Command::SetStyleMode(style_mode))
+        }
+
         Some("exit") => Ok(Command::Exit),
 
         other => Err(format!("invalid command type: {other:?}")),
@@ -323,6 +336,7 @@ fn parse_key(key: String) -> InputSeq {
 #[cfg(test)]
 mod test {
     use super::{cursor_key, parse_line, standard_key, Command};
+    use crate::cli::StyleMode;
     use crate::command::InputSeq;
 
     #[test]
@@ -525,6 +539,21 @@ mod test {
         assert!(matches!(command, Command::Snapshot));
     }
 
+    #[test]
+    fn parse_set_style_mode() {
+        let command = parse_line(r#"{ "type": "setStyleMode", "mode": "styled" }"#).unwrap();
+        assert!(matches!(command, Command::SetStyleMode(StyleMode::Styled)));
+
+        let command = parse_line(r#"{ "type": "setStyleMode", "mode": "plain" }"#).unwrap();
+        assert!(matches!(command, Command::SetStyleMode(StyleMode::Plain)));
+    }
+
+    #[test]
+    fn parse_set_style_mode_invalid() {
+        parse_line(r#"{ "type": "setStyleMode", "mode": "invalid" }"#).expect_err("should fail");
+        parse_line(r#"{ "type": "setStyleMode" }"#).expect_err("should fail");
+    }
+
     #[test]
     fn parse_exit() {
         let command = parse_line(r#"{ "type": "exit" }"#).unwrap();

htty-core/src/python/htty_core/__init__.py

@@ -1,8 +1,11 @@
+use crate::cli::StyleMode;
+
 #[derive(Debug)]
 pub enum Command {
     Input(Vec<InputSeq>),
     Snapshot,
     Resize(usize, usize),
+    SetStyleMode(StyleMode),
     Exit,
     Debug(String),
     Completed(std::path::PathBuf),

htty-core/src/python/htty_core/core.py

@@ -232,6 +232,10 @@ async fn run_event_loop(
                         session.resize(cols, rows);
                     }
 
+                    Some(Command::SetStyleMode(style_mode)) => {
+                        session.set_style_mode(style_mode);
+                    }
+
                     Some(Command::Debug(message)) => {
                         // Emit all debug messages as debug events
                         session.emit_debug_event(&message);