@barefootjs/go-template 0.35.2 → 0.35.3

package/dist/adapter/index.js

@@ -32,7 +32,7 @@ import {
   buildImportAliasMap,
   resolveGetterAliases,
   collectAliasableGetterNames,
-  resolveBodyDestructuredPropAliases
+  resolveBodyDestructuredPropAliases as resolveBodyDestructuredPropAliases2
 } from "@barefootjs/jsx";
 import { findInterpolationEnd } from "@barefootjs/jsx/scanner";
 import { BF_REGION, escapeHtml, resolveJsxChildrenProp } from "@barefootjs/shared";
@@ -2877,7 +2877,7 @@ function collectNillablePropNames(ctx, ir) {
 }
 
 // src/adapter/props/prop-classes.ts
-import { collectLoopBoundNames } from "@barefootjs/jsx";
+import { collectLoopBoundNames, resolveBodyDestructuredPropAliases } from "@barefootjs/jsx";
 function isStringTypeInfo(type) {
   return type.kind === "primitive" && type.primitive === "string";
 }
@@ -2898,6 +2898,10 @@ function collectStringValueNames(ir) {
     if (isStringTypeInfo(p.type))
       names.add(p.name);
   }
+  for (const [local, callerKey] of resolveBodyDestructuredPropAliases(ir.metadata.localConstants ?? [], ir.metadata.propsObjectName)) {
+    if (names.has(callerKey))
+      names.add(local);
+  }
   for (const c of ir.metadata.localConstants) {
     if (c.type !== null && isStringTypeInfo(c.type) || isBareStringLiteral(c.value)) {
       names.add(c.name);
@@ -2989,7 +2993,7 @@ class GoTemplateAdapter extends BaseAdapter {
       const getterNames = collectAliasableGetterNames(ir.metadata.signals ?? [], ir.metadata.memos ?? []);
       this.state.getterAliases = resolveGetterAliases(ir.metadata.localConstants ?? [], (n) => getterNames.has(n));
     }
-    this.state.propDestructureAliases = resolveBodyDestructuredPropAliases(ir.metadata.localConstants ?? [], ir.metadata.propsObjectName);
+    this.state.propDestructureAliases = resolveBodyDestructuredPropAliases2(ir.metadata.localConstants ?? [], ir.metadata.propsObjectName);
     this.state.staticLoopSourceBoundNames = collectLoopBoundNames2(ir);
     this.bakedStaticChildLoopCache = new Map;
     this.state.localHelperNames = new Set(this.state.localConstants.filter((c) => !c.isModule && c.containsArrow).map((c) => c.name));

package/dist/adapter/props/prop-classes.d.ts

@@ -35,6 +35,19 @@ import { type ComponentIR } from '@barefootjs/jsx';
  * string elsewhere in the component) but safe: the suppressed case just
  * falls back to today's numeric `bf_add` — the same, already-accepted
  * residual as an unresolvable operand — never silently-wrong output.
+ *
+ * A bare-props-form component's BODY-destructured, RENAMED prop (`const {
+ * fallbackLabel: skipLabel } = props`, the #2788 alias family) has no
+ * `propsParams` entry of its own — `propsParams` only carries the TYPE-level,
+ * caller-facing names, and the local alias never appears there. Without the
+ * alias resolved here too, a string-typed prop referenced only under its
+ * local rename in a `+` concat (`greeting + skipLabel`) is invisible to this
+ * witness, so `isStringConcatBinary` falls through to numeric `bf_add`
+ * instead of `bf_concat_str` (#2894, the go-template sibling of #2883's
+ * Mojolicious fix). `resolveBodyDestructuredPropAliases` already recognizes
+ * this exact destructuring shape; reusing it here keeps this one witness the
+ * single source of truth `_isStringValueName` reads, rather than growing a
+ * second, adapter-local alias lookup.
  */
 export declare function collectStringValueNames(ir: ComponentIR): Set<string>;
 //# sourceMappingURL=prop-classes.d.ts.map

package/dist/adapter/props/prop-classes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prop-classes.d.ts","sourceRoot":"","sources":["../../../src/adapter/props/prop-classes.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAyB,KAAK,WAAW,EAAiB,MAAM,iBAAiB,CAAA;AAcxF;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,CAiBpE"}
+{"version":3,"file":"prop-classes.d.ts","sourceRoot":"","sources":["../../../src/adapter/props/prop-classes.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAA6D,KAAK,WAAW,EAAiB,MAAM,iBAAiB,CAAA;AAc5H;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,CAuBpE"}

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;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEtD,eAAO,MAAM,eAAe,EAAE,eA4F7B,CAAA"}
+{"version":3,"file":"conformance-pins.d.ts","sourceRoot":"","sources":["../src/conformance-pins.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEtD,eAAO,MAAM,eAAe,EAAE,eA2G7B,CAAA"}

package/dist/index.js

@@ -32,7 +32,7 @@ import {
   buildImportAliasMap,
   resolveGetterAliases,
   collectAliasableGetterNames,
-  resolveBodyDestructuredPropAliases
+  resolveBodyDestructuredPropAliases as resolveBodyDestructuredPropAliases2
 } from "@barefootjs/jsx";
 import { findInterpolationEnd } from "@barefootjs/jsx/scanner";
 import { BF_REGION, escapeHtml, resolveJsxChildrenProp } from "@barefootjs/shared";
@@ -2877,7 +2877,7 @@ function collectNillablePropNames(ctx, ir) {
 }
 
 // src/adapter/props/prop-classes.ts
-import { collectLoopBoundNames } from "@barefootjs/jsx";
+import { collectLoopBoundNames, resolveBodyDestructuredPropAliases } from "@barefootjs/jsx";
 function isStringTypeInfo(type) {
   return type.kind === "primitive" && type.primitive === "string";
 }
@@ -2898,6 +2898,10 @@ function collectStringValueNames(ir) {
     if (isStringTypeInfo(p.type))
       names.add(p.name);
   }
+  for (const [local, callerKey] of resolveBodyDestructuredPropAliases(ir.metadata.localConstants ?? [], ir.metadata.propsObjectName)) {
+    if (names.has(callerKey))
+      names.add(local);
+  }
   for (const c of ir.metadata.localConstants) {
     if (c.type !== null && isStringTypeInfo(c.type) || isBareStringLiteral(c.value)) {
       names.add(c.name);
@@ -2989,7 +2993,7 @@ class GoTemplateAdapter extends BaseAdapter {
       const getterNames = collectAliasableGetterNames(ir.metadata.signals ?? [], ir.metadata.memos ?? []);
       this.state.getterAliases = resolveGetterAliases(ir.metadata.localConstants ?? [], (n) => getterNames.has(n));
     }
-    this.state.propDestructureAliases = resolveBodyDestructuredPropAliases(ir.metadata.localConstants ?? [], ir.metadata.propsObjectName);
+    this.state.propDestructureAliases = resolveBodyDestructuredPropAliases2(ir.metadata.localConstants ?? [], ir.metadata.propsObjectName);
     this.state.staticLoopSourceBoundNames = collectLoopBoundNames2(ir);
     this.bakedStaticChildLoopCache = new Map;
     this.state.localHelperNames = new Set(this.state.localConstants.filter((c) => !c.isModule && c.containsArrow).map((c) => c.name));
@@ -7109,7 +7113,12 @@ var conformancePins = {
     severity: "error",
     issue: "https://github.com/piconic-ai/barefootjs/issues/2700"
   }],
-  "namespace-import-primitive": [{ code: "BF013", severity: "error" }]
+  "namespace-import-primitive": [{ code: "BF013", severity: "error" }],
+  "static-nested-loop-ref": [{
+    code: "BF101",
+    severity: "error",
+    issue: "https://github.com/piconic-ai/barefootjs/issues/2893"
+  }]
 };
 // src/render-divergences.ts
 var renderDivergences = {};

package/dist/vite.js

@@ -3525,8 +3525,11 @@ function formatDateLocalNames(metadata) {
 // ../jsx/src/ir-to-client-js/prune-unused-prop-extractions.ts
 import ts19 from "typescript";
 
-// ../jsx/src/ir-to-client-js/control-flow/plan/lazy-preamble.ts
+// ../jsx/src/ir-to-client-js/emit-reactive.ts
 import ts20 from "typescript";
+
+// ../jsx/src/ir-to-client-js/control-flow/plan/lazy-preamble.ts
+import ts21 from "typescript";
 var NO_PREAMBLE = {
   lazySafe: true,
   facts: { declaredNames: new Set, freeNames: new Set }
@@ -3575,9 +3578,6 @@ var INERT_BINDING_GLOBALS = new Set([
   "decodeURI"
 ]);
 
-// ../jsx/src/ir-to-client-js/emit-reactive.ts
-import ts21 from "typescript";
-
 // ../jsx/src/ir-to-client-js/control-flow/stringify/event-delegation.ts
 var NON_BUBBLING_EVENTS = new Set([
   "blur",
@@ -8184,6 +8184,10 @@ function collectStringValueNames(ir) {
     if (isStringTypeInfo(p.type))
       names.add(p.name);
   }
+  for (const [local, callerKey] of resolveBodyDestructuredPropAliases(ir.metadata.localConstants ?? [], ir.metadata.propsObjectName)) {
+    if (names.has(callerKey))
+      names.add(local);
+  }
   for (const c of ir.metadata.localConstants) {
     if (c.type !== null && isStringTypeInfo(c.type) || isBareStringLiteral(c.value)) {
       names.add(c.name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/go-template",
-  "version": "0.35.2",
+  "version": "0.35.3",
   "description": "Go html/template adapter for BarefootJS - generates Go template files from IR",
   "type": "module",
   "main": "./dist/index.js",
@@ -49,7 +49,7 @@
     "directory": "packages/adapter-go-template"
   },
   "dependencies": {
-    "@barefootjs/shared": "0.35.2"
+    "@barefootjs/shared": "0.35.3"
   },
   "peerDependencies": {
     "@barefootjs/jsx": ">=0.2.0",
@@ -67,9 +67,9 @@
   },
   "devDependencies": {
     "@barefootjs/adapter-tests": "0.1.0",
-    "@barefootjs/client": "0.35.2",
-    "@barefootjs/jsx": "0.35.2",
-    "@barefootjs/vite": "0.35.2",
+    "@barefootjs/client": "0.35.3",
+    "@barefootjs/jsx": "0.35.3",
+    "@barefootjs/vite": "0.35.3",
     "vite": "^6.0.0"
   }
 }

package/src/__tests__/go-template-adapter.test.ts

@@ -6909,3 +6909,34 @@ export { C }
     expect(decode(htmlExplicitZero)).toEqual({ name: 'Ada', label: '', x: 0 })
   })
 })
+
+describe('GoTemplateAdapter - collectStringValueNames resolves renamed body-destructured prop aliases (#2894)', () => {
+  // Sibling gap to #2883 (Mojolicious): a `+` concat against a bare-props-form
+  // BODY-destructured, RENAMED prop (`const { fallbackLabel: skipLabel } =
+  // props`, the #2788 alias family) previously had no witness in
+  // `collectStringValueNames`, so `isStringConcatBinary` fell through to
+  // numeric `bf_add` instead of `bf_concat_str` — Go's `bf_add` coerces both
+  // operands through `toFloat64`, so a string operand silently becomes `0`.
+  test('a `+` concat against a renamed body-destructured prop lowers to bf_concat_str, not bf_add', () => {
+    const result = compileAndGenerate(`
+'use client'
+import { createSignal } from '@barefootjs/client'
+
+type Todo = { id: number; label: string }
+
+export function ConcatRenamedProp(props: { fallbackLabel: string }) {
+  const { fallbackLabel: skipLabel } = props
+  const [todos] = createSignal<Todo[]>([{ id: 1, label: 'Alpha' }])
+  return (
+    <ul>
+      {todos().map(t => (
+        <li key={t.id}>{t.label + skipLabel}</li>
+      ))}
+    </ul>
+  )
+}
+`)
+    expect(result.template).toContain('bf_concat_str .Label $.FallbackLabel')
+    expect(result.template).not.toContain('bf_add .Label $.FallbackLabel')
+  })
+})

package/src/adapter/props/prop-classes.ts

@@ -7,7 +7,7 @@
  * function over `ir.metadata`; no adapter instance state.
  */
 
-import { collectLoopBoundNames, type ComponentIR, type TypeInfo } from '@barefootjs/jsx'
+import { collectLoopBoundNames, resolveBodyDestructuredPropAliases, type ComponentIR, type TypeInfo } from '@barefootjs/jsx'
 
 /** True when `type` is the `string` primitive. */
 function isStringTypeInfo(type: TypeInfo): boolean {
@@ -49,6 +49,19 @@ function isBareStringLiteral(initialValue: string | undefined): boolean {
  * string elsewhere in the component) but safe: the suppressed case just
  * falls back to today's numeric `bf_add` — the same, already-accepted
  * residual as an unresolvable operand — never silently-wrong output.
+ *
+ * A bare-props-form component's BODY-destructured, RENAMED prop (`const {
+ * fallbackLabel: skipLabel } = props`, the #2788 alias family) has no
+ * `propsParams` entry of its own — `propsParams` only carries the TYPE-level,
+ * caller-facing names, and the local alias never appears there. Without the
+ * alias resolved here too, a string-typed prop referenced only under its
+ * local rename in a `+` concat (`greeting + skipLabel`) is invisible to this
+ * witness, so `isStringConcatBinary` falls through to numeric `bf_add`
+ * instead of `bf_concat_str` (#2894, the go-template sibling of #2883's
+ * Mojolicious fix). `resolveBodyDestructuredPropAliases` already recognizes
+ * this exact destructuring shape; reusing it here keeps this one witness the
+ * single source of truth `_isStringValueName` reads, rather than growing a
+ * second, adapter-local alias lookup.
  */
 export function collectStringValueNames(ir: ComponentIR): Set<string> {
   const names = new Set<string>()
@@ -60,6 +73,12 @@ export function collectStringValueNames(ir: ComponentIR): Set<string> {
   for (const p of ir.metadata.propsParams) {
     if (isStringTypeInfo(p.type)) names.add(p.name)
   }
+  for (const [local, callerKey] of resolveBodyDestructuredPropAliases(
+    ir.metadata.localConstants ?? [],
+    ir.metadata.propsObjectName,
+  )) {
+    if (names.has(callerKey)) names.add(local)
+  }
   for (const c of ir.metadata.localConstants) {
     if ((c.type !== null && isStringTypeInfo(c.type)) || isBareStringLiteral(c.value)) {
       names.add(c.name)

package/src/conformance-pins.ts

@@ -101,4 +101,19 @@ export const conformancePins: ConformancePins = {
   // resolves the primitive normally and never reaches this refusal (formerly
   // tracked as #2771, closed) — no open issue tracks further work.
   'namespace-import-primitive': [{ code: 'BF013', severity: 'error' }],
+  // #2893: `analyzeBakeableStaticElementLoop`'s static-array bake (Go's only
+  // path to bind a static/non-signal array as a loop source — `html/template`
+  // has no slice literal syntax) bails the WHOLE loop when the body contains
+  // a nested `loop` node (module docstring, `static-element-loop-bake.ts`).
+  // This fixture's outer static array's row has a nested `.map()` over
+  // `item.children`, so it falls through to the generic "computed loop
+  // array" BF101 refusal. Unrelated to #2798's own fix (a client-JS-only
+  // ref/reactive-binding gap) — this is a pre-existing Go-adapter SSR
+  // static-loop-baking scope boundary the new fixture happened to be the
+  // first to exercise.
+  'static-nested-loop-ref': [{
+    code: 'BF101',
+    severity: 'error',
+    issue: 'https://github.com/piconic-ai/barefootjs/issues/2893',
+  }],
 }