@barefootjs/test 0.31.1 → 0.31.3

package/dist/index.js

@@ -187287,8 +187287,11 @@ Additional information: BADCLIENT: Bad error code, ${badCode} not found in range
   } });
 });
 
+// ../jsx/src/compiler.ts
+var import_typescript23 = __toESM(require_typescript(), 1);
+
 // ../jsx/src/analyzer.ts
-var import_typescript8 = __toESM(require_typescript(), 1);
+var import_typescript9 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/expression-parser.ts
 var import_typescript = __toESM(require_typescript(), 1);
@@ -188820,6 +188823,29 @@ var import_typescript5 = __toESM(require_typescript(), 1);
 // ../jsx/src/ir-to-client-js/utils.ts
 var import_typescript3 = __toESM(require_typescript(), 1);
 
+// ../jsx/src/template-parts.ts
+function lookupPartToJsExpr(part, opts) {
+  const key = opts?.useTemplate && part.templateKey ? part.templateKey : part.key;
+  const obj = "{" + Object.entries(part.cases).map(([k, v]) => `${JSON.stringify(k)}: ${JSON.stringify(v)}`).join(", ") + "}";
+  const typed = opts?.typed ? " as Record<string, string>" : "";
+  return `(${obj}${typed})[${key}]`;
+}
+function templatePartsToJsExpr(parts, opts) {
+  let result = "`";
+  for (const part of parts) {
+    if (part.type === "string") {
+      result += opts?.useTemplate && part.templateValue ? part.templateValue : part.value;
+    } else if (part.type === "ternary") {
+      const cond = opts?.useTemplate && part.templateCondition ? part.templateCondition : part.condition;
+      result += `\${${cond} ? '${part.whenTrue}' : '${part.whenFalse}'}`;
+    } else if (part.type === "lookup") {
+      result += `\${${lookupPartToJsExpr(part, opts)}}`;
+    }
+  }
+  result += "`";
+  return result;
+}
+
 // ../jsx/src/scanner/js-scanner.ts
 var import_typescript2 = __toESM(require_typescript(), 1);
 function* iterateJsTokens(text, start = 0, end = text.length) {
@@ -189398,7 +189424,7 @@ function collectAstPropRefs(node, propNames, out) {
     out.add(n.text);
   });
 }
-function applyScopedPropRefRewrite(text, propRefs) {
+function applyScopedPropRefRewrite(text, propRefs, propAliases) {
   const prefix = "(";
   const sf = import_typescript5.default.createSourceFile("__bf_prop_rewrite.ts", `${prefix}${text}
 )`, import_typescript5.default.ScriptTarget.Latest, true);
@@ -189415,11 +189441,12 @@ function applyScopedPropRefRewrite(text, propRefs) {
     const end = n.getEnd() - prefix.length;
     if (start < 0 || end > text.length)
       return;
+    const callerKey = propAliases?.get(n.text) ?? n.text;
     if (parent && import_typescript5.default.isShorthandPropertyAssignment(parent) && parent.name === n) {
-      edits.push({ start, end, replacement: `${n.text}: ${PROPS_PARAM}.${n.text}` });
+      edits.push({ start, end, replacement: `${n.text}: ${PROPS_PARAM}.${callerKey}` });
       return;
     }
-    edits.push({ start, end, replacement: `${PROPS_PARAM}.${n.text}` });
+    edits.push({ start, end, replacement: `${PROPS_PARAM}.${callerKey}` });
   });
   if (edits.length === 0)
     return text;
@@ -189429,10 +189456,11 @@ function applyScopedPropRefRewrite(text, propRefs) {
   }
   return result;
 }
-function applyRegexPropRefRewrite(text, propRefs) {
+function applyRegexPropRefRewrite(text, propRefs, propAliases) {
   const { protect, restore } = createTemplateAwareStringProtector();
   let result = protect(text);
   for (const propName of propRefs) {
+    const callerKey = propAliases?.get(propName) ?? propName;
     const pattern = new RegExp(`(?<!${PROPS_PARAM}\\.)(?<!['"\\w.-])\\b${propName}\\b(?![a-zA-Z0-9_$])`, "g");
     result = result.replace(pattern, (match, offset, str) => {
       const after = str.slice(offset + match.length);
@@ -189441,12 +189469,12 @@ function applyRegexPropRefRewrite(text, propRefs) {
         if (/[{,]\s*$/.test(before))
           return match;
       }
-      return `${PROPS_PARAM}.${propName}`;
+      return `${PROPS_PARAM}.${callerKey}`;
     });
   }
   return restore(result);
 }
-function rewriteBarePropRefs(text, node, propNames, extraPropRefs) {
+function rewriteBarePropRefs(text, node, propNames, extraPropRefs, propAliases) {
   const foundPropRefs = new Set;
   collectAstPropRefs(node, propNames, foundPropRefs);
   if (extraPropRefs) {
@@ -189457,7 +189485,39 @@ function rewriteBarePropRefs(text, node, propNames, extraPropRefs) {
   }
   if (foundPropRefs.size === 0)
     return;
-  return applyScopedPropRefRewrite(text, foundPropRefs) ?? applyRegexPropRefRewrite(text, foundPropRefs);
+  return applyScopedPropRefRewrite(text, foundPropRefs, propAliases) ?? applyRegexPropRefRewrite(text, foundPropRefs, propAliases);
+}
+
+// ../jsx/src/props-binding.ts
+var import_typescript6 = __toESM(require_typescript(), 1);
+function isIdentifierName(key) {
+  if (key.length === 0)
+    return false;
+  for (let i2 = 0;i2 < key.length; ) {
+    const cp = key.codePointAt(i2);
+    const ok = i2 === 0 ? import_typescript6.default.isIdentifierStart(cp, import_typescript6.default.ScriptTarget.Latest) : import_typescript6.default.isIdentifierPart(cp, import_typescript6.default.ScriptTarget.Latest);
+    if (!ok)
+      return false;
+    i2 += cp > 65535 ? 2 : 1;
+  }
+  return true;
+}
+function propsDestructureBinding(p) {
+  const callerKey = p.sourceName ?? p.name;
+  const localName = p.name;
+  const binding = callerKey === localName ? localName : `${isIdentifierName(callerKey) ? callerKey : JSON.stringify(callerKey)}: ${localName}`;
+  return p.defaultValue ? `${binding} = ${p.defaultValue}` : binding;
+}
+function buildPropAliasMap(params) {
+  let map;
+  for (const p of params) {
+    if (p.sourceName) {
+      if (!map)
+        map = new Map;
+      map.set(p.name, p.sourceName);
+    }
+  }
+  return map;
 }
 
 // ../jsx/src/instrumentation.ts
@@ -189478,10 +189538,10 @@ function incrementCounter(key) {
 }
 
 // ../jsx/src/analyzer-context.ts
-var import_typescript7 = __toESM(require_typescript(), 1);
+var import_typescript8 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/strip-types.ts
-var import_typescript6 = __toESM(require_typescript(), 1);
+var import_typescript7 = __toESM(require_typescript(), 1);
 function collectAllTypeRanges(sourceFile) {
   const ranges = [];
   collectTypeRanges(sourceFile, sourceFile, sourceFile.text, ranges);
@@ -189566,7 +189626,7 @@ function mergeRanges(ranges) {
   return merged;
 }
 function collectTypeRanges(node, sourceFile, fullText, ranges) {
-  if (import_typescript6.default.isParameter(node)) {
+  if (import_typescript7.default.isParameter(node)) {
     const hasQuestion = !!node.questionToken;
     const hasType = !!node.type;
     if (hasQuestion && hasType) {
@@ -189580,72 +189640,72 @@ function collectTypeRanges(node, sourceFile, fullText, ranges) {
       }
     }
   }
-  if (import_typescript6.default.isVariableDeclaration(node) && node.type) {
+  if (import_typescript7.default.isVariableDeclaration(node) && node.type) {
     const colonPos = findColonBefore(node.type, fullText, node.name.getEnd());
     if (colonPos >= 0) {
       ranges.push({ start: colonPos, end: node.type.getEnd() });
     }
   }
-  if (import_typescript6.default.isArrowFunction(node) && node.type) {
+  if (import_typescript7.default.isArrowFunction(node) && node.type) {
     const colonPos = findColonBefore(node.type, fullText, node.parameters.end);
     if (colonPos >= 0) {
       ranges.push({ start: colonPos, end: node.type.getEnd() });
     }
   }
-  if ((import_typescript6.default.isFunctionDeclaration(node) || import_typescript6.default.isFunctionExpression(node)) && node.type) {
+  if ((import_typescript7.default.isFunctionDeclaration(node) || import_typescript7.default.isFunctionExpression(node)) && node.type) {
     const colonPos = findColonBefore(node.type, fullText, node.parameters.end);
     if (colonPos >= 0) {
       ranges.push({ start: colonPos, end: node.type.getEnd() });
     }
   }
-  if (import_typescript6.default.isAsExpression(node)) {
+  if (import_typescript7.default.isAsExpression(node)) {
     const exprEnd = node.expression.getEnd();
     ranges.push({ start: exprEnd, end: node.getEnd() });
     collectTypeRanges(node.expression, sourceFile, fullText, ranges);
     return;
   }
-  if (import_typescript6.default.isSatisfiesExpression(node)) {
+  if (import_typescript7.default.isSatisfiesExpression(node)) {
     const exprEnd = node.expression.getEnd();
     ranges.push({ start: exprEnd, end: node.getEnd() });
     collectTypeRanges(node.expression, sourceFile, fullText, ranges);
     return;
   }
-  if (import_typescript6.default.isNonNullExpression(node)) {
+  if (import_typescript7.default.isNonNullExpression(node)) {
     const exprEnd = node.expression.getEnd();
     ranges.push({ start: exprEnd, end: node.getEnd() });
     collectTypeRanges(node.expression, sourceFile, fullText, ranges);
     return;
   }
-  if (import_typescript6.default.isTypeAssertionExpression(node)) {
+  if (import_typescript7.default.isTypeAssertionExpression(node)) {
     const exprStart = node.expression.getStart(sourceFile);
     ranges.push({ start: node.getStart(sourceFile), end: exprStart });
     collectTypeRanges(node.expression, sourceFile, fullText, ranges);
     return;
   }
-  if (import_typescript6.default.isCallExpression(node) && node.typeArguments) {
+  if (import_typescript7.default.isCallExpression(node) && node.typeArguments) {
     const typeArgsStart = findAngleBracketBefore(node.typeArguments[0], fullText, node.expression.getEnd());
     const typeArgsEnd = findAngleBracketAfter(node.typeArguments[node.typeArguments.length - 1], fullText);
     if (typeArgsStart >= 0 && typeArgsEnd >= 0) {
       ranges.push({ start: typeArgsStart, end: typeArgsEnd });
     }
   }
-  if (import_typescript6.default.isNewExpression(node) && node.typeArguments) {
+  if (import_typescript7.default.isNewExpression(node) && node.typeArguments) {
     const typeArgsStart = findAngleBracketBefore(node.typeArguments[0], fullText, node.expression.getEnd());
     const typeArgsEnd = findAngleBracketAfter(node.typeArguments[node.typeArguments.length - 1], fullText);
     if (typeArgsStart >= 0 && typeArgsEnd >= 0) {
       ranges.push({ start: typeArgsStart, end: typeArgsEnd });
     }
   }
-  if (import_typescript6.default.isTypeAliasDeclaration(node) || import_typescript6.default.isInterfaceDeclaration(node)) {
+  if (import_typescript7.default.isTypeAliasDeclaration(node) || import_typescript7.default.isInterfaceDeclaration(node)) {
     ranges.push({
       start: expandToLineStart(node.getStart(sourceFile), fullText),
       end: expandThroughLineEnd(node.getEnd(), fullText)
     });
     return;
   }
-  if (import_typescript6.default.isTypeNode(node))
+  if (import_typescript7.default.isTypeNode(node))
     return;
-  import_typescript6.default.forEachChild(node, (child) => {
+  import_typescript7.default.forEachChild(node, (child) => {
     collectTypeRanges(child, sourceFile, fullText, ranges);
   });
 }
@@ -189757,9 +189817,9 @@ function createAnalyzerContext(sourceFile, filePath, acceptsCallbackBody) {
   };
 }
 function nodeContainsJsx(node) {
-  if (import_typescript7.default.isJsxElement(node) || import_typescript7.default.isJsxSelfClosingElement(node) || import_typescript7.default.isJsxFragment(node))
+  if (import_typescript8.default.isJsxElement(node) || import_typescript8.default.isJsxSelfClosingElement(node) || import_typescript8.default.isJsxFragment(node))
     return true;
-  return import_typescript7.default.forEachChild(node, nodeContainsJsx) ?? false;
+  return import_typescript8.default.forEachChild(node, nodeContainsJsx) ?? false;
 }
 function getSourceLocation(node, sourceFile, filePath) {
   const start = sourceFile.getLineAndCharacterOfPosition(node.getStart());
@@ -189777,20 +189837,20 @@ function getSourceLocation(node, sourceFile, filePath) {
   };
 }
 function membersToProperties(members, sourceFile) {
-  return members.filter(import_typescript7.default.isPropertySignature).map((member) => ({
+  return members.filter(import_typescript8.default.isPropertySignature).map((member) => ({
     name: propertyNameText(member.name, sourceFile),
     type: typeNodeToTypeInfo(member.type, sourceFile) ?? {
       kind: "unknown",
       raw: "unknown"
     },
     optional: !!member.questionToken,
-    readonly: !!member.modifiers?.some((m) => m.kind === import_typescript7.default.SyntaxKind.ReadonlyKeyword)
+    readonly: !!member.modifiers?.some((m) => m.kind === import_typescript8.default.SyntaxKind.ReadonlyKeyword)
   }));
 }
 function propertyNameText(name, sourceFile) {
   if (!name)
     return "";
-  if (import_typescript7.default.isStringLiteral(name) || import_typescript7.default.isNumericLiteral(name))
+  if (import_typescript8.default.isStringLiteral(name) || import_typescript8.default.isNumericLiteral(name))
     return name.text;
   return name.getText(sourceFile);
 }
@@ -189801,56 +189861,56 @@ function typeNodeToTypeInfo(typeNode, sourceFile, rawOf) {
   const raw = rawOf ? rawOf(typeNode) : typeNode.getText(sourceFile);
   const recurse = (n) => typeNodeToTypeInfo(n, sourceFile, rawOf) ?? { kind: "unknown", raw: "unknown" };
   switch (typeNode.kind) {
-    case import_typescript7.default.SyntaxKind.StringKeyword:
+    case import_typescript8.default.SyntaxKind.StringKeyword:
       return { kind: "primitive", raw, primitive: "string" };
-    case import_typescript7.default.SyntaxKind.NumberKeyword:
+    case import_typescript8.default.SyntaxKind.NumberKeyword:
       return { kind: "primitive", raw, primitive: "number" };
-    case import_typescript7.default.SyntaxKind.BooleanKeyword:
+    case import_typescript8.default.SyntaxKind.BooleanKeyword:
       return { kind: "primitive", raw, primitive: "boolean" };
-    case import_typescript7.default.SyntaxKind.NullKeyword:
+    case import_typescript8.default.SyntaxKind.NullKeyword:
       return { kind: "primitive", raw, primitive: "null" };
-    case import_typescript7.default.SyntaxKind.UndefinedKeyword:
+    case import_typescript8.default.SyntaxKind.UndefinedKeyword:
       return { kind: "primitive", raw, primitive: "undefined" };
   }
-  if (import_typescript7.default.isArrayTypeNode(typeNode)) {
+  if (import_typescript8.default.isArrayTypeNode(typeNode)) {
     return { kind: "array", raw, elementType: recurse(typeNode.elementType) };
   }
-  if (import_typescript7.default.isLiteralTypeNode(typeNode)) {
+  if (import_typescript8.default.isLiteralTypeNode(typeNode)) {
     const lit = typeNode.literal;
-    if (import_typescript7.default.isStringLiteral(lit) || import_typescript7.default.isNoSubstitutionTemplateLiteral(lit)) {
+    if (import_typescript8.default.isStringLiteral(lit) || import_typescript8.default.isNoSubstitutionTemplateLiteral(lit)) {
       return { kind: "primitive", raw, primitive: "string", literalValue: lit.text };
     }
-    if (import_typescript7.default.isNumericLiteral(lit)) {
+    if (import_typescript8.default.isNumericLiteral(lit)) {
       return { kind: "primitive", raw, primitive: "number", literalValue: lit.text };
     }
-    if (import_typescript7.default.isPrefixUnaryExpression(lit) && lit.operator === import_typescript7.default.SyntaxKind.MinusToken && import_typescript7.default.isNumericLiteral(lit.operand)) {
+    if (import_typescript8.default.isPrefixUnaryExpression(lit) && lit.operator === import_typescript8.default.SyntaxKind.MinusToken && import_typescript8.default.isNumericLiteral(lit.operand)) {
       return { kind: "primitive", raw, primitive: "number", literalValue: `-${lit.operand.text}` };
     }
-    if (lit.kind === import_typescript7.default.SyntaxKind.TrueKeyword || lit.kind === import_typescript7.default.SyntaxKind.FalseKeyword) {
+    if (lit.kind === import_typescript8.default.SyntaxKind.TrueKeyword || lit.kind === import_typescript8.default.SyntaxKind.FalseKeyword) {
       return {
         kind: "primitive",
         raw,
         primitive: "boolean",
-        literalValue: lit.kind === import_typescript7.default.SyntaxKind.TrueKeyword ? "true" : "false"
+        literalValue: lit.kind === import_typescript8.default.SyntaxKind.TrueKeyword ? "true" : "false"
       };
     }
-    if (lit.kind === import_typescript7.default.SyntaxKind.NullKeyword) {
+    if (lit.kind === import_typescript8.default.SyntaxKind.NullKeyword) {
       return { kind: "primitive", raw, primitive: "null" };
     }
     return { kind: "unknown", raw };
   }
-  if (import_typescript7.default.isUnionTypeNode(typeNode)) {
+  if (import_typescript8.default.isUnionTypeNode(typeNode)) {
     return { kind: "union", raw, unionTypes: typeNode.types.map(recurse) };
   }
-  if (import_typescript7.default.isTypeLiteralNode(typeNode)) {
+  if (import_typescript8.default.isTypeLiteralNode(typeNode)) {
     return {
       kind: "object",
       raw,
       ...synthetic ? {} : { properties: membersToProperties(typeNode.members, sourceFile) }
     };
   }
-  if (import_typescript7.default.isTypeReferenceNode(typeNode)) {
-    const refName = import_typescript7.default.isIdentifier(typeNode.typeName) ? typeNode.typeName.text : "";
+  if (import_typescript8.default.isTypeReferenceNode(typeNode)) {
+    const refName = import_typescript8.default.isIdentifier(typeNode.typeName) ? typeNode.typeName.text : "";
     if ((refName === "Array" || refName === "ReadonlyArray") && typeNode.typeArguments?.length === 1) {
       return { kind: "array", raw, elementType: recurse(typeNode.typeArguments[0]) };
     }
@@ -189859,7 +189919,7 @@ function typeNodeToTypeInfo(typeNode, sourceFile, rawOf) {
       raw
     };
   }
-  if (import_typescript7.default.isFunctionTypeNode(typeNode)) {
+  if (import_typescript8.default.isFunctionTypeNode(typeNode)) {
     if (synthetic)
       return { kind: "function", raw };
     return {
@@ -189879,15 +189939,15 @@ function typeNodeToTypeInfo(typeNode, sourceFile, rawOf) {
   }
   return { kind: "unknown", raw };
 }
-var _typePrinter = import_typescript7.default.createPrinter({ removeComments: true, omitTrailingSemicolon: true });
-var _blankTypeSourceFile = import_typescript7.default.createSourceFile("__bf_types__.ts", "", import_typescript7.default.ScriptTarget.Latest);
+var _typePrinter = import_typescript8.default.createPrinter({ removeComments: true, omitTrailingSemicolon: true });
+var _blankTypeSourceFile = import_typescript8.default.createSourceFile("__bf_types__.ts", "", import_typescript8.default.ScriptTarget.Latest);
 function tsTypeToTypeInfo(type2, checker) {
-  const node = checker.typeToTypeNode(type2, undefined, import_typescript7.default.NodeBuilderFlags.NoTruncation);
+  const node = checker.typeToTypeNode(type2, undefined, import_typescript8.default.NodeBuilderFlags.NoTruncation);
   if (!node)
     return null;
   const rawOf = (n) => {
     try {
-      return _typePrinter.printNode(import_typescript7.default.EmitHint.Unspecified, n, _blankTypeSourceFile);
+      return _typePrinter.printNode(import_typescript8.default.EmitHint.Unspecified, n, _blankTypeSourceFile);
     } catch {
       return "unknown";
     }
@@ -189898,16 +189958,16 @@ function isPascalCase(name) {
   return /^[A-Z][a-zA-Z0-9]*$/.test(name);
 }
 function isComponentFunction(node) {
-  return import_typescript7.default.isFunctionDeclaration(node) && !!node.name && isPascalCase(node.name.text) && !!node.body;
+  return import_typescript8.default.isFunctionDeclaration(node) && !!node.name && isPascalCase(node.name.text) && !!node.body;
 }
 function isArrowComponentFunction(node) {
-  if (!import_typescript7.default.isVariableDeclaration(node))
+  if (!import_typescript8.default.isVariableDeclaration(node))
     return false;
-  if (!import_typescript7.default.isIdentifier(node.name))
+  if (!import_typescript8.default.isIdentifier(node.name))
     return false;
   if (!isPascalCase(node.name.text))
     return false;
-  if (!node.initializer || !import_typescript7.default.isArrowFunction(node.initializer))
+  if (!node.initializer || !import_typescript8.default.isArrowFunction(node.initializer))
     return false;
   return true;
 }
@@ -189935,6 +189995,7 @@ var ErrorCodes = {
   JSX_IN_LOCAL_FUNCTION: "BF045",
   COMPONENT_REQUIRED_PROP_MISSING: "BF046",
   JSX_BRANCH_LOCAL_IN_CALLBACK: "BF047",
+  SIBLING_COMPONENT_NOT_COMPILED: "BF048",
   SHARED_PROGRAM_REQUIRED: "BF050",
   WRONG_PACKAGE_IMPORT: "BF051",
   BUILTIN_REQUIRES_IMPORT: "BF054",
@@ -189964,6 +190025,7 @@ var errorMessages = {
   [ErrorCodes.JSX_IN_LOCAL_FUNCTION]: "Local function returns JSX but cannot be inlined. Extract it as a top-level PascalCase component or use a single return statement.",
   [ErrorCodes.COMPONENT_REQUIRED_PROP_MISSING]: "Built-in component is missing a required prop.",
   [ErrorCodes.JSX_BRANCH_LOCAL_IN_CALLBACK]: "JSX-typed local declared inside an `if`-block cannot be referenced from a callback body (ref / event handler). " + "Render it as a child instead: `<div ref={...}>{local}</div>`.",
+  [ErrorCodes.SIBLING_COMPONENT_NOT_COMPILED]: "Referenced component did not compile to a template, so this reference would throw " + "`ReferenceError` at render time. Multi-return JSX dispatch (a `switch` or `if`/`else` " + "chain across multiple JSX-returning branches) cannot compile as a component in a " + `'use client' file. Extract it to a separate non-"use client" file (where it is preserved ` + "verbatim, see #932), or rewrite it as a single-return ternary/conditional chain so the " + "component pipeline can compile it.",
   [ErrorCodes.SHARED_PROGRAM_REQUIRED]: "Shared ts.Program required for type-based reactivity classification. This source imports a Reactive<T>-branded library (e.g. @barefootjs/form) whose getters cannot be classified by regex alone. Pass `options.program` (built via `createProgramForCorpus`) so the analyzer can resolve the brand through the TypeChecker.",
   [ErrorCodes.WRONG_PACKAGE_IMPORT]: "Import from wrong package.",
   [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.",
@@ -190151,9 +190213,9 @@ function needsTypeBasedDetection(source) {
 }
 function findBrandPackageImportLoc(sourceFile, filePath) {
   for (const stmt of sourceFile.statements) {
-    if (!import_typescript8.default.isImportDeclaration(stmt))
+    if (!import_typescript9.default.isImportDeclaration(stmt))
       continue;
-    if (!import_typescript8.default.isStringLiteral(stmt.moduleSpecifier))
+    if (!import_typescript9.default.isStringLiteral(stmt.moduleSpecifier))
       continue;
     if (!REACTIVE_BRAND_PACKAGES.includes(stmt.moduleSpecifier.text))
       continue;
@@ -190172,21 +190234,21 @@ function createProgramForFile(source, filePath) {
   try {
     const normalizedPath = path_default.resolve(filePath);
     const compilerOptions = {
-      target: import_typescript8.default.ScriptTarget.Latest,
-      module: import_typescript8.default.ModuleKind.ESNext,
-      moduleResolution: import_typescript8.default.ModuleResolutionKind.Bundler,
-      jsx: import_typescript8.default.JsxEmit.ReactJSX,
+      target: import_typescript9.default.ScriptTarget.Latest,
+      module: import_typescript9.default.ModuleKind.ESNext,
+      moduleResolution: import_typescript9.default.ModuleResolutionKind.Bundler,
+      jsx: import_typescript9.default.JsxEmit.ReactJSX,
       strict: true,
       skipLibCheck: true,
       noEmit: true,
       baseUrl: path_default.dirname(normalizedPath)
     };
-    const defaultHost = import_typescript8.default.createCompilerHost(compilerOptions);
+    const defaultHost = import_typescript9.default.createCompilerHost(compilerOptions);
     const virtualHost = {
       ...defaultHost,
       getSourceFile(fileName, languageVersion) {
         if (path_default.resolve(fileName) === normalizedPath) {
-          return import_typescript8.default.createSourceFile(fileName, source, languageVersion, true, import_typescript8.default.ScriptKind.TSX);
+          return import_typescript9.default.createSourceFile(fileName, source, languageVersion, true, import_typescript9.default.ScriptKind.TSX);
         }
         return defaultHost.getSourceFile(fileName, languageVersion);
       },
@@ -190201,7 +190263,7 @@ function createProgramForFile(source, filePath) {
         return defaultHost.readFile(fileName);
       }
     };
-    const program = import_typescript8.default.createProgram([normalizedPath], compilerOptions, virtualHost);
+    const program = import_typescript9.default.createProgram([normalizedPath], compilerOptions, virtualHost);
     const sourceFile = program.getSourceFile(normalizedPath);
     if (!sourceFile)
       return null;
@@ -190234,7 +190296,7 @@ function analyzeComponent(source, filePath, targetComponentName, program, accept
     }
   }
   if (!sourceFile) {
-    sourceFile = import_typescript8.default.createSourceFile(filePath, source, import_typescript8.default.ScriptTarget.Latest, true, import_typescript8.default.ScriptKind.TSX);
+    sourceFile = import_typescript9.default.createSourceFile(filePath, source, import_typescript9.default.ScriptTarget.Latest, true, import_typescript9.default.ScriptKind.TSX);
   }
   if (!checker && needsTypeBasedDetection(source)) {
     const result = createProgramForFile(source, filePath);
@@ -190280,23 +190342,23 @@ function analyzeComponent(source, filePath, targetComponentName, program, accept
 function findDefaultExportedComponent(sourceFile) {
   let defaultExportName;
   function findDefaultExport(node) {
-    if (import_typescript8.default.isExportAssignment(node) && !node.isExportEquals) {
-      if (import_typescript8.default.isIdentifier(node.expression)) {
+    if (import_typescript9.default.isExportAssignment(node) && !node.isExportEquals) {
+      if (import_typescript9.default.isIdentifier(node.expression)) {
         defaultExportName = node.expression.text;
       }
     }
-    if (import_typescript8.default.isFunctionDeclaration(node) && node.name && node.modifiers?.some((m) => m.kind === import_typescript8.default.SyntaxKind.DefaultKeyword)) {
+    if (import_typescript9.default.isFunctionDeclaration(node) && node.name && node.modifiers?.some((m) => m.kind === import_typescript9.default.SyntaxKind.DefaultKeyword)) {
       defaultExportName = node.name.text;
     }
-    import_typescript8.default.forEachChild(node, findDefaultExport);
+    import_typescript9.default.forEachChild(node, findDefaultExport);
   }
-  import_typescript8.default.forEachChild(sourceFile, findDefaultExport);
+  import_typescript9.default.forEachChild(sourceFile, findDefaultExport);
   return defaultExportName;
 }
 function collectNamedExports(sourceFile) {
   const exported = new Set;
   for (const stmt of sourceFile.statements) {
-    if (import_typescript8.default.isExportDeclaration(stmt) && stmt.exportClause && import_typescript8.default.isNamedExports(stmt.exportClause)) {
+    if (import_typescript9.default.isExportDeclaration(stmt) && stmt.exportClause && import_typescript9.default.isNamedExports(stmt.exportClause)) {
       for (const spec of stmt.exportClause.elements) {
         const local = (spec.propertyName ?? spec.name).text;
         exported.add(local);
@@ -190306,22 +190368,22 @@ function collectNamedExports(sourceFile) {
   return exported;
 }
 function visit(node, ctx, targetComponentName, namedExports) {
-  if (import_typescript8.default.isExpressionStatement(node) && import_typescript8.default.isStringLiteral(node.expression)) {
+  if (import_typescript9.default.isExpressionStatement(node) && import_typescript9.default.isStringLiteral(node.expression)) {
     if (node.expression.text === "use client" || node.expression.text === "'use client'") {
       ctx.hasUseClientDirective = true;
     }
   }
-  if (import_typescript8.default.isImportDeclaration(node)) {
+  if (import_typescript9.default.isImportDeclaration(node)) {
     collectImport(node, ctx);
   }
-  if (import_typescript8.default.isInterfaceDeclaration(node)) {
+  if (import_typescript9.default.isInterfaceDeclaration(node)) {
     collectInterfaceDefinition(node, ctx);
   }
-  if (import_typescript8.default.isTypeAliasDeclaration(node)) {
+  if (import_typescript9.default.isTypeAliasDeclaration(node)) {
     collectTypeAliasDefinition(node, ctx);
   }
-  if (!ctx.hasUseClientDirective && import_typescript8.default.isFunctionDeclaration(node) && node.name && node.body && isMultiReturnJsxFunctionBody(node.body)) {
-    const hasInlineExport = node.modifiers?.some((m) => m.kind === import_typescript8.default.SyntaxKind.ExportKeyword) ?? false;
+  if (!ctx.hasUseClientDirective && import_typescript9.default.isFunctionDeclaration(node) && node.name && node.body && isMultiReturnJsxFunctionBody(node.body)) {
+    const hasInlineExport = node.modifiers?.some((m) => m.kind === import_typescript9.default.SyntaxKind.ExportKeyword) ?? false;
     const hasNamedExport = namedExports?.has(node.name.text) ?? false;
     if (!hasInlineExport && !hasNamedExport) {
       collectFunction(node, ctx, true, false);
@@ -190336,9 +190398,9 @@ function visit(node, ctx, targetComponentName, namedExports) {
       if (!ctx.componentName) {
         ctx.componentName = node.name.text;
         ctx.componentNode = node;
-        ctx.isExported = node.modifiers?.some((m) => m.kind === import_typescript8.default.SyntaxKind.ExportKeyword) ?? false;
+        ctx.isExported = node.modifiers?.some((m) => m.kind === import_typescript9.default.SyntaxKind.ExportKeyword) ?? false;
         analyzeComponentBody(node, ctx);
-        if (node.modifiers?.some((m) => m.kind === import_typescript8.default.SyntaxKind.DefaultKeyword)) {
+        if (node.modifiers?.some((m) => m.kind === import_typescript9.default.SyntaxKind.DefaultKeyword)) {
           ctx.hasDefaultExport = true;
         }
       }
@@ -190352,10 +190414,10 @@ function visit(node, ctx, targetComponentName, namedExports) {
         ctx.componentName = node.name.text;
         ctx.componentNode = node.initializer;
         const parentStatement = node.parent;
-        if (import_typescript8.default.isVariableDeclarationList(parentStatement)) {
+        if (import_typescript9.default.isVariableDeclarationList(parentStatement)) {
           const varStatement = parentStatement.parent;
-          if (import_typescript8.default.isVariableStatement(varStatement)) {
-            ctx.isExported = varStatement.modifiers?.some((m) => m.kind === import_typescript8.default.SyntaxKind.ExportKeyword) ?? false;
+          if (import_typescript9.default.isVariableStatement(varStatement)) {
+            ctx.isExported = varStatement.modifiers?.some((m) => m.kind === import_typescript9.default.SyntaxKind.ExportKeyword) ?? false;
           }
         }
         analyzeComponentBody(node.initializer, ctx);
@@ -190367,9 +190429,10 @@ function visit(node, ctx, targetComponentName, namedExports) {
   if (!ctx.componentNode) {
     collectAmbientGlobals(node, ctx);
   }
-  if (import_typescript8.default.isVariableStatement(node) && !ctx.componentNode) {
-    const isExported = node.modifiers?.some((m) => m.kind === import_typescript8.default.SyntaxKind.ExportKeyword) ?? false;
-    const isLet = (node.declarationList.flags & import_typescript8.default.NodeFlags.Let) !== 0;
+  const isDeclareStatement = import_typescript9.default.isVariableStatement(node) && (node.modifiers?.some((m) => m.kind === import_typescript9.default.SyntaxKind.DeclareKeyword) ?? false);
+  if (import_typescript9.default.isVariableStatement(node) && !ctx.componentNode && !isDeclareStatement) {
+    const isExported = node.modifiers?.some((m) => m.kind === import_typescript9.default.SyntaxKind.ExportKeyword) ?? false;
+    const isLet = (node.declarationList.flags & import_typescript9.default.NodeFlags.Let) !== 0;
     const isModuleClientDirective = hasLeadingClientDirectiveOnStatement(node, ctx.sourceFile);
     for (const decl of node.declarationList.declarations) {
       if (declarationIsReactiveFactoryCall(decl, ctx)) {
@@ -190380,19 +190443,19 @@ function visit(node, ctx, targetComponentName, namedExports) {
         }
         continue;
       }
-      if (import_typescript8.default.isIdentifier(decl.name) && decl.initializer && !isArrowComponentFunction(decl)) {
+      if (import_typescript9.default.isIdentifier(decl.name) && (decl.initializer || isLet) && !isArrowComponentFunction(decl)) {
         collectConstant(decl, ctx, true, isLet ? "let" : "const", isExported);
       }
     }
   }
-  if (import_typescript8.default.isFunctionDeclaration(node) && node.name && !isComponentFunction(node)) {
-    const isExported = node.modifiers?.some((m) => m.kind === import_typescript8.default.SyntaxKind.ExportKeyword) ?? false;
+  if (import_typescript9.default.isFunctionDeclaration(node) && node.name && !isComponentFunction(node)) {
+    const isExported = node.modifiers?.some((m) => m.kind === import_typescript9.default.SyntaxKind.ExportKeyword) ?? false;
     collectFunction(node, ctx, true, isExported);
     return;
   }
-  if (import_typescript8.default.isExportDeclaration(node) && node.exportClause && import_typescript8.default.isNamedExports(node.exportClause)) {
+  if (import_typescript9.default.isExportDeclaration(node) && node.exportClause && import_typescript9.default.isNamedExports(node.exportClause)) {
     const isFromReexport = !!node.moduleSpecifier;
-    const sourceSpec = node.moduleSpecifier && import_typescript8.default.isStringLiteral(node.moduleSpecifier) ? node.moduleSpecifier.text : null;
+    const sourceSpec = node.moduleSpecifier && import_typescript9.default.isStringLiteral(node.moduleSpecifier) ? node.moduleSpecifier.text : null;
     const exportSpecifiers = node.exportClause.elements.map((spec) => ({
       name: (spec.propertyName ?? spec.name).text,
       alias: spec.propertyName ? spec.name.text : null,
@@ -190420,24 +190483,24 @@ function visit(node, ctx, targetComponentName, namedExports) {
       }
     }
   }
-  if (import_typescript8.default.isExportAssignment(node) && !node.isExportEquals) {
+  if (import_typescript9.default.isExportAssignment(node) && !node.isExportEquals) {
     const expr = node.expression;
-    if (import_typescript8.default.isIdentifier(expr)) {
+    if (import_typescript9.default.isIdentifier(expr)) {
       if (ctx.componentName && expr.text === ctx.componentName) {
         ctx.hasDefaultExport = true;
         ctx.isExported = true;
       }
     }
   }
-  import_typescript8.default.forEachChild(node, (child) => visit(child, ctx, targetComponentName, namedExports));
+  import_typescript9.default.forEachChild(node, (child) => visit(child, ctx, targetComponentName, namedExports));
 }
 function analyzeComponentBody(node, ctx) {
   if (node.parameters.length > 0) {
     extractProps(node.parameters[0], ctx);
   }
-  const body = import_typescript8.default.isFunctionDeclaration(node) ? node.body : getArrowFunctionBody(node);
+  const body = import_typescript9.default.isFunctionDeclaration(node) ? node.body : getArrowFunctionBody(node);
   if (body) {
-    ctx.componentBodyBlock = import_typescript8.default.isBlock(body) ? body : null;
+    ctx.componentBodyBlock = import_typescript9.default.isBlock(body) ? body : null;
     if (!ctx.componentBodyBlock) {
       ctx.jsxReturn = unwrapJsxTransparent(body);
     }
@@ -190447,14 +190510,14 @@ function analyzeComponentBody(node, ctx) {
   }
 }
 function getArrowFunctionBody(node) {
-  if (import_typescript8.default.isBlock(node.body)) {
+  if (import_typescript9.default.isBlock(node.body)) {
     return node.body;
   }
   return node.body;
 }
 function visitComponentBody(node, ctx) {
   const isTopLevel = ctx.componentBodyBlock !== null && node.parent === ctx.componentBodyBlock;
-  if (import_typescript8.default.isVariableStatement(node)) {
+  if (import_typescript9.default.isVariableStatement(node)) {
     for (const decl of node.declarationList.declarations) {
       if (isSignalDeclaration(decl, ctx)) {
         collectSignal(decl, ctx);
@@ -190477,16 +190540,16 @@ function visitComponentBody(node, ctx) {
         collectEffect(decl.initializer, ctx, decl.name.text);
         continue;
       }
-      if (import_typescript8.default.isIdentifier(decl.name)) {
-        const isLet = (node.declarationList.flags & import_typescript8.default.NodeFlags.Let) !== 0;
+      if (import_typescript9.default.isIdentifier(decl.name)) {
+        const isLet = (node.declarationList.flags & import_typescript9.default.NodeFlags.Let) !== 0;
         collectConstant(decl, ctx, false, isLet ? "let" : "const");
-      } else if (import_typescript8.default.isObjectBindingPattern(decl.name) && decl.initializer && import_typescript8.default.isIdentifier(decl.initializer) && ctx.propsObjectName === decl.initializer.text) {
-        const isLet = (node.declarationList.flags & import_typescript8.default.NodeFlags.Let) !== 0;
+      } else if (import_typescript9.default.isObjectBindingPattern(decl.name) && decl.initializer && import_typescript9.default.isIdentifier(decl.initializer) && ctx.propsObjectName === decl.initializer.text) {
+        const isLet = (node.declarationList.flags & import_typescript9.default.NodeFlags.Let) !== 0;
         collectConstant(decl, ctx, false, isLet ? "let" : "const");
       }
     }
   }
-  if (import_typescript8.default.isExpressionStatement(node)) {
+  if (import_typescript9.default.isExpressionStatement(node)) {
     if (isEffectCall(node.expression, ctx)) {
       collectEffect(node.expression, ctx);
       return;
@@ -190500,10 +190563,10 @@ function visitComponentBody(node, ctx) {
       return;
     }
   }
-  if (import_typescript8.default.isFunctionDeclaration(node) && node.name) {
+  if (import_typescript9.default.isFunctionDeclaration(node) && node.name) {
     collectFunction(node, ctx, false);
   }
-  if (import_typescript8.default.isIfStatement(node)) {
+  if (import_typescript9.default.isIfStatement(node)) {
     const jsxReturn = findJsxReturnInBlock(node.thenStatement);
     if (jsxReturn) {
       const scopeVars = collectScopeVariables(node.thenStatement, ctx);
@@ -190522,54 +190585,54 @@ function visitComponentBody(node, ctx) {
       return;
     }
   }
-  if (isTopLevel && (import_typescript8.default.isTryStatement(node) || import_typescript8.default.isSwitchStatement(node) || import_typescript8.default.isForStatement(node) || import_typescript8.default.isForInStatement(node) || import_typescript8.default.isForOfStatement(node) || import_typescript8.default.isWhileStatement(node) || import_typescript8.default.isDoStatement(node) || import_typescript8.default.isThrowStatement(node) || import_typescript8.default.isBlock(node) && node.parent === ctx.componentBodyBlock)) {
+  if (isTopLevel && (import_typescript9.default.isTryStatement(node) || import_typescript9.default.isSwitchStatement(node) || import_typescript9.default.isForStatement(node) || import_typescript9.default.isForInStatement(node) || import_typescript9.default.isForOfStatement(node) || import_typescript9.default.isWhileStatement(node) || import_typescript9.default.isDoStatement(node) || import_typescript9.default.isThrowStatement(node) || import_typescript9.default.isBlock(node) && node.parent === ctx.componentBodyBlock)) {
     collectInitStatement(node, ctx);
     return;
   }
-  if (import_typescript8.default.isReturnStatement(node) && node.expression) {
+  if (import_typescript9.default.isReturnStatement(node) && node.expression) {
     ctx.jsxReturn = unwrapJsxTransparent(node.expression);
   }
-  import_typescript8.default.forEachChild(node, (child) => {
-    if (import_typescript8.default.isArrowFunction(child) || import_typescript8.default.isFunctionExpression(child) || import_typescript8.default.isFunctionDeclaration(child)) {
+  import_typescript9.default.forEachChild(node, (child) => {
+    if (import_typescript9.default.isArrowFunction(child) || import_typescript9.default.isFunctionExpression(child) || import_typescript9.default.isFunctionDeclaration(child)) {
       return;
     }
     visitComponentBody(child, ctx);
   });
 }
 function findJsxReturnInBlock(node) {
-  if (import_typescript8.default.isBlock(node)) {
+  if (import_typescript9.default.isBlock(node)) {
     for (const stmt of node.statements) {
-      if (import_typescript8.default.isReturnStatement(stmt) && stmt.expression) {
+      if (import_typescript9.default.isReturnStatement(stmt) && stmt.expression) {
         const jsx = extractJsxFromExpression(stmt.expression);
         if (jsx)
           return jsx;
       }
     }
   }
-  if (import_typescript8.default.isReturnStatement(node) && node.expression) {
+  if (import_typescript9.default.isReturnStatement(node) && node.expression) {
     return extractJsxFromExpression(node.expression);
   }
   return null;
 }
 function unwrapJsxTransparent(expr) {
   let current = expr;
-  while (import_typescript8.default.isParenthesizedExpression(current) || import_typescript8.default.isAsExpression(current) || import_typescript8.default.isSatisfiesExpression(current) || import_typescript8.default.isNonNullExpression(current) || import_typescript8.default.isTypeAssertionExpression(current) || current.kind === import_typescript8.default.SyntaxKind.PartiallyEmittedExpression) {
+  while (import_typescript9.default.isParenthesizedExpression(current) || import_typescript9.default.isAsExpression(current) || import_typescript9.default.isSatisfiesExpression(current) || import_typescript9.default.isNonNullExpression(current) || import_typescript9.default.isTypeAssertionExpression(current) || current.kind === import_typescript9.default.SyntaxKind.PartiallyEmittedExpression) {
     current = current.expression;
   }
   return current;
 }
 function extractJsxFromExpression(expr) {
   const inner = unwrapJsxTransparent(expr);
-  if (import_typescript8.default.isJsxElement(inner) || import_typescript8.default.isJsxFragment(inner) || import_typescript8.default.isJsxSelfClosingElement(inner)) {
+  if (import_typescript9.default.isJsxElement(inner) || import_typescript9.default.isJsxFragment(inner) || import_typescript9.default.isJsxSelfClosingElement(inner)) {
     return inner;
   }
   return null;
 }
 function collectScopeVariables(node, ctx) {
   const variables = [];
-  if (import_typescript8.default.isBlock(node)) {
+  if (import_typescript9.default.isBlock(node)) {
     for (const stmt of node.statements) {
-      if (import_typescript8.default.isVariableStatement(stmt)) {
+      if (import_typescript9.default.isVariableStatement(stmt)) {
         for (const decl of stmt.declarationList.declarations) {
           variables.push(decl);
         }
@@ -190581,13 +190644,13 @@ function collectScopeVariables(node, ctx) {
 function collectParamBindingNames(params) {
   const out = new Set;
   const addBindingNames = (name) => {
-    if (import_typescript8.default.isIdentifier(name)) {
+    if (import_typescript9.default.isIdentifier(name)) {
       out.add(name.text);
-    } else if (import_typescript8.default.isObjectBindingPattern(name)) {
+    } else if (import_typescript9.default.isObjectBindingPattern(name)) {
       name.elements.forEach((e) => addBindingNames(e.name));
-    } else if (import_typescript8.default.isArrayBindingPattern(name)) {
+    } else if (import_typescript9.default.isArrayBindingPattern(name)) {
       name.elements.forEach((e) => {
-        if (!import_typescript8.default.isOmittedExpression(e))
+        if (!import_typescript9.default.isOmittedExpression(e))
           addBindingNames(e.name);
       });
     }
@@ -190604,7 +190667,7 @@ function collectEnclosingBranchVars(node, ctx) {
       if (cr.ifStatement.thenStatement !== current)
         continue;
       for (const decl of cr.scopeVariables) {
-        if (!import_typescript8.default.isIdentifier(decl.name) || !decl.initializer)
+        if (!import_typescript9.default.isIdentifier(decl.name) || !decl.initializer)
           continue;
         const varName = decl.name.text;
         if (result.has(varName))
@@ -190619,10 +190682,10 @@ function collectEnclosingBranchVars(node, ctx) {
   return result;
 }
 function collectBranchSignals(thenStatement, ctx, branchCondition) {
-  if (!import_typescript8.default.isBlock(thenStatement))
+  if (!import_typescript9.default.isBlock(thenStatement))
     return;
   for (const stmt of thenStatement.statements) {
-    if (!import_typescript8.default.isVariableStatement(stmt))
+    if (!import_typescript9.default.isVariableStatement(stmt))
       continue;
     for (const decl of stmt.declarationList.declarations) {
       if (!isSignalDeclaration(decl, ctx))
@@ -190648,13 +190711,13 @@ var ENV_SIGNAL_FACTORIES = {
   createSearchParams: "search"
 };
 function resolvePrimitiveKind(callExpr, ctx) {
-  if (import_typescript8.default.isIdentifier(callExpr.expression)) {
+  if (import_typescript9.default.isIdentifier(callExpr.expression)) {
     const hit = PRIMITIVE_CANONICAL_NAMES[callExpr.expression.text];
     if (hit)
       return hit;
     return resolveCalleeViaChecker(callExpr.expression, ctx);
   }
-  if (import_typescript8.default.isPropertyAccessExpression(callExpr.expression)) {
+  if (import_typescript9.default.isPropertyAccessExpression(callExpr.expression)) {
     const propName = callExpr.expression.name.text;
     const hit = PRIMITIVE_CANONICAL_NAMES[propName];
     if (!hit)
@@ -190681,7 +190744,7 @@ function resolveCanonicalClientExportName(ident, ctx) {
   if (!symbol)
     return null;
   let target = symbol;
-  if (symbol.flags & import_typescript8.default.SymbolFlags.Alias) {
+  if (symbol.flags & import_typescript9.default.SymbolFlags.Alias) {
     try {
       target = ctx.checker.getAliasedSymbol(symbol);
     } catch {
@@ -190697,14 +190760,14 @@ function resolveCanonicalClientExportName(ident, ctx) {
   return null;
 }
 function resolveEnvSignalKey(callExpr, ctx) {
-  if (import_typescript8.default.isIdentifier(callExpr.expression)) {
+  if (import_typescript9.default.isIdentifier(callExpr.expression)) {
     const key = ENV_SIGNAL_FACTORIES[callExpr.expression.text];
     if (key)
       return key;
     const canonical = resolveCanonicalClientExportName(callExpr.expression, ctx);
     return canonical ? ENV_SIGNAL_FACTORIES[canonical] ?? null : null;
   }
-  if (import_typescript8.default.isPropertyAccessExpression(callExpr.expression)) {
+  if (import_typescript9.default.isPropertyAccessExpression(callExpr.expression)) {
     const key = ENV_SIGNAL_FACTORIES[callExpr.expression.name.text];
     if (key && isBarefootClientNamespace(callExpr.expression.expression, ctx))
       return key;
@@ -190712,7 +190775,7 @@ function resolveEnvSignalKey(callExpr, ctx) {
   return null;
 }
 function isBarefootClientNamespace(expr, ctx) {
-  if (!import_typescript8.default.isIdentifier(expr))
+  if (!import_typescript9.default.isIdentifier(expr))
     return false;
   if (!ctx.checker)
     return false;
@@ -190725,22 +190788,22 @@ function isBarefootClientNamespace(expr, ctx) {
   if (!symbol)
     return false;
   for (const decl of symbol.declarations ?? []) {
-    if (!import_typescript8.default.isNamespaceImport(decl))
+    if (!import_typescript9.default.isNamespaceImport(decl))
       continue;
     const importDecl = decl.parent.parent;
-    if (!import_typescript8.default.isImportDeclaration(importDecl))
+    if (!import_typescript9.default.isImportDeclaration(importDecl))
       continue;
     const mod = importDecl.moduleSpecifier;
-    if (import_typescript8.default.isStringLiteral(mod) && mod.text === "@barefootjs/client") {
+    if (import_typescript9.default.isStringLiteral(mod) && mod.text === "@barefootjs/client") {
       return true;
     }
   }
   return false;
 }
 function isSignalDeclaration(node, ctx) {
-  if (!import_typescript8.default.isArrayBindingPattern(node.name))
+  if (!import_typescript9.default.isArrayBindingPattern(node.name))
     return false;
-  if (!node.initializer || !import_typescript8.default.isCallExpression(node.initializer))
+  if (!node.initializer || !import_typescript9.default.isCallExpression(node.initializer))
     return false;
   return resolvePrimitiveKind(node.initializer, ctx) === "signal";
 }
@@ -190748,14 +190811,14 @@ function collectSignal(node, ctx) {
   const pattern = node.name;
   const callExpr = node.initializer;
   const elements = pattern.elements;
-  const getterElided = elements.length === 2 && import_typescript8.default.isOmittedExpression(elements[0]);
-  if (elements.length < 1 || elements.length > 2 || !getterElided && (!import_typescript8.default.isBindingElement(elements[0]) || !import_typescript8.default.isIdentifier(elements[0].name))) {
+  const getterElided = elements.length === 2 && import_typescript9.default.isOmittedExpression(elements[0]);
+  if (elements.length < 1 || elements.length > 2 || !getterElided && (!import_typescript9.default.isBindingElement(elements[0]) || !import_typescript9.default.isIdentifier(elements[0].name))) {
     return;
   }
-  if (elements.length === 2 && (!import_typescript8.default.isBindingElement(elements[1]) || !import_typescript8.default.isIdentifier(elements[1].name))) {
+  if (elements.length === 2 && (!import_typescript9.default.isBindingElement(elements[1]) || !import_typescript9.default.isIdentifier(elements[1].name))) {
     return;
   }
-  const setter = elements.length === 2 && import_typescript8.default.isBindingElement(elements[1]) && import_typescript8.default.isIdentifier(elements[1].name) ? elements[1].name.text : null;
+  const setter = elements.length === 2 && import_typescript9.default.isBindingElement(elements[1]) && import_typescript9.default.isIdentifier(elements[1].name) ? elements[1].name.text : null;
   if (getterElided && !setter)
     return;
   const getter = getterElided ? `__bfGet_${setter}` : elements[0].name.text;
@@ -190773,7 +190836,8 @@ function collectSignal(node, ctx) {
   if (!ctx.propsObjectName && callExpr.arguments[0]) {
     const propNames = new Set(ctx.propsParams.map((p) => p.name));
     if (propNames.size > 0) {
-      templateInitialValue = rewriteBarePropRefs(initialValue, callExpr.arguments[0], propNames);
+      const propAliases = buildPropAliasMap(ctx.propsParams);
+      templateInitialValue = rewriteBarePropRefs(initialValue, callExpr.arguments[0], propNames, undefined, propAliases);
     }
   }
   ctx.signals.push({
@@ -190791,33 +190855,33 @@ function collectSignal(node, ctx) {
   });
 }
 function isSignalTupleDeclaration(node) {
-  if (!import_typescript8.default.isIdentifier(node.name))
+  if (!import_typescript9.default.isIdentifier(node.name))
     return false;
-  if (!node.initializer || !import_typescript8.default.isCallExpression(node.initializer))
+  if (!node.initializer || !import_typescript9.default.isCallExpression(node.initializer))
     return false;
   const callExpr = node.initializer;
-  return import_typescript8.default.isIdentifier(callExpr.expression) && callExpr.expression.text === "createSignal";
+  return import_typescript9.default.isIdentifier(callExpr.expression) && callExpr.expression.text === "createSignal";
 }
 function isSignalIndexAccess(node, ctx) {
-  if (!import_typescript8.default.isIdentifier(node.name))
+  if (!import_typescript9.default.isIdentifier(node.name))
     return null;
-  if (!node.initializer || !import_typescript8.default.isElementAccessExpression(node.initializer))
+  if (!node.initializer || !import_typescript9.default.isElementAccessExpression(node.initializer))
     return null;
   const access = node.initializer;
-  if (!import_typescript8.default.isNumericLiteral(access.argumentExpression))
+  if (!import_typescript9.default.isNumericLiteral(access.argumentExpression))
     return null;
   const indexValue = Number(access.argumentExpression.text);
   if (indexValue !== 0 && indexValue !== 1)
     return null;
   const index = indexValue;
-  if (import_typescript8.default.isCallExpression(access.expression)) {
+  if (import_typescript9.default.isCallExpression(access.expression)) {
     const call = access.expression;
-    if (import_typescript8.default.isIdentifier(call.expression) && call.expression.text === "createSignal") {
+    if (import_typescript9.default.isIdentifier(call.expression) && call.expression.text === "createSignal") {
       return { kind: "direct", index, callExpr: call };
     }
     return null;
   }
-  if (import_typescript8.default.isIdentifier(access.expression)) {
+  if (import_typescript9.default.isIdentifier(access.expression)) {
     const tupleName = access.expression.text;
     if (ctx.signalTupleRefs.has(tupleName)) {
       return { kind: "tupleRef", index, tupleName };
@@ -190912,30 +190976,30 @@ function flushPendingSignalTuples(ctx) {
   ctx.signalTupleRefs.clear();
 }
 function isMemoDeclaration(node, ctx) {
-  if (!import_typescript8.default.isIdentifier(node.name))
+  if (!import_typescript9.default.isIdentifier(node.name))
     return false;
-  if (!node.initializer || !import_typescript8.default.isCallExpression(node.initializer))
+  if (!node.initializer || !import_typescript9.default.isCallExpression(node.initializer))
     return false;
   return resolvePrimitiveKind(node.initializer, ctx) === "memo";
 }
 function memoBodyIsTemplateLiteral(memoArrow) {
   let node = memoArrow;
-  while (node && import_typescript8.default.isParenthesizedExpression(node))
+  while (node && import_typescript9.default.isParenthesizedExpression(node))
     node = node.expression;
-  if (!node || !import_typescript8.default.isArrowFunction(node))
+  if (!node || !import_typescript9.default.isArrowFunction(node))
     return false;
   let body = node.body;
-  while (import_typescript8.default.isParenthesizedExpression(body))
+  while (import_typescript9.default.isParenthesizedExpression(body))
     body = body.expression;
-  if (import_typescript8.default.isBlock(body)) {
-    const ret = body.statements.find(import_typescript8.default.isReturnStatement);
+  if (import_typescript9.default.isBlock(body)) {
+    const ret = body.statements.find(import_typescript9.default.isReturnStatement);
     if (!ret || !ret.expression)
       return false;
     body = ret.expression;
-    while (import_typescript8.default.isParenthesizedExpression(body))
+    while (import_typescript9.default.isParenthesizedExpression(body))
       body = body.expression;
   }
-  return import_typescript8.default.isTemplateExpression(body) || import_typescript8.default.isNoSubstitutionTemplateLiteral(body);
+  return import_typescript9.default.isTemplateExpression(body) || import_typescript9.default.isNoSubstitutionTemplateLiteral(body);
 }
 function collectMemo(node, ctx) {
   const name = node.name.text;
@@ -190952,7 +191016,7 @@ function collectMemo(node, ctx) {
       type2 = inferTypeFromValue(arrowBody);
     }
   }
-  if (ctx.checker && (type2.kind === "unknown" || type2.kind === "object") && callExpr.arguments[0] && (import_typescript8.default.isArrowFunction(callExpr.arguments[0]) || import_typescript8.default.isFunctionExpression(callExpr.arguments[0]))) {
+  if (ctx.checker && (type2.kind === "unknown" || type2.kind === "object") && callExpr.arguments[0] && (import_typescript9.default.isArrowFunction(callExpr.arguments[0]) || import_typescript9.default.isFunctionExpression(callExpr.arguments[0]))) {
     const fnType = ctx.checker.getTypeAtLocation(callExpr.arguments[0]);
     const sig = fnType.getCallSignatures()[0];
     if (sig) {
@@ -190962,19 +191026,20 @@ function collectMemo(node, ctx) {
     }
   }
   const memoArrow = callExpr.arguments[0];
-  const parsedBody = memoArrow && import_typescript8.default.isArrowFunction(memoArrow) && !import_typescript8.default.isBlock(memoArrow.body) ? parseExpression(ctx.getJS(memoArrow.body)) : undefined;
+  const parsedBody = memoArrow && import_typescript9.default.isArrowFunction(memoArrow) && !import_typescript9.default.isBlock(memoArrow.body) ? parseExpression(ctx.getJS(memoArrow.body)) : undefined;
   const parsed = parsedBody && parsedBody.kind !== "unsupported" && parsedBody.kind !== "object-literal" ? parsedBody : undefined;
   let arrowNode = memoArrow;
-  while (arrowNode && import_typescript8.default.isParenthesizedExpression(arrowNode))
+  while (arrowNode && import_typescript9.default.isParenthesizedExpression(arrowNode))
     arrowNode = arrowNode.expression;
-  const blockBody = arrowNode && import_typescript8.default.isArrowFunction(arrowNode) && import_typescript8.default.isBlock(arrowNode.body) ? arrowNode.body : undefined;
+  const blockBody = arrowNode && import_typescript9.default.isArrowFunction(arrowNode) && import_typescript9.default.isBlock(arrowNode.body) ? arrowNode.body : undefined;
   const parsedBlock = blockBody ? parseBlockBodyTolerant(blockBody, ctx.sourceFile, (node2) => ctx.getJS(node2)) : undefined;
   const parsedBlockComplete = parsedBlock && blockBody ? parsedBlock.length === blockBody.statements.length : undefined;
   let templateComputation;
   if (!ctx.propsObjectName && callExpr.arguments[0]) {
     const propNames = new Set(ctx.propsParams.map((p) => p.name));
     if (propNames.size > 0) {
-      templateComputation = rewriteBarePropRefs(computation, callExpr.arguments[0], propNames);
+      const propAliases = buildPropAliasMap(ctx.propsParams);
+      templateComputation = rewriteBarePropRefs(computation, callExpr.arguments[0], propNames, undefined, propAliases);
     }
   }
   ctx.memos.push({
@@ -190993,14 +191058,14 @@ function collectMemo(node, ctx) {
   });
 }
 function isEffectCall(node, ctx) {
-  if (!import_typescript8.default.isCallExpression(node))
+  if (!import_typescript9.default.isCallExpression(node))
     return false;
   return resolvePrimitiveKind(node, ctx) === "effect";
 }
 function isEffectDisposerCapture(node, ctx) {
-  if (!import_typescript8.default.isIdentifier(node.name))
+  if (!import_typescript9.default.isIdentifier(node.name))
     return false;
-  if (!node.initializer || !import_typescript8.default.isCallExpression(node.initializer))
+  if (!node.initializer || !import_typescript9.default.isCallExpression(node.initializer))
     return false;
   return resolvePrimitiveKind(node.initializer, ctx) === "effect";
 }
@@ -191015,7 +191080,7 @@ function collectEffect(node, ctx, captureName) {
   });
 }
 function isOnMountCall(node, ctx) {
-  if (!import_typescript8.default.isCallExpression(node))
+  if (!import_typescript9.default.isCallExpression(node))
     return false;
   return resolvePrimitiveKind(node, ctx) === "onMount";
 }
@@ -191050,19 +191115,19 @@ function leadsWithAsiHazard(body) {
 function extractAssignedIdentifiersFromNode(node) {
   const ids = new Set;
   function addFromTarget(target) {
-    if (import_typescript8.default.isIdentifier(target)) {
+    if (import_typescript9.default.isIdentifier(target)) {
       ids.add(target.text);
       return;
     }
-    if (import_typescript8.default.isParenthesizedExpression(target)) {
+    if (import_typescript9.default.isParenthesizedExpression(target)) {
       addFromTarget(target.expression);
       return;
     }
-    if (import_typescript8.default.isArrayLiteralExpression(target)) {
+    if (import_typescript9.default.isArrayLiteralExpression(target)) {
       for (const el of target.elements) {
-        if (import_typescript8.default.isOmittedExpression(el))
+        if (import_typescript9.default.isOmittedExpression(el))
           continue;
-        if (import_typescript8.default.isSpreadElement(el)) {
+        if (import_typescript9.default.isSpreadElement(el)) {
           addFromTarget(el.expression);
           continue;
         }
@@ -191070,17 +191135,17 @@ function extractAssignedIdentifiersFromNode(node) {
       }
       return;
     }
-    if (import_typescript8.default.isObjectLiteralExpression(target)) {
+    if (import_typescript9.default.isObjectLiteralExpression(target)) {
       for (const prop of target.properties) {
-        if (import_typescript8.default.isShorthandPropertyAssignment(prop)) {
+        if (import_typescript9.default.isShorthandPropertyAssignment(prop)) {
           ids.add(prop.name.text);
           continue;
         }
-        if (import_typescript8.default.isPropertyAssignment(prop)) {
+        if (import_typescript9.default.isPropertyAssignment(prop)) {
           addFromTarget(prop.initializer);
           continue;
         }
-        if (import_typescript8.default.isSpreadAssignment(prop)) {
+        if (import_typescript9.default.isSpreadAssignment(prop)) {
           addFromTarget(prop.expression);
           continue;
         }
@@ -191089,21 +191154,21 @@ function extractAssignedIdentifiersFromNode(node) {
     }
   }
   function visit2(n) {
-    if (import_typescript8.default.isArrowFunction(n) || import_typescript8.default.isFunctionExpression(n) || import_typescript8.default.isFunctionDeclaration(n) || import_typescript8.default.isMethodDeclaration(n) || import_typescript8.default.isGetAccessorDeclaration(n) || import_typescript8.default.isSetAccessorDeclaration(n) || import_typescript8.default.isConstructorDeclaration(n)) {
+    if (import_typescript9.default.isArrowFunction(n) || import_typescript9.default.isFunctionExpression(n) || import_typescript9.default.isFunctionDeclaration(n) || import_typescript9.default.isMethodDeclaration(n) || import_typescript9.default.isGetAccessorDeclaration(n) || import_typescript9.default.isSetAccessorDeclaration(n) || import_typescript9.default.isConstructorDeclaration(n)) {
       return;
     }
-    if (import_typescript8.default.isBinaryExpression(n)) {
+    if (import_typescript9.default.isBinaryExpression(n)) {
       const op = n.operatorToken.kind;
-      if (op === import_typescript8.default.SyntaxKind.EqualsToken || op === import_typescript8.default.SyntaxKind.PlusEqualsToken || op === import_typescript8.default.SyntaxKind.MinusEqualsToken || op === import_typescript8.default.SyntaxKind.AsteriskEqualsToken || op === import_typescript8.default.SyntaxKind.SlashEqualsToken || op === import_typescript8.default.SyntaxKind.PercentEqualsToken || op === import_typescript8.default.SyntaxKind.AsteriskAsteriskEqualsToken || op === import_typescript8.default.SyntaxKind.AmpersandEqualsToken || op === import_typescript8.default.SyntaxKind.BarEqualsToken || op === import_typescript8.default.SyntaxKind.CaretEqualsToken || op === import_typescript8.default.SyntaxKind.LessThanLessThanEqualsToken || op === import_typescript8.default.SyntaxKind.GreaterThanGreaterThanEqualsToken || op === import_typescript8.default.SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken || op === import_typescript8.default.SyntaxKind.AmpersandAmpersandEqualsToken || op === import_typescript8.default.SyntaxKind.BarBarEqualsToken || op === import_typescript8.default.SyntaxKind.QuestionQuestionEqualsToken) {
+      if (op === import_typescript9.default.SyntaxKind.EqualsToken || op === import_typescript9.default.SyntaxKind.PlusEqualsToken || op === import_typescript9.default.SyntaxKind.MinusEqualsToken || op === import_typescript9.default.SyntaxKind.AsteriskEqualsToken || op === import_typescript9.default.SyntaxKind.SlashEqualsToken || op === import_typescript9.default.SyntaxKind.PercentEqualsToken || op === import_typescript9.default.SyntaxKind.AsteriskAsteriskEqualsToken || op === import_typescript9.default.SyntaxKind.AmpersandEqualsToken || op === import_typescript9.default.SyntaxKind.BarEqualsToken || op === import_typescript9.default.SyntaxKind.CaretEqualsToken || op === import_typescript9.default.SyntaxKind.LessThanLessThanEqualsToken || op === import_typescript9.default.SyntaxKind.GreaterThanGreaterThanEqualsToken || op === import_typescript9.default.SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken || op === import_typescript9.default.SyntaxKind.AmpersandAmpersandEqualsToken || op === import_typescript9.default.SyntaxKind.BarBarEqualsToken || op === import_typescript9.default.SyntaxKind.QuestionQuestionEqualsToken) {
         addFromTarget(n.left);
       }
     }
-    if (import_typescript8.default.isPrefixUnaryExpression(n) || import_typescript8.default.isPostfixUnaryExpression(n)) {
-      if (n.operator === import_typescript8.default.SyntaxKind.PlusPlusToken || n.operator === import_typescript8.default.SyntaxKind.MinusMinusToken) {
+    if (import_typescript9.default.isPrefixUnaryExpression(n) || import_typescript9.default.isPostfixUnaryExpression(n)) {
+      if (n.operator === import_typescript9.default.SyntaxKind.PlusPlusToken || n.operator === import_typescript9.default.SyntaxKind.MinusMinusToken) {
         addFromTarget(n.operand);
       }
     }
-    import_typescript8.default.forEachChild(n, visit2);
+    import_typescript9.default.forEachChild(n, visit2);
   }
   visit2(node);
   const localDecls = collectLocalDeclarations(node);
@@ -191114,30 +191179,30 @@ function extractAssignedIdentifiersFromNode(node) {
 function collectLocalDeclarations(root) {
   const names = new Set;
   function addBindingName(name) {
-    if (import_typescript8.default.isIdentifier(name)) {
+    if (import_typescript9.default.isIdentifier(name)) {
       names.add(name.text);
       return;
     }
-    if (import_typescript8.default.isArrayBindingPattern(name)) {
+    if (import_typescript9.default.isArrayBindingPattern(name)) {
       for (const el of name.elements) {
-        if (import_typescript8.default.isBindingElement(el))
+        if (import_typescript9.default.isBindingElement(el))
           addBindingName(el.name);
       }
       return;
     }
-    if (import_typescript8.default.isObjectBindingPattern(name)) {
+    if (import_typescript9.default.isObjectBindingPattern(name)) {
       for (const el of name.elements) {
         addBindingName(el.name);
       }
     }
   }
   function visit2(n) {
-    if (import_typescript8.default.isArrowFunction(n) || import_typescript8.default.isFunctionExpression(n) || import_typescript8.default.isFunctionDeclaration(n))
+    if (import_typescript9.default.isArrowFunction(n) || import_typescript9.default.isFunctionExpression(n) || import_typescript9.default.isFunctionDeclaration(n))
       return;
-    if (import_typescript8.default.isVariableDeclaration(n)) {
+    if (import_typescript9.default.isVariableDeclaration(n)) {
       addBindingName(n.name);
     }
-    import_typescript8.default.forEachChild(n, visit2);
+    import_typescript9.default.forEachChild(n, visit2);
   }
   visit2(root);
   return names;
@@ -191171,35 +191236,35 @@ var CLIENT_EXPORTS = new Set([
   "Region"
 ]);
 function collectAmbientGlobals(node, ctx) {
-  if (import_typescript8.default.isVariableStatement(node)) {
-    const isDeclare = node.modifiers?.some((m) => m.kind === import_typescript8.default.SyntaxKind.DeclareKeyword) ?? false;
+  if (import_typescript9.default.isVariableStatement(node)) {
+    const isDeclare = node.modifiers?.some((m) => m.kind === import_typescript9.default.SyntaxKind.DeclareKeyword) ?? false;
     if (!isDeclare)
       return;
     for (const decl of node.declarationList.declarations) {
-      if (import_typescript8.default.isIdentifier(decl.name))
+      if (import_typescript9.default.isIdentifier(decl.name))
         ctx.ambientGlobals.add(decl.name.text);
     }
     return;
   }
-  if (import_typescript8.default.isFunctionDeclaration(node) && node.name) {
-    const isDeclare = node.modifiers?.some((m) => m.kind === import_typescript8.default.SyntaxKind.DeclareKeyword) ?? false;
+  if (import_typescript9.default.isFunctionDeclaration(node) && node.name) {
+    const isDeclare = node.modifiers?.some((m) => m.kind === import_typescript9.default.SyntaxKind.DeclareKeyword) ?? false;
     if (isDeclare)
       ctx.ambientGlobals.add(node.name.text);
     return;
   }
-  if (import_typescript8.default.isModuleDeclaration(node)) {
-    const isGlobalAugmentation = (node.flags & import_typescript8.default.NodeFlags.GlobalAugmentation) !== 0;
+  if (import_typescript9.default.isModuleDeclaration(node)) {
+    const isGlobalAugmentation = (node.flags & import_typescript9.default.NodeFlags.GlobalAugmentation) !== 0;
     if (!isGlobalAugmentation)
       return;
-    if (!node.body || !import_typescript8.default.isModuleBlock(node.body))
+    if (!node.body || !import_typescript9.default.isModuleBlock(node.body))
       return;
     for (const inner of node.body.statements) {
-      if (import_typescript8.default.isVariableStatement(inner)) {
+      if (import_typescript9.default.isVariableStatement(inner)) {
         for (const decl of inner.declarationList.declarations) {
-          if (import_typescript8.default.isIdentifier(decl.name))
+          if (import_typescript9.default.isIdentifier(decl.name))
             ctx.ambientGlobals.add(decl.name.text);
         }
-      } else if (import_typescript8.default.isFunctionDeclaration(inner) && inner.name) {
+      } else if (import_typescript9.default.isFunctionDeclaration(inner) && inner.name) {
         ctx.ambientGlobals.add(inner.name.text);
       }
     }
@@ -191210,7 +191275,7 @@ function collectImport(node, ctx) {
   const specifiers = [];
   const isTypeOnly = !!node.importClause?.isTypeOnly;
   const loc = getSourceLocation(node, ctx.sourceFile, ctx.filePath);
-  if (source === "@barefootjs/client" && !isTypeOnly && node.importClause?.namedBindings && import_typescript8.default.isNamedImports(node.importClause.namedBindings)) {
+  if (source === "@barefootjs/client" && !isTypeOnly && node.importClause?.namedBindings && import_typescript9.default.isNamedImports(node.importClause.namedBindings)) {
     const wrongImports = [];
     for (const element of node.importClause.namedBindings.elements) {
       const name = element.propertyName?.text ?? element.name.text;
@@ -191238,7 +191303,7 @@ function collectImport(node, ctx) {
       });
     }
     if (node.importClause.namedBindings) {
-      if (import_typescript8.default.isNamedImports(node.importClause.namedBindings)) {
+      if (import_typescript9.default.isNamedImports(node.importClause.namedBindings)) {
         for (const element of node.importClause.namedBindings.elements) {
           specifiers.push({
             name: element.propertyName?.text ?? element.name.text,
@@ -191249,7 +191314,7 @@ function collectImport(node, ctx) {
           });
         }
       }
-      if (import_typescript8.default.isNamespaceImport(node.importClause.namedBindings)) {
+      if (import_typescript9.default.isNamespaceImport(node.importClause.namedBindings)) {
         specifiers.push({
           name: node.importClause.namedBindings.name.text,
           alias: null,
@@ -191276,7 +191341,7 @@ function collectInterfaceDefinition(node, ctx) {
   });
 }
 function collectTypeAliasDefinition(node, ctx) {
-  const properties = import_typescript8.default.isTypeLiteralNode(node.type) ? membersToProperties(node.type.members, ctx.sourceFile) : undefined;
+  const properties = import_typescript9.default.isTypeLiteralNode(node.type) ? membersToProperties(node.type.members, ctx.sourceFile) : undefined;
   ctx.typeDefinitions.push({
     kind: "type",
     name: node.name.text,
@@ -191289,20 +191354,20 @@ function extractSingleJsxReturn(body) {
   let jsxReturn = null;
   let returnCount = 0;
   function visit2(node) {
-    if (import_typescript8.default.isFunctionDeclaration(node) || import_typescript8.default.isFunctionExpression(node) || import_typescript8.default.isArrowFunction(node))
+    if (import_typescript9.default.isFunctionDeclaration(node) || import_typescript9.default.isFunctionExpression(node) || import_typescript9.default.isArrowFunction(node))
       return;
-    if (import_typescript8.default.isReturnStatement(node)) {
+    if (import_typescript9.default.isReturnStatement(node)) {
       returnCount++;
       if (node.expression) {
         const expr = unwrapJsxTransparent(node.expression);
-        if (import_typescript8.default.isJsxElement(expr) || import_typescript8.default.isJsxSelfClosingElement(expr) || import_typescript8.default.isJsxFragment(expr)) {
+        if (import_typescript9.default.isJsxElement(expr) || import_typescript9.default.isJsxSelfClosingElement(expr) || import_typescript9.default.isJsxFragment(expr)) {
           jsxReturn = expr;
         }
       }
     }
-    import_typescript8.default.forEachChild(node, visit2);
+    import_typescript9.default.forEachChild(node, visit2);
   }
-  import_typescript8.default.forEachChild(body, visit2);
+  import_typescript9.default.forEachChild(body, visit2);
   if (returnCount !== 1)
     return null;
   return jsxReturn;
@@ -191319,9 +191384,9 @@ function extractMultiReturnJsxBranches(body, allowPreamble = false) {
   const stmts = body.statements;
   for (let i2 = 0;i2 < stmts.length; i2++) {
     const stmt = stmts[i2];
-    if (import_typescript8.default.isIfStatement(stmt)) {
+    if (import_typescript9.default.isIfStatement(stmt)) {
       let current = stmt;
-      while (import_typescript8.default.isIfStatement(current)) {
+      while (import_typescript9.default.isIfStatement(current)) {
         const ifStmt = current;
         if (!isDirectReturnBlock(ifStmt.thenStatement))
           return null;
@@ -191331,7 +191396,7 @@ function extractMultiReturnJsxBranches(body, allowPreamble = false) {
           return null;
         branches.push({ condition: ifStmt.expression, jsxReturn: jsxReturn ?? null });
         if (ifStmt.elseStatement) {
-          if (import_typescript8.default.isIfStatement(ifStmt.elseStatement)) {
+          if (import_typescript9.default.isIfStatement(ifStmt.elseStatement)) {
             current = ifStmt.elseStatement;
             continue;
           }
@@ -191353,18 +191418,18 @@ function extractMultiReturnJsxBranches(body, allowPreamble = false) {
       }
       continue;
     }
-    if (import_typescript8.default.isSwitchStatement(stmt)) {
+    if (import_typescript9.default.isSwitchStatement(stmt)) {
       if (branches.length > 0)
         return null;
-      if (!import_typescript8.default.isIdentifier(stmt.expression) && !import_typescript8.default.isPropertyAccessExpression(stmt.expression)) {
+      if (!import_typescript9.default.isIdentifier(stmt.expression) && !import_typescript9.default.isPropertyAccessExpression(stmt.expression)) {
         return null;
       }
-      const hasDefault = stmt.caseBlock.clauses.some((c) => import_typescript8.default.isDefaultClause(c));
+      const hasDefault = stmt.caseBlock.clauses.some((c) => import_typescript9.default.isDefaultClause(c));
       if (!hasDefault)
         return null;
       let pendingCases = [];
       for (const clause of stmt.caseBlock.clauses) {
-        if (import_typescript8.default.isCaseClause(clause) && clause.statements.length === 0) {
+        if (import_typescript9.default.isCaseClause(clause) && clause.statements.length === 0) {
           pendingCases.push(clause.expression);
           continue;
         }
@@ -191374,7 +191439,7 @@ function extractMultiReturnJsxBranches(body, allowPreamble = false) {
           return null;
         if (!caseClauseIsDirectReturn(clause))
           return null;
-        if (import_typescript8.default.isCaseClause(clause)) {
+        if (import_typescript9.default.isCaseClause(clause)) {
           branches.push({
             condition: clause.expression,
             jsxReturn: jsxReturn ?? null,
@@ -191395,18 +191460,18 @@ function extractMultiReturnJsxBranches(body, allowPreamble = false) {
         return null;
       return { branches, fallback, switchDiscriminant: stmt.expression, preamble };
     }
-    if (import_typescript8.default.isReturnStatement(stmt) && stmt.expression) {
+    if (import_typescript9.default.isReturnStatement(stmt) && stmt.expression) {
       const expr = unwrapJsxTransparent(stmt.expression);
-      if (import_typescript8.default.isJsxElement(expr) || import_typescript8.default.isJsxSelfClosingElement(expr) || import_typescript8.default.isJsxFragment(expr)) {
+      if (import_typescript9.default.isJsxElement(expr) || import_typescript9.default.isJsxSelfClosingElement(expr) || import_typescript9.default.isJsxFragment(expr)) {
         fallback = expr;
-      } else if (expr.kind === import_typescript8.default.SyntaxKind.NullKeyword) {} else {
+      } else if (expr.kind === import_typescript9.default.SyntaxKind.NullKeyword) {} else {
         return null;
       }
       continue;
     }
-    if (import_typescript8.default.isVariableStatement(stmt)) {
+    if (import_typescript9.default.isVariableStatement(stmt)) {
       const declFlags = stmt.declarationList.flags;
-      const isConstOrLet = (declFlags & import_typescript8.default.NodeFlags.Const) !== 0 || (declFlags & import_typescript8.default.NodeFlags.Let) !== 0;
+      const isConstOrLet = (declFlags & import_typescript9.default.NodeFlags.Const) !== 0 || (declFlags & import_typescript9.default.NodeFlags.Let) !== 0;
       if (allowPreamble && isConstOrLet && branches.length === 0 && fallback === null) {
         preamble.push(stmt);
         continue;
@@ -191422,12 +191487,12 @@ function extractMultiReturnJsxBranches(body, allowPreamble = false) {
   return { branches, fallback, preamble };
 }
 function isDirectReturnBlock(node) {
-  if (import_typescript8.default.isReturnStatement(node))
+  if (import_typescript9.default.isReturnStatement(node))
     return true;
-  if (import_typescript8.default.isBlock(node)) {
+  if (import_typescript9.default.isBlock(node)) {
     let returnCount = 0;
     for (const stmt of node.statements) {
-      if (import_typescript8.default.isReturnStatement(stmt)) {
+      if (import_typescript9.default.isReturnStatement(stmt)) {
         returnCount++;
         continue;
       }
@@ -191438,25 +191503,25 @@ function isDirectReturnBlock(node) {
   return false;
 }
 function findNullReturnInBlock(node) {
-  if (import_typescript8.default.isBlock(node)) {
+  if (import_typescript9.default.isBlock(node)) {
     for (const stmt of node.statements) {
-      if (import_typescript8.default.isReturnStatement(stmt) && stmt.expression) {
+      if (import_typescript9.default.isReturnStatement(stmt) && stmt.expression) {
         const expr = unwrapJsxTransparent(stmt.expression);
-        if (expr.kind === import_typescript8.default.SyntaxKind.NullKeyword)
+        if (expr.kind === import_typescript9.default.SyntaxKind.NullKeyword)
           return true;
       }
     }
   }
-  if (import_typescript8.default.isReturnStatement(node) && node.expression) {
+  if (import_typescript9.default.isReturnStatement(node) && node.expression) {
     const expr = unwrapJsxTransparent(node.expression);
-    if (expr.kind === import_typescript8.default.SyntaxKind.NullKeyword)
+    if (expr.kind === import_typescript9.default.SyntaxKind.NullKeyword)
       return true;
   }
   return false;
 }
 function findJsxReturnInCaseClause(clause) {
   for (const stmt of clause.statements) {
-    if (import_typescript8.default.isReturnStatement(stmt) && stmt.expression) {
+    if (import_typescript9.default.isReturnStatement(stmt) && stmt.expression) {
       return extractJsxFromExpression(stmt.expression);
     }
   }
@@ -191466,12 +191531,12 @@ function caseClauseIsDirectReturn(clause) {
   let returnCount = 0;
   let seenReturn = false;
   for (const stmt of clause.statements) {
-    if (import_typescript8.default.isReturnStatement(stmt)) {
+    if (import_typescript9.default.isReturnStatement(stmt)) {
       returnCount++;
       seenReturn = true;
       continue;
     }
-    if (import_typescript8.default.isBreakStatement(stmt)) {
+    if (import_typescript9.default.isBreakStatement(stmt)) {
       if (!seenReturn)
         return false;
       continue;
@@ -191482,9 +191547,9 @@ function caseClauseIsDirectReturn(clause) {
 }
 function findNullReturnInCaseClause(clause) {
   for (const stmt of clause.statements) {
-    if (import_typescript8.default.isReturnStatement(stmt) && stmt.expression) {
+    if (import_typescript9.default.isReturnStatement(stmt) && stmt.expression) {
       const expr = unwrapJsxTransparent(stmt.expression);
-      if (expr.kind === import_typescript8.default.SyntaxKind.NullKeyword)
+      if (expr.kind === import_typescript9.default.SyntaxKind.NullKeyword)
         return true;
     }
   }
@@ -191495,26 +191560,26 @@ function isMultiReturnJsxFunctionBody(body) {
   let hasJsxReturn = false;
   let allReturnsAreJsxOrNull = true;
   function visit2(node) {
-    if (import_typescript8.default.isFunctionDeclaration(node) || import_typescript8.default.isFunctionExpression(node) || import_typescript8.default.isArrowFunction(node))
+    if (import_typescript9.default.isFunctionDeclaration(node) || import_typescript9.default.isFunctionExpression(node) || import_typescript9.default.isArrowFunction(node))
       return;
-    if (import_typescript8.default.isReturnStatement(node)) {
+    if (import_typescript9.default.isReturnStatement(node)) {
       returnCount++;
       if (!node.expression) {
         allReturnsAreJsxOrNull = false;
         return;
       }
       const expr = unwrapJsxTransparent(node.expression);
-      const isJsx = import_typescript8.default.isJsxElement(expr) || import_typescript8.default.isJsxSelfClosingElement(expr) || import_typescript8.default.isJsxFragment(expr);
-      const isNull2 = expr.kind === import_typescript8.default.SyntaxKind.NullKeyword;
+      const isJsx = import_typescript9.default.isJsxElement(expr) || import_typescript9.default.isJsxSelfClosingElement(expr) || import_typescript9.default.isJsxFragment(expr);
+      const isNull2 = expr.kind === import_typescript9.default.SyntaxKind.NullKeyword;
       if (isJsx)
         hasJsxReturn = true;
       if (!isJsx && !isNull2)
         allReturnsAreJsxOrNull = false;
       return;
     }
-    import_typescript8.default.forEachChild(node, visit2);
+    import_typescript9.default.forEachChild(node, visit2);
   }
-  import_typescript8.default.forEachChild(body, visit2);
+  import_typescript9.default.forEachChild(body, visit2);
   return returnCount > 1 && hasJsxReturn && allReturnsAreJsxOrNull;
 }
 function collectFunction(node, ctx, _isModule, isExported = false) {
@@ -191584,7 +191649,7 @@ function collectFunction(node, ctx, _isModule, isExported = false) {
       }
     }
   }
-  const isAsync = node.modifiers?.some((m) => m.kind === import_typescript8.default.SyntaxKind.AsyncKeyword) ?? false;
+  const isAsync = node.modifiers?.some((m) => m.kind === import_typescript9.default.SyntaxKind.AsyncKeyword) ?? false;
   const isGenerator = !!node.asteriskToken;
   ctx.localFunctions.push({
     name,
@@ -191605,10 +191670,10 @@ function collectFunction(node, ctx, _isModule, isExported = false) {
   });
 }
 function extractValueBranches(node, ctx) {
-  if (import_typescript8.default.isParenthesizedExpression(node)) {
+  if (import_typescript9.default.isParenthesizedExpression(node)) {
     return extractValueBranches(node.expression, ctx);
   }
-  if (import_typescript8.default.isConditionalExpression(node)) {
+  if (import_typescript9.default.isConditionalExpression(node)) {
     return [
       ...extractValueBranches(node.whenTrue, ctx),
       ...extractValueBranches(node.whenFalse, ctx)
@@ -191620,46 +191685,46 @@ function extractFreeIdentifiersFromNode(node) {
   const ids = new Set;
   const boundNames = new Set;
   function addBindingNames(name, out) {
-    if (import_typescript8.default.isIdentifier(name))
+    if (import_typescript9.default.isIdentifier(name))
       out.push(name.text);
-    else if (import_typescript8.default.isObjectBindingPattern(name))
+    else if (import_typescript9.default.isObjectBindingPattern(name))
       name.elements.forEach((e) => addBindingNames(e.name, out));
-    else if (import_typescript8.default.isArrayBindingPattern(name))
+    else if (import_typescript9.default.isArrayBindingPattern(name))
       name.elements.forEach((e) => {
-        if (!import_typescript8.default.isOmittedExpression(e))
+        if (!import_typescript9.default.isOmittedExpression(e))
           addBindingNames(e.name, out);
       });
   }
   function visit2(n) {
-    if (import_typescript8.default.isTypeNode(n))
+    if (import_typescript9.default.isTypeNode(n))
       return;
-    if (import_typescript8.default.isIdentifier(n)) {
+    if (import_typescript9.default.isIdentifier(n)) {
       const parent = n.parent;
-      if (parent && import_typescript8.default.isPropertyAccessExpression(parent) && parent.name === n)
+      if (parent && import_typescript9.default.isPropertyAccessExpression(parent) && parent.name === n)
         return;
-      if (parent && import_typescript8.default.isPropertyAssignment(parent) && parent.name === n)
+      if (parent && import_typescript9.default.isPropertyAssignment(parent) && parent.name === n)
         return;
-      if (parent && import_typescript8.default.isParameter(parent) && parent.name === n)
+      if (parent && import_typescript9.default.isParameter(parent) && parent.name === n)
         return;
-      if (parent && import_typescript8.default.isVariableDeclaration(parent) && parent.name === n)
+      if (parent && import_typescript9.default.isVariableDeclaration(parent) && parent.name === n)
         return;
       if (boundNames.has(n.text))
         return;
       ids.add(n.text);
       return;
     }
-    if (import_typescript8.default.isArrowFunction(n)) {
+    if (import_typescript9.default.isArrowFunction(n)) {
       const params = [];
       for (const p of n.parameters)
         addBindingNames(p.name, params);
       for (const name of params)
         boundNames.add(name);
-      import_typescript8.default.forEachChild(n, visit2);
+      import_typescript9.default.forEachChild(n, visit2);
       for (const name of params)
         boundNames.delete(name);
       return;
     }
-    import_typescript8.default.forEachChild(n, visit2);
+    import_typescript9.default.forEachChild(n, visit2);
   }
   visit2(node);
   return ids;
@@ -191668,29 +191733,29 @@ function extractFreeTypeIdentifiersFromNode(node) {
   const ids = new Set;
   const boundTypeParams = new Set;
   function rootName(name) {
-    return import_typescript8.default.isQualifiedName(name) ? rootName(name.left) : name;
+    return import_typescript9.default.isQualifiedName(name) ? rootName(name.left) : name;
   }
   function visit2(n) {
-    if (import_typescript8.default.isTypeReferenceNode(n)) {
+    if (import_typescript9.default.isTypeReferenceNode(n)) {
       const name = rootName(n.typeName).text;
       if (!boundTypeParams.has(name))
         ids.add(name);
     }
-    if (import_typescript8.default.isTypeQueryNode(n)) {
+    if (import_typescript9.default.isTypeQueryNode(n)) {
       const name = rootName(n.exprName).text;
       if (!boundTypeParams.has(name))
         ids.add(name);
     }
-    if (import_typescript8.default.isFunctionLike(n) && n.typeParameters && n.typeParameters.length > 0) {
+    if (import_typescript9.default.isFunctionLike(n) && n.typeParameters && n.typeParameters.length > 0) {
       const names = n.typeParameters.map((p) => p.name.text);
       for (const p of names)
         boundTypeParams.add(p);
-      import_typescript8.default.forEachChild(n, visit2);
+      import_typescript9.default.forEachChild(n, visit2);
       for (const p of names)
         boundTypeParams.delete(p);
       return;
     }
-    import_typescript8.default.forEachChild(n, visit2);
+    import_typescript9.default.forEachChild(n, visit2);
   }
   visit2(node);
   return ids;
@@ -191700,22 +191765,22 @@ function initializerShapeContainsJsx(node) {
   function visit2(n) {
     if (found)
       return;
-    if (import_typescript8.default.isJsxElement(n) || import_typescript8.default.isJsxSelfClosingElement(n) || import_typescript8.default.isJsxFragment(n)) {
+    if (import_typescript9.default.isJsxElement(n) || import_typescript9.default.isJsxSelfClosingElement(n) || import_typescript9.default.isJsxFragment(n)) {
       found = true;
       return;
     }
-    if (import_typescript8.default.isFunctionDeclaration(n) || import_typescript8.default.isFunctionExpression(n) || import_typescript8.default.isArrowFunction(n)) {
+    if (import_typescript9.default.isFunctionDeclaration(n) || import_typescript9.default.isFunctionExpression(n) || import_typescript9.default.isArrowFunction(n)) {
       return;
     }
-    import_typescript8.default.forEachChild(n, visit2);
+    import_typescript9.default.forEachChild(n, visit2);
   }
   visit2(node);
   return found;
 }
 function isMapLikeCallWithJsx(node) {
-  if (!import_typescript8.default.isCallExpression(node))
+  if (!import_typescript9.default.isCallExpression(node))
     return false;
-  if (!import_typescript8.default.isPropertyAccessExpression(node.expression))
+  if (!import_typescript9.default.isPropertyAccessExpression(node.expression))
     return false;
   const method = node.expression.name.text;
   if (method !== "map" && method !== "flatMap")
@@ -191723,12 +191788,12 @@ function isMapLikeCallWithJsx(node) {
   const callback = node.arguments[0];
   if (!callback)
     return false;
-  if (!import_typescript8.default.isArrowFunction(callback) && !import_typescript8.default.isFunctionExpression(callback))
+  if (!import_typescript9.default.isArrowFunction(callback) && !import_typescript9.default.isFunctionExpression(callback))
     return false;
   return containsJsxDeep(callback.body);
 }
 function containsJsxDeep(node) {
-  if (import_typescript8.default.isJsxElement(node) || import_typescript8.default.isJsxSelfClosingElement(node) || import_typescript8.default.isJsxFragment(node))
+  if (import_typescript9.default.isJsxElement(node) || import_typescript9.default.isJsxSelfClosingElement(node) || import_typescript9.default.isJsxFragment(node))
     return true;
   let found = false;
   node.forEachChild((child) => {
@@ -191742,11 +191807,11 @@ function nodeContainsArrow(node) {
   function visit2(n) {
     if (found)
       return;
-    if (import_typescript8.default.isArrowFunction(n) || import_typescript8.default.isFunctionExpression(n)) {
+    if (import_typescript9.default.isArrowFunction(n) || import_typescript9.default.isFunctionExpression(n)) {
       found = true;
       return;
     }
-    import_typescript8.default.forEachChild(n, visit2);
+    import_typescript9.default.forEachChild(n, visit2);
   }
   visit2(node);
   return found;
@@ -191794,20 +191859,20 @@ function collectModuleScopeReactive(decl, ctx, isExported) {
   }));
 }
 function getSystemConstructKind(node) {
-  if (import_typescript8.default.isCallExpression(node) && import_typescript8.default.isIdentifier(node.expression) && node.expression.text === "createContext")
+  if (import_typescript9.default.isCallExpression(node) && import_typescript9.default.isIdentifier(node.expression) && node.expression.text === "createContext")
     return "createContext";
-  if (import_typescript8.default.isNewExpression(node) && import_typescript8.default.isIdentifier(node.expression) && node.expression.text === "WeakMap")
+  if (import_typescript9.default.isNewExpression(node) && import_typescript9.default.isIdentifier(node.expression) && node.expression.text === "WeakMap")
     return "weakMap";
   return;
 }
 function collectConstant(node, ctx, _isModule, declarationKind = "const", isExported = false) {
-  if (!_isModule && import_typescript8.default.isObjectBindingPattern(node.name) && node.initializer && import_typescript8.default.isIdentifier(node.initializer) && ctx.propsObjectName === node.initializer.text) {
+  if (!_isModule && import_typescript9.default.isObjectBindingPattern(node.name) && node.initializer && import_typescript9.default.isIdentifier(node.initializer) && ctx.propsObjectName === node.initializer.text) {
     const propsName = node.initializer.text;
     for (const el of node.name.elements) {
-      if (!import_typescript8.default.isBindingElement(el) || !import_typescript8.default.isIdentifier(el.name) || el.dotDotDotToken)
+      if (!import_typescript9.default.isBindingElement(el) || !import_typescript9.default.isIdentifier(el.name) || el.dotDotDotToken)
         continue;
       const localName = el.name.text;
-      const sourceKey = el.propertyName && import_typescript8.default.isIdentifier(el.propertyName) ? el.propertyName.text : localName;
+      const sourceKey = el.propertyName && import_typescript9.default.isIdentifier(el.propertyName) ? el.propertyName.text : localName;
       const defaultValueExpr = el.initializer ? ctx.getJS(el.initializer) : undefined;
       const baseValue = `${propsName}.${sourceKey}`;
       const value2 = defaultValueExpr ? `${baseValue} ?? ${defaultValueExpr}` : baseValue;
@@ -191827,7 +191892,7 @@ function collectConstant(node, ctx, _isModule, declarationKind = "const", isExpo
     }
     return;
   }
-  if (!import_typescript8.default.isIdentifier(node.name))
+  if (!import_typescript9.default.isIdentifier(node.name))
     return;
   if (isSignalDeclaration(node, ctx) || isMemoDeclaration(node, ctx))
     return;
@@ -191845,9 +191910,9 @@ function collectConstant(node, ctx, _isModule, declarationKind = "const", isExpo
   let isJsxFunction = false;
   if (node.initializer) {
     let init = node.initializer;
-    while (import_typescript8.default.isParenthesizedExpression(init))
+    while (import_typescript9.default.isParenthesizedExpression(init))
       init = init.expression;
-    if (import_typescript8.default.isJsxElement(init) || import_typescript8.default.isJsxSelfClosingElement(init) || import_typescript8.default.isJsxFragment(init)) {
+    if (import_typescript9.default.isJsxElement(init) || import_typescript9.default.isJsxSelfClosingElement(init) || import_typescript9.default.isJsxFragment(init)) {
       isJsx = true;
       ctx.jsxConstants.set(name, init);
     } else if (initializerShapeContainsJsx(init)) {
@@ -191855,9 +191920,9 @@ function collectConstant(node, ctx, _isModule, declarationKind = "const", isExpo
     } else if (isMapLikeCallWithJsx(init)) {
       ctx.inlineableJsxConsts.set(name, init);
     }
-    if (import_typescript8.default.isArrowFunction(init)) {
+    if (import_typescript9.default.isArrowFunction(init)) {
       const arrowBody = init.body;
-      if (import_typescript8.default.isBlock(arrowBody)) {
+      if (import_typescript9.default.isBlock(arrowBody)) {
         const jsxReturn = extractSingleJsxReturn(arrowBody);
         if (jsxReturn) {
           isJsxFunction = true;
@@ -191877,9 +191942,9 @@ function collectConstant(node, ctx, _isModule, declarationKind = "const", isExpo
         }
       } else {
         let body = arrowBody;
-        while (import_typescript8.default.isParenthesizedExpression(body))
+        while (import_typescript9.default.isParenthesizedExpression(body))
           body = body.expression;
-        if (import_typescript8.default.isJsxElement(body) || import_typescript8.default.isJsxSelfClosingElement(body) || import_typescript8.default.isJsxFragment(body)) {
+        if (import_typescript9.default.isJsxElement(body) || import_typescript9.default.isJsxSelfClosingElement(body) || import_typescript9.default.isJsxFragment(body)) {
           isJsxFunction = true;
           ctx.jsxFunctions.set(name, {
             jsxReturn: body,
@@ -191892,9 +191957,9 @@ function collectConstant(node, ctx, _isModule, declarationKind = "const", isExpo
   let valueBranches;
   if (node.initializer) {
     let inner = node.initializer;
-    while (import_typescript8.default.isParenthesizedExpression(inner))
+    while (import_typescript9.default.isParenthesizedExpression(inner))
       inner = inner.expression;
-    if (import_typescript8.default.isConditionalExpression(inner)) {
+    if (import_typescript9.default.isConditionalExpression(inner)) {
       valueBranches = extractValueBranches(node.initializer, ctx);
     }
   }
@@ -191910,8 +191975,10 @@ function collectConstant(node, ctx, _isModule, declarationKind = "const", isExpo
   let templateValue;
   if (value && ctx.propsParams.length > 0 && node.initializer) {
     let propNames;
+    let propAliases;
     if (!ctx.propsObjectName) {
       propNames = new Set(ctx.propsParams.map((p) => p.name));
+      propAliases = buildPropAliasMap(ctx.propsParams);
     } else {
       const shadowedByNonAlias = new Set;
       for (const s of ctx.signals) {
@@ -191932,7 +191999,7 @@ function collectConstant(node, ctx, _isModule, declarationKind = "const", isExpo
       propNames = new Set([...aliases].filter((n) => !shadowedByNonAlias.has(n)));
     }
     if (propNames.size > 0) {
-      const rewritten = rewriteBarePropRefs(value, node.initializer, propNames);
+      const rewritten = rewriteBarePropRefs(value, node.initializer, propNames, undefined, propAliases);
       if (rewritten !== undefined) {
         templateValue = rewritten;
         if (ctx.propsObjectName) {
@@ -191947,6 +192014,7 @@ function collectConstant(node, ctx, _isModule, declarationKind = "const", isExpo
     value,
     parsed,
     typedValue: typedValue !== value ? typedValue : undefined,
+    typeAnnotation: node.type ? node.type.getText(ctx.sourceFile) : undefined,
     valueBranches,
     declarationKind,
     isExported,
@@ -191969,7 +192037,7 @@ function collectConstant(node, ctx, _isModule, declarationKind = "const", isExpo
 function hasIgnoreDirective(node, sourceFile, ruleId) {
   const checkComments = (targetNode) => {
     const fullStart = targetNode.getFullStart();
-    const leadingComments = import_typescript8.default.getLeadingCommentRanges(sourceFile.getFullText(), fullStart);
+    const leadingComments = import_typescript9.default.getLeadingCommentRanges(sourceFile.getFullText(), fullStart);
     if (!leadingComments)
       return false;
     for (const range of leadingComments) {
@@ -191982,10 +192050,10 @@ function hasIgnoreDirective(node, sourceFile, ruleId) {
   };
   if (checkComments(node))
     return true;
-  if (import_typescript8.default.isArrowFunction(node)) {
+  if (import_typescript9.default.isArrowFunction(node)) {
     let current = node.parent;
     while (current) {
-      if (import_typescript8.default.isVariableStatement(current)) {
+      if (import_typescript9.default.isVariableStatement(current)) {
         if (checkComments(current))
           return true;
         break;
@@ -191996,7 +192064,7 @@ function hasIgnoreDirective(node, sourceFile, ruleId) {
   return false;
 }
 function extractProps(param, ctx) {
-  if (import_typescript8.default.isObjectBindingPattern(param.name)) {
+  if (import_typescript9.default.isObjectBindingPattern(param.name)) {
     const componentNode = ctx.componentNode;
     const ignored = !!(componentNode && hasIgnoreDirective(componentNode, ctx.sourceFile, "props-destructuring"));
     ctx.propsDestructuring = {
@@ -192005,22 +192073,24 @@ function extractProps(param, ctx) {
     };
     const memberTypes = param.type ? collectMemberTypes(param.type, ctx) : null;
     for (const element of param.name.elements) {
-      if (import_typescript8.default.isBindingElement(element) && import_typescript8.default.isIdentifier(element.name)) {
+      if (import_typescript9.default.isBindingElement(element) && import_typescript9.default.isIdentifier(element.name)) {
         const localName = element.name.text;
         const defaultValue = element.initializer ? ctx.getJS(element.initializer) : undefined;
         if (element.dotDotDotToken) {
           ctx.restPropsName = localName;
           continue;
         }
-        const sourcePropName = element.propertyName && import_typescript8.default.isIdentifier(element.propertyName) ? element.propertyName.text : localName;
+        const sourcePropName = element.propertyName && import_typescript9.default.isIdentifier(element.propertyName) ? element.propertyName.text : localName;
         const member = memberTypes?.get(sourcePropName);
         const resolvedType = member?.type ?? { kind: "unknown", raw: "unknown" };
         const defaultContainsArrow = element.initializer ? nodeContainsArrow(element.initializer) : false;
+        const parsedDefault = element.initializer ? tsNodeToParsedExpr(element.initializer) : undefined;
         ctx.propsParams.push({
           name: localName,
           type: resolvedType,
           optional: !!member?.optional || !!element.initializer,
           defaultValue,
+          ...parsedDefault && parsedDefault.kind !== "unsupported" && { parsed: parsedDefault },
           defaultContainsArrow: defaultContainsArrow || undefined,
           ...sourcePropName !== localName && { sourceName: sourcePropName }
         });
@@ -192034,7 +192104,7 @@ function extractProps(param, ctx) {
       }
     }
   }
-  if (import_typescript8.default.isIdentifier(param.name)) {
+  if (import_typescript9.default.isIdentifier(param.name)) {
     ctx.propsObjectName = param.name.text;
     if (param.type) {
       extractPropsFromType(param.type, ctx);
@@ -192045,24 +192115,24 @@ function extractProps(param, ctx) {
   }
 }
 function collectTypeKeys(typeNode, ctx) {
-  if (import_typescript8.default.isTypeLiteralNode(typeNode)) {
+  if (import_typescript9.default.isTypeLiteralNode(typeNode)) {
     return collectKeysFromMembers(typeNode.members, ctx);
   }
-  if (import_typescript8.default.isTypeReferenceNode(typeNode)) {
+  if (import_typescript9.default.isTypeReferenceNode(typeNode)) {
     const typeName = typeNode.typeName.getText(ctx.sourceFile);
     const typeDecl = findTypeDeclaration(typeName, ctx.sourceFile);
     if (!typeDecl)
       return null;
-    if (import_typescript8.default.isInterfaceDeclaration(typeDecl)) {
+    if (import_typescript9.default.isInterfaceDeclaration(typeDecl)) {
       if (typeDecl.heritageClauses && typeDecl.heritageClauses.length > 0)
         return null;
       return collectKeysFromMembers(typeDecl.members, ctx);
     }
-    if (import_typescript8.default.isTypeAliasDeclaration(typeDecl)) {
-      if (import_typescript8.default.isTypeLiteralNode(typeDecl.type)) {
+    if (import_typescript9.default.isTypeAliasDeclaration(typeDecl)) {
+      if (import_typescript9.default.isTypeLiteralNode(typeDecl.type)) {
         return collectKeysFromMembers(typeDecl.type.members, ctx);
       }
-      if (import_typescript8.default.isIntersectionTypeNode(typeDecl.type)) {
+      if (import_typescript9.default.isIntersectionTypeNode(typeDecl.type)) {
         return null;
       }
     }
@@ -192072,9 +192142,9 @@ function collectTypeKeys(typeNode, ctx) {
 function collectKeysFromMembers(members, ctx) {
   const keys = [];
   for (const member of members) {
-    if (import_typescript8.default.isIndexSignatureDeclaration(member))
+    if (import_typescript9.default.isIndexSignatureDeclaration(member))
       return null;
-    if (import_typescript8.default.isPropertySignature(member) && member.name) {
+    if (import_typescript9.default.isPropertySignature(member) && member.name) {
       keys.push(member.name.getText(ctx.sourceFile));
     }
   }
@@ -192085,7 +192155,7 @@ function collectMemberTypes(typeNode, ctx) {
   const fromMembers = (members) => {
     const map = new Map;
     for (const member of members) {
-      if (import_typescript8.default.isPropertySignature(member) && member.name) {
+      if (import_typescript9.default.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,
@@ -192095,35 +192165,35 @@ function collectMemberTypes(typeNode, ctx) {
     }
     return map;
   };
-  if (import_typescript8.default.isTypeLiteralNode(typeNode)) {
+  if (import_typescript9.default.isTypeLiteralNode(typeNode)) {
     return fromMembers(typeNode.members);
   }
-  if (import_typescript8.default.isTypeReferenceNode(typeNode)) {
+  if (import_typescript9.default.isTypeReferenceNode(typeNode)) {
     const typeName = typeNode.typeName.getText(ctx.sourceFile);
     const typeDecl = findTypeDeclaration(typeName, ctx.sourceFile);
     if (!typeDecl)
       return null;
-    if (import_typescript8.default.isInterfaceDeclaration(typeDecl)) {
+    if (import_typescript9.default.isInterfaceDeclaration(typeDecl)) {
       return fromMembers(typeDecl.members);
     }
-    if (import_typescript8.default.isTypeAliasDeclaration(typeDecl) && import_typescript8.default.isTypeLiteralNode(typeDecl.type)) {
+    if (import_typescript9.default.isTypeAliasDeclaration(typeDecl) && import_typescript9.default.isTypeLiteralNode(typeDecl.type)) {
       return fromMembers(typeDecl.type.members);
     }
   }
   return null;
 }
 function extractPropsFromType(typeNode, ctx) {
-  if (import_typescript8.default.isTypeLiteralNode(typeNode)) {
+  if (import_typescript9.default.isTypeLiteralNode(typeNode)) {
     extractPropsFromTypeMembers(typeNode.members, ctx);
     return;
   }
-  if (import_typescript8.default.isTypeReferenceNode(typeNode)) {
+  if (import_typescript9.default.isTypeReferenceNode(typeNode)) {
     const typeName = typeNode.typeName.getText(ctx.sourceFile);
     const typeDecl = findTypeDeclaration(typeName, ctx.sourceFile);
     if (typeDecl) {
-      if (import_typescript8.default.isInterfaceDeclaration(typeDecl)) {
+      if (import_typescript9.default.isInterfaceDeclaration(typeDecl)) {
         extractPropsFromTypeMembers(typeDecl.members, ctx);
-      } else if (import_typescript8.default.isTypeAliasDeclaration(typeDecl) && import_typescript8.default.isTypeLiteralNode(typeDecl.type)) {
+      } else if (import_typescript9.default.isTypeAliasDeclaration(typeDecl) && import_typescript9.default.isTypeLiteralNode(typeDecl.type)) {
         extractPropsFromTypeMembers(typeDecl.type.members, ctx);
       }
     }
@@ -192131,7 +192201,7 @@ function extractPropsFromType(typeNode, ctx) {
 }
 function extractPropsFromTypeMembers(members, ctx) {
   for (const member of members) {
-    if (import_typescript8.default.isPropertySignature(member) && member.name) {
+    if (import_typescript9.default.isPropertySignature(member) && member.name) {
       const propName = member.name.getText(ctx.sourceFile);
       const isOptional = !!member.questionToken;
       const propType = member.type ? typeNodeToTypeInfo(member.type, ctx.sourceFile) : { kind: "unknown", raw: "unknown" };
@@ -192147,17 +192217,17 @@ function extractPropsFromTypeMembers(members, ctx) {
 function findTypeDeclaration(typeName, sourceFile) {
   let result;
   function visit2(node) {
-    if (import_typescript8.default.isInterfaceDeclaration(node) && node.name.text === typeName) {
+    if (import_typescript9.default.isInterfaceDeclaration(node) && node.name.text === typeName) {
       result = node;
       return;
     }
-    if (import_typescript8.default.isTypeAliasDeclaration(node) && node.name.text === typeName) {
+    if (import_typescript9.default.isTypeAliasDeclaration(node) && node.name.text === typeName) {
       result = node;
       return;
     }
-    import_typescript8.default.forEachChild(node, visit2);
+    import_typescript9.default.forEachChild(node, visit2);
   }
-  import_typescript8.default.forEachChild(sourceFile, visit2);
+  import_typescript9.default.forEachChild(sourceFile, visit2);
   return result;
 }
 function inferTypeFromValue(value) {
@@ -192201,17 +192271,28 @@ function inferTypeFromValue(value) {
   }
   return { kind: "unknown", raw: "unknown" };
 }
+function collectCalledIdentifiers(code2) {
+  const called = new Set;
+  const sf = import_typescript9.default.createSourceFile("__deps__.tsx", code2, import_typescript9.default.ScriptTarget.Latest, false, import_typescript9.default.ScriptKind.TSX);
+  const visit2 = (node) => {
+    if (import_typescript9.default.isCallExpression(node) && import_typescript9.default.isIdentifier(node.expression)) {
+      called.add(node.expression.text);
+    }
+    import_typescript9.default.forEachChild(node, visit2);
+  };
+  visit2(sf);
+  return called;
+}
 function extractDependencies(code2, ctx) {
+  const called = collectCalledIdentifiers(code2);
   const deps = [];
   for (const signal of ctx.signals) {
-    const pattern = new RegExp(`\\b${signal.getter}\\s*\\(`, "g");
-    if (pattern.test(code2)) {
+    if (called.has(signal.getter)) {
       deps.push(signal.getter);
     }
   }
   for (const memo of ctx.memos) {
-    const pattern = new RegExp(`\\b${memo.name}\\s*\\(`, "g");
-    if (pattern.test(code2)) {
+    if (called.has(memo.name)) {
       deps.push(memo.name);
     }
   }
@@ -192294,16 +192375,16 @@ function isResolvableComponentSource(source) {
 function collectJsxComponentTags(sourceFile) {
   const tags = new Set;
   function visit2(node) {
-    if (import_typescript8.default.isJsxOpeningElement(node) || import_typescript8.default.isJsxSelfClosingElement(node)) {
+    if (import_typescript9.default.isJsxOpeningElement(node) || import_typescript9.default.isJsxSelfClosingElement(node)) {
       const tagName = node.tagName;
-      if (import_typescript8.default.isIdentifier(tagName)) {
+      if (import_typescript9.default.isIdentifier(tagName)) {
         const first = tagName.text.charAt(0);
         if (first >= "A" && first <= "Z") {
           tags.add(tagName.text);
         }
       }
     }
-    import_typescript8.default.forEachChild(node, visit2);
+    import_typescript9.default.forEachChild(node, visit2);
   }
   visit2(sourceFile);
   return tags;
@@ -192382,18 +192463,18 @@ function fileHasUseClientDirective(filePath) {
   } catch {
     return true;
   }
-  const sf = import_typescript8.default.createSourceFile(filePath, content, import_typescript8.default.ScriptTarget.Latest, false, import_typescript8.default.ScriptKind.TSX);
+  const sf = import_typescript9.default.createSourceFile(filePath, content, import_typescript9.default.ScriptTarget.Latest, false, import_typescript9.default.ScriptKind.TSX);
   let found = false;
   function visit2(node) {
     if (found)
       return;
-    if (import_typescript8.default.isExpressionStatement(node) && import_typescript8.default.isStringLiteral(node.expression)) {
+    if (import_typescript9.default.isExpressionStatement(node) && import_typescript9.default.isStringLiteral(node.expression)) {
       if (node.expression.text === "use client") {
         found = true;
         return;
       }
     }
-    import_typescript8.default.forEachChild(node, visit2);
+    import_typescript9.default.forEachChild(node, visit2);
   }
   visit2(sf);
   return found;
@@ -192478,13 +192559,13 @@ var REACTIVE_PRIMITIVES = new Set([
   "onCleanup"
 ]);
 function prescanReactiveFactoriesInSource(source, filePath) {
-  const sourceFile = import_typescript8.default.createSourceFile(filePath + ".prescan", source, import_typescript8.default.ScriptTarget.Latest, true, import_typescript8.default.ScriptKind.TSX);
+  const sourceFile = import_typescript9.default.createSourceFile(filePath + ".prescan", source, import_typescript9.default.ScriptTarget.Latest, true, import_typescript9.default.ScriptKind.TSX);
   const factories = new Map;
   const declined = new Map;
   const reactiveShaped = new Set;
   const cleanFactoryImports = new Set;
   function visitTop(node) {
-    if (import_typescript8.default.isFunctionDeclaration(node) && node.name && node.body) {
+    if (import_typescript9.default.isFunctionDeclaration(node) && node.name && node.body) {
       const det = detectReactiveFactory(node, sourceFile, filePath);
       if (!det)
         return;
@@ -192501,7 +192582,7 @@ function prescanReactiveFactoriesInSource(source, filePath) {
       }
     }
   }
-  import_typescript8.default.forEachChild(sourceFile, visitTop);
+  import_typescript9.default.forEachChild(sourceFile, visitTop);
   const result = { factories, declined, reactiveShaped, cleanFactoryImports, sourceFile };
   prescanImportedReactiveFactories(sourceFile, filePath, result);
   return result;
@@ -192518,15 +192599,15 @@ function toComponentRelativeSpecifier(resolvedAbs, componentFilePath) {
 function buildEntryImportIndex(sf, filePath) {
   const index = new Map;
   for (const stmt of sf.statements) {
-    if (!import_typescript8.default.isImportDeclaration(stmt))
+    if (!import_typescript9.default.isImportDeclaration(stmt))
       continue;
-    if (!import_typescript8.default.isStringLiteral(stmt.moduleSpecifier))
+    if (!import_typescript9.default.isStringLiteral(stmt.moduleSpecifier))
       continue;
     const src = stmt.moduleSpecifier.text;
     const targetKey = src.startsWith("./") || src.startsWith("../") ? resolveRelativeImportToFile(src, filePath) ?? "unresolved:" + src : src;
     const wholeTypeOnly = stmt.importClause?.isTypeOnly === true;
     const namedBindings = stmt.importClause?.namedBindings;
-    if (namedBindings && import_typescript8.default.isNamedImports(namedBindings)) {
+    if (namedBindings && import_typescript9.default.isNamedImports(namedBindings)) {
       for (const el of namedBindings.elements) {
         index.set(el.name.text, {
           targetKey,
@@ -192541,31 +192622,31 @@ function buildEntryImportIndex(sf, filePath) {
 function collectEntryBindingNames(sf) {
   const names = new Set;
   function visit2(node) {
-    if (import_typescript8.default.isImportDeclaration(node) && node.importClause) {
+    if (import_typescript9.default.isImportDeclaration(node) && node.importClause) {
       if (node.importClause.name)
         names.add(node.importClause.name.text);
       const namedBindings = node.importClause.namedBindings;
-      if (namedBindings && import_typescript8.default.isNamedImports(namedBindings)) {
+      if (namedBindings && import_typescript9.default.isNamedImports(namedBindings)) {
         for (const el of namedBindings.elements)
           names.add(el.name.text);
       }
-      if (namedBindings && import_typescript8.default.isNamespaceImport(namedBindings)) {
+      if (namedBindings && import_typescript9.default.isNamespaceImport(namedBindings)) {
         names.add(namedBindings.name.text);
       }
     }
-    if (import_typescript8.default.isVariableDeclaration(node)) {
+    if (import_typescript9.default.isVariableDeclaration(node)) {
       const out = [];
       addBindingNames(node.name, out);
       for (const n of out)
         names.add(n);
     }
-    if ((import_typescript8.default.isFunctionDeclaration(node) || import_typescript8.default.isClassDeclaration(node) || import_typescript8.default.isEnumDeclaration(node)) && node.name) {
+    if ((import_typescript9.default.isFunctionDeclaration(node) || import_typescript9.default.isClassDeclaration(node) || import_typescript9.default.isEnumDeclaration(node)) && node.name) {
       names.add(node.name.text);
     }
-    if ((import_typescript8.default.isTypeAliasDeclaration(node) || import_typescript8.default.isInterfaceDeclaration(node)) && node.name) {
+    if ((import_typescript9.default.isTypeAliasDeclaration(node) || import_typescript9.default.isInterfaceDeclaration(node)) && node.name) {
       names.add(node.name.text);
     }
-    if (import_typescript8.default.isFunctionLike(node)) {
+    if (import_typescript9.default.isFunctionLike(node)) {
       for (const p of node.parameters) {
         const out = [];
         addBindingNames(p.name, out);
@@ -192573,7 +192654,7 @@ function collectEntryBindingNames(sf) {
           names.add(n);
       }
     }
-    import_typescript8.default.forEachChild(node, visit2);
+    import_typescript9.default.forEachChild(node, visit2);
   }
   visit2(sf);
   return names;
@@ -192582,19 +192663,19 @@ var MAX_REEXPORT_HOPS = 1;
 function prescanImportedReactiveFactories(entrySourceFile, filePath, result) {
   const candidateCallees = new Set;
   function collectCandidates(node) {
-    if (import_typescript8.default.isVariableDeclaration(node) && (import_typescript8.default.isArrayBindingPattern(node.name) || import_typescript8.default.isObjectBindingPattern(node.name)) && node.initializer && import_typescript8.default.isCallExpression(node.initializer) && import_typescript8.default.isIdentifier(node.initializer.expression)) {
+    if (import_typescript9.default.isVariableDeclaration(node) && (import_typescript9.default.isArrayBindingPattern(node.name) || import_typescript9.default.isObjectBindingPattern(node.name)) && node.initializer && import_typescript9.default.isCallExpression(node.initializer) && import_typescript9.default.isIdentifier(node.initializer.expression)) {
       candidateCallees.add(node.initializer.expression.text);
     }
-    import_typescript8.default.forEachChild(node, collectCandidates);
+    import_typescript9.default.forEachChild(node, collectCandidates);
   }
   collectCandidates(entrySourceFile);
   if (candidateCallees.size === 0)
     return;
   const importsToCheck = [];
   for (const stmt of entrySourceFile.statements) {
-    if (!import_typescript8.default.isImportDeclaration(stmt))
+    if (!import_typescript9.default.isImportDeclaration(stmt))
       continue;
-    if (!import_typescript8.default.isStringLiteral(stmt.moduleSpecifier))
+    if (!import_typescript9.default.isStringLiteral(stmt.moduleSpecifier))
       continue;
     const src = stmt.moduleSpecifier.text;
     if (!src.startsWith("./") && !src.startsWith("../"))
@@ -192602,7 +192683,7 @@ function prescanImportedReactiveFactories(entrySourceFile, filePath, result) {
     if (stmt.importClause?.isTypeOnly)
       continue;
     const namedBindings = stmt.importClause?.namedBindings;
-    if (!namedBindings || !import_typescript8.default.isNamedImports(namedBindings))
+    if (!namedBindings || !import_typescript9.default.isNamedImports(namedBindings))
       continue;
     const specs = [];
     for (const el of namedBindings.elements) {
@@ -192640,14 +192721,14 @@ function prescanImportedReactiveFactories(entrySourceFile, filePath, result) {
       helperCache.set(abs, "clean");
       return "clean";
     }
-    const sf = import_typescript8.default.createSourceFile(abs + ".prescan", content, import_typescript8.default.ScriptTarget.Latest, true, import_typescript8.default.ScriptKind.TSX);
+    const sf = import_typescript9.default.createSourceFile(abs + ".prescan", content, import_typescript9.default.ScriptTarget.Latest, true, import_typescript9.default.ScriptKind.TSX);
     const localFns = new Map;
     const exportedFns = new Map;
     for (const stmt of sf.statements) {
-      if (import_typescript8.default.isFunctionDeclaration(stmt) && stmt.name && stmt.body) {
+      if (import_typescript9.default.isFunctionDeclaration(stmt) && stmt.name && stmt.body) {
         localFns.set(stmt.name.text, stmt);
-        const hasExportModifier = stmt.modifiers?.some((m) => m.kind === import_typescript8.default.SyntaxKind.ExportKeyword) ?? false;
-        const hasDefaultModifier = stmt.modifiers?.some((m) => m.kind === import_typescript8.default.SyntaxKind.DefaultKeyword) ?? false;
+        const hasExportModifier = stmt.modifiers?.some((m) => m.kind === import_typescript9.default.SyntaxKind.ExportKeyword) ?? false;
+        const hasDefaultModifier = stmt.modifiers?.some((m) => m.kind === import_typescript9.default.SyntaxKind.DefaultKeyword) ?? false;
         if (hasExportModifier && !hasDefaultModifier) {
           exportedFns.set(stmt.name.text, stmt);
         }
@@ -192656,10 +192737,10 @@ function prescanImportedReactiveFactories(entrySourceFile, filePath, result) {
     const reexports = new Map;
     let hasStarReexport = false;
     for (const stmt of sf.statements) {
-      if (!import_typescript8.default.isExportDeclaration(stmt) || stmt.isTypeOnly)
+      if (!import_typescript9.default.isExportDeclaration(stmt) || stmt.isTypeOnly)
         continue;
       if (!stmt.moduleSpecifier) {
-        if (stmt.exportClause && import_typescript8.default.isNamedExports(stmt.exportClause)) {
+        if (stmt.exportClause && import_typescript9.default.isNamedExports(stmt.exportClause)) {
           for (const el of stmt.exportClause.elements) {
             if (el.isTypeOnly)
               continue;
@@ -192670,9 +192751,9 @@ function prescanImportedReactiveFactories(entrySourceFile, filePath, result) {
         }
         continue;
       }
-      if (!import_typescript8.default.isStringLiteral(stmt.moduleSpecifier))
+      if (!import_typescript9.default.isStringLiteral(stmt.moduleSpecifier))
         continue;
-      if (stmt.exportClause && import_typescript8.default.isNamedExports(stmt.exportClause)) {
+      if (stmt.exportClause && import_typescript9.default.isNamedExports(stmt.exportClause)) {
         for (const el of stmt.exportClause.elements) {
           if (el.isTypeOnly)
             continue;
@@ -192822,7 +192903,7 @@ function collectHelperModuleValueBindings(sf) {
   const importedTypes = new Map;
   const imported = new Map;
   for (const stmt of sf.statements) {
-    if (import_typescript8.default.isVariableStatement(stmt)) {
+    if (import_typescript9.default.isVariableStatement(stmt)) {
       const out = [];
       for (const decl of stmt.declarationList.declarations) {
         addBindingNames(decl.name, out);
@@ -192831,16 +192912,16 @@ function collectHelperModuleValueBindings(sf) {
         local.add(n);
       continue;
     }
-    if ((import_typescript8.default.isFunctionDeclaration(stmt) || import_typescript8.default.isClassDeclaration(stmt) || import_typescript8.default.isEnumDeclaration(stmt)) && stmt.name) {
+    if ((import_typescript9.default.isFunctionDeclaration(stmt) || import_typescript9.default.isClassDeclaration(stmt) || import_typescript9.default.isEnumDeclaration(stmt)) && stmt.name) {
       local.add(stmt.name.text);
       continue;
     }
-    if ((import_typescript8.default.isTypeAliasDeclaration(stmt) || import_typescript8.default.isInterfaceDeclaration(stmt)) && stmt.name) {
+    if ((import_typescript9.default.isTypeAliasDeclaration(stmt) || import_typescript9.default.isInterfaceDeclaration(stmt)) && stmt.name) {
       localTypes.add(stmt.name.text);
       continue;
     }
-    if (import_typescript8.default.isImportDeclaration(stmt)) {
-      if (!import_typescript8.default.isStringLiteral(stmt.moduleSpecifier))
+    if (import_typescript9.default.isImportDeclaration(stmt)) {
+      if (!import_typescript9.default.isStringLiteral(stmt.moduleSpecifier))
         continue;
       const src = stmt.moduleSpecifier.text;
       if (src === "@barefootjs/client" || src === "@barefootjs/client/runtime")
@@ -192849,7 +192930,7 @@ function collectHelperModuleValueBindings(sf) {
       if (stmt.importClause?.name)
         (wholeTypeOnly ? localTypes : local).add(stmt.importClause.name.text);
       const namedBindings = stmt.importClause?.namedBindings;
-      if (namedBindings && import_typescript8.default.isNamedImports(namedBindings)) {
+      if (namedBindings && import_typescript9.default.isNamedImports(namedBindings)) {
         for (const el of namedBindings.elements) {
           const entry = { source: src, exportedName: (el.propertyName ?? el.name).text };
           if (wholeTypeOnly || el.isTypeOnly)
@@ -192858,7 +192939,7 @@ function collectHelperModuleValueBindings(sf) {
             imported.set(el.name.text, entry);
         }
       }
-      if (namedBindings && import_typescript8.default.isNamespaceImport(namedBindings)) {
+      if (namedBindings && import_typescript9.default.isNamespaceImport(namedBindings)) {
         (wholeTypeOnly ? localTypes : local).add(namedBindings.name.text);
       }
     }
@@ -192925,11 +193006,11 @@ function detectReactiveFactory(node, sourceFile, filePath) {
   function checkForReactive(n) {
     if (hasReactiveCall)
       return;
-    if (import_typescript8.default.isCallExpression(n) && import_typescript8.default.isIdentifier(n.expression) && REACTIVE_PRIMITIVES.has(n.expression.text)) {
+    if (import_typescript9.default.isCallExpression(n) && import_typescript9.default.isIdentifier(n.expression) && REACTIVE_PRIMITIVES.has(n.expression.text)) {
       hasReactiveCall = true;
       return;
     }
-    import_typescript8.default.forEachChild(n, checkForReactive);
+    import_typescript9.default.forEachChild(n, checkForReactive);
   }
   checkForReactive(node.body);
   if (!hasReactiveCall)
@@ -192937,29 +193018,29 @@ function detectReactiveFactory(node, sourceFile, filePath) {
   const loc = getSourceLocation(node, sourceFile, filePath);
   let totalReturnCount = 0;
   function countReturns(n) {
-    if (import_typescript8.default.isFunctionLike(n))
+    if (import_typescript9.default.isFunctionLike(n))
       return;
-    if (import_typescript8.default.isReturnStatement(n)) {
+    if (import_typescript9.default.isReturnStatement(n)) {
       totalReturnCount++;
       return;
     }
-    import_typescript8.default.forEachChild(n, countReturns);
+    import_typescript9.default.forEachChild(n, countReturns);
   }
-  import_typescript8.default.forEachChild(node.body, countReturns);
+  import_typescript9.default.forEachChild(node.body, countReturns);
   let returnExpr = null;
   let returnCount = 0;
   for (const stmt of node.body.statements) {
-    if (!import_typescript8.default.isReturnStatement(stmt))
+    if (!import_typescript9.default.isReturnStatement(stmt))
       continue;
     returnCount++;
     if (!stmt.expression)
       return { kind: "reactive-shaped" };
     let expr = stmt.expression;
-    while (import_typescript8.default.isParenthesizedExpression(expr))
+    while (import_typescript9.default.isParenthesizedExpression(expr))
       expr = expr.expression;
-    if (import_typescript8.default.isAsExpression(expr))
+    if (import_typescript9.default.isAsExpression(expr))
       expr = expr.expression;
-    if (import_typescript8.default.isTypeAssertionExpression(expr))
+    if (import_typescript9.default.isTypeAssertionExpression(expr))
       expr = expr.expression;
     returnExpr = expr;
   }
@@ -192967,18 +193048,18 @@ function detectReactiveFactory(node, sourceFile, filePath) {
     return { kind: "reactive-shaped" };
   const returnTupleIdentifiers = [];
   let returnKind;
-  if (import_typescript8.default.isArrayLiteralExpression(returnExpr)) {
+  if (import_typescript9.default.isArrayLiteralExpression(returnExpr)) {
     returnKind = "tuple";
     for (const el of returnExpr.elements) {
-      if (!import_typescript8.default.isIdentifier(el))
+      if (!import_typescript9.default.isIdentifier(el))
         return { kind: "reactive-shaped" };
       returnTupleIdentifiers.push(el.text);
     }
     if (returnTupleIdentifiers.length === 0)
       return { kind: "reactive-shaped" };
-  } else if (import_typescript8.default.isObjectLiteralExpression(returnExpr)) {
+  } else if (import_typescript9.default.isObjectLiteralExpression(returnExpr)) {
     returnKind = "object";
-    const hasNonShorthand = returnExpr.properties.some((p) => !import_typescript8.default.isShorthandPropertyAssignment(p));
+    const hasNonShorthand = returnExpr.properties.some((p) => !import_typescript9.default.isShorthandPropertyAssignment(p));
     if (hasNonShorthand) {
       return {
         kind: "declined",
@@ -192999,7 +193080,7 @@ function detectReactiveFactory(node, sourceFile, filePath) {
   }
   const params = [];
   for (const p of node.parameters) {
-    if (import_typescript8.default.isIdentifier(p.name)) {
+    if (import_typescript9.default.isIdentifier(p.name)) {
       params.push(p.name.text);
       continue;
     }
@@ -193007,11 +193088,11 @@ function detectReactiveFactory(node, sourceFile, filePath) {
   }
   const localBindings = [];
   for (const stmt of node.body.statements) {
-    if (import_typescript8.default.isVariableStatement(stmt)) {
+    if (import_typescript9.default.isVariableStatement(stmt)) {
       for (const decl of stmt.declarationList.declarations) {
         addBindingNames(decl.name, localBindings);
       }
-    } else if (import_typescript8.default.isFunctionDeclaration(stmt) && stmt.name) {
+    } else if (import_typescript9.default.isFunctionDeclaration(stmt) && stmt.name) {
       localBindings.push(stmt.name.text);
     }
   }
@@ -193031,47 +193112,47 @@ function detectReactiveFactory(node, sourceFile, filePath) {
       if (!relevantNames.has(id.text))
         return;
       const p = id.parent;
-      if (import_typescript8.default.isPropertyAccessExpression(p) && p.name === id)
+      if (import_typescript9.default.isPropertyAccessExpression(p) && p.name === id)
         return;
-      if (import_typescript8.default.isPropertyAssignment(p) && p.name === id)
+      if (import_typescript9.default.isPropertyAssignment(p) && p.name === id)
         return;
-      if (import_typescript8.default.isBindingElement(p) && p.propertyName === id)
+      if (import_typescript9.default.isBindingElement(p) && p.propertyName === id)
         return;
-      if ((import_typescript8.default.isMethodDeclaration(p) || import_typescript8.default.isGetAccessorDeclaration(p) || import_typescript8.default.isSetAccessorDeclaration(p) || import_typescript8.default.isPropertyDeclaration(p) || import_typescript8.default.isEnumMember(p)) && p.name === id)
+      if ((import_typescript9.default.isMethodDeclaration(p) || import_typescript9.default.isGetAccessorDeclaration(p) || import_typescript9.default.isSetAccessorDeclaration(p) || import_typescript9.default.isPropertyDeclaration(p) || import_typescript9.default.isEnumMember(p)) && p.name === id)
         return;
-      if (import_typescript8.default.isJsxAttribute(p) && p.name === id)
+      if (import_typescript9.default.isJsxAttribute(p) && p.name === id)
         return;
-      if (import_typescript8.default.isLabeledStatement(p) && p.label === id || (import_typescript8.default.isBreakStatement(p) || import_typescript8.default.isContinueStatement(p)) && p.label === id)
+      if (import_typescript9.default.isLabeledStatement(p) && p.label === id || (import_typescript9.default.isBreakStatement(p) || import_typescript9.default.isContinueStatement(p)) && p.label === id)
         return;
-      if ((import_typescript8.default.isJsxOpeningElement(p) || import_typescript8.default.isJsxSelfClosingElement(p) || import_typescript8.default.isJsxClosingElement(p)) && p.tagName === id && /^[a-z]/.test(id.text))
+      if ((import_typescript9.default.isJsxOpeningElement(p) || import_typescript9.default.isJsxSelfClosingElement(p) || import_typescript9.default.isJsxClosingElement(p)) && p.tagName === id && /^[a-z]/.test(id.text))
         return;
-      if (import_typescript8.default.isShorthandPropertyAssignment(p) && p.name === id) {
+      if (import_typescript9.default.isShorthandPropertyAssignment(p) && p.name === id) {
         push(id, "shorthand");
         return;
       }
-      if (import_typescript8.default.isBindingElement(p) && p.name === id && !p.propertyName && import_typescript8.default.isObjectBindingPattern(p.parent)) {
+      if (import_typescript9.default.isBindingElement(p) && p.name === id && !p.propertyName && import_typescript9.default.isObjectBindingPattern(p.parent)) {
         if (params.includes(id.text))
           shadowedParam = id.text;
         push(id, "shorthand");
         return;
       }
-      const isDecl = (import_typescript8.default.isVariableDeclaration(p) || import_typescript8.default.isParameter(p) || import_typescript8.default.isBindingElement(p) || import_typescript8.default.isFunctionDeclaration(p) || import_typescript8.default.isFunctionExpression(p) || import_typescript8.default.isClassDeclaration(p) || import_typescript8.default.isClassExpression(p)) && p.name === id;
+      const isDecl = (import_typescript9.default.isVariableDeclaration(p) || import_typescript9.default.isParameter(p) || import_typescript9.default.isBindingElement(p) || import_typescript9.default.isFunctionDeclaration(p) || import_typescript9.default.isFunctionExpression(p) || import_typescript9.default.isClassDeclaration(p) || import_typescript9.default.isClassExpression(p)) && p.name === id;
       if (isDecl && params.includes(id.text))
         shadowedParam = id.text;
       push(id, "plain");
     }
     function visit2(n) {
-      if (import_typescript8.default.isTypeNode(n) || import_typescript8.default.isTypeParameterDeclaration(n) || import_typescript8.default.isTypeAliasDeclaration(n) || import_typescript8.default.isInterfaceDeclaration(n))
+      if (import_typescript9.default.isTypeNode(n) || import_typescript9.default.isTypeParameterDeclaration(n) || import_typescript9.default.isTypeAliasDeclaration(n) || import_typescript9.default.isInterfaceDeclaration(n))
         return;
-      if (import_typescript8.default.isIdentifier(n)) {
+      if (import_typescript9.default.isIdentifier(n)) {
         classify(n);
         return;
       }
-      import_typescript8.default.forEachChild(n, visit2);
+      import_typescript9.default.forEachChild(n, visit2);
     }
     visit2(root);
   }
-  const keptStatements = node.body.statements.filter((s) => !import_typescript8.default.isReturnStatement(s));
+  const keptStatements = node.body.statements.filter((s) => !import_typescript9.default.isReturnStatement(s));
   const pieces = [];
   let base = 0;
   for (const stmt of keptStatements) {
@@ -193119,18 +193200,18 @@ function detectReactiveFactory(node, sourceFile, filePath) {
   };
 }
 function addBindingNames(name, out) {
-  if (import_typescript8.default.isIdentifier(name)) {
+  if (import_typescript9.default.isIdentifier(name)) {
     out.push(name.text);
     return;
   }
-  if (import_typescript8.default.isObjectBindingPattern(name)) {
+  if (import_typescript9.default.isObjectBindingPattern(name)) {
     for (const el of name.elements)
       addBindingNames(el.name, out);
     return;
   }
-  if (import_typescript8.default.isArrayBindingPattern(name)) {
+  if (import_typescript9.default.isArrayBindingPattern(name)) {
     for (const el of name.elements) {
-      if (import_typescript8.default.isOmittedExpression(el))
+      if (import_typescript9.default.isOmittedExpression(el))
         continue;
       addBindingNames(el.name, out);
     }
@@ -193142,33 +193223,33 @@ function rewriteFactoryCallsInSource(source, prescan) {
   let callSiteIndex = 0;
   const inlinedFactories = new Set;
   function visitStmt(node, inComponent) {
-    if (import_typescript8.default.isVariableStatement(node) && inComponent) {
+    if (import_typescript9.default.isVariableStatement(node) && inComponent) {
       for (const decl of node.declarationList.declarations) {
         maybeRewriteDecl(node, decl);
       }
     }
-    import_typescript8.default.forEachChild(node, (child) => {
-      if (import_typescript8.default.isFunctionDeclaration(child) && child.name && factories.has(child.name.text))
+    import_typescript9.default.forEachChild(node, (child) => {
+      if (import_typescript9.default.isFunctionDeclaration(child) && child.name && factories.has(child.name.text))
         return;
       visitStmt(child, inComponent || isPascalCaseComponentFn(child));
     });
   }
   function maybeRewriteDecl(stmt, decl) {
-    if (!decl.initializer || !import_typescript8.default.isCallExpression(decl.initializer))
+    if (!decl.initializer || !import_typescript9.default.isCallExpression(decl.initializer))
       return;
-    if (!import_typescript8.default.isIdentifier(decl.initializer.expression))
+    if (!import_typescript9.default.isIdentifier(decl.initializer.expression))
       return;
     const factoryName = decl.initializer.expression.text;
     const factory = factories.get(factoryName);
     if (!factory)
       return;
-    if (import_typescript8.default.isArrayBindingPattern(decl.name)) {
+    if (import_typescript9.default.isArrayBindingPattern(decl.name)) {
       if (factory.returnKind !== "tuple")
         return;
       rewriteTupleDecl(stmt, decl.name, decl.initializer, factory);
       return;
     }
-    if (import_typescript8.default.isObjectBindingPattern(decl.name)) {
+    if (import_typescript9.default.isObjectBindingPattern(decl.name)) {
       if (factory.returnKind !== "object")
         return;
       rewriteObjectDecl(stmt, decl.name, decl.initializer, factory);
@@ -193181,7 +193262,7 @@ function rewriteFactoryCallsInSource(source, prescan) {
       return;
     const callerNames = [];
     for (const el of elements) {
-      if (import_typescript8.default.isOmittedExpression(el) || !import_typescript8.default.isIdentifier(el.name))
+      if (import_typescript9.default.isOmittedExpression(el) || !import_typescript9.default.isIdentifier(el.name))
         return;
       callerNames.push(el.name.text);
     }
@@ -193203,7 +193284,7 @@ function rewriteFactoryCallsInSource(source, prescan) {
         return;
       if (el.initializer)
         return;
-      if (!import_typescript8.default.isIdentifier(el.name))
+      if (!import_typescript9.default.isIdentifier(el.name))
         return;
       if (!factory.returnTupleIdentifiers.includes(el.name.text))
         return;
@@ -193312,21 +193393,21 @@ function factoryImportInsertionOffset(sf) {
   let lastImportEnd = -1;
   let directiveEnd = -1;
   for (const stmt of sf.statements) {
-    if (import_typescript8.default.isImportDeclaration(stmt)) {
+    if (import_typescript9.default.isImportDeclaration(stmt)) {
       lastImportEnd = stmt.getEnd();
       continue;
     }
-    if (directiveEnd === -1 && import_typescript8.default.isExpressionStatement(stmt) && import_typescript8.default.isStringLiteral(stmt.expression) && stmt.expression.text === "use client") {
+    if (directiveEnd === -1 && import_typescript9.default.isExpressionStatement(stmt) && import_typescript9.default.isStringLiteral(stmt.expression) && stmt.expression.text === "use client") {
       directiveEnd = stmt.getEnd();
     }
   }
   return lastImportEnd >= 0 ? lastImportEnd : directiveEnd >= 0 ? directiveEnd : 0;
 }
 function isPascalCaseComponentFn(node) {
-  if (import_typescript8.default.isFunctionDeclaration(node) && node.name) {
+  if (import_typescript9.default.isFunctionDeclaration(node) && node.name) {
     return /^[A-Z]/.test(node.name.text);
   }
-  if (import_typescript8.default.isVariableDeclaration(node) && import_typescript8.default.isIdentifier(node.name) && node.initializer && import_typescript8.default.isArrowFunction(node.initializer)) {
+  if (import_typescript9.default.isVariableDeclaration(node) && import_typescript9.default.isIdentifier(node.name) && node.initializer && import_typescript9.default.isArrowFunction(node.initializer)) {
     return /^[A-Z]/.test(node.name.text);
   }
   return false;
@@ -193355,20 +193436,20 @@ function declinedFactoryErrorCode(code2) {
 function validateReactiveFactoryCalls(ctx) {
   if (!ctx.componentNode)
     return;
-  const body = import_typescript8.default.isFunctionDeclaration(ctx.componentNode) ? ctx.componentNode.body : import_typescript8.default.isBlock(ctx.componentNode.body) ? ctx.componentNode.body : null;
+  const body = import_typescript9.default.isFunctionDeclaration(ctx.componentNode) ? ctx.componentNode.body : import_typescript9.default.isBlock(ctx.componentNode.body) ? ctx.componentNode.body : null;
   if (!body)
     return;
   for (const stmt of body.statements) {
-    if (!import_typescript8.default.isVariableStatement(stmt))
+    if (!import_typescript9.default.isVariableStatement(stmt))
       continue;
     for (const decl of stmt.declarationList.declarations) {
-      if (!decl.initializer || !import_typescript8.default.isCallExpression(decl.initializer))
+      if (!decl.initializer || !import_typescript9.default.isCallExpression(decl.initializer))
         continue;
-      if (!import_typescript8.default.isIdentifier(decl.initializer.expression))
+      if (!import_typescript9.default.isIdentifier(decl.initializer.expression))
         continue;
       const callee = decl.initializer.expression.text;
       const loc = getSourceLocation(stmt, ctx.sourceFile, ctx.filePath);
-      if (import_typescript8.default.isArrayBindingPattern(decl.name)) {
+      if (import_typescript9.default.isArrayBindingPattern(decl.name)) {
         if (callee === "createSignal" || callee === "createMemo")
           continue;
         if (resolveEnvSignalKey(decl.initializer, ctx))
@@ -193395,7 +193476,7 @@ function validateReactiveFactoryCalls(ctx) {
         }));
         continue;
       }
-      if (import_typescript8.default.isObjectBindingPattern(decl.name)) {
+      if (import_typescript9.default.isObjectBindingPattern(decl.name)) {
         validateObjectFactoryDestructure(ctx, decl.name, callee, loc);
       }
     }
@@ -193411,7 +193492,7 @@ function validateObjectFactoryDestructure(ctx, pattern, callee, loc) {
       }));
       return;
     }
-    const hasUnsupportedElement = pattern.elements.some((el) => !!el.propertyName || !!el.initializer || !!el.dotDotDotToken || !import_typescript8.default.isIdentifier(el.name));
+    const hasUnsupportedElement = pattern.elements.some((el) => !!el.propertyName || !!el.initializer || !!el.dotDotDotToken || !import_typescript9.default.isIdentifier(el.name));
     if (hasUnsupportedElement) {
       ctx.errors.push(createError(ErrorCodes.REACTIVE_FACTORY_RENAME_UNSUPPORTED, loc, {
         severity: "error",
@@ -193419,7 +193500,7 @@ function validateObjectFactoryDestructure(ctx, pattern, callee, loc) {
       }));
       return;
     }
-    const unknown = pattern.elements.map((el) => import_typescript8.default.isIdentifier(el.name) ? el.name.text : "").filter((name) => name && !factory.returnTupleIdentifiers.includes(name));
+    const unknown = pattern.elements.map((el) => import_typescript9.default.isIdentifier(el.name) ? el.name.text : "").filter((name) => name && !factory.returnTupleIdentifiers.includes(name));
     if (unknown.length > 0) {
       const label = unknown.length === 1 ? "property" : "properties";
       ctx.errors.push(createError(ErrorCodes.UNRECOGNIZED_REACTIVE_FACTORY, loc, {
@@ -193463,7 +193544,7 @@ function validateObjectFactoryDestructure(ctx, pattern, callee, loc) {
 }
 
 // ../jsx/src/jsx-to-ir.ts
-var import_typescript11 = __toESM(require_typescript(), 1);
+var import_typescript12 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/types.ts
 var SCOPE_FORBIDDEN = {
@@ -193577,7 +193658,7 @@ function isClientBuiltinName(name) {
 }
 
 // ../jsx/src/reactivity-checker.ts
-var import_typescript9 = __toESM(require_typescript(), 1);
+var import_typescript10 = __toESM(require_typescript(), 1);
 var REACTIVE_BRAND = "__reactive";
 function queryType(checker, node) {
   incrementCounter("typeCheckerQueries");
@@ -193595,7 +193676,7 @@ function safeGetText(node) {
   }
 }
 function analyze(node, checker) {
-  if (import_typescript9.default.isPropertyAccessExpression(node)) {
+  if (import_typescript10.default.isPropertyAccessExpression(node)) {
     try {
       const type2 = queryType(checker, node);
       if (isReactiveType(type2)) {
@@ -193619,7 +193700,7 @@ function analyze(node, checker) {
     }
     return NOT_REACTIVE;
   }
-  if (import_typescript9.default.isIdentifier(node)) {
+  if (import_typescript10.default.isIdentifier(node)) {
     try {
       const type2 = queryType(checker, node);
       if (isReactiveType(type2)) {
@@ -193631,7 +193712,7 @@ function analyze(node, checker) {
     } catch {}
     return NOT_REACTIVE;
   }
-  if (import_typescript9.default.isCallExpression(node)) {
+  if (import_typescript10.default.isCallExpression(node)) {
     try {
       const calleeType = queryType(checker, node.expression);
       if (isReactiveType(calleeType)) {
@@ -193644,7 +193725,7 @@ function analyze(node, checker) {
   }
   let foundChild;
   let foundChildText = "";
-  import_typescript9.default.forEachChild(node, (child) => {
+  import_typescript10.default.forEachChild(node, (child) => {
     if (foundChild?.isReactive)
       return;
     const result = analyze(child, checker);
@@ -193673,7 +193754,7 @@ function containsReactiveExpression(node, checker) {
 }
 
 // ../jsx/src/free-refs.ts
-var import_typescript10 = __toESM(require_typescript(), 1);
+var import_typescript11 = __toESM(require_typescript(), 1);
 var _bindingMapCache = new WeakMap;
 function buildBindingMap(env) {
   const cached = _bindingMapCache.get(env);
@@ -193741,20 +193822,20 @@ function defaultBindingScope(kind) {
 function collectIdentifiers2(node) {
   const out = [];
   const visit2 = (n, parent) => {
-    if (import_typescript10.default.isIdentifier(n)) {
-      if (parent && import_typescript10.default.isPropertyAccessExpression(parent) && parent.name === n)
+    if (import_typescript11.default.isIdentifier(n)) {
+      if (parent && import_typescript11.default.isPropertyAccessExpression(parent) && parent.name === n)
         return;
-      if (parent && import_typescript10.default.isPropertyAssignment(parent) && parent.name === n)
+      if (parent && import_typescript11.default.isPropertyAssignment(parent) && parent.name === n)
         return;
-      if (parent && (import_typescript10.default.isJsxOpeningElement(parent) || import_typescript10.default.isJsxClosingElement(parent) || import_typescript10.default.isJsxSelfClosingElement(parent)) && parent.tagName === n) {
+      if (parent && (import_typescript11.default.isJsxOpeningElement(parent) || import_typescript11.default.isJsxClosingElement(parent) || import_typescript11.default.isJsxSelfClosingElement(parent)) && parent.tagName === n) {
         return;
       }
-      if (parent && import_typescript10.default.isJsxAttribute(parent) && parent.name === n)
+      if (parent && import_typescript11.default.isJsxAttribute(parent) && parent.name === n)
         return;
       out.push(n);
       return;
     }
-    import_typescript10.default.forEachChild(n, (child) => visit2(child, n));
+    import_typescript11.default.forEachChild(n, (child) => visit2(child, n));
   };
   visit2(node);
   return out;
@@ -193763,7 +193844,7 @@ function collectReactiveBrandRefs(node, checker) {
   const out = [];
   const seen = new Set;
   const visit2 = (n) => {
-    if (import_typescript10.default.isPropertyAccessExpression(n)) {
+    if (import_typescript11.default.isPropertyAccessExpression(n)) {
       try {
         const type2 = checker.getTypeAtLocation(n);
         if (isReactiveType(type2)) {
@@ -193781,7 +193862,7 @@ function collectReactiveBrandRefs(node, checker) {
         incrementCounter("freeRefsTypeLookupFailures");
       }
     }
-    import_typescript10.default.forEachChild(n, visit2);
+    import_typescript11.default.forEachChild(n, visit2);
   };
   visit2(node);
   return out;
@@ -193791,14 +193872,14 @@ function resolveConstantInitializerRefs(c, env, visited) {
     return [];
   if (c.containsArrow)
     return [];
-  const sf = import_typescript10.default.createSourceFile("__const_init.ts", `const __probe = (${c.value});`, import_typescript10.default.ScriptTarget.Latest, true);
+  const sf = import_typescript11.default.createSourceFile("__const_init.ts", `const __probe = (${c.value});`, import_typescript11.default.ScriptTarget.Latest, true);
   const stmt = sf.statements[0];
-  if (!stmt || !import_typescript10.default.isVariableStatement(stmt))
+  if (!stmt || !import_typescript11.default.isVariableStatement(stmt))
     return [];
   const decl = stmt.declarationList.declarations[0];
   if (!decl || !decl.initializer)
     return [];
-  const expr = import_typescript10.default.isParenthesizedExpression(decl.initializer) ? decl.initializer.expression : decl.initializer;
+  const expr = import_typescript11.default.isParenthesizedExpression(decl.initializer) ? decl.initializer.expression : decl.initializer;
   return resolveFreeRefsInternal(expr, env, visited);
 }
 function resolveFreeRefsInternal(node, env, visited) {
@@ -193810,7 +193891,7 @@ function resolveFreeRefsInternal(node, env, visited) {
     const name = ident.text;
     if (env.propsObjectName === name) {
       const parent = ident.parent;
-      if (parent && import_typescript10.default.isPropertyAccessExpression(parent) && parent.expression === ident && parent.name.text === "children") {
+      if (parent && import_typescript11.default.isPropertyAccessExpression(parent) && parent.expression === ident && parent.name.text === "children") {
         continue;
       }
     }
@@ -194213,6 +194294,83 @@ var toLocaleDatePlugin = {
   }
 };
 
+// ../jsx/src/scope/binding-scope.ts
+class BindingScope {
+  frames;
+  static EMPTY = new BindingScope([]);
+  constructor(frames) {
+    this.frames = frames;
+  }
+  enterLoopRow(loop) {
+    const bindings = new Map;
+    if (loop.paramBindings && loop.paramBindings.length > 0) {
+      for (const b of loop.paramBindings)
+        bindings.set(b.name, { source: "destructure" });
+    } else {
+      bindings.set(loop.param, { source: "item" });
+    }
+    if (loop.index != null)
+      bindings.set(loop.index, { source: "index" });
+    for (const name of loop.preamble?.declaredNames ?? [])
+      bindings.set(name, { source: "preamble" });
+    const frame = { kind: "loop-row", bindings };
+    return new BindingScope([frame, ...this.frames]);
+  }
+  enterCallback(params) {
+    const bindings = new Map;
+    for (const name of params)
+      bindings.set(name, { source: "param" });
+    const frame = { kind: "callback", bindings };
+    return new BindingScope([frame, ...this.frames]);
+  }
+  isBound(name) {
+    for (const frame of this.frames) {
+      if (frame.bindings.has(name))
+        return true;
+    }
+    return false;
+  }
+  lookup(name) {
+    for (let depth = 0;depth < this.frames.length; depth++) {
+      const frame = this.frames[depth];
+      const binding = frame.bindings.get(name);
+      if (binding)
+        return { depth, frame, binding };
+    }
+    return null;
+  }
+  boundNames() {
+    if (this.boundNamesCache)
+      return this.boundNamesCache;
+    const names = new Set;
+    for (const frame of this.frames) {
+      for (const name of frame.bindings.keys())
+        names.add(name);
+    }
+    this.boundNamesCache = names;
+    return names;
+  }
+  boundNamesCache;
+  valueBoundNamesCache;
+  valueBoundNames() {
+    if (this.valueBoundNamesCache)
+      return this.valueBoundNamesCache;
+    const names = new Set;
+    for (const frame of this.frames) {
+      for (const [name, binding] of frame.bindings) {
+        if (binding.source === "item" || binding.source === "index" || binding.source === "destructure") {
+          names.add(name);
+        }
+      }
+    }
+    this.valueBoundNamesCache = names;
+    return names;
+  }
+  asShadowPredicate() {
+    return (name) => this.isBound(name);
+  }
+}
+
 // ../jsx/src/jsx-to-ir.ts
 var CLIENT_DIRECTIVE_INTERIOR_RE2 = /^\s*@client\s*$/;
 var BLOCK_COMMENT_RE2 = /\/\*([\s\S]*?)\*\//g;
@@ -194238,13 +194396,13 @@ function exprCallsReactiveGetters(expr, ctx) {
   function visit2(n) {
     if (found)
       return;
-    if (import_typescript11.default.isCallExpression(n) && import_typescript11.default.isIdentifier(n.expression)) {
+    if (import_typescript12.default.isCallExpression(n) && import_typescript12.default.isIdentifier(n.expression)) {
       if (names.has(n.expression.text)) {
         found = true;
         return;
       }
     }
-    import_typescript11.default.forEachChild(n, visit2);
+    import_typescript12.default.forEachChild(n, visit2);
   }
   visit2(expr);
   return found;
@@ -194271,11 +194429,11 @@ function exprReferencesModuleClientSignal(expr, ctx) {
   function visit2(n) {
     if (found)
       return;
-    if (import_typescript11.default.isCallExpression(n) && import_typescript11.default.isIdentifier(n.expression) && names.has(n.expression.text)) {
+    if (import_typescript12.default.isCallExpression(n) && import_typescript12.default.isIdentifier(n.expression) && names.has(n.expression.text)) {
       found = true;
       return;
     }
-    import_typescript11.default.forEachChild(n, visit2);
+    import_typescript12.default.forEachChild(n, visit2);
   }
   visit2(expr);
   return found;
@@ -194285,11 +194443,11 @@ function exprHasFunctionCalls(expr) {
   function visit2(n) {
     if (found)
       return;
-    if (import_typescript11.default.isCallExpression(n)) {
+    if (import_typescript12.default.isCallExpression(n)) {
       found = true;
       return;
     }
-    import_typescript11.default.forEachChild(n, visit2);
+    import_typescript12.default.forEachChild(n, visit2);
   }
   visit2(expr);
   return found;
@@ -194326,10 +194484,10 @@ function lowerDateCalls(text, expr, ctx) {
     return text;
   const candidates = [];
   function visit2(n) {
-    if (import_typescript11.default.isCallExpression(n) && n.arguments.length === 0 && import_typescript11.default.isPropertyAccessExpression(n.expression) && !n.expression.questionDotToken && DATE_METHODS.has(n.expression.name.text)) {
+    if (import_typescript12.default.isCallExpression(n) && n.arguments.length === 0 && import_typescript12.default.isPropertyAccessExpression(n.expression) && !n.expression.questionDotToken && DATE_METHODS.has(n.expression.name.text)) {
       candidates.push(n);
     }
-    import_typescript11.default.forEachChild(n, visit2);
+    import_typescript12.default.forEachChild(n, visit2);
   }
   visit2(expr);
   if (candidates.length === 0)
@@ -194354,10 +194512,10 @@ function lowerToLocaleDateCalls(text, expr, ctx) {
     return text;
   const candidates = [];
   function visit2(n) {
-    if (import_typescript11.default.isCallExpression(n) && n.arguments.length === 2 && import_typescript11.default.isPropertyAccessExpression(n.expression) && !n.expression.questionDotToken && n.expression.name.text === "toLocaleDateString") {
+    if (import_typescript12.default.isCallExpression(n) && n.arguments.length === 2 && import_typescript12.default.isPropertyAccessExpression(n.expression) && !n.expression.questionDotToken && n.expression.name.text === "toLocaleDateString") {
       candidates.push(n);
     }
-    import_typescript11.default.forEachChild(n, visit2);
+    import_typescript12.default.forEachChild(n, visit2);
   }
   visit2(expr);
   if (candidates.length === 0)
@@ -194393,14 +194551,16 @@ function rewriteBarePropRefs2(text, expr, ctx) {
   let propNames = getDestructuredPropNames(ctx);
   if (!propNames)
     return dateLowered === text ? undefined : dateLowered;
-  if (ctx.loopParams.size > 0) {
-    const filtered = new Set([...propNames].filter((n) => !ctx.loopParams.has(n)));
+  const shadowingNames = ctx.scope.boundNames();
+  if (shadowingNames.size > 0) {
+    const filtered = new Set([...propNames].filter((n) => !shadowingNames.has(n)));
     if (filtered.size === 0)
       return dateLowered === text ? undefined : dateLowered;
     propNames = filtered;
   }
   const extraPropRefs = collectBranchLocalPropRefsViaSubstitution(expr, ctx);
-  return rewriteBarePropRefs(dateLowered, expr, propNames, extraPropRefs);
+  const propAliases = getDestructuredPropAliases(ctx);
+  return rewriteBarePropRefs(dateLowered, expr, propNames, extraPropRefs, propAliases ?? undefined);
 }
 function collectBranchLocalPropRefsViaSubstitution(node, ctx) {
   const propDepsMap = ctx._branchScopePropDeps;
@@ -194409,10 +194569,10 @@ function collectBranchLocalPropRefsViaSubstitution(node, ctx) {
     return;
   let acc;
   function visit2(n, parent) {
-    if (import_typescript11.default.isIdentifier(n) && propDepsMap.has(n.text)) {
-      const isObjectKey = parent && import_typescript11.default.isPropertyAssignment(parent) && parent.name === n;
-      const isShorthand = parent && import_typescript11.default.isShorthandPropertyAssignment(parent) && parent.name === n;
-      const isAccessName = parent && import_typescript11.default.isPropertyAccessExpression(parent) && parent.name === n;
+    if (import_typescript12.default.isIdentifier(n) && propDepsMap.has(n.text)) {
+      const isObjectKey = parent && import_typescript12.default.isPropertyAssignment(parent) && parent.name === n;
+      const isShorthand = parent && import_typescript12.default.isShorthandPropertyAssignment(parent) && parent.name === n;
+      const isAccessName = parent && import_typescript12.default.isPropertyAccessExpression(parent) && parent.name === n;
       if (!isObjectKey && !isShorthand && !isAccessName) {
         const deps = propDepsMap.get(n.text);
         if (deps && deps.size > 0) {
@@ -194423,7 +194583,7 @@ function collectBranchLocalPropRefsViaSubstitution(node, ctx) {
         }
       }
     }
-    import_typescript11.default.forEachChild(n, (child) => visit2(child, n));
+    import_typescript12.default.forEachChild(n, (child) => visit2(child, n));
   }
   visit2(node);
   return acc;
@@ -194445,11 +194605,18 @@ function getDestructuredPropNames(ctx) {
           shadowed.add(c.name);
       }
     }
-    const names = ctx.analyzer.propsParams.map((p) => p.name).filter((n) => !shadowed.has(n));
+    const eligible = ctx.analyzer.propsParams.filter((p) => !shadowed.has(p.name));
+    const names = eligible.map((p) => p.name);
     ctx._destructuredPropNames = names.length > 0 ? new Set(names) : null;
+    ctx._destructuredPropAliases = buildPropAliasMap(eligible) ?? null;
   }
   return ctx._destructuredPropNames ?? null;
 }
+function getDestructuredPropAliases(ctx) {
+  if (ctx._destructuredPropNames === undefined)
+    getDestructuredPropNames(ctx);
+  return ctx._destructuredPropAliases ?? null;
+}
 function createTransformContext(analyzer) {
   return {
     analyzer,
@@ -194462,7 +194629,7 @@ function createTransformContext(analyzer) {
     spreadIdCounter: 0,
     isRoot: true,
     insideComponentChildren: false,
-    loopParams: new Set,
+    scope: BindingScope.EMPTY,
     loopDepth: 0,
     patterns: {
       signals: analyzer.signals.map((s) => ({
@@ -194492,21 +194659,21 @@ function createTransformContext(analyzer) {
 function buildComponentNamespaces(ctx) {
   const result = new Map;
   for (const stmt of ctx.sourceFile.statements) {
-    if (!import_typescript11.default.isVariableStatement(stmt))
+    if (!import_typescript12.default.isVariableStatement(stmt))
       continue;
     for (const decl of stmt.declarationList.declarations) {
-      if (!decl.initializer || !import_typescript11.default.isIdentifier(decl.name))
+      if (!decl.initializer || !import_typescript12.default.isIdentifier(decl.name))
         continue;
       let init = decl.initializer;
-      while (import_typescript11.default.isParenthesizedExpression(init))
+      while (import_typescript12.default.isParenthesizedExpression(init))
         init = init.expression;
-      if (!import_typescript11.default.isObjectLiteralExpression(init))
+      if (!import_typescript12.default.isObjectLiteralExpression(init))
         continue;
       const members = new Map;
       for (const prop of init.properties) {
-        if (import_typescript11.default.isShorthandPropertyAssignment(prop)) {
+        if (import_typescript12.default.isShorthandPropertyAssignment(prop)) {
           members.set(prop.name.text, prop.name.text);
-        } else if (import_typescript11.default.isPropertyAssignment(prop) && (import_typescript11.default.isIdentifier(prop.name) || import_typescript11.default.isStringLiteral(prop.name)) && import_typescript11.default.isIdentifier(prop.initializer)) {
+        } else if (import_typescript12.default.isPropertyAssignment(prop) && (import_typescript12.default.isIdentifier(prop.name) || import_typescript12.default.isStringLiteral(prop.name)) && import_typescript12.default.isIdentifier(prop.initializer)) {
           members.set(prop.name.text, prop.initializer.text);
         }
       }
@@ -194518,11 +194685,11 @@ function buildComponentNamespaces(ctx) {
   return result;
 }
 function resolveMemberExpressionTag(tagNode, ctx) {
-  if (!import_typescript11.default.isPropertyAccessExpression(tagNode))
+  if (!import_typescript12.default.isPropertyAccessExpression(tagNode))
     return null;
-  if (!import_typescript11.default.isIdentifier(tagNode.expression))
+  if (!import_typescript12.default.isIdentifier(tagNode.expression))
     return null;
-  if (!import_typescript11.default.isIdentifier(tagNode.name))
+  if (!import_typescript12.default.isIdentifier(tagNode.name))
     return null;
   if (!ctx._componentNamespaces) {
     ctx._componentNamespaces = buildComponentNamespaces(ctx);
@@ -194539,7 +194706,8 @@ function generateSpreadSlotId(ctx) {
   return `Spread_${ctx.spreadIdCounter++}`;
 }
 function makeBindingEnv(ctx) {
-  const loopKey = ctx.loopParams.size === 0 ? "" : Array.from(ctx.loopParams).sort().join("\x00");
+  const boundNames = ctx.scope.valueBoundNames();
+  const loopKey = boundNames.size === 0 ? "" : Array.from(boundNames).sort().join("\x00");
   if (ctx._bindingEnv && ctx._bindingEnvLoopKey === loopKey) {
     return ctx._bindingEnv;
   }
@@ -194554,7 +194722,7 @@ function makeBindingEnv(ctx) {
     localFunctions: a.localFunctions,
     imports: a.imports,
     ambientGlobals: a.ambientGlobals,
-    loopParams: new Set(ctx.loopParams),
+    loopParams: boundNames,
     checker: a.checker
   };
   ctx._bindingEnv = env;
@@ -194678,7 +194846,7 @@ function buildIRRoot(analyzer) {
     return null;
   const ctx = createTransformContext(analyzer);
   const jsxReturn = analyzer.jsxReturn;
-  if (import_typescript11.default.isJsxElement(jsxReturn) || import_typescript11.default.isJsxSelfClosingElement(jsxReturn) || import_typescript11.default.isJsxFragment(jsxReturn)) {
+  if (import_typescript12.default.isJsxElement(jsxReturn) || import_typescript12.default.isJsxSelfClosingElement(jsxReturn) || import_typescript12.default.isJsxFragment(jsxReturn)) {
     const ir2 = transformNode(jsxReturn, ctx);
     if (ir2 && needsScopeWrapper(ir2)) {
       return wrapInScopeElement(ir2);
@@ -194734,22 +194902,22 @@ function wrapInScopeElement(node) {
   };
 }
 function transformNode(node, ctx) {
-  if (import_typescript11.default.isJsxElement(node)) {
+  if (import_typescript12.default.isJsxElement(node)) {
     return transformJsxElement(node, ctx);
   }
-  if (import_typescript11.default.isJsxSelfClosingElement(node)) {
+  if (import_typescript12.default.isJsxSelfClosingElement(node)) {
     return transformSelfClosingElement(node, ctx);
   }
-  if (import_typescript11.default.isJsxFragment(node)) {
+  if (import_typescript12.default.isJsxFragment(node)) {
     return transformFragment(node, ctx);
   }
-  if (import_typescript11.default.isJsxText(node)) {
+  if (import_typescript12.default.isJsxText(node)) {
     return transformText(node, ctx);
   }
-  if (import_typescript11.default.isJsxExpression(node)) {
+  if (import_typescript12.default.isJsxExpression(node)) {
     return transformExpression(node, ctx);
   }
-  if (import_typescript11.default.isConditionalExpression(node)) {
+  if (import_typescript12.default.isConditionalExpression(node)) {
     return transformConditional(node, ctx);
   }
   return null;
@@ -194850,17 +195018,23 @@ function lowerFormControlValueSsr(tagName, attrs, children) {
     });
     return;
   }
-  const selectedFor = (optValue) => AttrValueOf.expression(`(${expr}) === ${JSON.stringify(optValue)}`, templateExpr !== undefined ? { templateExpr: `(${templateExpr}) === ${JSON.stringify(optValue)}` } : undefined);
+  const selectedForLiteral = (optValue) => AttrValueOf.expression(`(${expr}) === ${JSON.stringify(optValue)}`, templateExpr !== undefined ? { templateExpr: `(${templateExpr}) === ${JSON.stringify(optValue)}` } : undefined);
+  const selectedForExpr = (optExpr, optTemplateExpr) => AttrValueOf.expression(`(${expr}) === (${optExpr})`, templateExpr !== undefined || optTemplateExpr !== undefined ? { templateExpr: `(${templateExpr ?? expr}) === (${optTemplateExpr ?? optExpr})` } : undefined);
   const distribute = (nodes) => {
     for (const n of nodes) {
       if (n.type === "element" && n.tag === "option") {
         if (n.attrs.some((a) => a.name === "selected"))
           continue;
         const optValue = n.attrs.find((a) => a.name === "value");
-        if (!optValue || optValue.value.kind !== "literal")
+        if (!optValue)
           continue;
-        n.attrs.push({ name: "selected", value: selectedFor(optValue.value.value), loc: n.loc });
-      } else if (n.type === "fragment" || n.type === "element" && n.tag === "optgroup") {
+        if (optValue.value.kind === "literal") {
+          n.attrs.push({ name: "selected", value: selectedForLiteral(optValue.value.value), loc: n.loc });
+        } else if (optValue.value.kind === "expression") {
+          const selected = selectedForExpr(optValue.value.expr, optValue.value.templateExpr);
+          n.attrs.push({ name: "selected", value: selected, loc: n.loc });
+        }
+      } else if (n.type === "fragment" || n.type === "loop" || n.type === "element" && n.tag === "optgroup") {
         distribute(n.children);
       }
     }
@@ -195100,7 +195274,7 @@ function transformSelfClosingComponent(node, ctx, name) {
 }
 function isTransparentFragment(node, ctx) {
   const children = node.children.filter((child2) => {
-    if (import_typescript11.default.isJsxText(child2)) {
+    if (import_typescript12.default.isJsxText(child2)) {
       return child2.text.trim() !== "";
     }
     return true;
@@ -195108,7 +195282,7 @@ function isTransparentFragment(node, ctx) {
   if (children.length !== 1)
     return false;
   const child = children[0];
-  if (!import_typescript11.default.isJsxExpression(child))
+  if (!import_typescript12.default.isJsxExpression(child))
     return false;
   if (!child.expression)
     return false;
@@ -195152,7 +195326,7 @@ function transformChildren(children, ctx) {
   const result = [];
   for (let i2 = 0;i2 < children.length; i2++) {
     const child = children[i2];
-    if (import_typescript11.default.isJsxExpression(child) && !child.expression) {
+    if (import_typescript12.default.isJsxExpression(child) && !child.expression) {
       continue;
     }
     const transformed = transformNode(child, ctx);
@@ -195167,10 +195341,10 @@ function transformChildren(children, ctx) {
 }
 function isRenderNothingLiteral(expr, ctx) {
   let e = expr;
-  while (import_typescript11.default.isParenthesizedExpression(e) || import_typescript11.default.isAsExpression(e) || import_typescript11.default.isSatisfiesExpression(e) || import_typescript11.default.isNonNullExpression(e)) {
+  while (import_typescript12.default.isParenthesizedExpression(e) || import_typescript12.default.isAsExpression(e) || import_typescript12.default.isSatisfiesExpression(e) || import_typescript12.default.isNonNullExpression(e)) {
     e = e.expression;
   }
-  return e.kind === import_typescript11.default.SyntaxKind.NullKeyword || e.kind === import_typescript11.default.SyntaxKind.TrueKeyword || e.kind === import_typescript11.default.SyntaxKind.FalseKeyword || import_typescript11.default.isIdentifier(e) && e.text === "undefined" && !isNameBound("undefined", makeBindingEnv(ctx));
+  return e.kind === import_typescript12.default.SyntaxKind.NullKeyword || e.kind === import_typescript12.default.SyntaxKind.TrueKeyword || e.kind === import_typescript12.default.SyntaxKind.FalseKeyword || import_typescript12.default.isIdentifier(e) && e.text === "undefined" && !isNameBound("undefined", makeBindingEnv(ctx));
 }
 function transformText(node, ctx) {
   const text = node.text.replace(/\s+/g, " ");
@@ -195196,7 +195370,7 @@ function transformExpressionInner(expr, ctx, node, isClientOnly) {
     return null;
   }
   checkBareSignalOrMemoIdentifier(expr, ctx);
-  if (import_typescript11.default.isIdentifier(expr)) {
+  if (import_typescript12.default.isIdentifier(expr)) {
     const jsxNode = ctx.analyzer.jsxConstants.get(expr.text);
     if (jsxNode) {
       return transformNode(jsxNode, ctx);
@@ -195241,7 +195415,8 @@ function transformExpressionInner(expr, ctx, node, isClientOnly) {
     freeRefs
   };
   const reactive = isReactiveExpression(exprText, ctx, expr) || isReactiveOrigin(origin);
-  const refsLoopParam = ctx.loopParams.size > 0 && Array.from(ctx.loopParams).some((p) => new RegExp(`\\b${p}\\b`).test(exprText));
+  const scopeValueNames = ctx.scope.valueBoundNames();
+  const refsLoopParam = scopeValueNames.size > 0 && Array.from(scopeValueNames).some((p) => new RegExp(`\\b${p}\\b`).test(exprText));
   const callsReactive = exprCallsReactiveGetters(expr, ctx);
   const hasCalls = exprHasFunctionCalls(expr);
   const needsSlot = reactive || isClientOnly || refsLoopParam || callsReactive || hasCalls;
@@ -195474,38 +195649,38 @@ function transformLogicalAnd(node, ctx) {
   };
 }
 function containsJsxInExpression(node) {
-  if (import_typescript11.default.isJsxElement(node) || import_typescript11.default.isJsxSelfClosingElement(node) || import_typescript11.default.isJsxFragment(node)) {
+  if (import_typescript12.default.isJsxElement(node) || import_typescript12.default.isJsxSelfClosingElement(node) || import_typescript12.default.isJsxFragment(node)) {
     return true;
   }
-  return import_typescript11.default.forEachChild(node, containsJsxInExpression) ?? false;
+  return import_typescript12.default.forEachChild(node, containsJsxInExpression) ?? false;
 }
 function callsJsxHelper(node, ctx) {
   let found = false;
   const visit2 = (n) => {
     if (found)
       return;
-    if (import_typescript11.default.isCallExpression(n) && import_typescript11.default.isIdentifier(n.expression)) {
+    if (import_typescript12.default.isCallExpression(n) && import_typescript12.default.isIdentifier(n.expression)) {
       const name = n.expression.text;
       if (ctx.analyzer.jsxFunctions.has(name) || ctx.analyzer.jsxMultiReturnFunctions.has(name)) {
         found = true;
         return;
       }
     }
-    import_typescript11.default.forEachChild(n, visit2);
+    import_typescript12.default.forEachChild(n, visit2);
   };
   visit2(node);
   return found;
 }
 function containsAwaitExpression(node) {
-  if (import_typescript11.default.isAwaitExpression(node))
+  if (import_typescript12.default.isAwaitExpression(node))
     return true;
-  if (import_typescript11.default.isFunctionDeclaration(node) || import_typescript11.default.isFunctionExpression(node) || import_typescript11.default.isArrowFunction(node))
+  if (import_typescript12.default.isFunctionDeclaration(node) || import_typescript12.default.isFunctionExpression(node) || import_typescript12.default.isArrowFunction(node))
     return false;
-  return import_typescript11.default.forEachChild(node, containsAwaitExpression) ?? false;
+  return import_typescript12.default.forEachChild(node, containsAwaitExpression) ?? false;
 }
 function transformNullishCoalescing(node, ctx) {
   const leftText = ctx.getJS(node.left);
-  const isNullish = node.operatorToken.kind === import_typescript11.default.SyntaxKind.QuestionQuestionToken;
+  const isNullish = node.operatorToken.kind === import_typescript12.default.SyntaxKind.QuestionQuestionToken;
   const condition = isNullish ? `${leftText} != null` : leftText;
   const leftOrigin = {
     phase: "tick",
@@ -195551,36 +195726,36 @@ function transformNullishCoalescing(node, ctx) {
 }
 function assertNever2(expr) {
   const kind = expr?.kind;
-  throw new Error(`transformJsxExpression: unhandled ts.SyntaxKind ${kind !== undefined ? import_typescript11.default.SyntaxKind[kind] : "unknown"} ` + `(kind=${kind}). Update spec/compiler.md Appendix A and the switch in jsx-to-ir.ts.`);
+  throw new Error(`transformJsxExpression: unhandled ts.SyntaxKind ${kind !== undefined ? import_typescript12.default.SyntaxKind[kind] : "unknown"} ` + `(kind=${kind}). Update spec/compiler.md Appendix A and the switch in jsx-to-ir.ts.`);
 }
 function transformJsxExpression(expr, ctx, isClientOnly = false) {
   const node = expr;
   switch (node.kind) {
-    case import_typescript11.default.SyntaxKind.ParenthesizedExpression:
-    case import_typescript11.default.SyntaxKind.AsExpression:
-    case import_typescript11.default.SyntaxKind.SatisfiesExpression:
-    case import_typescript11.default.SyntaxKind.NonNullExpression:
-    case import_typescript11.default.SyntaxKind.TypeAssertionExpression:
-    case import_typescript11.default.SyntaxKind.PartiallyEmittedExpression:
+    case import_typescript12.default.SyntaxKind.ParenthesizedExpression:
+    case import_typescript12.default.SyntaxKind.AsExpression:
+    case import_typescript12.default.SyntaxKind.SatisfiesExpression:
+    case import_typescript12.default.SyntaxKind.NonNullExpression:
+    case import_typescript12.default.SyntaxKind.TypeAssertionExpression:
+    case import_typescript12.default.SyntaxKind.PartiallyEmittedExpression:
       return transformJsxExpression(node.expression, ctx, isClientOnly);
-    case import_typescript11.default.SyntaxKind.JsxElement:
+    case import_typescript12.default.SyntaxKind.JsxElement:
       return transformJsxElement(node, ctx);
-    case import_typescript11.default.SyntaxKind.JsxFragment:
+    case import_typescript12.default.SyntaxKind.JsxFragment:
       return transformFragment(node, ctx);
-    case import_typescript11.default.SyntaxKind.JsxSelfClosingElement:
+    case import_typescript12.default.SyntaxKind.JsxSelfClosingElement:
       return transformSelfClosingElement(node, ctx);
-    case import_typescript11.default.SyntaxKind.ConditionalExpression:
+    case import_typescript12.default.SyntaxKind.ConditionalExpression:
       return transformConditional(node, ctx);
-    case import_typescript11.default.SyntaxKind.BinaryExpression: {
-      if (node.operatorToken.kind === import_typescript11.default.SyntaxKind.AmpersandAmpersandToken) {
+    case import_typescript12.default.SyntaxKind.BinaryExpression: {
+      if (node.operatorToken.kind === import_typescript12.default.SyntaxKind.AmpersandAmpersandToken) {
         return transformLogicalAnd(node, ctx);
       }
-      if ((node.operatorToken.kind === import_typescript11.default.SyntaxKind.QuestionQuestionToken || node.operatorToken.kind === import_typescript11.default.SyntaxKind.BarBarToken) && (containsJsxInExpression(node.right) || callsJsxHelper(node.right, ctx))) {
+      if ((node.operatorToken.kind === import_typescript12.default.SyntaxKind.QuestionQuestionToken || node.operatorToken.kind === import_typescript12.default.SyntaxKind.BarBarToken) && (containsJsxInExpression(node.right) || callsJsxHelper(node.right, ctx))) {
         return transformNullishCoalescing(node, ctx);
       }
       return null;
     }
-    case import_typescript11.default.SyntaxKind.CallExpression: {
+    case import_typescript12.default.SyntaxKind.CallExpression: {
       const mapMethod = getMapLikeMethod(node);
       if (mapMethod) {
         const mapResult = transformMapCall(node, ctx, isClientOnly, mapMethod);
@@ -195588,7 +195763,7 @@ function transformJsxExpression(expr, ctx, isClientOnly = false) {
           return mapResult;
       }
       const callee = node.expression;
-      if (import_typescript11.default.isIdentifier(callee)) {
+      if (import_typescript12.default.isIdentifier(callee)) {
         const jsxFunc = ctx.analyzer.jsxFunctions.get(callee.text);
         if (jsxFunc) {
           return transformJsxFunctionCall(node, jsxFunc, ctx, isClientOnly);
@@ -195600,39 +195775,39 @@ function transformJsxExpression(expr, ctx, isClientOnly = false) {
       }
       return null;
     }
-    case import_typescript11.default.SyntaxKind.Identifier:
-    case import_typescript11.default.SyntaxKind.StringLiteral:
-    case import_typescript11.default.SyntaxKind.NumericLiteral:
-    case import_typescript11.default.SyntaxKind.BigIntLiteral:
-    case import_typescript11.default.SyntaxKind.RegularExpressionLiteral:
-    case import_typescript11.default.SyntaxKind.NoSubstitutionTemplateLiteral:
-    case import_typescript11.default.SyntaxKind.TemplateExpression:
-    case import_typescript11.default.SyntaxKind.TaggedTemplateExpression:
-    case import_typescript11.default.SyntaxKind.TrueKeyword:
-    case import_typescript11.default.SyntaxKind.FalseKeyword:
-    case import_typescript11.default.SyntaxKind.NullKeyword:
-    case import_typescript11.default.SyntaxKind.ThisKeyword:
-    case import_typescript11.default.SyntaxKind.SuperKeyword:
-    case import_typescript11.default.SyntaxKind.ImportKeyword:
-    case import_typescript11.default.SyntaxKind.PropertyAccessExpression:
-    case import_typescript11.default.SyntaxKind.ElementAccessExpression:
-    case import_typescript11.default.SyntaxKind.PrefixUnaryExpression:
-    case import_typescript11.default.SyntaxKind.PostfixUnaryExpression:
-    case import_typescript11.default.SyntaxKind.TypeOfExpression:
-    case import_typescript11.default.SyntaxKind.VoidExpression:
-    case import_typescript11.default.SyntaxKind.DeleteExpression:
-    case import_typescript11.default.SyntaxKind.NewExpression:
-    case import_typescript11.default.SyntaxKind.ObjectLiteralExpression:
-    case import_typescript11.default.SyntaxKind.ArrowFunction:
-    case import_typescript11.default.SyntaxKind.FunctionExpression:
-    case import_typescript11.default.SyntaxKind.ClassExpression:
-    case import_typescript11.default.SyntaxKind.MetaProperty:
-    case import_typescript11.default.SyntaxKind.ExpressionWithTypeArguments:
-    case import_typescript11.default.SyntaxKind.CommaListExpression:
-    case import_typescript11.default.SyntaxKind.SyntheticExpression:
-    case import_typescript11.default.SyntaxKind.ArrayLiteralExpression:
+    case import_typescript12.default.SyntaxKind.Identifier:
+    case import_typescript12.default.SyntaxKind.StringLiteral:
+    case import_typescript12.default.SyntaxKind.NumericLiteral:
+    case import_typescript12.default.SyntaxKind.BigIntLiteral:
+    case import_typescript12.default.SyntaxKind.RegularExpressionLiteral:
+    case import_typescript12.default.SyntaxKind.NoSubstitutionTemplateLiteral:
+    case import_typescript12.default.SyntaxKind.TemplateExpression:
+    case import_typescript12.default.SyntaxKind.TaggedTemplateExpression:
+    case import_typescript12.default.SyntaxKind.TrueKeyword:
+    case import_typescript12.default.SyntaxKind.FalseKeyword:
+    case import_typescript12.default.SyntaxKind.NullKeyword:
+    case import_typescript12.default.SyntaxKind.ThisKeyword:
+    case import_typescript12.default.SyntaxKind.SuperKeyword:
+    case import_typescript12.default.SyntaxKind.ImportKeyword:
+    case import_typescript12.default.SyntaxKind.PropertyAccessExpression:
+    case import_typescript12.default.SyntaxKind.ElementAccessExpression:
+    case import_typescript12.default.SyntaxKind.PrefixUnaryExpression:
+    case import_typescript12.default.SyntaxKind.PostfixUnaryExpression:
+    case import_typescript12.default.SyntaxKind.TypeOfExpression:
+    case import_typescript12.default.SyntaxKind.VoidExpression:
+    case import_typescript12.default.SyntaxKind.DeleteExpression:
+    case import_typescript12.default.SyntaxKind.NewExpression:
+    case import_typescript12.default.SyntaxKind.ObjectLiteralExpression:
+    case import_typescript12.default.SyntaxKind.ArrowFunction:
+    case import_typescript12.default.SyntaxKind.FunctionExpression:
+    case import_typescript12.default.SyntaxKind.ClassExpression:
+    case import_typescript12.default.SyntaxKind.MetaProperty:
+    case import_typescript12.default.SyntaxKind.ExpressionWithTypeArguments:
+    case import_typescript12.default.SyntaxKind.CommaListExpression:
+    case import_typescript12.default.SyntaxKind.SyntheticExpression:
+    case import_typescript12.default.SyntaxKind.ArrayLiteralExpression:
       return null;
-    case import_typescript11.default.SyntaxKind.AwaitExpression:
+    case import_typescript12.default.SyntaxKind.AwaitExpression:
       ctx.analyzer.errors.push(createError(ErrorCodes.STAGE_AWAIT_IN_TEMPLATE, getSourceLocation(node, ctx.sourceFile, ctx.filePath)));
       return {
         type: "expression",
@@ -195643,16 +195818,16 @@ function transformJsxExpression(expr, ctx, isClientOnly = false) {
         loc: getSourceLocation(node, ctx.sourceFile, ctx.filePath),
         origin: { phase: "tick", scope: "template", effect: "pure", freeRefs: [] }
       };
-    case import_typescript11.default.SyntaxKind.YieldExpression:
+    case import_typescript12.default.SyntaxKind.YieldExpression:
       return null;
-    case import_typescript11.default.SyntaxKind.SpreadElement:
-    case import_typescript11.default.SyntaxKind.OmittedExpression:
-    case import_typescript11.default.SyntaxKind.JsxExpression:
-    case import_typescript11.default.SyntaxKind.JsxOpeningElement:
-    case import_typescript11.default.SyntaxKind.JsxOpeningFragment:
-    case import_typescript11.default.SyntaxKind.JsxClosingFragment:
-    case import_typescript11.default.SyntaxKind.JsxAttributes:
-    case import_typescript11.default.SyntaxKind.MissingDeclaration:
+    case import_typescript12.default.SyntaxKind.SpreadElement:
+    case import_typescript12.default.SyntaxKind.OmittedExpression:
+    case import_typescript12.default.SyntaxKind.JsxExpression:
+    case import_typescript12.default.SyntaxKind.JsxOpeningElement:
+    case import_typescript12.default.SyntaxKind.JsxOpeningFragment:
+    case import_typescript12.default.SyntaxKind.JsxClosingFragment:
+    case import_typescript12.default.SyntaxKind.JsxAttributes:
+    case import_typescript12.default.SyntaxKind.MissingDeclaration:
       return null;
     default:
       return assertNever2(node);
@@ -195689,7 +195864,7 @@ function transformConditionalBranch(node, ctx) {
   };
 }
 function getMapLikeMethod(node) {
-  if (!import_typescript11.default.isPropertyAccessExpression(node.expression))
+  if (!import_typescript12.default.isPropertyAccessExpression(node.expression))
     return null;
   const name = node.expression.name.text;
   if (name === "map")
@@ -195699,9 +195874,9 @@ function getMapLikeMethod(node) {
   return null;
 }
 function isFilterCall(node) {
-  if (!import_typescript11.default.isCallExpression(node))
+  if (!import_typescript12.default.isCallExpression(node))
     return null;
-  if (!import_typescript11.default.isPropertyAccessExpression(node.expression))
+  if (!import_typescript12.default.isPropertyAccessExpression(node.expression))
     return null;
   if (node.expression.name.text !== "filter")
     return null;
@@ -195713,9 +195888,9 @@ function isFilterCall(node) {
   };
 }
 function isSortCall(node) {
-  if (!import_typescript11.default.isCallExpression(node))
+  if (!import_typescript12.default.isCallExpression(node))
     return null;
-  if (!import_typescript11.default.isPropertyAccessExpression(node.expression))
+  if (!import_typescript12.default.isPropertyAccessExpression(node.expression))
     return null;
   const methodName = node.expression.name.text;
   if (methodName !== "sort" && methodName !== "toSorted")
@@ -195729,9 +195904,9 @@ function isSortCall(node) {
   };
 }
 function isIteratorShapeCall(node) {
-  if (!import_typescript11.default.isCallExpression(node))
+  if (!import_typescript12.default.isCallExpression(node))
     return null;
-  if (!import_typescript11.default.isPropertyAccessExpression(node.expression))
+  if (!import_typescript12.default.isPropertyAccessExpression(node.expression))
     return null;
   if (node.arguments.length !== 0)
     return null;
@@ -195741,11 +195916,11 @@ function isIteratorShapeCall(node) {
   return { array: node.expression.expression, shape: name };
 }
 function isObjectIteratorCall(node) {
-  if (!import_typescript11.default.isCallExpression(node))
+  if (!import_typescript12.default.isCallExpression(node))
     return null;
-  if (!import_typescript11.default.isPropertyAccessExpression(node.expression))
+  if (!import_typescript12.default.isPropertyAccessExpression(node.expression))
     return null;
-  if (!import_typescript11.default.isIdentifier(node.expression.expression))
+  if (!import_typescript12.default.isIdentifier(node.expression.expression))
     return null;
   if (node.expression.expression.text !== "Object")
     return null;
@@ -195770,7 +195945,7 @@ function extractSortComparator(callback, _method, ctx) {
 ` + `(reverse the operands for descending order).`
   });
   let resolvedNode = callback;
-  if (import_typescript11.default.isIdentifier(callback)) {
+  if (import_typescript12.default.isIdentifier(callback)) {
     const resolved = resolveSortComparatorIdentifier(callback.text, ctx);
     if (!resolved) {
       return {
@@ -195780,7 +195955,7 @@ function extractSortComparator(callback, _method, ctx) {
     }
     resolvedNode = resolved;
   }
-  if (!import_typescript11.default.isArrowFunction(resolvedNode) && !import_typescript11.default.isFunctionExpression(resolvedNode)) {
+  if (!import_typescript12.default.isArrowFunction(resolvedNode) && !import_typescript12.default.isFunctionExpression(resolvedNode)) {
     return {
       result: null,
       unsupportedReason: "Sort comparator must be an arrow function or function expression"
@@ -195807,11 +195982,11 @@ function resolveSortComparatorIdentifier(name, ctx) {
     return null;
   if (constInfo) {
     const ast = parseConstInitializer(constInfo);
-    return ast && (import_typescript11.default.isArrowFunction(ast) || import_typescript11.default.isFunctionExpression(ast)) ? ast : null;
+    return ast && (import_typescript12.default.isArrowFunction(ast) || import_typescript12.default.isFunctionExpression(ast)) ? ast : null;
   }
   if (fnInfo) {
     const ast = parseFunctionInfoAsExpr(fnInfo);
-    return ast && (import_typescript11.default.isArrowFunction(ast) || import_typescript11.default.isFunctionExpression(ast)) ? ast : null;
+    return ast && (import_typescript12.default.isArrowFunction(ast) || import_typescript12.default.isFunctionExpression(ast)) ? ast : null;
   }
   return null;
 }
@@ -195822,11 +195997,11 @@ function resolveCallbackMethodFunctionReferenceIdentifier(name, analyzer) {
     return null;
   if (constInfo) {
     const ast = parseConstInitializer(constInfo);
-    return ast && (import_typescript11.default.isArrowFunction(ast) || import_typescript11.default.isFunctionExpression(ast)) ? ast : null;
+    return ast && (import_typescript12.default.isArrowFunction(ast) || import_typescript12.default.isFunctionExpression(ast)) ? ast : null;
   }
   if (fnInfo) {
     const ast = parseFunctionInfoAsExpr(fnInfo);
-    return ast && (import_typescript11.default.isArrowFunction(ast) || import_typescript11.default.isFunctionExpression(ast)) ? ast : null;
+    return ast && (import_typescript12.default.isArrowFunction(ast) || import_typescript12.default.isFunctionExpression(ast)) ? ast : null;
   }
   return null;
 }
@@ -195882,13 +196057,13 @@ function resolveCallbackMethodFunctionReferences(expr, analyzer, bound = EMPTY_B
   return visit2(expr, bound);
 }
 function extractFilterPredicate(callback, ctx) {
-  if (!import_typescript11.default.isArrowFunction(callback))
+  if (!import_typescript12.default.isArrowFunction(callback))
     return { result: null };
   if (callback.parameters.length < 1)
     return { result: null };
   const firstParam = callback.parameters[0];
-  if (!import_typescript11.default.isIdentifier(firstParam.name)) {
-    if (import_typescript11.default.isBlock(callback.body)) {
+  if (!import_typescript12.default.isIdentifier(firstParam.name)) {
+    if (import_typescript12.default.isBlock(callback.body)) {
       return {
         result: null,
         unsupportedReason: "Block body in a destructured filter param is not supported. Workaround: use an expression-body arrow, or add /* @client */."
@@ -195908,7 +196083,7 @@ function extractFilterPredicate(callback, ctx) {
     return { result: null };
   }
   const param = firstParam.name.getText(ctx.sourceFile);
-  if (import_typescript11.default.isBlock(callback.body)) {
+  if (import_typescript12.default.isBlock(callback.body)) {
     const raw2 = ctx.getJS(callback.body);
     const statements = parseBlockBody(callback.body, ctx.sourceFile, (n) => ctx.getJS(n));
     if (!statements) {
@@ -195934,7 +196109,7 @@ function extractFilterPredicate(callback, ctx) {
   return { result: { param, predicate, raw } };
 }
 function extractLoopParamBindings(pattern) {
-  if (import_typescript11.default.isIdentifier(pattern))
+  if (import_typescript12.default.isIdentifier(pattern))
     return null;
   const bindings = [];
   let unsupported = false;
@@ -195943,7 +196118,7 @@ function extractLoopParamBindings(pattern) {
       return false;
     for (let i2 = 0;i2 < key.length; ) {
       const cp = key.codePointAt(i2);
-      const ok = i2 === 0 ? import_typescript11.default.isIdentifierStart(cp, import_typescript11.default.ScriptTarget.Latest) : import_typescript11.default.isIdentifierPart(cp, import_typescript11.default.ScriptTarget.Latest);
+      const ok = i2 === 0 ? import_typescript12.default.isIdentifierStart(cp, import_typescript12.default.ScriptTarget.Latest) : import_typescript12.default.isIdentifierPart(cp, import_typescript12.default.ScriptTarget.Latest);
       if (!ok)
         return false;
       i2 += cp > 65535 ? 2 : 1;
@@ -195956,17 +196131,17 @@ function extractLoopParamBindings(pattern) {
   const walk = (p, prefix, segments) => {
     if (unsupported)
       return;
-    if (import_typescript11.default.isArrayBindingPattern(p)) {
+    if (import_typescript12.default.isArrayBindingPattern(p)) {
       const elements2 = p.elements;
       for (let index = 0;index < elements2.length; index++) {
         if (unsupported)
           return;
         const el = elements2[index];
-        if (import_typescript11.default.isOmittedExpression(el))
+        if (import_typescript12.default.isOmittedExpression(el))
           continue;
         if (el.dotDotDotToken) {
           internalInvariant(index === elements2.length - 1, "extractLoopParamBindings: array rest token in non-final position (parser should reject)");
-          internalInvariant(import_typescript11.default.isIdentifier(el.name), "extractLoopParamBindings: array rest target is not an identifier (parser should reject)");
+          internalInvariant(import_typescript12.default.isIdentifier(el.name), "extractLoopParamBindings: array rest target is not an identifier (parser should reject)");
           bindings.push({
             name: el.name.text,
             path: prefix,
@@ -195977,7 +196152,7 @@ function extractLoopParamBindings(pattern) {
         }
         const path = `${prefix}[${index}]`;
         const nextSegments = [...segments, { kind: "index", index }];
-        if (import_typescript11.default.isIdentifier(el.name)) {
+        if (import_typescript12.default.isIdentifier(el.name)) {
           bindings.push({ name: el.name.text, path, segments: nextSegments });
         } else {
           walk(el.name, path, nextSegments);
@@ -195993,7 +196168,7 @@ function extractLoopParamBindings(pattern) {
       const el = elements[i2];
       if (el.dotDotDotToken) {
         internalInvariant(i2 === elements.length - 1, "extractLoopParamBindings: object rest token in non-final position (parser should reject)");
-        internalInvariant(import_typescript11.default.isIdentifier(el.name), "extractLoopParamBindings: object rest target is not an identifier (parser should reject)");
+        internalInvariant(import_typescript12.default.isIdentifier(el.name), "extractLoopParamBindings: object rest target is not an identifier (parser should reject)");
         bindings.push({
           name: el.name.text,
           path: prefix,
@@ -196005,17 +196180,17 @@ function extractLoopParamBindings(pattern) {
       let keyText = null;
       if (el.propertyName) {
         const pn = el.propertyName;
-        if (import_typescript11.default.isIdentifier(pn))
+        if (import_typescript12.default.isIdentifier(pn))
           keyText = pn.text;
-        else if (import_typescript11.default.isStringLiteral(pn))
+        else if (import_typescript12.default.isStringLiteral(pn))
           keyText = pn.text;
-        else if (import_typescript11.default.isNumericLiteral(pn))
+        else if (import_typescript12.default.isNumericLiteral(pn))
           keyText = pn.text;
         else {
           unsupported = true;
           return;
         }
-      } else if (import_typescript11.default.isIdentifier(el.name)) {
+      } else if (import_typescript12.default.isIdentifier(el.name)) {
         keyText = el.name.text;
       } else {
         unsupported = true;
@@ -196025,14 +196200,14 @@ function extractLoopParamBindings(pattern) {
       collectedKeys.push({ key: keyText, isIdent: keyIsIdent });
       const path = appendDotAccess(prefix, keyText);
       const nextSegments = [...segments, { kind: "field", key: keyText, isIdent: keyIsIdent }];
-      if (import_typescript11.default.isIdentifier(el.name)) {
+      if (import_typescript12.default.isIdentifier(el.name)) {
         bindings.push({ name: el.name.text, path, segments: nextSegments });
       } else {
         walk(el.name, path, nextSegments);
       }
     }
   };
-  if (import_typescript11.default.isArrayBindingPattern(pattern) || import_typescript11.default.isObjectBindingPattern(pattern)) {
+  if (import_typescript12.default.isArrayBindingPattern(pattern) || import_typescript12.default.isObjectBindingPattern(pattern)) {
     walk(pattern, "", []);
     if (unsupported)
       return { unsupported: true };
@@ -196042,7 +196217,7 @@ function extractLoopParamBindings(pattern) {
 }
 function findKeyJsxAttribute(opening) {
   for (const prop of opening.attributes.properties) {
-    if (import_typescript11.default.isJsxAttribute(prop) && prop.name.getText() === "key") {
+    if (import_typescript12.default.isJsxAttribute(prop) && prop.name.getText() === "key") {
       return prop;
     }
   }
@@ -196087,7 +196262,7 @@ function keyAttrValueToExpr(v) {
 function normalizeKeyExpr(expr) {
   let out = "";
   for (const tok of iterateJsTokens(expr)) {
-    if (tok.kind === import_typescript11.default.SyntaxKind.WhitespaceTrivia || tok.kind === import_typescript11.default.SyntaxKind.NewLineTrivia) {
+    if (tok.kind === import_typescript12.default.SyntaxKind.WhitespaceTrivia || tok.kind === import_typescript12.default.SyntaxKind.NewLineTrivia) {
       continue;
     }
     out += expr.slice(tok.pos, tok.end);
@@ -196099,13 +196274,13 @@ function conditionalHasExplicitNullishBranch(cond) {
 }
 function branchHasExplicitNullish(branch) {
   let b = branch;
-  while (import_typescript11.default.isParenthesizedExpression(b))
+  while (import_typescript12.default.isParenthesizedExpression(b))
     b = b.expression;
-  if (b.kind === import_typescript11.default.SyntaxKind.NullKeyword)
+  if (b.kind === import_typescript12.default.SyntaxKind.NullKeyword)
     return true;
-  if (import_typescript11.default.isIdentifier(b) && b.text === "undefined")
+  if (import_typescript12.default.isIdentifier(b) && b.text === "undefined")
     return true;
-  if (import_typescript11.default.isConditionalExpression(b))
+  if (import_typescript12.default.isConditionalExpression(b))
     return conditionalHasExplicitNullishBranch(b);
   return false;
 }
@@ -196114,26 +196289,26 @@ function classifyKeyProblem(keyAttr, checker) {
     return "missing";
   if (!keyAttr.initializer)
     return "missing";
-  if (import_typescript11.default.isJsxExpression(keyAttr.initializer) && !keyAttr.initializer.expression) {
+  if (import_typescript12.default.isJsxExpression(keyAttr.initializer) && !keyAttr.initializer.expression) {
     return "missing";
   }
   let expr;
-  if (import_typescript11.default.isStringLiteral(keyAttr.initializer)) {
+  if (import_typescript12.default.isStringLiteral(keyAttr.initializer)) {
     return null;
-  } else if (import_typescript11.default.isJsxExpression(keyAttr.initializer)) {
+  } else if (import_typescript12.default.isJsxExpression(keyAttr.initializer)) {
     expr = keyAttr.initializer.expression;
   }
   if (!expr)
     return null;
-  if (expr.kind === import_typescript11.default.SyntaxKind.NullKeyword)
+  if (expr.kind === import_typescript12.default.SyntaxKind.NullKeyword)
     return null;
-  if (import_typescript11.default.isIdentifier(expr) && expr.text === "undefined")
+  if (import_typescript12.default.isIdentifier(expr) && expr.text === "undefined")
     return null;
-  if (import_typescript11.default.isConditionalExpression(expr) && conditionalHasExplicitNullishBranch(expr))
+  if (import_typescript12.default.isConditionalExpression(expr) && conditionalHasExplicitNullishBranch(expr))
     return null;
   if (checker) {
     const type2 = checker.getTypeAtLocation(expr);
-    const isNullable = type2.isUnion() ? type2.types.some((t) => (t.flags & (import_typescript11.default.TypeFlags.Null | import_typescript11.default.TypeFlags.Undefined | import_typescript11.default.TypeFlags.Void)) !== 0) : (type2.flags & (import_typescript11.default.TypeFlags.Null | import_typescript11.default.TypeFlags.Undefined | import_typescript11.default.TypeFlags.Void)) !== 0;
+    const isNullable = type2.isUnion() ? type2.types.some((t) => (t.flags & (import_typescript12.default.TypeFlags.Null | import_typescript12.default.TypeFlags.Undefined | import_typescript12.default.TypeFlags.Void)) !== 0) : (type2.flags & (import_typescript12.default.TypeFlags.Null | import_typescript12.default.TypeFlags.Undefined | import_typescript12.default.TypeFlags.Void)) !== 0;
     if (isNullable)
       return "nullable-type";
   }
@@ -196159,81 +196334,81 @@ function checkLoopKey(callback, ctx, isNested) {
     ctx.analyzer.errors.push(createError(errorCode, getSourceLocation(locNode, ctx.sourceFile, ctx.filePath), { suggestion: { message: keyErrorSuggestion(problem) } }));
   }
   let body = callback.body;
-  if (import_typescript11.default.isBlock(body)) {
-    const ret = body.statements.find((s) => import_typescript11.default.isReturnStatement(s) && s.expression != null);
+  if (import_typescript12.default.isBlock(body)) {
+    const ret = body.statements.find((s) => import_typescript12.default.isReturnStatement(s) && s.expression != null);
     if (!ret?.expression)
       return;
     body = ret.expression;
   }
-  while (import_typescript11.default.isParenthesizedExpression(body))
+  while (import_typescript12.default.isParenthesizedExpression(body))
     body = body.expression;
   function checkJsxOperand(node) {
     let n = node;
-    while (import_typescript11.default.isParenthesizedExpression(n))
+    while (import_typescript12.default.isParenthesizedExpression(n))
       n = n.expression;
-    if (import_typescript11.default.isJsxElement(n))
+    if (import_typescript12.default.isJsxElement(n))
       checkOpening(n.openingElement);
-    else if (import_typescript11.default.isJsxSelfClosingElement(n))
+    else if (import_typescript12.default.isJsxSelfClosingElement(n))
       checkOpening(n);
   }
-  if (import_typescript11.default.isConditionalExpression(body)) {
+  if (import_typescript12.default.isConditionalExpression(body)) {
     checkJsxOperand(body.whenTrue);
     checkJsxOperand(body.whenFalse);
     return;
   }
-  if (import_typescript11.default.isBinaryExpression(body) && (body.operatorToken.kind === import_typescript11.default.SyntaxKind.AmpersandAmpersandToken || body.operatorToken.kind === import_typescript11.default.SyntaxKind.BarBarToken || body.operatorToken.kind === import_typescript11.default.SyntaxKind.QuestionQuestionToken)) {
+  if (import_typescript12.default.isBinaryExpression(body) && (body.operatorToken.kind === import_typescript12.default.SyntaxKind.AmpersandAmpersandToken || body.operatorToken.kind === import_typescript12.default.SyntaxKind.BarBarToken || body.operatorToken.kind === import_typescript12.default.SyntaxKind.QuestionQuestionToken)) {
     checkJsxOperand(body.left);
     checkJsxOperand(body.right);
     return;
   }
-  if (import_typescript11.default.isJsxElement(body)) {
+  if (import_typescript12.default.isJsxElement(body)) {
     checkOpening(body.openingElement);
     return;
   }
-  if (import_typescript11.default.isJsxSelfClosingElement(body)) {
+  if (import_typescript12.default.isJsxSelfClosingElement(body)) {
     checkOpening(body);
     return;
   }
 }
 function flatMapProjectionCall(body) {
   let expr;
-  if (import_typescript11.default.isBlock(body)) {
+  if (import_typescript12.default.isBlock(body)) {
     const real = body.statements;
-    if (real.length !== 1 || !import_typescript11.default.isReturnStatement(real[0]) || !real[0].expression)
+    if (real.length !== 1 || !import_typescript12.default.isReturnStatement(real[0]) || !real[0].expression)
       return null;
     expr = real[0].expression;
   } else {
     expr = body;
   }
-  while (import_typescript11.default.isParenthesizedExpression(expr))
+  while (import_typescript12.default.isParenthesizedExpression(expr))
     expr = expr.expression;
-  if (!import_typescript11.default.isCallExpression(expr))
+  if (!import_typescript12.default.isCallExpression(expr))
     return null;
   if (!getMapLikeMethod(expr))
     return null;
   const cb = expr.arguments[0];
-  if (!cb || !import_typescript11.default.isArrowFunction(cb) && !import_typescript11.default.isFunctionExpression(cb))
+  if (!cb || !import_typescript12.default.isArrowFunction(cb) && !import_typescript12.default.isFunctionExpression(cb))
     return null;
   for (const p of cb.parameters) {
-    if (!import_typescript11.default.isIdentifier(p.name))
+    if (!import_typescript12.default.isIdentifier(p.name))
       return null;
   }
   let innerBody = cb.body;
-  if (import_typescript11.default.isBlock(innerBody)) {
-    const ret = innerBody.statements.find((s) => import_typescript11.default.isReturnStatement(s) && s.expression != null);
+  if (import_typescript12.default.isBlock(innerBody)) {
+    const ret = innerBody.statements.find((s) => import_typescript12.default.isReturnStatement(s) && s.expression != null);
     if (innerBody.statements.length !== 1 || !ret?.expression)
       return null;
     innerBody = ret.expression;
   }
-  while (import_typescript11.default.isParenthesizedExpression(innerBody))
+  while (import_typescript12.default.isParenthesizedExpression(innerBody))
     innerBody = innerBody.expression;
   const isElementish = (n) => {
     let m = n;
-    while (import_typescript11.default.isParenthesizedExpression(m))
+    while (import_typescript12.default.isParenthesizedExpression(m))
       m = m.expression;
-    if (import_typescript11.default.isJsxElement(m) || import_typescript11.default.isJsxSelfClosingElement(m))
+    if (import_typescript12.default.isJsxElement(m) || import_typescript12.default.isJsxSelfClosingElement(m))
       return leafIsWirelessElement(m);
-    if (import_typescript11.default.isConditionalExpression(m))
+    if (import_typescript12.default.isConditionalExpression(m))
       return isElementish(m.whenTrue) && isElementish(m.whenFalse);
     return false;
   };
@@ -196246,19 +196421,19 @@ function leafIsWirelessElement(el) {
   const visit2 = (n) => {
     if (!ok)
       return;
-    if (import_typescript11.default.isJsxOpeningElement(n) || import_typescript11.default.isJsxSelfClosingElement(n)) {
+    if (import_typescript12.default.isJsxOpeningElement(n) || import_typescript12.default.isJsxSelfClosingElement(n)) {
       const tagNode = n.tagName;
-      const isIntrinsic = import_typescript11.default.isIdentifier(tagNode) ? !/^[A-Z]/.test(tagNode.text) : import_typescript11.default.isJsxNamespacedName(tagNode);
+      const isIntrinsic = import_typescript12.default.isIdentifier(tagNode) ? !/^[A-Z]/.test(tagNode.text) : import_typescript12.default.isJsxNamespacedName(tagNode);
       if (!isIntrinsic) {
         ok = false;
         return;
       }
       for (const attr of n.attributes.properties) {
-        if (import_typescript11.default.isJsxSpreadAttribute(attr)) {
+        if (import_typescript12.default.isJsxSpreadAttribute(attr)) {
           ok = false;
           return;
         }
-        if (import_typescript11.default.isJsxAttribute(attr)) {
+        if (import_typescript12.default.isJsxAttribute(attr)) {
           const name = attr.name.getText();
           if (/^on[A-Z]/.test(name)) {
             ok = false;
@@ -196267,11 +196442,11 @@ function leafIsWirelessElement(el) {
         }
       }
     }
-    if (import_typescript11.default.isCallExpression(n) && getMapLikeMethod(n) && containsJsxInExpression(n)) {
+    if (import_typescript12.default.isCallExpression(n) && getMapLikeMethod(n) && containsJsxInExpression(n)) {
       ok = false;
       return;
     }
-    import_typescript11.default.forEachChild(n, visit2);
+    import_typescript12.default.forEachChild(n, visit2);
   };
   visit2(el);
   return ok;
@@ -196329,7 +196504,7 @@ function extractItemConditionalKey(cond) {
   return a ?? b;
 }
 function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
-  const isNested = ctx.loopParams.size > 0;
+  const isNested = ctx.scope.valueBoundNames().size > 0;
   const diagCountAtEntry = ctx.analyzer.errors.length;
   const depth = ctx.loopDepth;
   const propAccess = node.expression;
@@ -196451,7 +196626,7 @@ function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
   let children = [];
   let paramBindings;
   let flatMapCallback;
-  if (import_typescript11.default.isArrowFunction(callback)) {
+  if (import_typescript12.default.isArrowFunction(callback)) {
     if (callback.parameters.length > 0) {
       const firstParam = callback.parameters[0];
       param = firstParam.name.getText(ctx.sourceFile);
@@ -196459,9 +196634,9 @@ function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
         paramType = firstParam.type.getText(ctx.sourceFile);
       }
       const isEntriesShape = iterationShape === "entries" || objectIteration === "entries";
-      if (isEntriesShape && import_typescript11.default.isArrayBindingPattern(firstParam.name)) {
-        const elements = firstParam.name.elements.filter((el) => !import_typescript11.default.isOmittedExpression(el));
-        if (elements.length === 2 && import_typescript11.default.isBindingElement(elements[0]) && import_typescript11.default.isIdentifier(elements[0].name) && import_typescript11.default.isBindingElement(elements[1]) && import_typescript11.default.isIdentifier(elements[1].name)) {
+      if (isEntriesShape && import_typescript12.default.isArrayBindingPattern(firstParam.name)) {
+        const elements = firstParam.name.elements.filter((el) => !import_typescript12.default.isOmittedExpression(el));
+        if (elements.length === 2 && import_typescript12.default.isBindingElement(elements[0]) && import_typescript12.default.isIdentifier(elements[0].name) && import_typescript12.default.isBindingElement(elements[1]) && import_typescript12.default.isIdentifier(elements[1].name)) {
           index = elements[0].name.text;
           param = elements[1].name.text;
         } else {
@@ -196488,20 +196663,14 @@ function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
         indexType = secondParam.type.getText(ctx.sourceFile);
       }
     }
-    if (paramBindings) {
-      for (const b of paramBindings)
-        ctx.loopParams.add(b.name);
-    } else {
-      ctx.loopParams.add(param);
-    }
-    if (index)
-      ctx.loopParams.add(index);
+    const savedScope = ctx.scope;
+    ctx.scope = ctx.scope.enterLoopRow({ param, index, paramBindings });
     ctx.loopDepth++;
     const tryTransformRenderableBody = (expr) => {
-      if (!import_typescript11.default.isBinaryExpression(expr))
+      if (!import_typescript12.default.isBinaryExpression(expr))
         return;
       const op = expr.operatorToken.kind;
-      if (op !== import_typescript11.default.SyntaxKind.AmpersandAmpersandToken && op !== import_typescript11.default.SyntaxKind.BarBarToken && op !== import_typescript11.default.SyntaxKind.QuestionQuestionToken) {
+      if (op !== import_typescript12.default.SyntaxKind.AmpersandAmpersandToken && op !== import_typescript12.default.SyntaxKind.BarBarToken && op !== import_typescript12.default.SyntaxKind.QuestionQuestionToken) {
         return;
       }
       if (!containsJsxInExpression(expr) && !callsJsxHelper(expr, ctx))
@@ -196511,33 +196680,33 @@ function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
         children = [transformed];
     };
     const body = callback.body;
-    if (import_typescript11.default.isJsxElement(body) || import_typescript11.default.isJsxSelfClosingElement(body) || import_typescript11.default.isJsxFragment(body)) {
+    if (import_typescript12.default.isJsxElement(body) || import_typescript12.default.isJsxSelfClosingElement(body) || import_typescript12.default.isJsxFragment(body)) {
       const transformed = transformNode(body, ctx);
       if (transformed) {
         children = [transformed];
       }
-    } else if (import_typescript11.default.isConditionalExpression(body)) {
+    } else if (import_typescript12.default.isConditionalExpression(body)) {
       children = [transformConditional(body, ctx)];
-    } else if (import_typescript11.default.isParenthesizedExpression(body)) {
+    } else if (import_typescript12.default.isParenthesizedExpression(body)) {
       let inner = body.expression;
-      while (import_typescript11.default.isParenthesizedExpression(inner)) {
+      while (import_typescript12.default.isParenthesizedExpression(inner)) {
         inner = inner.expression;
       }
-      if (import_typescript11.default.isJsxElement(inner) || import_typescript11.default.isJsxSelfClosingElement(inner) || import_typescript11.default.isJsxFragment(inner)) {
+      if (import_typescript12.default.isJsxElement(inner) || import_typescript12.default.isJsxSelfClosingElement(inner) || import_typescript12.default.isJsxFragment(inner)) {
         const transformed = transformNode(inner, ctx);
         if (transformed) {
           children = [transformed];
         }
-      } else if (import_typescript11.default.isConditionalExpression(inner)) {
+      } else if (import_typescript12.default.isConditionalExpression(inner)) {
         children = [transformConditional(inner, ctx)];
-      } else if (method === "flatMap" && import_typescript11.default.isArrayLiteralExpression(inner)) {
+      } else if (method === "flatMap" && import_typescript12.default.isArrayLiteralExpression(inner)) {
         children = transformArrayLiteralChildren(inner, ctx);
       } else {
         tryTransformRenderableBody(inner);
       }
-    } else if (method === "flatMap" && import_typescript11.default.isArrayLiteralExpression(body)) {
+    } else if (method === "flatMap" && import_typescript12.default.isArrayLiteralExpression(body)) {
       children = transformArrayLiteralChildren(body, ctx);
-    } else if (import_typescript11.default.isBlock(body)) {
+    } else if (import_typescript12.default.isBlock(body)) {
       const multiReturn = method !== "flatMap" ? extractMultiReturnJsxBranches(body, true) : null;
       if (multiReturn && multiReturn.branches.length > 0) {
         const loc = getSourceLocation(body, ctx.sourceFile, ctx.filePath);
@@ -196555,13 +196724,31 @@ function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
           }
         }
       }
-      const returnStmt = children.length === 0 ? body.statements.find((s) => import_typescript11.default.isReturnStatement(s) && s.expression != null) : undefined;
+      const returnStmt = children.length === 0 ? body.statements.find((s) => import_typescript12.default.isReturnStatement(s) && s.expression != null) : undefined;
+      let rowScopeBeforePreamble = null;
+      if (returnStmt) {
+        const preambleNames = new Set;
+        for (const stmt of body.statements) {
+          if (stmt === returnStmt)
+            break;
+          collectPreambleDeclaredNames(stmt, preambleNames);
+        }
+        if (preambleNames.size > 0) {
+          rowScopeBeforePreamble = ctx.scope;
+          ctx.scope = savedScope.enterLoopRow({
+            param,
+            index,
+            paramBindings,
+            preamble: { declaredNames: [...preambleNames] }
+          });
+        }
+      }
       if (returnStmt && returnStmt.expression) {
         let returnExpr = returnStmt.expression;
-        while (import_typescript11.default.isParenthesizedExpression(returnExpr)) {
+        while (import_typescript12.default.isParenthesizedExpression(returnExpr)) {
           returnExpr = returnExpr.expression;
         }
-        if (import_typescript11.default.isJsxElement(returnExpr) || import_typescript11.default.isJsxSelfClosingElement(returnExpr) || import_typescript11.default.isJsxFragment(returnExpr)) {
+        if (import_typescript12.default.isJsxElement(returnExpr) || import_typescript12.default.isJsxSelfClosingElement(returnExpr) || import_typescript12.default.isJsxFragment(returnExpr)) {
           const transformed = transformNode(returnExpr, ctx);
           if (transformed) {
             children = [transformed];
@@ -196625,6 +196812,9 @@ function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
           }
         }
       }
+      if (rowScopeBeforePreamble) {
+        ctx.scope = rowScopeBeforePreamble;
+      }
       if (method === "flatMap" && children.length === 0 && !flatMapProjectionCall(body)) {
         flatMapCallback = buildFlatMapCallback(callback, body, ctx);
       }
@@ -196640,7 +196830,7 @@ function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
         }
       }
     }
-    if (method === "flatMap" && children.length === 0 && !flatMapCallback && !import_typescript11.default.isBlock(body)) {
+    if (method === "flatMap" && children.length === 0 && !flatMapCallback && !import_typescript12.default.isBlock(body)) {
       flatMapCallback = buildFlatMapCallback(callback, body, ctx);
     }
     if (flatMapCallback)
@@ -196653,19 +196843,12 @@ function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
         }
       }));
     }
-    if (paramBindings) {
-      for (const b of paramBindings)
-        ctx.loopParams.delete(b.name);
-    } else {
-      ctx.loopParams.delete(param);
-    }
-    if (index)
-      ctx.loopParams.delete(index);
+    ctx.scope = savedScope;
     ctx.loopDepth--;
   }
   if (children.length === 0 && !flatMapCallback) {
     const cb = node.arguments[0];
-    const cbBody = cb && (import_typescript11.default.isArrowFunction(cb) || import_typescript11.default.isFunctionExpression(cb)) ? cb.body : undefined;
+    const cbBody = cb && (import_typescript12.default.isArrowFunction(cb) || import_typescript12.default.isFunctionExpression(cb)) ? cb.body : undefined;
     if (cbBody && containsJsxInExpression(cbBody) && ctx.analyzer.errors.length === diagCountAtEntry) {
       ctx.analyzer.errors.push(createError(ErrorCodes.UNSUPPORTED_JSX_PATTERN, getSourceLocation(cbBody, ctx.sourceFile, ctx.filePath), {
         message: `A .${method}() callback that builds JSX in this shape cannot be ` + "compiled — the JSX would leak verbatim into the client bundle. " + "Recognized bodies: a JSX element/fragment, a ternary or " + "&& / || / ?? expression, an array literal (flatMap), or a block " + "body whose return the compiler can lower.",
@@ -196676,7 +196859,7 @@ function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
     }
     return null;
   }
-  if (import_typescript11.default.isArrowFunction(node.arguments[0]) && children.length > 0) {
+  if (import_typescript12.default.isArrowFunction(node.arguments[0]) && children.length > 0) {
     checkLoopKey(node.arguments[0], ctx, isNested);
   }
   const itemConditional = children.length > 0 ? loopBodyItemConditional(children) : null;
@@ -196773,12 +196956,12 @@ function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
 function transformArrayLiteralChildren(arrayLiteral, ctx) {
   const children = [];
   for (const element of arrayLiteral.elements) {
-    if (import_typescript11.default.isSpreadElement(element))
+    if (import_typescript12.default.isSpreadElement(element))
       continue;
     let inner = element;
-    while (import_typescript11.default.isParenthesizedExpression(inner))
+    while (import_typescript12.default.isParenthesizedExpression(inner))
       inner = inner.expression;
-    if (import_typescript11.default.isJsxElement(inner) || import_typescript11.default.isJsxSelfClosingElement(inner) || import_typescript11.default.isJsxFragment(inner)) {
+    if (import_typescript12.default.isJsxElement(inner) || import_typescript12.default.isJsxSelfClosingElement(inner) || import_typescript12.default.isJsxFragment(inner)) {
       const transformed = transformNode(inner, ctx);
       if (transformed)
         children.push(transformed);
@@ -196787,7 +196970,7 @@ function transformArrayLiteralChildren(arrayLiteral, ctx) {
   return children;
 }
 function containsJsx(node) {
-  if (import_typescript11.default.isJsxElement(node) || import_typescript11.default.isJsxSelfClosingElement(node) || import_typescript11.default.isJsxFragment(node))
+  if (import_typescript12.default.isJsxElement(node) || import_typescript12.default.isJsxSelfClosingElement(node) || import_typescript12.default.isJsxFragment(node))
     return true;
   let found = false;
   node.forEachChild((child) => {
@@ -196803,7 +196986,7 @@ function buildFlatMapCallback(callback, body, ctx) {
   const leafIrs = [];
   let refusalNode;
   const collectJsx = (n, underTemplate) => {
-    if (import_typescript11.default.isJsxElement(n) || import_typescript11.default.isJsxSelfClosingElement(n) || import_typescript11.default.isJsxFragment(n)) {
+    if (import_typescript12.default.isJsxElement(n) || import_typescript12.default.isJsxSelfClosingElement(n) || import_typescript12.default.isJsxFragment(n)) {
       if (underTemplate)
         refusalNode ??= n;
       leafSpans.push({ start: n.getStart(ctx.sourceFile), end: n.getEnd() });
@@ -196811,7 +196994,7 @@ function buildFlatMapCallback(callback, body, ctx) {
       leafIrs.push(ir ?? { type: "text", value: "", loc: getSourceLocation(n, ctx.sourceFile, ctx.filePath) });
       return;
     }
-    const inTemplate = underTemplate || import_typescript11.default.isTemplateExpression(n) || import_typescript11.default.isTaggedTemplateExpression(n);
+    const inTemplate = underTemplate || import_typescript12.default.isTemplateExpression(n) || import_typescript12.default.isTaggedTemplateExpression(n);
     n.forEachChild((c) => collectJsx(c, inTemplate));
   };
   collectJsx(body, false);
@@ -197002,21 +197185,21 @@ function attrValueText(value) {
   return out.join(" ");
 }
 function collectBindingNames2(name, out) {
-  if (import_typescript11.default.isIdentifier(name)) {
+  if (import_typescript12.default.isIdentifier(name)) {
     out.add(name.text);
     return;
   }
   for (const el of name.elements) {
-    if (import_typescript11.default.isBindingElement(el))
+    if (import_typescript12.default.isBindingElement(el))
       collectBindingNames2(el.name, out);
   }
 }
 function collectPreambleDeclaredNames(stmt, out) {
-  if (import_typescript11.default.isVariableStatement(stmt)) {
+  if (import_typescript12.default.isVariableStatement(stmt)) {
     for (const decl of stmt.declarationList.declarations) {
       collectBindingNames2(decl.name, out);
     }
-  } else if (import_typescript11.default.isFunctionDeclaration(stmt) && stmt.name) {
+  } else if (import_typescript12.default.isFunctionDeclaration(stmt) && stmt.name) {
     out.add(stmt.name.text);
   }
 }
@@ -197045,10 +197228,10 @@ function preambleFromValueStatements(statements, ctx) {
 function neutralPreambleDeclarations(statements, ctx) {
   const out = [];
   for (const stmt of statements) {
-    if (!import_typescript11.default.isVariableStatement(stmt))
+    if (!import_typescript12.default.isVariableStatement(stmt))
       return null;
     for (const decl of stmt.declarationList.declarations) {
-      if (!import_typescript11.default.isIdentifier(decl.name))
+      if (!import_typescript12.default.isIdentifier(decl.name))
         return null;
       if (!decl.initializer)
         return null;
@@ -197081,11 +197264,11 @@ function buildPreambleSegments(statements, returnStmt, ctx) {
   let refusalNode;
   const recordBuilderTarget = (leaf, stmt) => {
     for (let n = leaf.parent;n && n !== stmt.parent; n = n.parent) {
-      if (import_typescript11.default.isCallExpression(n) && import_typescript11.default.isPropertyAccessExpression(n.expression) && (n.expression.name.text === "push" || n.expression.name.text === "unshift") && import_typescript11.default.isIdentifier(n.expression.expression)) {
+      if (import_typescript12.default.isCallExpression(n) && import_typescript12.default.isPropertyAccessExpression(n.expression) && (n.expression.name.text === "push" || n.expression.name.text === "unshift") && import_typescript12.default.isIdentifier(n.expression.expression)) {
         builders.add(n.expression.expression.text);
         return;
       }
-      if (import_typescript11.default.isVariableDeclaration(n) && import_typescript11.default.isIdentifier(n.name)) {
+      if (import_typescript12.default.isVariableDeclaration(n) && import_typescript12.default.isIdentifier(n.name)) {
         builders.add(n.name.text);
         return;
       }
@@ -197098,7 +197281,7 @@ function buildPreambleSegments(statements, returnStmt, ctx) {
     const leafSpans = [];
     const leafIrs = [];
     const collect = (n, underTemplate) => {
-      if (import_typescript11.default.isJsxElement(n) || import_typescript11.default.isJsxSelfClosingElement(n) || import_typescript11.default.isJsxFragment(n)) {
+      if (import_typescript12.default.isJsxElement(n) || import_typescript12.default.isJsxSelfClosingElement(n) || import_typescript12.default.isJsxFragment(n)) {
         if (underTemplate)
           refusalNode ??= n;
         recordBuilderTarget(n, stmt);
@@ -197109,7 +197292,7 @@ function buildPreambleSegments(statements, returnStmt, ctx) {
         leafIrs.push(ir ?? { type: "text", value: "", loc: getSourceLocation(n, ctx.sourceFile, ctx.filePath) });
         return;
       }
-      const inTemplate = underTemplate || import_typescript11.default.isTemplateExpression(n) || import_typescript11.default.isTaggedTemplateExpression(n);
+      const inTemplate = underTemplate || import_typescript12.default.isTemplateExpression(n) || import_typescript12.default.isTaggedTemplateExpression(n);
       n.forEachChild((c) => collect(c, inTemplate));
     };
     collect(stmt, false);
@@ -197213,13 +197396,13 @@ function expandSpreadAttribute(attr, ctx) {
   }];
 }
 function attrFreeIdentifiers(attr) {
-  if (!attr.initializer || !import_typescript11.default.isJsxExpression(attr.initializer) || !attr.initializer.expression) {
+  if (!attr.initializer || !import_typescript12.default.isJsxExpression(attr.initializer) || !attr.initializer.expression) {
     return;
   }
   return extractFreeIdentifiersFromNode(attr.initializer.expression);
 }
 function computeReactivityFlags(attr, ctx) {
-  if (!attr.initializer || !import_typescript11.default.isJsxExpression(attr.initializer) || !attr.initializer.expression) {
+  if (!attr.initializer || !import_typescript12.default.isJsxExpression(attr.initializer) || !attr.initializer.expression) {
     return {};
   }
   const expr = attr.initializer.expression;
@@ -197245,22 +197428,22 @@ function processAttributes(attributes, ctx) {
   const events = [];
   let ref = null;
   for (const attr of attributes.properties) {
-    if (import_typescript11.default.isJsxSpreadAttribute(attr)) {
+    if (import_typescript12.default.isJsxSpreadAttribute(attr)) {
       attrs.push(...expandSpreadAttribute(attr, ctx));
       continue;
     }
-    if (!import_typescript11.default.isJsxAttribute(attr))
+    if (!import_typescript12.default.isJsxAttribute(attr))
       continue;
     const rawName = attr.name.getText(ctx.sourceFile);
     if (rawName === "ref") {
-      if (attr.initializer && import_typescript11.default.isJsxExpression(attr.initializer) && attr.initializer.expression) {
+      if (attr.initializer && import_typescript12.default.isJsxExpression(attr.initializer) && attr.initializer.expression) {
         reportJsxBranchLocalInCallback(attr.initializer.expression, ctx);
         ref = ctx.getJS(attr.initializer.expression);
       }
       continue;
     }
     if (/^on[A-Z]/.test(rawName)) {
-      if (attr.initializer && import_typescript11.default.isJsxExpression(attr.initializer) && attr.initializer.expression) {
+      if (attr.initializer && import_typescript12.default.isJsxExpression(attr.initializer) && attr.initializer.expression) {
         const eventName = rawName.slice(2).toLowerCase();
         reportJsxBranchLocalInCallback(attr.initializer.expression, ctx);
         events.push({
@@ -197275,7 +197458,7 @@ function processAttributes(attributes, ctx) {
     const name = toHTMLAttrName(rawName);
     let value = getAttributeValue(attr, ctx);
     let clientOnly;
-    if (attr.initializer && import_typescript11.default.isJsxExpression(attr.initializer) && attr.initializer.expression) {
+    if (attr.initializer && import_typescript12.default.isJsxExpression(attr.initializer) && attr.initializer.expression) {
       if (value.kind === "expression" && value.templateExpr === undefined) {
         const rewritten = rewriteBarePropRefs2(value.expr, attr.initializer.expression, ctx);
         if (rewritten !== value.expr) {
@@ -197302,55 +197485,55 @@ function getAttributeValue(attr, ctx) {
   if (!attr.initializer) {
     return AttrValueOf.booleanAttr();
   }
-  if (import_typescript11.default.isStringLiteral(attr.initializer)) {
+  if (import_typescript12.default.isStringLiteral(attr.initializer)) {
     return AttrValueOf.literal(decodeEntities(attr.initializer.text));
   }
-  if (import_typescript11.default.isJsxExpression(attr.initializer) && attr.initializer.expression) {
+  if (import_typescript12.default.isJsxExpression(attr.initializer) && attr.initializer.expression) {
     let expr = attr.initializer.expression;
-    if (import_typescript11.default.isIdentifier(expr)) {
+    if (import_typescript12.default.isIdentifier(expr)) {
       const branchInit = ctx._branchScopeVars?.get(expr.text);
       if (branchInit && !initializerShapeContainsJsx(branchInit)) {
         expr = branchInit;
       }
     }
     expr = tryDesugarInterleaveTaggedTemplate(expr, ctx);
-    if (import_typescript11.default.isAwaitExpression(expr)) {
+    if (import_typescript12.default.isAwaitExpression(expr)) {
       ctx.analyzer.errors.push(createError(ErrorCodes.STAGE_AWAIT_IN_TEMPLATE, getSourceLocation(expr, ctx.sourceFile, ctx.filePath)));
       return AttrValueOf.expression("undefined");
     }
     checkBareSignalOrMemoIdentifier(expr, ctx);
-    if (attr.name.getText(ctx.sourceFile) === "style" && import_typescript11.default.isObjectLiteralExpression(expr)) {
+    if (attr.name.getText(ctx.sourceFile) === "style" && import_typescript12.default.isObjectLiteralExpression(expr)) {
       const cssString = tryStaticStyleObjectToCss(expr);
       if (cssString !== null) {
         return AttrValueOf.literal(cssString);
       }
     }
-    if (import_typescript11.default.isTemplateExpression(expr)) {
+    if (import_typescript12.default.isTemplateExpression(expr)) {
       const parts = parseTemplateLiteral(expr, ctx);
       if (parts.some((p) => p.type === "ternary" || p.type === "lookup")) {
         return AttrValueOf.template(parts);
       }
     }
-    if (import_typescript11.default.isElementAccessExpression(expr) && !import_typescript11.default.isStringLiteralLike(expr.argumentExpression) && !import_typescript11.default.isNumericLiteral(expr.argumentExpression)) {
+    if (import_typescript12.default.isElementAccessExpression(expr) && !import_typescript12.default.isStringLiteralLike(expr.argumentExpression) && !import_typescript12.default.isNumericLiteral(expr.argumentExpression)) {
       const parts = tryResolveTemplateSpanFromConst(expr, ctx);
       if (parts) {
         return AttrValueOf.template(parts);
       }
     }
-    if (import_typescript11.default.isIdentifier(expr)) {
+    if (import_typescript12.default.isIdentifier(expr)) {
       const resolved = tryResolveIdentifierAsTemplateLiteral(expr, ctx);
       if (resolved) {
         return AttrValueOf.template(resolved);
       }
     }
-    if (import_typescript11.default.isConditionalExpression(expr)) {
+    if (import_typescript12.default.isConditionalExpression(expr)) {
       const ternary = parseTernary(expr, ctx);
       if (ternary) {
         return AttrValueOf.template([ternary]);
       }
     }
-    if (import_typescript11.default.isBinaryExpression(expr) && expr.operatorToken.kind === import_typescript11.default.SyntaxKind.BarBarToken) {
-      if (import_typescript11.default.isIdentifier(expr.right) && expr.right.text === "undefined") {
+    if (import_typescript12.default.isBinaryExpression(expr) && expr.operatorToken.kind === import_typescript12.default.SyntaxKind.BarBarToken) {
+      if (import_typescript12.default.isIdentifier(expr.right) && expr.right.text === "undefined") {
         const baseExpr = ctx.getJS(expr.left);
         return AttrValueOf.expression(baseExpr, { presenceOrUndefined: true });
       }
@@ -197363,11 +197546,11 @@ function getAttributeValue(attr, ctx) {
 function tryStaticStyleObjectToCss(expr) {
   const parts = [];
   for (const prop of expr.properties) {
-    if (!import_typescript11.default.isPropertyAssignment(prop))
+    if (!import_typescript12.default.isPropertyAssignment(prop))
       return null;
-    if (!import_typescript11.default.isIdentifier(prop.name) && !import_typescript11.default.isStringLiteral(prop.name))
+    if (!import_typescript12.default.isIdentifier(prop.name) && !import_typescript12.default.isStringLiteral(prop.name))
       return null;
-    if (!import_typescript11.default.isStringLiteral(prop.initializer))
+    if (!import_typescript12.default.isStringLiteral(prop.initializer))
       return null;
     const key = cssKebabCase(prop.name.text);
     parts.push(`${key}:${prop.initializer.text}`);
@@ -197380,7 +197563,7 @@ function parseTemplateLiteral(expr, ctx) {
     parts.push({ type: "string", value: expr.head.text });
   }
   for (const span of expr.templateSpans) {
-    if (import_typescript11.default.isConditionalExpression(span.expression)) {
+    if (import_typescript12.default.isConditionalExpression(span.expression)) {
       const ternary = parseTernary(span.expression, ctx);
       if (ternary) {
         parts.push(ternary);
@@ -197406,8 +197589,8 @@ function parseTemplateLiteral(expr, ctx) {
   return parts;
 }
 function tryResolveTemplateSpanFromConst(expr, ctx) {
-  if (import_typescript11.default.isIdentifier(expr)) {
-    if (ctx.loopParams.has(expr.text))
+  if (import_typescript12.default.isIdentifier(expr)) {
+    if (ctx.scope.isBound(expr.text))
       return null;
     const constInfo = findLocalConst(expr.text, ctx.analyzer);
     if (!constInfo)
@@ -197415,31 +197598,31 @@ function tryResolveTemplateSpanFromConst(expr, ctx) {
     const ast = parseConstInitializer(constInfo);
     if (!ast)
       return null;
-    if (import_typescript11.default.isStringLiteral(ast) || import_typescript11.default.isNoSubstitutionTemplateLiteral(ast)) {
+    if (import_typescript12.default.isStringLiteral(ast) || import_typescript12.default.isNoSubstitutionTemplateLiteral(ast)) {
       return [{ type: "string", value: ast.text }];
     }
     return null;
   }
-  if (import_typescript11.default.isElementAccessExpression(expr)) {
-    if (!import_typescript11.default.isIdentifier(expr.expression))
+  if (import_typescript12.default.isElementAccessExpression(expr)) {
+    if (!import_typescript12.default.isIdentifier(expr.expression))
       return null;
-    if (ctx.loopParams.has(expr.expression.text))
+    if (ctx.scope.isBound(expr.expression.text))
       return null;
     const constInfo = findLocalConst(expr.expression.text, ctx.analyzer);
     if (!constInfo)
       return null;
     const ast = parseConstInitializer(constInfo);
-    if (!ast || !import_typescript11.default.isObjectLiteralExpression(ast))
+    if (!ast || !import_typescript12.default.isObjectLiteralExpression(ast))
       return null;
     const cases = {};
     for (const prop of ast.properties) {
-      if (!import_typescript11.default.isPropertyAssignment(prop))
+      if (!import_typescript12.default.isPropertyAssignment(prop))
         return null;
-      const keyName = prop.name && (import_typescript11.default.isStringLiteral(prop.name) || import_typescript11.default.isIdentifier(prop.name)) ? prop.name.text : null;
+      const keyName = prop.name && (import_typescript12.default.isStringLiteral(prop.name) || import_typescript12.default.isIdentifier(prop.name)) ? prop.name.text : null;
       if (!keyName)
         return null;
       const value = prop.initializer;
-      if (import_typescript11.default.isStringLiteral(value) || import_typescript11.default.isNoSubstitutionTemplateLiteral(value)) {
+      if (import_typescript12.default.isStringLiteral(value) || import_typescript12.default.isNoSubstitutionTemplateLiteral(value)) {
         cases[keyName] = value.text;
       } else {
         return null;
@@ -197486,23 +197669,23 @@ function hasDynamicTagBinding(name, sourceFile) {
   const visit2 = (node) => {
     if (found)
       return;
-    if (import_typescript11.default.isVariableDeclaration(node) && import_typescript11.default.isIdentifier(node.name) && node.name.text === name && node.initializer) {
+    if (import_typescript12.default.isVariableDeclaration(node) && import_typescript12.default.isIdentifier(node.name) && node.name.text === name && node.initializer) {
       let init = node.initializer;
-      while (import_typescript11.default.isAsExpression(init) || import_typescript11.default.isSatisfiesExpression(init) || import_typescript11.default.isParenthesizedExpression(init) || import_typescript11.default.isNonNullExpression(init)) {
+      while (import_typescript12.default.isAsExpression(init) || import_typescript12.default.isSatisfiesExpression(init) || import_typescript12.default.isParenthesizedExpression(init) || import_typescript12.default.isNonNullExpression(init)) {
         init = init.expression;
       }
-      if (import_typescript11.default.isPropertyAccessExpression(init) && init.name.text === "tag") {
+      if (import_typescript12.default.isPropertyAccessExpression(init) && init.name.text === "tag") {
         found = true;
         return;
       }
     }
-    import_typescript11.default.forEachChild(node, visit2);
+    import_typescript12.default.forEachChild(node, visit2);
   };
   visit2(sourceFile);
   return found;
 }
 function tryResolveIdentifierAsTemplateLiteral(ident, ctx) {
-  if (ctx.loopParams.has(ident.text))
+  if (ctx.scope.isBound(ident.text))
     return null;
   const constInfo = findLocalConst(ident.text, ctx.analyzer);
   if (!constInfo)
@@ -197510,13 +197693,13 @@ function tryResolveIdentifierAsTemplateLiteral(ident, ctx) {
   const ast = parseConstInitializer(constInfo);
   if (!ast)
     return null;
-  if (import_typescript11.default.isNoSubstitutionTemplateLiteral(ast) || import_typescript11.default.isStringLiteral(ast)) {
+  if (import_typescript12.default.isNoSubstitutionTemplateLiteral(ast) || import_typescript12.default.isStringLiteral(ast)) {
     return [{ type: "string", value: ast.text }];
   }
-  if (import_typescript11.default.isElementAccessExpression(ast) && !import_typescript11.default.isStringLiteralLike(ast.argumentExpression) && !import_typescript11.default.isNumericLiteral(ast.argumentExpression)) {
+  if (import_typescript12.default.isElementAccessExpression(ast) && !import_typescript12.default.isStringLiteralLike(ast.argumentExpression) && !import_typescript12.default.isNumericLiteral(ast.argumentExpression)) {
     return tryResolveTemplateSpanFromConst(ast, ctx);
   }
-  if (!import_typescript11.default.isTemplateExpression(ast))
+  if (!import_typescript12.default.isTemplateExpression(ast))
     return null;
   let resolvedAny = false;
   const parts = [];
@@ -197554,14 +197737,14 @@ function parseConstInitializerImpl(c) {
   if (!c.value)
     return null;
   const wrapped = `const __bf_resolve__ = (${c.value})`;
-  const sf = import_typescript11.default.createSourceFile("__bf_resolve.ts", wrapped, import_typescript11.default.ScriptTarget.Latest, true, import_typescript11.default.ScriptKind.TS);
+  const sf = import_typescript12.default.createSourceFile("__bf_resolve.ts", wrapped, import_typescript12.default.ScriptTarget.Latest, true, import_typescript12.default.ScriptKind.TS);
   const stmt = sf.statements[0];
-  if (!stmt || !import_typescript11.default.isVariableStatement(stmt))
+  if (!stmt || !import_typescript12.default.isVariableStatement(stmt))
     return null;
   const decl = stmt.declarationList.declarations[0];
   if (!decl?.initializer)
     return null;
-  return import_typescript11.default.isParenthesizedExpression(decl.initializer) ? decl.initializer.expression : decl.initializer;
+  return import_typescript12.default.isParenthesizedExpression(decl.initializer) ? decl.initializer.expression : decl.initializer;
 }
 function astText(node) {
   return node.getText(node.getSourceFile());
@@ -197581,9 +197764,9 @@ function parseFunctionInfoAsExprImpl(fn) {
   const params = fn.typedParams !== undefined ? fn.typedParams : fn.params.map(formatParamWithType).join(", ");
   const body = fn.typedBody ?? fn.body;
   const wrapped = `const __bf_resolve_fn__ = function(${params}) ${body}`;
-  const sf = import_typescript11.default.createSourceFile("__bf_resolve_fn.ts", wrapped, import_typescript11.default.ScriptTarget.Latest, true, import_typescript11.default.ScriptKind.TS);
+  const sf = import_typescript12.default.createSourceFile("__bf_resolve_fn.ts", wrapped, import_typescript12.default.ScriptTarget.Latest, true, import_typescript12.default.ScriptKind.TS);
   const stmt = sf.statements[0];
-  if (!stmt || !import_typescript11.default.isVariableStatement(stmt))
+  if (!stmt || !import_typescript12.default.isVariableStatement(stmt))
     return null;
   const decl = stmt.declarationList.declarations[0];
   if (!decl?.initializer)
@@ -197591,9 +197774,9 @@ function parseFunctionInfoAsExprImpl(fn) {
   return decl.initializer;
 }
 function tryDesugarInterleaveTaggedTemplate(expr, ctx) {
-  if (!import_typescript11.default.isTaggedTemplateExpression(expr))
+  if (!import_typescript12.default.isTaggedTemplateExpression(expr))
     return expr;
-  if (!import_typescript11.default.isIdentifier(expr.tag))
+  if (!import_typescript12.default.isIdentifier(expr.tag))
     return expr;
   const resolvedTag = resolveInterleaveTagIdentifier(expr.tag.text, ctx);
   if (!resolvedTag)
@@ -197610,23 +197793,23 @@ function resolveInterleaveTagIdentifier(name, ctx) {
     return null;
   if (constInfo) {
     const ast = parseConstInitializer(constInfo);
-    return ast && (import_typescript11.default.isArrowFunction(ast) || import_typescript11.default.isFunctionExpression(ast)) ? ast : null;
+    return ast && (import_typescript12.default.isArrowFunction(ast) || import_typescript12.default.isFunctionExpression(ast)) ? ast : null;
   }
   if (fnInfo) {
     const ast = parseFunctionInfoAsExpr(fnInfo);
-    return ast && (import_typescript11.default.isArrowFunction(ast) || import_typescript11.default.isFunctionExpression(ast)) ? ast : null;
+    return ast && (import_typescript12.default.isArrowFunction(ast) || import_typescript12.default.isFunctionExpression(ast)) ? ast : null;
   }
   return null;
 }
 function isInterleaveTagFunction(fn) {
-  if (!import_typescript11.default.isArrowFunction(fn) && !import_typescript11.default.isFunctionExpression(fn))
+  if (!import_typescript12.default.isArrowFunction(fn) && !import_typescript12.default.isFunctionExpression(fn))
     return false;
   if (fn.parameters.length !== 2)
     return false;
   const [partsParam, argsParam] = fn.parameters;
-  if (!import_typescript11.default.isIdentifier(partsParam.name) || partsParam.dotDotDotToken)
+  if (!import_typescript12.default.isIdentifier(partsParam.name) || partsParam.dotDotDotToken)
     return false;
-  if (!import_typescript11.default.isIdentifier(argsParam.name) || !argsParam.dotDotDotToken)
+  if (!import_typescript12.default.isIdentifier(argsParam.name) || !argsParam.dotDotDotToken)
     return false;
   const parsed = tsNodeToParsedExpr(fn);
   if (parsed.kind !== "arrow")
@@ -197683,7 +197866,7 @@ function isInterleaveSpanExpr(expr, i2, argsName) {
 function buildUntaggedTemplateLiteral(node, ctx) {
   const template = node.template;
   let text;
-  if (import_typescript11.default.isNoSubstitutionTemplateLiteral(template)) {
+  if (import_typescript12.default.isNoSubstitutionTemplateLiteral(template)) {
     text = "`" + (template.rawText ?? template.text) + "`";
   } else {
     let body = template.head.rawText ?? template.head.text;
@@ -197695,15 +197878,15 @@ function buildUntaggedTemplateLiteral(node, ctx) {
     text = "`" + body + "`";
   }
   const wrapped = `const __bf_resolve_tagged__ = (${text})`;
-  const sf = import_typescript11.default.createSourceFile("__bf_resolve_tagged.tsx", wrapped, import_typescript11.default.ScriptTarget.Latest, true, import_typescript11.default.ScriptKind.TSX);
+  const sf = import_typescript12.default.createSourceFile("__bf_resolve_tagged.tsx", wrapped, import_typescript12.default.ScriptTarget.Latest, true, import_typescript12.default.ScriptKind.TSX);
   const stmt = sf.statements[0];
-  if (!stmt || !import_typescript11.default.isVariableStatement(stmt))
+  if (!stmt || !import_typescript12.default.isVariableStatement(stmt))
     return null;
   const decl = stmt.declarationList.declarations[0];
   if (!decl?.initializer)
     return null;
-  const result = import_typescript11.default.isParenthesizedExpression(decl.initializer) ? decl.initializer.expression : decl.initializer;
-  if (!import_typescript11.default.isTemplateExpression(result) && !import_typescript11.default.isNoSubstitutionTemplateLiteral(result))
+  const result = import_typescript12.default.isParenthesizedExpression(decl.initializer) ? decl.initializer.expression : decl.initializer;
+  if (!import_typescript12.default.isTemplateExpression(result) && !import_typescript12.default.isNoSubstitutionTemplateLiteral(result))
     return null;
   return result;
 }
@@ -197723,10 +197906,10 @@ function parseTernary(expr, ctx) {
   return null;
 }
 function getStringValue(node) {
-  if (import_typescript11.default.isStringLiteral(node)) {
+  if (import_typescript12.default.isStringLiteral(node)) {
     return node.text;
   }
-  if (import_typescript11.default.isNoSubstitutionTemplateLiteral(node)) {
+  if (import_typescript12.default.isNoSubstitutionTemplateLiteral(node)) {
     return node.text;
   }
   return null;
@@ -197734,19 +197917,19 @@ function getStringValue(node) {
 function processComponentProps(attributes, ctx) {
   const props = [];
   for (const attr of attributes.properties) {
-    if (import_typescript11.default.isJsxSpreadAttribute(attr)) {
+    if (import_typescript12.default.isJsxSpreadAttribute(attr)) {
       props.push(...expandSpreadAttribute(attr, ctx));
       continue;
     }
-    if (!import_typescript11.default.isJsxAttribute(attr))
+    if (!import_typescript12.default.isJsxAttribute(attr))
       continue;
     const name = attr.name.getText(ctx.sourceFile);
-    if (attr.initializer && import_typescript11.default.isJsxExpression(attr.initializer) && attr.initializer.expression) {
+    if (attr.initializer && import_typescript12.default.isJsxExpression(attr.initializer) && attr.initializer.expression) {
       let jsxExpr = attr.initializer.expression;
-      while (import_typescript11.default.isParenthesizedExpression(jsxExpr)) {
+      while (import_typescript12.default.isParenthesizedExpression(jsxExpr)) {
         jsxExpr = jsxExpr.expression;
       }
-      if (import_typescript11.default.isJsxElement(jsxExpr) || import_typescript11.default.isJsxSelfClosingElement(jsxExpr) || import_typescript11.default.isJsxFragment(jsxExpr)) {
+      if (import_typescript12.default.isJsxElement(jsxExpr) || import_typescript12.default.isJsxSelfClosingElement(jsxExpr) || import_typescript12.default.isJsxFragment(jsxExpr)) {
         const prevInsideComponentChildren = ctx.insideComponentChildren;
         ctx.insideComponentChildren = true;
         const irNode = transformNode(jsxExpr, ctx);
@@ -197763,8 +197946,8 @@ function processComponentProps(attributes, ctx) {
     }
     let value = getAttributeValue(attr, ctx);
     if (value.kind === "template") {
-      const collapsed = templatePartsToJsString(value.parts);
-      const collapsedTemplate = templatePartsToJsString(value.parts, { useTemplate: true });
+      const collapsed = templatePartsToJsExpr(value.parts);
+      const collapsedTemplate = templatePartsToJsExpr(value.parts, { useTemplate: true });
       value = AttrValueOf.expression(collapsed, {
         parts: value.parts,
         ...collapsedTemplate !== collapsed && { templateExpr: collapsedTemplate }
@@ -197773,7 +197956,7 @@ function processComponentProps(attributes, ctx) {
       value = AttrValueOf.booleanShorthand();
     }
     let clientOnly;
-    if (attr.initializer && import_typescript11.default.isJsxExpression(attr.initializer) && attr.initializer.expression) {
+    if (attr.initializer && import_typescript12.default.isJsxExpression(attr.initializer) && attr.initializer.expression) {
       if (value.kind === "expression" && value.templateExpr === undefined) {
         const rewritten = rewriteBarePropRefs2(value.expr, attr.initializer.expression, ctx);
         if (rewritten !== value.expr) {
@@ -197796,25 +197979,8 @@ function processComponentProps(attributes, ctx) {
   }
   return props;
 }
-function templatePartsToJsString(parts, opts) {
-  let result = "`";
-  for (const part of parts) {
-    if (part.type === "string") {
-      result += opts?.useTemplate && part.templateValue ? part.templateValue : part.value;
-    } else if (part.type === "ternary") {
-      const cond = opts?.useTemplate && part.templateCondition ? part.templateCondition : part.condition;
-      result += `\${${cond} ? '${part.whenTrue}' : '${part.whenFalse}'}`;
-    } else if (part.type === "lookup") {
-      const key = opts?.useTemplate && part.templateKey ? part.templateKey : part.key;
-      const obj = "{" + Object.entries(part.cases).map(([k, v]) => `${JSON.stringify(k)}: ${JSON.stringify(v)}`).join(", ") + "}";
-      result += `\${(${obj})[${key}]}`;
-    }
-  }
-  result += "`";
-  return result;
-}
 function checkBareSignalOrMemoIdentifier(expr, ctx) {
-  if (!import_typescript11.default.isIdentifier(expr))
+  if (!import_typescript12.default.isIdentifier(expr))
     return;
   const name = expr.text;
   for (const signal of ctx.analyzer.signals) {
@@ -197845,12 +198011,12 @@ function checkBareSignalOrMemoIdentifier(expr, ctx) {
 function isArrayExprDirectPropRef(arrayExpr, ctx) {
   const propNames = new Set(ctx.patterns.props.map((p) => p.name));
   const propsObjName = ctx.analyzer.propsObjectName;
-  if (import_typescript11.default.isIdentifier(arrayExpr)) {
+  if (import_typescript12.default.isIdentifier(arrayExpr)) {
     return propNames.has(arrayExpr.text);
   }
-  if (import_typescript11.default.isPropertyAccessExpression(arrayExpr) && propsObjName) {
+  if (import_typescript12.default.isPropertyAccessExpression(arrayExpr) && propsObjName) {
     const obj = arrayExpr.expression;
-    if (import_typescript11.default.isIdentifier(obj) && obj.text === propsObjName) {
+    if (import_typescript12.default.isIdentifier(obj) && obj.text === propsObjName) {
       return true;
     }
   }
@@ -197868,9 +198034,10 @@ function isSignalOrMemoArray(array, ctx) {
   return false;
 }
 function referencesLoopParam(expr, ctx) {
-  if (ctx.loopParams.size === 0)
+  const boundNames = ctx.scope.valueBoundNames();
+  if (boundNames.size === 0)
     return false;
-  for (const p of ctx.loopParams) {
+  for (const p of boundNames) {
     if (new RegExp(`\\b${p}\\b`).test(expr))
       return true;
   }
@@ -197950,8 +198117,9 @@ function hasReactiveAttributes(attrs, ctx) {
     if (isSignalOrMemoReference(valueToCheck, ctx) || isPropsReference(valueToCheck, ctx)) {
       return true;
     }
-    if (ctx.loopParams.size > 0) {
-      for (const p of ctx.loopParams) {
+    const scopeValueNames = ctx.scope.valueBoundNames();
+    if (scopeValueNames.size > 0) {
+      for (const p of scopeValueNames) {
         if (new RegExp(`\\b${p}\\b`).test(valueToCheck))
           return true;
       }
@@ -198043,7 +198211,7 @@ function buildIfStatementChain(analyzer, ctx, opts) {
         jsxBranchLocalNames.add(n);
     }
     for (const decl of condReturn.scopeVariables) {
-      if (import_typescript11.default.isIdentifier(decl.name) && decl.initializer) {
+      if (import_typescript12.default.isIdentifier(decl.name) && decl.initializer) {
         branchScopeVars.set(decl.name.text, decl.initializer);
         if (initializerShapeContainsJsx(decl.initializer)) {
           jsxBranchLocalNames.add(decl.name.text);
@@ -198110,7 +198278,7 @@ function buildIfStatementChain(analyzer, ctx, opts) {
     }
     const scopeVariables = [];
     for (const decl of condReturn.scopeVariables) {
-      if (import_typescript11.default.isIdentifier(decl.name) && decl.initializer) {
+      if (import_typescript12.default.isIdentifier(decl.name) && decl.initializer) {
         const init = ctx.getJS(decl.initializer);
         const typedInit = decl.initializer.getText(ctx.sourceFile);
         scopeVariables.push({
@@ -198248,13 +198416,13 @@ var KEYWORDS_AND_GLOBALS = new Set([
 ]);
 
 // ../jsx/src/ir-to-client-js/walk-prop-accesses.ts
-var import_typescript12 = __toESM(require_typescript(), 1);
+var import_typescript13 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/value-references.ts
-var import_typescript13 = __toESM(require_typescript(), 1);
+var import_typescript14 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/relocate.ts
-var import_typescript14 = __toESM(require_typescript(), 1);
+var import_typescript15 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/lowering-registry.ts
 var plugins = [];
@@ -198433,10 +198601,10 @@ function formatDateLocalNames(metadata) {
 }
 
 // ../jsx/src/ir-to-client-js/prune-unused-prop-extractions.ts
-var import_typescript15 = __toESM(require_typescript(), 1);
+var import_typescript16 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/ir-to-client-js/control-flow/plan/lazy-preamble.ts
-var import_typescript16 = __toESM(require_typescript(), 1);
+var import_typescript17 = __toESM(require_typescript(), 1);
 var NO_PREAMBLE = {
   lazySafe: true,
   facts: { declaredNames: new Set, freeNames: new Set }
@@ -198486,7 +198654,7 @@ var INERT_BINDING_GLOBALS = new Set([
 ]);
 
 // ../jsx/src/ir-to-client-js/emit-reactive.ts
-var import_typescript17 = __toESM(require_typescript(), 1);
+var import_typescript18 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/ir-to-client-js/control-flow/stringify/event-delegation.ts
 var NON_BUBBLING_EVENTS = new Set([
@@ -198501,7 +198669,7 @@ var NON_BUBBLING_EVENTS = new Set([
 ]);
 
 // ../jsx/src/ir-to-client-js/rewrite-props-object.ts
-var import_typescript18 = __toESM(require_typescript(), 1);
+var import_typescript19 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/ir-to-client-js/source-map.ts
 var BASE64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@@ -198592,21 +198760,21 @@ class SourceMapGenerator {
 }
 
 // ../jsx/src/preprocess-inline-jsx-callbacks.ts
-var import_typescript19 = __toESM(require_typescript(), 1);
+var import_typescript20 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/ssr-defaults.ts
-var import_typescript20 = __toESM(require_typescript(), 1);
+var import_typescript21 = __toESM(require_typescript(), 1);
 var UNRESOLVED = Symbol("unresolved");
 var NO_RETURN = Symbol("no-return");
 
 // ../jsx/src/augment-inherited-props.ts
-var import_typescript21 = __toESM(require_typescript(), 1);
+var import_typescript22 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/rich-type-refusal.ts
 var EMPTY_BINDINGS2 = new Map;
 // ../jsx/src/shared-program.ts
 init_path();
-var import_typescript22 = __toESM(require_typescript(), 1);
+var import_typescript24 = __toESM(require_typescript(), 1);
 // ../jsx/src/adapters/interface.ts
 class BaseAdapter {
   renderChildren(children) {
@@ -198682,7 +198850,7 @@ class JsxAdapter extends BaseAdapter {
       }
       const rawInitialValue = preserveTypes ? signal.typedInitialValue ?? signal.initialValue : signal.initialValue;
       const initialValue = rawInitialValue.trim().startsWith("{") ? `(${rawInitialValue})` : rawInitialValue;
-      const needsTypeAssertion = preserveTypes && !signal.typedInitialValue && signal.type.kind !== "unknown" && signal.type.kind !== "primitive";
+      const needsTypeAssertion = preserveTypes && !signal.typedInitialValue && signal.type.kind !== "unknown" && signal.type.kind !== "primitive" && signal.type.raw !== "object";
       if (needsTypeAssertion) {
         lines.push(`  const ${signal.getter} = () => ${initialValue} as ${signal.type.raw}`);
       } else {
@@ -198701,12 +198869,16 @@ class JsxAdapter extends BaseAdapter {
       const computation = preserveTypes ? memo.typedComputation ?? memo.computation : memo.computation;
       lines.push(`  const ${memo.name} = ${computation}`);
     }
+    const moduleScopeNames = this.moduleScopeDeclarationNames(ir);
     for (const constant of ir.metadata.localConstants) {
       if (constant.isExported)
         continue;
+      if (moduleScopeNames.has(constant.name))
+        continue;
       const keyword = constant.declarationKind ?? "const";
       if (!constant.value) {
-        lines.push(`  ${keyword} ${constant.name}`);
+        const typeAnnotation = preserveTypes && (constant.typeAnnotation ?? constant.type) ? `: ${constant.typeAnnotation ?? constant.type?.raw}` : "";
+        lines.push(`  ${keyword} ${constant.name}${typeAnnotation}`);
         continue;
       }
       const value = constant.value.trim();
@@ -198715,9 +198887,12 @@ class JsxAdapter extends BaseAdapter {
       if (!reachable.has(constant.name))
         continue;
       const constValue = preserveTypes ? constant.typedValue ?? constant.value : constant.value;
-      lines.push(`  ${keyword} ${constant.name} = ${constValue}`);
+      const letTypeAnnotation = preserveTypes && keyword === "let" && constant.typeAnnotation ? `: ${constant.typeAnnotation}` : "";
+      lines.push(`  ${keyword} ${constant.name}${letTypeAnnotation} = ${constValue}`);
     }
     for (const func of localFunctions) {
+      if (moduleScopeNames.has(func.name))
+        continue;
       if (!reachable.has(func.name))
         continue;
       const params = preserveTypes && func.typedParams !== undefined ? func.typedParams : func.params.map(formatParamWithType).join(", ");
@@ -198727,6 +198902,127 @@ class JsxAdapter extends BaseAdapter {
       lines.push(`  ${asyncKw}function ${func.name}(${params})${returnAnnotation} ${body}`);
     }
     return lines.join(`
+`);
+  }
+  moduleScopeNamesCache = new WeakMap;
+  moduleScopeDeclarationNames(ir) {
+    const cached = this.moduleScopeNamesCache.get(ir);
+    if (cached)
+      return cached;
+    const componentScope = new Set;
+    for (const sig of ir.metadata.signals) {
+      if (sig.isModule)
+        continue;
+      componentScope.add(sig.getter);
+      if (sig.setter)
+        componentScope.add(sig.setter);
+    }
+    for (const memo of ir.metadata.memos) {
+      if (!memo.isModule)
+        componentScope.add(memo.name);
+    }
+    for (const p of ir.metadata.propsParams)
+      componentScope.add(p.name);
+    if (ir.metadata.propsObjectName)
+      componentScope.add(ir.metadata.propsObjectName);
+    if (ir.metadata.restPropsName)
+      componentScope.add(ir.metadata.restPropsName);
+    for (const c of ir.metadata.localConstants) {
+      if (!c.isModule)
+        componentScope.add(c.name);
+    }
+    for (const f of ir.metadata.localFunctions) {
+      if (!f.isModule)
+        componentScope.add(f.name);
+    }
+    const exported = new Set;
+    const candidates = new Map;
+    for (const c of ir.metadata.localConstants) {
+      if (!c.isModule)
+        continue;
+      if (c.isJsx || c.isJsxFunction)
+        continue;
+      if (c.isExported) {
+        exported.add(c.name);
+        continue;
+      }
+      candidates.set(c.name, c.freeIdentifiers ?? extractFreeIdentifiersFromText(c.value ?? ""));
+    }
+    for (const f of ir.metadata.localFunctions) {
+      if (!f.isModule)
+        continue;
+      if (f.isJsxFunction || f.isMultiReturnJsxHelper)
+        continue;
+      if (f.isExported) {
+        exported.add(f.name);
+        continue;
+      }
+      const params = f.typedParams !== undefined ? f.typedParams : f.params.map(formatParamWithType).join(", ");
+      candidates.set(f.name, extractFreeIdentifiersFromText(`(${params}) => ${f.body}`));
+    }
+    const referencesAny = (refs, names) => {
+      for (const ref of refs) {
+        if (names.has(ref))
+          return true;
+      }
+      return false;
+    };
+    let changed = true;
+    while (changed) {
+      changed = false;
+      for (const [name, refs] of candidates) {
+        if (referencesAny(refs, componentScope)) {
+          candidates.delete(name);
+          componentScope.add(name);
+          changed = true;
+        }
+      }
+    }
+    const result = new Set([...exported, ...candidates.keys()]);
+    this.moduleScopeNamesCache.set(ir, result);
+    return result;
+  }
+  generateModuleScopeDeclarations(ir) {
+    const { preserveTypes } = this.jsxConfig;
+    const moduleNames = this.moduleScopeDeclarationNames(ir);
+    const entries = [];
+    for (const t of ir.metadata.typeDefinitions) {
+      entries.push({ line: t.loc.start.line, text: t.definition });
+    }
+    for (const c of ir.metadata.localConstants) {
+      if (!c.isModule || !moduleNames.has(c.name))
+        continue;
+      const keyword = c.declarationKind ?? "const";
+      const exportKw = c.isExported ? "export " : "";
+      if (!c.value) {
+        const typeAnnotation = preserveTypes && (c.typeAnnotation ?? c.type) ? `: ${c.typeAnnotation ?? c.type?.raw}` : "";
+        entries.push({ line: c.loc.start.line, text: `${exportKw}${keyword} ${c.name}${typeAnnotation}` });
+        continue;
+      }
+      const trimmed = c.value.trim();
+      if (/^new WeakMap\b/.test(trimmed))
+        continue;
+      if (c.isExported && /^createContext\b/.test(trimmed))
+        continue;
+      const value = preserveTypes ? c.typedValue ?? c.value : c.value;
+      const letTypeAnnotation = preserveTypes && keyword === "let" && c.typeAnnotation ? `: ${c.typeAnnotation}` : "";
+      entries.push({ line: c.loc.start.line, text: `${exportKw}${keyword} ${c.name}${letTypeAnnotation} = ${value}` });
+    }
+    for (const f of ir.metadata.localFunctions) {
+      if (!f.isModule || !moduleNames.has(f.name))
+        continue;
+      const params = preserveTypes && f.typedParams !== undefined ? f.typedParams : f.params.map(formatParamWithType).join(", ");
+      const returnAnnotation = preserveTypes && f.typedReturnType ? `: ${f.typedReturnType}` : "";
+      const body = preserveTypes ? f.typedBody ?? f.body : f.body;
+      const asyncKw = f.isAsync ? "async " : "";
+      const exportKw = f.isExported ? "export " : "";
+      entries.push({
+        line: f.loc.start.line,
+        text: `${exportKw}${asyncKw}function ${f.name}(${params})${returnAnnotation} ${body}`
+      });
+    }
+    entries.sort((a, b) => a.line - b.line);
+    return entries.map((e) => e.text).join(`
 `);
   }
   renderNodeRaw(node) {
@@ -198738,6 +199034,15 @@ class JsxAdapter extends BaseAdapter {
     }
     return this.renderNode(node);
   }
+  renderTemplatePartsAsJs(parts) {
+    return templatePartsToJsExpr(parts, { typed: this.jsxConfig.preserveTypes });
+  }
+  expressionValueToJs(value) {
+    if (this.jsxConfig.preserveTypes && value.parts && value.expr === templatePartsToJsExpr(value.parts)) {
+      return this.renderTemplatePartsAsJs(value.parts);
+    }
+    return value.expr;
+  }
   renderScopeMarker(instanceIdExpr) {
     return `${BF_SCOPE}={${instanceIdExpr}}`;
   }
@@ -198805,6 +199110,7 @@ class TestAdapter extends JsxAdapter {
   generate(ir) {
     this.componentName = ir.metadata.componentName;
     const imports = this.generateImports(ir);
+    const moduleConstants = this.generateModuleScopeDeclarations(ir);
     const types2 = this.generateTypes(ir);
     const component = this.generateComponent(ir);
     const defaultExport = ir.metadata.hasDefaultExport ? `
@@ -198813,9 +199119,11 @@ export default ${this.componentName}` : "";
       imports,
       types: types2 || "",
       component,
-      defaultExport
+      defaultExport,
+      moduleConstants,
+      moduleConstantsIncludeExports: true
     };
-    const template = [imports, types2, component].filter(Boolean).join(`
+    const template = [imports, moduleConstants, types2, component].filter(Boolean).join(`
 
 `) + defaultExport;
     return {
@@ -198846,9 +199154,6 @@ export default ${this.componentName}` : "";
   }
   generateTypes(ir) {
     const lines = [];
-    for (const typeDef of ir.metadata.typeDefinitions) {
-      lines.push(typeDef.definition);
-    }
     const propsTypeName = ir.metadata.propsType?.raw;
     if (propsTypeName && !ir.metadata.propsObjectName) {
       lines.push("");
@@ -198871,7 +199176,7 @@ export default ${this.componentName}` : "";
     const bodyRefText = [jsxBody, signalInits, scopeIdLine].join(`
 `);
     const bfScopeAlias = /\b__bfScope\b/.test(bodyRefText) ? "__bfScope" : "__bfScope: _bfScope";
-    const propsParams = ir.metadata.propsParams.map((p) => p.defaultValue ? `${p.name} = ${p.defaultValue}` : p.name).join(", ");
+    const propsParams = ir.metadata.propsParams.map((p) => propsDestructureBinding(p)).join(", ");
     const restPropsName = ir.metadata.restPropsName;
     const hydrationProps = `__instanceId, ${bfScopeAlias}`;
     const parts = [];
@@ -199018,13 +199323,7 @@ export default ${this.componentName}` : "";
   }
   flattenTemplate(value) {
     const v = value;
-    return "`" + v.parts.map((p) => {
-      if (p.type === "string")
-        return p.value;
-      if (p.type === "ternary")
-        return `\${${p.condition} ? '${p.whenTrue}' : '${p.whenFalse}'}`;
-      return `\${(${JSON.stringify(p.cases)})[${p.key}]}`;
-    }).join("") + "`";
+    return this.renderTemplatePartsAsJs(v.parts);
   }
   renderComponentProps(comp) {
     const parts = [];
@@ -199145,9 +199444,9 @@ function registerBuiltinLoweringPlugins() {
     registerLoweringPlugin(plugin);
 }
 // ../jsx/src/combine-client-js.ts
-var import_typescript23 = __toESM(require_typescript(), 1);
+var import_typescript25 = __toESM(require_typescript(), 1);
 // ../jsx/src/debug.ts
-var import_typescript24 = __toESM(require_typescript(), 1);
+var import_typescript26 = __toESM(require_typescript(), 1);
 function escapeForIdBoundary(name) {
   return name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -199239,7 +199538,7 @@ function resolveSetters(handler, setterToSignal, fnSetters) {
   return refs;
 }
 // ../jsx/src/profiler.ts
-var import_typescript25 = __toESM(require_typescript(), 1);
+var import_typescript27 = __toESM(require_typescript(), 1);
 
 // ../jsx/src/index.ts
 registerBuiltinLoweringPlugins();