@barefootjs/go-template 0.31.4 → 0.31.6

package/dist/index.js

@@ -26,7 +26,8 @@ import {
   dangerousInnerHtmlMetacharViolation,
   dangerousInnerHtmlDiagnostic,
   collectLoopBoundNames as collectLoopBoundNames2,
-  evaluateStaticLiteral as evaluateStaticLiteral3
+  evaluateStaticLiteral as evaluateStaticLiteral3,
+  BindingScope
 } from "@barefootjs/jsx";
 import { findInterpolationEnd } from "@barefootjs/jsx/scanner";
 import { BF_REGION, escapeHtml } from "@barefootjs/shared";
@@ -463,6 +464,7 @@ function collectNestedComponents(node, result) {
           ...loop.childComponent,
           isDynamic: !loop.isStaticArray,
           isPropDerived: !!loop.isPropDerivedArray,
+          clientOnly: loop.clientOnly,
           loopKey: loop.key ?? undefined,
           loopParam: loop.param ?? undefined,
           bodyChildren: hasBodyChildren ? loop.childComponent.children : undefined,
@@ -2856,7 +2858,7 @@ class GoTemplateAdapter extends BaseAdapter {
   }
   inLoop = false;
   bakedStaticChildLoopCache = new Map;
-  loopParamStack = [];
+  scope = BindingScope.EMPTY;
   loopKeyDepthStack = [];
   loopScalarItemStack = [];
   loopWrapperStack = [];
@@ -2914,6 +2916,7 @@ class GoTemplateAdapter extends BaseAdapter {
     this.state.referencedDerivedConsts = new Set;
     this.state.templateVarCounter = 0;
     this.state.pendingChildrenDefines = [];
+    this.scope = BindingScope.EMPTY;
     this.primeCompileState(ir);
     this.state.stringValueNames = collectStringValueNames(ir);
     this.recordDerivedFieldDeps(ir, new Set((ir.metadata.propsParams ?? []).map((p) => p.name)));
@@ -3154,6 +3157,12 @@ ${scriptRegistrations}${templateBody}
   isNestedArrayShadowed(param, nestedArrayFields) {
     return nestedArrayFields.has(capitalizeFieldName(param.name)) || nestedArrayFields.has(capitalizeFieldName(param.sourceName ?? param.name));
   }
+  isOrphanedClientOnlyNested(nested) {
+    return !!nested.clientOnly && !nested.isDynamic && !nested.isPropDerived;
+  }
+  propDerivedNestedArrayFields(nestedComponents) {
+    return new Set(nestedComponents.filter((n) => n.isPropDerived).map((n) => `${n.name}s`));
+  }
   propParamFieldNamesUnion(params) {
     return params.flatMap((p) => [capitalizeFieldName(p.name), capitalizeFieldName(p.sourceName ?? p.name)]);
   }
@@ -3192,7 +3201,7 @@ ${scriptRegistrations}${templateBody}
   recordRepropsSpec(ir, componentName, nestedComponents, spreadSlots) {
     if (!this.childDerivedFieldDeps.has(componentName))
       return;
-    const nestedArrayFields = new Set(nestedComponents.map((n) => `${n.name}s`));
+    const nestedArrayFields = this.propDerivedNestedArrayFields(nestedComponents);
     const params = (ir.metadata.propsParams ?? []).filter((p) => !this.isNestedArrayShadowed(p, nestedArrayFields));
     const takenInput = new Set(this.propParamFieldNamesUnion(ir.metadata.propsParams ?? []));
     const eligible = nestedComponents.every((n) => n.isDynamic && !n.isPropDerived) && spreadSlots.length === 0 && !ir.metadata.restPropsName && this.nonCollidingContextConsumers(takenInput).length === 0;
@@ -3406,8 +3415,8 @@ ${goFields.join(`
     if (this.usesSearchParams(ir)) {
       lines.push("\tSearchParams bf.SearchParams // Optional: request query for searchParams()");
     }
-    const inputNested = nestedComponents.filter((n) => !n.isDynamic || n.isPropDerived);
-    const nestedArrayFields = new Set(nestedComponents.map((n) => `${n.name}s`));
+    const inputNested = nestedComponents.filter((n) => (!n.isDynamic || n.isPropDerived) && !this.isOrphanedClientOnlyNested(n));
+    const nestedArrayFields = this.propDerivedNestedArrayFields(nestedComponents);
     for (const param of ir.metadata.propsParams) {
       const fieldName = capitalizeFieldName(param.sourceName ?? param.name);
       if (this.isNestedArrayShadowed(param, nestedArrayFields))
@@ -3544,7 +3553,7 @@ ${goFields.join(`
     lines.push(`		scopeID = "${componentName}_" + randomID(6)`);
     lines.push("\t}");
     lines.push("");
-    const staticNested = nestedComponents.filter((n) => !n.isDynamic || n.isPropDerived);
+    const staticNested = nestedComponents.filter((n) => (!n.isDynamic || n.isPropDerived) && !this.isOrphanedClientOnlyNested(n));
     const emittedWrapperVars = new Set;
     const staticWithBody = staticNested.filter((n) => n.bodyChildren && n.bodyChildren.length > 0);
     const staticWithoutBody = staticNested.filter((n) => !n.bodyChildren || n.bodyChildren.length === 0);
@@ -3626,7 +3635,7 @@ ${goFields.join(`
     if (this.usesSearchParams(ir)) {
       lines.push("\t\tSearchParams: in.SearchParams,");
     }
-    const nestedArrayFields = new Set(nestedComponents.map((n) => `${n.name}s`));
+    const nestedArrayFields = this.propDerivedNestedArrayFields(nestedComponents);
     const memoFallbacks = new Map;
     for (const memo of ir.metadata.memos) {
       const stripped = memo.computation.replace(/^\(\)\s*=>\s*/, "");
@@ -4124,7 +4133,7 @@ ${goFields.join(`
     }
   }
   emitPropsDataFields(lines, ir, nestedComponents, propTypeOverrides, takenJsonTags) {
-    const nestedArrayFields = new Set(nestedComponents.map((n) => `${n.name}s`));
+    const nestedArrayFields = this.propDerivedNestedArrayFields(nestedComponents);
     const propFieldNames = new Set;
     for (const param of ir.metadata.propsParams) {
       const fieldName = capitalizeFieldName(param.name);
@@ -4198,6 +4207,8 @@ ${goFields.join(`
       lines.push(`	${this.contextFieldName(c)} ${this.contextConsumerGoType(c)} \`json:"${jsonTag}"\``);
     }
     for (const nested of nestedComponents) {
+      if (this.isOrphanedClientOnlyNested(nested))
+        continue;
       const elemType = nested.bodyChildren?.length ? this.loopBodyWrapperName(componentName, nested) : `${nested.name}Props`;
       if (nested.isDynamic && !nested.isPropDerived) {
         lines.push(`	${nested.name}s []${elemType} \`json:"-"\``);
@@ -4794,8 +4805,7 @@ ${goFields.join(`
     const inlinedNum = this.resolveModuleNumericConst(name);
     if (inlinedNum !== null)
       return inlinedNum;
-    const currentLoopParam = this.loopParamStack[this.loopParamStack.length - 1];
-    if (currentLoopParam && name === currentLoopParam)
+    if (this.isCurrentLoopItem(name))
       return ".";
     if (this.isOuterLoopParam(name))
       return `$${name}`;
@@ -4862,16 +4872,16 @@ ${goFields.join(`
     }
     return false;
   }
+  isCurrentLoopItem(name) {
+    const hit = this.scope.lookup(name);
+    return hit !== null && hit.depth === 0 && hit.binding.source === "item";
+  }
   isOuterLoopParam(name) {
-    const top = this.loopParamStack.length - 1;
-    for (let i = 0;i < top; i++) {
-      if (this.loopParamStack[i] === name)
-        return true;
-    }
-    return false;
+    const hit = this.scope.lookup(name);
+    return hit !== null && hit.depth > 0 && hit.binding.source === "item";
   }
   rootFieldRef(name) {
-    const prefix = this.loopParamStack.length > 0 ? "$." : ".";
+    const prefix = this.inLoop ? "$." : ".";
     return `${prefix}${capitalizeFieldName(name)}`;
   }
   searchParamsFieldRef(name) {
@@ -4881,9 +4891,8 @@ ${goFields.join(`
     return collectModuleStringConstsShared(constants);
   }
   resolveModuleStringConst(name) {
-    if (this.loopParamStack.length > 0 && this.loopParamStack[this.loopParamStack.length - 1] === name) {
+    if (this.isCurrentLoopItem(name))
       return null;
-    }
     if (this.loopVarRefCount.has(name))
       return null;
     if (this.isOuterLoopParam(name))
@@ -4894,9 +4903,8 @@ ${goFields.join(`
     return `"${escapeGoString(value)}"`;
   }
   resolveModuleNumericConst(name) {
-    if (this.loopParamStack.length > 0 && this.loopParamStack[this.loopParamStack.length - 1] === name) {
+    if (this.isCurrentLoopItem(name))
       return null;
-    }
     if (this.loopVarRefCount.has(name))
       return null;
     if (this.isOuterLoopParam(name))
@@ -4951,7 +4959,7 @@ ${goFields.join(`
     if (property === "length" && object.kind === "call" && object.callee.kind === "identifier" && object.args.length === 0) {
       const slice = this.state.memoBackedLoopSlice.get(object.callee.name);
       if (slice) {
-        const prefix = this.loopParamStack.length > 0 ? "$." : ".";
+        const prefix = this.inLoop ? "$." : ".";
         return `len ${prefix}${slice}`;
       }
     }
@@ -4976,8 +4984,7 @@ ${goFields.join(`
       if (staticValue !== null)
         return staticValue;
     }
-    const currentLoopParam = this.loopParamStack[this.loopParamStack.length - 1];
-    if (object.kind === "identifier" && currentLoopParam && object.name === currentLoopParam) {
+    if (object.kind === "identifier" && this.isCurrentLoopItem(object.name)) {
       return `.${goFieldNameForKey(property)}`;
     }
     const obj = emit(object);
@@ -5739,7 +5746,7 @@ ${goFields.join(`
     return this.renderParsedExpr(parsed);
   }
   isLoopShadowedName(name) {
-    return this.loopParamStack.length > 0 && this.loopParamStack[this.loopParamStack.length - 1] === name || this.loopVarRefCount.has(name) || this.isOuterLoopParam(name) || this.loopBindingStack.some((bindings) => bindings.has(name));
+    return this.scope.isBound(name) || this.loopVarRefCount.has(name);
   }
   loopRowChildPropOverrides(comp) {
     const childShape = this.childComponentShapes.get(comp.name);
@@ -5954,8 +5961,7 @@ ${goFields.join(`
           const inlined = this.resolveModuleStringConst(expr.name);
           if (inlined !== null)
             return plain(inlined);
-          const currentLoopParam = this.loopParamStack[this.loopParamStack.length - 1];
-          if (currentLoopParam && expr.name === currentLoopParam) {
+          if (this.isCurrentLoopItem(expr.name)) {
             return plain(".");
           }
           if (this.isOuterLoopParam(expr.name)) {
@@ -6012,11 +6018,8 @@ ${goFields.join(`
         if (expr.object.kind === "identifier" && this.state.propsObjectName && expr.object.name === this.state.propsObjectName) {
           return plain(this.rootFieldRef(expr.property));
         }
-        {
-          const currentLoopParam = this.loopParamStack[this.loopParamStack.length - 1];
-          if (expr.object.kind === "identifier" && currentLoopParam && expr.object.name === currentLoopParam) {
-            return plain(`.${capitalizeFieldName(expr.property)}`);
-          }
+        if (expr.object.kind === "identifier" && this.isCurrentLoopItem(expr.object.name)) {
+          return plain(`.${capitalizeFieldName(expr.property)}`);
         }
         const obj = this.renderConditionExpr(expr.object);
         if (expr.property === "length") {
@@ -6194,12 +6197,12 @@ ${goFields.join(`
       });
     }
     const bakedChildLoop = loop.childComponent ? this.getBakedStaticChildLoop(loop.markerId, loop.childComponent, loop.arrayParsed, loop.param, loop.key ?? undefined) : null;
-    const bakedElementLoop = loop.childComponent ? null : analyzeBakeableStaticElementLoop(loop, this.state.localConstants, { isNameShadowed: (name) => this.state.staticLoopSourceBoundNames.has(name) });
+    const bakedElementLoop = loop.childComponent ? null : analyzeBakeableStaticElementLoop(loop, this.state.localConstants, { isNameShadowed: this.scope.asShadowPredicate() });
     if (bakedElementLoop) {
       return this.renderUnrolledStaticElementLoop(loop, bakedElementLoop.items);
     }
     const arrayName = loop.array.trim();
-    if (bakedChildLoop === null && /^[A-Za-z_$][\w$]*$/.test(arrayName)) {
+    if (bakedChildLoop === null && /^[A-Za-z_$][\w$]*$/.test(arrayName) && !this.scope.isBound(arrayName)) {
       const arrayConst = this.state.localConstants.find((c) => c.name === arrayName);
       if (arrayConst && !arrayConst.isModule && arrayConst.parsed && !this.isStringExpr(arrayConst.parsed, new Set)) {
         this.state.errors.push({
@@ -6208,7 +6211,8 @@ ${goFields.join(`
           message: `Loop array \`${arrayName}\` is a local computed value (\`${arrayConst.value}\`) that the Go template adapter cannot bind as a template variable — only a string-derived local resolves to a generated struct field.`,
           loc: loop.loc ?? this.makeLoc(),
           suggestion: {
-            message: "Pre-compute the array server-side and pass it as a prop, or mark the loop position as @client-only so it runs in JS on the client."
+            message: "Pre-compute the array server-side and pass it as a prop, or mark the loop position as @client-only so it runs in JS on the client.",
+            escape: [{ kind: "prop-precompute" }, { kind: "client-directive" }]
           }
         });
       }
@@ -6227,6 +6231,9 @@ ${goFields.join(`
     }
     const wasInLoopOuter = this.inLoop;
     this.inLoop = true;
+    const scopeLoop = loop.iterationShape === "keys" ? { ...loop, param: "" } : loop;
+    const prevScope = this.scope;
+    this.scope = prevScope.enterLoopRow(scopeLoop);
     const addedLoopVars = [];
     for (const d of loop.preamble?.declarations ?? []) {
       this.loopVarRefCount.set(d.name, (this.loopVarRefCount.get(d.name) ?? 0) + 1);
@@ -6238,17 +6245,14 @@ ${goFields.join(`
       this.loopBindingStack.push(built.bindings);
       this.loopRestExcludeStack.push(built.restExcludes);
       pushedBindingMap = true;
-      this.loopParamStack.push("");
       if (rangeIndex !== "_") {
         this.loopVarRefCount.set(rangeIndex, (this.loopVarRefCount.get(rangeIndex) ?? 0) + 1);
         addedLoopVars.push(rangeIndex);
       }
     } else if (loop.iterationShape === "keys") {
-      this.loopParamStack.push("");
       this.loopVarRefCount.set(param, (this.loopVarRefCount.get(param) ?? 0) + 1);
       addedLoopVars.push(param);
     } else {
-      this.loopParamStack.push(param);
       if (rangeIndex !== "_") {
         this.loopVarRefCount.set(rangeIndex, (this.loopVarRefCount.get(rangeIndex) ?? 0) + 1);
         addedLoopVars.push(rangeIndex);
@@ -6270,7 +6274,7 @@ ${goFields.join(`
       else
         this.loopVarRefCount.set(v, rc);
     }
-    this.loopParamStack.pop();
+    this.scope = prevScope;
     if (pushedBindingMap) {
       this.loopBindingStack.pop();
       this.loopRestExcludeStack.pop();
@@ -6302,7 +6306,8 @@ ${goFields.join(`
     this.loopWrapperStack.push(false);
     this.loopKeyDepthStack.push(loop.depth);
     this.loopScalarItemStack.push(this.scalarLiteralLoopGoType(loop.arrayParsed, loop.itemType) !== null);
-    this.loopParamStack.push(loop.param);
+    const prevScope = this.scope;
+    this.scope = prevScope.enterLoopRow(loop);
     let body = "";
     for (const item of items) {
       this.staticLoopItemStack.push({ param: loop.param, item });
@@ -6322,7 +6327,7 @@ ${goFields.join(`
         break;
       }
     }
-    this.loopParamStack.pop();
+    this.scope = prevScope;
     this.loopScalarItemStack.pop();
     this.loopKeyDepthStack.pop();
     this.loopWrapperStack.pop();
@@ -6491,8 +6496,7 @@ ${children}`;
       }
       if (this.inLoop) {
         const trimmed = value.expr.trim();
-        const currentLoopParam = this.loopParamStack[this.loopParamStack.length - 1];
-        if (currentLoopParam && trimmed === currentLoopParam) {
+        if (this.isCurrentLoopItem(trimmed)) {
           return `{{bf_spread_attrs (bf_js_keys .)}}`;
         }
         const restInfo = this.lookupRestExclude(trimmed);
@@ -6650,21 +6654,29 @@ var conformancePins = {
   "tag-cloud": [{ code: "BF021", severity: "error" }],
   "preamble-cells": [{ code: "BF021", severity: "error" }],
   "static-array-from-props": [
-    { code: "BF101", severity: "error", issue: "https://github.com/piconic-ai/barefootjs/issues/2321" }
+    {
+      code: "BF101",
+      severity: "error",
+      issue: "https://github.com/piconic-ai/barefootjs/issues/2321"
+    }
   ],
   "static-array-from-props-with-component": [
-    { code: "BF101", severity: "error", issue: "https://github.com/piconic-ai/barefootjs/issues/2321" }
+    {
+      code: "BF101",
+      severity: "error",
+      issue: "https://github.com/piconic-ai/barefootjs/issues/2321"
+    }
   ],
   "filter-nested-callback-predicate": [
     { code: "BF101", severity: "error", issue: "https://github.com/piconic-ai/barefootjs/issues/2320" }
   ],
-  "filter-nested-find-predicate": [
-    { code: "BF101", severity: "error", issue: "https://github.com/piconic-ai/barefootjs/issues/2320" }
-  ],
+  "filter-nested-find-predicate": [{ code: "BF101", severity: "error", issue: "https://github.com/piconic-ai/barefootjs/issues/2320" }],
   "date-method-uncatalogued": [{ code: "BF021", severity: "error", issue: "https://github.com/piconic-ai/barefootjs/issues/2356" }]
 };
 // src/render-divergences.ts
-var renderDivergences = {};
+var renderDivergences = {
+  "static-array-from-props-with-component-precomputed": "prop-backed child-component loop renders the loop host empty at SSR (https://github.com/piconic-ai/barefootjs/issues/2630)"
+};
 export {
   renderDivergences,
   goTemplateAdapter,

package/dist/render-divergences.d.ts

@@ -13,9 +13,15 @@
  * the docs compatibility-matrix page. Graduating an entry means fixing
  * the adapter (or the shared compiler layer) and deleting the line.
  *
- * Empty — the file's last live entry (`aliased-destructured-prop`, #2525)
- * graduated: the Input struct field is now keyed by `sourceName ?? name`
- * (caller-facing), so the caller-side composite literal `go run`s clean.
+ * Empty — the file's last live entry (`static-array-from-props-with-
+ * component-client`, #2627) graduated: a clientOnly child-component loop
+ * whose array is neither a signal/memo nor a direct prop reference (e.g.
+ * `Object.entries(props.tags).filter(...)` feeding a `<Tag>` loop) is now
+ * excluded entirely from the Input/Props/NewProps codegen instead of
+ * colliding with the driving prop's own field — see
+ * `GoTemplateAdapter.isOrphanedClientOnlyNested`. The caller-side composite
+ * literal for the `tags` prop now type-checks against its own `interface{}`
+ * field and `go run`s clean.
  * Keep the file (and this header) when the set is empty — the next
  * divergence lands here, not in a re-created file.
  */

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;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAExD,eAAO,MAAM,iBAAiB,EAAE,iBAa/B,CAAA"}
+{"version":3,"file":"render-divergences.d.ts","sourceRoot":"","sources":["../src/render-divergences.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAExD,eAAO,MAAM,iBAAiB,EAAE,iBAiC/B,CAAA"}