@tishlang/tish 1.9.2 → 1.12.0

package/crates/tish_compile/src/codegen.rs

@@ -540,6 +540,33 @@ pub fn compile_project_full(
         crate::resolve::NativeBuildArtifacts,
     ),
     CompileError,
+> {
+    compile_project_full_emit(
+        entry_path,
+        project_root,
+        features,
+        optimize,
+        crate::NativeEmitMode::DesktopBin,
+        None,
+    )
+}
+
+/// Like [`compile_project_full`], with emit mode and optional feature cap (e.g. iOS sandbox).
+pub fn compile_project_full_emit(
+    entry_path: &Path,
+    project_root: Option<&Path>,
+    features: &[String],
+    optimize: bool,
+    emit_mode: crate::NativeEmitMode,
+    feature_cap: Option<&std::collections::HashSet<String>>,
+) -> Result<
+    (
+        String,
+        Vec<crate::resolve::ResolvedNativeModule>,
+        Vec<String>,
+        crate::resolve::NativeBuildArtifacts,
+    ),
+    CompileError,
 > {
     use crate::resolve;
     let root = project_root.unwrap_or_else(|| entry_path.parent().unwrap_or(Path::new(".")));
@@ -555,33 +582,41 @@ pub fn compile_project_full(
         message: e,
         span: None,
     })?;
-    let native_modules =
+    let mut native_modules =
         resolve::resolve_native_modules(&merged.program, root).map_err(|e| CompileError {
             message: e,
             span: None,
         })?;
-    let native_build = resolve::compute_native_build_artifacts(
-        &merged.program,
-        root,
-        &native_modules,
-    )
-        .map_err(|e| CompileError {
+    if resolve::program_uses_document(&merged.program) {
+        resolve::ensure_tish_canvas_module(&mut native_modules, root).map_err(|e| CompileError {
             message: e,
             span: None,
         })?;
+    }
+    let native_build =
+        resolve::compute_native_build_artifacts(&merged.program, root, &native_modules).map_err(
+            |e| CompileError {
+                message: e,
+                span: None,
+            },
+        )?;
     let mut all_features: Vec<String> = features.to_vec();
     for f in resolve::extract_native_import_features(&merged.program) {
         if !all_features.contains(&f) {
             all_features.push(f);
         }
     }
-    let rust = compile_with_native_modules(
+    if let Some(cap) = feature_cap {
+        all_features.retain(|f| cap.contains(f));
+    }
+    let rust = compile_with_native_modules_emit(
         &merged.program,
         project_root,
         &all_features,
         &native_modules,
         &native_build.native_init,
         optimize,
+        emit_mode,
     )?;
     Ok((rust, native_modules, all_features, native_build))
 }
@@ -605,6 +640,26 @@ pub fn compile_with_native_modules(
     native_modules: &[crate::resolve::ResolvedNativeModule],
     native_init: &std::collections::HashMap<String, crate::resolve::NativeModuleInit>,
     optimize: bool,
+) -> Result<String, CompileError> {
+    compile_with_native_modules_emit(
+        program,
+        project_root,
+        features,
+        native_modules,
+        native_init,
+        optimize,
+        crate::NativeEmitMode::DesktopBin,
+    )
+}
+
+pub fn compile_with_native_modules_emit(
+    program: &Program,
+    project_root: Option<&Path>,
+    features: &[String],
+    native_modules: &[crate::resolve::ResolvedNativeModule],
+    native_init: &std::collections::HashMap<String, crate::resolve::NativeModuleInit>,
+    optimize: bool,
+    emit_mode: crate::NativeEmitMode,
 ) -> Result<String, CompileError> {
     let program = if optimize {
         tishlang_opt::optimize(program)
@@ -632,6 +687,13 @@ pub fn compile_with_native_modules(
             native_init.clone()
         };
     let mut g = Codegen::new_with_native_modules(project_root, features, map);
+    g.emit_mode = emit_mode;
+    g.has_native_ui_host = native_modules.iter().any(|m| {
+        m.package_name == "tish-macos"
+            || m.package_name == "tish-ios"
+            || m.crate_name == "tishlang_macos"
+            || m.crate_name == "tishlang_ios"
+    });
     g.emit_program(&program)?;
     Ok(g.output)
 }
@@ -682,6 +744,11 @@ struct Codegen {
     /// `try`/`throw` lowering uses `return Err` only at depth 0 (e.g. `run()`); inside native
     /// closures it must not return a `Result` from a `Value`-returning closure.
     value_fn_depth: u32,
+    emit_mode: crate::NativeEmitMode,
+    /// Program links `tish:macos` / `tish:ios` — skip HeadlessHost install.
+    has_native_ui_host: bool,
+    /// Program references browser global `document` — inject tish-canvas.
+    program_uses_document: bool,
 }
 
 impl Codegen {
@@ -712,6 +779,19 @@ impl Codegen {
             program_has_jsx: false,
             program_fun_decl_names: std::collections::HashSet::new(),
             value_fn_depth: 0,
+            emit_mode: crate::NativeEmitMode::DesktopBin,
+            has_native_ui_host: false,
+            program_uses_document: false,
+        }
+    }
+
+    /// In async `run()` bodies, propagate runtime op errors with `?`; in sync
+    /// `Value::native` closures use `.unwrap_or(Value::Null)`.
+    fn ops_result_suffix(&self) -> &'static str {
+        if self.is_async && self.async_context_stack.last().copied().unwrap_or(false) {
+            "?"
+        } else {
+            ".unwrap_or(Value::Null)"
         }
     }
 
@@ -731,12 +811,9 @@ impl Codegen {
         for _ in 0..8 {
             let mut changed = false;
             for (name, ann) in &raw {
-                let resolved = crate::types::RustType::from_annotation_with_aliases(
-                    ann,
-                    &self.type_aliases,
-                );
-                let prev: Option<crate::types::RustType> =
-                    self.type_aliases.get(name).cloned();
+                let resolved =
+                    crate::types::RustType::from_annotation_with_aliases(ann, &self.type_aliases);
+                let prev: Option<crate::types::RustType> = self.type_aliases.get(name).cloned();
                 if prev.as_ref() != Some(&resolved) {
                     self.type_aliases.insert(name.clone(), resolved);
                     changed = true;
@@ -791,8 +868,11 @@ impl Codegen {
     fn emit_named_struct_decls(&mut self) {
         // Snapshot keys + values so we can mutate `self` (writing the
         // emitted source) inside the loop.
-        let mut entries: Vec<(String, crate::types::RustType)> =
-            self.type_aliases.iter().map(|(k, v)| (k.clone(), v.clone())).collect();
+        let mut entries: Vec<(String, crate::types::RustType)> = self
+            .type_aliases
+            .iter()
+            .map(|(k, v)| (k.clone(), v.clone()))
+            .collect();
         entries.sort_by(|a, b| a.0.cmp(&b.0));
         let mut emitted_any = false;
         for (name, ty) in entries {
@@ -928,7 +1008,7 @@ impl Codegen {
                 }
             };
             format!(
-                "{{ let _ns = {}; match _ns {{ Value::Object(ref _o) => _o.borrow().get({:?}).cloned().unwrap_or(Value::Null), _ => Value::Null }} }}",
+                "{{ let _ns = {}; match _ns {{ Value::Object(ref _o) => _o.borrow().strings.get({:?}).cloned().unwrap_or(Value::Null), _ => Value::Null }} }}",
                 init_expr, export_name
             )
         })
@@ -954,8 +1034,9 @@ impl Codegen {
                     // latter dispatches into `http_serve_per_worker`, which
                     // calls onWorker once per accept thread to build that
                     // thread's handler.
-                    "serve" => Some("Value::native(|args: &[Value]| { let handler = args.get(1).cloned().unwrap_or(Value::Null); match handler { Value::Function(f) => tish_http_serve(args, move |req_args| f(req_args)), Value::Object(ref opts) => { let factory = opts.borrow().get(&Arc::from(\"onWorker\")).cloned().unwrap_or(Value::Null); tishlang_runtime::http_serve_per_worker(args, factory) }, _ => Value::Null } })"),
+                    "serve" => Some("Value::native(|args: &[Value]| { let handler = args.get(1).cloned().unwrap_or(Value::Null); match handler { Value::Function(f) => tish_http_serve(args, move |req_args| f(req_args)), Value::Object(ref opts) => { let factory = opts.borrow().strings.get(\"onWorker\").cloned().unwrap_or(Value::Null); tishlang_runtime::http_serve_per_worker(args, factory) }, _ => Value::Null } })"),
                     "Promise" => Some("tish_promise_object()"),
+                    "Symbol" => Some("tish_symbol_object()"),
                     _ => None,
                 },
             "tish:timers" if self.has_feature("timers") => match export_name {
@@ -970,8 +1051,8 @@ impl Codegen {
                     "cwd" => Some("Value::native(|args: &[Value]| tish_process_cwd(args))"),
                     "exec" => Some("Value::native(|args: &[Value]| tish_process_exec(args))"),
                     "argv" => Some("Value::Array(VmRef::new(std::env::args().map(|s| Value::String(s.into())).collect()))"),
-                    "env" => Some("Value::Object(VmRef::new(std::env::vars().map(|(k,v)| (Arc::from(k.as_str()), Value::String(v.into()))).collect()))"),
-                    "process" => Some("{ let mut m = ObjectMap::default(); m.insert(Arc::from(\"exit\"), Value::native(|args: &[Value]| tish_process_exit(args))); m.insert(Arc::from(\"cwd\"), Value::native(|args: &[Value]| tish_process_cwd(args))); m.insert(Arc::from(\"exec\"), Value::native(|args: &[Value]| tish_process_exec(args))); m.insert(Arc::from(\"argv\"), Value::Array(VmRef::new(std::env::args().map(|s| Value::String(s.into())).collect()))); m.insert(Arc::from(\"env\"), Value::Object(VmRef::new(std::env::vars().map(|(k,v)| (Arc::from(k.as_str()), Value::String(v.into()))).collect::<ObjectMap>()))); Value::Object(VmRef::new(m)) }"),
+                    "env" => Some("Value::object(std::env::vars().map(|(k,v)| (Arc::from(k.as_str()), Value::String(v.into()))).collect())"),
+                    "process" => Some("{ let mut m = ObjectMap::default(); m.insert(Arc::from(\"exit\"), Value::native(|args: &[Value]| tish_process_exit(args))); m.insert(Arc::from(\"cwd\"), Value::native(|args: &[Value]| tish_process_cwd(args))); m.insert(Arc::from(\"exec\"), Value::native(|args: &[Value]| tish_process_exec(args))); m.insert(Arc::from(\"argv\"), Value::Array(VmRef::new(std::env::args().map(|s| Value::String(s.into())).collect()))); m.insert(Arc::from(\"env\"), Value::object(std::env::vars().map(|(k,v)| (Arc::from(k.as_str()), Value::String(v.into()))).collect::<ObjectMap>())); Value::object(m) }"),
                     _ => None,
                 },
             "tish:ws" if self.has_feature("ws") => match export_name {
@@ -1222,11 +1303,12 @@ impl Codegen {
         self.is_async = program_uses_async(program);
         self.program_has_jsx = tishlang_ui::jsx::program_contains_jsx(program);
         self.program_fun_decl_names = tishlang_ui::jsx::collect_fun_decl_names(program);
+        self.program_uses_document = crate::resolve::program_uses_document(program);
         self.write("#![allow(unused, non_snake_case)]\n\n");
         self.write("use std::cell::RefCell;\n");
         self.write("use std::rc::Rc;\n");
         self.write("use std::sync::Arc;\n");
-        self.write("use tishlang_runtime::{console_debug as tish_console_debug, console_info as tish_console_info, console_log as tish_console_log, console_warn as tish_console_warn, console_error as tish_console_error, boolean as tish_boolean, decode_uri as tish_decode_uri, encode_uri as tish_encode_uri, string_escape_html_impl as tish_escape_html, in_operator as tish_in_operator, is_finite as tish_is_finite, is_nan as tish_is_nan, json_parse as tish_json_parse, json_stringify as tish_json_stringify, math_abs as tish_math_abs, math_ceil as tish_math_ceil, math_floor as tish_math_floor, math_max as tish_math_max, math_min as tish_math_min, math_round as tish_math_round, math_sqrt as tish_math_sqrt, parse_float as tish_parse_float, parse_int as tish_parse_int, math_random as tish_math_random, math_pow as tish_math_pow, math_sin as tish_math_sin, math_cos as tish_math_cos, math_tan as tish_math_tan, math_log as tish_math_log, math_exp as tish_math_exp, math_sign as tish_math_sign, math_trunc as tish_math_trunc, date_now as tish_date_now, array_is_array as tish_array_is_array, string_from_char_code as tish_string_from_char_code, object_assign as tish_object_assign, object_keys as tish_object_keys, object_values as tish_object_values, object_entries as tish_object_entries, object_from_entries as tish_object_from_entries, tish_construct, tish_uint8_array_constructor, tish_audio_context_constructor, register_static_route as tish_register_static_route, ObjectMap, TishError, Value, VmRef};\n");
+        self.write("use tishlang_runtime::{console_debug as tish_console_debug, console_info as tish_console_info, console_log as tish_console_log, console_warn as tish_console_warn, console_error as tish_console_error, boolean as tish_boolean, decode_uri as tish_decode_uri, encode_uri as tish_encode_uri, string_escape_html_impl as tish_escape_html, in_operator as tish_in_operator, is_finite as tish_is_finite, is_nan as tish_is_nan, json_parse as tish_json_parse, json_stringify as tish_json_stringify, math_abs as tish_math_abs, math_ceil as tish_math_ceil, math_floor as tish_math_floor, math_max as tish_math_max, math_min as tish_math_min, math_round as tish_math_round, math_sqrt as tish_math_sqrt, parse_float as tish_parse_float, parse_int as tish_parse_int, math_random as tish_math_random, math_pow as tish_math_pow, math_sin as tish_math_sin, math_cos as tish_math_cos, math_tan as tish_math_tan, math_log as tish_math_log, math_exp as tish_math_exp, math_sign as tish_math_sign, math_trunc as tish_math_trunc, math_imul as tish_math_imul, date_now as tish_date_now, array_is_array as tish_array_is_array, string_from_char_code as tish_string_from_char_code, object_assign as tish_object_assign, object_keys as tish_object_keys, object_values as tish_object_values, object_entries as tish_object_entries, object_from_entries as tish_object_from_entries, symbol_object as tish_symbol_object, tish_construct, tish_uint8_array_constructor, tish_audio_context_constructor, register_static_route as tish_register_static_route, ObjectMap, TishError, Value, VmRef};\n");
         if self.program_has_jsx {
             self.write("use tishlang_ui::{fragment_value, install_thread_local_host, native_create_root, native_use_state, ui_h, ui_text, HeadlessHost};\n");
         }
@@ -1252,6 +1334,9 @@ impl Codegen {
         if self.has_feature("regex") {
             self.write("use tishlang_runtime::regexp_new;\n");
         }
+        if self.program_uses_document {
+            self.write("use tish_canvas::document_value as tish_canvas_document;\n");
+        }
         self.write("\n");
 
         // Collect every `type Foo = { ... }` declaration in the program
@@ -1267,35 +1352,39 @@ impl Codegen {
         // and `x.field` becomes a direct field access.
         self.emit_named_struct_decls();
 
-        if self.is_async {
+        if self.is_async && self.emit_mode == crate::NativeEmitMode::DesktopBin {
             self.writeln("#[tokio::main]");
             self.writeln("async fn main() {");
-        } else {
+        } else if self.emit_mode == crate::NativeEmitMode::DesktopBin {
             self.writeln("fn main() {");
         }
-        self.indent += 1;
-        if self.is_async {
-            self.writeln("if let Err(e) = run().await {");
-        } else {
-            self.writeln("if let Err(e) = run() {");
+        if self.emit_mode == crate::NativeEmitMode::DesktopBin {
+            self.indent += 1;
+            if self.is_async {
+                self.writeln("if let Err(e) = run().await {");
+            } else {
+                self.writeln("if let Err(e) = run() {");
+            }
+            self.indent += 1;
+            self.writeln("eprintln!(\"Error: {}\", e);");
+            self.writeln("std::process::exit(1);");
+            self.indent -= 1;
+            self.writeln("}");
+            self.indent -= 1;
+            self.writeln("}");
+            self.writeln("");
         }
-        self.indent += 1;
-        self.writeln("eprintln!(\"Error: {}\", e);");
-        self.writeln("std::process::exit(1);");
-        self.indent -= 1;
-        self.writeln("}");
-        self.indent -= 1;
-        self.writeln("}");
-        self.writeln("");
         if self.is_async {
             self.writeln("async fn run() -> Result<(), Box<dyn std::error::Error>> {");
+        } else if self.emit_mode == crate::NativeEmitMode::EmbeddedLib {
+            self.writeln("pub fn run() -> Result<(), Box<dyn std::error::Error>> {");
         } else {
             self.writeln("fn run() -> Result<(), Box<dyn std::error::Error>> {");
         }
         self.indent += 1;
 
         // Initialize builtins
-        self.writeln("let mut console = Value::Object(VmRef::new(ObjectMap::from([");
+        self.writeln("let mut console = Value::object(ObjectMap::from([");
         self.indent += 1;
         self.writeln("(Arc::from(\"debug\"), Value::native(|args: &[Value]| { tish_console_debug(args); Value::Null })),");
         self.writeln("(Arc::from(\"info\"), Value::native(|args: &[Value]| { tish_console_info(args); Value::Null })),");
@@ -1303,147 +1392,156 @@ impl Codegen {
         self.writeln("(Arc::from(\"warn\"), Value::native(|args: &[Value]| { tish_console_warn(args); Value::Null })),");
         self.writeln("(Arc::from(\"error\"), Value::native(|args: &[Value]| { tish_console_error(args); Value::Null })),");
         self.indent -= 1;
-        self.writeln("])));");
-        self.writeln(
-            "let Boolean = Value::native(|args: &[Value]| tish_boolean(args));",
-        );
-        self.writeln(
-            "let parseInt = Value::native(|args: &[Value]| tish_parse_int(args));",
-        );
-        self.writeln(
-            "let parseFloat = Value::native(|args: &[Value]| tish_parse_float(args));",
-        );
-        self.writeln(
-            "let decodeURI = Value::native(|args: &[Value]| tish_decode_uri(args));",
-        );
-        self.writeln(
-            "let encodeURI = Value::native(|args: &[Value]| tish_encode_uri(args));",
-        );
+        self.writeln("]));");
+        self.writeln("let Boolean = Value::native(|args: &[Value]| tish_boolean(args));");
+        self.writeln("let parseInt = Value::native(|args: &[Value]| tish_parse_int(args));");
+        self.writeln("let parseFloat = Value::native(|args: &[Value]| tish_parse_float(args));");
+        self.writeln("let decodeURI = Value::native(|args: &[Value]| tish_decode_uri(args));");
+        self.writeln("let encodeURI = Value::native(|args: &[Value]| tish_encode_uri(args));");
         self.writeln(
             r#"let registerStaticRoute = Value::native(|args: &[Value]| { let path = match args.get(0) { Some(Value::String(s)) => s.to_string(), _ => return Value::Null }; let body = match args.get(1) { Some(Value::String(s)) => s.as_bytes().to_vec(), _ => return Value::Null }; let ct = match args.get(2) { Some(Value::String(s)) => s.to_string(), _ => "application/octet-stream".to_string() }; tish_register_static_route(&path, &body, &ct); Value::Null });"#,
         );
         self.writeln(
             "let htmlEscape = Value::native(|args: &[Value]| tish_escape_html(args.first().unwrap_or(&Value::Null)));",
         );
-        self.writeln(
-            "let isFinite = Value::native(|args: &[Value]| tish_is_finite(args));",
-        );
+        self.writeln("let isFinite = Value::native(|args: &[Value]| tish_is_finite(args));");
         self.writeln("let isNaN = Value::native(|args: &[Value]| tish_is_nan(args));");
         self.writeln("let Infinity = Value::Number(f64::INFINITY);");
         self.writeln("let NaN = Value::Number(f64::NAN);");
-        self.writeln("let Math = Value::Object(VmRef::new(ObjectMap::from([");
+        self.writeln("let Math = Value::object(ObjectMap::from([");
         self.indent += 1;
+        self.writeln("(Arc::from(\"abs\"), Value::native(|args: &[Value]| tish_math_abs(args))),");
         self.writeln(
-            "(Arc::from(\"abs\"), Value::native(|args: &[Value]| tish_math_abs(args))),",
+            "(Arc::from(\"sqrt\"), Value::native(|args: &[Value]| tish_math_sqrt(args))),",
         );
-        self.writeln("(Arc::from(\"sqrt\"), Value::native(|args: &[Value]| tish_math_sqrt(args))),");
+        self.writeln("(Arc::from(\"min\"), Value::native(|args: &[Value]| tish_math_min(args))),");
+        self.writeln("(Arc::from(\"max\"), Value::native(|args: &[Value]| tish_math_max(args))),");
         self.writeln(
-            "(Arc::from(\"min\"), Value::native(|args: &[Value]| tish_math_min(args))),",
+            "(Arc::from(\"floor\"), Value::native(|args: &[Value]| tish_math_floor(args))),",
         );
         self.writeln(
-            "(Arc::from(\"max\"), Value::native(|args: &[Value]| tish_math_max(args))),",
+            "(Arc::from(\"ceil\"), Value::native(|args: &[Value]| tish_math_ceil(args))),",
         );
-        self.writeln("(Arc::from(\"floor\"), Value::native(|args: &[Value]| tish_math_floor(args))),");
-        self.writeln("(Arc::from(\"ceil\"), Value::native(|args: &[Value]| tish_math_ceil(args))),");
-        self.writeln("(Arc::from(\"round\"), Value::native(|args: &[Value]| tish_math_round(args))),");
-        self.writeln("(Arc::from(\"random\"), Value::native(|args: &[Value]| tish_math_random(args))),");
         self.writeln(
-            "(Arc::from(\"pow\"), Value::native(|args: &[Value]| tish_math_pow(args))),",
+            "(Arc::from(\"round\"), Value::native(|args: &[Value]| tish_math_round(args))),",
         );
         self.writeln(
-            "(Arc::from(\"sin\"), Value::native(|args: &[Value]| tish_math_sin(args))),",
+            "(Arc::from(\"random\"), Value::native(|args: &[Value]| tish_math_random(args))),",
         );
+        self.writeln("(Arc::from(\"pow\"), Value::native(|args: &[Value]| tish_math_pow(args))),");
+        self.writeln("(Arc::from(\"sin\"), Value::native(|args: &[Value]| tish_math_sin(args))),");
+        self.writeln("(Arc::from(\"cos\"), Value::native(|args: &[Value]| tish_math_cos(args))),");
+        self.writeln("(Arc::from(\"tan\"), Value::native(|args: &[Value]| tish_math_tan(args))),");
+        self.writeln("(Arc::from(\"log\"), Value::native(|args: &[Value]| tish_math_log(args))),");
+        self.writeln("(Arc::from(\"exp\"), Value::native(|args: &[Value]| tish_math_exp(args))),");
         self.writeln(
-            "(Arc::from(\"cos\"), Value::native(|args: &[Value]| tish_math_cos(args))),",
+            "(Arc::from(\"sign\"), Value::native(|args: &[Value]| tish_math_sign(args))),",
         );
         self.writeln(
-            "(Arc::from(\"tan\"), Value::native(|args: &[Value]| tish_math_tan(args))),",
+            "(Arc::from(\"trunc\"), Value::native(|args: &[Value]| tish_math_trunc(args))),",
         );
         self.writeln(
-            "(Arc::from(\"log\"), Value::native(|args: &[Value]| tish_math_log(args))),",
+            "(Arc::from(\"imul\"), Value::native(|args: &[Value]| tish_math_imul(args))),",
         );
-        self.writeln(
-            "(Arc::from(\"exp\"), Value::native(|args: &[Value]| tish_math_exp(args))),",
-        );
-        self.writeln("(Arc::from(\"sign\"), Value::native(|args: &[Value]| tish_math_sign(args))),");
-        self.writeln("(Arc::from(\"trunc\"), Value::native(|args: &[Value]| tish_math_trunc(args))),");
         self.writeln("(Arc::from(\"PI\"), Value::Number(std::f64::consts::PI)),");
         self.writeln("(Arc::from(\"E\"), Value::Number(std::f64::consts::E)),");
         self.indent -= 1;
-        self.writeln("])));");
-        self.writeln("let JSON = Value::Object(VmRef::new(ObjectMap::from([");
+        self.writeln("]));");
+        self.writeln("let JSON = Value::object(ObjectMap::from([");
         self.indent += 1;
-        self.writeln("(Arc::from(\"parse\"), Value::native(|args: &[Value]| tish_json_parse(args))),");
+        self.writeln(
+            "(Arc::from(\"parse\"), Value::native(|args: &[Value]| tish_json_parse(args))),",
+        );
         self.writeln("(Arc::from(\"stringify\"), Value::native(|args: &[Value]| tish_json_stringify(args))),");
         self.indent -= 1;
-        self.writeln("])));");
+        self.writeln("]));");
 
-        self.writeln("let Array = Value::Object(VmRef::new(ObjectMap::from([");
+        self.writeln("let Array = Value::object(ObjectMap::from([");
         self.indent += 1;
-        self.writeln("(Arc::from(\"isArray\"), Value::native(|args: &[Value]| tish_array_is_array(args))),");
+        self.writeln(
+            "(Arc::from(\"isArray\"), Value::native(|args: &[Value]| tish_array_is_array(args))),",
+        );
         self.indent -= 1;
-        self.writeln("])));");
+        self.writeln("]));");
 
-        self.writeln("let String = Value::Object(VmRef::new(ObjectMap::from([");
+        self.writeln("let String = Value::object(ObjectMap::from([");
         self.indent += 1;
         self.writeln("(Arc::from(\"fromCharCode\"), Value::native(|args: &[Value]| tish_string_from_char_code(args))),");
         self.indent -= 1;
-        self.writeln("])));");
+        self.writeln("]));");
 
-        self.writeln("let Date = Value::Object(VmRef::new(ObjectMap::from([");
+        self.writeln("let Date = Value::object(ObjectMap::from([");
         self.indent += 1;
-        self.writeln(
-            "(Arc::from(\"now\"), Value::native(|args: &[Value]| tish_date_now(args))),",
-        );
+        self.writeln("(Arc::from(\"now\"), Value::native(|args: &[Value]| tish_date_now(args))),");
         self.indent -= 1;
-        self.writeln("])));");
+        self.writeln("]));");
 
-        self.writeln("let Object = Value::Object(VmRef::new(ObjectMap::from([");
+        self.writeln("let Symbol = tish_symbol_object();");
+
+        self.writeln("let Object = Value::object(ObjectMap::from([");
         self.indent += 1;
-        self.writeln("(Arc::from(\"assign\"), Value::native(|args: &[Value]| tish_object_assign(args))),");
-        self.writeln("(Arc::from(\"keys\"), Value::native(|args: &[Value]| tish_object_keys(args))),");
-        self.writeln("(Arc::from(\"values\"), Value::native(|args: &[Value]| tish_object_values(args))),");
-        self.writeln("(Arc::from(\"entries\"), Value::native(|args: &[Value]| tish_object_entries(args))),");
+        self.writeln(
+            "(Arc::from(\"assign\"), Value::native(|args: &[Value]| tish_object_assign(args))),",
+        );
+        self.writeln(
+            "(Arc::from(\"keys\"), Value::native(|args: &[Value]| tish_object_keys(args))),",
+        );
+        self.writeln(
+            "(Arc::from(\"values\"), Value::native(|args: &[Value]| tish_object_values(args))),",
+        );
+        self.writeln(
+            "(Arc::from(\"entries\"), Value::native(|args: &[Value]| tish_object_entries(args))),",
+        );
         self.writeln("(Arc::from(\"fromEntries\"), Value::native(|args: &[Value]| tish_object_from_entries(args))),");
         self.indent -= 1;
-        self.writeln("])));");
+        self.writeln("]));");
 
         self.writeln("let Uint8Array = tish_uint8_array_constructor();");
         self.writeln("let AudioContext = tish_audio_context_constructor();");
+        if self.program_uses_document {
+            self.writeln("let document = VmRef::new(tish_canvas_document());");
+            self.refcell_wrapped_vars.insert("document".to_string());
+            self.rc_cell_storage_define("document");
+            if let Some(scope) = self.outer_vars_stack.last_mut() {
+                scope.push("document".to_string());
+            }
+        }
 
         if self.has_feature("process") {
-            self.writeln("let process = Value::Object(VmRef::new({");
+            self.writeln("let process = Value::object({");
             self.indent += 1;
             self.writeln("let mut p = ObjectMap::default();");
             self.writeln("p.insert(Arc::from(\"exit\"), Value::native(|args: &[Value]| tish_process_exit(args)));");
             self.writeln("p.insert(Arc::from(\"cwd\"), Value::native(|args: &[Value]| tish_process_cwd(args)));");
             self.writeln("p.insert(Arc::from(\"exec\"), Value::native(|args: &[Value]| tish_process_exec(args)));");
             self.writeln("let argv: Vec<Value> = std::env::args().map(|s| Value::String(s.into())).collect();");
-            self.writeln(
-                "p.insert(Arc::from(\"argv\"), Value::Array(VmRef::new(argv)));",
-            );
+            self.writeln("p.insert(Arc::from(\"argv\"), Value::Array(VmRef::new(argv)));");
             self.writeln("let mut env_obj = ObjectMap::default();");
             self.writeln("for (key, value) in std::env::vars() {");
             self.indent += 1;
             self.writeln("env_obj.insert(Arc::from(key.as_str()), Value::String(value.into()));");
             self.indent -= 1;
             self.writeln("}");
-            self.writeln(
-                "p.insert(Arc::from(\"env\"), Value::Object(VmRef::new(env_obj)));",
-            );
+            self.writeln("p.insert(Arc::from(\"env\"), Value::object(env_obj));");
             self.writeln("p");
             self.indent -= 1;
-            self.writeln("}));");
+            self.writeln("});");
         }
 
         if self.has_feature("timers") {
-            self.writeln("let setTimeout = Value::native(|args: &[Value]| tish_timer_set_timeout(args));");
+            self.writeln(
+                "let setTimeout = Value::native(|args: &[Value]| tish_timer_set_timeout(args));",
+            );
             self.writeln("let clearTimeout = Value::native(|args: &[Value]| tish_timer_clear_timeout(args));");
-            self.writeln("let setInterval = Value::native(|args: &[Value]| tish_timer_set_interval(args));");
+            self.writeln(
+                "let setInterval = Value::native(|args: &[Value]| tish_timer_set_interval(args));",
+            );
             self.writeln("let clearInterval = Value::native(|args: &[Value]| tish_timer_clear_interval(args));");
         }
         if self.has_feature("http") {
-            self.writeln("let fetch = Value::native(|args: &[Value]| tish_fetch_promise(args.to_vec()));");
+            self.writeln(
+                "let fetch = Value::native(|args: &[Value]| tish_fetch_promise(args.to_vec()));",
+            );
             self.writeln("let fetchAll = Value::native(|args: &[Value]| tish_fetch_all_promise(args.to_vec()));");
             if self.is_async {
                 self.writeln("let Promise = tish_promise_object();");
@@ -1461,10 +1559,12 @@ impl Codegen {
             self.writeln("let handler = args.get(1).cloned().unwrap_or(Value::Null);");
             self.writeln("match handler {");
             self.indent += 1;
-            self.writeln("Value::Function(f) => tish_http_serve(args, move |req_args| f(req_args)),");
+            self.writeln(
+                "Value::Function(f) => tish_http_serve(args, move |req_args| f(req_args)),",
+            );
             self.writeln("Value::Object(ref opts) => {");
             self.indent += 1;
-            self.writeln("let factory = opts.borrow().get(&Arc::from(\"onWorker\")).cloned().unwrap_or(Value::Null);");
+            self.writeln("let factory = opts.borrow().strings.get(\"onWorker\").cloned().unwrap_or(Value::Null);");
             self.writeln("tishlang_runtime::http_serve_per_worker(args, factory)");
             self.indent -= 1;
             self.writeln("},");
@@ -1476,39 +1576,29 @@ impl Codegen {
         }
 
         if self.has_feature("fs") {
+            self.writeln("let readFile = Value::native(|args: &[Value]| tish_read_file(args));");
+            self.writeln("let writeFile = Value::native(|args: &[Value]| tish_write_file(args));");
             self.writeln(
-                "let readFile = Value::native(|args: &[Value]| tish_read_file(args));",
-            );
-            self.writeln(
-                "let writeFile = Value::native(|args: &[Value]| tish_write_file(args));",
-            );
-            self.writeln("let fileExists = Value::native(|args: &[Value]| tish_file_exists(args));");
-            self.writeln(
-                "let isDir = Value::native(|args: &[Value]| tish_is_dir(args));",
-            );
-            self.writeln(
-                "let readDir = Value::native(|args: &[Value]| tish_read_dir(args));",
-            );
-            self.writeln(
-                "let mkdir = Value::native(|args: &[Value]| tish_mkdir(args));",
+                "let fileExists = Value::native(|args: &[Value]| tish_file_exists(args));",
             );
+            self.writeln("let isDir = Value::native(|args: &[Value]| tish_is_dir(args));");
+            self.writeln("let readDir = Value::native(|args: &[Value]| tish_read_dir(args));");
+            self.writeln("let mkdir = Value::native(|args: &[Value]| tish_mkdir(args));");
         }
 
         if self.has_feature("regex") {
-            self.writeln(
-                "let RegExp = Value::native(|args: &[Value]| regexp_new(args));",
-            );
+            self.writeln("let RegExp = Value::native(|args: &[Value]| regexp_new(args));");
         }
 
-        if self.program_has_jsx {
+        if self.program_has_jsx && !self.has_native_ui_host {
             self.writeln("install_thread_local_host(Box::new(HeadlessHost::default()));");
             self.writeln("let Fragment = fragment_value();");
             self.writeln("let h = Value::native(|args: &[Value]| ui_h(args));");
             self.writeln("let text = Value::native(|args: &[Value]| ui_text(args));");
+            self.writeln("let useState = Value::native(|args: &[Value]| native_use_state(args));");
             self.writeln(
-                "let useState = Value::native(|args: &[Value]| native_use_state(args));",
+                "let createRoot = Value::native(|args: &[Value]| native_create_root(args));",
             );
-            self.writeln("let createRoot = Value::native(|args: &[Value]| native_create_root(args));");
         }
 
         // Polars, Egui etc. are emitted via VarDecl from import { X } from 'tish:...'
@@ -1548,6 +1638,20 @@ impl Codegen {
         self.writeln("Ok(())");
         self.indent -= 1;
         self.writeln("}");
+        if self.emit_mode == crate::NativeEmitMode::EmbeddedLib {
+            self.writeln("");
+            self.writeln("#[no_mangle]");
+            self.writeln("pub extern \"C\" fn tish_ios_launch() {");
+            self.indent += 1;
+            if self.is_async {
+                self.writeln("let rt = tokio::runtime::Runtime::new().expect(\"tokio runtime\");");
+                self.writeln("let _ = rt.block_on(run());");
+            } else {
+                self.writeln("let _ = run();");
+            }
+            self.indent -= 1;
+            self.writeln("}");
+        }
         Ok(())
     }
 
@@ -1622,10 +1726,7 @@ impl Codegen {
                     };
                     if self.refcell_wrapped_vars.contains(name.as_ref()) {
                         // Closure-mutated: same Rc<RefCell<T>> pattern as Value (assignments use borrow_mut)
-                        self.writeln(&format!(
-                            "let {} = VmRef::new({});",
-                            escaped_name, expr_str
-                        ));
+                        self.writeln(&format!("let {} = VmRef::new({});", escaped_name, expr_str));
                         self.rc_cell_storage_define(name.as_ref());
                     } else {
                         let type_str = rust_type.to_rust_type_str();
@@ -1653,10 +1754,7 @@ impl Codegen {
                         } else {
                             expr_str.to_string()
                         };
-                        self.writeln(&format!(
-                            "let {} = VmRef::new({});",
-                            escaped_name, init_val
-                        ));
+                        self.writeln(&format!("let {} = VmRef::new({});", escaped_name, init_val));
                         self.rc_cell_storage_define(name.as_ref());
                     } else if clone_needed {
                         self.writeln(&format!(
@@ -2036,6 +2134,7 @@ impl Codegen {
                             "setInterval",
                             "clearInterval",
                             "Promise",
+                            "Symbol",
                             "RegExp",
                             "Polars",
                         ]
@@ -2136,6 +2235,7 @@ impl Codegen {
                     "setInterval",
                     "clearInterval",
                     "Promise",
+                    "Symbol",
                     "RegExp",
                     "Polars",
                     // Free-standing global functions used inside user-defined
@@ -2242,6 +2342,10 @@ impl Codegen {
                     for v in &mutable_outer_vars {
                         self.refcell_wrapped_vars.insert(v.clone());
                     }
+                    // Read-only captures are plain Value bindings inside the closure.
+                    for v in &read_only_outer_vars {
+                        self.refcell_wrapped_vars.remove(v);
+                    }
 
                     // Pre-scan body for nested functions (handles function body as Block)
                     if let Statement::Block { statements, .. } = body.as_ref() {
@@ -2409,7 +2513,7 @@ impl Codegen {
                     match &prop.value {
                         DestructElement::Ident(name, _) => {
                             self.writeln(&format!(
-                                "{} {} = match &({}) {{ Value::Object(ref _o) => _o.borrow().get({:?}).cloned().unwrap_or(Value::Null), _ => Value::Null }};",
+                                "{} {} = match &({}) {{ Value::Object(ref _o) => _o.borrow().strings.get({:?}).cloned().unwrap_or(Value::Null), _ => Value::Null }};",
                                 mutability,
                                 Self::escape_ident(name.as_ref()),
                                 value_expr,
@@ -2419,7 +2523,7 @@ impl Codegen {
                         DestructElement::Pattern(nested) => {
                             let nested_var = format!("_nested_obj_{}", key);
                             self.writeln(&format!(
-                                "let {} = match &({}) {{ Value::Object(ref _o) => _o.borrow().get({:?}).cloned().unwrap_or(Value::Null), _ => Value::Null }};",
+                                "let {} = match &({}) {{ Value::Object(ref _o) => _o.borrow().strings.get({:?}).cloned().unwrap_or(Value::Null), _ => Value::Null }};",
                                 nested_var, value_expr, key
                             ));
                             self.emit_destruct_bindings(nested, &nested_var, mutability, span)?;
@@ -2502,7 +2606,12 @@ impl Codegen {
                         // Convert native type to Value for compatibility with existing code
                         var_type.to_value_expr(&escaped)
                     } else {
-                        escaped.into_owned()
+                        let s = escaped.into_owned();
+                        if self.value_fn_depth > 0 || !self.loop_stack.is_empty() {
+                            format!("({}).clone()", s)
+                        } else {
+                            s
+                        }
                     }
                 }
             }
@@ -2760,6 +2869,14 @@ impl Codegen {
                                 obj_expr, start, end
                             ));
                         }
+                        "substr" => {
+                            let start = arg_exprs.first().cloned().unwrap_or_else(|| "Value::Number(0.0)".to_string());
+                            let length = arg_exprs.get(1).cloned().unwrap_or_else(|| "Value::Null".to_string());
+                            return Ok(format!(
+                                "tishlang_runtime::string_substr(&{}, &{}, &{})",
+                                obj_expr, start, length
+                            ));
+                        }
                         "split" => {
                             let sep = arg_exprs.first().cloned().unwrap_or_else(|| "Value::Null".to_string());
                             return Ok(format!(
@@ -2980,7 +3097,7 @@ impl Codegen {
                 if has_spread {
                     let args_code = self.emit_call_args(args)?;
                     return Ok(format!(
-                        "{{ let _callee = &{}; let _spread_args = {}; match _callee {{ Value::Function(cb) => cb(&_spread_args), other => panic!(\"Not a function: tried to call {{:?}} as a function (e.g. method on Null when read failed)\", other) }} }}",
+                        "{{ let _callee = ({}).clone(); let _spread_args = {}; tishlang_runtime::value_call(&_callee, _spread_args.as_slice()) }}",
                         callee_expr, args_code
                     ));
                 }
@@ -2994,8 +3111,8 @@ impl Codegen {
                     .join(", ");
                 format!(
                     "({{\n\
-                     {}    let _callee = &{};\n\
-                     {}    match _callee {{ Value::Function(cb) => cb(&[{}]), other => panic!(\"Not a function: tried to call {{:?}} as a function (e.g. method on Null when read failed)\", other) }}\n\
+                     {}    let _callee = ({}).clone();\n\
+                     {}    tishlang_runtime::value_call(&_callee, &[{}])\n\
                      {}}})",
                     "    ".repeat(self.indent),
                     callee_expr,
@@ -3160,11 +3277,11 @@ impl Codegen {
                             }
                             ObjectProp::Spread(e) => {
                                 let val = self.emit_expr(e)?;
-                                parts.push(format!("if let Value::Object(ref _spread) = {} {{ for (k, v) in _spread.borrow().iter() {{ _obj.insert(Arc::clone(k), v.clone()); }} }}", val));
+                                parts.push(format!("if let Value::Object(ref _spread) = {} {{ for (k, v) in _spread.borrow().strings.iter() {{ _obj.insert(Arc::clone(k), v.clone()); }} }}", val));
                             }
                         }
                     }
-                    format!("{{ let mut _obj: ObjectMap = ObjectMap::default(); {} Value::Object(VmRef::new(_obj)) }}", parts.join(" "))
+                    format!("{{ let mut _obj: ObjectMap = ObjectMap::default(); {} Value::object(_obj) }}", parts.join(" "))
                 } else {
                     let mut parts = Vec::new();
                     for prop in props {
@@ -3178,7 +3295,7 @@ impl Codegen {
                         }
                     }
                     format!(
-                        "Value::Object(VmRef::new(ObjectMap::from([{}])))",
+                        "Value::object(ObjectMap::from([{}]))",
                         parts.join(", ")
                     )
                 }
@@ -3274,7 +3391,8 @@ impl Codegen {
                      Value::Number(_) => \"number\".into(), Value::String(_) => \"string\".into(), \
                      Value::Bool(_) => \"boolean\".into(), Value::Null => \"null\".into(), \
                      Value::Array(_) => \"object\".into(), Value::Object(_) => \"object\".into(), \
-                     Value::Function(_) => \"function\".into(), _ => \"object\".into() }})",
+                     Value::Function(_) => \"function\".into(), Value::Symbol(_) => \"symbol\".into(), \
+                     _ => \"object\".into() }})",
                     o
                 )
             }
@@ -3400,10 +3518,11 @@ impl Codegen {
                     CompoundOp::Div => "div",
                     CompoundOp::Mod => "modulo",
                 };
+                let op_suffix = self.ops_result_suffix();
                 if is_refcell {
                     format!(
-                        "{{ let _lhs_v = (*{}.borrow()).clone(); let _rhs = ({}).clone(); let _new = tishlang_runtime::ops::{}(&_lhs_v, &_rhs)?; *{}.borrow_mut() = _new; (*{}.borrow()).clone() }}",
-                        n, val, op_fn, n, n
+                        "{{ let _lhs_v = (*{}.borrow()).clone(); let _rhs = ({}).clone(); let _new = tishlang_runtime::ops::{}(&_lhs_v, &_rhs){}; *{}.borrow_mut() = _new; (*{}.borrow()).clone() }}",
+                        n, val, op_fn, op_suffix, n, n
                     )
                 } else if var_type.is_native() {
                     // Wrap native lhs as Value, run ops::, unbox result back to native
@@ -3411,13 +3530,13 @@ impl Codegen {
                     let result_native = var_type.from_value_expr("_result");
                     let n_as_value2 = var_type.to_value_expr(&n);
                     format!(
-                        "{{ let _lhs = {}; let _rhs = ({}).clone(); let _result = tishlang_runtime::ops::{}(&_lhs, &_rhs)?; {} = {}; {} }}",
-                        n_as_value, val, op_fn, n, result_native, n_as_value2
+                        "{{ let _lhs = {}; let _rhs = ({}).clone(); let _result = tishlang_runtime::ops::{}(&_lhs, &_rhs){}; {} = {}; {} }}",
+                        n_as_value, val, op_fn, op_suffix, n, result_native, n_as_value2
                     )
                 } else {
                     format!(
-                        "{{ let _rhs = ({}).clone(); {} = tishlang_runtime::ops::{}(&{}, &_rhs)?; {}.clone() }}",
-                        val, n, op_fn, n, n
+                        "{{ let _rhs = ({}).clone(); {} = tishlang_runtime::ops::{}(&{}, &_rhs){}; {}.clone() }}",
+                        val, n, op_fn, n, op_suffix, n
                     )
                 }
             }
@@ -4606,6 +4725,7 @@ impl Codegen {
                     "setInterval",
                     "clearInterval",
                     "Promise",
+                    "Symbol",
                     "RegExp",
                     "Polars",
                 ]
@@ -4679,6 +4799,7 @@ impl Codegen {
             "setInterval",
             "clearInterval",
             "Promise",
+            "Symbol",
             "RegExp",
             "Polars",
         ] {
@@ -4707,6 +4828,41 @@ impl Codegen {
             ));
         }
 
+        // Locals from an enclosing Value::native (e.g. captured helper fns) are not on
+        // outer_vars_stack but must not move into multiple sibling closures.
+        const BUILTINS: &[&str] = &[
+            "Boolean", "console", "Math", "JSON", "Date", "Object", "process",
+            "setTimeout", "clearTimeout", "setInterval", "clearInterval", "Promise",
+            "Symbol", "RegExp", "Polars", "Infinity", "NaN", "serve",
+        ];
+        let mut already_captured: HashSet<String> = outer_vars
+            .iter()
+            .chain(outer_params.iter())
+            .chain(referenced_funcs.iter())
+            .cloned()
+            .collect();
+        already_captured.extend(BUILTINS.iter().map(|s| s.to_string()));
+        let implicit_env_captures: Vec<String> = if self.value_fn_depth > 0 {
+            referenced
+                .iter()
+                .filter(|name| {
+                    !param_names.contains(name.as_str())
+                        && !local_var_names.contains(name.as_str())
+                        && !already_captured.contains(name.as_str())
+                })
+                .cloned()
+                .collect()
+        } else {
+            Vec::new()
+        };
+        for name in &implicit_env_captures {
+            let escaped = Self::escape_ident(name);
+            code.push_str(&format!(
+                "    let {}_ref = VmRef::new({}.clone());\n",
+                escaped, escaped
+            ));
+        }
+
         code.push_str("    Value::native(move |args: &[Value]| {\n");
         self.value_fn_depth += 1;
 
@@ -4734,6 +4890,13 @@ impl Codegen {
                 var_escaped, var_escaped
             ));
         }
+        for name in &implicit_env_captures {
+            let escaped = Self::escape_ident(name);
+            code.push_str(&format!(
+                "        let {} = (*{}_ref.borrow()).clone();\n",
+                escaped, escaped
+            ));
+        }
 
         // Make captured functions available
         for func_name in &referenced_funcs {
@@ -4786,6 +4949,12 @@ impl Codegen {
         for v in &cell_capture_outer_vars {
             self.refcell_wrapped_vars.insert(v.clone());
         }
+        for v in &read_only_outer_vars {
+            self.refcell_wrapped_vars.remove(v);
+        }
+        for v in &implicit_env_captures {
+            self.refcell_wrapped_vars.remove(v);
+        }
 
         self.type_context.push_fun_param_scope(params, None);
 
@@ -4886,14 +5055,11 @@ impl Codegen {
         // alias). Each property in source order is matched to a struct
         // field; missing fields fall back to `default_value()` so the
         // emit succeeds even on partial literals (rare, but harmless).
-        if let (RustType::Named { name, fields }, Expr::Object { props, .. }) =
-            (target_type, expr)
+        if let (RustType::Named { name, fields }, Expr::Object { props, .. }) = (target_type, expr)
         {
             use std::collections::HashMap;
-            let field_types: HashMap<&str, &RustType> = fields
-                .iter()
-                .map(|(k, t)| (k.as_ref(), t))
-                .collect();
+            let field_types: HashMap<&str, &RustType> =
+                fields.iter().map(|(k, t)| (k.as_ref(), t)).collect();
             let mut field_inits: HashMap<String, String> = HashMap::new();
             let mut bail = false;
             for prop in props {