@barefootjs/mojolicious 0.4.0 → 0.5.1

package/dist/adapter/index.js

@@ -87,6 +87,7 @@ class MojoAdapter extends BaseAdapter {
   name = "mojolicious";
   extension = ".html.ep";
   templatesPerComponent = true;
+  importMapInjection = "html-snippet";
   templatePrimitives = MOJO_PRIMITIVE_EMIT_MAP;
   componentName = "";
   options;
@@ -399,8 +400,10 @@ ${whenTrue}
     const indexVar = loop.iterationShape === "keys" ? `$${param}` : loop.index ? `$${loop.index}` : "$_i";
     const prevInLoop = this.inLoop;
     this.inLoop = true;
-    const children = this.renderChildren(loop.children);
+    const renderedChildren = this.renderChildren(loop.children);
     this.inLoop = prevInLoop;
+    const children = loop.bodyIsItemConditional && loop.key ? `<%== bf->comment("loop-i:" . ${this.convertExpressionToPerl(loop.key)}) %>
+${renderedChildren}` : renderedChildren;
     const lines = [];
     lines.push(`<%== bf->comment("loop:${loop.markerId}") %>`);
     if (sortedHoist && loop.sortComparator) {
@@ -919,8 +922,11 @@ function perlIdentifierFromMarkerId(markerId) {
   return markerId.replace(/[^a-zA-Z0-9]/g, (ch) => ch === "_" ? "__" : `_x${ch.charCodeAt(0).toString(16)}`);
 }
 function renderSortMethod(recv, c) {
-  const keyEntry = c.key.kind === "self" ? `key_kind => 'self'` : `key_kind => 'field', key => '${c.key.field}'`;
-  return `bf->sort(${recv}, { ${keyEntry}, compare_type => '${c.type}', direction => '${c.direction}' })`;
+  const keyHashes = c.keys.map((k) => {
+    const keyEntry = k.key.kind === "self" ? `key_kind => 'self'` : `key_kind => 'field', key => '${k.key.field}'`;
+    return `{ ${keyEntry}, compare_type => '${k.type}', direction => '${k.direction}' }`;
+  });
+  return `bf->sort(${recv}, { keys => [${keyHashes.join(", ")}] })`;
 }
 
 class MojoFilterEmitter {

package/dist/adapter/mojo-adapter.d.ts

@@ -24,6 +24,7 @@ export declare class MojoAdapter extends BaseAdapter implements IRNodeEmitter<Mo
     name: string;
     extension: string;
     templatesPerComponent: boolean;
+    importMapInjection: 'html-snippet';
     /**
      * Identifier-path callees the Mojo runtime can render in template
      * scope. The relocate pass consults this map to mark matching

package/dist/adapter/mojo-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mojo-adapter.d.ts","sourceRoot":"","sources":["../../src/adapter/mojo-adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mojo-adapter.d.ts","sourceRoot":"","sources":["../../src/adapter/mojo-adapter.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,WAAW,EACX,MAAM,EACN,SAAS,EACT,MAAM,EACN,YAAY,EACZ,aAAa,EACb,MAAM,EACN,WAAW,EACX,UAAU,EACV,MAAM,EACN,aAAa,EACb,UAAU,EACV,OAAO,EAKP,yBAAyB,EAC1B,MAAM,iBAAiB,CAAA;AACxB,OAAO,EACL,WAAW,EACX,KAAK,aAAa,EAClB,KAAK,sBAAsB,EAM3B,KAAK,aAAa,EAClB,KAAK,UAAU,EAYhB,MAAM,iBAAiB,CAAA;AAGxB;;;;;;GAMG;AACH,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;AAC1C,OAAO,KAAK,EAAE,UAAU,EAAiD,MAAM,iBAAiB,CAAA;AAkEhG,MAAM,WAAW,kBAAkB;IACjC,qEAAqE;IACrE,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAEzB,8EAA8E;IAC9E,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,qBAAa,WAAY,SAAQ,WAAY,YAAW,aAAa,CAAC,aAAa,CAAC;IAClF,IAAI,SAAgB;IACpB,SAAS,SAAa;IACtB,qBAAqB,UAAO;IAG5B,kBAAkB,EAAG,cAAc,CAAS;IAE5C;;;;;;;;;;;OAWG;IACH,kBAAkB,EAAE,yBAAyB,CAA0B;IAEvE,OAAO,CAAC,aAAa,CAAa;IAClC,OAAO,CAAC,OAAO,CAA8B;IAC7C,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,MAAM,CAAiB;IAC/B;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,mBAAmB,CAAyB;IACpD;;;;;;OAMG;IACH,OAAO,CAAC,eAAe,CAAsB;IAC7C,OAAO,CAAC,WAAW,CAAyB;IAE5C,YAAY,OAAO,GAAE,kBAAuB,EAM3C;IAED,QAAQ,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,aAAa,CAuDzE;IAMD,OAAO,CAAC,2BAA2B;IAenC,OAAO,CAAC,sBAAsB;IAa9B;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE/B;IAMD,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAE1F;IAED,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE7B;IAED,cAAc,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CAEzC;IAED,eAAe,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAElG;IAED,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAEpF;IAED,aAAa,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAE9F;IAED,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAE5F;IAED,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE7B;IAED,eAAe,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAElG;IAED,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAE5F;IAED,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAEtF;IAMD,aAAa,CAAC,OAAO,EAAE,SAAS,GAAG,MAAM,CAuBxC;IAMD,gBAAgB,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CAe3C;IAMD,iBAAiB,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CAsC7C;IAED,OAAO,CAAC,gBAAgB;IAOxB;;;OAGG;IACH,OAAO,CAAC,2BAA2B;IAcnC;;;;;OAKG;IACH,OAAO,CAAC,gCAAgC;IA8ExC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAsH/B;IAMD;;;;;;;;OAQG;IACH,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CA+BpC;IAED,eAAe,CAAC,IAAI,EAAE,WAAW,GAAG,MAAM,CA0CzC;IAED,OAAO,CAAC,sBAAsB,CAAI;IAElC,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,iBAAiB;IA0BzB,OAAO,CAAC,cAAc;IAQtB,OAAO,CAAC,UAAU;IAIlB,WAAW,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAgBjC;IAMD;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CA8FlC;IAED,OAAO,CAAC,gBAAgB;IA0BxB,iBAAiB,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CAIjD;IAED,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEvC;IAED,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEvC;IAMD;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;IAqB5B;;;OAGG;IACH,OAAO,CAAC,wBAAwB;IAuBhC,OAAO,CAAC,kBAAkB;IAiC1B,OAAO,CAAC,wBAAwB;IAsBhC,OAAO,CAAC,mBAAmB;IAe3B,OAAO,CAAC,iCAAiC;IAmCzC;;;;;;;OAOG;IACH,OAAO,CAAC,gCAAgC;IAmBxC;;;;;;;;;;;;;;;;OAgBG;IACH,OAAO,CAAC,+BAA+B;IA+BvC,OAAO,CAAC,uBAAuB;IAwH/B;;;;;;;;;;;;;;;;;OAiBG;IACH,OAAO,CAAC,yBAAyB;IA8DjC;;;;;;;;OAQG;IACH,OAAO,CAAC,sBAAsB;IAgD9B;;;;;OAKG;IACH,OAAO,CAAC,sBAAsB;IAI9B,4EAA4E;IAC5E,8BAA8B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAElD;IAED,iFAAiF;IACjF,2BAA2B,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAEnE;CACF;AAieD,eAAO,MAAM,WAAW,aAAoB,CAAA"}

package/dist/build.js

@@ -87,6 +87,7 @@ class MojoAdapter extends BaseAdapter {
   name = "mojolicious";
   extension = ".html.ep";
   templatesPerComponent = true;
+  importMapInjection = "html-snippet";
   templatePrimitives = MOJO_PRIMITIVE_EMIT_MAP;
   componentName = "";
   options;
@@ -399,8 +400,10 @@ ${whenTrue}
     const indexVar = loop.iterationShape === "keys" ? `$${param}` : loop.index ? `$${loop.index}` : "$_i";
     const prevInLoop = this.inLoop;
     this.inLoop = true;
-    const children = this.renderChildren(loop.children);
+    const renderedChildren = this.renderChildren(loop.children);
     this.inLoop = prevInLoop;
+    const children = loop.bodyIsItemConditional && loop.key ? `<%== bf->comment("loop-i:" . ${this.convertExpressionToPerl(loop.key)}) %>
+${renderedChildren}` : renderedChildren;
     const lines = [];
     lines.push(`<%== bf->comment("loop:${loop.markerId}") %>`);
     if (sortedHoist && loop.sortComparator) {
@@ -919,8 +922,11 @@ function perlIdentifierFromMarkerId(markerId) {
   return markerId.replace(/[^a-zA-Z0-9]/g, (ch) => ch === "_" ? "__" : `_x${ch.charCodeAt(0).toString(16)}`);
 }
 function renderSortMethod(recv, c) {
-  const keyEntry = c.key.kind === "self" ? `key_kind => 'self'` : `key_kind => 'field', key => '${c.key.field}'`;
-  return `bf->sort(${recv}, { ${keyEntry}, compare_type => '${c.type}', direction => '${c.direction}' })`;
+  const keyHashes = c.keys.map((k) => {
+    const keyEntry = k.key.kind === "self" ? `key_kind => 'self'` : `key_kind => 'field', key => '${k.key.field}'`;
+    return `{ ${keyEntry}, compare_type => '${k.type}', direction => '${k.direction}' }`;
+  });
+  return `bf->sort(${recv}, { keys => [${keyHashes.join(", ")}] })`;
 }
 
 class MojoFilterEmitter {

package/dist/index.js

@@ -87,6 +87,7 @@ class MojoAdapter extends BaseAdapter {
   name = "mojolicious";
   extension = ".html.ep";
   templatesPerComponent = true;
+  importMapInjection = "html-snippet";
   templatePrimitives = MOJO_PRIMITIVE_EMIT_MAP;
   componentName = "";
   options;
@@ -399,8 +400,10 @@ ${whenTrue}
     const indexVar = loop.iterationShape === "keys" ? `$${param}` : loop.index ? `$${loop.index}` : "$_i";
     const prevInLoop = this.inLoop;
     this.inLoop = true;
-    const children = this.renderChildren(loop.children);
+    const renderedChildren = this.renderChildren(loop.children);
     this.inLoop = prevInLoop;
+    const children = loop.bodyIsItemConditional && loop.key ? `<%== bf->comment("loop-i:" . ${this.convertExpressionToPerl(loop.key)}) %>
+${renderedChildren}` : renderedChildren;
     const lines = [];
     lines.push(`<%== bf->comment("loop:${loop.markerId}") %>`);
     if (sortedHoist && loop.sortComparator) {
@@ -919,8 +922,11 @@ function perlIdentifierFromMarkerId(markerId) {
   return markerId.replace(/[^a-zA-Z0-9]/g, (ch) => ch === "_" ? "__" : `_x${ch.charCodeAt(0).toString(16)}`);
 }
 function renderSortMethod(recv, c) {
-  const keyEntry = c.key.kind === "self" ? `key_kind => 'self'` : `key_kind => 'field', key => '${c.key.field}'`;
-  return `bf->sort(${recv}, { ${keyEntry}, compare_type => '${c.type}', direction => '${c.direction}' })`;
+  const keyHashes = c.keys.map((k) => {
+    const keyEntry = k.key.kind === "self" ? `key_kind => 'self'` : `key_kind => 'field', key => '${k.key.field}'`;
+    return `{ ${keyEntry}, compare_type => '${k.type}', direction => '${k.direction}' }`;
+  });
+  return `bf->sort(${recv}, { keys => [${keyHashes.join(", ")}] })`;
 }
 
 class MojoFilterEmitter {

package/lib/BarefootJS.pm

@@ -530,7 +530,8 @@ sub trim ($self, $recv) {
 # lowering (#1448 Tier B). Non-mutating — JS's mutate-vs-new
 # distinction is moot in SSR template context.
 #
-# Opts hash-ref (compiler emits exactly these four keys):
+# Opts hash-ref. The compiler emits a `keys` list of per-key hashes
+# in priority order; each hash carries:
 #
 #   key_kind     => 'self' | 'field'
 #   key          => '' when key_kind eq 'self'; field name verbatim
@@ -539,7 +540,7 @@ sub trim ($self, $recv) {
 #                   applied. Perl hash lookups are case-sensitive so
 #                   the key here must match the actual hash key the
 #                   user populated.
-#   compare_type => 'numeric' | 'string'
+#   compare_type => 'numeric' | 'string' | 'auto'
 #   direction    => 'asc' | 'desc'
 #
 # Accepted comparator catalogue (gated upstream at parse time —
@@ -548,47 +549,73 @@ sub trim ($self, $recv) {
 #   (a,b) => a.f - b.f                       → field, numeric
 #   (a,b) => a - b                           → self,  numeric
 #   (a,b) => a[.f].localeCompare(b[.f])      → field|self, string
+#   (a,b) => a.f > b.f ? 1 : -1              → field|self, auto
+#   any of the above ||-chained              → multi-key tie-breaks
 #   (and reversed-operand variants for `desc`).
 #
-# A future `nulls => 'first' | 'last'` knob can land alongside
-# without churn — the opts hash is the right place to grow.
+# `auto` (relational-ternary lowering) compares numerically when both
+# keys `looks_like_number`, else lexically — Go's `bf_sort` applies the
+# same rule so the two template adapters stay byte-equal.
+#
+# A future `nulls => 'first' | 'last'` knob can land per key without
+# churn — the opts hash is the right place to grow.
 
 sub sort ($self, $recv, $opts = {}) {
     return [] unless ref($recv) eq 'ARRAY';
-    my $key_kind     = $opts->{key_kind}     // 'self';
-    my $key          = $opts->{key}          // '';
-    my $compare_type = $opts->{compare_type} // 'numeric';
-    my $direction    = $opts->{direction}    // 'asc';
-
-    # Schwartzian transform: project each item to its sort key once,
-    # then sort by key, then drop the keys. Cheaper than re-resolving
-    # the field accessor inside every comparison for non-trivial arrays.
+
+    # Normalise the per-key specs (priority order, length >= 1).
+    my @spec = map {
+        {
+            key_kind     => $_->{key_kind}     // 'self',
+            key          => $_->{key}          // '',
+            compare_type => $_->{compare_type} // 'numeric',
+            direction    => $_->{direction}    // 'asc',
+        }
+    } @{ $opts->{keys} // [] };
+    return [ @$recv ] unless @spec;
+
+    # Schwartzian transform: project each item to all its sort keys
+    # once, then compare projected keys. Cheaper than re-resolving the
+    # field accessors inside every comparison for non-trivial arrays.
     my @keyed = map {
         my $item = $_;
-        my $k = $key_kind eq 'field' && ref($item) eq 'HASH' ? $item->{$key} : $item;
-        [$k, $item]
+        my @ks = map {
+            $_->{key_kind} eq 'field' && ref($item) eq 'HASH' ? $item->{ $_->{key} } : $item;
+        } @spec;
+        [ \@ks, $item ];
     } @$recv;
 
-    my $cmp;
-    if ($compare_type eq 'string') {
-        $cmp = $direction eq 'desc'
-            ? sub { ($b->[0] // '') cmp ($a->[0] // '') }
-            : sub { ($a->[0] // '') cmp ($b->[0] // '') };
-    } else {
-        # Numeric: undef projects to 0 so the sort is total without
-        # warnings on missing fields. Documented divergence from JS
-        # (which would coerce undef → NaN and produce indeterminate
-        # ordering); matching Go's `toFloat64(nil) == 0` keeps the
-        # adapter outputs symmetric.
-        $cmp = $direction eq 'desc'
-            ? sub { ($b->[0] // 0) <=> ($a->[0] // 0) }
-            : sub { ($a->[0] // 0) <=> ($b->[0] // 0) };
-    }
+    my $cmp = sub {
+        for my $i (0 .. $#spec) {
+            my $sp = $spec[$i];
+            my $c  = _compare_sort_key($a->[0][$i], $b->[0][$i], $sp->{compare_type});
+            next if $c == 0;            # tie on this key — try the next
+            return $sp->{direction} eq 'desc' ? -$c : $c;
+        }
+        return 0;
+    };
 
     my @sorted = sort $cmp @keyed;
     return [ map { $_->[1] } @sorted ];
 }
 
+# Compare two projected keys, ascending orientation (-1 / 0 / 1); the
+# caller negates for 'desc'. 'auto' compares numerically when both
+# keys look like numbers, else lexically (matches Go's `bf_sort`).
+# undef coalesces to '' / 0 so the order stays total without warnings.
+sub _compare_sort_key ($av, $bv, $compare_type) {
+    if ($compare_type eq 'string') {
+        return ($av // '') cmp ($bv // '');
+    }
+    if ($compare_type eq 'auto') {
+        if (looks_like_number($av // '') && looks_like_number($bv // '')) {
+            return ($av // 0) <=> ($bv // 0);
+        }
+        return ($av // '') cmp ($bv // '');
+    }
+    return ($av // 0) <=> ($bv // 0);    # numeric
+}
+
 # ---------------------------------------------------------------------------
 # JSX intrinsic-element spread (#1407)
 # ---------------------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/mojolicious",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "description": "Mojolicious EP template adapter for BarefootJS - generates .html.ep files from IR",
   "type": "module",
   "main": "./dist/index.js",
@@ -52,14 +52,14 @@
     "directory": "packages/adapter-mojolicious"
   },
   "dependencies": {
-    "@barefootjs/shared": "0.4.0"
+    "@barefootjs/shared": "0.5.1"
   },
   "peerDependencies": {
     "@barefootjs/jsx": ">=0.2.0"
   },
   "devDependencies": {
     "@barefootjs/adapter-tests": "0.1.0",
-    "@barefootjs/jsx": "0.4.0",
+    "@barefootjs/jsx": "0.5.1",
     "typescript": "^5.0.0"
   }
 }

package/src/__tests__/mojo-adapter.test.ts

@@ -69,21 +69,19 @@ runAdapterConformanceTests({
     'toggle-shared',
     'reactive-props',
     'props-reactivity-comparison',
-    // #1633: child component forwards a destructured rest bag
-    // (`function NativeSelect({ children, ...props })`) onto its
-    // element via `{...props}`. The Mojo child template references
-    // `$props` (`<%== $bf->spread_attrs($props) %>`), but
-    // `render_child` doesn't plumb the rest-spread bag into the child
-    // template's scope, so rendering dies with `Global symbol "$props"
-    // requires explicit package name`. The Go adapter plumbs the same
-    // bag via the `Spread_0`/`Extras map[string]any` Input field, so it
-    // renders fine; Mojo needs the equivalent render_child plumbing.
-    // The fixture exists to pin the CSR layer of #1633 (children
-    // materialization), which Hono / Go / CSR all verify — Mojo's
-    // spread-bag-in-child gap is orthogonal. Same class of spread-bag
-    // limitation that keeps `jsx-spread-rest-prop` /
-    // `jsx-spread-props-object` off the CSR conformance path.
-    'native-select-spread-children',
+    // #1665 whole-item loop conditional. The Mojo adapter correctly emits the
+    // per-item `<!--bf-loop-i:KEY-->` anchor, `data-key`, and the conditional
+    // markers (verified by template-structure tests), but the fixture's
+    // `sel() === t.id` string comparison lowers to Perl numeric `==`
+    // (`"b" == "a"` → `0 == 0` → true), so the perl-executed render renders
+    // every item's true branch instead of only the matching one. Selecting
+    // `eq` vs `==` from operand types is a separate pre-existing Mojo
+    // limitation (same family as the skipped `logical-or-jsx` /
+    // `nullish-coalescing-jsx` map shapes); the anchored SSR shape itself is
+    // covered cross-adapter by Hono + CSR conformance and the runtime
+    // hydration tests. Remove this skip once the Mojo limitation is fixed:
+    // https://github.com/piconic-ai/barefootjs/issues/1672
+    'loop-item-conditional',
   ],
   // Per-fixture build-time contracts for shapes the Mojo adapter
   // intentionally refuses to lower. Owned by this adapter test file
@@ -909,6 +907,8 @@ import { fixture as arraySortFieldAscFixture } from '../../../adapter-tests/fixt
 import { fixture as arraySortFieldDescFixture } from '../../../adapter-tests/fixtures/methods/array-sort-field-desc'
 import { fixture as arraySortPrimitiveFixture } from '../../../adapter-tests/fixtures/methods/array-sort-primitive'
 import { fixture as arraySortLocaleFixture } from '../../../adapter-tests/fixtures/methods/array-sort-locale'
+import { fixture as arraySortMultiKeyFixture } from '../../../adapter-tests/fixtures/methods/array-sort-multikey'
+import { fixture as arraySortTernaryFixture } from '../../../adapter-tests/fixtures/methods/array-sort-ternary'
 import { fixture as arrayToSortedFixture } from '../../../adapter-tests/fixtures/methods/array-toSorted'
 // #1448 Tier B — .entries / .keys / .values iteration shapes.
 import { fixture as arrayEntriesFixture } from '../../../adapter-tests/fixtures/methods/array-entries'
@@ -933,12 +933,17 @@ describe('MojoAdapter - #1448 Tier A/B fixture-driven lowering pins', () => {
     { fixture: stringTrimFixture,       expect: 'bf->trim($value)' },
     // #1448 Tier B — sort / toSorted. The loop-chained field cases
     // hoist into a `my $bf_iter_lN = bf->sort(...)` local; the
-    // standalone primitive cases inline the call.
-    { fixture: arraySortFieldAscFixture,  expect: `bf->sort($items, { key_kind => 'field', key => 'price', compare_type => 'numeric', direction => 'asc' })` },
-    { fixture: arraySortFieldDescFixture, expect: `bf->sort($items, { key_kind => 'field', key => 'price', compare_type => 'numeric', direction => 'desc' })` },
-    { fixture: arraySortPrimitiveFixture, expect: `bf->sort($nums, { key_kind => 'self', compare_type => 'numeric', direction => 'asc' })` },
-    { fixture: arraySortLocaleFixture,    expect: `bf->sort($names, { key_kind => 'self', compare_type => 'string', direction => 'asc' })` },
-    { fixture: arrayToSortedFixture,      expect: `bf->sort($nums, { key_kind => 'self', compare_type => 'numeric', direction => 'asc' })` },
+    // standalone primitive cases inline the call. Each comparison key
+    // is one hash under `keys` (a single-key comparator → one element).
+    { fixture: arraySortFieldAscFixture,  expect: `bf->sort($items, { keys => [{ key_kind => 'field', key => 'price', compare_type => 'numeric', direction => 'asc' }] })` },
+    { fixture: arraySortFieldDescFixture, expect: `bf->sort($items, { keys => [{ key_kind => 'field', key => 'price', compare_type => 'numeric', direction => 'desc' }] })` },
+    { fixture: arraySortPrimitiveFixture, expect: `bf->sort($nums, { keys => [{ key_kind => 'self', compare_type => 'numeric', direction => 'asc' }] })` },
+    { fixture: arraySortLocaleFixture,    expect: `bf->sort($names, { keys => [{ key_kind => 'self', compare_type => 'string', direction => 'asc' }] })` },
+    // Multi-key (`||`-chain): one hash per comparison key, in order.
+    { fixture: arraySortMultiKeyFixture,  expect: `bf->sort($items, { keys => [{ key_kind => 'field', key => 'price', compare_type => 'numeric', direction => 'asc' }, { key_kind => 'field', key => 'name', compare_type => 'string', direction => 'asc' }] })` },
+    // Relational-ternary comparator lowers to a single `auto` key.
+    { fixture: arraySortTernaryFixture,   expect: `bf->sort($items, { keys => [{ key_kind => 'field', key => 'rank', compare_type => 'auto', direction => 'asc' }] })` },
+    { fixture: arrayToSortedFixture,      expect: `bf->sort($nums, { keys => [{ key_kind => 'self', compare_type => 'numeric', direction => 'asc' }] })` },
     // #1448 Tier B — iteration shapes. These are loop-level patterns.
     // .entries() → for loop with both $i index var and $v value var
     { fixture: arrayEntriesFixture,       expect: '% my $v = $items->[$i];' },
@@ -966,3 +971,165 @@ describe('MojoAdapter - #1448 Tier A/B fixture-driven lowering pins', () => {
     })
   }
 })
+
+// =============================================================================
+// #1448 — `/* @client */` escape hatch for STILL-UNSUPPORTED methods
+// =============================================================================
+//
+// Mojo sibling of the Go block: #1448 documents `/* @client */` as the
+// universal workaround for any Array/String method the template
+// adapters can't lower. This pins that contract for the Mojo adapter —
+// wrapping the unsupported expression in the directive must clear the
+// BF021/BF101 build error the bare form raises and emit a client-only
+// placeholder so the Mojo SSR pass renders valid `.html.ep` that the
+// client runtime fills at hydration.
+//
+// Same silent-footgun caveat as Go: the unsupported *string* methods
+// raise NO build diagnostic — bare `.startsWith` / `.repeat` / … lower
+// to a Perl hash-deref-and-call (`$name->{startsWith}('a')`) that
+// passes the adapter gate, then dies at render with
+// `Can't use string (...) as a HASH ref while "strict refs"`.
+// `/* @client */` is the only escape hatch, so these tests pin it.
+describe('MojoAdapter - #1448 @client escape hatch (unsupported methods)', () => {
+  function emit(expr: string, client: boolean) {
+    const marker = client ? '/* @client */ ' : ''
+    const adapter = new MojoAdapter()
+    const ir = compileToIR(`
+"use client"
+import { createSignal } from "@barefootjs/client"
+export function C() {
+  const [items, setItems] = createSignal<{ name: string; n: number; tags: string[] }[]>([])
+  const [name, setName] = createSignal("x")
+  return <div>{${marker}${expr}}</div>
+}
+`, adapter)
+    const template = adapter.generate(ir).template ?? ''
+    return { errors: adapter.errors ?? [], template }
+  }
+
+  function emitLoop(chain: string, client: boolean) {
+    const marker = client ? '/* @client */ ' : ''
+    const adapter = new MojoAdapter()
+    const ir = compileToIR(`
+"use client"
+import { createSignal } from "@barefootjs/client"
+export function C() {
+  const [items, setItems] = createSignal<{ name: string; n: number }[]>([])
+  const myCmp = (a: { n: number }, b: { n: number }) => a.n - b.n
+  return <ul>{${marker}${chain}}</ul>
+}
+`, adapter)
+    const template = adapter.generate(ir).template ?? ''
+    return { errors: adapter.errors ?? [], template }
+  }
+
+  // Tier C array methods — bare form raises BF101 at build time.
+  const unsupportedArray: Array<[string, string]> = [
+    ['reduce', `items().reduce((a, b) => a + b.n, 0)`],
+    ['flatMap', `items().flatMap(i => i.tags)`],
+    ['flat', `items().flat()`],
+  ]
+  for (const [name, expr] of unsupportedArray) {
+    test(`array .${name}: bare raises BF101, @client clears it + emits client placeholder`, () => {
+      const bare = emit(expr, false)
+      expect(bare.errors.some(e => e.code === 'BF101')).toBe(true)
+
+      const guarded = emit(expr, true)
+      expect(guarded.errors).toEqual([])
+      // Client-only text slot → `<%== bf->comment("client:sN") %>`.
+      expect(guarded.template).toMatch(/bf->comment\("client:s\d+"\)/)
+    })
+  }
+
+  // Tier B/C string methods — bare form emits an INVALID Perl
+  // hash-deref-and-call with NO build error (the silent footgun).
+  const unsupportedString: Array<[string, string, string]> = [
+    ['split', `name().split(",")`, '->{split}'],
+    ['startsWith', `name().startsWith("a")`, '->{startsWith}'],
+    ['endsWith', `name().endsWith("z")`, '->{endsWith}'],
+    ['replace', `name().replace("a", "b")`, '->{replace}'],
+    ['repeat', `name().repeat(3)`, '->{repeat}'],
+    ['padStart', `name().padStart(5, "0")`, '->{padStart}'],
+    ['padEnd', `name().padEnd(5, "0")`, '->{padEnd}'],
+    ['charAt', `name().charAt(0)`, '->{charAt}'],
+  ]
+  for (const [name, expr, badEmit] of unsupportedString) {
+    test(`string .${name}: bare emits invalid Perl deref, @client emits client placeholder`, () => {
+      const bare = emit(expr, false)
+      // Documents the footgun: no BF101 guard, invalid template emitted.
+      expect(bare.errors.filter(e => e.code === 'BF101')).toEqual([])
+      expect(bare.template).toContain(badEmit)
+
+      const guarded = emit(expr, true)
+      expect(guarded.errors).toEqual([])
+      expect(guarded.template).toMatch(/bf->comment\("client:s\d+"\)/)
+      expect(guarded.template).not.toContain(badEmit)
+    })
+  }
+
+  // Tier B `.sort` / `.toSorted` follow-ups still refused with BF021.
+  // The Mojo client-only loop placeholder is an empty element (the
+  // client runtime repopulates it via the `bf-s` scope marker), so the
+  // contract here is: no errors + the comparator never lowers + no
+  // rendered `<li>` survives.
+  const unsupportedSort: Array<[string, string]> = [
+    ['function-reference comparator', `items().toSorted(myCmp).map(x => <li key={x.name}>{x.name}</li>)`],
+    ['localeCompare locale/options arg', `items().toSorted((a, b) => a.name.localeCompare(b.name, "ja", { numeric: true })).map(x => <li key={x.name}>{x.name}</li>)`],
+  ]
+  for (const [label, chain] of unsupportedSort) {
+    test(`sort follow-up (${label}): bare raises BF021, @client clears it`, () => {
+      const bare = compileJSX(`
+"use client"
+import { createSignal } from "@barefootjs/client"
+export function C() {
+  const [items, setItems] = createSignal<{ name: string; n: number }[]>([])
+  const myCmp = (a: { n: number }, b: { n: number }) => a.n - b.n
+  return <ul>{${chain}}</ul>
+}
+`.trimStart(), 'test.tsx', { adapter: new MojoAdapter() })
+      expect(bare.errors?.some(e => e.code === 'BF021')).toBe(true)
+
+      const guarded = emitLoop(chain, true)
+      expect(guarded.errors).toEqual([])
+      // Empty client-only loop placeholder — no item rows emitted SSR.
+      expect(guarded.template).not.toContain('<li')
+      expect(guarded.template).not.toContain('localeCompare')
+    })
+  }
+
+  // End-to-end proof via perl + Mojolicious: the bare unsupported form
+  // crashes Mojo template execution, while the `@client` form renders a
+  // `<!--bf-client:sN-->` placeholder. Skipped on hosts without
+  // Mojolicious installed.
+  test('e2e: bare string method crashes perl render, @client renders placeholder', async () => {
+    const guarded = `
+"use client"
+import { createSignal } from "@barefootjs/client"
+export function C() {
+  const [name, setName] = createSignal("hello")
+  return <div>{/* @client */ name().repeat(3)}</div>
+}
+`
+    const bareSrc = guarded.replace('/* @client */ ', '')
+    try {
+      const html = await renderMojoComponent({
+        source: guarded.trimStart(),
+        adapter: new MojoAdapter(),
+      })
+      expect(html).toContain('<!--bf-client:s0-->')
+    } catch (err) {
+      if (err instanceof PerlNotAvailableError) {
+        console.log('Skipping #1448 @client e2e: perl/Mojolicious not found')
+        return
+      }
+      throw err
+    }
+    // Bare form must fail Mojo template execution (no @client guard).
+    await expect(
+      renderMojoComponent({
+        source: bareSrc.trimStart(),
+        adapter: new MojoAdapter(),
+      }),
+    ).rejects.toThrow(/HASH ref/)
+  })
+})

package/src/adapter/mojo-adapter.ts

@@ -135,6 +135,9 @@ export class MojoAdapter extends BaseAdapter implements IRNodeEmitter<MojoRender
   name = 'mojolicious'
   extension = '.html.ep'
   templatesPerComponent = true
+  // Template-string target with no component layer: `bf build` emits a static
+  // `barefoot-importmap.html` to `%= include` into the page <head> (#1644).
+  importMapInjection = 'html-snippet' as const
 
   /**
    * Identifier-path callees the Mojo runtime can render in template
@@ -595,9 +598,19 @@ export class MojoAdapter extends BaseAdapter implements IRNodeEmitter<MojoRender
       : loop.index ? `$${loop.index}` : '$_i'
     const prevInLoop = this.inLoop
     this.inLoop = true
-    const children = this.renderChildren(loop.children)
+    const renderedChildren = this.renderChildren(loop.children)
     this.inLoop = prevInLoop
 
+    // Whole-item conditional (#1665): prepend an always-present
+    // `<!--bf-loop-i:KEY-->` anchor before each item's (possibly empty)
+    // conditional content so the client's `mapArrayAnchored` can hydrate
+    // every SSR-rendered item by its anchor. `bf->comment` prepends `bf-`,
+    // so `"loop-i:" . KEY` yields `<!--bf-loop-i:KEY-->`.
+    const children =
+      loop.bodyIsItemConditional && loop.key
+        ? `<%== bf->comment("loop-i:" . ${this.convertExpressionToPerl(loop.key)}) %>\n${renderedChildren}`
+        : renderedChildren
+
     const lines: string[] = []
     // Scoped per-call-site marker so sibling `.map()`s under the same parent
     // each get their own reconciliation range (#1087).
@@ -1603,10 +1616,11 @@ function renderArrayMethod(
  * plus the loop-hoist path in `renderLoop` — same emit shape across
  * all three so a regression in any one path surfaces consistently.
  *
- * The Perl helper accepts a hash-ref opts bag (room for a future
- * `nulls` knob without arity churn), and returns a fresh ARRAY ref
- * so downstream composition (`@{bf->sort(...)}` in `join(...)`, etc.)
- * stays straightforward.
+ * The Perl helper accepts a hash-ref opts bag whose `keys` entry is
+ * an ordered list of per-key hashes (room for a future `nulls` knob
+ * without arity churn), and returns a fresh ARRAY ref so downstream
+ * composition (`@{bf->sort(...)}` in `join(...)`, etc.) stays
+ * straightforward.
  */
 /**
  * Encode an `IRLoop.markerId` into a Perl-identifier-safe suffix
@@ -1626,11 +1640,18 @@ function perlIdentifierFromMarkerId(markerId: string): string {
 }
 
 function renderSortMethod(recv: string, c: SortComparator): string {
-  const keyEntry =
-    c.key.kind === 'self'
-      ? `key_kind => 'self'`
-      : `key_kind => 'field', key => '${c.key.field}'`
-  return `bf->sort(${recv}, { ${keyEntry}, compare_type => '${c.type}', direction => '${c.direction}' })`
+  // One hash per comparison key, in priority order, under `keys`. A
+  // simple comparator yields a one-element list; a `||`-chained
+  // multi-key comparator yields one per operand. `bf->sort` walks them
+  // in order, falling through to the next on a tie.
+  const keyHashes = c.keys.map((k) => {
+    const keyEntry =
+      k.key.kind === 'self'
+        ? `key_kind => 'self'`
+        : `key_kind => 'field', key => '${k.key.field}'`
+    return `{ ${keyEntry}, compare_type => '${k.type}', direction => '${k.direction}' }`
+  })
+  return `bf->sort(${recv}, { keys => [${keyHashes.join(', ')}] })`
 }
 
 /**

package/src/test-render.ts

@@ -305,7 +305,7 @@ function buildChildRenderers(
   const lines: string[] = []
   lines.push(`# Register child component renderers`)
 
-  for (const [componentName] of childTemplates) {
+  for (const [componentName, { ir: childIR }] of childTemplates) {
     const snakeName = toSnakeCase(componentName)
     const childTemplatePath = resolve(tempDir, `${snakeName}.html.ep`)
 
@@ -326,6 +326,22 @@ function buildChildRenderers(
 
     lines.push(`  $bf->register_child_renderer('${snakeName}', sub {`)
     lines.push(`    my ($child_props) = @_;`)
+    // (#1652) A child that destructures a rest-spread bag
+    // (`function NativeSelect({ children, ...props })`) emits a
+    // template referencing `$<restPropsName>`
+    // (`<%== bf->spread_attrs($props) %>`). The parent's render_child
+    // call only forwards the props it explicitly passed (here just
+    // `children`), so the rest bag never reaches the child stash and
+    // Perl strict mode aborts with `Global symbol "$props" requires
+    // explicit package name`. Seed it with an empty hashref when the
+    // caller didn't supply one — mirroring the top-level harness path
+    // (`buildPerlProps`) and the production runtime's
+    // `_derive_stash_from_defaults` `isRestProps` branch, which plumbs
+    // the equivalent of Go's `Spread_0`/`Extras` Input field.
+    if (childIR.metadata.restPropsName) {
+      const rest = childIR.metadata.restPropsName
+      lines.push(`    $child_props->{${rest}} = {} unless defined $child_props->{${rest}};`)
+    }
     lines.push(`    ${slotIdsPerl}`)
     lines.push(`    my $child_bf = BarefootJS->new($c, {});`)
     lines.push(`    $child_bf->_scope_id("test_$sid");`)