@barefootjs/vite 0.33.1 → 0.33.2

package/dist/index.js

@@ -10598,6 +10598,31 @@ function unwrapHoistedFragment(node) {
     return node;
   return { ...only, needsScope: true };
 }
+function markDataKeyCarrier(children) {
+  for (let i = 0;i < children.length; i++) {
+    const marked = markCarrierIn(children[i]);
+    if (!marked)
+      continue;
+    const out = children.slice();
+    out[i] = marked;
+    return out;
+  }
+  return children;
+}
+function markCarrierIn(node) {
+  if (node.type === "element") {
+    return { ...node, carriesDataKey: true };
+  }
+  if (node.type === "conditional") {
+    const cond = node;
+    const whenTrue = markCarrierIn(cond.whenTrue);
+    const whenFalse = markCarrierIn(cond.whenFalse);
+    if (!whenTrue && !whenFalse)
+      return null;
+    return { ...cond, whenTrue: whenTrue ?? cond.whenTrue, whenFalse: whenFalse ?? cond.whenFalse };
+  }
+  return null;
+}
 function transformFragment(node, ctx) {
   const isFragmentRoot = ctx.isRoot;
   const isTransparent = isFragmentRoot && isTransparentFragment(node, ctx);
@@ -10608,7 +10633,7 @@ function transformFragment(node, ctx) {
   const needsScopeComment = isFragmentRoot && !isTransparent || undefined;
   return {
     type: "fragment",
-    children,
+    children: needsScopeComment ? markDataKeyCarrier(children) : children,
     transparent: isTransparent || undefined,
     needsScopeComment,
     loc: getSourceLocation(node, ctx.sourceFile, ctx.filePath)
@@ -13705,6 +13730,50 @@ function buildIfStatementChain(analyzer, ctx, opts) {
 }
 
 // ../jsx/src/ir-to-client-js/prop-handling.ts
+function resolveRestSpreadOrigin(ctx, name) {
+  const byName = localConstantValues(ctx);
+  const visited = new Set;
+  let current = 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;
+}
+var _localConstantValuesCache = new WeakMap;
+function localConstantValues(ctx) {
+  const cached = _localConstantValuesCache.get(ctx);
+  if (cached)
+    return cached;
+  const byName = new Map;
+  for (const constant of ctx.localConstants) {
+    if (!byName.has(constant.name))
+      byName.set(constant.name, constant.value);
+  }
+  _localConstantValuesCache.set(ctx, byName);
+  return byName;
+}
+var _restSpreadNamesCache = new WeakMap;
+function resolveRestSpreadNames(ctx) {
+  const cached = _restSpreadNamesCache.get(ctx);
+  if (cached)
+    return cached;
+  const names = new Set;
+  if (ctx.restPropsName)
+    names.add(ctx.restPropsName);
+  if (ctx.propsObjectName)
+    names.add(ctx.propsObjectName);
+  for (const constant of ctx.localConstants) {
+    if (resolveRestSpreadOrigin(ctx, constant.name) !== null)
+      names.add(constant.name);
+  }
+  _restSpreadNamesCache.set(ctx, names);
+  return names;
+}
 function expandDynamicPropValue(value, ctx, scope) {
   const trimmedValue = value.trim();
   if (scope?.isBound(trimmedValue))
@@ -13793,6 +13862,9 @@ function decideWrapForChildProp(expandedValue, ctx, prop) {
   return decideWrapForAttr(expandedValue, ctx, prop);
 }
 function needsEffectWrapper(expr, ctx, freeIdentifiers2) {
+  return needsEffectWrapperCore(expr, ctx, freeIdentifiers2, new Set);
+}
+function needsEffectWrapperCore(expr, ctx, freeIdentifiers2, visitedConstants) {
   for (const signal of ctx.signals) {
     if (identifierCallPattern(signal.getter).test(expr)) {
       return true;
@@ -13815,6 +13887,19 @@ function needsEffectWrapper(expr, ctx, freeIdentifiers2) {
     if (propsAccess.test(expr))
       return true;
   }
+  for (const constant of ctx.localConstants) {
+    if (visitedConstants.has(constant.name))
+      continue;
+    if (constant.value === undefined || constant.containsArrow)
+      continue;
+    const referenced = freeIdentifiers2 ? freeIdentifiers2.has(constant.name) : tokenContainsIdent(expr, constant.name);
+    if (!referenced)
+      continue;
+    visitedConstants.add(constant.name);
+    if (needsEffectWrapperCore(constant.value, ctx, constant.freeIdentifiers, visitedConstants)) {
+      return true;
+    }
+  }
   return false;
 }
 function classifyReactivity(expr, ctx, loopParam, loopParamBindings, freeIdentifiers2) {
@@ -14488,24 +14573,14 @@ function jsxChildrenContainComponent(nodes) {
 function isSingleElementJsxChildren2(nodes) {
   return nodes.length === 1 && nodes[0].type === "element";
 }
-function buildRestSpreadNames(ctx) {
-  const names = new Set;
-  if (ctx.restPropsName)
-    names.add(ctx.restPropsName);
-  if (ctx.propsObjectName)
-    names.add(ctx.propsObjectName);
-  return names;
-}
 function buildComponentPropsExpr(props, ctx) {
-  const restName = ctx.restPropsName;
-  const propsObjName = ctx.propsObjectName;
   const knownSpreadProp = props.find((p) => {
     if (p.name !== "..." && !p.name.startsWith("..."))
       return false;
     if (p.value.kind !== "spread" && p.value.kind !== "expression")
       return false;
     const expr = p.value.kind === "spread" ? p.value.expr : p.value.expr;
-    return expr === restName || expr === propsObjName;
+    return resolveRestSpreadOrigin(ctx, expr) !== null;
   });
   const spreadSource = knownSpreadProp ? PROPS_PARAM : null;
   const propsForInit = [];
@@ -14653,13 +14728,13 @@ function collectElements(node, ctx, siblingOffsets, insideConditional = false) {
       if (l.childComponent) {
         template = "";
         if (l.isStaticArray && l.children[0]) {
-          staticItemTemplate = irToHtmlTemplate(l.children[0], buildRestSpreadNames(ctx), 0, undefined, undefined);
+          staticItemTemplate = irToHtmlTemplate(l.children[0], resolveRestSpreadNames(ctx), 0, undefined, undefined);
         }
       } else if (l.children[0] && !projectionInner) {
         const loopParamSpec = [{ param: l.param, bindings: l.paramBindings }];
-        template = useElementReconciliation ? irToPlaceholderTemplate(l.children[0], buildRestSpreadNames(ctx), 0, loopParamSpec) : irToHtmlTemplate(l.children[0], buildRestSpreadNames(ctx), 0, loopParamSpec);
+        template = useElementReconciliation ? irToPlaceholderTemplate(l.children[0], resolveRestSpreadNames(ctx), 0, loopParamSpec) : irToHtmlTemplate(l.children[0], resolveRestSpreadNames(ctx), 0, loopParamSpec);
         if (l.isStaticArray) {
-          staticItemTemplate = useElementReconciliation ? irToPlaceholderTemplate(l.children[0], buildRestSpreadNames(ctx), 0) : irToHtmlTemplate(l.children[0], buildRestSpreadNames(ctx), 0);
+          staticItemTemplate = useElementReconciliation ? irToPlaceholderTemplate(l.children[0], resolveRestSpreadNames(ctx), 0) : irToHtmlTemplate(l.children[0], resolveRestSpreadNames(ctx), 0);
         } else if (!useElementReconciliation && !l.bodyIsMultiRoot && !l.bodyIsItemConditional) {
           const skeletonSafeSlots = {
             reactiveAttrKeys: new Set(bindings.reactiveAttrs.map((a) => `${a.childSlotId}::${a.attrName}`)),
@@ -14711,11 +14786,11 @@ function collectElements(node, ctx, siblingOffsets, insideConditional = false) {
         preambleRegions: l.preambleRegions,
         flatMapClient: projectionInner ? {
           params: l.index ? `(${l.param}, ${l.index})` : `(${l.param})`,
-          body: renderFlatMapProjectionClientBody(projectionInner, buildRestSpreadNames(ctx)),
+          body: renderFlatMapProjectionClientBody(projectionInner, resolveRestSpreadNames(ctx)),
           keyed: projectionInner.key !== null
         } : l.flatMapCallback ? {
           params: l.flatMapCallback.params,
-          body: renderFlatMapClientBody(l.flatMapCallback, buildRestSpreadNames(ctx)),
+          body: renderFlatMapClientBody(l.flatMapCallback, resolveRestSpreadNames(ctx)),
           keyed: flatMapCallbackHasKeyedLeaf(l.flatMapCallback)
         } : undefined
       });
@@ -14782,10 +14857,9 @@ function collectFromElement(element, ctx, insideConditional = false) {
     for (const attr of element.attrs) {
       if (attr.name === "..." && attr.value) {
         const spreadVal = attrValueToString(attr.value) ?? "";
-        const elemRestName = ctx.restPropsName;
-        const elemPropsObjName = ctx.propsObjectName;
-        if (spreadVal && (spreadVal === elemRestName || spreadVal === elemPropsObjName)) {
-          const consumedKeys = spreadVal === elemRestName ? ctx.propsParams.map((p) => p.sourceName ?? p.name) : [];
+        const spreadOrigin = spreadVal ? resolveRestSpreadOrigin(ctx, spreadVal) : null;
+        if (spreadOrigin !== null) {
+          const consumedKeys = spreadOrigin === "rest" ? ctx.propsParams.map((p) => p.sourceName ?? p.name) : [];
           const staticAttrKeys = element.attrs.filter((a) => a.name !== "...").map((a) => a.name);
           const excludeKeys = [...new Set([...consumedKeys, ...staticAttrKeys])];
           ctx.restAttrElements.push({
@@ -14864,7 +14938,7 @@ function collectBranchTextEffects(node) {
 }
 function collectBranchLoops(node, ctx, siblingOffsets) {
   const loops = [];
-  const restNames = ctx ? buildRestSpreadNames(ctx) : undefined;
+  const restNames = ctx ? resolveRestSpreadNames(ctx) : undefined;
   walkIR(node, null, {
     ...stopAt("conditional", "ifStatement"),
     element: ({ node: el, scope: parentSlotId, descend }) => {
@@ -14932,7 +15006,7 @@ function collectBranchLoops(node, ctx, siblingOffsets) {
   return loops;
 }
 function buildConditionalMetadata(node, ctx, siblingOffsets) {
-  const restNames = buildRestSpreadNames(ctx);
+  const restNames = resolveRestSpreadNames(ctx);
   return {
     slotId: node.slotId,
     condition: node.condition,
@@ -16576,12 +16650,9 @@ function emitRegistrationAndHydration(lines, ctx, _ir, graph, inlinability) {
   lines.push("");
   const propNamesForStaticCheck = new Set(ctx.propsParams.map((p) => p.name));
   const { inlinableConstants, unsafeLocalNames } = inlinability ?? buildInlinableConstants(ctx, graph, _ir.root);
-  const restSpreadNames = new Set;
-  if (ctx.restPropsName)
-    restSpreadNames.add(ctx.restPropsName);
-  if (ctx.propsObjectName)
-    restSpreadNames.add(ctx.propsObjectName);
-  const isCommentScope = _ir.root.type === "fragment" && _ir.root.needsScopeComment || _ir.root.type === "component";
+  const restSpreadNames = resolveRestSpreadNames(ctx);
+  const isFragmentRoot = _ir.root.type === "fragment" && !!_ir.root.needsScopeComment;
+  const isCommentScope = isFragmentRoot || _ir.root.type === "component";
   const defParts = [`init: init${name}`];
   if (canGenerateStaticTemplate(_ir.root, propNamesForStaticCheck, inlinableConstants, unsafeLocalNames)) {
     const markupSlotIds = new Set(ctx.dynamicElements.map((e) => e.slotId));
@@ -16599,6 +16670,9 @@ function emitRegistrationAndHydration(lines, ctx, _ir, graph, inlinability) {
   if (isCommentScope) {
     defParts.push("comment: true");
   }
+  if (isFragmentRoot) {
+    defParts.push("fragmentRoot: true");
+  }
   const registryKey = nameForRegistryRef(name);
   if (registryKey !== name) {
     defParts.push(`name: '${name}'`);
@@ -21626,10 +21700,18 @@ var PHASES = [
 
 // ../jsx/src/ir-to-client-js/rewrite-props-object.ts
 import ts20 from "typescript";
-function rewritePropsObjectRef(code, propsObjectName) {
-  const srcPropsName = propsObjectName ?? "props";
-  if (srcPropsName === PROPS_PARAM)
-    return code;
+function rewritePropsObjectRef(code, propsObjectName, restPropsName = null) {
+  let result = code;
+  const seen = new Set;
+  for (const srcPropsName of [propsObjectName ?? "props", restPropsName]) {
+    if (srcPropsName === null || srcPropsName === PROPS_PARAM || seen.has(srcPropsName))
+      continue;
+    seen.add(srcPropsName);
+    result = rewriteOneName(result, srcPropsName);
+  }
+  return result;
+}
+function rewriteOneName(code, srcPropsName) {
   if (!identifierPattern(srcPropsName).test(code))
     return code;
   const sourceFile = ts20.createSourceFile("init-body.ts", code, ts20.ScriptTarget.Latest, true, ts20.ScriptKind.TS);
@@ -21697,7 +21779,7 @@ function generateInitFunction(ir, ctx, siblingComponents, localImportPrefixes) {
   runPhases(lines, phaseCtx, PHASES);
   const hydrateLine = emitRegistrationAndHydration(lines, ctx, ir, graph, inlinability);
   let generatedCode = rewritePropsObjectRef(lines.join(`
-`), ctx.propsObjectName);
+`), ctx.propsObjectName, ctx.restPropsName);
   generatedCode += `
 ` + hydrateLine;
   const moduleConstantsCode = emitModuleLevelDeclarations(classification.moduleLevelConstants, classification.moduleLevelFunctions, classification.moduleLevelSignals, classification.moduleLevelMemos);
@@ -21997,11 +22079,7 @@ function generateTemplateOnlyMount(ir, ctx) {
   const propNamesForStaticCheck = new Set(ctx.propsParams.map((p) => p.name));
   const graph = buildReferencesGraph(ctx, ir.root);
   const { inlinableConstants, unsafeLocalNames } = buildInlinableConstants(ctx, graph, ir.root);
-  const restSpreadNames = new Set;
-  if (ctx.restPropsName)
-    restSpreadNames.add(ctx.restPropsName);
-  if (ctx.propsObjectName)
-    restSpreadNames.add(ctx.propsObjectName);
+  const restSpreadNames = resolveRestSpreadNames(ctx);
   let templateHtml;
   if (canGenerateStaticTemplate(ir.root, propNamesForStaticCheck, inlinableConstants, unsafeLocalNames)) {
     const markupSlotIds = new Set(ctx.dynamicElements.map((e) => e.slotId));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/vite",
-  "version": "0.33.1",
+  "version": "0.33.2",
   "description": "Vite plugin for BarefootJS: Vite/Rollup owns bundling, hashing, chunking, tree-shaking and minification of client assets, BarefootJS keeps only the JSX to (template, client JS) compile",
   "type": "module",
   "main": "./dist/index.js",
@@ -38,17 +38,17 @@
     "directory": "packages/vite"
   },
   "dependencies": {
-    "@barefootjs/shared": "0.33.1"
+    "@barefootjs/shared": "0.33.2"
   },
   "peerDependencies": {
     "@barefootjs/jsx": ">=0.2.0",
     "vite": "^6.0.0"
   },
   "devDependencies": {
-    "@barefootjs/client": "0.33.1",
-    "@barefootjs/go-template": "0.33.1",
-    "@barefootjs/hono": "0.33.1",
-    "@barefootjs/jsx": "0.33.1",
+    "@barefootjs/client": "0.33.2",
+    "@barefootjs/go-template": "0.33.2",
+    "@barefootjs/hono": "0.33.2",
+    "@barefootjs/jsx": "0.33.2",
     "typescript": "^5.0.0",
     "vite": "^6.0.0"
   }