From 10f45edfafa8d9331b79968a7ce2dc2018e3999b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralph=20K=C3=BCpper?= <ralph@skelpo.com>
Date: Thu, 11 Jun 2026 23:29:54 +0200
Subject: [PATCH 1/3] feat(runtime,codegen): native yoga-layout via taffy
 (#348) + fix labeled-break-from-nested-switch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- perry/yoga native module: taffy-backed flexbox primitives (node tree,
  style setters, measure callbacks via js_native_call_value, computed
  layout) so the real 'yoga-layout' npm package runs natively (no WASM).
  A TS shim ships as the package's index.ts over these primitives.
  ink lays out + renders text/boxes/colors natively through it.
- fix(codegen): a 'break <label>' targeting an outer labeled switch from
  inside a NESTED switch was resolving (via the LabeledBreak fallback) to
  the inner switch's exit instead of the outer's — lower_switch never
  registered its pending label in label_targets (only loops did). This
  miscompiled react-reconciler's element-type classification switch, so
  every Context.Provider became fiber tag 29 (invalid) and its children
  were dropped. Register the pending label on the switch's exit.

Refs #348.
---
 crates/perry-api-manifest/src/entries.rs      |   2 +
 .../src/lower_call/native_table/mod.rs        |   2 +
 .../src/lower_call/native_table/yoga.rs       |  38 +
 crates/perry-codegen/src/stmt/switch_stmt.rs  |  18 +
 crates/perry-runtime/src/lib.rs               |   1 +
 crates/perry-runtime/src/yoga.rs              | 732 ++++++++++++++++++
 6 files changed, 793 insertions(+)
 create mode 100644 crates/perry-codegen/src/lower_call/native_table/yoga.rs
 create mode 100644 crates/perry-runtime/src/yoga.rs

diff --git a/crates/perry-api-manifest/src/entries.rs b/crates/perry-api-manifest/src/entries.rs
index e323bc0426..04a172a2bd 100644
--- a/crates/perry-api-manifest/src/entries.rs
+++ b/crates/perry-api-manifest/src/entries.rs
@@ -116,6 +116,7 @@ pub const NATIVE_MODULES: &[&str] = &[
     "vm",
     "process",
     "perry/tui",
+    "perry/yoga",
     "perry/ui",
     "perry/system",
     "perry/plugin",
@@ -213,6 +214,7 @@ pub const RUNTIME_ONLY_MODULES: &[&str] = &[
     "perry/media",
     "perry/audio",
     "perry/tui",
+    "perry/yoga",
     "perry/background",
     "tty",
     "wasi",
diff --git a/crates/perry-codegen/src/lower_call/native_table/mod.rs b/crates/perry-codegen/src/lower_call/native_table/mod.rs
index 76fe61f593..314543e249 100644
--- a/crates/perry-codegen/src/lower_call/native_table/mod.rs
+++ b/crates/perry-codegen/src/lower_call/native_table/mod.rs
@@ -33,6 +33,7 @@ mod thread_lodash;
 mod tls_events;
 mod tui;
 mod utils_crypto;
+mod yoga;
 
 // ============================================================================
 // Native stdlib module dispatch (fastify, mysql2, ws, pg, ioredis, mongodb,
@@ -163,6 +164,7 @@ pub(super) static NATIVE_MODULE_TABLE: LazyLock<Vec<NativeModSig>> = LazyLock::n
     v.extend_from_slice(dates::DATES_ROWS);
     v.extend_from_slice(media::MEDIA_ROWS);
     v.extend_from_slice(tui::TUI_ROWS);
+    v.extend_from_slice(yoga::YOGA_ROWS);
     v.extend_from_slice(extras::EXTRAS_ROWS);
     v.extend_from_slice(http_client::HTTP_CLIENT_ROWS);
     v.extend_from_slice(http_server::HTTP_SERVER_ROWS);
diff --git a/crates/perry-codegen/src/lower_call/native_table/yoga.rs b/crates/perry-codegen/src/lower_call/native_table/yoga.rs
new file mode 100644
index 0000000000..bb3d1b8415
--- /dev/null
+++ b/crates/perry-codegen/src/lower_call/native_table/yoga.rs
@@ -0,0 +1,38 @@
+//! `perry/yoga` — native taffy-backed flexbox primitives consumed by the
+//! `yoga-layout` TS shim (so real `ink` lays out natively). All entries are
+//! free functions taking plain f64 args (handles are integer ids, not tagged
+//! pointers) and returning an f64 (numbers, or NaN-boxed `undefined` for
+//! setters). See `perry-runtime/src/yoga.rs`.
+
+use super::*;
+
+macro_rules! yoga_fn {
+    ($method:literal, $runtime:literal, $argc:expr) => {
+        NativeModSig {
+            module: "perry/yoga",
+            has_receiver: false,
+            method: $method,
+            class_filter: None,
+            runtime: $runtime,
+            args: &[NA_F64; $argc],
+            ret: NR_F64,
+        }
+    };
+}
+
+pub(super) const YOGA_ROWS: &[NativeModSig] = &[
+    yoga_fn!("nodeNew", "js_yoga_node_new", 0),
+    yoga_fn!("nodeFree", "js_yoga_node_free", 1),
+    yoga_fn!("insertChild", "js_yoga_insert_child", 3),
+    yoga_fn!("removeChild", "js_yoga_remove_child", 2),
+    yoga_fn!("childCount", "js_yoga_child_count", 1),
+    yoga_fn!("setMeasureFunc", "js_yoga_set_measure_func", 2),
+    yoga_fn!("unsetMeasureFunc", "js_yoga_unset_measure_func", 1),
+    yoga_fn!("setNumber", "js_yoga_set_number", 4),
+    yoga_fn!("setEdge", "js_yoga_set_edge", 5),
+    yoga_fn!("setGap", "js_yoga_set_gap", 4),
+    yoga_fn!("setEnum", "js_yoga_set_enum", 3),
+    yoga_fn!("calculateLayout", "js_yoga_calculate_layout", 4),
+    yoga_fn!("getComputed", "js_yoga_get_computed", 2),
+    yoga_fn!("getComputedEdge", "js_yoga_get_computed_edge", 3),
+];
diff --git a/crates/perry-codegen/src/stmt/switch_stmt.rs b/crates/perry-codegen/src/stmt/switch_stmt.rs
index b67a5a155e..30c0c5edb1 100644
--- a/crates/perry-codegen/src/stmt/switch_stmt.rs
+++ b/crates/perry-codegen/src/stmt/switch_stmt.rs
@@ -69,6 +69,24 @@ pub(crate) fn lower_switch(
     ctx.loop_targets
         .push((exit_label.clone(), exit_label.clone(), ctx.try_depth));
 
+    // If this switch carries a pending label (from an enclosing
+    // `a: switch (...)`), register it so `break a;` resolves to THIS
+    // switch's exit even when the break sits inside a *nested* switch.
+    // Without this, `LabeledBreak` falls back to the innermost
+    // `loop_targets` entry — the nested switch's own exit — so the break
+    // escapes only the inner switch and execution falls through into the
+    // outer switch's remaining code (e.g. react-reconciler's
+    // `switch (type.$$typeof) { case CTX: t = 10; break a; }`, where the
+    // case body's `break a` was landing in the invalid-element tail and
+    // every Context.Provider became fiber tag 29 → children dropped).
+    let consumed_label = ctx.pending_label.take();
+    if let Some(ref lbl) = consumed_label {
+        ctx.label_targets.insert(
+            lbl.clone(),
+            (exit_label.clone(), exit_label.clone(), ctx.try_depth),
+        );
+    }
+
     // Compile each test block. Each test compares dv against the case
     // expression with fcmp oeq, jumps to the body on match, otherwise
     // jumps to the next *case* test (or to no_match_target if this is the
diff --git a/crates/perry-runtime/src/lib.rs b/crates/perry-runtime/src/lib.rs
index d812aa174e..822ac1e40c 100644
--- a/crates/perry-runtime/src/lib.rs
+++ b/crates/perry-runtime/src/lib.rs
@@ -55,6 +55,7 @@ pub mod ffi;
 pub mod frame;
 pub mod fs;
 pub mod gc;
+pub mod yoga;
 pub mod intl;
 pub mod iterator_helpers;
 pub mod macos_bundle;
diff --git a/crates/perry-runtime/src/yoga.rs b/crates/perry-runtime/src/yoga.rs
new file mode 100644
index 0000000000..8a69de7af0
--- /dev/null
+++ b/crates/perry-runtime/src/yoga.rs
@@ -0,0 +1,732 @@
+//! Native `yoga-layout` backend for Perry — taffy-powered flexbox so the
+//! real `ink` (and any `yoga-layout` consumer) lays out natively, no WASM.
+//!
+//! The npm `yoga-layout` package is a WASM blob; Perry can't run WASM. ink
+//! only ever talks to yoga through a fixed API (`Node.create()`, style
+//! setters, `calculateLayout`, `getComputed*`, a measure callback). This
+//! module reimplements that surface over `taffy` (the same Rust flexbox
+//! engine `perry/tui` uses), exposed to TS as the `perry/yoga` native module.
+//! A thin TS shim (shipped as the `yoga-layout` package's `index.ts`) maps
+//! the public yoga API onto these primitives and keeps yoga's enum
+//! constants (`YGEnums.ts`).
+//!
+//! Nodes are plain integer handles (an `f64` id, not a tagged pointer) into
+//! a per-process registry. `calculateLayout` builds a fresh `TaffyTree` from
+//! the registry, runs the solver (calling stored JS measure callbacks for
+//! leaf text nodes), and writes the relative computed `Layout` back onto each
+//! node for `getComputed*` to read — mirroring how `tui/layout.rs` works.
+
+use std::collections::HashMap;
+use std::sync::Mutex;
+
+use taffy::prelude::{auto, length, percent};
+use taffy::{
+    AlignContent, AlignItems, AvailableSpace, Dimension, Display, FlexDirection, FlexWrap,
+    JustifyContent, Layout, LengthPercentage, LengthPercentageAuto, NodeId, Overflow, Point,
+    Position, Rect, Size, Style, TaffyTree,
+};
+
+use crate::value::{POINTER_MASK, POINTER_TAG, TAG_UNDEFINED};
+
+// ---------------------------------------------------------------------------
+// Property / unit / enum tags — must stay in sync with the TS shim.
+// ---------------------------------------------------------------------------
+
+// Numeric props (js_yoga_set_number)
+const P_WIDTH: u32 = 0;
+const P_HEIGHT: u32 = 1;
+const P_MIN_WIDTH: u32 = 2;
+const P_MIN_HEIGHT: u32 = 3;
+const P_MAX_WIDTH: u32 = 4;
+const P_MAX_HEIGHT: u32 = 5;
+const P_FLEX_BASIS: u32 = 6;
+const P_FLEX_GROW: u32 = 7;
+const P_FLEX_SHRINK: u32 = 8;
+const P_FLEX: u32 = 9;
+const P_ASPECT_RATIO: u32 = 10;
+
+// Units
+const U_POINT: u32 = 0;
+const U_PERCENT: u32 = 1;
+const U_AUTO: u32 = 2;
+const U_UNDEFINED: u32 = 3;
+
+// Edge props (js_yoga_set_edge)
+const E_MARGIN: u32 = 0;
+const E_PADDING: u32 = 1;
+const E_BORDER: u32 = 2;
+const E_POSITION: u32 = 3;
+
+// yoga YGEdge values
+const EDGE_LEFT: u32 = 0;
+const EDGE_TOP: u32 = 1;
+const EDGE_RIGHT: u32 = 2;
+const EDGE_BOTTOM: u32 = 3;
+const EDGE_START: u32 = 4;
+const EDGE_END: u32 = 5;
+const EDGE_HORIZONTAL: u32 = 6;
+const EDGE_VERTICAL: u32 = 7;
+const EDGE_ALL: u32 = 8;
+
+// Enum props (js_yoga_set_enum)
+const EN_FLEX_DIRECTION: u32 = 0;
+const EN_JUSTIFY: u32 = 1;
+const EN_ALIGN_ITEMS: u32 = 2;
+const EN_ALIGN_SELF: u32 = 3;
+const EN_ALIGN_CONTENT: u32 = 4;
+const EN_FLEX_WRAP: u32 = 5;
+const EN_DISPLAY: u32 = 6;
+const EN_POSITION_TYPE: u32 = 7;
+const EN_OVERFLOW: u32 = 8;
+
+// Computed-layout fields (js_yoga_get_computed)
+const C_LEFT: u32 = 0;
+const C_TOP: u32 = 1;
+const C_WIDTH: u32 = 2;
+const C_HEIGHT: u32 = 3;
+const C_RIGHT: u32 = 4;
+const C_BOTTOM: u32 = 5;
+
+// ---------------------------------------------------------------------------
+// Node registry
+// ---------------------------------------------------------------------------
+
+struct YogaNode {
+    style: Style,
+    children: Vec<u32>,
+    /// NaN-boxed JS measure callback, or `TAG_UNDEFINED` for none.
+    measure: f64,
+    layout: Layout,
+}
+
+impl YogaNode {
+    fn new() -> Self {
+        YogaNode {
+            style: Style {
+                // yoga defaults to flex-direction: column, position: relative.
+                display: Display::Flex,
+                flex_direction: FlexDirection::Column,
+                ..Default::default()
+            },
+            children: Vec::new(),
+            measure: f64::from_bits(TAG_UNDEFINED),
+            layout: Layout::default(),
+        }
+    }
+}
+
+static YOGA_NODES: Mutex<Option<HashMap<u32, YogaNode>>> = Mutex::new(None);
+static YOGA_NEXT_ID: Mutex<u32> = Mutex::new(1);
+static GC_SCANNER_REGISTERED: Mutex<bool> = Mutex::new(false);
+
+fn with_nodes<R, F: FnOnce(&mut HashMap<u32, YogaNode>) -> R>(f: F) -> R {
+    ensure_gc_scanner_registered();
+    let mut guard = crate::gc::lock_gc_root_registry(&YOGA_NODES);
+    if guard.is_none() {
+        *guard = Some(HashMap::new());
+    }
+    f(guard.as_mut().unwrap())
+}
+
+fn ensure_gc_scanner_registered() {
+    let mut reg = GC_SCANNER_REGISTERED.lock().unwrap();
+    if !*reg {
+        crate::gc::gc_register_mutable_root_scanner_named("perry_yoga", yoga_root_scanner);
+        *reg = true;
+    }
+}
+
+/// Keep stored measure callbacks alive across GC between `setMeasureFunc`
+/// and `calculateLayout`.
+fn yoga_root_scanner(visitor: &mut crate::gc::RuntimeRootVisitor<'_>) {
+    let mut guard = crate::gc::lock_gc_root_registry(&YOGA_NODES);
+    if let Some(map) = guard.as_mut() {
+        for node in map.values_mut() {
+            if (node.measure.to_bits() & !POINTER_MASK) == POINTER_TAG {
+                visitor.visit_nanbox_f64_slot(&mut node.measure);
+            }
+        }
+    }
+}
+
+// ---------------------------------------------------------------------------
+// Style helpers
+// ---------------------------------------------------------------------------
+
+#[inline]
+fn dim(value: f32, unit: u32) -> Dimension {
+    match unit {
+        U_POINT => length(value),
+        U_PERCENT => percent(value / 100.0),
+        _ => auto(),
+    }
+}
+
+#[inline]
+fn lp(value: f32, unit: u32) -> LengthPercentage {
+    match unit {
+        U_PERCENT => percent(value / 100.0),
+        _ => length(value),
+    }
+}
+
+#[inline]
+fn lpa(value: f32, unit: u32) -> LengthPercentageAuto {
+    match unit {
+        U_PERCENT => percent(value / 100.0),
+        U_AUTO | U_UNDEFINED => auto(),
+        _ => length(value),
+    }
+}
+
+fn rect_set_edge_lp(rect: &mut Rect<LengthPercentage>, edge: u32, v: LengthPercentage) {
+    match edge {
+        EDGE_LEFT | EDGE_START => rect.left = v,
+        EDGE_RIGHT | EDGE_END => rect.right = v,
+        EDGE_TOP => rect.top = v,
+        EDGE_BOTTOM => rect.bottom = v,
+        EDGE_HORIZONTAL => {
+            rect.left = v;
+            rect.right = v;
+        }
+        EDGE_VERTICAL => {
+            rect.top = v;
+            rect.bottom = v;
+        }
+        EDGE_ALL => {
+            rect.left = v;
+            rect.right = v;
+            rect.top = v;
+            rect.bottom = v;
+        }
+        _ => {}
+    }
+}
+
+fn rect_set_edge_lpa(rect: &mut Rect<LengthPercentageAuto>, edge: u32, v: LengthPercentageAuto) {
+    match edge {
+        EDGE_LEFT | EDGE_START => rect.left = v,
+        EDGE_RIGHT | EDGE_END => rect.right = v,
+        EDGE_TOP => rect.top = v,
+        EDGE_BOTTOM => rect.bottom = v,
+        EDGE_HORIZONTAL => {
+            rect.left = v;
+            rect.right = v;
+        }
+        EDGE_VERTICAL => {
+            rect.top = v;
+            rect.bottom = v;
+        }
+        EDGE_ALL => {
+            rect.left = v;
+            rect.right = v;
+            rect.top = v;
+            rect.bottom = v;
+        }
+        _ => {}
+    }
+}
+
+// yoga enum value → taffy
+fn map_flex_direction(v: u32) -> FlexDirection {
+    match v {
+        0 => FlexDirection::Column,
+        1 => FlexDirection::ColumnReverse,
+        2 => FlexDirection::Row,
+        3 => FlexDirection::RowReverse,
+        _ => FlexDirection::Column,
+    }
+}
+
+fn map_justify(v: u32) -> Option<JustifyContent> {
+    Some(match v {
+        0 => JustifyContent::FlexStart,
+        1 => JustifyContent::Center,
+        2 => JustifyContent::FlexEnd,
+        3 => JustifyContent::SpaceBetween,
+        4 => JustifyContent::SpaceAround,
+        5 => JustifyContent::SpaceEvenly,
+        _ => return None,
+    })
+}
+
+fn map_align(v: u32) -> Option<AlignItems> {
+    Some(match v {
+        1 => AlignItems::FlexStart,
+        2 => AlignItems::Center,
+        3 => AlignItems::FlexEnd,
+        4 => AlignItems::Stretch,
+        5 => AlignItems::Baseline,
+        // 0 = Auto; 6/7/8 (space-*) aren't valid for align-items in taffy.
+        _ => return None,
+    })
+}
+
+fn map_align_content(v: u32) -> Option<AlignContent> {
+    Some(match v {
+        1 => AlignContent::FlexStart,
+        2 => AlignContent::Center,
+        3 => AlignContent::FlexEnd,
+        4 => AlignContent::Stretch,
+        6 => AlignContent::SpaceBetween,
+        7 => AlignContent::SpaceAround,
+        8 => AlignContent::SpaceEvenly,
+        _ => return None,
+    })
+}
+
+// ---------------------------------------------------------------------------
+// FFI: node lifecycle
+// ---------------------------------------------------------------------------
+
+#[no_mangle]
+pub extern "C" fn js_yoga_node_new() -> f64 {
+    let id = {
+        let mut n = YOGA_NEXT_ID.lock().unwrap();
+        let v = *n;
+        *n += 1;
+        v
+    };
+    with_nodes(|m| {
+        m.insert(id, YogaNode::new());
+    });
+    id as f64
+}
+
+#[no_mangle]
+pub extern "C" fn js_yoga_node_free(id: f64) -> f64 {
+    let id = id as u32;
+    with_nodes(|m| {
+        m.remove(&id);
+    });
+    f64::from_bits(TAG_UNDEFINED)
+}
+
+#[no_mangle]
+pub extern "C" fn js_yoga_insert_child(parent: f64, child: f64, index: f64) -> f64 {
+    let (p, c, idx) = (parent as u32, child as u32, index as usize);
+    with_nodes(|m| {
+        if let Some(node) = m.get_mut(&p) {
+            let idx = idx.min(node.children.len());
+            node.children.insert(idx, c);
+        }
+    });
+    f64::from_bits(TAG_UNDEFINED)
+}
+
+#[no_mangle]
+pub extern "C" fn js_yoga_remove_child(parent: f64, child: f64) -> f64 {
+    let (p, c) = (parent as u32, child as u32);
+    with_nodes(|m| {
+        if let Some(node) = m.get_mut(&p) {
+            node.children.retain(|&x| x != c);
+        }
+    });
+    f64::from_bits(TAG_UNDEFINED)
+}
+
+#[no_mangle]
+pub extern "C" fn js_yoga_child_count(id: f64) -> f64 {
+    let id = id as u32;
+    with_nodes(|m| m.get(&id).map(|n| n.children.len()).unwrap_or(0) as f64)
+}
+
+#[no_mangle]
+pub extern "C" fn js_yoga_set_measure_func(id: f64, cb: f64) -> f64 {
+    let id = id as u32;
+    with_nodes(|m| {
+        if let Some(node) = m.get_mut(&id) {
+            node.measure = cb;
+        }
+    });
+    f64::from_bits(TAG_UNDEFINED)
+}
+
+#[no_mangle]
+pub extern "C" fn js_yoga_unset_measure_func(id: f64) -> f64 {
+    let id = id as u32;
+    with_nodes(|m| {
+        if let Some(node) = m.get_mut(&id) {
+            node.measure = f64::from_bits(TAG_UNDEFINED);
+        }
+    });
+    f64::from_bits(TAG_UNDEFINED)
+}
+
+// ---------------------------------------------------------------------------
+// FFI: style setters
+// ---------------------------------------------------------------------------
+
+#[no_mangle]
+pub extern "C" fn js_yoga_set_number(id: f64, prop: f64, value: f64, unit: f64) -> f64 {
+    let (id, prop, unit, v) = (id as u32, prop as u32, unit as u32, value as f32);
+    with_nodes(|m| {
+        if let Some(node) = m.get_mut(&id) {
+            let s = &mut node.style;
+            match prop {
+                P_WIDTH => s.size.width = dim(v, unit),
+                P_HEIGHT => s.size.height = dim(v, unit),
+                P_MIN_WIDTH => s.min_size.width = dim(v, unit),
+                P_MIN_HEIGHT => s.min_size.height = dim(v, unit),
+                P_MAX_WIDTH => s.max_size.width = dim(v, unit),
+                P_MAX_HEIGHT => s.max_size.height = dim(v, unit),
+                P_FLEX_BASIS => s.flex_basis = dim(v, unit),
+                P_FLEX_GROW => s.flex_grow = v,
+                P_FLEX_SHRINK => s.flex_shrink = v,
+                P_FLEX => {
+                    // yoga setFlex(v): grow=v, shrink=v, basis=0 when v>0.
+                    if v >= 0.0 {
+                        s.flex_grow = v;
+                        s.flex_shrink = v;
+                    }
+                }
+                P_ASPECT_RATIO => s.aspect_ratio = if v.is_finite() { Some(v) } else { None },
+                _ => {}
+            }
+        }
+    });
+    f64::from_bits(TAG_UNDEFINED)
+}
+
+#[no_mangle]
+pub extern "C" fn js_yoga_set_edge(id: f64, prop: f64, edge: f64, value: f64, unit: f64) -> f64 {
+    let (id, prop, edge, unit, v) = (
+        id as u32,
+        prop as u32,
+        edge as u32,
+        unit as u32,
+        value as f32,
+    );
+    with_nodes(|m| {
+        if let Some(node) = m.get_mut(&id) {
+            let s = &mut node.style;
+            match prop {
+                E_MARGIN => rect_set_edge_lpa(&mut s.margin, edge, lpa(v, unit)),
+                E_POSITION => rect_set_edge_lpa(&mut s.inset, edge, lpa(v, unit)),
+                E_PADDING => rect_set_edge_lp(&mut s.padding, edge, lp(v, unit)),
+                E_BORDER => rect_set_edge_lp(&mut s.border, edge, lp(v, unit)),
+                _ => {}
+            }
+        }
+    });
+    f64::from_bits(TAG_UNDEFINED)
+}
+
+#[no_mangle]
+pub extern "C" fn js_yoga_set_gap(id: f64, gutter: f64, value: f64, unit: f64) -> f64 {
+    let (id, gutter, unit, v) = (id as u32, gutter as u32, unit as u32, value as f32);
+    with_nodes(|m| {
+        if let Some(node) = m.get_mut(&id) {
+            let s = &mut node.style;
+            let g = lp(v, unit);
+            match gutter {
+                0 => s.gap.width = g,  // YGGutterColumn
+                1 => s.gap.height = g, // YGGutterRow
+                _ => {
+                    s.gap.width = g;
+                    s.gap.height = g;
+                } // YGGutterAll
+            }
+        }
+    });
+    f64::from_bits(TAG_UNDEFINED)
+}
+
+#[no_mangle]
+pub extern "C" fn js_yoga_set_enum(id: f64, prop: f64, value: f64) -> f64 {
+    let (id, prop, v) = (id as u32, prop as u32, value as u32);
+    with_nodes(|m| {
+        if let Some(node) = m.get_mut(&id) {
+            let s = &mut node.style;
+            match prop {
+                EN_FLEX_DIRECTION => s.flex_direction = map_flex_direction(v),
+                EN_JUSTIFY => s.justify_content = map_justify(v),
+                EN_ALIGN_ITEMS => s.align_items = map_align(v),
+                EN_ALIGN_SELF => s.align_self = map_align(v),
+                EN_ALIGN_CONTENT => s.align_content = map_align_content(v),
+                EN_FLEX_WRAP => {
+                    s.flex_wrap = match v {
+                        1 => FlexWrap::Wrap,
+                        2 => FlexWrap::WrapReverse,
+                        _ => FlexWrap::NoWrap,
+                    }
+                }
+                EN_DISPLAY => {
+                    s.display = match v {
+                        1 => Display::None,
+                        _ => Display::Flex,
+                    }
+                }
+                EN_POSITION_TYPE => {
+                    s.position = match v {
+                        2 => Position::Absolute,
+                        _ => Position::Relative,
+                    }
+                }
+                EN_OVERFLOW => {
+                    let o = match v {
+                        1 => Overflow::Hidden,
+                        2 => Overflow::Scroll,
+                        _ => Overflow::Visible,
+                    };
+                    s.overflow = Point { x: o, y: o };
+                }
+                _ => {}
+            }
+        }
+    });
+    f64::from_bits(TAG_UNDEFINED)
+}
+
+// ---------------------------------------------------------------------------
+// FFI: layout
+// ---------------------------------------------------------------------------
+
+const YG_MEASURE_UNDEFINED: f64 = 0.0;
+const YG_MEASURE_EXACTLY: f64 = 1.0;
+const YG_MEASURE_AT_MOST: f64 = 2.0;
+
+#[no_mangle]
+pub extern "C" fn js_yoga_calculate_layout(id: f64, width: f64, height: f64, _direction: f64) -> f64 {
+    let root_id = id as u32;
+
+    // Phase 1: build a fresh taffy tree from the registry, collecting the
+    // (taffy NodeId -> measure callback) map for leaves. Done under the lock,
+    // but we release it before computing so measure callbacks (which re-enter
+    // JS and may call yoga functions) don't deadlock.
+    let mut taffy: TaffyTree<u32> = TaffyTree::new();
+    let mut handle_to_taffy: HashMap<u32, NodeId> = HashMap::new();
+    // Keyed by yoga handle (the taffy node context), so the measure closure
+    // can resolve the callback straight from the context without the map.
+    let mut measure_cbs: HashMap<u32, f64> = HashMap::new();
+
+    let built = with_nodes(|m| {
+        build_taffy(
+            m,
+            &mut taffy,
+            &mut handle_to_taffy,
+            &mut measure_cbs,
+            root_id,
+        )
+    });
+    let root_taffy = match built {
+        Some(id) => id,
+        None => return f64::from_bits(TAG_UNDEFINED),
+    };
+
+    let avail = Size {
+        width: if width.is_finite() {
+            AvailableSpace::Definite(width as f32)
+        } else {
+            AvailableSpace::MaxContent
+        },
+        height: if height.is_finite() {
+            AvailableSpace::Definite(height as f32)
+        } else {
+            AvailableSpace::MaxContent
+        },
+    };
+
+    let _ = taffy.compute_layout_with_measure(
+        root_taffy,
+        avail,
+        |known_dims, available_space, _node_id, node_context, _style| {
+            let cb = node_context.and_then(|yid| measure_cbs.get(&*yid).copied());
+            measure_leaf(known_dims, available_space, cb)
+        },
+    );
+
+    // Phase 3: write computed layouts back onto each node.
+    with_nodes(|m| {
+        store_layout(m, &taffy, &handle_to_taffy, root_id);
+    });
+
+    f64::from_bits(TAG_UNDEFINED)
+}
+
+fn build_taffy(
+    m: &HashMap<u32, YogaNode>,
+    taffy: &mut TaffyTree<u32>,
+    map: &mut HashMap<u32, NodeId>,
+    measure_cbs: &mut HashMap<u32, f64>,
+    handle: u32,
+) -> Option<NodeId> {
+    let node = m.get(&handle)?;
+    let style = node.style.clone();
+    let has_measure = (node.measure.to_bits() & !POINTER_MASK) == POINTER_TAG;
+
+    if node.children.is_empty() {
+        // Leaf — attach the yoga handle as context so the measure closure
+        // can find this node's callback.
+        let tid = taffy.new_leaf_with_context(style, handle).ok()?;
+        map.insert(handle, tid);
+        if has_measure {
+            measure_cbs.insert(handle, node.measure);
+        }
+        Some(tid)
+    } else {
+        let child_ids: Vec<NodeId> = node
+            .children
+            .iter()
+            .filter_map(|c| build_taffy(m, taffy, map, measure_cbs, *c))
+            .collect();
+        let tid = taffy.new_with_children(style, &child_ids).ok()?;
+        map.insert(handle, tid);
+        Some(tid)
+    }
+}
+
+fn measure_leaf(
+    known_dims: Size<Option<f32>>,
+    available_space: Size<AvailableSpace>,
+    cb: Option<f64>,
+) -> Size<f32> {
+    let cb = match cb {
+        Some(c) => c,
+        None => {
+            return Size {
+                width: known_dims.width.unwrap_or(0.0),
+                height: known_dims.height.unwrap_or(0.0),
+            }
+        }
+    };
+
+    // Build yoga measure args: (width, widthMode, height, heightMode).
+    let (w, wmode) = measure_axis(known_dims.width, available_space.width);
+    let (h, hmode) = measure_axis(known_dims.height, available_space.height);
+    let args = [w, wmode, h, hmode];
+
+    let result = unsafe { crate::closure::js_native_call_value(cb, args.as_ptr(), 4) };
+
+    // result is a NaN-boxed object {width, height}; read both numbers.
+    let bits = result.to_bits();
+    if (bits & !POINTER_MASK) != POINTER_TAG {
+        return Size {
+            width: known_dims.width.unwrap_or(0.0),
+            height: known_dims.height.unwrap_or(0.0),
+        };
+    }
+    let obj = (bits & POINTER_MASK) as *const crate::object::ObjectHeader;
+    let rw = read_obj_number(obj, b"width");
+    let rh = read_obj_number(obj, b"height");
+    Size {
+        width: rw.unwrap_or_else(|| known_dims.width.unwrap_or(0.0)),
+        height: rh.unwrap_or_else(|| known_dims.height.unwrap_or(0.0)),
+    }
+}
+
+fn measure_axis(known: Option<f32>, avail: AvailableSpace) -> (f64, f64) {
+    if let Some(k) = known {
+        (k as f64, YG_MEASURE_EXACTLY)
+    } else {
+        match avail {
+            AvailableSpace::Definite(v) => (v as f64, YG_MEASURE_AT_MOST),
+            _ => (f64::NAN, YG_MEASURE_UNDEFINED),
+        }
+    }
+}
+
+fn read_obj_number(obj: *const crate::object::ObjectHeader, name: &[u8]) -> Option<f32> {
+    let key = crate::string::js_string_from_bytes(name.as_ptr(), name.len() as u32);
+    if key.is_null() {
+        return None;
+    }
+    let v = crate::object::js_object_get_field_by_name_f64(obj, key);
+    if v.is_finite() {
+        Some(v as f32)
+    } else {
+        None
+    }
+}
+
+fn store_layout(
+    m: &mut HashMap<u32, YogaNode>,
+    taffy: &TaffyTree<u32>,
+    map: &HashMap<u32, NodeId>,
+    handle: u32,
+) {
+    if let Some(tid) = map.get(&handle) {
+        if let Ok(l) = taffy.layout(*tid) {
+            if let Some(node) = m.get_mut(&handle) {
+                node.layout = *l;
+            }
+        }
+    }
+    // Recurse (children list is on the node; clone to avoid borrow clash).
+    let children = m.get(&handle).map(|n| n.children.clone()).unwrap_or_default();
+    for c in children {
+        store_layout(m, taffy, map, c);
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn js_yoga_get_computed(id: f64, field: f64) -> f64 {
+    let (id, field) = (id as u32, field as u32);
+    with_nodes(|m| {
+        m.get(&id)
+            .map(|n| {
+                let l = &n.layout;
+                match field {
+                    C_LEFT => l.location.x as f64,
+                    C_TOP => l.location.y as f64,
+                    C_WIDTH => l.size.width as f64,
+                    C_HEIGHT => l.size.height as f64,
+                    C_RIGHT => (l.location.x + l.size.width) as f64,
+                    C_BOTTOM => (l.location.y + l.size.height) as f64,
+                    _ => 0.0,
+                }
+            })
+            .unwrap_or(0.0)
+    })
+}
+
+#[no_mangle]
+pub extern "C" fn js_yoga_get_computed_edge(id: f64, kind: f64, edge: f64) -> f64 {
+    let (id, kind, edge) = (id as u32, kind as u32, edge as u32);
+    with_nodes(|m| {
+        m.get(&id)
+            .map(|n| {
+                let l = &n.layout;
+                // taffy's Layout exposes resolved padding/border; margin is
+                // collapsed into positioning, so report 0 for it (ink only
+                // relies on getComputedPadding/getComputedBorder).
+                let r = match kind {
+                    E_PADDING => &l.padding,
+                    E_BORDER => &l.border,
+                    _ => return 0.0,
+                };
+                match edge {
+                    EDGE_LEFT | EDGE_START => r.left as f64,
+                    EDGE_RIGHT | EDGE_END => r.right as f64,
+                    EDGE_TOP => r.top as f64,
+                    EDGE_BOTTOM => r.bottom as f64,
+                    _ => 0.0,
+                }
+            })
+            .unwrap_or(0.0)
+    })
+}
+
+// Keep-alive anchors so whole-program LTO doesn't strip the #[no_mangle] FFI
+// symbols that are only referenced from generated `.o` (native-table dispatch).
+// Typed statics (coercion, not a const ptr→int cast).
+macro_rules! keep {
+    ($n:ident : $t:ty = $f:ident) => {
+        #[used]
+        static $n: $t = $f;
+    };
+}
+keep!(KEEP_YOGA_0: extern "C" fn() -> f64 = js_yoga_node_new);
+keep!(KEEP_YOGA_1: extern "C" fn(f64) -> f64 = js_yoga_node_free);
+keep!(KEEP_YOGA_2: extern "C" fn(f64, f64, f64) -> f64 = js_yoga_insert_child);
+keep!(KEEP_YOGA_3: extern "C" fn(f64, f64) -> f64 = js_yoga_remove_child);
+keep!(KEEP_YOGA_4: extern "C" fn(f64) -> f64 = js_yoga_child_count);
+keep!(KEEP_YOGA_5: extern "C" fn(f64, f64) -> f64 = js_yoga_set_measure_func);
+keep!(KEEP_YOGA_6: extern "C" fn(f64) -> f64 = js_yoga_unset_measure_func);
+keep!(KEEP_YOGA_7: extern "C" fn(f64, f64, f64, f64) -> f64 = js_yoga_set_number);
+keep!(KEEP_YOGA_8: extern "C" fn(f64, f64, f64, f64, f64) -> f64 = js_yoga_set_edge);
+keep!(KEEP_YOGA_9: extern "C" fn(f64, f64, f64, f64) -> f64 = js_yoga_set_gap);
+keep!(KEEP_YOGA_10: extern "C" fn(f64, f64, f64) -> f64 = js_yoga_set_enum);
+keep!(KEEP_YOGA_11: extern "C" fn(f64, f64, f64, f64) -> f64 = js_yoga_calculate_layout);
+keep!(KEEP_YOGA_12: extern "C" fn(f64, f64) -> f64 = js_yoga_get_computed);
+keep!(KEEP_YOGA_13: extern "C" fn(f64, f64, f64) -> f64 = js_yoga_get_computed_edge);

From 6b29f8630532344b1dbd8223fac57c947e951d22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralph=20K=C3=BCpper?= <ralph@skelpo.com>
Date: Fri, 12 Jun 2026 15:26:20 +0200
Subject: [PATCH 2/3] feat(compile): JSON module imports + version/changelog
 for ink #348
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Materialize `import x from "./foo.json"` (with or without
`with { type: "json" }`) as a native module exporting the parsed JSON as
its default export, instead of skipping JSON files outright. JSON is a
syntactic subset of a JS expression, so collect_modules synthesizes
`export default <json>;` and feeds it through the normal parse → lower →
codegen path; non-JSON modules take an identical path. Validates as JSON
first for a clear error on malformed input.

Fixes ink's `<Box borderStyle="round">` crash (cli-boxes imports
`boxes.json`, which previously resolved to the empty-module sentinel and
threw `Cannot read properties of undefined (reading 'topLeft')`).

Bundles the version bump (0.5.1162) + changelog for the native yoga/taffy
backend and the labeled-break-from-nested-switch fix already on this branch.
---
 CHANGELOG.md                                  |  59 +++++++
 CLAUDE.md                                     |   2 +-
 Cargo.lock                                    | 148 +++++++++---------
 Cargo.toml                                    |   2 +-
 .../src/commands/compile/collect_modules.rs   |  34 ++--
 5 files changed, 160 insertions(+), 85 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9811b33df0..ac18d58c61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,62 @@
+## v0.5.1162 — feat: native yoga-layout via taffy + JSON module imports + Context.Provider fix (ink #348 end-to-end)
+
+Makes `ink` (React-based TUI) compile **and render** fully natively — no WASM
+yoga, no V8. Three independent changes land together under #348.
+
+### 1. Native `perry/yoga` backend over taffy
+
+`yoga-layout` (the WASM flexbox engine ink depends on for geometry) is replaced
+by a native backend built on `taffy` 0.7 (already a `perry-runtime` dependency).
+
+- New `crates/perry-runtime/src/yoga.rs`: a handle-based node store
+  (`YOGA_NODES`) with the full FFI surface ink uses — node new/free,
+  insert/remove/child-count, set number/edge/gap/enum props, measure-func
+  register/unregister, `calculateLayout`, and computed-box/edge getters. Each
+  `calculateLayout` builds a fresh `TaffyTree`, wires per-node measure
+  callbacks back into JS via `js_native_call_value`, and computes layout with
+  `compute_layout_with_measure`. A GC root scanner marks the live measure
+  callbacks.
+- New `crates/perry-codegen/src/lower_call/native_table/yoga.rs`: 14
+  `NativeModSig` rows mapping the `perry/yoga` method names to the runtime
+  entry points; registered in `native_table/mod.rs`.
+- `perry/yoga` added to the perry-namespace module list in
+  `perry-api-manifest`.
+- `node_modules/yoga-layout`'s `src/index.ts` is a thin shim re-exporting the
+  native primitives behind the real yoga `Node`/`Config` API surface.
+
+### 2. JSON module imports compile to a native default export
+
+`import data from "./x.json"` (with or without `with { type: "json" }`) was
+previously **skipped entirely** during module collection, leaving the default
+import bound to the empty-module sentinel. ink's `cli-boxes` dependency
+(`import cliBoxes from "./boxes.json"`) therefore resolved to `undefined`, and
+any `<Box borderStyle="round">` threw `Cannot read properties of undefined
+(reading 'topLeft')`.
+
+`crates/perry/src/commands/compile/collect_modules.rs` now materializes a JSON
+import as a native ESM module: the file is validated as JSON, then compiled as
+`export default <json>;` (JSON being a syntactic subset of a JS expression) and
+flows through the normal parse → lower → codegen path. Non-JSON modules are
+unaffected (identical code path). Malformed JSON now fails with a clear
+`Failed to parse JSON module …` error instead of silently producing the
+sentinel.
+
+### 3. Labeled `break` from a nested `switch` resolves to the outer switch
+
+A labeled `switch` did not register its label as a break target, so a
+`break <label>;` from a *nested* switch (as in react-reconciler's
+`createFiberFromTypeAndProps`) escaped to the wrong exit — dropping
+`Context.Provider` children, so ink rendered nothing. `switch_stmt.rs` now
+registers the consumed label like loops already did.
+
+Result: `render(<App/>)` with nested Boxes, `flexDirection` row/column,
+`padding`/`margin`/`width`/`justifyContent`, and `borderStyle` all lay out via
+taffy and emit positioned ANSI from a single native executable.
+
+Known remaining follow-up (separate, minor): `<Text dimColor>` renders as
+`[object Object]` (boolean style-modifier handling in ink's Text); `color=`
+works.
+
 ## v0.5.1161 — fix(http): `server.ref()`/`server.unref()` return `this` instead of a raw number (#5011)
 
 Fixes #5011 — `server.ref()` and `server.unref()` on a `node:http`/`node:https`
diff --git a/CLAUDE.md b/CLAUDE.md
index 4e1a825ef3..247b3d0f0c 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -8,7 +8,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 Perry is a native TypeScript compiler written in Rust that compiles TypeScript source code directly to native executables. It uses SWC for TypeScript parsing and LLVM for code generation.
 
-**Current Version:** 0.5.1161
+**Current Version:** 0.5.1162
 
 
 ## TypeScript Parity Status
diff --git a/Cargo.lock b/Cargo.lock
index fe84f0a331..07b69c6d66 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5283,7 +5283,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "perry"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "anyhow",
  "base64",
@@ -5338,14 +5338,14 @@ dependencies = [
 
 [[package]]
 name = "perry-api-manifest"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "perry-audio-miniaudio"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "cc",
  "libc",
@@ -5353,7 +5353,7 @@ dependencies = [
 
 [[package]]
 name = "perry-codegen"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "anyhow",
  "log",
@@ -5368,7 +5368,7 @@ dependencies = [
 
 [[package]]
 name = "perry-codegen-arkts"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "anyhow",
  "perry-hir",
@@ -5377,7 +5377,7 @@ dependencies = [
 
 [[package]]
 name = "perry-codegen-glance"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "anyhow",
  "perry-hir",
@@ -5385,7 +5385,7 @@ dependencies = [
 
 [[package]]
 name = "perry-codegen-js"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "anyhow",
  "perry-dispatch",
@@ -5395,7 +5395,7 @@ dependencies = [
 
 [[package]]
 name = "perry-codegen-swiftui"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "anyhow",
  "perry-hir",
@@ -5404,7 +5404,7 @@ dependencies = [
 
 [[package]]
 name = "perry-codegen-wasm"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "anyhow",
  "base64",
@@ -5417,7 +5417,7 @@ dependencies = [
 
 [[package]]
 name = "perry-codegen-wear-tiles"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "anyhow",
  "perry-hir",
@@ -5425,7 +5425,7 @@ dependencies = [
 
 [[package]]
 name = "perry-container-compose"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -5454,14 +5454,14 @@ dependencies = [
 
 [[package]]
 name = "perry-container-e2e"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "anyhow",
 ]
 
 [[package]]
 name = "perry-diagnostics"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "serde",
  "serde_json",
@@ -5469,7 +5469,7 @@ dependencies = [
 
 [[package]]
 name = "perry-dispatch"
-version = "0.5.1161"
+version = "0.5.1162"
 
 [[package]]
 name = "perry-doc-fixture-my-bindings"
@@ -5480,7 +5480,7 @@ dependencies = [
 
 [[package]]
 name = "perry-doc-tests"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "anyhow",
  "clap",
@@ -5495,14 +5495,14 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-ads"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "perry-ffi",
 ]
 
 [[package]]
 name = "perry-ext-argon2"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "argon2",
  "perry-ffi",
@@ -5510,7 +5510,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-axios"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "perry-ffi",
  "reqwest",
@@ -5519,7 +5519,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-bcrypt"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "bcrypt",
  "perry-ffi",
@@ -5527,7 +5527,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-better-sqlite3"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "perry-ffi",
  "rusqlite",
@@ -5535,7 +5535,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-cheerio"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "perry-ffi",
  "scraper",
@@ -5543,7 +5543,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-commander"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "perry-ffi",
  "perry-runtime",
@@ -5551,7 +5551,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-cron"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "chrono",
  "cron 0.16.0",
@@ -5561,7 +5561,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-dayjs"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "chrono",
  "perry-ffi",
@@ -5569,7 +5569,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-decimal"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "perry-ffi",
  "rust_decimal",
@@ -5577,7 +5577,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-dotenv"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "perry-ffi",
  "serde_json",
@@ -5585,7 +5585,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-ethers"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "perry-ffi",
  "rand 0.8.6",
@@ -5593,7 +5593,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-events"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "perry-ffi",
  "perry-runtime",
@@ -5601,14 +5601,14 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-exponential-backoff"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "perry-ffi",
 ]
 
 [[package]]
 name = "perry-ext-fastify"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "bytes",
  "http-body-util",
@@ -5625,7 +5625,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-fetch"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "lazy_static",
  "perry-ffi",
@@ -5637,7 +5637,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-http"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "lazy_static",
  "perry-ext-http-server",
@@ -5650,7 +5650,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-http-server"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "bytes",
  "h2",
@@ -5673,7 +5673,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-ioredis"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "lazy_static",
  "perry-ffi",
@@ -5683,7 +5683,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-jsonwebtoken"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "base64",
  "jsonwebtoken",
@@ -5694,7 +5694,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-lru-cache"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "lru",
  "perry-ffi",
@@ -5702,7 +5702,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-moment"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "chrono",
  "perry-ffi",
@@ -5710,7 +5710,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-mongodb"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "bson",
  "futures-util",
@@ -5722,7 +5722,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-mysql2"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "chrono",
  "perry-ffi",
@@ -5732,7 +5732,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-nanoid"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "nanoid",
  "perry-ffi",
@@ -5741,7 +5741,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-net"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "perry-ffi",
  "perry-runtime",
@@ -5753,7 +5753,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-nodemailer"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "lettre",
  "perry-ffi",
@@ -5763,7 +5763,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-pdf"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "perry-ffi",
  "printpdf",
@@ -5771,7 +5771,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-pg"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "perry-ffi",
  "sqlx",
@@ -5780,7 +5780,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-ratelimit"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "governor",
  "perry-ffi",
@@ -5788,7 +5788,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-sharp"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "base64",
  "image",
@@ -5797,14 +5797,14 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-slugify"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "perry-ffi",
 ]
 
 [[package]]
 name = "perry-ext-streams"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "lazy_static",
  "perry-ffi",
@@ -5813,7 +5813,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-uuid"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "perry-ffi",
  "uuid",
@@ -5821,7 +5821,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-validator"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "perry-ffi",
  "regex",
@@ -5831,7 +5831,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-ws"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "futures-util",
  "lazy_static",
@@ -5843,7 +5843,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ext-zlib"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "brotli",
  "flate2",
@@ -5852,7 +5852,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ffi"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "dashmap",
  "once_cell",
@@ -5861,7 +5861,7 @@ dependencies = [
 
 [[package]]
 name = "perry-hir"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "anyhow",
  "perry-api-manifest",
@@ -5878,7 +5878,7 @@ dependencies = [
 
 [[package]]
 name = "perry-parser"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "anyhow",
  "perry-diagnostics",
@@ -5890,7 +5890,7 @@ dependencies = [
 
 [[package]]
 name = "perry-runtime"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "anyhow",
  "base64",
@@ -5922,7 +5922,7 @@ dependencies = [
 
 [[package]]
 name = "perry-stdlib"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "aes 0.8.4",
  "aes-gcm",
@@ -6014,7 +6014,7 @@ dependencies = [
 
 [[package]]
 name = "perry-transform"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "anyhow",
  "perry-hir",
@@ -6024,7 +6024,7 @@ dependencies = [
 
 [[package]]
 name = "perry-types"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "anyhow",
  "thiserror 1.0.69",
@@ -6032,14 +6032,14 @@ dependencies = [
 
 [[package]]
 name = "perry-ui"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "perry-ui-model",
 ]
 
 [[package]]
 name = "perry-ui-android"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "base64",
  "itoa",
@@ -6056,7 +6056,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ui-geisterhand"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "rand 0.8.6",
  "serde",
@@ -6066,7 +6066,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ui-gtk4"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "base64",
  "cairo-rs",
@@ -6089,7 +6089,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ui-ios"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "base64",
  "block2",
@@ -6105,7 +6105,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ui-macos"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "base64",
  "block2",
@@ -6120,7 +6120,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ui-model"
-version = "0.5.1161"
+version = "0.5.1162"
 
 [[package]]
 name = "perry-ui-test"
@@ -6128,11 +6128,11 @@ version = "0.1.0"
 
 [[package]]
 name = "perry-ui-testkit"
-version = "0.5.1161"
+version = "0.5.1162"
 
 [[package]]
 name = "perry-ui-tvos"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "base64",
  "block2",
@@ -6148,7 +6148,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ui-visionos"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "base64",
  "block2",
@@ -6164,7 +6164,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ui-watchos"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "block2",
  "libc",
@@ -6177,7 +6177,7 @@ dependencies = [
 
 [[package]]
 name = "perry-ui-windows"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "base64",
  "libc",
@@ -6194,14 +6194,14 @@ dependencies = [
 
 [[package]]
 name = "perry-ui-windows-winui"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "perry-ui-windows",
 ]
 
 [[package]]
 name = "perry-updater"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "base64",
  "ed25519-dalek",
@@ -6215,7 +6215,7 @@ dependencies = [
 
 [[package]]
 name = "perry-wasm-host"
-version = "0.5.1161"
+version = "0.5.1162"
 dependencies = [
  "wasmi",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 23bcf3e713..1aa69e4ebe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -201,7 +201,7 @@ codegen-units = 16
 opt-level = "s"       # Optimize for size in stdlib
 
 [workspace.package]
-version = "0.5.1161"
+version = "0.5.1162"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/PerryTS/perry"
diff --git a/crates/perry/src/commands/compile/collect_modules.rs b/crates/perry/src/commands/compile/collect_modules.rs
index 1f476e1eca..710c9d9e2c 100644
--- a/crates/perry/src/commands/compile/collect_modules.rs
+++ b/crates/perry/src/commands/compile/collect_modules.rs
@@ -501,16 +501,15 @@ fn collect_module_one(
     // surfaces as an unsupported-module error rather than silently running).
     let should_use_js_runtime =
         (is_js_file(&canonical) && !is_in_compiled_pkg && is_in_node_modules)
-            || is_declaration_file(&canonical)
-            || is_json;
+            || is_declaration_file(&canonical);
 
-    // Skip JSON files — they're data, not code (imported via `with { type: "json" }`)
-    if is_json {
-        return Ok(ModuleDiscovery {
-            finish: None,
-            children: pending,
-        });
-    }
+    // #348 follow-up: JSON module imports (`import data from "./x.json"`,
+    // optionally with `with { type: "json" }`) are NOT skipped — they compile
+    // to a native module whose default export is the parsed data (synthesized
+    // as `export default <json>;` just below). Previously JSON was handed to
+    // the (now-removed) JS runtime / skipped outright, leaving the default
+    // import bound to the empty-module sentinel — which broke cli-boxes (and
+    // thus ink's `borderStyle` box-drawing).
 
     if should_use_js_runtime {
         // Skip declaration files - they're just type information
@@ -607,6 +606,23 @@ fn collect_module_one(
     // It's a TypeScript file to compile natively
     let raw_source = fs::read_to_string(&canonical)
         .map_err(|e| anyhow!("Failed to read {}: {}", canonical.display(), e))?;
+    // JSON module import: turn the data file into a native ESM module whose
+    // default export is the parsed value. JSON is a syntactic subset of a JS
+    // expression, so `export default <json>;` parses and lowers like any other
+    // module. Validate as JSON first so a malformed file yields a clear error
+    // rather than a confusing TS parse failure on the synthesized source.
+    let raw_source = if is_json {
+        if let Err(e) = serde_json::from_str::<serde_json::Value>(&raw_source) {
+            return Err(anyhow!(
+                "Failed to parse JSON module {}: {}",
+                canonical.display(),
+                e
+            ));
+        }
+        format!("export default {};\n", raw_source.trim())
+    } else {
+        raw_source
+    };
     if is_in_compiled_pkg {
         refuse_compile_package_native_addon(ctx, &canonical)?;
     }

From 44c0f31d2326b71a2f634775c00e4e053ced79b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralph=20K=C3=BCpper?= <ralph@skelpo.com>
Date: Fri, 12 Jun 2026 17:14:39 +0200
Subject: [PATCH 3/3] fix(ci): cargo fmt + perry/yoga manifest entries + regen
 API docs

- cargo fmt on yoga.rs / lib.rs (lint job).
- Add the 14 `perry/yoga` rows to perry-api-manifest so the
  manifest-consistency check (#513) sees a counterpart for every
  NATIVE_MODULE_TABLE dispatch entry (cargo-test job).
- Regenerate docs/src/api/reference.md + docs/api/perry.d.ts to match
  (api-docs-drift job).
---
 crates/perry-api-manifest/src/entries.rs | 20 ++++++++++++++
 crates/perry-runtime/src/lib.rs          |  2 +-
 crates/perry-runtime/src/yoga.rs         | 12 +++++++--
 docs/api/perry.d.ts                      | 33 +++++++++++++++++++++++-
 docs/src/api/reference.md                | 22 +++++++++++++++-
 5 files changed, 84 insertions(+), 5 deletions(-)

diff --git a/crates/perry-api-manifest/src/entries.rs b/crates/perry-api-manifest/src/entries.rs
index 04a172a2bd..4137b23c3c 100644
--- a/crates/perry-api-manifest/src/entries.rs
+++ b/crates/perry-api-manifest/src/entries.rs
@@ -2348,6 +2348,26 @@ pub static API_MANIFEST: &[ApiEntry] = &[
         TypeSpec::Void,
     ),
     method_sig("perry/tui", "exit", false, None, &[], TypeSpec::Void),
+    // `perry/yoga` — native taffy-backed flexbox primitives consumed by the
+    // `yoga-layout` TS shim (see crates/perry-runtime/src/yoga.rs and
+    // codegen's native_table/yoga.rs). All free functions taking numeric
+    // handle/value args; the `(...args: any[]): any` .d.ts fallback is fine
+    // since only the internal shim calls them. These rows mirror the dispatch
+    // table so the manifest-consistency check (#513) stays satisfied.
+    method("perry/yoga", "nodeNew", false, None),
+    method("perry/yoga", "nodeFree", false, None),
+    method("perry/yoga", "insertChild", false, None),
+    method("perry/yoga", "removeChild", false, None),
+    method("perry/yoga", "childCount", false, None),
+    method("perry/yoga", "setMeasureFunc", false, None),
+    method("perry/yoga", "unsetMeasureFunc", false, None),
+    method("perry/yoga", "setNumber", false, None),
+    method("perry/yoga", "setEdge", false, None),
+    method("perry/yoga", "setGap", false, None),
+    method("perry/yoga", "setEnum", false, None),
+    method("perry/yoga", "calculateLayout", false, None),
+    method("perry/yoga", "getComputed", false, None),
+    method("perry/yoga", "getComputedEdge", false, None),
     method_sig(
         "perry/tui",
         "boxSetFlexDirection",
diff --git a/crates/perry-runtime/src/lib.rs b/crates/perry-runtime/src/lib.rs
index 822ac1e40c..d93b7d1e3b 100644
--- a/crates/perry-runtime/src/lib.rs
+++ b/crates/perry-runtime/src/lib.rs
@@ -55,7 +55,6 @@ pub mod ffi;
 pub mod frame;
 pub mod fs;
 pub mod gc;
-pub mod yoga;
 pub mod intl;
 pub mod iterator_helpers;
 pub mod macos_bundle;
@@ -75,6 +74,7 @@ pub mod node_sea;
 pub mod node_stream;
 pub mod node_submodules;
 pub mod node_test;
+pub mod yoga;
 // #3137/#3138/#3142: public `node:v8` serialize/deserialize + heap stats + GCProfiler.
 pub mod node_v8;
 // #3127/#3128/#3130/#3283: public `node:vm` import/require and narrowed execution.
diff --git a/crates/perry-runtime/src/yoga.rs b/crates/perry-runtime/src/yoga.rs
index 8a69de7af0..be0ae76e83 100644
--- a/crates/perry-runtime/src/yoga.rs
+++ b/crates/perry-runtime/src/yoga.rs
@@ -487,7 +487,12 @@ const YG_MEASURE_EXACTLY: f64 = 1.0;
 const YG_MEASURE_AT_MOST: f64 = 2.0;
 
 #[no_mangle]
-pub extern "C" fn js_yoga_calculate_layout(id: f64, width: f64, height: f64, _direction: f64) -> f64 {
+pub extern "C" fn js_yoga_calculate_layout(
+    id: f64,
+    width: f64,
+    height: f64,
+    _direction: f64,
+) -> f64 {
     let root_id = id as u32;
 
     // Phase 1: build a fresh taffy tree from the registry, collecting the
@@ -653,7 +658,10 @@ fn store_layout(
         }
     }
     // Recurse (children list is on the node; clone to avoid borrow clash).
-    let children = m.get(&handle).map(|n| n.children.clone()).unwrap_or_default();
+    let children = m
+        .get(&handle)
+        .map(|n| n.children.clone())
+        .unwrap_or_default();
     for c in children {
         store_layout(m, taffy, map, c);
     }
diff --git a/docs/api/perry.d.ts b/docs/api/perry.d.ts
index eb6b40b8b5..11dbe97857 100644
--- a/docs/api/perry.d.ts
+++ b/docs/api/perry.d.ts
@@ -1,6 +1,6 @@
 // Auto-generated from Perry's API manifest (#465). Do not edit by hand.
 // Source: perry-api-manifest::API_MANIFEST
-// Coverage: 1925 entries across 111 modules
+// Coverage: 1939 entries across 112 modules
 
 type PerryU32 = number & { readonly __perryU32?: never };
 type PerryU64 = number & { readonly __perryU64?: never };
@@ -3055,6 +3055,37 @@ declare module "perry/workloads" {
   export function runGraph(...args: any[]): any;
 }
 
+declare module "perry/yoga" {
+  /** stdlib */
+  export function calculateLayout(...args: any[]): any;
+  /** stdlib */
+  export function childCount(...args: any[]): any;
+  /** stdlib */
+  export function getComputed(...args: any[]): any;
+  /** stdlib */
+  export function getComputedEdge(...args: any[]): any;
+  /** stdlib */
+  export function insertChild(...args: any[]): any;
+  /** stdlib */
+  export function nodeFree(...args: any[]): any;
+  /** stdlib */
+  export function nodeNew(...args: any[]): any;
+  /** stdlib */
+  export function removeChild(...args: any[]): any;
+  /** stdlib */
+  export function setEdge(...args: any[]): any;
+  /** stdlib */
+  export function setEnum(...args: any[]): any;
+  /** stdlib */
+  export function setGap(...args: any[]): any;
+  /** stdlib */
+  export function setMeasureFunc(...args: any[]): any;
+  /** stdlib */
+  export function setNumber(...args: any[]): any;
+  /** stdlib */
+  export function unsetMeasureFunc(...args: any[]): any;
+}
+
 declare module "pg" {
   /** stdlib */
   export class Client { [key: string]: any; }
diff --git a/docs/src/api/reference.md b/docs/src/api/reference.md
index f17e54dd1e..994566740e 100644
--- a/docs/src/api/reference.md
+++ b/docs/src/api/reference.md
@@ -2,7 +2,7 @@
 
 This page is auto-generated from Perry's compile-time API manifest (`perry-api-manifest::API_MANIFEST`). It is the source of truth for what `perry compile` accepts; references to symbols not listed here produce `R005 UnimplementedApi` (issue #463). Stubs (#464) are flagged ⚠ — they link cleanly but no-op at runtime on the chosen target.
 
-Total: 2786 entries across 114 modules.
+Total: 2800 entries across 115 modules.
 
 ## Modules
 
@@ -82,6 +82,7 @@ Total: 2786 entries across 114 modules.
 - [`perry/updater`](#perry-updater)
 - [`perry/widget`](#perry-widget)
 - [`perry/workloads`](#perry-workloads)
+- [`perry/yoga`](#perry-yoga)
 - [`pg`](#pg)
 - [`process`](#process)
 - [`punycode`](#punycode)
@@ -2670,6 +2671,25 @@ Total: 2786 entries across 114 modules.
 - `policy`
 - `runtime`
 
+## `perry/yoga`
+
+### Methods
+
+- `calculateLayout` — module
+- `childCount` — module
+- `getComputed` — module
+- `getComputedEdge` — module
+- `insertChild` — module
+- `nodeFree` — module
+- `nodeNew` — module
+- `removeChild` — module
+- `setEdge` — module
+- `setEnum` — module
+- `setGap` — module
+- `setMeasureFunc` — module
+- `setNumber` — module
+- `unsetMeasureFunc` — module
+
 ## `pg`
 
 ### Classes