@tishlang/tish 2.12.0 → 2.16.13

package/crates/tish_builtins/src/array.rs

@@ -9,6 +9,44 @@ pub fn from_vec(v: Vec<Value>) -> Value {
     Value::Array(VmRef::new(v))
 }
 
+/// Snapshot an array `Value` into an owned `Vec<Value>` (one clone of the backing store),
+/// handling both the boxed [`Value::Array`] and packed [`Value::NumberArray`] reps. Non-array
+/// values snapshot as empty. Used by the fused HOF-chain lowering (#317): the chain iterates this
+/// snapshot once, so a `.filter(...).map(...).reduce(...)` runs as a single native loop with no
+/// per-stage intermediate array and no per-element boxed `value_call`. Cloning up front (rather
+/// than holding a borrow) keeps the fused body free to read the source array safely.
+pub fn snapshot_values(arr: &Value) -> Vec<Value> {
+    match arr {
+        Value::Array(a) => a.borrow().clone(),
+        Value::NumberArray(a) => a.borrow().iter().map(|&n| Value::Number(n)).collect(),
+        _ => Vec::new(),
+    }
+}
+
+/// If `arr` is an array whose every element is a `Value::Number`, return an owned `Vec<f64>`
+/// snapshot; otherwise return `None`. Packed [`Value::NumberArray`] is all-numeric by construction
+/// (one clone, no scan). A boxed [`Value::Array`] is scanned once — built by `[].push(n)`, the
+/// dominant numeric-pipeline source stays a boxed `Array`, so the scan unlocks the fused HOF chain's
+/// unboxed f64 fast path for it too. The `None` result drives the fused lowering back to its boxed
+/// loop, so any non-numeric element is handled with identical `Value` semantics.
+pub fn as_f64_snapshot(arr: &Value) -> Option<Vec<f64>> {
+    match arr {
+        Value::NumberArray(a) => Some(a.borrow().clone()),
+        Value::Array(a) => {
+            let b = a.borrow();
+            let mut out: Vec<f64> = Vec::with_capacity(b.len());
+            for v in b.iter() {
+                match v {
+                    Value::Number(n) => out.push(*n),
+                    _ => return None,
+                }
+            }
+            Some(out)
+        }
+        _ => None,
+    }
+}
+
 /// Get the length of an array.
 pub fn len(arr: &Value) -> Option<usize> {
     match arr {
@@ -307,15 +345,20 @@ pub fn map(arr: &Value, callback: &Value) -> Value {
     // boxed array on the FIRST non-numeric callback result; every element's callback still runs
     // exactly once, in index order (the deopt resumes at `i + 1`).
     if let Some((data, cb)) = packed_snapshot(arr, callback) {
+        // JS passes `(element, index, array)`; `arr_value` is the receiver, cloned per call (a cheap
+        // VmRef refcount bump). A callback that ignores the 3rd param is unaffected.
+        let arr_value = arr.clone();
         let mut nums: Vec<f64> = Vec::with_capacity(data.len());
         for (i, &n) in data.iter().enumerate() {
-            match cb.call(&[Value::Number(n), Value::Number(i as f64)]) {
+            if tishlang_core::has_pending_throw() { return packed_or_empty(nums); } // #303
+            match cb.call(&[Value::Number(n), Value::Number(i as f64), arr_value.clone()]) {
                 Value::Number(r) => nums.push(r),
                 other => {
                     let mut boxed: Vec<Value> = nums.into_iter().map(Value::Number).collect();
                     boxed.push(other);
                     for (j, &m) in data.iter().enumerate().skip(i + 1) {
-                        boxed.push(cb.call(&[Value::Number(m), Value::Number(j as f64)]));
+                        if tishlang_core::has_pending_throw() { break; } // #303
+                        boxed.push(cb.call(&[Value::Number(m), Value::Number(j as f64), arr_value.clone()]));
                     }
                     return Value::Array(VmRef::new(boxed));
                 }
@@ -325,12 +368,17 @@ pub fn map(arr: &Value, callback: &Value) -> Value {
     }
     let arr = as_boxed_array(arr); let arr = &*arr;
     if let (Value::Array(arr), Value::Function(cb)) = (arr, callback) {
-        let arr_borrow = arr.borrow();
-        let result: Vec<Value> = arr_borrow
-            .iter()
-            .enumerate()
-            .map(|(i, v)| cb.call(&[v.clone(), Value::Number(i as f64)]))
-            .collect();
+        // #382: snapshot the backing store and DROP the borrow before running any callback — a
+        // callback that re-enters this same array (`arr.map(x => arr.length)`) would otherwise
+        // deadlock (Mutex, send-values) or panic (RefCell). Matches the packed path's copy semantics.
+        let arr_borrow = arr.borrow().clone();
+        let arr_value = Value::Array(arr.clone()); // 3rd callback arg (JS `array`)
+        // #303: stop on a pending throw from the callback (don't map the rest of the array).
+        let mut result: Vec<Value> = Vec::with_capacity(arr_borrow.len());
+        for (i, v) in arr_borrow.iter().enumerate() {
+            if tishlang_core::has_pending_throw() { break; }
+            result.push(cb.call(&[v.clone(), Value::Number(i as f64), arr_value.clone()]));
+        }
         Value::Array(VmRef::new(result))
     } else {
         Value::Null
@@ -341,9 +389,11 @@ pub fn filter(arr: &Value, callback: &Value) -> Value {
     // Packed fast path: `filter` keeps a SUBSET of the input f64s, so the result is always numeric —
     // build the packed `Vec<f64>` directly, no boxed intermediate, and hand back a `NumberArray`.
     if let Some((data, cb)) = packed_snapshot(arr, callback) {
+        let arr_value = arr.clone(); // 3rd callback arg (JS `array`)
         let mut out: Vec<f64> = Vec::new();
         for (i, &n) in data.iter().enumerate() {
-            if cb.call(&[Value::Number(n), Value::Number(i as f64)]).is_truthy() {
+            if tishlang_core::has_pending_throw() { break; } // #303
+            if cb.call(&[Value::Number(n), Value::Number(i as f64), arr_value.clone()]).is_truthy() {
                 out.push(n);
             }
         }
@@ -351,19 +401,16 @@ pub fn filter(arr: &Value, callback: &Value) -> Value {
     }
     let arr = as_boxed_array(arr); let arr = &*arr;
     if let (Value::Array(arr), Value::Function(cb)) = (arr, callback) {
-        let arr_borrow = arr.borrow();
-        let result: Vec<Value> = arr_borrow
-            .iter()
-            .enumerate()
-            .filter_map(|(i, v)| {
-                let keep = cb.call(&[v.clone(), Value::Number(i as f64)]);
-                if keep.is_truthy() {
-                    Some(v.clone())
-                } else {
-                    None
-                }
-            })
-            .collect();
+        let arr_borrow = arr.borrow().clone(); // #382: snapshot; drop the guard before any callback
+        let arr_value = Value::Array(arr.clone()); // 3rd callback arg (JS `array`)
+        // #303: stop on a pending throw from the predicate (don't test the rest of the array).
+        let mut result: Vec<Value> = Vec::new();
+        for (i, v) in arr_borrow.iter().enumerate() {
+            if tishlang_core::has_pending_throw() { break; }
+            if cb.call(&[v.clone(), Value::Number(i as f64), arr_value.clone()]).is_truthy() {
+                result.push(v.clone());
+            }
+        }
         Value::Array(VmRef::new(result))
     } else {
         Value::Null
@@ -374,6 +421,8 @@ pub fn reduce(arr: &Value, callback: &Value, initial: &Value) -> Value {
     // Packed fast path: fold the `Vec<f64>` snapshot directly. Same no-initial rule as the boxed
     // path (absent init → first element as the seed, scan from index 1).
     if let Some((data, cb)) = packed_snapshot(arr, callback) {
+        // `reduce` passes `(accumulator, element, index, array)` — the array is the 4th arg.
+        let arr_value = arr.clone();
         let (start_idx, mut acc) = if matches!(initial, Value::Null) && !data.is_empty() {
             (1usize, Value::Number(data[0]))
         } else {
@@ -381,13 +430,15 @@ pub fn reduce(arr: &Value, callback: &Value, initial: &Value) -> Value {
         };
         // `skip(start_idx)` preserves the true element index for the callback's 3rd arg.
         for (i, &x) in data.iter().enumerate().skip(start_idx) {
-            acc = cb.call(&[acc, Value::Number(x), Value::Number(i as f64)]);
+            if tishlang_core::has_pending_throw() { return acc; } // #303
+            acc = cb.call(&[acc, Value::Number(x), Value::Number(i as f64), arr_value.clone()]);
         }
         return acc;
     }
     let arr = as_boxed_array(arr); let arr = &*arr;
     if let (Value::Array(arr), Value::Function(cb)) = (arr, callback) {
-        let arr_borrow = arr.borrow();
+        let arr_borrow = arr.borrow().clone(); // #382: snapshot; drop the guard before any callback
+        let arr_value = Value::Array(arr.clone()); // 4th callback arg (JS `array`)
         let len = arr_borrow.len();
         let (start_idx, mut acc) = if matches!(initial, Value::Null) && !arr_borrow.is_empty() {
             // No initial value: use first element as acc, start from index 1
@@ -396,8 +447,9 @@ pub fn reduce(arr: &Value, callback: &Value, initial: &Value) -> Value {
             (0, initial.clone())
         };
         for i in start_idx..len {
+            if tishlang_core::has_pending_throw() { return acc; } // #303
             let v = arr_borrow[i].clone();
-            acc = cb.call(&[acc, v.clone(), Value::Number(i as f64)]);
+            acc = cb.call(&[acc, v.clone(), Value::Number(i as f64), arr_value.clone()]);
         }
         acc
     } else {
@@ -407,16 +459,20 @@ pub fn reduce(arr: &Value, callback: &Value, initial: &Value) -> Value {
 
 pub fn for_each(arr: &Value, callback: &Value) -> Value {
     if let Some((data, cb)) = packed_snapshot(arr, callback) {
+        let arr_value = arr.clone(); // 3rd callback arg (JS `array`)
         for (i, &n) in data.iter().enumerate() {
-            cb.call(&[Value::Number(n), Value::Number(i as f64)]);
+            if tishlang_core::has_pending_throw() { return Value::Null; } // #303
+            cb.call(&[Value::Number(n), Value::Number(i as f64), arr_value.clone()]);
         }
         return Value::Null;
     }
     let arr = as_boxed_array(arr); let arr = &*arr;
     if let (Value::Array(arr), Value::Function(cb)) = (arr, callback) {
-        let arr_borrow = arr.borrow();
+        let arr_borrow = arr.borrow().clone(); // #382: snapshot; drop the guard before any callback
+        let arr_value = Value::Array(arr.clone()); // 3rd callback arg (JS `array`)
         for (i, v) in arr_borrow.iter().enumerate() {
-            cb.call(&[v.clone(), Value::Number(i as f64)]);
+            if tishlang_core::has_pending_throw() { break; } // #303
+            cb.call(&[v.clone(), Value::Number(i as f64), arr_value.clone()]);
         }
     }
     Value::Null
@@ -424,8 +480,10 @@ pub fn for_each(arr: &Value, callback: &Value) -> Value {
 
 pub fn find(arr: &Value, callback: &Value) -> Value {
     if let Some((data, cb)) = packed_snapshot(arr, callback) {
+        let arr_value = arr.clone(); // 3rd callback arg (JS `array`)
         for (i, &n) in data.iter().enumerate() {
-            if cb.call(&[Value::Number(n), Value::Number(i as f64)]).is_truthy() {
+            if tishlang_core::has_pending_throw() { break; } // #303
+            if cb.call(&[Value::Number(n), Value::Number(i as f64), arr_value.clone()]).is_truthy() {
                 return Value::Number(n);
             }
         }
@@ -433,9 +491,11 @@ pub fn find(arr: &Value, callback: &Value) -> Value {
     }
     let arr = as_boxed_array(arr); let arr = &*arr;
     if let (Value::Array(arr), Value::Function(cb)) = (arr, callback) {
-        let arr_borrow = arr.borrow();
+        let arr_borrow = arr.borrow().clone(); // #382: snapshot; drop the guard before any callback
+        let arr_value = Value::Array(arr.clone()); // 3rd callback arg (JS `array`)
         for (i, v) in arr_borrow.iter().enumerate() {
-            let result = cb.call(&[v.clone(), Value::Number(i as f64)]);
+            if tishlang_core::has_pending_throw() { break; } // #303
+            let result = cb.call(&[v.clone(), Value::Number(i as f64), arr_value.clone()]);
             if result.is_truthy() {
                 return v.clone();
             }
@@ -446,8 +506,10 @@ pub fn find(arr: &Value, callback: &Value) -> Value {
 
 pub fn find_index(arr: &Value, callback: &Value) -> Value {
     if let Some((data, cb)) = packed_snapshot(arr, callback) {
+        let arr_value = arr.clone(); // 3rd callback arg (JS `array`)
         for (i, &n) in data.iter().enumerate() {
-            if cb.call(&[Value::Number(n), Value::Number(i as f64)]).is_truthy() {
+            if tishlang_core::has_pending_throw() { break; } // #303
+            if cb.call(&[Value::Number(n), Value::Number(i as f64), arr_value.clone()]).is_truthy() {
                 return Value::Number(i as f64);
             }
         }
@@ -455,9 +517,11 @@ pub fn find_index(arr: &Value, callback: &Value) -> Value {
     }
     let arr = as_boxed_array(arr); let arr = &*arr;
     if let (Value::Array(arr), Value::Function(cb)) = (arr, callback) {
-        let arr_borrow = arr.borrow();
+        let arr_borrow = arr.borrow().clone(); // #382: snapshot; drop the guard before any callback
+        let arr_value = Value::Array(arr.clone()); // 3rd callback arg (JS `array`)
         for (i, v) in arr_borrow.iter().enumerate() {
-            let result = cb.call(&[v.clone(), Value::Number(i as f64)]);
+            if tishlang_core::has_pending_throw() { break; } // #303
+            let result = cb.call(&[v.clone(), Value::Number(i as f64), arr_value.clone()]);
             if result.is_truthy() {
                 return Value::Number(i as f64);
             }
@@ -470,9 +534,11 @@ pub fn find_index(arr: &Value, callback: &Value) -> Value {
 /// the original index. Returns `null` (JS `undefined`) when nothing matches. #247
 pub fn find_last(arr: &Value, callback: &Value) -> Value {
     if let Some((data, cb)) = packed_snapshot(arr, callback) {
+        let arr_value = arr.clone(); // 3rd callback arg (JS `array`)
         for i in (0..data.len()).rev() {
+            if tishlang_core::has_pending_throw() { break; } // #303
             if cb
-                .call(&[Value::Number(data[i]), Value::Number(i as f64)])
+                .call(&[Value::Number(data[i]), Value::Number(i as f64), arr_value.clone()])
                 .is_truthy()
             {
                 return Value::Number(data[i]);
@@ -483,10 +549,12 @@ pub fn find_last(arr: &Value, callback: &Value) -> Value {
     let arr = as_boxed_array(arr);
     let arr = &*arr;
     if let (Value::Array(arr), Value::Function(cb)) = (arr, callback) {
-        let arr_borrow = arr.borrow();
+        let arr_borrow = arr.borrow().clone(); // #382: snapshot; drop the guard before any callback
+        let arr_value = Value::Array(arr.clone()); // 3rd callback arg (JS `array`)
         for i in (0..arr_borrow.len()).rev() {
+            if tishlang_core::has_pending_throw() { break; } // #303
             let v = &arr_borrow[i];
-            if cb.call(&[v.clone(), Value::Number(i as f64)]).is_truthy() {
+            if cb.call(&[v.clone(), Value::Number(i as f64), arr_value.clone()]).is_truthy() {
                 return v.clone();
             }
         }
@@ -497,9 +565,11 @@ pub fn find_last(arr: &Value, callback: &Value) -> Value {
 /// `Array.prototype.findLastIndex` — like [`find_index`] but from the end; `-1` if no match. #247
 pub fn find_last_index(arr: &Value, callback: &Value) -> Value {
     if let Some((data, cb)) = packed_snapshot(arr, callback) {
+        let arr_value = arr.clone(); // 3rd callback arg (JS `array`)
         for i in (0..data.len()).rev() {
+            if tishlang_core::has_pending_throw() { break; } // #303
             if cb
-                .call(&[Value::Number(data[i]), Value::Number(i as f64)])
+                .call(&[Value::Number(data[i]), Value::Number(i as f64), arr_value.clone()])
                 .is_truthy()
             {
                 return Value::Number(i as f64);
@@ -510,10 +580,12 @@ pub fn find_last_index(arr: &Value, callback: &Value) -> Value {
     let arr = as_boxed_array(arr);
     let arr = &*arr;
     if let (Value::Array(arr), Value::Function(cb)) = (arr, callback) {
-        let arr_borrow = arr.borrow();
+        let arr_borrow = arr.borrow().clone(); // #382: snapshot; drop the guard before any callback
+        let arr_value = Value::Array(arr.clone()); // 3rd callback arg (JS `array`)
         for i in (0..arr_borrow.len()).rev() {
+            if tishlang_core::has_pending_throw() { break; } // #303
             if cb
-                .call(&[arr_borrow[i].clone(), Value::Number(i as f64)])
+                .call(&[arr_borrow[i].clone(), Value::Number(i as f64), arr_value.clone()])
                 .is_truthy()
             {
                 return Value::Number(i as f64);
@@ -545,8 +617,10 @@ pub fn at(arr: &Value, index: &Value) -> Value {
 
 pub fn some(arr: &Value, callback: &Value) -> Value {
     if let Some((data, cb)) = packed_snapshot(arr, callback) {
+        let arr_value = arr.clone(); // 3rd callback arg (JS `array`)
         for (i, &n) in data.iter().enumerate() {
-            if cb.call(&[Value::Number(n), Value::Number(i as f64)]).is_truthy() {
+            if tishlang_core::has_pending_throw() { break; } // #303
+            if cb.call(&[Value::Number(n), Value::Number(i as f64), arr_value.clone()]).is_truthy() {
                 return Value::Bool(true);
             }
         }
@@ -554,9 +628,11 @@ pub fn some(arr: &Value, callback: &Value) -> Value {
     }
     let arr = as_boxed_array(arr); let arr = &*arr;
     if let (Value::Array(arr), Value::Function(cb)) = (arr, callback) {
-        let arr_borrow = arr.borrow();
+        let arr_borrow = arr.borrow().clone(); // #382: snapshot; drop the guard before any callback
+        let arr_value = Value::Array(arr.clone()); // 3rd callback arg (JS `array`)
         for (i, v) in arr_borrow.iter().enumerate() {
-            let result = cb.call(&[v.clone(), Value::Number(i as f64)]);
+            if tishlang_core::has_pending_throw() { break; } // #303
+            let result = cb.call(&[v.clone(), Value::Number(i as f64), arr_value.clone()]);
             if result.is_truthy() {
                 return Value::Bool(true);
             }
@@ -567,8 +643,10 @@ pub fn some(arr: &Value, callback: &Value) -> Value {
 
 pub fn every(arr: &Value, callback: &Value) -> Value {
     if let Some((data, cb)) = packed_snapshot(arr, callback) {
+        let arr_value = arr.clone(); // 3rd callback arg (JS `array`)
         for (i, &n) in data.iter().enumerate() {
-            if !cb.call(&[Value::Number(n), Value::Number(i as f64)]).is_truthy() {
+            if tishlang_core::has_pending_throw() { break; } // #303
+            if !cb.call(&[Value::Number(n), Value::Number(i as f64), arr_value.clone()]).is_truthy() {
                 return Value::Bool(false);
             }
         }
@@ -576,9 +654,11 @@ pub fn every(arr: &Value, callback: &Value) -> Value {
     }
     let arr = as_boxed_array(arr); let arr = &*arr;
     if let (Value::Array(arr), Value::Function(cb)) = (arr, callback) {
-        let arr_borrow = arr.borrow();
+        let arr_borrow = arr.borrow().clone(); // #382: snapshot; drop the guard before any callback
+        let arr_value = Value::Array(arr.clone()); // 3rd callback arg (JS `array`)
         for (i, v) in arr_borrow.iter().enumerate() {
-            let result = cb.call(&[v.clone(), Value::Number(i as f64)]);
+            if tishlang_core::has_pending_throw() { break; } // #303
+            let result = cb.call(&[v.clone(), Value::Number(i as f64), arr_value.clone()]);
             if !result.is_truthy() {
                 return Value::Bool(false);
             }
@@ -592,10 +672,12 @@ pub fn every(arr: &Value, callback: &Value) -> Value {
 pub fn flat_map(arr: &Value, callback: &Value) -> Value {
     let arr = as_boxed_array(arr); let arr = &*arr;
     if let (Value::Array(arr), Value::Function(cb)) = (arr, callback) {
-        let arr_borrow = arr.borrow();
+        let arr_borrow = arr.borrow().clone(); // #382: snapshot; drop the guard before any callback
+        let arr_value = Value::Array(arr.clone()); // 3rd callback arg (JS `array`)
         let mut result: Vec<Value> = Vec::new();
         for (i, v) in arr_borrow.iter().enumerate() {
-            let mapped = cb.call(&[v.clone(), Value::Number(i as f64)]);
+            if tishlang_core::has_pending_throw() { break; } // #303
+            let mapped = cb.call(&[v.clone(), Value::Number(i as f64), arr_value.clone()]);
             if let Value::Array(inner) = mapped {
                 result.extend(inner.borrow().iter().cloned());
             } else {
@@ -628,13 +710,23 @@ pub fn sort_default(arr: &Value) -> Value {
 
 pub fn sort_with_comparator(arr: &Value, comparator: &Value) -> Value {
     if let (Value::Array(arr), Value::Function(cmp_fn)) = (arr, comparator) {
-        let mut arr_mut = arr.borrow_mut();
-        let len = arr_mut.len();
+        // #382: move the elements out under a short-lived borrow, then DROP the guard before invoking
+        // the comparator. A comparator that reads the array being sorted (the common
+        // `arr.sort((a,b) => arr.indexOf(a) - arr.indexOf(b))` idiom) would otherwise re-lock this same
+        // Mutex under send-values and self-deadlock the worker (or panic under RefCell) — the exact
+        // reentrant-lock class fixed for the captured-cell path in #218/#338. `mem::take` leaves the
+        // array empty for the duration of the sort; the final result is written back below.
+        let mut elements: Vec<Value> = std::mem::take(&mut *arr.borrow_mut());
+        let len = elements.len();
         let mut indices: Vec<usize> = (0..len).collect();
-        let mut elements: Vec<Value> = std::mem::take(&mut *arr_mut);
         let mut args_buf: [Value; 2] = [Value::Null, Value::Null];
 
         indices.sort_by(|&a, &b| {
+            // #303: once the comparator has thrown, stop invoking it — return Equal so the sort can
+            // unwind. Avoids extra comparator calls (and their side effects) after the throw.
+            if tishlang_core::has_pending_throw() {
+                return std::cmp::Ordering::Equal;
+            }
             args_buf[0] = elements[a].clone();
             args_buf[1] = elements[b].clone();
             match cmp_fn.call(&args_buf) {
@@ -644,11 +736,18 @@ pub fn sort_with_comparator(arr: &Value, comparator: &Value) -> Value {
             }
         });
 
-        *arr_mut = indices
-            .into_iter()
-            .map(|i| std::mem::replace(&mut elements[i], Value::Null))
-            .collect();
-        drop(arr_mut);
+        // Re-acquire the guard only to write the result back — no user code runs past this point.
+        if tishlang_core::has_pending_throw() {
+            // #303: the comparator threw — do NOT write the partial/bogus reordering back. Restore the
+            // original element order (leave the array unmodified) and let the caller re-raise the throw.
+            *arr.borrow_mut() = elements;
+        } else {
+            let sorted: Vec<Value> = indices
+                .into_iter()
+                .map(|i| std::mem::replace(&mut elements[i], Value::Null))
+                .collect();
+            *arr.borrow_mut() = sorted;
+        }
         Value::Array(arr.clone())
     } else {
         Value::Null
@@ -757,6 +856,89 @@ fn get_prop_number(v: &Value, prop: &std::sync::Arc<str>) -> f64 {
     }
 }
 
+/// Read a numeric key from an element following a (possibly empty) property path.
+/// An empty path means the element itself is the numeric key (`(a,b)=>a-b`).
+/// `["k"]` reads `el.k`; `["a","b"]` reads `el.a.b`. Missing fields collapse to
+/// NaN, mirroring what `el.k - el.k` would produce in the boxed comparator, so the
+/// decorate-sort path stays order-identical to the dynamic comparator path.
+fn read_key_number(el: &Value, path: &[&str]) -> f64 {
+    if path.is_empty() {
+        return el.as_number().unwrap_or(f64::NAN);
+    }
+    let mut cur = el.clone();
+    for (i, seg) in path.iter().enumerate() {
+        let is_last = i + 1 == path.len();
+        match &cur {
+            Value::Object(o) => {
+                let next = o.borrow().strings.get(*seg).cloned();
+                match next {
+                    Some(v) if is_last => return v.as_number().unwrap_or(f64::NAN),
+                    Some(v) => cur = v,
+                    None => return f64::NAN,
+                }
+            }
+            // `.length` is computed (not stored) for strings/arrays — mirror get_member.
+            Value::String(s) if *seg == "length" && is_last => return s.chars().count() as f64,
+            Value::Array(a) if *seg == "length" && is_last => return a.borrow().len() as f64,
+            _ => return f64::NAN,
+        }
+    }
+    f64::NAN
+}
+
+/// GENERAL multi-key numeric sort (decorate-sort-undecorate / Schwartzian transform).
+///
+/// The native codegen fuses any comparator that reduces to a lexicographic comparison
+/// of numeric keys — `(a,b)=>a.k-b.k`, `(a,b)=>b.k-a.k`, or the canonical multi-key
+/// `(a,b)=>{ if(a.k!==b.k) return a.k-b.k; return a.j-b.j }` — into a call here, with
+/// `keys` describing each `(property-path, ascending)` key in priority order.
+///
+/// Each element's keys are extracted ONCE into an unboxed `f64` vector, then the index
+/// permutation is sorted by plain `f64` comparison: no per-comparison hash lookups, no
+/// `Value` boxing, no closure dispatch. The boxed comparator path does `key_a - key_b`
+/// and returns its sign, so a lexicographic `partial_cmp` over the same keys (NaN →
+/// Equal) yields the IDENTICAL ordering — backend-identical with the dynamic path.
+pub fn sort_by_keys(arr: &Value, keys: &[(&[&str], bool)]) -> Value {
+    let arr = as_boxed_array(arr);
+    if let Value::Array(a) = &*arr {
+        let k = keys.len();
+        let mut g = a.borrow_mut();
+        let len = g.len();
+        // Decorate: pull every numeric key out of the boxed element exactly once.
+        let mut decorated: Vec<(usize, Vec<f64>)> = Vec::with_capacity(len);
+        for (idx, el) in g.iter().enumerate() {
+            let mut row = Vec::with_capacity(k);
+            for (path, _) in keys {
+                row.push(read_key_number(el, path));
+            }
+            decorated.push((idx, row));
+        }
+        // Sort the permutation by lexicographic f64 comparison of the extracted keys.
+        decorated.sort_by(|(_, ka), (_, kb)| {
+            for (col, (_, asc)) in keys.iter().enumerate() {
+                let ord = ka[col]
+                    .partial_cmp(&kb[col])
+                    .unwrap_or(std::cmp::Ordering::Equal);
+                let ord = if *asc { ord } else { ord.reverse() };
+                if ord != std::cmp::Ordering::Equal {
+                    return ord;
+                }
+            }
+            std::cmp::Ordering::Equal
+        });
+        // Undecorate: apply the permutation in place.
+        let mut elements: Vec<Value> = std::mem::take(&mut *g);
+        *g = decorated
+            .into_iter()
+            .map(|(i, _)| std::mem::replace(&mut elements[i], Value::Null))
+            .collect();
+        drop(g);
+        Value::Array(a.clone())
+    } else {
+        Value::Null
+    }
+}
+
 #[cfg(test)]
 mod packed_hof_tests {
     //! The packed (`NumberArray`) HOF fast paths must be observably IDENTICAL to the boxed path —
@@ -881,4 +1063,295 @@ mod packed_hof_tests {
         assert!(matches!(map(&n, &Value::Number(1.0)), Value::Null));
         assert!(matches!(filter(&n, &Value::Null), Value::Null));
     }
+
+    #[test]
+    fn for_each_stops_on_pending_throw() {
+        use std::sync::{Arc, Mutex};
+        // #303: once the callback parks a throw, for_each must stop invoking it (no extra iterations).
+        let _ = tishlang_core::take_pending_throw(); // start with a clean slot
+        let arr = from_vec(vec![
+            Value::Number(1.0),
+            Value::Number(2.0),
+            Value::Number(3.0),
+            Value::Number(4.0),
+        ]);
+        let calls = Arc::new(Mutex::new(0usize));
+        let c2 = calls.clone();
+        let cb = Value::native(move |a: &[Value]| {
+            *c2.lock().unwrap() += 1;
+            if a[0].as_number() == Some(2.0) {
+                tishlang_core::set_pending_throw(Value::Null);
+            }
+            Value::Null
+        });
+        for_each(&arr, &cb);
+        assert_eq!(
+            *calls.lock().unwrap(),
+            2,
+            "for_each should stop after the throwing element, not run all 4"
+        );
+        let _ = tishlang_core::take_pending_throw(); // drain so it doesn't leak into other tests
+    }
+
+    #[test]
+    fn sort_with_comparator_throw_restores_original_order() {
+        // #303: a comparator that throws must NOT corrupt the array — sort_with_comparator restores the
+        // original order and leaves the throw parked for the caller to re-raise.
+        let _ = tishlang_core::take_pending_throw();
+        let arr = from_vec(vec![
+            Value::Number(5.0),
+            Value::Number(4.0),
+            Value::Number(3.0),
+            Value::Number(2.0),
+            Value::Number(1.0),
+        ]);
+        // Park a throw on the first comparison and return a dummy ordering value.
+        let cmp = Value::native(|_a: &[Value]| {
+            tishlang_core::set_pending_throw(Value::String("cmp".into()));
+            Value::Null
+        });
+        let _ = sort_with_comparator(&arr, &cmp);
+        if let Value::Array(a) = &arr {
+            let got: Vec<f64> = a
+                .borrow()
+                .iter()
+                .map(|v| v.as_number().unwrap_or(f64::NAN))
+                .collect();
+            assert_eq!(
+                got,
+                vec![5.0, 4.0, 3.0, 2.0, 1.0],
+                "array must be left in its original order after a comparator throw"
+            );
+        } else {
+            panic!("expected a boxed array");
+        }
+        assert!(
+            tishlang_core::take_pending_throw().is_some(),
+            "the parked throw must survive for the caller to re-raise"
+        );
+    }
+}
+
+#[cfg(test)]
+mod sort_by_keys_tests {
+    //! `sort_by_keys` (the fused multi-key numeric comparator path) must produce the
+    //! EXACT same order as running the equivalent boxed comparator through
+    //! `sort_with_comparator`, since cross-backend parity depends on it.
+    use super::*;
+    use std::sync::Arc;
+    use tishlang_core::Value;
+
+    fn rec(key: f64, idx: f64) -> Value {
+        Value::object_from_pairs([
+            (Arc::from("key"), Value::Number(key)),
+            (Arc::from("idx"), Value::Number(idx)),
+        ])
+    }
+
+    fn keys_of(arr: &Value) -> Vec<(f64, f64)> {
+        match arr {
+            Value::Array(a) => a
+                .borrow()
+                .iter()
+                .map(|v| match v {
+                    Value::Object(o) => {
+                        let b = o.borrow();
+                        let k = b.strings.get("key").and_then(|x| x.as_number()).unwrap();
+                        let i = b.strings.get("idx").and_then(|x| x.as_number()).unwrap();
+                        (k, i)
+                    }
+                    _ => panic!("expected object element"),
+                })
+                .collect(),
+            _ => panic!("expected array"),
+        }
+    }
+
+    /// A reference boxed comparator with the canonical `key then idx` total order.
+    fn boxed_key_then_idx() -> Value {
+        Value::native(|args: &[Value]| {
+            let a = &args[0];
+            let b = &args[1];
+            let read = |v: &Value, p: &str| match v {
+                Value::Object(o) => o.borrow().strings.get(p).and_then(|x| x.as_number()).unwrap(),
+                _ => f64::NAN,
+            };
+            let (ak, bk) = (read(a, "key"), read(b, "key"));
+            if ak != bk {
+                Value::Number(ak - bk)
+            } else {
+                Value::Number(read(a, "idx") - read(b, "idx"))
+            }
+        })
+    }
+
+    #[test]
+    fn multi_key_matches_boxed_comparator() {
+        // Same unsorted input through both paths; the orders must be identical.
+        let input = || {
+            from_vec(vec![
+                rec(7.0, 0.0),
+                rec(3.0, 1.0),
+                rec(7.0, 2.0),
+                rec(1.0, 3.0),
+                rec(3.0, 4.0),
+                rec(7.0, 5.0),
+            ])
+        };
+        let fused = input();
+        sort_by_keys(
+            &fused,
+            &[(&["key"] as &[&str], true), (&["idx"] as &[&str], true)],
+        );
+        let boxed = input();
+        sort_with_comparator(&boxed, &boxed_key_then_idx());
+        assert_eq!(
+            keys_of(&fused),
+            keys_of(&boxed),
+            "fused multi-key sort must match the boxed comparator order exactly"
+        );
+        // And it is the expected total order.
+        assert_eq!(
+            keys_of(&fused),
+            vec![(1.0, 3.0), (3.0, 1.0), (3.0, 4.0), (7.0, 0.0), (7.0, 2.0), (7.0, 5.0)]
+        );
+    }
+
+    #[test]
+    fn single_key_descending() {
+        let arr = from_vec(vec![rec(2.0, 0.0), rec(9.0, 1.0), rec(5.0, 2.0)]);
+        sort_by_keys(&arr, &[(&["key"] as &[&str], false)]);
+        let ks: Vec<f64> = keys_of(&arr).into_iter().map(|(k, _)| k).collect();
+        assert_eq!(ks, vec![9.0, 5.0, 2.0]);
+    }
+
+    #[test]
+    fn bare_element_key_sorts_numbers() {
+        // Empty path = the element itself is the numeric key (`(a,b)=>a-b`).
+        let arr = from_vec(vec![
+            Value::Number(4.0),
+            Value::Number(1.0),
+            Value::Number(3.0),
+            Value::Number(2.0),
+        ]);
+        sort_by_keys(&arr, &[(&[] as &[&str], true)]);
+        let got: Vec<f64> = match &arr {
+            Value::Array(a) => a.borrow().iter().map(|v| v.as_number().unwrap()).collect(),
+            _ => panic!(),
+        };
+        assert_eq!(got, vec![1.0, 2.0, 3.0, 4.0]);
+    }
+
+    #[test]
+    fn missing_field_reads_nan_and_does_not_panic() {
+        // An element missing the primary key reads NaN; NaN comparisons collapse to
+        // Equal (`partial_cmp -> None -> Equal`), mirroring `a.key - b.key == NaN`
+        // (sign neither <0 nor >0) in the boxed path. The sort must still complete
+        // and return a valid permutation of the input (length + idx-set preserved).
+        let arr = from_vec(vec![
+            rec(5.0, 0.0),
+            Value::object_from_pairs([(Arc::from("idx"), Value::Number(1.0))]), // no "key"
+            rec(2.0, 2.0),
+        ]);
+        sort_by_keys(
+            &arr,
+            &[(&["key"] as &[&str], true), (&["idx"] as &[&str], true)],
+        );
+        let idxs: Vec<f64> = match &arr {
+            Value::Array(a) => a
+                .borrow()
+                .iter()
+                .map(|e| match e {
+                    Value::Object(o) => {
+                        o.borrow().strings.get("idx").and_then(|x| x.as_number()).unwrap()
+                    }
+                    _ => f64::NAN,
+                })
+                .collect(),
+            _ => panic!(),
+        };
+        let mut sorted = idxs.clone();
+        sorted.sort_by(|a, b| a.partial_cmp(b).unwrap());
+        assert_eq!(sorted, vec![0.0, 1.0, 2.0], "no element lost or duplicated");
+    }
+}
+
+#[cfg(test)]
+mod reentrancy_tests_382 {
+    //! #382: a boxed-array HOF / comparator must snapshot and DROP the array's borrow before running
+    //! any user callback, so a callback that re-enters the SAME array does not deadlock (Mutex, under
+    //! send-values) or panic "already borrowed" (RefCell, the default). Follow-up to #218/#338.
+    use super::*;
+    use tishlang_core::{native_fn, Value, VmRef};
+
+    fn arr3() -> Value {
+        Value::Array(VmRef::new(vec![
+            Value::Number(10.0),
+            Value::Number(20.0),
+            Value::Number(30.0),
+        ]))
+    }
+
+    #[test]
+    fn map_callback_can_mutate_same_array_without_panic() {
+        let arr = arr3();
+        let same = arr.clone(); // shares the VmRef → callback re-enters the same cell
+        let cb = Value::Function(native_fn(move |args| {
+            // borrow_mut() the array being mapped: pre-fix this panics ("already borrowed") because
+            // map still holds arr.borrow(); post-fix map has snapshotted+dropped, so this succeeds.
+            if let Value::Array(a) = &same {
+                a.borrow_mut().push(Value::Number(999.0));
+            }
+            args[0].clone()
+        }));
+        let out = map(&arr, &cb);
+        match out {
+            Value::Array(o) => assert_eq!(o.borrow().len(), 3, "map iterates the 3-element snapshot"),
+            _ => panic!("map should return an array"),
+        }
+    }
+
+    #[test]
+    fn foreach_callback_can_read_same_array_length() {
+        let arr = arr3();
+        let same = arr.clone();
+        let seen = VmRef::new(Vec::<f64>::new());
+        let seen_cb = seen.clone();
+        let cb = Value::Function(native_fn(move |args| {
+            if let Value::Array(a) = &same {
+                // read length from inside the callback (re-enters the same cell)
+                let len = a.borrow().len() as f64;
+                seen_cb.borrow_mut().push(len);
+            }
+            let _ = args;
+            Value::Null
+        }));
+        for_each(&arr, &cb);
+        assert_eq!(seen.borrow().len(), 3, "callback ran once per element without deadlock/panic");
+    }
+
+    #[test]
+    fn sort_comparator_can_read_same_array_without_panic() {
+        let arr = arr3();
+        let same = arr.clone();
+        let cmp = Value::Function(native_fn(move |args| {
+            // A comparator that reads the array being sorted (the arr.indexOf(a) idiom): pre-fix this
+            // re-locks the held guard (deadlock/panic); post-fix the guard is dropped during sorting.
+            if let Value::Array(a) = &same {
+                let _ = a.borrow().len();
+            }
+            match (&args[0], &args[1]) {
+                (Value::Number(x), Value::Number(y)) => Value::Number(x - y),
+                _ => Value::Number(0.0),
+            }
+        }));
+        let out = sort_with_comparator(&arr, &cmp);
+        match out {
+            Value::Array(o) => {
+                let got: Vec<f64> = o.borrow().iter().filter_map(|v| v.as_number()).collect();
+                assert_eq!(got, vec![10.0, 20.0, 30.0], "ascending sort completes, no element lost");
+            }
+            _ => panic!("sort should return an array"),
+        }
+    }
 }