@tishlang/tish 1.6.0 → 1.7.0

package/crates/tish_runtime/src/ws.rs

@@ -16,8 +16,8 @@ use std::time::{Duration, Instant};
 use futures_util::{SinkExt, StreamExt};
 use lazy_static::lazy_static;
 use tishlang_core::{ObjectMap, Value};
-use tokio::sync::mpsc as tokio_mpsc;
 use tokio::runtime::Runtime;
+use tokio::sync::mpsc as tokio_mpsc;
 
 thread_local! {
     /// Multi-thread runtime so `tokio::spawn` I/O tasks keep running after `block_on` returns.
@@ -200,7 +200,10 @@ fn conn_object(id: u32) -> Value {
     obj.insert(
         Arc::from("send"),
         Value::Function(Rc::new(move |args: &[Value]| {
-            let data = args.first().map(|v| v.to_display_string()).unwrap_or_default();
+            let data = args
+                .first()
+                .map(|v| v.to_display_string())
+                .unwrap_or_default();
             Value::Bool(conn_send(id, data))
         })),
     );
@@ -213,15 +216,13 @@ fn conn_object(id: u32) -> Value {
     );
     obj.insert(
         Arc::from("receive"),
-        Value::Function(Rc::new(move |_args: &[Value]| {
-            match conn_receive(id) {
-                Some(s) => {
-                    let mut ev: ObjectMap = ObjectMap::default();
-                    ev.insert(Arc::from("data"), Value::String(s.into()));
-                    Value::Object(Rc::new(RefCell::new(ev)))
-                }
-                None => Value::Null,
+        Value::Function(Rc::new(move |_args: &[Value]| match conn_receive(id) {
+            Some(s) => {
+                let mut ev: ObjectMap = ObjectMap::default();
+                ev.insert(Arc::from("data"), Value::String(s.into()));
+                Value::Object(Rc::new(RefCell::new(ev)))
             }
+            None => Value::Null,
         })),
     );
     let id_timeout = id;
@@ -231,7 +232,9 @@ fn conn_object(id: u32) -> Value {
             let timeout_ms = args
                 .first()
                 .and_then(|v| match v {
-                    Value::Number(n) if n.is_finite() && *n >= 0.0 => Some((*n as u64).min(3600_000)),
+                    Value::Number(n) if n.is_finite() && *n >= 0.0 => {
+                        Some((*n as u64).min(3600_000))
+                    }
                     _ => None,
                 })
                 .unwrap_or(1000);
@@ -366,11 +369,17 @@ pub fn web_socket_server_listen(args: &[Value]) -> Value {
                 };
                 let ws_stream = match tokio_tungstenite::accept_async(stream).await {
                     Ok(ws) => {
-                        eprintln!("[tish ws] server accepted connection (handshake OK): port {}", port);
+                        eprintln!(
+                            "[tish ws] server accepted connection (handshake OK): port {}",
+                            port
+                        );
                         ws
                     }
                     Err(e) => {
-                        eprintln!("[tish ws] server accept_async failed: {} (port {})", e, port);
+                        eprintln!(
+                            "[tish ws] server accept_async failed: {} (port {})",
+                            e, port
+                        );
                         continue;
                     }
                 };
@@ -475,8 +484,7 @@ pub fn web_socket_server_construct(args: &[Value]) -> Value {
             .unwrap_or_default();
         let cb = args.get(2).cloned().unwrap_or(Value::Null);
         if event == "connection" {
-            so.borrow_mut()
-                .insert(Arc::from("_onConnection"), cb);
+            so.borrow_mut().insert(Arc::from("_onConnection"), cb);
         }
         Value::Null
     });
@@ -535,7 +543,10 @@ pub fn web_socket_server_construct(args: &[Value]) -> Value {
     m.insert(Arc::from("clients"), Value::Array(clients));
     m.insert(Arc::from("on"), Value::Function(on_fn));
     m.insert(Arc::from("listen"), Value::Function(listen_fn));
-    m.insert(Arc::from("acceptTimeout"), Value::Function(accept_timeout_fn));
+    m.insert(
+        Arc::from("acceptTimeout"),
+        Value::Function(accept_timeout_fn),
+    );
     Value::Object(Rc::new(RefCell::new(m)))
 }
 
@@ -578,7 +589,9 @@ mod tests {
                                 .unwrap_or_default(),
                             _ => String::new(),
                         };
-                        if let Some(Value::Function(sf)) = wso.borrow().get(&Arc::from("send")).cloned() {
+                        if let Some(Value::Function(sf)) =
+                            wso.borrow().get(&Arc::from("send")).cloned()
+                        {
                             let _ = sf(&[Value::String(data.into())]);
                         }
                         break;
@@ -692,7 +705,11 @@ mod tests {
         let _ = send_f(&[Value::String(join_msg.into())]);
 
         // Client uses receiveTimeout like the agent
-        let recv_timeout = co.borrow().get(&Arc::from("receiveTimeout")).cloned().unwrap();
+        let recv_timeout = co
+            .borrow()
+            .get(&Arc::from("receiveTimeout"))
+            .cloned()
+            .unwrap();
         let Value::Function(recv_timeout_f) = recv_timeout else {
             panic!("no receiveTimeout");
         };
@@ -707,7 +724,11 @@ mod tests {
             .get(&Arc::from("data"))
             .map(|v| v.to_display_string())
             .unwrap_or_default();
-        assert!(data1.contains("\"type\":\"joined\""), "expected joined, got {}", data1);
+        assert!(
+            data1.contains("\"type\":\"joined\""),
+            "expected joined, got {}",
+            data1
+        );
 
         let got2 = recv_timeout_f(&[timeout_arg]);
         let Value::Object(ev2) = got2 else {
@@ -718,7 +739,11 @@ mod tests {
             .get(&Arc::from("data"))
             .map(|v| v.to_display_string())
             .unwrap_or_default();
-        assert!(data2.contains("\"type\":\"presence\""), "expected presence, got {}", data2);
+        assert!(
+            data2.contains("\"type\":\"presence\""),
+            "expected presence, got {}",
+            data2
+        );
 
         let _ = server.join();
     }

package/crates/tish_runtime/tests/fetch_readable_stream.rs

@@ -51,16 +51,17 @@ fn fetch_readable_stream_read_chunks() {
         Value::Object(o) => o.borrow(),
         _ => panic!("expected object response, got {:?}", resp),
     };
-    assert!(obj.get(&std::sync::Arc::from("ok")).map(|v| matches!(v, Value::Bool(true))).unwrap_or(false));
+    assert!(obj
+        .get(&std::sync::Arc::from("ok"))
+        .map(|v| matches!(v, Value::Bool(true)))
+        .unwrap_or(false));
 
     let body = obj.get(&std::sync::Arc::from("body")).expect("body");
     let stream = match body {
         Value::Opaque(s) => s.as_ref(),
         _ => panic!("expected ReadableStream opaque"),
     };
-    let reader_val = stream
-        .get_method("getReader")
-        .expect("getReader")(&[]);
+    let reader_val = stream.get_method("getReader").expect("getReader")(&[]);
     let reader = match reader_val {
         Value::Opaque(r) => r,
         _ => panic!("expected reader opaque, got {:?}", reader_val),

package/crates/tish_ui/src/jsx.rs

@@ -1,8 +1,6 @@
 //! Shared JSX lowering: emit `h(tag, props, children)` as JavaScript or Rust (`Value`) source.
 
-use tishlang_ast::{
-    ArrayElement, Expr, JsxAttrValue, JsxChild, JsxProp, Literal, ObjectProp,
-};
+use tishlang_ast::{ArrayElement, Expr, JsxAttrValue, JsxChild, JsxProp, Literal, ObjectProp};
 
 /// Escape a Tish identifier for Rust output (matches `tishlang_compile` conventions).
 pub fn escape_ident_rust(s: &str) -> String {
@@ -26,20 +24,29 @@ where
             children,
             ..
         } => {
-            let tag_str = if tag.chars().next().map(|c| c.is_uppercase()).unwrap_or(false) {
+            let tag_str = if tag
+                .chars()
+                .next()
+                .map(|c| c.is_uppercase())
+                .unwrap_or(false)
+            {
                 tag.as_ref().to_string()
             } else {
                 format!("{:?}", tag.as_ref())
             };
             let props_str = emit_jsx_props_js(props, emit_expr)?;
-            let children_strs: Result<Vec<_>, _> =
-                children.iter().map(|c| emit_jsx_child_js(c, emit_expr)).collect();
+            let children_strs: Result<Vec<_>, _> = children
+                .iter()
+                .map(|c| emit_jsx_child_js(c, emit_expr))
+                .collect();
             let children_str = children_strs?.join(", ");
             Ok(format!("h({}, {}, [{}])", tag_str, props_str, children_str))
         }
         Expr::JsxFragment { children, .. } => {
-            let children_strs: Result<Vec<_>, _> =
-                children.iter().map(|c| emit_jsx_child_js(c, emit_expr)).collect();
+            let children_strs: Result<Vec<_>, _> = children
+                .iter()
+                .map(|c| emit_jsx_child_js(c, emit_expr))
+                .collect();
             let children_str = children_strs?.join(", ");
             Ok(format!("h(Fragment, null, [{}])", children_str))
         }
@@ -120,7 +127,11 @@ where
             children,
             ..
         } => {
-            let is_component = tag.chars().next().map(|c| c.is_uppercase()).unwrap_or(false);
+            let is_component = tag
+                .chars()
+                .next()
+                .map(|c| c.is_uppercase())
+                .unwrap_or(false);
             let tag_rust = if is_component {
                 escape_ident_rust(tag.as_ref())
             } else {
@@ -146,11 +157,7 @@ where
                 "Value::Array(Rc::new(RefCell::new(vec![{}])))",
                 child_parts?.join(", ")
             );
-            Ok(wrap_h_call_rust(
-                "Fragment",
-                "Value::Null",
-                &children_rust,
-            ))
+            Ok(wrap_h_call_rust("Fragment", "Value::Null", &children_rust))
         }
         _ => Err(E::from("emit_jsx_rust: not a JSX expression".to_string())),
     }
@@ -279,7 +286,13 @@ fn stmt_contains_jsx(stmt: &tishlang_ast::Statement) -> bool {
         Statement::While { cond, body, .. } | Statement::DoWhile { body, cond, .. } => {
             expr_contains_jsx(cond) || stmt_contains_jsx(body)
         }
-        Statement::For { init, cond, update, body, .. } => {
+        Statement::For {
+            init,
+            cond,
+            update,
+            body,
+            ..
+        } => {
             init.as_ref().is_some_and(|s| stmt_contains_jsx(s))
                 || cond.as_ref().is_some_and(expr_contains_jsx)
                 || update.as_ref().is_some_and(expr_contains_jsx)
@@ -288,7 +301,12 @@ fn stmt_contains_jsx(stmt: &tishlang_ast::Statement) -> bool {
         Statement::ForOf { iterable, body, .. } => {
             expr_contains_jsx(iterable) || stmt_contains_jsx(body)
         }
-        Statement::Switch { expr, cases, default_body, .. } => {
+        Statement::Switch {
+            expr,
+            cases,
+            default_body,
+            ..
+        } => {
             expr_contains_jsx(expr)
                 || cases.iter().any(|(e, ss)| {
                     e.as_ref().is_some_and(expr_contains_jsx) || ss.iter().any(stmt_contains_jsx)
@@ -372,9 +390,12 @@ fn expr_contains_jsx(expr: &Expr) -> bool {
         Expr::MemberAssign { object, value, .. } => {
             expr_contains_jsx(object) || expr_contains_jsx(value)
         }
-        Expr::IndexAssign { object, index, value, .. } => {
-            expr_contains_jsx(object) || expr_contains_jsx(index) || expr_contains_jsx(value)
-        }
+        Expr::IndexAssign {
+            object,
+            index,
+            value,
+            ..
+        } => expr_contains_jsx(object) || expr_contains_jsx(index) || expr_contains_jsx(value),
         Expr::New { callee, args, .. } => {
             expr_contains_jsx(callee)
                 || args.iter().any(|a| match a {
@@ -383,8 +404,6 @@ fn expr_contains_jsx(expr: &Expr) -> bool {
                     }
                 })
         }
-        Expr::Literal { .. }
-        | Expr::Ident { .. }
-        | Expr::NativeModuleLoad { .. } => false,
+        Expr::Literal { .. } | Expr::Ident { .. } | Expr::NativeModuleLoad { .. } => false,
     }
 }

package/crates/tish_ui/src/lib.rs

@@ -11,6 +11,6 @@ pub mod runtime;
 
 #[cfg(feature = "runtime")]
 pub use runtime::{
-    fragment_value, install_thread_local_host, native_create_root, native_use_state, ui_h,
-    ui_text, with_thread_local_host, Host, HeadlessHost, FRAGMENT_SENTINEL,
+    fragment_value, install_thread_local_host, native_create_root, native_use_state, ui_h, ui_text,
+    with_thread_local_host, HeadlessHost, Host, FRAGMENT_SENTINEL,
 };