@barefootjs/xslate 0.29.0 → 0.30.2

package/dist/adapter/index.js

@@ -187314,7 +187314,8 @@ import {
   dangerousInnerHtmlMetacharViolation,
   dangerousInnerHtmlDiagnostic,
   resolveStaticLoopSource,
-  collectLoopBoundNames as collectLoopBoundNames2
+  collectLoopBoundNames as collectLoopBoundNames2,
+  derivesScopeFromSlot
 } from "@barefootjs/jsx";
 
 // src/adapter/boolean-result.ts
@@ -188627,6 +188628,7 @@ ${whenTrue}
     this.inLoop = true;
     const prevLoopKeyDepth = this.currentLoopKeyDepth;
     this.currentLoopKeyDepth = loop.depth;
+    const preambleLines = (loop.preamble?.declarations ?? []).map((d) => `: my $${d.name} = ${this.convertExpressionToKolon(d.raw, d.valueParsed)};`);
     const childrenUnderLoop = this.renderChildren(loop.children);
     this.currentLoopKeyDepth = prevLoopKeyDepth;
     this.inLoop = prevInLoop;
@@ -188649,9 +188651,11 @@ ${childrenUnderLoop}` : childrenUnderLoop;
         filterCond = filterCond.replace(new RegExp(`\\$${loop.filterPredicate.param}\\b`, "g"), `$${param}`);
       }
       lines.push(`: if (${filterCond}) {`);
+      lines.push(...preambleLines);
       lines.push(bodyChildren);
       lines.push(`: }`);
     } else {
+      lines.push(...preambleLines);
       lines.push(bodyChildren);
     }
     lines.push(`: }`);
@@ -188711,10 +188715,7 @@ ${childrenUnderLoop}` : childrenUnderLoop;
       if ((p.name.match(/^on[A-Z]/) || p.name === "ref") && p.value.kind === "expression")
         continue;
       if (p.value.kind === "jsx-children" && p.name !== "children") {
-        const prevInLoop = this.inLoop;
-        this.inLoop = false;
         const slotBody = this.renderChildren(p.value.children);
-        this.inLoop = prevInLoop;
         const macroName = `bf_prop_${this.childrenCaptureCounter++}`;
         namedSlotMacros.push(`<: macro ${macroName} -> () { :>${slotBody}<: } :>`);
         currentEntries().push(`${kolonHashKey(p.name)} => ${macroName}()`);
@@ -188735,16 +188736,13 @@ ${childrenUnderLoop}` : childrenUnderLoop;
       if (lowered)
         currentEntries().push(lowered);
     }
-    if (comp.slotId && !this.inLoop) {
+    if (derivesScopeFromSlot(comp)) {
       currentEntries().push(`_bf_slot => '${comp.slotId}'`);
     }
     const tplName = this.toTemplateName(comp.name);
     const effectiveChildren = comp.children.length > 0 ? comp.children : resolveJsxChildrenProp(comp.props);
     if (effectiveChildren.length > 0) {
-      const prevInLoop = this.inLoop;
-      this.inLoop = false;
       const childrenBody = this.renderChildren(effectiveChildren);
-      this.inLoop = prevInLoop;
       const macroName = `bf_children_${comp.slotId ?? "c" + this.childrenCaptureCounter++}`;
       currentEntries().push(`children => ${macroName}()`);
       const dict = this.combineComponentPropSegments(segments);

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

@@ -1 +1 @@
-{"version":3,"file":"xslate-adapter.d.ts","sourceRoot":"","sources":["../../src/adapter/xslate-adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"xslate-adapter.d.ts","sourceRoot":"","sources":["../../src/adapter/xslate-adapter.ts"],"names":[],"mappings":"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"}

package/dist/build.js

@@ -187314,7 +187314,8 @@ import {
   dangerousInnerHtmlMetacharViolation,
   dangerousInnerHtmlDiagnostic,
   resolveStaticLoopSource,
-  collectLoopBoundNames as collectLoopBoundNames2
+  collectLoopBoundNames as collectLoopBoundNames2,
+  derivesScopeFromSlot
 } from "@barefootjs/jsx";
 
 // src/adapter/boolean-result.ts
@@ -188627,6 +188628,7 @@ ${whenTrue}
     this.inLoop = true;
     const prevLoopKeyDepth = this.currentLoopKeyDepth;
     this.currentLoopKeyDepth = loop.depth;
+    const preambleLines = (loop.preamble?.declarations ?? []).map((d) => `: my $${d.name} = ${this.convertExpressionToKolon(d.raw, d.valueParsed)};`);
     const childrenUnderLoop = this.renderChildren(loop.children);
     this.currentLoopKeyDepth = prevLoopKeyDepth;
     this.inLoop = prevInLoop;
@@ -188649,9 +188651,11 @@ ${childrenUnderLoop}` : childrenUnderLoop;
         filterCond = filterCond.replace(new RegExp(`\\$${loop.filterPredicate.param}\\b`, "g"), `$${param}`);
       }
       lines.push(`: if (${filterCond}) {`);
+      lines.push(...preambleLines);
       lines.push(bodyChildren);
       lines.push(`: }`);
     } else {
+      lines.push(...preambleLines);
       lines.push(bodyChildren);
     }
     lines.push(`: }`);
@@ -188711,10 +188715,7 @@ ${childrenUnderLoop}` : childrenUnderLoop;
       if ((p.name.match(/^on[A-Z]/) || p.name === "ref") && p.value.kind === "expression")
         continue;
       if (p.value.kind === "jsx-children" && p.name !== "children") {
-        const prevInLoop = this.inLoop;
-        this.inLoop = false;
         const slotBody = this.renderChildren(p.value.children);
-        this.inLoop = prevInLoop;
         const macroName = `bf_prop_${this.childrenCaptureCounter++}`;
         namedSlotMacros.push(`<: macro ${macroName} -> () { :>${slotBody}<: } :>`);
         currentEntries().push(`${kolonHashKey(p.name)} => ${macroName}()`);
@@ -188735,16 +188736,13 @@ ${childrenUnderLoop}` : childrenUnderLoop;
       if (lowered)
         currentEntries().push(lowered);
     }
-    if (comp.slotId && !this.inLoop) {
+    if (derivesScopeFromSlot(comp)) {
       currentEntries().push(`_bf_slot => '${comp.slotId}'`);
     }
     const tplName = this.toTemplateName(comp.name);
     const effectiveChildren = comp.children.length > 0 ? comp.children : resolveJsxChildrenProp(comp.props);
     if (effectiveChildren.length > 0) {
-      const prevInLoop = this.inLoop;
-      this.inLoop = false;
       const childrenBody = this.renderChildren(effectiveChildren);
-      this.inLoop = prevInLoop;
       const macroName = `bf_children_${comp.slotId ?? "c" + this.childrenCaptureCounter++}`;
       currentEntries().push(`children => ${macroName}()`);
       const dict = this.combineComponentPropSegments(segments);

package/dist/conformance-pins.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conformance-pins.d.ts","sourceRoot":"","sources":["../src/conformance-pins.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEtD,eAAO,MAAM,eAAe,EAAE,eA8J7B,CAAA"}
+{"version":3,"file":"conformance-pins.d.ts","sourceRoot":"","sources":["../src/conformance-pins.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEtD,eAAO,MAAM,eAAe,EAAE,eAyJ7B,CAAA"}

package/dist/index.js

@@ -187314,7 +187314,8 @@ import {
   dangerousInnerHtmlMetacharViolation,
   dangerousInnerHtmlDiagnostic,
   resolveStaticLoopSource,
-  collectLoopBoundNames as collectLoopBoundNames2
+  collectLoopBoundNames as collectLoopBoundNames2,
+  derivesScopeFromSlot
 } from "@barefootjs/jsx";
 
 // src/adapter/boolean-result.ts
@@ -188627,6 +188628,7 @@ ${whenTrue}
     this.inLoop = true;
     const prevLoopKeyDepth = this.currentLoopKeyDepth;
     this.currentLoopKeyDepth = loop.depth;
+    const preambleLines = (loop.preamble?.declarations ?? []).map((d) => `: my $${d.name} = ${this.convertExpressionToKolon(d.raw, d.valueParsed)};`);
     const childrenUnderLoop = this.renderChildren(loop.children);
     this.currentLoopKeyDepth = prevLoopKeyDepth;
     this.inLoop = prevInLoop;
@@ -188649,9 +188651,11 @@ ${childrenUnderLoop}` : childrenUnderLoop;
         filterCond = filterCond.replace(new RegExp(`\\$${loop.filterPredicate.param}\\b`, "g"), `$${param}`);
       }
       lines.push(`: if (${filterCond}) {`);
+      lines.push(...preambleLines);
       lines.push(bodyChildren);
       lines.push(`: }`);
     } else {
+      lines.push(...preambleLines);
       lines.push(bodyChildren);
     }
     lines.push(`: }`);
@@ -188711,10 +188715,7 @@ ${childrenUnderLoop}` : childrenUnderLoop;
       if ((p.name.match(/^on[A-Z]/) || p.name === "ref") && p.value.kind === "expression")
         continue;
       if (p.value.kind === "jsx-children" && p.name !== "children") {
-        const prevInLoop = this.inLoop;
-        this.inLoop = false;
         const slotBody = this.renderChildren(p.value.children);
-        this.inLoop = prevInLoop;
         const macroName = `bf_prop_${this.childrenCaptureCounter++}`;
         namedSlotMacros.push(`<: macro ${macroName} -> () { :>${slotBody}<: } :>`);
         currentEntries().push(`${kolonHashKey(p.name)} => ${macroName}()`);
@@ -188735,16 +188736,13 @@ ${childrenUnderLoop}` : childrenUnderLoop;
       if (lowered)
         currentEntries().push(lowered);
     }
-    if (comp.slotId && !this.inLoop) {
+    if (derivesScopeFromSlot(comp)) {
       currentEntries().push(`_bf_slot => '${comp.slotId}'`);
     }
     const tplName = this.toTemplateName(comp.name);
     const effectiveChildren = comp.children.length > 0 ? comp.children : resolveJsxChildrenProp(comp.props);
     if (effectiveChildren.length > 0) {
-      const prevInLoop = this.inLoop;
-      this.inLoop = false;
       const childrenBody = this.renderChildren(effectiveChildren);
-      this.inLoop = prevInLoop;
       const macroName = `bf_children_${comp.slotId ?? "c" + this.childrenCaptureCounter++}`;
       currentEntries().push(`children => ${macroName}()`);
       const dict = this.combineComponentPropSegments(segments);
@@ -189141,7 +189139,6 @@ var xslateAdapter = new XslateAdapter;
 // src/conformance-pins.ts
 var conformancePins = {
   "filter-typeof-predicate": [{ code: "BF021", severity: "error" }],
-  "map-preamble-branch-body": [{ code: "BF021", severity: "error" }],
   "map-array-builder-body": [{ code: "BF021", severity: "error" }],
   "map-array-builder-escaping": [{ code: "BF021", severity: "error" }],
   "fill-unsupported": [{ code: "BF101", severity: "error" }],
@@ -189169,7 +189166,10 @@ var conformancePins = {
 };
 // src/render-divergences.ts
 var renderDivergences = {
-  "composite-row-child-component": "a child component nested inside a dynamic loop row gets a random `Name_<id>` scope id from `render_child` instead of the parent-derived `<parent>_s0` the reference emits (https://github.com/piconic-ai/barefootjs/issues/2444)"
+  "aliased-destructured-prop": "aliased destructured prop `{ n: count }` loses its rename — template vars, ssr-defaults, and the props bridge all key off the local name, so the prop is always undefined (https://github.com/piconic-ai/barefootjs/issues/2460)",
+  "composite-row-child-aliased-prop": "same #2460 defect as `aliased-destructured-prop`, inside a keyed `.map()` loop row: the nested child's renamed prop (`{ n: count }`) is always undefined, so both rows render an empty count (https://github.com/piconic-ai/barefootjs/issues/2460)",
+  "loop-param-shadows-bool-prop": 'a .map() param sharing a boolean prop\'s name is routed through the bool lowering in attribute position (renders "true"/"false" instead of the row string) — `collectBooleanTypedProps` lacks the `collectLoopBoundNames` subtraction its sibling `collectStringValueNames` got in #2236 (https://github.com/piconic-ai/barefootjs/issues/2488)',
+  "loop-param-shadows-spread-const": "a .map() param shadowing an object const is resolved by `emitSpread` against `localConstants` with no loop-shadow check, so every row spreads the OUTER const instead of the row value (https://github.com/piconic-ai/barefootjs/issues/2489)"
 };
 export {
   xslateAdapter,

package/dist/render-divergences.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render-divergences.d.ts","sourceRoot":"","sources":["../src/render-divergences.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAExD,eAAO,MAAM,iBAAiB,EAAE,iBAe/B,CAAA"}
+{"version":3,"file":"render-divergences.d.ts","sourceRoot":"","sources":["../src/render-divergences.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAExD,eAAO,MAAM,iBAAiB,EAAE,iBA0B/B,CAAA"}

package/lib/BarefootJS/Backend/Xslate.pm

@@ -1,5 +1,5 @@
 package BarefootJS::Backend::Xslate;
-our $VERSION = "0.28.1";
+our $VERSION = "0.30.0";
 use strict;
 use warnings;
 use utf8;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/xslate",
-  "version": "0.29.0",
+  "version": "0.30.2",
   "description": "Text::Xslate (Kolon) adapter for BarefootJS — compiles IR to .tx templates and ships the Xslate rendering backend; runs under any PSGI/Plack app",
   "type": "module",
   "main": "./dist/index.js",
@@ -55,14 +55,14 @@
     "directory": "packages/adapter-xslate"
   },
   "dependencies": {
-    "@barefootjs/shared": "0.29.0"
+    "@barefootjs/shared": "0.30.2"
   },
   "peerDependencies": {
     "@barefootjs/jsx": ">=0.2.0"
   },
   "devDependencies": {
     "@barefootjs/adapter-tests": "0.1.0",
-    "@barefootjs/jsx": "0.29.0",
+    "@barefootjs/jsx": "0.30.2",
     "typescript": "^5.0.0"
   }
 }

package/src/__tests__/xslate-spread-attrs.test.ts

@@ -206,13 +206,13 @@ function C({ rows }: { rows?: number }) {
 
   test('leaves a defaulted attr unconditional (scope did not widen)', () => {
     const { template } = compileAndGenerate(`
-function C({ value = '' }: { value?: string }) {
-  return <textarea value={value} />
+function C({ placeholder = '' }: { placeholder?: string }) {
+  return <textarea placeholder={placeholder} />
 }
 `)
-    // `value` has a destructure default → never undef → unconditional, exactly
-    // like Hono's value="".
-    expect(template).toContain('value="<: $value :>"')
-    expect(template).not.toContain('defined $value')
+    // `placeholder` has a destructure default → never undef → unconditional, exactly
+    // like Hono's placeholder="".
+    expect(template).toContain('placeholder="<: $placeholder :>"')
+    expect(template).not.toContain('defined $placeholder')
   })
 })

package/src/adapter/xslate-adapter.ts

@@ -79,6 +79,7 @@ import {
   dangerousInnerHtmlDiagnostic,
   resolveStaticLoopSource,
   collectLoopBoundNames,
+  derivesScopeFromSlot,
 } from '@barefootjs/jsx'
 import { isAriaBooleanAttr, isBooleanResultExpr } from './boolean-result.ts'
 import ts from 'typescript'
@@ -879,6 +880,15 @@ export class XslateAdapter extends BaseAdapter implements IRNodeEmitter<XslateRe
     // Re-render children now that inLoop is set (so nested components use the
     // loop-child naming convention). renderedChildren above was computed with
     // the previous flag; recompute under the loop flag.
+
+    // Per-row locals for a `.map()` callback preamble (#2447), in source
+    // order so a later initializer sees an earlier local — same as the
+    // source block. Phase 1 refuses the loop outright when the preamble
+    // isn't fully declarable, so there is no partial-lowering case: either
+    // every statement is lowered here, or the build already failed.
+    const preambleLines = (loop.preamble?.declarations ?? []).map(
+      d => `: my $${d.name} = ${this.convertExpressionToKolon(d.raw, d.valueParsed)};`,
+    )
     const childrenUnderLoop = this.renderChildren(loop.children)
     this.currentLoopKeyDepth = prevLoopKeyDepth
     this.inLoop = prevInLoop
@@ -933,9 +943,11 @@ export class XslateAdapter extends BaseAdapter implements IRNodeEmitter<XslateRe
         )
       }
       lines.push(`: if (${filterCond}) {`)
+      lines.push(...preambleLines)
       lines.push(bodyChildren)
       lines.push(`: }`)
     } else {
+      lines.push(...preambleLines)
       lines.push(bodyChildren)
     }
 
@@ -1066,10 +1078,7 @@ export class XslateAdapter extends BaseAdapter implements IRNodeEmitter<XslateRe
       // SSR (Hono renders neither; the client JS wires them at hydration).
       if ((p.name.match(/^on[A-Z]/) || p.name === 'ref') && p.value.kind === 'expression') continue
       if (p.value.kind === 'jsx-children' && p.name !== 'children') {
-        const prevInLoop = this.inLoop
-        this.inLoop = false
         const slotBody = this.renderChildren(p.value.children)
-        this.inLoop = prevInLoop
         // Purely counter-based — NOT derived from `p.name` or `comp.slotId`.
         // A JSX prop name can contain characters (`data-slot`) that aren't a
         // valid Kolon macro identifier, and `comp.slotId` alone would
@@ -1111,11 +1120,11 @@ export class XslateAdapter extends BaseAdapter implements IRNodeEmitter<XslateRe
       if (lowered) currentEntries().push(lowered)
     }
     // Pass slot ID so the child renderer can set correct scope ID for
-    // hydration. Skip for loop children — they use ComponentName_random.
-    // Appended to whatever the trailing entries segment is so a spread's
-    // own `_bf_slot`/`children` keys (if any) never win over these
-    // compiler-controlled entries.
-    if (comp.slotId && !this.inLoop) {
+    // hydration. Skipped for a loop item root — it uses ComponentName_random
+    // instead (#2444). Appended to whatever the trailing entries segment is
+    // so a spread's own `_bf_slot`/`children` keys (if any) never win over
+    // these compiler-controlled entries.
+    if (derivesScopeFromSlot(comp)) {
       currentEntries().push(`_bf_slot => '${comp.slotId}'`)
     }
     const tplName = this.toTemplateName(comp.name)
@@ -1133,10 +1142,7 @@ export class XslateAdapter extends BaseAdapter implements IRNodeEmitter<XslateRe
       // children HTML; the macro call result is passed as the `children` entry
       // of the render_child hashref. `render_child` materializes a CODE-ref
       // children value through the backend before handing it to the child.
-      const prevInLoop = this.inLoop
-      this.inLoop = false
       const childrenBody = this.renderChildren(effectiveChildren)
-      this.inLoop = prevInLoop
       const macroName = `bf_children_${comp.slotId ?? 'c' + this.childrenCaptureCounter++}`
       currentEntries().push(`children => ${macroName}()`)
       const dict = this.combineComponentPropSegments(segments)

package/src/conformance-pins.ts

@@ -13,11 +13,6 @@ export const conformancePins: ConformancePins = {
   // JS-runtime target runs it, a DSL adapter surfaces BF021 + `/* @client */`.
   // See spec/callback-fidelity.md.
   'filter-typeof-predicate': [{ code: 'BF021', severity: 'error' }],
-  // A `.map()` body with a `const`/`let` preamble before its branches:
-  // a JS runtime folds it, a DSL adapter can't carry the loop-local into a
-  // conditional branch template, so it refuses with BF021 + `/* @client */`.
-  // See spec/callback-fidelity.md.
-  'map-preamble-branch-body': [{ code: 'BF021', severity: 'error' }],
   'map-array-builder-body': [{ code: 'BF021', severity: 'error' }],
   'map-array-builder-escaping': [{ code: 'BF021', severity: 'error' }],
   // `.fill(value)` mutates the receiver in place — no template lowering

package/src/render-divergences.ts

@@ -20,13 +20,24 @@ export const renderDivergences: RenderDivergences = {
   // instead of a fixed regex-shape catalogue) now correctly seeds `todos`
   // from `(props.initialTodos ?? []).map(t => ({ ...t, editing: false }))`.
 
-  // #2444: a child component nested inside a dynamic loop row whose root
-  // is a plain element (`composite` loop plan + `nestedComponents`) is
-  // rendered through the runtime's `render_child`, which mints its own
-  // `Badge_<random>` scope id instead of deriving the parent-scope +
-  // mount-slot id (`test_s0`) the Hono reference emits. Content is
-  // correct; only `bf-s` diverges. Same class as the `grandchild-
-  // composition` CSR skip.
-  'composite-row-child-component':
-    'a child component nested inside a dynamic loop row gets a random `Name_<id>` scope id from `render_child` instead of the parent-derived `<parent>_s0` the reference emits (https://github.com/piconic-ai/barefootjs/issues/2444)',
+  // Onboarding TSX-fidelity fixtures (PR #2461): `expectedHtml` is
+  // hand-authored to the CORRECT output because the emission bug lives in
+  // the shared compiler layer — every adapter, including the Hono
+  // reference, currently emits the broken form (verified against this
+  // adapter's emitted template; see each fixture's docstring). Graduate
+  // by fixing the shared emission, regenerating `expectedHtml` from the
+  // fixed reference, and deleting these lines (and the matching hono
+  // `skipJsx` entries).
+  'aliased-destructured-prop':
+    'aliased destructured prop `{ n: count }` loses its rename — template vars, ssr-defaults, and the props bridge all key off the local name, so the prop is always undefined (https://github.com/piconic-ai/barefootjs/issues/2460)',
+  'composite-row-child-aliased-prop':
+    'same #2460 defect as `aliased-destructured-prop`, inside a keyed `.map()` loop row: the nested child\'s renamed prop (`{ n: count }`) is always undefined, so both rows render an empty count (https://github.com/piconic-ai/barefootjs/issues/2460)',
+
+  // #2482 audit follow-ups: loop-scope holes in per-adapter name
+  // classification. Graduate by applying the loop-bound-name guards
+  // described in each issue and deleting the line.
+  'loop-param-shadows-bool-prop':
+    'a .map() param sharing a boolean prop\'s name is routed through the bool lowering in attribute position (renders "true"/"false" instead of the row string) — `collectBooleanTypedProps` lacks the `collectLoopBoundNames` subtraction its sibling `collectStringValueNames` got in #2236 (https://github.com/piconic-ai/barefootjs/issues/2488)',
+  'loop-param-shadows-spread-const':
+    'a .map() param shadowing an object const is resolved by `emitSpread` against `localConstants` with no loop-shadow check, so every row spreads the OUTER const instead of the row value (https://github.com/piconic-ai/barefootjs/issues/2489)',
 }