@tishlang/tish-format 1.0.12 → 1.0.13

package/crates/tish_ui/src/runtime/mod.rs

@@ -0,0 +1,180 @@
+//! UI runtime: `h`, `Fragment`, vnode shapes compatible with Lattish, minimal hooks, and [`Host`].
+
+mod hooks;
+
+use std::sync::Arc;
+
+pub use hooks::{
+    alloc_root_id, current_root_id, drop_host_for_root, install_host_for_root,
+    install_thread_local_host, native_create_root,
+    native_use_effect, native_use_layout_effect, native_use_memo, native_use_ref,
+    native_use_state, run_with_current_root,
+    schedule_flush,
+    unregister_root, unregister_root_hooks_and_effects, with_host_for_root,
+    with_thread_local_host, HookState, RootId, LEGACY_ROOT_ID,
+};
+
+use tishlang_core::{ObjectMap, Value, VmRef};
+
+/// Sentinel string for `Fragment` (native). Full runtimes may also use `Symbol.for("tish.fragment")`
+/// when the global `Symbol` is present; [`is_fragment_tag`] accepts both that registry symbol and
+/// this string for compatibility.
+pub const FRAGMENT_SENTINEL: &str = "__tish_ui_Fragment__";
+
+/// `Fragment` marker value for `h(Fragment, null, children)`.
+pub fn fragment_value() -> Value {
+    Value::String(FRAGMENT_SENTINEL.into())
+}
+
+/// Returns true if `tag` refers to [`fragment_value`].
+pub fn is_fragment_tag(tag: &Value) -> bool {
+    match tag {
+        Value::String(s) => s.as_ref() == FRAGMENT_SENTINEL,
+        Value::Symbol(s) => s.registry_key.as_deref() == Some("tish.fragment"),
+        _ => false,
+    }
+}
+
+/// `text(s)` helper — returns string as `Value::String` for JSX text nodes.
+pub fn ui_text(args: &[Value]) -> Value {
+    let s = args
+        .first()
+        .map(|v| v.to_display_string())
+        .unwrap_or_default();
+    Value::String(s.into())
+}
+
+/// Vnode factory: `h(tag, props, children)` (Lattish-compatible shape).
+pub fn ui_h(args: &[Value]) -> Value {
+    let tag = args.get(0).cloned().unwrap_or(Value::Null);
+    let props = args.get(1).cloned().unwrap_or(Value::Null);
+    let children_arg = args.get(2).cloned().unwrap_or(Value::Null);
+
+    let children_vec = normalize_children_list(children_arg);
+
+    if let Value::Function(f) = &tag {
+        let mut merged = if matches!(props, Value::Null) {
+            ObjectMap::default()
+        } else if let Value::Object(obj) = props {
+            obj.borrow().strings.clone()
+        } else {
+            ObjectMap::default()
+        };
+        if !children_vec.is_empty() {
+            merged.insert(
+                Arc::from("children"),
+                Value::Array(VmRef::new(children_vec.clone())),
+            );
+        }
+        return f(&[Value::object(merged)]);
+    }
+
+    if is_fragment_tag(&tag) {
+        return vnode_fragment(children_vec);
+    }
+
+    let tag_str: Arc<str> = match tag {
+        Value::String(s) => s,
+        _ => return Value::Null,
+    };
+
+    vnode_element(tag_str, props, children_vec)
+}
+
+fn normalize_children_list(children_arg: Value) -> Vec<Value> {
+    match children_arg {
+        Value::Null => vec![],
+        Value::Array(a) => flatten_vnode_children(&a.borrow()),
+        other => vec![other],
+    }
+}
+
+/// JSX often passes `{items.map(...)}` as one slot in the children array. Treat nested `Value::Array`
+/// like React: splice them into the parent list so hosts never see a raw array vnode.
+fn flatten_vnode_children(items: &[Value]) -> Vec<Value> {
+    let mut out = Vec::new();
+    for c in items {
+        match c {
+            Value::Array(inner) => out.extend(flatten_vnode_children(&inner.borrow())),
+            Value::Null => {}
+            _ => out.push(c.clone()),
+        }
+    }
+    out
+}
+
+fn vnode_element(tag: Arc<str>, props: Value, children: Vec<Value>) -> Value {
+    let mut m = ObjectMap::default();
+    m.insert(Arc::from("tag"), Value::String(tag));
+    m.insert(
+        Arc::from("props"),
+        if matches!(props, Value::Null) {
+            Value::Null
+        } else {
+            props
+        },
+    );
+    m.insert(Arc::from("children"), Value::Array(VmRef::new(children)));
+    m.insert(Arc::from("_el"), Value::Null);
+    Value::object(m)
+}
+
+fn vnode_fragment(children: Vec<Value>) -> Value {
+    let mut m = ObjectMap::default();
+    m.insert(Arc::from("tag"), fragment_value());
+    m.insert(Arc::from("props"), Value::Null);
+    m.insert(Arc::from("children"), Value::Array(VmRef::new(children)));
+    m.insert(Arc::from("_el"), Value::Null);
+    Value::object(m)
+}
+
+/// Pluggable UI backend (Floem, DOM, SwiftUI, …). Main-thread / single-threaded by default.
+pub trait Host {
+    /// Apply a new root vnode (after each render flush).
+    fn commit_root(&mut self, vnode: &Value);
+    /// Content area width changed (e.g. window resize); default no-op.
+    fn content_width_changed(&mut self, _width: f64) {}
+    /// Called once from the main queue shortly after the window is ordered on-screen. Split /
+    /// sidebar hosts can use this to re-layout when pane bounds were still provisional during the
+    /// first commit.
+    fn after_window_shown(&mut self) {}
+    /// Clear native control target/action (and similar) before the host is dropped — e.g. window close.
+    fn detach_native_actions(&mut self) {}
+}
+
+/// No-op / test host that only stores the last committed tree.
+pub struct HeadlessHost {
+    pub last: Option<Value>,
+}
+
+impl Default for HeadlessHost {
+    fn default() -> Self {
+        Self { last: None }
+    }
+}
+
+impl Host for HeadlessHost {
+    fn commit_root(&mut self, vnode: &Value) {
+        self.last = Some(vnode.clone());
+    }
+}
+
+/// Tag registry hook for future host-specific intrinsic mapping (HTML tag → component kind).
+#[derive(Default)]
+pub struct TagRegistry;
+
+impl TagRegistry {
+    pub fn new() -> Self {
+        Self
+    }
+}
+
+/// Placeholder for subset CSS / style object interpretation.
+#[derive(Default)]
+pub struct StyleInterpreter;
+
+impl StyleInterpreter {
+    pub fn new() -> Self {
+        Self
+    }
+}

package/crates/tish_vm/Cargo.toml

@@ -0,0 +1,47 @@
+[package]
+name = "tishlang_vm"
+version = "0.1.0"
+edition = "2021"
+description = "Bytecode VM for Tish"
+
+license-file = { workspace = true }
+repository = { workspace = true }
+[features]
+default = []
+regex = ["tishlang_core/regex"]
+# Propagate `send-values` so that every native-function closure we build
+# in the VM (array / string / object methods) picks up the right
+# `Rc<dyn Fn>` vs `Arc<dyn Fn + Send + Sync>` wrapper at compile time.
+send-values = ["tishlang_core/send-values", "tishlang_builtins/send-values"]
+# For wasm32 target: use web_sys console for output
+wasm = ["dep:wasm-bindgen"]
+# Built-in modules: fs, http, process (for bytecode LoadNativeExport).
+# `dep:tishlang_runtime` is required so enabling e.g. `http` always activates the optional runtime crate
+# (some Cargo/cache combinations only saw `tishlang_runtime/http` and built VM stubs without http).
+fs = ["dep:tishlang_runtime", "tishlang_runtime/fs"]
+process = ["dep:tishlang_runtime", "tishlang_runtime/process"]
+# Timer globals + `tish:timers` LoadNativeExport (uses tishlang_runtime TLS timer registry).
+timers = ["dep:tishlang_runtime"]
+# Any HTTP build needs Send-safe values so handlers can be dispatched
+# across worker threads or processes. HTTP implies timers (fetch/Promise often pair with setTimeout).
+http = ["dep:tishlang_runtime", "tishlang_runtime/http", "send-values", "timers"]
+# Promise + `tish:http.await` / `Promise` export without the full HTTP client stack (e.g. wasm32-wasip1).
+promise = ["dep:tishlang_runtime", "tishlang_runtime/promise", "send-values"]
+ws = ["dep:tishlang_runtime", "tishlang_runtime/ws"]
+
+[dependencies]
+tishlang_ast = { path = "../tish_ast", version = ">=0.1" }
+tishlang_builtins = { path = "../tish_builtins", version = ">=0.1" }
+tishlang_bytecode = { path = "../tish_bytecode", version = ">=0.1" }
+tishlang_core = { path = "../tish_core", version = ">=0.1" }
+tishlang_runtime = { path = "../tish_runtime", version = ">=0.1", optional = true }
+rand = "0.10"
+wasm-bindgen = { version = "0.2", optional = true }
+
+[dev-dependencies]
+tishlang_compile = { path = "../tish_compile", version = ">=0.1" }
+tishlang_parser = { path = "../tish_parser", version = ">=0.1" }
+tishlang_opt = { path = "../tish_opt", version = ">=0.1" }
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+getrandom = { version = "0.4", features = ["wasm_js"] }

package/crates/tish_vm/src/lib.rs

@@ -0,0 +1,39 @@
+//! Bytecode VM for Tish execution.
+
+mod vm;
+
+pub use vm::{all_compiled_capabilities, run, run_with_options, Vm, VmRunOptions};
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn bytecode_for_of_break_continue_switch_try() {
+        let src = r#"
+let sum = 0;
+for (let x of [1, 2, 3]) { sum = sum + x; }
+console.log(sum);
+let n = 0;
+do { n = n + 1; } while (n < 3);
+console.log(n);
+const k = 2;
+switch (k) {
+  case 1: console.log(1); break;
+  case 2: console.log(2); break;
+  default: console.log(0);
+}
+        try { throw "ok"; } catch (e) { console.log(e); }
+        let x = 10;
+        x++;
+        ++x;
+        x += 3;
+        console.log(x);
+        fn f(a, b, ...rest) { return rest.length; }
+        console.log(f(1,2,3,4));
+"#;
+        let program = tishlang_parser::parse(src).expect("parse");
+        let chunk = tishlang_bytecode::compile(&program).expect("compile");
+        let _ = run(&chunk).expect("run");
+    }
+}