@tishlang/tish 1.6.0 → 1.8.0

package/crates/tish_runtime/src/lib.rs

@@ -5,9 +5,9 @@
 
 #[cfg(feature = "regex")]
 use std::cell::RefCell;
+use std::fmt;
 #[cfg(feature = "regex")]
 use std::rc::Rc;
-use std::fmt;
 use std::sync::OnceLock;
 use tishlang_builtins::helpers::extract_num;
 #[cfg(feature = "fs")]
@@ -15,79 +15,77 @@ use tishlang_builtins::helpers::make_error_value;
 
 pub use tishlang_core::ObjectMap;
 pub use tishlang_core::Value;
+// Re-export the shared-mutable wrapper so the Rust code emitted by
+// `tishlang_compile::codegen` can write `VmRef::new(...)` without needing
+// a direct dependency on `tishlang_core` from the generated crate.
+pub use tishlang_core::{VmReadGuard, VmRef, VmWriteGuard};
 
 pub use tishlang_builtins::construct::{
-    audio_context_constructor_value as tish_audio_context_constructor,
-    construct as tish_construct,
+    audio_context_constructor_value as tish_audio_context_constructor, construct as tish_construct,
     uint8_array_constructor_value as tish_uint8_array_constructor,
 };
 
 // Re-export array methods from tishlang_builtins
 pub use tishlang_builtins::array::{
-    push as array_push_impl,
-    pop as array_pop,
-    shift as array_shift,
-    unshift as array_unshift_impl,
-    index_of as array_index_of_impl,
-    includes as array_includes_impl,
-    join as array_join_impl,
-    reverse as array_reverse,
-    shuffle as array_shuffle,
-    splice as array_splice_impl,
-    slice as array_slice_impl,
-    concat as array_concat_impl,
-    flat as array_flat_impl,
-    map as array_map,
-    filter as array_filter,
-    reduce as array_reduce,
-    for_each as array_for_each,
-    find as array_find,
-    find_index as array_find_index,
-    some as array_some,
-    every as array_every,
-    flat_map as array_flat_map,
-    sort_default as array_sort_default,
-    sort_with_comparator as array_sort_with_comparator,
-    sort_numeric_asc as array_sort_numeric_asc,
+    concat as array_concat_impl, every as array_every, filter as array_filter, find as array_find,
+    find_index as array_find_index, flat as array_flat_impl, flat_map as array_flat_map,
+    for_each as array_for_each, includes as array_includes_impl, index_of as array_index_of_impl,
+    join as array_join_impl, map as array_map, pop as array_pop, push as array_push_impl,
+    reduce as array_reduce, reverse as array_reverse, shift as array_shift,
+    shuffle as array_shuffle, slice as array_slice_impl, some as array_some,
+    sort_default as array_sort_default, sort_numeric_asc as array_sort_numeric_asc,
     sort_numeric_desc as array_sort_numeric_desc,
+    sort_with_comparator as array_sort_with_comparator, splice as array_splice_impl,
+    unshift as array_unshift_impl,
 };
 
 // Re-export string methods from tishlang_builtins
 pub use tishlang_builtins::string::{
-    index_of as string_index_of_impl,
-    includes as string_includes_impl,
-    slice as string_slice_impl,
-    substring as string_substring_impl,
-    split as string_split_impl,
+    char_at as string_char_at_impl, char_code_at as string_char_code_at_impl,
+    ends_with as string_ends_with_impl, escape_html as string_escape_html_impl,
+    includes as string_includes_impl, index_of as string_index_of_impl,
+    last_index_of as string_last_index_of_impl, pad_end as string_pad_end_impl,
+    pad_start as string_pad_start_impl, repeat as string_repeat_impl,
+    replace as string_replace_impl, replace_all as string_replace_all_impl,
+    slice as string_slice_impl, split as string_split_impl,
+    starts_with as string_starts_with_impl, substring as string_substring_impl,
+    to_lower_case as string_to_lower_case, to_upper_case as string_to_upper_case,
     trim as string_trim,
-    to_upper_case as string_to_upper_case,
-    to_lower_case as string_to_lower_case,
-    starts_with as string_starts_with_impl,
-    ends_with as string_ends_with_impl,
-    replace as string_replace_impl,
-    replace_all as string_replace_all_impl,
-    char_at as string_char_at_impl,
-    char_code_at as string_char_code_at_impl,
-    repeat as string_repeat_impl,
-    pad_start as string_pad_start_impl,
-    pad_end as string_pad_end_impl,
-    last_index_of as string_last_index_of_impl,
 };
 
 // Wrapper functions to maintain API compatibility
-pub fn array_push(arr: &Value, args: &[Value]) -> Value { array_push_impl(arr, args) }
-pub fn array_unshift(arr: &Value, args: &[Value]) -> Value { array_unshift_impl(arr, args) }
-pub fn array_index_of(arr: &Value, search: &Value) -> Value { array_index_of_impl(arr, search) }
+pub fn array_push(arr: &Value, args: &[Value]) -> Value {
+    array_push_impl(arr, args)
+}
+pub fn array_unshift(arr: &Value, args: &[Value]) -> Value {
+    array_unshift_impl(arr, args)
+}
+pub fn array_index_of(arr: &Value, search: &Value) -> Value {
+    array_index_of_impl(arr, search)
+}
 pub fn array_includes(arr: &Value, search: &Value, from: &Value) -> Value {
     array_includes_impl(arr, search, Some(from))
 }
-pub fn array_join(arr: &Value, sep: &Value) -> Value { array_join_impl(arr, sep) }
-pub fn array_splice(arr: &Value, start: &Value, delete_count: Option<&Value>, items: &[Value]) -> Value {
+pub fn array_join(arr: &Value, sep: &Value) -> Value {
+    array_join_impl(arr, sep)
+}
+pub fn array_splice(
+    arr: &Value,
+    start: &Value,
+    delete_count: Option<&Value>,
+    items: &[Value],
+) -> Value {
     array_splice_impl(arr, start, delete_count, items)
 }
-pub fn array_slice(arr: &Value, start: &Value, end: &Value) -> Value { array_slice_impl(arr, start, end) }
-pub fn array_concat(arr: &Value, args: &[Value]) -> Value { array_concat_impl(arr, args) }
-pub fn array_flat(arr: &Value, depth: &Value) -> Value { array_flat_impl(arr, depth) }
+pub fn array_slice(arr: &Value, start: &Value, end: &Value) -> Value {
+    array_slice_impl(arr, start, end)
+}
+pub fn array_concat(arr: &Value, args: &[Value]) -> Value {
+    array_concat_impl(arr, args)
+}
+pub fn array_flat(arr: &Value, depth: &Value) -> Value {
+    array_flat_impl(arr, depth)
+}
 
 pub fn array_sort(arr: &Value, comparator: Option<&Value>) -> Value {
     match comparator {
@@ -102,11 +100,21 @@ pub fn string_index_of(s: &Value, search: &Value, from: &Value) -> Value {
 pub fn string_includes(s: &Value, search: &Value, from: &Value) -> Value {
     string_includes_impl(s, search, Some(from))
 }
-pub fn string_slice(s: &Value, start: &Value, end: &Value) -> Value { string_slice_impl(s, start, end) }
-pub fn string_substring(s: &Value, start: &Value, end: &Value) -> Value { string_substring_impl(s, start, end) }
-pub fn string_split(s: &Value, sep: &Value) -> Value { string_split_impl(s, sep) }
-pub fn string_starts_with(s: &Value, search: &Value) -> Value { string_starts_with_impl(s, search) }
-pub fn string_ends_with(s: &Value, search: &Value) -> Value { string_ends_with_impl(s, search) }
+pub fn string_slice(s: &Value, start: &Value, end: &Value) -> Value {
+    string_slice_impl(s, start, end)
+}
+pub fn string_substring(s: &Value, start: &Value, end: &Value) -> Value {
+    string_substring_impl(s, start, end)
+}
+pub fn string_split(s: &Value, sep: &Value) -> Value {
+    string_split_impl(s, sep)
+}
+pub fn string_starts_with(s: &Value, search: &Value) -> Value {
+    string_starts_with_impl(s, search)
+}
+pub fn string_ends_with(s: &Value, search: &Value) -> Value {
+    string_ends_with_impl(s, search)
+}
 pub fn string_replace(s: &Value, search: &Value, replacement: &Value) -> Value {
     #[cfg(feature = "regex")]
     if matches!(search, Value::RegExp(_)) {
@@ -114,12 +122,24 @@ pub fn string_replace(s: &Value, search: &Value, replacement: &Value) -> Value {
     }
     string_replace_impl(s, search, replacement)
 }
-pub fn string_replace_all(s: &Value, search: &Value, replacement: &Value) -> Value { string_replace_all_impl(s, search, replacement) }
-pub fn string_char_at(s: &Value, idx: &Value) -> Value { string_char_at_impl(s, idx) }
-pub fn string_char_code_at(s: &Value, idx: &Value) -> Value { string_char_code_at_impl(s, idx) }
-pub fn string_repeat(s: &Value, count: &Value) -> Value { string_repeat_impl(s, count) }
-pub fn string_pad_start(s: &Value, target_len: &Value, pad: &Value) -> Value { string_pad_start_impl(s, target_len, pad) }
-pub fn string_pad_end(s: &Value, target_len: &Value, pad: &Value) -> Value { string_pad_end_impl(s, target_len, pad) }
+pub fn string_replace_all(s: &Value, search: &Value, replacement: &Value) -> Value {
+    string_replace_all_impl(s, search, replacement)
+}
+pub fn string_char_at(s: &Value, idx: &Value) -> Value {
+    string_char_at_impl(s, idx)
+}
+pub fn string_char_code_at(s: &Value, idx: &Value) -> Value {
+    string_char_code_at_impl(s, idx)
+}
+pub fn string_repeat(s: &Value, count: &Value) -> Value {
+    string_repeat_impl(s, count)
+}
+pub fn string_pad_start(s: &Value, target_len: &Value, pad: &Value) -> Value {
+    string_pad_start_impl(s, target_len, pad)
+}
+pub fn string_pad_end(s: &Value, target_len: &Value, pad: &Value) -> Value {
+    string_pad_end_impl(s, target_len, pad)
+}
 pub fn string_last_index_of(s: &Value, search: &Value, position: &Value) -> Value {
     string_last_index_of_impl(s, search, position)
 }
@@ -244,23 +264,59 @@ pub mod ops {
 }
 
 use tishlang_builtins::globals::{
-    array_is_array as builtins_array_is_array,
-    boolean as builtins_boolean,
-    decode_uri as builtins_decode_uri,
-    encode_uri as builtins_encode_uri,
-    is_finite as builtins_is_finite,
-    is_nan as builtins_is_nan,
-    object_assign as builtins_object_assign,
-    object_entries as builtins_object_entries,
-    object_from_entries as builtins_object_from_entries,
-    object_keys as builtins_object_keys,
+    array_is_array as builtins_array_is_array, boolean as builtins_boolean,
+    decode_uri as builtins_decode_uri, encode_uri as builtins_encode_uri,
+    is_finite as builtins_is_finite, is_nan as builtins_is_nan,
+    object_assign as builtins_object_assign, object_entries as builtins_object_entries,
+    object_from_entries as builtins_object_from_entries, object_keys as builtins_object_keys,
     object_values as builtins_object_values,
     string_from_char_code as builtins_string_from_char_code,
 };
-use tishlang_core::{
-    json_parse as core_json_parse,
-    json_stringify as core_json_stringify,
-};
+use tishlang_core::{json_parse as core_json_parse, json_stringify as core_json_stringify};
+
+/// Public JSON helpers used by codegen-emitted code (specifically the
+/// `_tish_write_json` impls on user-declared `type` aliases). Re-exporting
+/// from the runtime keeps the generated source decoupled from
+/// `tishlang_core` — generated code only ever names `tishlang_runtime`.
+pub mod json {
+    pub use tishlang_core::json_stringify_into as stringify_into;
+    /// Append the JSON-escaped contents of `s` (without surrounding
+    /// quotes) to `buf`. Used by typed-struct serialisers for `String`
+    /// fields. Falls through to `tishlang_core::json_stringify_into`'s
+    /// internal helper via a `Value::String` round-trip when the inner
+    /// helper isn't directly exposed.
+    pub fn escape_into(buf: &mut String, s: &str) {
+        // Inline the same escape rules as tishlang_core::json::
+        // `escape_json_string_into`. Kept locally so we don't widen
+        // tishlang_core's public surface unnecessarily.
+        let bytes = s.as_bytes();
+        let mut start = 0usize;
+        for (i, &b) in bytes.iter().enumerate() {
+            if b < 0x20 || b == b'"' || b == b'\\' {
+                if start < i {
+                    buf.push_str(&s[start..i]);
+                }
+                match b {
+                    b'"' => buf.push_str("\\\""),
+                    b'\\' => buf.push_str("\\\\"),
+                    b'\n' => buf.push_str("\\n"),
+                    b'\r' => buf.push_str("\\r"),
+                    b'\t' => buf.push_str("\\t"),
+                    b'\x08' => buf.push_str("\\b"),
+                    b'\x0c' => buf.push_str("\\f"),
+                    _ => {
+                        use std::fmt::Write;
+                        let _ = write!(buf, "\\u{:04x}", b as u32);
+                    }
+                }
+                start = i + 1;
+            }
+        }
+        if start < bytes.len() {
+            buf.push_str(&s[start..]);
+        }
+    }
+}
 
 /// Error type for Tish throw/catch.
 #[derive(Debug, Clone)]
@@ -290,14 +346,12 @@ enum LogLevel {
 static LOG_LEVEL: OnceLock<LogLevel> = OnceLock::new();
 
 fn get_log_level() -> LogLevel {
-    *LOG_LEVEL.get_or_init(|| {
-        match std::env::var("TISH_LOG_LEVEL").as_deref() {
-            Ok("debug") => LogLevel::Debug,
-            Ok("info") => LogLevel::Info,
-            Ok("warn") => LogLevel::Warn,
-            Ok("error") => LogLevel::Error,
-            _ => LogLevel::Log,
-        }
+    *LOG_LEVEL.get_or_init(|| match std::env::var("TISH_LOG_LEVEL").as_deref() {
+        Ok("debug") => LogLevel::Debug,
+        Ok("info") => LogLevel::Info,
+        Ok("warn") => LogLevel::Warn,
+        Ok("error") => LogLevel::Error,
+        _ => LogLevel::Log,
     })
 }
 
@@ -363,39 +417,59 @@ pub fn encode_uri(args: &[Value]) -> Value {
 
 // Math functions - use tishlang_builtins::math
 pub use tishlang_builtins::math::{
-    abs as tish_math_abs_impl,
-    sqrt as tish_math_sqrt_impl,
-    floor as tish_math_floor_impl,
-    ceil as tish_math_ceil_impl,
-    round as tish_math_round_impl,
-    sin as tish_math_sin_impl,
-    cos as tish_math_cos_impl,
-    tan as tish_math_tan_impl,
-    exp as tish_math_exp_impl,
-    trunc as tish_math_trunc_impl,
-    min as tish_math_min_impl,
-    max as tish_math_max_impl,
-    pow as tish_math_pow_impl,
-    sign as tish_math_sign_impl,
-    random as tish_math_random_impl,
+    abs as tish_math_abs_impl, ceil as tish_math_ceil_impl, cos as tish_math_cos_impl,
+    exp as tish_math_exp_impl, floor as tish_math_floor_impl, max as tish_math_max_impl,
+    min as tish_math_min_impl, pow as tish_math_pow_impl, random as tish_math_random_impl,
+    round as tish_math_round_impl, sign as tish_math_sign_impl, sin as tish_math_sin_impl,
+    sqrt as tish_math_sqrt_impl, tan as tish_math_tan_impl, trunc as tish_math_trunc_impl,
 };
 
 // Wrapper functions to maintain API (existing callers use math_* naming)
-pub fn math_abs(args: &[Value]) -> Value { tish_math_abs_impl(args) }
-pub fn math_sqrt(args: &[Value]) -> Value { tish_math_sqrt_impl(args) }
-pub fn math_floor(args: &[Value]) -> Value { tish_math_floor_impl(args) }
-pub fn math_ceil(args: &[Value]) -> Value { tish_math_ceil_impl(args) }
-pub fn math_round(args: &[Value]) -> Value { tish_math_round_impl(args) }
-pub fn math_min(args: &[Value]) -> Value { tish_math_min_impl(args) }
-pub fn math_max(args: &[Value]) -> Value { tish_math_max_impl(args) }
-pub fn math_sin(args: &[Value]) -> Value { tish_math_sin_impl(args) }
-pub fn math_cos(args: &[Value]) -> Value { tish_math_cos_impl(args) }
-pub fn math_tan(args: &[Value]) -> Value { tish_math_tan_impl(args) }
-pub fn math_exp(args: &[Value]) -> Value { tish_math_exp_impl(args) }
-pub fn math_trunc(args: &[Value]) -> Value { tish_math_trunc_impl(args) }
-pub fn math_pow(args: &[Value]) -> Value { tish_math_pow_impl(args) }
-pub fn math_sign(args: &[Value]) -> Value { tish_math_sign_impl(args) }
-pub fn math_random(args: &[Value]) -> Value { tish_math_random_impl(args) }
+pub fn math_abs(args: &[Value]) -> Value {
+    tish_math_abs_impl(args)
+}
+pub fn math_sqrt(args: &[Value]) -> Value {
+    tish_math_sqrt_impl(args)
+}
+pub fn math_floor(args: &[Value]) -> Value {
+    tish_math_floor_impl(args)
+}
+pub fn math_ceil(args: &[Value]) -> Value {
+    tish_math_ceil_impl(args)
+}
+pub fn math_round(args: &[Value]) -> Value {
+    tish_math_round_impl(args)
+}
+pub fn math_min(args: &[Value]) -> Value {
+    tish_math_min_impl(args)
+}
+pub fn math_max(args: &[Value]) -> Value {
+    tish_math_max_impl(args)
+}
+pub fn math_sin(args: &[Value]) -> Value {
+    tish_math_sin_impl(args)
+}
+pub fn math_cos(args: &[Value]) -> Value {
+    tish_math_cos_impl(args)
+}
+pub fn math_tan(args: &[Value]) -> Value {
+    tish_math_tan_impl(args)
+}
+pub fn math_exp(args: &[Value]) -> Value {
+    tish_math_exp_impl(args)
+}
+pub fn math_trunc(args: &[Value]) -> Value {
+    tish_math_trunc_impl(args)
+}
+pub fn math_pow(args: &[Value]) -> Value {
+    tish_math_pow_impl(args)
+}
+pub fn math_sign(args: &[Value]) -> Value {
+    tish_math_sign_impl(args)
+}
+pub fn math_random(args: &[Value]) -> Value {
+    tish_math_random_impl(args)
+}
 
 pub fn math_log(args: &[Value]) -> Value {
     let n = extract_num(args.first()).unwrap_or(f64::NAN);
@@ -408,7 +482,10 @@ pub fn json_stringify(args: &[Value]) -> Value {
 }
 
 pub fn json_parse(args: &[Value]) -> Value {
-    let s = args.first().map(|v| v.to_display_string()).unwrap_or_default();
+    let s = args
+        .first()
+        .map(|v| v.to_display_string())
+        .unwrap_or_default();
     core_json_parse(&s).unwrap_or(Value::Null)
 }
 
@@ -431,10 +508,13 @@ pub fn string_from_char_code(args: &[Value]) -> Value {
 
 #[cfg(feature = "process")]
 pub fn process_exit(args: &[Value]) -> Value {
-    let code = args.first().and_then(|v| match v {
-        Value::Number(n) => Some(*n as i32),
-        _ => None,
-    }).unwrap_or(0);
+    let code = args
+        .first()
+        .and_then(|v| match v {
+            Value::Number(n) => Some(*n as i32),
+            _ => None,
+        })
+        .unwrap_or(0);
     std::process::exit(code);
 }
 
@@ -449,7 +529,10 @@ pub fn process_cwd(_args: &[Value]) -> Value {
 #[cfg(feature = "process")]
 pub fn process_exec(args: &[Value]) -> Value {
     use std::process::Command;
-    let cmd = args.first().map(|v| v.to_display_string()).unwrap_or_default();
+    let cmd = args
+        .first()
+        .map(|v| v.to_display_string())
+        .unwrap_or_default();
     if cmd.is_empty() {
         return Value::Number(0.0);
     }
@@ -461,7 +544,10 @@ pub fn process_exec(args: &[Value]) -> Value {
 
 #[cfg(feature = "fs")]
 pub fn read_file(args: &[Value]) -> Value {
-    let path = args.first().map(|v| v.to_display_string()).unwrap_or_default();
+    let path = args
+        .first()
+        .map(|v| v.to_display_string())
+        .unwrap_or_default();
     match std::fs::read_to_string(&path) {
         Ok(content) => Value::String(content.into()),
         Err(e) => make_error_value(e),
@@ -470,8 +556,14 @@ pub fn read_file(args: &[Value]) -> Value {
 
 #[cfg(feature = "fs")]
 pub fn write_file(args: &[Value]) -> Value {
-    let path = args.first().map(|v| v.to_display_string()).unwrap_or_default();
-    let content = args.get(1).map(|v| v.to_display_string()).unwrap_or_default();
+    let path = args
+        .first()
+        .map(|v| v.to_display_string())
+        .unwrap_or_default();
+    let content = args
+        .get(1)
+        .map(|v| v.to_display_string())
+        .unwrap_or_default();
     match std::fs::write(&path, &content) {
         Ok(()) => Value::Bool(true),
         Err(e) => make_error_value(e),
@@ -480,13 +572,19 @@ pub fn write_file(args: &[Value]) -> Value {
 
 #[cfg(feature = "fs")]
 pub fn file_exists(args: &[Value]) -> Value {
-    let path = args.first().map(|v| v.to_display_string()).unwrap_or_default();
+    let path = args
+        .first()
+        .map(|v| v.to_display_string())
+        .unwrap_or_default();
     Value::Bool(std::path::Path::new(&path).exists())
 }
 
 #[cfg(feature = "fs")]
 pub fn is_dir(args: &[Value]) -> Value {
-    let path = args.first().map(|v| v.to_display_string()).unwrap_or_default();
+    let path = args
+        .first()
+        .map(|v| v.to_display_string())
+        .unwrap_or_default();
     Value::Bool(std::path::Path::new(&path).is_dir())
 }
 
@@ -494,14 +592,17 @@ pub fn is_dir(args: &[Value]) -> Value {
 pub fn read_dir(args: &[Value]) -> Value {
     use std::cell::RefCell;
     use std::rc::Rc;
-    let path = args.first().map(|v| v.to_display_string()).unwrap_or_else(|| ".".to_string());
+    let path = args
+        .first()
+        .map(|v| v.to_display_string())
+        .unwrap_or_else(|| ".".to_string());
     match std::fs::read_dir(&path) {
         Ok(entries) => {
             let files: Vec<Value> = entries
                 .filter_map(|e| e.ok())
                 .map(|e| Value::String(e.file_name().to_string_lossy().into()))
                 .collect();
-            Value::Array(Rc::new(RefCell::new(files)))
+            Value::Array(VmRef::new(files))
         }
         Err(e) => make_error_value(e),
     }
@@ -509,7 +610,10 @@ pub fn read_dir(args: &[Value]) -> Value {
 
 #[cfg(feature = "fs")]
 pub fn mkdir(args: &[Value]) -> Value {
-    let path = args.first().map(|v| v.to_display_string()).unwrap_or_default();
+    let path = args
+        .first()
+        .map(|v| v.to_display_string())
+        .unwrap_or_default();
     match std::fs::create_dir_all(&path) {
         Ok(()) => Value::Bool(true),
         Err(e) => make_error_value(e),
@@ -523,8 +627,12 @@ pub fn get_prop(obj: &Value, key: impl AsRef<str>) -> Value {
     let key = key.as_ref();
     match obj {
         Value::Object(map) => {
-            let k: Arc<str> = key.into();
-            map.borrow().get(&k).cloned().unwrap_or(Value::Null)
+            // The map's key type is `Arc<str>`, which implements
+            // `Borrow<str>` — so we can look up with a borrowed `&str`
+            // directly. Previously we allocated a fresh `Arc<str>` on
+            // every call (one heap alloc per `r.field` read in tight
+            // handler loops); this version is alloc-free on the hit path.
+            map.borrow().get(key).cloned().unwrap_or(Value::Null)
         }
         Value::Array(arr) => {
             if key == "length" {
@@ -544,17 +652,17 @@ pub fn get_prop(obj: &Value, key: impl AsRef<str>) -> Value {
         }
         #[cfg(feature = "regex")]
         Value::RegExp(re) => {
-            let re = Rc::clone(re);
+            let re = re.clone();
             if key == "exec" {
-                Value::Function(Rc::new(move |args: &[Value]| {
+                Value::native(move |args: &[Value]| {
                     let input = args.first().unwrap_or(&Value::Null);
-                    regexp_exec(&Value::RegExp(Rc::clone(&re)), input)
-                }))
+                    regexp_exec(&Value::RegExp(re.clone()), input)
+                })
             } else if key == "test" {
-                Value::Function(Rc::new(move |args: &[Value]| {
+                Value::native(move |args: &[Value]| {
                     let input = args.first().unwrap_or(&Value::Null);
-                    regexp_test(&Value::RegExp(Rc::clone(&re)), input)
-                }))
+                    regexp_test(&Value::RegExp(re.clone()), input)
+                })
             } else {
                 Value::Null
             }
@@ -593,7 +701,15 @@ pub fn get_index(obj: &Value, index: &Value) -> Value {
 pub fn set_prop(obj: &Value, key: &str, val: Value) -> Value {
     match obj {
         Value::Object(map) => {
-            map.borrow_mut().insert(Arc::from(key), val.clone());
+            // Try the in-place update path first: if the key already
+            // exists we re-use the existing `Arc<str>` and skip the
+            // alloc. Only newly-inserted keys pay for `Arc::from(key)`.
+            let mut m = map.borrow_mut();
+            if let Some(slot) = m.get_mut(key) {
+                *slot = val.clone();
+            } else {
+                m.insert(Arc::from(key), val.clone());
+            }
             val
         }
         _ => panic!("Cannot assign property on non-object"),
@@ -634,7 +750,7 @@ pub fn in_operator(key: &Value, obj: &Value) -> Value {
         Value::Number(n) => n.to_string().into(),
         _ => return Value::Bool(false),
     };
-    
+
     let result = match obj {
         Value::Object(map) => map.borrow().contains_key(&key_str),
         Value::Array(arr) => {
@@ -647,7 +763,7 @@ pub fn in_operator(key: &Value, obj: &Value) -> Value {
         }
         _ => false,
     };
-    
+
     Value::Bool(result)
 }
 
@@ -679,10 +795,18 @@ mod promise_io;
 #[cfg(feature = "http")]
 mod http;
 
+#[cfg(feature = "http")]
+mod http_prefork;
+
+#[cfg(feature = "http-io-uring")]
+mod http_io_uring;
+
+#[cfg(feature = "http-hyper")]
+mod http_hyper;
+
 #[cfg(feature = "http")]
 mod http_fetch;
 
-#[cfg(any(feature = "http", feature = "ws"))]
 mod timers;
 
 #[cfg(feature = "http")]
@@ -696,29 +820,88 @@ mod ws;
 
 #[cfg(feature = "ws")]
 pub use ws::{
-    web_socket_client, web_socket_server_accept, web_socket_server_construct, web_socket_server_listen,
-    ws_broadcast_native, ws_send_native,
+    web_socket_client, web_socket_server_accept, web_socket_server_construct,
+    web_socket_server_listen, ws_broadcast_native, ws_send_native,
 };
 
 #[cfg(feature = "http")]
 pub use http::{
-    await_fetch as http_await_fetch,
-    await_fetch_all as http_await_fetch_all,
-    serve as http_serve,
+    await_fetch as http_await_fetch, await_fetch_all as http_await_fetch_all,
+    register_static_route,
 };
 
-#[cfg(any(feature = "http", feature = "ws"))]
-pub use timers::{set_timeout as timer_set_timeout, clear_timeout as timer_clear_timeout};
+// `serve` is the user-facing entry point for Tish's HTTP server. By default
+// it uses the tiny_http + SO_REUSEPORT path in `http.rs`. When compiled with
+// `--features http-hyper` and the `TISH_HTTP_BACKEND=hyper` env var is set
+// at runtime, it dispatches to the hyper backend in `http_hyper.rs`.
+//
+// The env-var switch (rather than a cargo feature switch) means one built
+// binary can toggle backends for A/B benchmarking and production rollout
+// without rebuilding. When `http-hyper` is not compiled in, the switch is a
+// no-op and the tiny_http path is used unconditionally.
+#[cfg(feature = "http")]
+pub fn http_serve<F>(args: &[tishlang_core::Value], handler: F) -> tishlang_core::Value
+where
+    F: Fn(&[tishlang_core::Value]) -> tishlang_core::Value + Send + Sync + 'static,
+{
+    #[cfg(feature = "http-hyper")]
+    {
+        if http_hyper::is_enabled_via_env() {
+            return http_hyper::serve(args, handler);
+        }
+    }
+    http::serve(args, handler)
+}
 
+/// `serve(port, { onWorker: (workerId) => handler })` — the object form of
+/// `serve`. Picks up `onWorker`, invokes it once per HTTP accept thread to
+/// build that thread's handler, then enters the normal parallel accept
+/// loop. See [`http::serve_per_worker`] for the full doc.
+///
+/// This is broadly useful for any Tish app that wants per-worker state —
+/// DB connection pools, in-process caches, counters, etc. — without a
+/// global `RwLock` or forcing everything through the single-thread
+/// dispatcher. It also plays nicely with prefork: `onWorker` sees global
+/// worker ids across processes so logs and sharded state are easy to key.
 #[cfg(feature = "http")]
-pub use promise::promise_object;
+pub fn http_serve_per_worker(
+    args: &[tishlang_core::Value],
+    factory_value: tishlang_core::Value,
+) -> tishlang_core::Value {
+    use tishlang_core::Value;
+    // factory_value should be Value::Function (passed down by codegen after
+    // extracting `onWorker` from the options object).
+    let Value::Function(factory) = factory_value else {
+        eprintln!("[tish http] serve: onWorker must be a function (id) => handler");
+        return Value::Null;
+    };
+    let factory: tishlang_core::NativeFn = factory;
+    http::serve_per_worker(args, move |worker_id| {
+        let handler_val = factory(&[Value::Number(worker_id as f64)]);
+        match handler_val {
+            Value::Function(f) => f,
+            _ => panic!(
+                "onWorker returned {:?} for worker {}; must return a function",
+                handler_val, worker_id
+            ),
+        }
+    })
+}
+
+pub use timers::{
+    clear_interval as timer_clear_interval, clear_timeout as timer_clear_timeout, drain_timers,
+    set_interval as timer_set_interval, set_timeout as timer_set_timeout,
+};
+
+#[cfg(feature = "http")]
+pub use promise::{promise_instance_catch, promise_instance_then, promise_object};
 
 #[cfg(feature = "http")]
 pub use native_promise::{await_promise, fetch_all_promise, fetch_async_promise, fetch_promise};
 
 // RegExp Support
 #[cfg(feature = "regex")]
-pub use tishlang_core::{TishRegExp, RegExpFlags};
+pub use tishlang_core::{RegExpFlags, TishRegExp};
 
 #[cfg(feature = "regex")]
 pub fn regexp_new(args: &[Value]) -> Value {
@@ -735,7 +918,7 @@ pub fn regexp_new(args: &[Value]) -> Value {
     };
 
     match TishRegExp::new(&pattern, &flags) {
-        Ok(re) => Value::RegExp(Rc::new(RefCell::new(re))),
+        Ok(re) => Value::RegExp(VmRef::new(re)),
         Err(e) => {
             eprintln!("RegExp error: {}", e);
             Value::Null
@@ -816,7 +999,7 @@ fn regexp_exec_impl(re: &mut tishlang_core::TishRegExp, input: &str) -> Value {
                 };
             }
 
-            Value::Object(Rc::new(RefCell::new(obj)))
+            Value::Object(VmRef::new(obj))
         }
         Ok(None) | Err(_) => {
             if re.flags.global || re.flags.sticky {
@@ -831,12 +1014,12 @@ fn regexp_exec_impl(re: &mut tishlang_core::TishRegExp, input: &str) -> Value {
 pub fn string_split_regex(s: &Value, separator: &Value, limit: Option<usize>) -> Value {
     let input = match s {
         Value::String(s) => s.as_ref(),
-        _ => return Value::Array(Rc::new(RefCell::new(vec![s.clone()]))),
+        _ => return Value::Array(VmRef::new(vec![s.clone()])),
     };
-    
+
     let max = limit.unwrap_or(usize::MAX);
     if max == 0 {
-        return Value::Array(Rc::new(RefCell::new(Vec::new())));
+        return Value::Array(VmRef::new(Vec::new()));
     }
 
     match separator {
@@ -844,32 +1027,34 @@ pub fn string_split_regex(s: &Value, separator: &Value, limit: Option<usize>) ->
             let re = re.borrow();
             let mut result = Vec::new();
             let mut last_end = 0;
-            
+
             for mat in re.regex.find_iter(input) {
                 match mat {
                     Ok(m) => {
-                        if result.len() >= max - 1 { break; }
+                        if result.len() >= max - 1 {
+                            break;
+                        }
                         result.push(Value::String(input[last_end..m.start()].into()));
                         last_end = m.end();
                     }
                     Err(_) => break,
                 }
             }
-            
+
             if result.len() < max {
                 result.push(Value::String(input[last_end..].into()));
             }
-            
-            Value::Array(Rc::new(RefCell::new(result)))
+
+            Value::Array(VmRef::new(result))
         }
         Value::String(sep) => {
             let parts: Vec<Value> = input
                 .splitn(max, sep.as_ref())
                 .map(|s| Value::String(s.into()))
                 .collect();
-            Value::Array(Rc::new(RefCell::new(parts)))
+            Value::Array(VmRef::new(parts))
         }
-        _ => Value::Array(Rc::new(RefCell::new(vec![Value::String(input.into())]))),
+        _ => Value::Array(VmRef::new(vec![Value::String(input.into())])),
     }
 }
 
@@ -883,11 +1068,11 @@ pub fn string_match_regex(s: &Value, regexp: &Value) -> Value {
     match regexp {
         Value::RegExp(re) => {
             let mut re = re.borrow_mut();
-            
+
             if re.flags.global {
                 let mut matches = Vec::new();
                 re.last_index = 0;
-                
+
                 while let Ok(Some(m)) = re.regex.find_from_pos(input, re.last_index) {
                     matches.push(Value::String(m.as_str().into()));
                     if m.start() == m.end() {
@@ -895,22 +1080,26 @@ pub fn string_match_regex(s: &Value, regexp: &Value) -> Value {
                     } else {
                         re.last_index = m.end();
                     }
-                    if re.last_index > input.len() { break; }
+                    if re.last_index > input.len() {
+                        break;
+                    }
                 }
-                
+
                 re.last_index = 0;
-                
-                if matches.is_empty() { Value::Null } else { Value::Array(Rc::new(RefCell::new(matches))) }
+
+                if matches.is_empty() {
+                    Value::Null
+                } else {
+                    Value::Array(VmRef::new(matches))
+                }
             } else {
                 regexp_exec_impl(&mut re, input)
             }
         }
-        Value::String(pattern) => {
-            match tishlang_core::TishRegExp::new(pattern, "") {
-                Ok(mut re) => regexp_exec_impl(&mut re, input),
-                Err(_) => Value::Null,
-            }
-        }
+        Value::String(pattern) => match tishlang_core::TishRegExp::new(pattern, "") {
+            Ok(mut re) => regexp_exec_impl(&mut re, input),
+            Err(_) => Value::Null,
+        },
         _ => Value::Null,
     }
 }
@@ -997,19 +1186,16 @@ pub fn string_search_regex(s: &Value, regexp: &Value) -> Value {
                 _ => Value::Number(-1.0),
             }
         }
-        Value::String(pattern) => {
-
-            match tishlang_core::TishRegExp::new(pattern, "") {
-                Ok(re) => match re.regex.find(input) {
-                    Ok(Some(m)) => {
-                        let char_index = input[..m.start()].chars().count();
-                        Value::Number(char_index as f64)
-                    }
-                    _ => Value::Number(-1.0),
-                },
-                Err(_) => Value::Number(-1.0),
-            }
-        }
+        Value::String(pattern) => match tishlang_core::TishRegExp::new(pattern, "") {
+            Ok(re) => match re.regex.find(input) {
+                Ok(Some(m)) => {
+                    let char_index = input[..m.start()].chars().count();
+                    Value::Number(char_index as f64)
+                }
+                _ => Value::Number(-1.0),
+            },
+            Err(_) => Value::Number(-1.0),
+        },
         _ => Value::Number(-1.0),
     }
 }