@barefootjs/vite 0.31.9 → 0.32.0

package/dist/index.js

@@ -7280,15 +7280,28 @@ function collectKeysFromMembers(members, ctx) {
   }
   return keys;
 }
+function isResolvableMemberType(info) {
+  switch (info.kind) {
+    case "primitive":
+      return info.primitive === "string" || info.primitive === "number" || info.primitive === "boolean";
+    case "interface":
+      return CATALOGUED_RICH_TYPE_NAMES.has(baseTypeName(info.raw));
+    case "array":
+      return !!info.elementType && isResolvableMemberType(info.elementType);
+    case "object":
+      return info.properties !== undefined && info.properties.every((prop) => isResolvableMemberType(prop.type));
+    default:
+      return false;
+  }
+}
 function collectMemberTypes(typeNode, ctx) {
-  const isResolvablePrimitive = (info) => info.kind === "primitive" && (info.primitive === "string" || info.primitive === "number" || info.primitive === "boolean") || info.kind === "interface" && CATALOGUED_RICH_TYPE_NAMES.has(baseTypeName(info.raw));
   const fromMembers = (members) => {
     const map = new Map;
     for (const member of members) {
       if (ts9.isPropertySignature(member) && member.name) {
         const info = member.type ? typeNodeToTypeInfo(member.type, ctx.sourceFile) : null;
         map.set(member.name.getText(ctx.sourceFile), {
-          type: info && isResolvablePrimitive(info) ? info : null,
+          type: info && isResolvableMemberType(info) ? info : null,
           optional: !!member.questionToken
         });
       }
@@ -22547,6 +22560,7 @@ function extractSsrDefaults(metadata) {
     out[metadata.restPropsName] = { isRestProps: true, value: {} };
   }
   const bindings = {};
+  const localConsts = localConstValuesByName(metadata);
   for (const c of metadata.localConstants ?? []) {
     if (!c.isModule || c.value === undefined)
       continue;
@@ -22562,14 +22576,26 @@ function extractSsrDefaults(metadata) {
     if (sig.envReader)
       continue;
     const value = tryStaticEval(sig.initialValue, { bindings, propsLike });
-    out[sig.getter] = { value: resultToJsonable(value) };
+    if (metadata.propsObjectName !== null && referencesOwnProp(sig.initialValue, metadata.propsObjectName, sig.getter, localConsts)) {
+      if (!(sig.getter in out)) {
+        out[sig.getter] = { propName: sig.getter, value: null };
+      }
+    } else {
+      out[sig.getter] = { value: resultToJsonable(value) };
+    }
     bindings[sig.getter] = value;
   }
   for (const memo of metadata.memos) {
     if (memo.isModule)
       continue;
     const value = tryStaticEval(memo.computation, { bindings, propsLike });
-    out[memo.name] = { value: resultToJsonable(value) };
+    if (metadata.propsObjectName !== null && referencesOwnProp(memo.computation, metadata.propsObjectName, memo.name, localConsts)) {
+      if (!(memo.name in out)) {
+        out[memo.name] = { propName: memo.name, value: null };
+      }
+    } else {
+      out[memo.name] = { value: resultToJsonable(value) };
+    }
     bindings[memo.name] = value;
   }
   if (metadata.propsObjectName !== null) {
@@ -22577,12 +22603,12 @@ function extractSsrDefaults(metadata) {
     for (const sig of metadata.signals) {
       if (!sig.getter || sig.isModule || sig.envReader)
         continue;
-      collectPropRefs(sig.initialValue, metadata.propsObjectName, referenced);
+      collectPropRefsTransitive(sig.initialValue, metadata.propsObjectName, localConsts, referenced);
     }
     for (const memo of metadata.memos) {
       if (memo.isModule)
         continue;
-      collectPropRefs(memo.computation, metadata.propsObjectName, referenced);
+      collectPropRefsTransitive(memo.computation, metadata.propsObjectName, localConsts, referenced);
     }
     for (const name of referenced) {
       if (name in out)
@@ -22592,6 +22618,20 @@ function extractSsrDefaults(metadata) {
   }
   return Object.keys(out).length === 0 ? undefined : out;
 }
+function localConstValuesByName(metadata) {
+  const out = new Map;
+  for (const c of metadata.localConstants ?? []) {
+    if (c.isModule || c.value === undefined)
+      continue;
+    out.set(c.name, c.value);
+  }
+  return out;
+}
+function referencesOwnProp(expr, propsObjectName, name, localConsts) {
+  const referenced = new Set;
+  collectPropRefsTransitive(expr, propsObjectName, localConsts, referenced);
+  return referenced.has(name);
+}
 function collectPropRefs(expr, propsObjectName, out) {
   if (!expr || !expr.trim())
     return;
@@ -22607,6 +22647,23 @@ function collectPropRefs(expr, propsObjectName, out) {
   };
   visit3(node);
 }
+function collectPropRefsTransitive(expr, propsObjectName, localConsts, out, visited = new Set) {
+  if (!expr || !expr.trim())
+    return;
+  collectPropRefs(expr, propsObjectName, out);
+  const node = parseExpression2(expr);
+  if (!node)
+    return;
+  for (const id of extractFreeIdentifiersFromNode(node)) {
+    if (visited.has(id))
+      continue;
+    const constValue = localConsts.get(id);
+    if (constValue === undefined)
+      continue;
+    visited.add(id);
+    collectPropRefsTransitive(constValue, propsObjectName, localConsts, out, visited);
+  }
+}
 function resultToJsonable(v) {
   if (v === UNRESOLVED)
     return null;
@@ -22651,7 +22708,7 @@ function evalStatementsForReturn(statements, ctx) {
   return NO_RETURN;
 }
 function parseExpression2(expr) {
-  const sf = ts22.createSourceFile("__ssr_default__.ts", `(${expr})`, ts22.ScriptTarget.Latest, false, ts22.ScriptKind.TS);
+  const sf = ts22.createSourceFile("__ssr_default__.ts", `(${expr})`, ts22.ScriptTarget.Latest, true, ts22.ScriptKind.TS);
   const stmt = sf.statements[0];
   if (!stmt || !ts22.isExpressionStatement(stmt))
     return null;
@@ -22965,6 +23022,38 @@ function classify2(name, origin, expr, parsed, available) {
   }
   return { kind: "derived", name, origin, expr, parsed, frees: [...frees] };
 }
+function localConstExprsByName(metadata) {
+  const out = new Map;
+  for (const c of metadata.localConstants ?? []) {
+    if (c.isModule || c.declarationKind !== "const" || c.value === undefined)
+      continue;
+    out.set(c.name, c.parsed ?? parseExpression(c.value.trim()));
+  }
+  return out;
+}
+function resolveThroughLocalConsts(parsed, localConsts) {
+  let current = parsed;
+  const maxIter = localConsts.size + 1;
+  for (let i = 0;i < maxIter; i++) {
+    const frees = freeIdentifiers(current);
+    if (frees === null)
+      break;
+    let changed = false;
+    for (const name of frees) {
+      const value = localConsts.get(name);
+      if (!value)
+        continue;
+      const inlined = inlineBinding(current, name, value);
+      if (inlined === null)
+        continue;
+      current = inlined;
+      changed = true;
+    }
+    if (!changed)
+      break;
+  }
+  return current;
+}
 function computeSsrSeedPlan(metadata) {
   const baseScope = metadata.propsParams.map((p) => p.name);
   if (metadata.propsObjectName)
@@ -22973,6 +23062,7 @@ function computeSsrSeedPlan(metadata) {
     baseScope.push(name);
   }
   const available = new Set(baseScope);
+  const localConsts = localConstExprsByName(metadata);
   const steps = [];
   for (const signal of metadata.signals) {
     if (signal.envReader) {
@@ -22984,13 +23074,13 @@ function computeSsrSeedPlan(metadata) {
       }
     }
     const expr = signal.initialValue.trim();
-    steps.push(expr === "" ? { kind: "opaque", name: signal.getter, origin: "signal" } : classify2(signal.getter, "signal", expr, parseExpression(expr), available));
+    steps.push(expr === "" ? { kind: "opaque", name: signal.getter, origin: "signal" } : classify2(signal.getter, "signal", expr, resolveThroughLocalConsts(parseExpression(expr), localConsts), available));
     available.add(signal.getter);
   }
   for (const memo of metadata.memos) {
     const body = extractArrowBodyExpression(memo.computation);
     const expr = body?.trim() ?? "";
-    steps.push(expr === "" ? { kind: "opaque", name: memo.name, origin: "memo" } : classify2(memo.name, "memo", expr, memo.parsed ?? parseExpression(expr), available));
+    steps.push(expr === "" ? { kind: "opaque", name: memo.name, origin: "memo" } : classify2(memo.name, "memo", expr, resolveThroughLocalConsts(memo.parsed ?? parseExpression(expr), localConsts), available));
     available.add(memo.name);
   }
   return { baseScope, steps };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/vite",
-  "version": "0.31.9",
+  "version": "0.32.0",
   "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.31.9"
+    "@barefootjs/shared": "0.32.0"
   },
   "peerDependencies": {
     "@barefootjs/jsx": ">=0.2.0",
     "vite": "^6.0.0"
   },
   "devDependencies": {
-    "@barefootjs/client": "0.31.9",
-    "@barefootjs/go-template": "0.31.9",
-    "@barefootjs/hono": "0.31.9",
-    "@barefootjs/jsx": "0.31.9",
+    "@barefootjs/client": "0.32.0",
+    "@barefootjs/go-template": "0.32.0",
+    "@barefootjs/hono": "0.32.0",
+    "@barefootjs/jsx": "0.32.0",
     "typescript": "^5.0.0",
     "vite": "^6.0.0"
   }