@barefootjs/jsx 0.28.0 → 0.29.0

package/dist/index.js

@@ -5367,6 +5367,7 @@ var ErrorCodes = {
   SHARED_PROGRAM_REQUIRED: "BF050",
   WRONG_PACKAGE_IMPORT: "BF051",
   BUILTIN_REQUIRES_IMPORT: "BF054",
+  INLINED_IMPORT_MISSING_EXPORT: "BF055",
   UNDECLARED_INIT_STATEMENT_REFERENCE: "BF052",
   STRIPPED_CLIENT_IMPORT_REFERENCED: "BF053",
   STAGE_REACTIVE_IN_TEMPLATE: "BF060",
@@ -5397,6 +5398,7 @@ var errorMessages = {
   [ErrorCodes.BUILTIN_REQUIRES_IMPORT]: "Built-in <Async> / <Region> must be imported from '@barefootjs/client'. " + "The compiler recognises these tags by their import (not by tag name), " + "so an unimported tag with this name is treated as an undeclared component.",
   [ErrorCodes.UNDECLARED_INIT_STATEMENT_REFERENCE]: "Init statement references an undeclared identifier. Declare it at module scope, inside the component, or import it — otherwise ESM strict mode throws ReferenceError at runtime.",
   [ErrorCodes.STRIPPED_CLIENT_IMPORT_REFERENCED]: "Import was stripped from the client bundle but its binding is still referenced. Client components ('use client' .tsx) are not callable as plain functions from imperative .ts modules — render them as JSX from a 'use client' parent instead. If the flagged name is a local shadow rather than the stripped import, please file an issue.",
+  [ErrorCodes.INLINED_IMPORT_MISSING_EXPORT]: "An inlined relative import requests a name the target module does not export. The client bundle would throw ReferenceError at load.",
   [ErrorCodes.STAGE_REACTIVE_IN_TEMPLATE]: "Reactive binding (signal getter or memo) referenced from template scope. The template lambda runs at module scope without the reactive context, so the value cannot be evaluated at SSR. Wrap the JSX expression in /* @client */ to defer it to hydrate, or restructure so the template uses a prop or static value.",
   [ErrorCodes.STAGE_INIT_LOCAL_IN_TEMPLATE]: "Init-scope local referenced from template scope. The template lambda runs at module scope (via render() / renderChild()) and cannot reach init-body locals. Wrap the JSX expression in /* @client */, or lift the value to a prop or module-scope const.",
   [ErrorCodes.STAGE_AWAIT_IN_TEMPLATE]: "AwaitExpression in template scope. The generated template and init functions are synchronous — a bare `await` produces a SyntaxError at parse time. Move the await into the component body (before the return) or into an onMount/effect callback, and pass the resolved value to JSX.",
@@ -7931,6 +7933,8 @@ function importsBrowserOnlyClientApi(ctx) {
     if (imp.isTypeOnly)
       continue;
     for (const spec of imp.specifiers) {
+      if (spec.isTypeOnly)
+        continue;
       const importedName = spec.name;
       if (BROWSER_ONLY_CLIENT_APIS.has(importedName))
         return true;
@@ -14042,7 +14046,7 @@ function emitTemplateCloneLines(template, indent) {
   ];
 }
 function emitLoopItemElementSetup(lines, opts) {
-  const { template, bodyIsMultiRoot, indent, singleRootLayout } = opts;
+  const { template, bodyIsMultiRoot, indent, singleRootLayout, mountRow } = opts;
   const innerIndent = indent + "  ";
   if (bodyIsMultiRoot) {
     lines.push(`${indent}let __el, __extras`);
@@ -14053,18 +14057,21 @@ function emitLoopItemElementSetup(lines, opts) {
       lines.push(ln);
     }
     lines.push(`${innerIndent}__el.__bfExtras = __extras`);
+    if (mountRow)
+      lines.push(`${innerIndent}mountRowRoot(__el)`);
     lines.push(`${indent}}`);
     return;
   }
   if (singleRootLayout === "inline") {
     const cloneExpr = emitTemplateCloneInline(template);
-    lines.push(`${indent}const __el = __existing ?? (() => { ${cloneExpr} })()`);
+    const clone = `__existing ?? (() => { ${cloneExpr} })()`;
+    lines.push(`${indent}const __el = ${mountRow ? `__existing ?? mountRowRoot((() => { ${cloneExpr} })())` : clone}`);
     return;
   }
-  lines.push(`${indent}const __el = __existing ?? (() => {`);
+  lines.push(`${indent}const __el = __existing ?? ${mountRow ? "mountRowRoot(" : ""}(() => {`);
   for (const ln of emitTemplateCloneLines(template, innerIndent))
     lines.push(ln);
-  lines.push(`${indent}})()`);
+  lines.push(`${indent}})()${mountRow ? ")" : ""}`);
 }
 function emitMultiRootTemplateCloneLines(template, indent, varEl, varExtras) {
   const isSvg = multiRootTemplateNeedsSvgWrap(template);
@@ -15279,6 +15286,74 @@ function propHasPropertyAccess(u) {
   return u.accessKinds.has("property") || u.accessKinds.has("index");
 }
 
+// src/value-references.ts
+import ts13 from "typescript";
+function isValueReferenceIdentifier(id) {
+  const parent = id.parent;
+  if (!parent)
+    return false;
+  if (ts13.isPropertyAccessExpression(parent) && parent.name === id)
+    return false;
+  if (ts13.isPropertyAssignment(parent) && parent.name === id)
+    return false;
+  if ((ts13.isMethodDeclaration(parent) || ts13.isGetAccessorDeclaration(parent) || ts13.isSetAccessorDeclaration(parent)) && parent.name === id) {
+    return false;
+  }
+  if (ts13.isPropertyDeclaration(parent) && parent.name === id)
+    return false;
+  if (ts13.isMetaProperty(parent) && parent.name === id)
+    return false;
+  if (ts13.isVariableDeclaration(parent) && parent.name === id)
+    return false;
+  if (ts13.isFunctionDeclaration(parent) && parent.name === id)
+    return false;
+  if (ts13.isFunctionExpression(parent) && parent.name === id)
+    return false;
+  if (ts13.isClassDeclaration(parent) && parent.name === id)
+    return false;
+  if (ts13.isClassExpression(parent) && parent.name === id)
+    return false;
+  if (ts13.isParameter(parent) && parent.name === id)
+    return false;
+  if (ts13.isBindingElement(parent) && (parent.name === id || parent.propertyName === id))
+    return false;
+  if (ts13.isLabeledStatement(parent) && parent.label === id)
+    return false;
+  if (ts13.isBreakOrContinueStatement(parent) && parent.label === id)
+    return false;
+  if (ts13.isImportSpecifier(parent) && (parent.name === id || parent.propertyName === id))
+    return false;
+  if (ts13.isExportSpecifier(parent) && (parent.name === id || parent.propertyName === id))
+    return false;
+  if (ts13.isImportClause(parent) && parent.name === id)
+    return false;
+  if (ts13.isNamespaceImport(parent) && parent.name === id)
+    return false;
+  if (ts13.isQualifiedName(parent) && parent.right === id)
+    return false;
+  return true;
+}
+function collectValueReferencedNames(code) {
+  let sourceFile;
+  try {
+    sourceFile = ts13.createSourceFile("generated.js", code, ts13.ScriptTarget.Latest, true, ts13.ScriptKind.JS);
+  } catch {
+    return null;
+  }
+  const diagnostics = sourceFile.parseDiagnostics;
+  if (diagnostics && diagnostics.length > 0)
+    return null;
+  const names = new Set;
+  function visit3(node) {
+    if (ts13.isIdentifier(node) && isValueReferenceIdentifier(node)) {
+      names.add(node.text);
+    }
+    ts13.forEachChild(node, visit3);
+  }
+  visit3(sourceFile);
+  return names;
+}
+
 // src/ir-to-client-js/imports.ts
 var RUNTIME_IMPORT_CANDIDATES = [
   "createSignal",
@@ -15301,6 +15376,7 @@ var RUNTIME_IMPORT_CANDIDATES = [
   "registerTemplate",
   "initChild",
   "upsertChild",
+  "mountRowRoot",
   "createPortal",
   "provideContext",
   "createContext",
@@ -15357,7 +15433,7 @@ function collectUserDomImports(ir) {
   for (const imp of ir.metadata.imports) {
     if (runtimeSources.has(imp.source) && !imp.isTypeOnly) {
       for (const spec of imp.specifiers) {
-        if (!spec.isDefault && !spec.isNamespace) {
+        if (!spec.isDefault && !spec.isNamespace && !spec.isTypeOnly) {
           if (isClientBuiltinName(spec.name))
             continue;
           userImports.push(spec.alias ? `${spec.name} as ${spec.alias}` : spec.name);
@@ -15367,9 +15443,22 @@ function collectUserDomImports(ir) {
   }
   return userImports;
 }
+function makeValueUsageTest(generatedCode) {
+  let referenced;
+  return (localName) => {
+    if (referenced === undefined) {
+      referenced = collectValueReferencedNames(generatedCode);
+    }
+    if (referenced !== null) {
+      return referenced.has(localName);
+    }
+    return generatedCode.includes(localName);
+  };
+}
 function collectExternalImports(ir, generatedCode, localImportPrefixes) {
   const componentNames = collectComponentNames(ir.root);
   const importLines = [];
+  const isUsedAsValue = makeValueUsageTest(generatedCode);
   for (const imp of ir.metadata.imports) {
     if (imp.isTypeOnly)
       continue;
@@ -15383,10 +15472,12 @@ function collectExternalImports(ir, generatedCode, localImportPrefixes) {
     }
     const usedSpecs = [];
     for (const spec of imp.specifiers) {
+      if (spec.isTypeOnly)
+        continue;
       const localName = spec.alias || spec.name;
       if (componentNames.has(localName))
         continue;
-      if (new RegExp(`\\b${localName}\\b`).test(generatedCode)) {
+      if (isUsedAsValue(localName)) {
         usedSpecs.push(spec.alias ? `${spec.name} as ${spec.alias}` : spec.name);
       }
     }
@@ -15425,7 +15516,7 @@ function collectComponentNames(node) {
 }
 
 // src/relocate.ts
-import ts13 from "typescript";
+import ts14 from "typescript";
 
 // src/lowering-registry.ts
 var plugins = [];
@@ -15471,19 +15562,19 @@ function classify(name, env) {
 function collectFreeRefs(node) {
   const refs = new Map;
   function visit3(n, parent) {
-    if (ts13.isIdentifier(n)) {
-      if (parent && ts13.isPropertyAccessExpression(parent) && parent.name === n)
+    if (ts14.isIdentifier(n)) {
+      if (parent && ts14.isPropertyAccessExpression(parent) && parent.name === n)
         return;
-      if (parent && ts13.isPropertyAssignment(parent) && parent.name === n)
+      if (parent && ts14.isPropertyAssignment(parent) && parent.name === n)
         return;
-      if (parent && ts13.isShorthandPropertyAssignment(parent) && parent.name === n)
+      if (parent && ts14.isShorthandPropertyAssignment(parent) && parent.name === n)
         return;
       const list = refs.get(n.text) ?? [];
       list.push(n);
       refs.set(n.text, list);
       return;
     }
-    ts13.forEachChild(n, (child) => visit3(child, n));
+    ts14.forEachChild(n, (child) => visit3(child, n));
   }
   visit3(node);
   return refs;
@@ -15586,11 +15677,11 @@ function isInlinableInTemplate(value, env) {
   return { ok: true, rewrittenValue: r.text, decisions: r.decisions };
 }
 function getCalleeIdentifierPath(callee) {
-  if (ts13.isParenthesizedExpression(callee))
+  if (ts14.isParenthesizedExpression(callee))
     return getCalleeIdentifierPath(callee.expression);
-  if (ts13.isIdentifier(callee))
+  if (ts14.isIdentifier(callee))
     return callee.text;
-  if (ts13.isPropertyAccessExpression(callee)) {
+  if (ts14.isPropertyAccessExpression(callee)) {
     const left = getCalleeIdentifierPath(callee.expression);
     if (left === null)
       return null;
@@ -15599,11 +15690,11 @@ function getCalleeIdentifierPath(callee) {
   return null;
 }
 function getCalleeLeftmostIdentifier(callee) {
-  if (ts13.isParenthesizedExpression(callee))
+  if (ts14.isParenthesizedExpression(callee))
     return getCalleeLeftmostIdentifier(callee.expression);
-  if (ts13.isIdentifier(callee))
+  if (ts14.isIdentifier(callee))
     return callee.text;
-  if (ts13.isPropertyAccessExpression(callee)) {
+  if (ts14.isPropertyAccessExpression(callee)) {
     return getCalleeLeftmostIdentifier(callee.expression);
   }
   return null;
@@ -15651,12 +15742,12 @@ function isCallAcceptedByAdapter(call, env) {
 }
 function parseExpressionNode(text) {
   try {
-    const sf = ts13.createSourceFile("__inline_check__.ts", `(${text});`, ts13.ScriptTarget.Latest, false, ts13.ScriptKind.TS);
+    const sf = ts14.createSourceFile("__inline_check__.ts", `(${text});`, ts14.ScriptTarget.Latest, false, ts14.ScriptKind.TS);
     const stmt = sf.statements[0];
-    if (!stmt || !ts13.isExpressionStatement(stmt))
+    if (!stmt || !ts14.isExpressionStatement(stmt))
       return null;
     const inner = stmt.expression;
-    return ts13.isParenthesizedExpression(inner) ? inner.expression : inner;
+    return ts14.isParenthesizedExpression(inner) ? inner.expression : inner;
   } catch {
     return null;
   }
@@ -15673,8 +15764,8 @@ function hasCallWithBridgedArg(node, decisions, env) {
   function visit3(n) {
     if (found)
       return;
-    if (ts13.isCallExpression(n) || ts13.isNewExpression(n)) {
-      const accepted = ts13.isCallExpression(n) && isCallAcceptedByAdapter(n, env);
+    if (ts14.isCallExpression(n) || ts14.isNewExpression(n)) {
+      const accepted = ts14.isCallExpression(n) && isCallAcceptedByAdapter(n, env);
       if (!accepted) {
         const args = n.arguments;
         if (args) {
@@ -15687,7 +15778,7 @@ function hasCallWithBridgedArg(node, decisions, env) {
         }
       }
     }
-    ts13.forEachChild(n, visit3);
+    ts14.forEachChild(n, visit3);
   }
   visit3(node);
   return found;
@@ -15697,13 +15788,13 @@ function hasZeroArgCall(node, env) {
   function visit3(n) {
     if (found)
       return;
-    if (ts13.isCallExpression(n) && n.arguments.length === 0) {
+    if (ts14.isCallExpression(n) && n.arguments.length === 0) {
       if (!isCallAcceptedByAdapter(n, env)) {
         found = true;
         return;
       }
     }
-    ts13.forEachChild(n, visit3);
+    ts14.forEachChild(n, visit3);
   }
   visit3(node);
   return found;
@@ -15713,25 +15804,25 @@ function containsAnyIdentifier(node, names) {
   function visit3(n) {
     if (found)
       return;
-    if (ts13.isPropertyAccessExpression(n)) {
+    if (ts14.isPropertyAccessExpression(n)) {
       visit3(n.expression);
       return;
     }
-    if (ts13.isPropertyAssignment(n)) {
+    if (ts14.isPropertyAssignment(n)) {
       visit3(n.initializer);
       return;
     }
-    if (ts13.isShorthandPropertyAssignment(n)) {
-      if (ts13.isIdentifier(n.name) && names.has(n.name.text)) {
+    if (ts14.isShorthandPropertyAssignment(n)) {
+      if (ts14.isIdentifier(n.name) && names.has(n.name.text)) {
         found = true;
       }
       return;
     }
-    if (ts13.isIdentifier(n) && names.has(n.text)) {
+    if (ts14.isIdentifier(n) && names.has(n.text)) {
       found = true;
       return;
     }
-    ts13.forEachChild(n, visit3);
+    ts14.forEachChild(n, visit3);
   }
   visit3(node);
   return found;
@@ -18854,7 +18945,7 @@ function buildArmBody(branch, options) {
 }
 
 // src/ir-to-client-js/emit-reactive.ts
-import ts14 from "typescript";
+import ts15 from "typescript";
 
 // src/ir-to-client-js/control-flow/stringify/claim-plan.ts
 function slotSpecLiteral(slot) {
@@ -18957,20 +19048,20 @@ function lowerToLocaleCallsInReactiveExpr(expr, matcher) {
     return expr;
   let sourceFile;
   try {
-    sourceFile = ts14.createSourceFile("__reactive_expr__.ts", `(${expr});`, ts14.ScriptTarget.Latest, true, ts14.ScriptKind.TS);
+    sourceFile = ts15.createSourceFile("__reactive_expr__.ts", `(${expr});`, ts15.ScriptTarget.Latest, true, ts15.ScriptKind.TS);
   } catch {
     return expr;
   }
   const stmt = sourceFile.statements[0];
-  if (!stmt || !ts14.isExpressionStatement(stmt))
+  if (!stmt || !ts15.isExpressionStatement(stmt))
     return expr;
-  const root = ts14.isParenthesizedExpression(stmt.expression) ? stmt.expression.expression : stmt.expression;
+  const root = ts15.isParenthesizedExpression(stmt.expression) ? stmt.expression.expression : stmt.expression;
   const candidates = [];
   const visit3 = (n) => {
-    if (ts14.isCallExpression(n) && n.arguments.length === 2 && ts14.isPropertyAccessExpression(n.expression) && !n.expression.questionDotToken && n.expression.name.text === "toLocaleDateString") {
+    if (ts15.isCallExpression(n) && n.arguments.length === 2 && ts15.isPropertyAccessExpression(n.expression) && !n.expression.questionDotToken && n.expression.name.text === "toLocaleDateString") {
       candidates.push(n);
     }
-    ts14.forEachChild(n, visit3);
+    ts15.forEachChild(n, visit3);
   };
   visit3(root);
   if (candidates.length === 0)
@@ -19006,20 +19097,20 @@ function lowerDateCallsInReactiveExpr(expr, matcher) {
     return expr;
   let sourceFile;
   try {
-    sourceFile = ts14.createSourceFile("__reactive_expr__.ts", `(${expr});`, ts14.ScriptTarget.Latest, true, ts14.ScriptKind.TS);
+    sourceFile = ts15.createSourceFile("__reactive_expr__.ts", `(${expr});`, ts15.ScriptTarget.Latest, true, ts15.ScriptKind.TS);
   } catch {
     return expr;
   }
   const stmt = sourceFile.statements[0];
-  if (!stmt || !ts14.isExpressionStatement(stmt))
+  if (!stmt || !ts15.isExpressionStatement(stmt))
     return expr;
-  const root = ts14.isParenthesizedExpression(stmt.expression) ? stmt.expression.expression : stmt.expression;
+  const root = ts15.isParenthesizedExpression(stmt.expression) ? stmt.expression.expression : stmt.expression;
   const candidates = [];
   const visit3 = (n) => {
-    if (ts14.isCallExpression(n) && n.arguments.length === 0 && ts14.isPropertyAccessExpression(n.expression) && !n.expression.questionDotToken && DATE_METHODS.has(n.expression.name.text)) {
+    if (ts15.isCallExpression(n) && n.arguments.length === 0 && ts15.isPropertyAccessExpression(n.expression) && !n.expression.questionDotToken && DATE_METHODS.has(n.expression.name.text)) {
       candidates.push(n);
     }
-    ts14.forEachChild(n, visit3);
+    ts15.forEachChild(n, visit3);
   };
   visit3(root);
   if (candidates.length === 0)
@@ -20144,7 +20235,8 @@ function stringifyCompositeLoop(lines, plan) {
     template,
     bodyIsMultiRoot,
     indent: bodyIndent,
-    singleRootLayout: "multiline"
+    singleRootLayout: "multiline",
+    mountRow: true
   });
   emitComponentAndEventSetup(lines, bodyIndent, "__el", compsArr, eventsArr, loopParam, loopParamBindings, bodyIsMultiRoot);
   if (innerLoops.length > 0) {
@@ -20974,20 +21066,20 @@ var PHASES = [
 ];
 
 // src/ir-to-client-js/rewrite-props-object.ts
-import ts15 from "typescript";
+import ts16 from "typescript";
 function rewritePropsObjectRef(code, propsObjectName) {
   const srcPropsName = propsObjectName ?? "props";
   if (srcPropsName === PROPS_PARAM)
     return code;
   if (!new RegExp(`\\b${srcPropsName}\\b`).test(code))
     return code;
-  const sourceFile = ts15.createSourceFile("init-body.ts", code, ts15.ScriptTarget.Latest, true, ts15.ScriptKind.TS);
+  const sourceFile = ts16.createSourceFile("init-body.ts", code, ts16.ScriptTarget.Latest, true, ts16.ScriptKind.TS);
   const spans = [];
   function visit3(node) {
-    if (ts15.isIdentifier(node) && node.text === srcPropsName && shouldRewrite(node)) {
+    if (ts16.isIdentifier(node) && node.text === srcPropsName && shouldRewrite(node)) {
       spans.push([node.getStart(sourceFile), node.getEnd()]);
     }
-    ts15.forEachChild(node, visit3);
+    ts16.forEachChild(node, visit3);
   }
   visit3(sourceFile);
   if (spans.length === 0)
@@ -21003,17 +21095,17 @@ function shouldRewrite(node) {
   const parent = node.parent;
   if (!parent)
     return true;
-  if (ts15.isPropertyAccessExpression(parent) && parent.name === node)
+  if (ts16.isPropertyAccessExpression(parent) && parent.name === node)
     return false;
-  if (ts15.isPropertyAssignment(parent) && parent.name === node)
+  if (ts16.isPropertyAssignment(parent) && parent.name === node)
     return false;
-  if (ts15.isShorthandPropertyAssignment(parent) && parent.name === node)
+  if (ts16.isShorthandPropertyAssignment(parent) && parent.name === node)
     return false;
-  if (ts15.isPropertySignature(parent) && parent.name === node)
+  if (ts16.isPropertySignature(parent) && parent.name === node)
     return false;
-  if (ts15.isPropertyDeclaration(parent) && parent.name === node)
+  if (ts16.isPropertyDeclaration(parent) && parent.name === node)
     return false;
-  if (ts15.isBindingElement(parent) && parent.name === node)
+  if (ts16.isBindingElement(parent) && parent.name === node)
     return false;
   return true;
 }
@@ -21643,7 +21735,7 @@ function walkIR2(node, visitor) {
 }
 
 // src/preprocess-inline-jsx-callbacks.ts
-import ts16 from "typescript";
+import ts17 from "typescript";
 var SYNTHETIC_PREFIX = "BFInlineJsxCallback";
 var MAX_FIXPOINT_ITERATIONS = 16;
 function preprocessInlineJsxCallbacks(source, filePath) {
@@ -21665,8 +21757,8 @@ function preprocessInlineJsxCallbacks(source, filePath) {
   return { source: current, errors, syntheticNames };
 }
 function runSinglePass(source, filePath, startingCounter) {
-  const sourceFile = ts16.createSourceFile(filePath, source, ts16.ScriptTarget.Latest, true, ts16.ScriptKind.TSX);
-  const hasUseClient = sourceFile.statements.some((stmt) => ts16.isExpressionStatement(stmt) && ts16.isStringLiteral(stmt.expression) && (stmt.expression.text === "use client" || stmt.expression.text === "'use client'"));
+  const sourceFile = ts17.createSourceFile(filePath, source, ts17.ScriptTarget.Latest, true, ts17.ScriptKind.TSX);
+  const hasUseClient = sourceFile.statements.some((stmt) => ts17.isExpressionStatement(stmt) && ts17.isStringLiteral(stmt.expression) && (stmt.expression.text === "use client" || stmt.expression.text === "'use client'"));
   if (!hasUseClient) {
     return { source, errors: [], syntheticNames: [], counterAfter: startingCounter };
   }
@@ -21688,22 +21780,22 @@ function runSinglePass(source, filePath, startingCounter) {
     }
   }
   function visit3(node) {
-    if (ts16.isJsxAttribute(node) && node.initializer && ts16.isJsxExpression(node.initializer) && node.initializer.expression) {
+    if (ts17.isJsxAttribute(node) && node.initializer && ts17.isJsxExpression(node.initializer) && node.initializer.expression) {
       if (tryHandleArrowValue(node.initializer.expression)) {
         return;
       }
     }
-    if (ts16.isPropertyAssignment(node) && node.initializer) {
+    if (ts17.isPropertyAssignment(node) && node.initializer) {
       if (tryHandleArrowValue(node.initializer))
         return;
     }
-    ts16.forEachChild(node, visit3);
+    ts17.forEachChild(node, visit3);
   }
   function tryHandleArrowValue(initializer) {
     let expr = initializer;
-    while (ts16.isParenthesizedExpression(expr))
+    while (ts17.isParenthesizedExpression(expr))
       expr = expr.expression;
-    if (ts16.isArrowFunction(expr) && arrowBodyContainsJsx(expr)) {
+    if (ts17.isArrowFunction(expr) && arrowBodyContainsJsx(expr)) {
       return handleInlineArrow(expr);
     }
     return false;
@@ -21740,7 +21832,7 @@ function runSinglePass(source, filePath, startingCounter) {
     replacements.push({ start: arrowStart, end: arrowEnd, text: name });
     return true;
   }
-  ts16.forEachChild(sourceFile, visit3);
+  ts17.forEachChild(sourceFile, visit3);
   if (replacements.length === 0) {
     return { source, errors, syntheticNames, counterAfter: counter };
   }
@@ -21763,11 +21855,11 @@ function errorMessageForCapture(captures) {
   return `Inline JSX-returning arrow function captures non-module identifier(s): ` + `${captures.sort().join(", ")}. ` + `Extract the callback into a top-level '\\'use client\\'' component (e.g. ` + `\`function MyNode(n) { return <div/> }\` then \`renderNode={MyNode}\`) ` + `or pass captured values via component props.`;
 }
 function arrowBodyContainsJsx(arrow) {
-  if (ts16.isBlock(arrow.body)) {
+  if (ts17.isBlock(arrow.body)) {
     return blockReturnsJsx(arrow.body);
   }
   let body = arrow.body;
-  while (ts16.isParenthesizedExpression(body))
+  while (ts17.isParenthesizedExpression(body))
     body = body.expression;
   return isJsxLike(body);
 }
@@ -21776,24 +21868,24 @@ function blockReturnsJsx(block) {
   function visit3(n) {
     if (found)
       return;
-    if (ts16.isReturnStatement(n) && n.expression) {
+    if (ts17.isReturnStatement(n) && n.expression) {
       let e = n.expression;
-      while (ts16.isParenthesizedExpression(e))
+      while (ts17.isParenthesizedExpression(e))
         e = e.expression;
       if (isJsxLike(e)) {
         found = true;
         return;
       }
     }
-    if (ts16.isArrowFunction(n) || ts16.isFunctionDeclaration(n) || ts16.isFunctionExpression(n))
+    if (ts17.isArrowFunction(n) || ts17.isFunctionDeclaration(n) || ts17.isFunctionExpression(n))
       return;
-    ts16.forEachChild(n, visit3);
+    ts17.forEachChild(n, visit3);
   }
-  ts16.forEachChild(block, visit3);
+  ts17.forEachChild(block, visit3);
   return found;
 }
 function isJsxLike(expr) {
-  return ts16.isJsxElement(expr) || ts16.isJsxSelfClosingElement(expr) || ts16.isJsxFragment(expr);
+  return ts17.isJsxElement(expr) || ts17.isJsxSelfClosingElement(expr) || ts17.isJsxFragment(expr);
 }
 function collectArrowParamNames(arrow) {
   const names = new Set;
@@ -21803,13 +21895,13 @@ function collectArrowParamNames(arrow) {
 }
 function collectBindingNames2(name, out) {
   const push = Array.isArray(out) ? (n) => out.push(n) : (n) => out.add(n);
-  if (ts16.isIdentifier(name)) {
+  if (ts17.isIdentifier(name)) {
     push(name.text);
-  } else if (ts16.isObjectBindingPattern(name)) {
+  } else if (ts17.isObjectBindingPattern(name)) {
     name.elements.forEach((el) => collectBindingNames2(el.name, out));
-  } else if (ts16.isArrayBindingPattern(name)) {
+  } else if (ts17.isArrayBindingPattern(name)) {
     name.elements.forEach((el) => {
-      if (!ts16.isOmittedExpression(el))
+      if (!ts17.isOmittedExpression(el))
         collectBindingNames2(el.name, out);
     });
   }
@@ -21836,48 +21928,48 @@ function collectFreeIdentifiers(arrow) {
     return bound.includes(name);
   }
   function visit3(node) {
-    if (ts16.isIdentifier(node)) {
+    if (ts17.isIdentifier(node)) {
       const parent = node.parent;
-      if (parent && ts16.isPropertyAccessExpression(parent) && parent.name === node)
+      if (parent && ts17.isPropertyAccessExpression(parent) && parent.name === node)
         return;
-      if (parent && ts16.isPropertyAssignment(parent) && parent.name === node)
+      if (parent && ts17.isPropertyAssignment(parent) && parent.name === node)
         return;
-      if (parent && ts16.isPropertySignature(parent) && parent.name === node)
+      if (parent && ts17.isPropertySignature(parent) && parent.name === node)
         return;
-      if (parent && ts16.isPropertyDeclaration(parent) && parent.name === node)
+      if (parent && ts17.isPropertyDeclaration(parent) && parent.name === node)
         return;
-      if (parent && ts16.isMethodDeclaration(parent) && parent.name === node)
+      if (parent && ts17.isMethodDeclaration(parent) && parent.name === node)
         return;
-      if (parent && ts16.isMethodSignature(parent) && parent.name === node)
+      if (parent && ts17.isMethodSignature(parent) && parent.name === node)
         return;
-      if (parent && ts16.isGetAccessorDeclaration(parent) && parent.name === node)
+      if (parent && ts17.isGetAccessorDeclaration(parent) && parent.name === node)
         return;
-      if (parent && ts16.isSetAccessorDeclaration(parent) && parent.name === node)
+      if (parent && ts17.isSetAccessorDeclaration(parent) && parent.name === node)
         return;
-      if (parent && ts16.isEnumMember(parent) && parent.name === node)
+      if (parent && ts17.isEnumMember(parent) && parent.name === node)
         return;
-      if (parent && ts16.isBindingElement(parent) && parent.propertyName === node)
+      if (parent && ts17.isBindingElement(parent) && parent.propertyName === node)
         return;
-      if (parent && ts16.isShorthandPropertyAssignment(parent) && parent.name === node) {
+      if (parent && ts17.isShorthandPropertyAssignment(parent) && parent.name === node) {
         if (!isBound(node.text))
           ids.add(node.text);
         return;
       }
-      if (parent && ts16.isParameter(parent) && parent.name === node)
+      if (parent && ts17.isParameter(parent) && parent.name === node)
         return;
-      if (parent && ts16.isVariableDeclaration(parent) && parent.name === node)
+      if (parent && ts17.isVariableDeclaration(parent) && parent.name === node)
         return;
-      if (parent && ts16.isFunctionDeclaration(parent) && parent.name === node)
+      if (parent && ts17.isFunctionDeclaration(parent) && parent.name === node)
         return;
-      if (parent && ts16.isClassDeclaration(parent) && parent.name === node)
+      if (parent && ts17.isClassDeclaration(parent) && parent.name === node)
         return;
-      if (parent && ts16.isJsxAttribute(parent) && parent.name === node)
+      if (parent && ts17.isJsxAttribute(parent) && parent.name === node)
         return;
-      if (parent && ts16.isJsxOpeningElement(parent) && parent.tagName === node) {
+      if (parent && ts17.isJsxOpeningElement(parent) && parent.tagName === node) {
         if (/^[a-z]/.test(node.text))
           return;
       }
-      if (parent && ts16.isJsxClosingElement(parent) && parent.tagName === node) {
+      if (parent && ts17.isJsxClosingElement(parent) && parent.tagName === node) {
         if (/^[a-z]/.test(node.text))
           return;
       }
@@ -21886,43 +21978,43 @@ function collectFreeIdentifiers(arrow) {
       ids.add(node.text);
       return;
     }
-    if (ts16.isVariableDeclaration(node)) {
+    if (ts17.isVariableDeclaration(node)) {
       const declared = pushBindings(node.name);
       if (node.initializer)
         visit3(node.initializer);
       return;
     }
-    if (ts16.isFunctionDeclaration(node)) {
+    if (ts17.isFunctionDeclaration(node)) {
       if (node.name)
         bound.push(node.name.text);
       visitInsideNewScope(node);
       return;
     }
-    if (ts16.isClassDeclaration(node)) {
+    if (ts17.isClassDeclaration(node)) {
       if (node.name)
         bound.push(node.name.text);
-      ts16.forEachChild(node, visit3);
+      ts17.forEachChild(node, visit3);
       return;
     }
-    if (ts16.isArrowFunction(node) || ts16.isFunctionExpression(node)) {
+    if (ts17.isArrowFunction(node) || ts17.isFunctionExpression(node)) {
       visitInsideNewScope(node);
       return;
     }
-    if (ts16.isCatchClause(node)) {
+    if (ts17.isCatchClause(node)) {
       const before = bound.length;
       if (node.variableDeclaration)
         pushBindings(node.variableDeclaration.name);
-      ts16.forEachChild(node, visit3);
+      ts17.forEachChild(node, visit3);
       popN(bound.length - before);
       return;
     }
-    if (ts16.isBlock(node)) {
+    if (ts17.isBlock(node)) {
       const before = bound.length;
-      ts16.forEachChild(node, visit3);
+      ts17.forEachChild(node, visit3);
       popN(bound.length - before);
       return;
     }
-    ts16.forEachChild(node, visit3);
+    ts17.forEachChild(node, visit3);
   }
   function visitInsideNewScope(fn) {
     const before = bound.length;
@@ -21945,29 +22037,29 @@ function collectFreeIdentifiers(arrow) {
 function collectModuleScopeNames(sourceFile) {
   const names = new Set;
   for (const stmt of sourceFile.statements) {
-    if (ts16.isFunctionDeclaration(stmt) && stmt.name)
+    if (ts17.isFunctionDeclaration(stmt) && stmt.name)
       names.add(stmt.name.text);
-    else if (ts16.isClassDeclaration(stmt) && stmt.name)
+    else if (ts17.isClassDeclaration(stmt) && stmt.name)
       names.add(stmt.name.text);
-    else if (ts16.isVariableStatement(stmt)) {
+    else if (ts17.isVariableStatement(stmt)) {
       for (const decl of stmt.declarationList.declarations)
         collectBindingNames2(decl.name, names);
-    } else if (ts16.isImportDeclaration(stmt) && stmt.importClause) {
+    } else if (ts17.isImportDeclaration(stmt) && stmt.importClause) {
       const ic = stmt.importClause;
       if (ic.name)
         names.add(ic.name.text);
       if (ic.namedBindings) {
-        if (ts16.isNamespaceImport(ic.namedBindings))
+        if (ts17.isNamespaceImport(ic.namedBindings))
           names.add(ic.namedBindings.name.text);
         else
           for (const e of ic.namedBindings.elements)
             names.add(e.name.text);
       }
-    } else if (ts16.isTypeAliasDeclaration(stmt))
+    } else if (ts17.isTypeAliasDeclaration(stmt))
       names.add(stmt.name.text);
-    else if (ts16.isInterfaceDeclaration(stmt))
+    else if (ts17.isInterfaceDeclaration(stmt))
       names.add(stmt.name.text);
-    else if (ts16.isEnumDeclaration(stmt))
+    else if (ts17.isEnumDeclaration(stmt))
       names.add(stmt.name.text);
   }
   return names;
@@ -21975,7 +22067,7 @@ function collectModuleScopeNames(sourceFile) {
 function buildSyntheticDeclaration(name, arrow, sourceFile) {
   const paramsText = arrow.parameters.length === 0 ? "" : arrow.parameters.map((p) => p.getText(sourceFile)).join(", ");
   let bodyText;
-  if (ts16.isBlock(arrow.body)) {
+  if (ts17.isBlock(arrow.body)) {
     bodyText = arrow.body.getText(sourceFile);
   } else {
     const expr = arrow.body.getText(sourceFile);
@@ -21985,7 +22077,7 @@ function buildSyntheticDeclaration(name, arrow, sourceFile) {
 }
 
 // src/ssr-defaults.ts
-import ts17 from "typescript";
+import ts18 from "typescript";
 var UNRESOLVED = Symbol("unresolved");
 var NO_RETURN = Symbol("no-return");
 function extractSsrDefaults(metadata) {
@@ -22061,11 +22153,11 @@ function collectPropRefs(expr, propsObjectName, out) {
   if (!node)
     return;
   const visit3 = (n) => {
-    if (ts17.isPropertyAccessExpression(n) && ts17.isIdentifier(n.expression) && n.expression.text === propsObjectName && ts17.isIdentifier(n.name)) {
+    if (ts18.isPropertyAccessExpression(n) && ts18.isIdentifier(n.expression) && n.expression.text === propsObjectName && ts18.isIdentifier(n.name)) {
       out.add(n.name.text);
       return;
     }
-    ts17.forEachChild(n, visit3);
+    ts18.forEachChild(n, visit3);
   };
   visit3(node);
 }
@@ -22086,23 +22178,23 @@ function tryStaticEval(expr, ctx) {
 }
 function evalStatementsForReturn(statements, ctx) {
   for (const stmt of statements) {
-    if (ts17.isVariableStatement(stmt)) {
+    if (ts18.isVariableStatement(stmt)) {
       for (const d of stmt.declarationList.declarations) {
-        if (!ts17.isIdentifier(d.name) || !d.initializer)
+        if (!ts18.isIdentifier(d.name) || !d.initializer)
           continue;
         const v = evalNode(d.initializer, ctx);
         if (v !== UNRESOLVED)
           ctx.bindings[d.name.text] = v;
       }
-    } else if (ts17.isReturnStatement(stmt)) {
+    } else if (ts18.isReturnStatement(stmt)) {
       return stmt.expression ? evalNode(stmt.expression, ctx) : UNRESOLVED;
-    } else if (ts17.isIfStatement(stmt)) {
+    } else if (ts18.isIfStatement(stmt)) {
       const cond = evalNode(stmt.expression, ctx);
       if (cond === UNRESOLVED)
         return UNRESOLVED;
       const branch = cond ? stmt.thenStatement : stmt.elseStatement;
       if (branch) {
-        const taken = evalStatementsForReturn(ts17.isBlock(branch) ? branch.statements : [branch], ctx);
+        const taken = evalStatementsForReturn(ts18.isBlock(branch) ? branch.statements : [branch], ctx);
         if (taken !== NO_RETURN)
           return taken;
       }
@@ -22113,45 +22205,45 @@ function evalStatementsForReturn(statements, ctx) {
   return NO_RETURN;
 }
 function parseExpression2(expr) {
-  const sf = ts17.createSourceFile("__ssr_default__.ts", `(${expr})`, ts17.ScriptTarget.Latest, false, ts17.ScriptKind.TS);
+  const sf = ts18.createSourceFile("__ssr_default__.ts", `(${expr})`, ts18.ScriptTarget.Latest, false, ts18.ScriptKind.TS);
   const stmt = sf.statements[0];
-  if (!stmt || !ts17.isExpressionStatement(stmt))
+  if (!stmt || !ts18.isExpressionStatement(stmt))
     return null;
-  const inner = ts17.isParenthesizedExpression(stmt.expression) ? stmt.expression.expression : stmt.expression;
+  const inner = ts18.isParenthesizedExpression(stmt.expression) ? stmt.expression.expression : stmt.expression;
   return inner;
 }
 function evalNode(node, ctx) {
-  if (ts17.isParenthesizedExpression(node))
+  if (ts18.isParenthesizedExpression(node))
     return evalNode(node.expression, ctx);
-  if (ts17.isAsExpression(node))
+  if (ts18.isAsExpression(node))
     return evalNode(node.expression, ctx);
-  if (ts17.isSatisfiesExpression(node))
+  if (ts18.isSatisfiesExpression(node))
     return evalNode(node.expression, ctx);
-  if (ts17.isTypeAssertionExpression(node))
+  if (ts18.isTypeAssertionExpression(node))
     return evalNode(node.expression, ctx);
-  if (ts17.isNonNullExpression(node))
+  if (ts18.isNonNullExpression(node))
     return evalNode(node.expression, ctx);
-  if (ts17.isArrowFunction(node)) {
+  if (ts18.isArrowFunction(node)) {
     if (node.parameters.length !== 0)
       return UNRESOLVED;
-    if (!ts17.isBlock(node.body))
+    if (!ts18.isBlock(node.body))
       return evalNode(node.body, ctx);
     const localBindings = { ...ctx.bindings };
     const localCtx = { ...ctx, bindings: localBindings };
     const result = evalStatementsForReturn(node.body.statements, localCtx);
     return result === NO_RETURN ? UNRESOLVED : result;
   }
-  if (ts17.isNumericLiteral(node))
+  if (ts18.isNumericLiteral(node))
     return Number(node.text);
-  if (ts17.isStringLiteralLike(node))
+  if (ts18.isStringLiteralLike(node))
     return node.text;
-  if (node.kind === ts17.SyntaxKind.TrueKeyword)
+  if (node.kind === ts18.SyntaxKind.TrueKeyword)
     return true;
-  if (node.kind === ts17.SyntaxKind.FalseKeyword)
+  if (node.kind === ts18.SyntaxKind.FalseKeyword)
     return false;
-  if (node.kind === ts17.SyntaxKind.NullKeyword)
+  if (node.kind === ts18.SyntaxKind.NullKeyword)
     return null;
-  if (ts17.isIdentifier(node)) {
+  if (ts18.isIdentifier(node)) {
     if (node.text === "undefined")
       return;
     if (node.text in ctx.bindings)
@@ -22160,29 +22252,29 @@ function evalNode(node, ctx) {
       return;
     return UNRESOLVED;
   }
-  if (ts17.isPrefixUnaryExpression(node)) {
+  if (ts18.isPrefixUnaryExpression(node)) {
     const arg = evalNode(node.operand, ctx);
     if (arg === UNRESOLVED)
       return UNRESOLVED;
     switch (node.operator) {
-      case ts17.SyntaxKind.MinusToken:
+      case ts18.SyntaxKind.MinusToken:
         return typeof arg === "number" ? -arg : UNRESOLVED;
-      case ts17.SyntaxKind.PlusToken:
+      case ts18.SyntaxKind.PlusToken:
         return typeof arg === "number" ? +arg : UNRESOLVED;
-      case ts17.SyntaxKind.ExclamationToken:
+      case ts18.SyntaxKind.ExclamationToken:
         return !arg;
     }
     return UNRESOLVED;
   }
-  if (ts17.isObjectLiteralExpression(node)) {
+  if (ts18.isObjectLiteralExpression(node)) {
     const obj = {};
     for (const prop of node.properties) {
-      if (!ts17.isPropertyAssignment(prop))
+      if (!ts18.isPropertyAssignment(prop))
         return UNRESOLVED;
       let key;
-      if (ts17.isIdentifier(prop.name) || ts17.isStringLiteralLike(prop.name)) {
+      if (ts18.isIdentifier(prop.name) || ts18.isStringLiteralLike(prop.name)) {
         key = prop.name.text;
-      } else if (ts17.isNumericLiteral(prop.name)) {
+      } else if (ts18.isNumericLiteral(prop.name)) {
         key = prop.name.text;
       } else {
         return UNRESOLVED;
@@ -22194,10 +22286,10 @@ function evalNode(node, ctx) {
     }
     return obj;
   }
-  if (ts17.isArrayLiteralExpression(node)) {
+  if (ts18.isArrayLiteralExpression(node)) {
     const arr = [];
     for (const elem of node.elements) {
-      if (ts17.isOmittedExpression(elem))
+      if (ts18.isOmittedExpression(elem))
         return UNRESOLVED;
       const v = evalNode(elem, ctx);
       if (v === UNRESOLVED)
@@ -22206,7 +22298,7 @@ function evalNode(node, ctx) {
     }
     return arr;
   }
-  if (ts17.isElementAccessExpression(node)) {
+  if (ts18.isElementAccessExpression(node)) {
     const base = evalNode(node.expression, ctx);
     if (base === undefined)
       return;
@@ -22220,17 +22312,17 @@ function evalNode(node, ctx) {
     const k = String(key);
     return Object.prototype.hasOwnProperty.call(base, k) ? base[k] : undefined;
   }
-  if (ts17.isPropertyAccessExpression(node)) {
+  if (ts18.isPropertyAccessExpression(node)) {
     const baseResult = evalNode(node.expression, ctx);
     if (baseResult === undefined)
       return;
     return UNRESOLVED;
   }
-  if (ts17.isCallExpression(node)) {
-    if (node.arguments.length === 0 && ts17.isIdentifier(node.expression) && node.expression.text in ctx.bindings) {
+  if (ts18.isCallExpression(node)) {
+    if (node.arguments.length === 0 && ts18.isIdentifier(node.expression) && node.expression.text in ctx.bindings) {
       return ctx.bindings[node.expression.text];
     }
-    if (ts17.isPropertyAccessExpression(node.expression) && node.expression.name.text === "join") {
+    if (ts18.isPropertyAccessExpression(node.expression) && node.expression.name.text === "join") {
       const recv = evalNode(node.expression.expression, ctx);
       if (Array.isArray(recv)) {
         let sep2 = ",";
@@ -22246,27 +22338,27 @@ function evalNode(node, ctx) {
     }
     return UNRESOLVED;
   }
-  if (ts17.isConditionalExpression(node)) {
+  if (ts18.isConditionalExpression(node)) {
     const cond = evalNode(node.condition, ctx);
     if (cond === UNRESOLVED)
       return UNRESOLVED;
     return cond ? evalNode(node.whenTrue, ctx) : evalNode(node.whenFalse, ctx);
   }
-  if (ts17.isBinaryExpression(node)) {
+  if (ts18.isBinaryExpression(node)) {
     const op = node.operatorToken.kind;
-    if (op === ts17.SyntaxKind.QuestionQuestionToken) {
+    if (op === ts18.SyntaxKind.QuestionQuestionToken) {
       const l2 = evalNode(node.left, ctx);
       if (l2 !== UNRESOLVED && l2 !== null && l2 !== undefined)
         return l2;
       return evalNode(node.right, ctx);
     }
-    if (op === ts17.SyntaxKind.BarBarToken) {
+    if (op === ts18.SyntaxKind.BarBarToken) {
       const l2 = evalNode(node.left, ctx);
       if (l2 !== UNRESOLVED && l2)
         return l2;
       return evalNode(node.right, ctx);
     }
-    if (op === ts17.SyntaxKind.AmpersandAmpersandToken) {
+    if (op === ts18.SyntaxKind.AmpersandAmpersandToken) {
       const l2 = evalNode(node.left, ctx);
       if (l2 === UNRESOLVED)
         return UNRESOLVED;
@@ -22279,30 +22371,30 @@ function evalNode(node, ctx) {
     if (l === UNRESOLVED || r === UNRESOLVED)
       return UNRESOLVED;
     switch (op) {
-      case ts17.SyntaxKind.PlusToken:
+      case ts18.SyntaxKind.PlusToken:
         if (typeof l === "string" || typeof r === "string")
           return `${l}${r}`;
         if (typeof l === "number" && typeof r === "number")
           return l + r;
         return UNRESOLVED;
-      case ts17.SyntaxKind.MinusToken:
+      case ts18.SyntaxKind.MinusToken:
         return typeof l === "number" && typeof r === "number" ? l - r : UNRESOLVED;
-      case ts17.SyntaxKind.AsteriskToken:
+      case ts18.SyntaxKind.AsteriskToken:
         return typeof l === "number" && typeof r === "number" ? l * r : UNRESOLVED;
-      case ts17.SyntaxKind.SlashToken:
+      case ts18.SyntaxKind.SlashToken:
         return typeof l === "number" && typeof r === "number" && r !== 0 ? l / r : UNRESOLVED;
-      case ts17.SyntaxKind.PercentToken:
+      case ts18.SyntaxKind.PercentToken:
         return typeof l === "number" && typeof r === "number" && r !== 0 ? l % r : UNRESOLVED;
-      case ts17.SyntaxKind.EqualsEqualsEqualsToken:
-      case ts17.SyntaxKind.EqualsEqualsToken:
+      case ts18.SyntaxKind.EqualsEqualsEqualsToken:
+      case ts18.SyntaxKind.EqualsEqualsToken:
         return l === r;
-      case ts17.SyntaxKind.ExclamationEqualsEqualsToken:
-      case ts17.SyntaxKind.ExclamationEqualsToken:
+      case ts18.SyntaxKind.ExclamationEqualsEqualsToken:
+      case ts18.SyntaxKind.ExclamationEqualsToken:
         return l !== r;
     }
     return UNRESOLVED;
   }
-  if (ts17.isTemplateExpression(node)) {
+  if (ts18.isTemplateExpression(node)) {
     if (node.templateSpans.length === 0)
       return node.head.text;
     let acc = node.head.text;
@@ -22314,13 +22406,13 @@ function evalNode(node, ctx) {
     }
     return acc;
   }
-  if (ts17.isNoSubstitutionTemplateLiteral(node))
+  if (ts18.isNoSubstitutionTemplateLiteral(node))
     return node.text;
   return UNRESOLVED;
 }
 
 // src/augment-inherited-props.ts
-import ts18 from "typescript";
+import ts19 from "typescript";
 function collectContextConsumers(metadata) {
   const constants = metadata.localConstants ?? [];
   const contextDefaults = new Map;
@@ -22352,47 +22444,47 @@ function collectContextConsumers(metadata) {
 }
 function parseUseContextArg(source) {
   const expr = parseSingleExpression(source);
-  if (!expr || !ts18.isCallExpression(expr))
+  if (!expr || !ts19.isCallExpression(expr))
     return null;
-  if (!ts18.isIdentifier(expr.expression) || expr.expression.text !== "useContext")
+  if (!ts19.isIdentifier(expr.expression) || expr.expression.text !== "useContext")
     return null;
   if (expr.arguments.length !== 1)
     return null;
   const arg = expr.arguments[0];
-  return ts18.isIdentifier(arg) ? arg.text : null;
+  return ts19.isIdentifier(arg) ? arg.text : null;
 }
 function parseCreateContextDefault(source) {
   const expr = parseSingleExpression(source);
-  if (!expr || !ts18.isCallExpression(expr))
+  if (!expr || !ts19.isCallExpression(expr))
     return null;
   if (expr.arguments.length === 0)
     return null;
   const arg = expr.arguments[0];
-  if (ts18.isStringLiteral(arg) || ts18.isNoSubstitutionTemplateLiteral(arg))
+  if (ts19.isStringLiteral(arg) || ts19.isNoSubstitutionTemplateLiteral(arg))
     return arg.text;
-  if (ts18.isNumericLiteral(arg))
+  if (ts19.isNumericLiteral(arg))
     return Number(arg.text);
-  if (arg.kind === ts18.SyntaxKind.TrueKeyword)
+  if (arg.kind === ts19.SyntaxKind.TrueKeyword)
     return true;
-  if (arg.kind === ts18.SyntaxKind.FalseKeyword)
+  if (arg.kind === ts19.SyntaxKind.FalseKeyword)
     return false;
   return null;
 }
 function isObjectLiteralCreateContextDefault(source) {
   const expr = parseSingleExpression(source);
-  if (!expr || !ts18.isCallExpression(expr))
+  if (!expr || !ts19.isCallExpression(expr))
     return false;
   if (expr.arguments.length === 0)
     return false;
-  return ts18.isObjectLiteralExpression(expr.arguments[0]);
+  return ts19.isObjectLiteralExpression(expr.arguments[0]);
 }
 function parseSingleExpression(source) {
-  const sf = ts18.createSourceFile("__ctx.ts", `(${source})`, ts18.ScriptTarget.Latest, false);
+  const sf = ts19.createSourceFile("__ctx.ts", `(${source})`, ts19.ScriptTarget.Latest, false);
   const stmt = sf.statements[0];
-  if (!stmt || !ts18.isExpressionStatement(stmt))
+  if (!stmt || !ts19.isExpressionStatement(stmt))
     return null;
   let e = stmt.expression;
-  while (ts18.isParenthesizedExpression(e))
+  while (ts19.isParenthesizedExpression(e))
     e = e.expression;
   return e;
 }
@@ -22417,25 +22509,25 @@ function augmentInheritedPropAccesses(ir) {
   const pinCoalesceLiterals = (s) => {
     if (!s || !s.includes(propsObj))
       return;
-    const sf = ts18.createSourceFile("__aug.ts", `(${s})`, ts18.ScriptTarget.Latest, false);
+    const sf = ts19.createSourceFile("__aug.ts", `(${s})`, ts19.ScriptTarget.Latest, false);
     const visit3 = (n) => {
-      if (ts18.isBinaryExpression(n) && (n.operatorToken.kind === ts18.SyntaxKind.QuestionQuestionToken || n.operatorToken.kind === ts18.SyntaxKind.BarBarToken)) {
+      if (ts19.isBinaryExpression(n) && (n.operatorToken.kind === ts19.SyntaxKind.QuestionQuestionToken || n.operatorToken.kind === ts19.SyntaxKind.BarBarToken)) {
         let left = n.left;
-        while (ts18.isParenthesizedExpression(left))
+        while (ts19.isParenthesizedExpression(left))
           left = left.expression;
-        if (ts18.isPropertyAccessExpression(left) && ts18.isIdentifier(left.expression) && left.expression.text === propsObj) {
+        if (ts19.isPropertyAccessExpression(left) && ts19.isIdentifier(left.expression) && left.expression.text === propsObj) {
           const name = left.name.text;
           let right = n.right;
-          while (ts18.isParenthesizedExpression(right))
+          while (ts19.isParenthesizedExpression(right))
             right = right.expression;
-          if (ts18.isPrefixUnaryExpression(right))
+          if (ts19.isPrefixUnaryExpression(right))
             right = right.operand;
-          const kind = ts18.isNumericLiteral(right) ? "number" : right.kind === ts18.SyntaxKind.TrueKeyword || right.kind === ts18.SyntaxKind.FalseKeyword ? "boolean" : ts18.isStringLiteralLike(right) ? "string" : null;
+          const kind = ts19.isNumericLiteral(right) ? "number" : right.kind === ts19.SyntaxKind.TrueKeyword || right.kind === ts19.SyntaxKind.FalseKeyword ? "boolean" : ts19.isStringLiteralLike(right) ? "string" : null;
           if (kind && !coalesceLiteralTypes.has(name))
             coalesceLiteralTypes.set(name, kind);
         }
       }
-      ts18.forEachChild(n, visit3);
+      ts19.forEachChild(n, visit3);
     };
     visit3(sf);
   };
@@ -22546,33 +22638,33 @@ function augmentInheritedPropAccesses(ir) {
   }
 }
 function parseStaticStringConst(source) {
-  const sf = ts18.createSourceFile("__const.ts", `const __x = (${source});`, ts18.ScriptTarget.Latest, false);
+  const sf = ts19.createSourceFile("__const.ts", `const __x = (${source});`, ts19.ScriptTarget.Latest, false);
   const stmt = sf.statements[0];
-  if (!stmt || !ts18.isVariableStatement(stmt))
+  if (!stmt || !ts19.isVariableStatement(stmt))
     return null;
   let init = stmt.declarationList.declarations[0]?.initializer;
-  while (init && ts18.isParenthesizedExpression(init))
+  while (init && ts19.isParenthesizedExpression(init))
     init = init.expression;
   if (!init)
     return null;
-  if (ts18.isStringLiteral(init) || ts18.isNoSubstitutionTemplateLiteral(init)) {
+  if (ts19.isStringLiteral(init) || ts19.isNoSubstitutionTemplateLiteral(init)) {
     return init.text;
   }
   return evalStringArrayJoin(source);
 }
 function evalTemplateOfStringConsts(source, resolved) {
-  const sf = ts18.createSourceFile("__const.ts", `const __x = (${source});`, ts18.ScriptTarget.Latest, false);
+  const sf = ts19.createSourceFile("__const.ts", `const __x = (${source});`, ts19.ScriptTarget.Latest, false);
   const stmt = sf.statements[0];
-  if (!stmt || !ts18.isVariableStatement(stmt))
+  if (!stmt || !ts19.isVariableStatement(stmt))
     return null;
   let init = stmt.declarationList.declarations[0]?.initializer;
-  while (init && ts18.isParenthesizedExpression(init))
+  while (init && ts19.isParenthesizedExpression(init))
     init = init.expression;
-  if (!init || !ts18.isTemplateExpression(init))
+  if (!init || !ts19.isTemplateExpression(init))
     return null;
   let out = init.head.text;
   for (const span of init.templateSpans) {
-    if (!ts18.isIdentifier(span.expression))
+    if (!ts19.isIdentifier(span.expression))
       return null;
     const value = resolved.get(span.expression.text);
     if (value === undefined)
@@ -22603,30 +22695,30 @@ function lookupStaticRecordLiteral(objectName, key, constants) {
   const constInfo = (constants ?? []).find((c) => c.name === objectName && c.isModule);
   if (constInfo?.value === undefined)
     return null;
-  const sf = ts18.createSourceFile("__rec.ts", `(${constInfo.value})`, ts18.ScriptTarget.Latest, true);
+  const sf = ts19.createSourceFile("__rec.ts", `(${constInfo.value})`, ts19.ScriptTarget.Latest, true);
   if (sf.statements.length !== 1)
     return null;
   const stmt = sf.statements[0];
-  if (!ts18.isExpressionStatement(stmt))
+  if (!ts19.isExpressionStatement(stmt))
     return null;
   let parsed = stmt.expression;
-  while (ts18.isParenthesizedExpression(parsed))
+  while (ts19.isParenthesizedExpression(parsed))
     parsed = parsed.expression;
-  if (!ts18.isObjectLiteralExpression(parsed))
+  if (!ts19.isObjectLiteralExpression(parsed))
     return null;
   for (const prop of parsed.properties) {
-    if (!ts18.isPropertyAssignment(prop))
+    if (!ts19.isPropertyAssignment(prop))
       continue;
     const name = prop.name;
-    const propKey = ts18.isIdentifier(name) || ts18.isStringLiteral(name) || ts18.isNoSubstitutionTemplateLiteral(name) ? name.text : null;
+    const propKey = ts19.isIdentifier(name) || ts19.isStringLiteral(name) || ts19.isNoSubstitutionTemplateLiteral(name) ? name.text : null;
     if (propKey !== key)
       continue;
     let v = prop.initializer;
-    while (ts18.isParenthesizedExpression(v))
+    while (ts19.isParenthesizedExpression(v))
       v = v.expression;
-    if (ts18.isNumericLiteral(v))
+    if (ts19.isNumericLiteral(v))
       return { kind: "number", text: v.text };
-    if (ts18.isStringLiteral(v) || ts18.isNoSubstitutionTemplateLiteral(v)) {
+    if (ts19.isStringLiteral(v) || ts19.isNoSubstitutionTemplateLiteral(v)) {
       return { kind: "string", text: v.text };
     }
     return null;
@@ -22634,28 +22726,28 @@ function lookupStaticRecordLiteral(objectName, key, constants) {
   return null;
 }
 function evalStringArrayJoin(source) {
-  const sf = ts18.createSourceFile("__join.ts", `const __x = (${source});`, ts18.ScriptTarget.Latest, false);
+  const sf = ts19.createSourceFile("__join.ts", `const __x = (${source});`, ts19.ScriptTarget.Latest, false);
   const stmt = sf.statements[0];
-  if (!stmt || !ts18.isVariableStatement(stmt))
+  if (!stmt || !ts19.isVariableStatement(stmt))
     return null;
   let node = stmt.declarationList.declarations[0]?.initializer;
-  while (node && ts18.isParenthesizedExpression(node))
+  while (node && ts19.isParenthesizedExpression(node))
     node = node.expression;
-  if (!node || !ts18.isCallExpression(node))
+  if (!node || !ts19.isCallExpression(node))
     return null;
   const callee = node.expression;
-  if (!ts18.isPropertyAccessExpression(callee))
+  if (!ts19.isPropertyAccessExpression(callee))
     return null;
   if (callee.name.text !== "join")
     return null;
   let recv = callee.expression;
-  while (ts18.isParenthesizedExpression(recv))
+  while (ts19.isParenthesizedExpression(recv))
     recv = recv.expression;
-  if (!ts18.isArrayLiteralExpression(recv))
+  if (!ts19.isArrayLiteralExpression(recv))
     return null;
   const parts = [];
   for (const el of recv.elements) {
-    if (ts18.isStringLiteral(el) || ts18.isNoSubstitutionTemplateLiteral(el)) {
+    if (ts19.isStringLiteral(el) || ts19.isNoSubstitutionTemplateLiteral(el)) {
       parts.push(el.text);
     } else {
       return null;
@@ -22664,7 +22756,7 @@ function evalStringArrayJoin(source) {
   let sep2 = ",";
   if (node.arguments.length >= 1) {
     const arg = node.arguments[0];
-    if (ts18.isStringLiteral(arg) || ts18.isNoSubstitutionTemplateLiteral(arg))
+    if (ts19.isStringLiteral(arg) || ts19.isNoSubstitutionTemplateLiteral(arg))
       sep2 = arg.text;
     else
       return null;
@@ -22672,11 +22764,11 @@ function evalStringArrayJoin(source) {
   return parts.join(sep2);
 }
 function parseRecordIndexAccess(val, localConstants, propsParams, resolveKey) {
-  if (!ts18.isElementAccessExpression(val))
+  if (!ts19.isElementAccessExpression(val))
     return null;
   const obj = val.expression;
   const arg = val.argumentExpression;
-  if (!ts18.isIdentifier(obj) || !ts18.isIdentifier(arg))
+  if (!ts19.isIdentifier(obj) || !ts19.isIdentifier(arg))
     return null;
   let indexPropName;
   let defaultKey;
@@ -22692,35 +22784,35 @@ function parseRecordIndexAccess(val, localConstants, propsParams, resolveKey) {
   const constInfo = localConstants.find((c) => c.name === obj.text && c.isModule);
   if (constInfo?.value === undefined)
     return null;
-  const sf = ts18.createSourceFile("__rec.ts", `(${constInfo.value})`, ts18.ScriptTarget.Latest, true);
+  const sf = ts19.createSourceFile("__rec.ts", `(${constInfo.value})`, ts19.ScriptTarget.Latest, true);
   if (sf.statements.length !== 1)
     return null;
   const stmt = sf.statements[0];
-  if (!ts18.isExpressionStatement(stmt))
+  if (!ts19.isExpressionStatement(stmt))
     return null;
   let parsed = stmt.expression;
-  while (ts18.isParenthesizedExpression(parsed))
+  while (ts19.isParenthesizedExpression(parsed))
     parsed = parsed.expression;
-  if (!ts18.isObjectLiteralExpression(parsed))
+  if (!ts19.isObjectLiteralExpression(parsed))
     return null;
   const entries = [];
   for (const prop of parsed.properties) {
-    if (!ts18.isPropertyAssignment(prop))
+    if (!ts19.isPropertyAssignment(prop))
       return null;
     let key;
-    if (ts18.isIdentifier(prop.name)) {
+    if (ts19.isIdentifier(prop.name)) {
       key = prop.name.text;
-    } else if (ts18.isStringLiteral(prop.name) || ts18.isNoSubstitutionTemplateLiteral(prop.name)) {
+    } else if (ts19.isStringLiteral(prop.name) || ts19.isNoSubstitutionTemplateLiteral(prop.name)) {
       key = prop.name.text;
     } else {
       return null;
     }
     let v = prop.initializer;
-    while (ts18.isParenthesizedExpression(v))
+    while (ts19.isParenthesizedExpression(v))
       v = v.expression;
-    if (ts18.isNumericLiteral(v)) {
+    if (ts19.isNumericLiteral(v)) {
       entries.push({ key, value: { kind: "number", text: v.text } });
-    } else if (ts18.isStringLiteral(v) || ts18.isNoSubstitutionTemplateLiteral(v)) {
+    } else if (ts19.isStringLiteral(v) || ts19.isNoSubstitutionTemplateLiteral(v)) {
       entries.push({ key, value: { kind: "string", text: v.text } });
     } else {
       return null;
@@ -23359,6 +23451,7 @@ function compileJSX(source, filePath, options) {
       const sortedRuntimeImports = [...runtimeImports].sort();
       const runtimeImportLine = sortedRuntimeImports.length > 0 ? `import { ${sortedRuntimeImports.join(", ")} } from '${RUNTIME_MODULE}'` : "";
       const externalImportLines = [];
+      const isUsedAsValue = makeValueUsageTest(body);
       for (const imp of ctx.imports) {
         if (imp.isTypeOnly)
           continue;
@@ -23368,7 +23461,7 @@ function compileJSX(source, filePath, options) {
           externalImportLines.push(`import '${imp.source}'`);
           continue;
         }
-        const used = imp.specifiers.filter((s2) => !s2.isDefault && !s2.isNamespace && new RegExp(`\\b${s2.alias || s2.name}\\b`).test(body)).map((s2) => s2.alias ? `${s2.name} as ${s2.alias}` : s2.name);
+        const used = imp.specifiers.filter((s2) => !s2.isDefault && !s2.isNamespace && !s2.isTypeOnly && isUsedAsValue(s2.alias || s2.name)).map((s2) => s2.alias ? `${s2.name} as ${s2.alias}` : s2.name);
         if (used.length > 0) {
           externalImportLines.push(`import { ${used.join(", ")} } from '${imp.source}'`);
         }
@@ -23404,6 +23497,8 @@ function compileJSX(source, filePath, options) {
       if (!imp.source.startsWith("./") && !imp.source.startsWith("../"))
         continue;
       for (const spec of imp.specifiers) {
+        if (spec.isTypeOnly)
+          continue;
         if (ctx.importedClientSignalNames.has(spec.alias ?? spec.name)) {
           sources.add(imp.source);
           break;
@@ -23500,7 +23595,7 @@ function compileJSX(source, filePath, options) {
   return { files, errors };
 }
 // src/shared-program.ts
-import ts19 from "typescript";
+import ts20 from "typescript";
 function commonParent(paths) {
   if (paths.length === 0)
     return process.cwd();
@@ -23521,10 +23616,10 @@ function commonParent(paths) {
 function createProgramForCorpus(files, options = {}) {
   const baseUrl = options.baseUrl ?? commonParent(files);
   const compilerOptions = {
-    target: ts19.ScriptTarget.Latest,
-    module: ts19.ModuleKind.ESNext,
-    moduleResolution: ts19.ModuleResolutionKind.Bundler,
-    jsx: ts19.JsxEmit.ReactJSX,
+    target: ts20.ScriptTarget.Latest,
+    module: ts20.ModuleKind.ESNext,
+    moduleResolution: ts20.ModuleResolutionKind.Bundler,
+    jsx: ts20.JsxEmit.ReactJSX,
     strict: true,
     skipLibCheck: true,
     noEmit: true,
@@ -23534,7 +23629,7 @@ function createProgramForCorpus(files, options = {}) {
     ...options.compilerOptions
   };
   const absolute = files.map((f) => path_default.resolve(f));
-  return ts19.createProgram(absolute, compilerOptions, undefined, options.oldProgram);
+  return ts20.createProgram(absolute, compilerOptions, undefined, options.oldProgram);
 }
 // src/adapters/interface.ts
 class BaseAdapter {
@@ -24516,7 +24611,7 @@ function dangerousInnerHtmlDiagnostic(expr, loc, reason) {
   };
 }
 // src/combine-client-js.ts
-import ts20 from "typescript";
+import ts21 from "typescript";
 var CHILD_PLACEHOLDER_RE = /import '\/\* @bf-child:(\w+) \*\/'/g;
 function combineParentChildClientJs(files) {
   const result = new Map;
@@ -24573,10 +24668,10 @@ function combineParentChildClientJs(files) {
   return result;
 }
 function parseAndMerge(content, importsBySource, otherImports, codeSections) {
-  const sourceFile = ts20.createSourceFile("combine.js", content, ts20.ScriptTarget.Latest, false, ts20.ScriptKind.JS);
+  const sourceFile = ts21.createSourceFile("combine.js", content, ts21.ScriptTarget.Latest, false, ts21.ScriptKind.JS);
   const importSpans = [];
   for (const stmt of sourceFile.statements) {
-    if (!ts20.isImportDeclaration(stmt))
+    if (!ts21.isImportDeclaration(stmt))
       continue;
     const start = stmt.getStart(sourceFile);
     const end = stmt.getEnd();
@@ -24586,8 +24681,8 @@ function parseAndMerge(content, importsBySource, otherImports, codeSections) {
       continue;
     const clause = stmt.importClause;
     const bindings = clause?.namedBindings;
-    const specifier = ts20.isStringLiteral(stmt.moduleSpecifier) ? stmt.moduleSpecifier.text : "";
-    if (clause && !clause.name && bindings && ts20.isNamedImports(bindings)) {
+    const specifier = ts21.isStringLiteral(stmt.moduleSpecifier) ? stmt.moduleSpecifier.text : "";
+    if (clause && !clause.name && bindings && ts21.isNamedImports(bindings)) {
       if (!importsBySource.has(specifier)) {
         importsBySource.set(specifier, new Set);
       }
@@ -24754,7 +24849,7 @@ function escapeRe(s) {
   return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 // src/debug.ts
-import ts21 from "typescript";
+import ts22 from "typescript";
 function buildComponentGraph(source, filePath, componentName) {
   const ctx = analyzeComponent(source, filePath, componentName);
   if (!ctx.jsxReturn) {
@@ -26039,7 +26134,7 @@ function truncateExpr(expr, max = 40) {
 function exprReadsPropMember(expr, propsObjectName) {
   let sf;
   try {
-    sf = ts21.createSourceFile("__attr.tsx", `(${expr})`, ts21.ScriptTarget.Latest, true, ts21.ScriptKind.TSX);
+    sf = ts22.createSourceFile("__attr.tsx", `(${expr})`, ts22.ScriptTarget.Latest, true, ts22.ScriptKind.TSX);
   } catch {
     return false;
   }
@@ -26047,11 +26142,11 @@ function exprReadsPropMember(expr, propsObjectName) {
   const visit3 = (n) => {
     if (found)
       return;
-    if (ts21.isPropertyAccessExpression(n) && ts21.isIdentifier(n.expression) && n.expression.text === propsObjectName && n.name.text !== "children") {
+    if (ts22.isPropertyAccessExpression(n) && ts22.isIdentifier(n.expression) && n.expression.text === propsObjectName && n.name.text !== "children") {
       found = true;
       return;
     }
-    ts21.forEachChild(n, visit3);
+    ts22.forEachChild(n, visit3);
   };
   visit3(sf);
   return found;
@@ -26121,7 +26216,7 @@ function findSourceFile2(meta) {
   return null;
 }
 // src/profiler.ts
-import ts22 from "typescript";
+import ts23 from "typescript";
 var PROFILE_SCHEMA_VERSION = 1;
 var DEFAULT_FANOUT_THRESHOLD = 8;
 function buildStaticBudget(source, filePath, componentName, options = {}) {
@@ -26391,15 +26486,15 @@ function joinProfilerEvents(events, index) {
   return { joined, unattributed, diagnostics };
 }
 function findUninstrumentedEffects(source, filePath, instrumentedLines) {
-  const sf = ts22.createSourceFile(filePath, source, ts22.ScriptTarget.Latest, true, ts22.ScriptKind.TSX);
+  const sf = ts23.createSourceFile(filePath, source, ts23.ScriptTarget.Latest, true, ts23.ScriptKind.TSX);
   const out = [];
   const visit3 = (node) => {
-    if (ts22.isCallExpression(node) && ts22.isIdentifier(node.expression) && node.expression.text === "createEffect") {
+    if (ts23.isCallExpression(node) && ts23.isIdentifier(node.expression) && node.expression.text === "createEffect") {
       const line = sf.getLineAndCharacterOfPosition(node.getStart(sf)).line + 1;
       if (!instrumentedLines.has(line))
         out.push({ file: filePath, line });
     }
-    ts22.forEachChild(node, visit3);
+    ts23.forEachChild(node, visit3);
   };
   visit3(sf);
   out.sort((a, b) => a.line - b.line);
@@ -26707,13 +26802,13 @@ function assessBatchSafety(args) {
   const signalGetters = new Set(args.graph.signals.map((s) => s.name));
   let sf;
   try {
-    sf = ts22.createSourceFile("__h.ts", `const __h = ${args.handler}`, ts22.ScriptTarget.Latest, true);
+    sf = ts23.createSourceFile("__h.ts", `const __h = ${args.handler}`, ts23.ScriptTarget.Latest, true);
   } catch {
     return "unverified";
   }
   const calls = [];
   const visit3 = (node) => {
-    if (ts22.isCallExpression(node) && ts22.isIdentifier(node.expression)) {
+    if (ts23.isCallExpression(node) && ts23.isIdentifier(node.expression)) {
       const name = node.expression.text;
       if (setters.has(name))
         calls.push({ pos: node.getStart(sf), kind: "write" });
@@ -26722,7 +26817,7 @@ function assessBatchSafety(args) {
       else if (!signalGetters.has(name) && !memoNames.has(name))
         calls.push({ pos: node.getStart(sf), kind: "risky" });
     }
-    ts22.forEachChild(node, visit3);
+    ts23.forEachChild(node, visit3);
   };
   visit3(sf);
   calls.sort((a, b) => a.pos - b.pos);
@@ -27399,6 +27494,7 @@ export {
   listComponentFunctions,
   jsxToIR,
   joinProfilerEvents,
+  isValueReferenceIdentifier,
   isValidHelperId,
   isSupported,
   isStringTypedOperand,
@@ -27473,6 +27569,7 @@ export {
   computeSsrSeedPlan,
   compileJSX,
   combineParentChildClientJs,
+  collectValueReferencedNames,
   collectModuleStringConsts,
   collectLoopBoundNames,
   collectContextConsumers,