@barefootjs/jsx 0.33.2 → 0.33.4

package/src/ir-to-client-js/prop-handling.ts

@@ -5,6 +5,7 @@
 import type { ParamInfo, SignalInfo } from '../types.ts'
 import type { ClientJsContext } from './types.ts'
 import type { BindingScope } from '../scope/binding-scope.ts'
+import { resolveRestSpreadOriginCore } from '../props-binding.ts'
 
 /**
  * Which of the component's two "forwards the caller's leftover props"
@@ -29,25 +30,13 @@ import type { BindingScope } from '../scope/binding-scope.ts'
  * `spreadAttrs({...})` call keyed by the alias name instead of the
  * runtime-visible one.
  *
- * Walks the chain hop by hop (not a precomputed set) so a multi-hop alias
- * (`const p2 = props; const p3 = p2`) resolves through every link; `visited`
- * guards a constant cycle (`const a = b; const b = a`) the same way
- * `free-refs.ts`'s `resolveConstantInitializerRefs` does. A constant whose
- * value isn't a bare identifier already on the chain (e.g. a real computed
- * object) stops the walk, so a genuinely different spread expression is
- * never mistaken for the rest object.
+ * The walk itself lives in `props-binding.ts`'s `resolveRestSpreadOriginCore`,
+ * shared with Phase 1's slot-id decision so both phases agree on which
+ * spreads forward the caller's leftover props (#2754). This wrapper only
+ * supplies the `ClientJsContext`-shaped inputs.
  */
 export function resolveRestSpreadOrigin(ctx: ClientJsContext, name: string): 'rest' | 'props' | null {
-  const byName = localConstantValues(ctx)
-  const visited = new Set<string>()
-  let current: string | undefined = name.trim()
-  while (current !== undefined && !visited.has(current)) {
-    if (ctx.restPropsName && current === ctx.restPropsName) return 'rest'
-    if (ctx.propsObjectName && current === ctx.propsObjectName) return 'props'
-    visited.add(current)
-    current = byName.get(current)?.trim()
-  }
-  return null
+  return resolveRestSpreadOriginCore(ctx, localConstantValues(ctx), name)
 }
 
 /**

package/src/ir-to-client-js/utils.ts

@@ -25,6 +25,7 @@ import {
   loopEndMarker,
   loopItemMarker,
   toHTMLAttrName as toHtmlAttrName,
+  keyAttrName as sharedKeyAttrName,
 } from '@barefootjs/shared'
 
 export { DATA_KEY, DATA_KEY_PREFIX, DATA_BF_PH, BF_LOOP_START, BF_LOOP_END, loopStartMarker, loopEndMarker, loopItemMarker, toHtmlAttrName }
@@ -39,9 +40,36 @@ export const PROPS_PARAM = '_p'
  * Get the data-key attribute name for a given loop depth.
  * Outer loop (depth 0): 'data-key'
  * Nested loops (depth N): 'data-key-N'
+ *
+ * Re-exported from `@barefootjs/shared` (the single source of truth also
+ * used by `jsx-to-ir.ts`'s `IRElement.keyAttr` resolution) so existing
+ * imports of this module keep working.
  */
-export function keyAttrName(loopDepth: number): string {
-  return loopDepth > 0 ? `${DATA_KEY_PREFIX}${loopDepth}` : DATA_KEY
+export const keyAttrName = sharedKeyAttrName
+
+/**
+ * Build the trailing `, <bfId>, <keyAttrName>` arguments for a NESTED
+ * (`loopDepth > 0`) `mapArray(...)` call — `inner-loop.ts` / `loop-child-arm.ts`,
+ * the only two stringify sites whose loop can be nested (#2753 Shape B: the
+ * runtime otherwise has no way to know it isn't the outermost loop, and
+ * always stamped the plain `data-key` name).
+ *
+ * A depth-0 (or unkeyed) loop needs no change at all: `mapArray`'s own
+ * default (`BF_KEY`, `'data-key'`) is already correct there, and an unkeyed
+ * loop's runtime never stamps a key attribute regardless of the name — so
+ * this returns `bfIdArg` UNCHANGED, keeping every other call site (and every
+ * existing depth-0 call here) byte-identical.
+ *
+ * `bfIdArg` is the existing profiling-id suffix (e.g. `profileBindingId(...)`,
+ * either `''` or `, "<id>"`) already threaded through these two call sites —
+ * an empty one is widened to an explicit `, undefined` placeholder so the
+ * name lands in the right positional slot (`mapArray`'s 6th parameter is
+ * `bfId`, not `keyAttrName`).
+ */
+export function mapArrayKeyArgs(bfIdArg: string, keyed: boolean, loopDepth: number): string {
+  if (!keyed || loopDepth <= 0) return bfIdArg
+  const bfIdSlot = bfIdArg || ', undefined'
+  return `${bfIdSlot}, ${JSON.stringify(keyAttrName(loopDepth))}`
 }
 
 /**