@barefootjs/xslate 0.35.2 → 0.35.3

package/dist/adapter/index.js

@@ -188214,7 +188214,7 @@ function generateDerivedMemoSeed(ctx, ir) {
 }
 
 // src/adapter/props/prop-classes.ts
-import { collectLoopBoundNames } from "@barefootjs/jsx";
+import { collectLoopBoundNames, resolveBodyDestructuredPropAliases } from "@barefootjs/jsx";
 
 // src/adapter/value/parsed-literal.ts
 import { evalStringArrayJoin } from "@barefootjs/jsx";
@@ -188246,6 +188246,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 (isStringTypeInfo(c.type ?? undefined) || isBareStringLiteral(c.value))
       names.add(c.name);

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

@@ -46,6 +46,20 @@ export declare function collectNullableOptionalProps(ir: ComponentIR): Set<strin
  * elsewhere in the component) but safe: the suppressed case just falls
  * back to today's numeric `+` — 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 `+` instead of
+ * Kolon's `~` (#2894 sibling gap, surfaced by the `string-concat-plus-
+ * renamed-prop` fixture — same bug class as #2883/go-template's 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,EAAE,MAAM,iBAAiB,CAAA;AAGzE;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,EAAE,EAAE,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,CAMrE;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,EAAE,EAAE,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,CAWzE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,CAepE"}
+{"version":3,"file":"prop-classes.d.ts","sourceRoot":"","sources":["../../../src/adapter/props/prop-classes.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAA6D,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAG7G;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,EAAE,EAAE,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,CAMrE;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,EAAE,EAAE,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,CAWzE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,CAqBpE"}

package/dist/index.js

@@ -188214,7 +188214,7 @@ function generateDerivedMemoSeed(ctx, ir) {
 }
 
 // src/adapter/props/prop-classes.ts
-import { collectLoopBoundNames } from "@barefootjs/jsx";
+import { collectLoopBoundNames, resolveBodyDestructuredPropAliases } from "@barefootjs/jsx";
 
 // src/adapter/value/parsed-literal.ts
 import { evalStringArrayJoin } from "@barefootjs/jsx";
@@ -188246,6 +188246,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 (isStringTypeInfo(c.type ?? undefined) || isBareStringLiteral(c.value))
       names.add(c.name);

package/dist/vite.js

@@ -2175,6 +2175,20 @@ function propsDestructureBinding(p) {
   const binding = callerKey === localName ? localName : `${isIdentifierName(callerKey) ? callerKey : JSON.stringify(callerKey)}: ${localName}`;
   return p.defaultValue ? `${binding} = ${p.defaultValue}` : binding;
 }
+function resolveBodyDestructuredPropAliases(localConstants, propsObjectName) {
+  const aliases = new Map;
+  if (propsObjectName === null)
+    return aliases;
+  for (const c of localConstants) {
+    if (c.isModule)
+      continue;
+    const m = c.parsed;
+    if (m?.kind === "member" && !m.computed && m.object.kind === "identifier" && m.object.name === propsObjectName) {
+      aliases.set(c.name, m.property);
+    }
+  }
+  return aliases;
+}
 var EMPTY_SET = new Set;
 
 // ../jsx/src/ir-to-client-js/csr-substitute.ts
@@ -3421,8 +3435,11 @@ function matchSearchParamsMethodCall(callee, args, localNames) {
 // ../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 }
@@ -3471,9 +3488,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",
@@ -6215,6 +6229,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 (isStringTypeInfo(c.type ?? undefined) || isBareStringLiteral(c.value))
       names.add(c.name);

package/lib/BarefootJS/Backend/Xslate.pm

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/xslate",
-  "version": "0.35.2",
+  "version": "0.35.3",
   "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,7 +55,7 @@
     "directory": "packages/adapter-xslate"
   },
   "dependencies": {
-    "@barefootjs/shared": "0.35.2"
+    "@barefootjs/shared": "0.35.3"
   },
   "peerDependencies": {
     "@barefootjs/jsx": ">=0.2.0",
@@ -72,9 +72,9 @@
   },
   "devDependencies": {
     "@barefootjs/adapter-tests": "0.1.0",
-    "@barefootjs/jsx": "0.35.2",
-    "@barefootjs/vite": "0.35.2",
-    "@barefootjs/client": "0.35.2",
+    "@barefootjs/jsx": "0.35.3",
+    "@barefootjs/vite": "0.35.3",
+    "@barefootjs/client": "0.35.3",
     "typescript": "^5.0.0",
     "vite": "^6.0.0"
   }

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

@@ -759,3 +759,33 @@ export function Counter() {
     expect(template).not.toContain('<link')
   })
 })
+
+describe('XslateAdapter - collectStringValueNames resolves renamed body-destructured prop aliases (#2894)', () => {
+  // Sibling gap to #2883 (Mojolicious) and this same PR's go-template fix:
+  // a `+` concat against a bare-props-form BODY-destructured, RENAMED prop
+  // (`const { fallbackLabel: skipLabel } = props`, the #2788 alias family)
+  // had no witness in `collectStringValueNames`, so `isStringConcatBinary`
+  // fell through to Kolon's numeric `+` instead of `~` — Kolon's `+`
+  // coerces a non-numeric string operand to `0` (#2176).
+  test('a `+` concat against a renamed body-destructured prop lowers to ~, not numeric +', () => {
+    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('$t.label ~ $skipLabel')
+  })
+})

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

@@ -7,7 +7,7 @@
  * adapter's `props/prop-types.ts`. No adapter instance state.
  */
 
-import { collectLoopBoundNames, type ComponentIR } from '@barefootjs/jsx'
+import { collectLoopBoundNames, resolveBodyDestructuredPropAliases, type ComponentIR } from '@barefootjs/jsx'
 import { isStringTypeInfo, isBareStringLiteral } from '../value/parsed-literal.ts'
 
 /**
@@ -68,6 +68,20 @@ export function collectNullableOptionalProps(ir: ComponentIR): Set<string> {
  * elsewhere in the component) but safe: the suppressed case just falls
  * back to today's numeric `+` — 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 `+` instead of
+ * Kolon's `~` (#2894 sibling gap, surfaced by the `string-concat-plus-
+ * renamed-prop` fixture — same bug class as #2883/go-template's 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>()
@@ -79,6 +93,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 (isStringTypeInfo(c.type ?? undefined) || isBareStringLiteral(c.value)) names.add(c.name)
   }