@suss/adapter-typescript 0.22.2 → 0.22.3

package/dist/index.js

@@ -4647,6 +4647,26 @@ function resolveImportedLocalName(sourceFile, importModule, importName) {
   }
   return null;
 }
+function importedReferenceSpellings(sourceFile, importModule, importName) {
+  const spellings = [];
+  const localName = resolveImportedLocalName(
+    sourceFile,
+    importModule,
+    importName
+  );
+  if (localName !== null) {
+    spellings.push(localName);
+  }
+  if (!sourceFile.getFullText().includes(`.${importName}`)) {
+    return spellings;
+  }
+  for (const root of importedRootsOf(sourceFile, [importModule])) {
+    if (root !== importName) {
+      spellings.push(`${root}.${importName}`);
+    }
+  }
+  return spellings;
+}
 
 // src/discovery/resolveValue.ts
 import { Node as Node17 } from "ts-morph";
@@ -8093,13 +8113,13 @@ function collectMethodsCalledOnCallResults(sourceFile) {
   return called;
 }
 function registrationSubjectsOf(sourceFile, importModule, importName, resolution) {
-  const importedLocalName = resolveImportedLocalName(
+  const spellings = importedReferenceSpellings(
     sourceFile,
     importModule,
     importName
   );
   const subjects = /* @__PURE__ */ new Map();
-  if (importedLocalName === null) {
+  if (spellings.length === 0) {
     return subjects;
   }
   sourceFile.forEachDescendant((node) => {
@@ -8109,7 +8129,7 @@ function registrationSubjectsOf(sourceFile, importModule, importName, resolution
         return;
       }
       const calleeText = Node32.isCallExpression(init) || Node32.isNewExpression(init) ? init.getExpression().getText() : null;
-      if (calleeText === importedLocalName) {
+      if (calleeText !== null && spellings.includes(calleeText)) {
         subjects.set(node.getName(), init);
       }
       return;
@@ -8122,7 +8142,9 @@ function registrationSubjectsOf(sourceFile, importModule, importName, resolution
       return;
     }
     const typeText = typeNode.getText();
-    if (typeText === importedLocalName || typeText.startsWith(`${importedLocalName}<`)) {
+    if (spellings.some(
+      (spelling) => typeText === spelling || typeText.startsWith(`${spelling}<`)
+    )) {
       subjects.set(node.getName(), creationSiteBehind(node, resolution));
     }
   });
@@ -8166,17 +8188,17 @@ function registrationSubjectIdsOf(sourceFile, matches, resolution) {
   return ids;
 }
 function unboundConstructionsOf(sourceFile, importModule, importName) {
-  const importedLocalName = resolveImportedLocalName(
+  const spellings = importedReferenceSpellings(
     sourceFile,
     importModule,
     importName
   );
-  if (importedLocalName === null) {
+  if (spellings.length === 0) {
     return [];
   }
   const constructions = [];
   sourceFile.forEachDescendant((node) => {
-    if ((Node32.isCallExpression(node) || Node32.isNewExpression(node)) && node.getExpression().getText() === importedLocalName && !Node32.isVariableDeclaration(node.getParent())) {
+    if ((Node32.isCallExpression(node) || Node32.isNewExpression(node)) && spellings.includes(node.getExpression().getText()) && !Node32.isVariableDeclaration(node.getParent())) {
       constructions.push(node);
     }
   });
@@ -10213,202 +10235,15 @@ function tryMatchParameterCall(node, func, pattern, match) {
   return { node, terminal };
 }
 
-// src/terminals/jsx.ts
-import { Node as Node44 } from "ts-morph";
-function tryMatchJsxReturn(node, pattern) {
-  let expr;
-  let source;
-  if (Node44.isReturnStatement(node)) {
-    expr = node.getExpression();
-    source = node;
-  } else if (Node44.isArrowFunction(node)) {
-    const body = node.getBody();
-    if (body !== void 0 && !Node44.isBlock(body)) {
-      expr = body;
-      source = body;
-    }
-  }
-  if (expr === void 0 || source === void 0) {
-    return null;
-  }
-  const tree = jsxToRenderNode(expr);
-  if (tree === null) {
-    return null;
-  }
-  const component = tree.type === "element" ? tree.tag : "Fragment";
-  const terminal = {
-    kind: pattern.kind,
-    statusCode: null,
-    body: null,
-    exceptionType: null,
-    message: null,
-    component,
-    delegateTarget: null,
-    emitEvent: null,
-    renderTree: tree,
-    location: {
-      start: startLineOf(node),
-      end: endLineOf(node)
-    }
-  };
-  return { node, source, terminal };
-}
-function componentTargetOf(tagNode) {
-  if (!Node44.isIdentifier(tagNode) || !/^[A-Z]/.test(tagNode.getText())) {
-    return null;
-  }
-  const target = functionTargetOf(tagNode);
-  return target === null ? null : { file: target.file, name: target.name };
-}
-function jsxToRenderNode(node) {
-  if (Node44.isJsxElement(node)) {
-    const opening = node.getOpeningElement();
-    const tag = opening.getTagNameNode().getText();
-    const attrs = collectJsxAttributes(opening);
-    const target = componentTargetOf(opening.getTagNameNode());
-    const children = node.getJsxChildren().map(jsxChildToRenderNode).filter((n) => n !== null);
-    return {
-      type: "element",
-      tag,
-      children,
-      ...attrs !== null ? { attrs } : {},
-      ...target !== null ? { target } : {}
-    };
-  }
-  if (Node44.isJsxSelfClosingElement(node)) {
-    const tag = node.getTagNameNode().getText();
-    const attrs = collectJsxAttributes(node);
-    const target = componentTargetOf(node.getTagNameNode());
-    return {
-      type: "element",
-      tag,
-      children: [],
-      ...attrs !== null ? { attrs } : {},
-      ...target !== null ? { target } : {}
-    };
-  }
-  if (Node44.isJsxFragment(node)) {
-    const children = node.getJsxChildren().map(jsxChildToRenderNode).filter((n) => n !== null);
-    return { type: "element", tag: "Fragment", children };
-  }
-  if (Node44.isParenthesizedExpression(node)) {
-    return jsxToRenderNode(node.getExpression());
-  }
-  return null;
-}
-function collectJsxAttributes(opening) {
-  const entries = {};
-  for (const attr of opening.getAttributes()) {
-    if (Node44.isJsxSpreadAttribute(attr)) {
-      const exprText = attr.getExpression().getText();
-      entries[`...${exprText}`] = exprText;
-      continue;
-    }
-    if (!Node44.isJsxAttribute(attr)) {
-      continue;
-    }
-    const name = attr.getNameNode().getText();
-    const initializer = attr.getInitializer();
-    if (initializer === void 0) {
-      entries[name] = "";
-      continue;
-    }
-    if (Node44.isJsxExpression(initializer)) {
-      const inner = initializer.getExpression();
-      entries[name] = inner !== void 0 ? inner.getText() : "";
-      continue;
-    }
-    entries[name] = initializer.getText();
-  }
-  return Object.keys(entries).length > 0 ? entries : null;
-}
-function jsxChildToRenderNode(child) {
-  if (Node44.isJsxText(child)) {
-    const text = child.getLiteralText().trim();
-    if (text.length === 0) {
-      return null;
-    }
-    return { type: "text", value: text };
-  }
-  if (Node44.isJsxExpression(child)) {
-    const inner = child.getExpression();
-    if (inner === void 0) {
-      return null;
-    }
-    return jsxExpressionToRenderNode(inner);
-  }
-  if (Node44.isJsxElement(child) || Node44.isJsxSelfClosingElement(child) || Node44.isJsxFragment(child)) {
-    return jsxToRenderNode(child);
-  }
-  return null;
-}
-function jsxExpressionToRenderNode(expr) {
-  if (Node44.isParenthesizedExpression(expr)) {
-    return jsxExpressionToRenderNode(expr.getExpression());
-  }
-  if (Node44.isBinaryExpression(expr)) {
-    const op = expr.getOperatorToken().getText();
-    if (op === "&&") {
-      const right = renderAlternative(peelParens(expr.getRight()));
-      if (right.kind === "jsx") {
-        return {
-          type: "conditional",
-          condition: expr.getLeft().getText(),
-          whenTrue: right.node,
-          whenFalse: null
-        };
-      }
-    }
-  }
-  if (Node44.isConditionalExpression(expr)) {
-    const truthy = renderAlternative(peelParens(expr.getWhenTrue()));
-    const falsy = renderAlternative(peelParens(expr.getWhenFalse()));
-    if (truthy.kind === "jsx") {
-      return {
-        type: "conditional",
-        condition: expr.getCondition().getText(),
-        whenTrue: truthy.node,
-        whenFalse: falsy.kind === "jsx" ? falsy.node : null
-      };
-    }
-    if (falsy.kind === "jsx") {
-      return {
-        type: "conditional",
-        condition: `!(${expr.getCondition().getText()})`,
-        whenTrue: falsy.node,
-        whenFalse: null
-      };
-    }
-  }
-  return { type: "expression", sourceText: expr.getText() };
-}
-function renderAlternative(node) {
-  if (Node44.isNullLiteral(node)) {
-    return { kind: "noRender" };
-  }
-  if (Node44.isFalseLiteral(node)) {
-    return { kind: "noRender" };
-  }
-  if (Node44.isIdentifier(node) && node.getText() === "undefined") {
-    return { kind: "noRender" };
-  }
-  if (Node44.isJsxElement(node) || Node44.isJsxSelfClosingElement(node) || Node44.isJsxFragment(node)) {
-    const tree = jsxToRenderNode(node);
-    if (tree !== null) {
-      return { kind: "jsx", node: tree };
-    }
-  }
-  return { kind: "notStatic" };
-}
-
-// src/terminals/returns.ts
+// src/terminals/extract.ts
 import {
-  Node as Node49
+  Node as Node45
 } from "ts-morph";
+import { constantOf } from "@suss/values";
 
 // src/shapes/shapes.ts
 import {
-  Node as Node45,
+  Node as Node44,
   SyntaxKind as SyntaxKind10
 } from "ts-morph";
 
@@ -10869,35 +10704,35 @@ function extractShapeWithArguments(node, substitutions) {
 }
 function extractShapeInner(node) {
   const unwrapped2 = peelSyntax(node);
-  if (boundArguments !== null && Node45.isIdentifier(unwrapped2)) {
+  if (boundArguments !== null && Node44.isIdentifier(unwrapped2)) {
     const argument = boundArguments.get(unwrapped2.getText());
     if (argument !== void 0 && argument !== unwrapped2) {
       return extractShape(argument);
     }
   }
-  if (Node45.isObjectLiteralExpression(unwrapped2)) {
+  if (Node44.isObjectLiteralExpression(unwrapped2)) {
     return shapeFromObjectLiteral(unwrapped2);
   }
-  if (Node45.isArrayLiteralExpression(unwrapped2)) {
+  if (Node44.isArrayLiteralExpression(unwrapped2)) {
     return shapeFromArrayLiteral(unwrapped2);
   }
-  if (Node45.isStringLiteral(unwrapped2) || Node45.isNoSubstitutionTemplateLiteral(unwrapped2)) {
+  if (Node44.isStringLiteral(unwrapped2) || Node44.isNoSubstitutionTemplateLiteral(unwrapped2)) {
     return { type: "literal", value: unwrapped2.getLiteralValue() };
   }
-  if (Node45.isTemplateExpression(unwrapped2)) {
+  if (Node44.isTemplateExpression(unwrapped2)) {
     return { type: "text" };
   }
-  if (Node45.isNumericLiteral(unwrapped2)) {
+  if (Node44.isNumericLiteral(unwrapped2)) {
     return numericLiteralShape(
       unwrapped2.getLiteralValue(),
       unwrapped2.getText()
     );
   }
-  if (Node45.isPrefixUnaryExpression(unwrapped2)) {
+  if (Node44.isPrefixUnaryExpression(unwrapped2)) {
     const op = unwrapped2.getOperatorToken();
     if (op === SyntaxKind10.MinusToken || op === SyntaxKind10.PlusToken) {
       const inner = unwrapped2.getOperand();
-      if (Node45.isNumericLiteral(inner)) {
+      if (Node44.isNumericLiteral(inner)) {
         const v3 = inner.getLiteralValue();
         const signed = op === SyntaxKind10.MinusToken ? -v3 : v3;
         const rawBody = inner.getText();
@@ -10906,7 +10741,7 @@ function extractShapeInner(node) {
       }
     }
   }
-  if (Node45.isBigIntLiteral(unwrapped2)) {
+  if (Node44.isBigIntLiteral(unwrapped2)) {
     return { type: "ref", name: "bigint" };
   }
   const kind = unwrapped2.getKind();
@@ -10919,10 +10754,10 @@ function extractShapeInner(node) {
   if (kind === SyntaxKind10.NullKeyword) {
     return { type: "null" };
   }
-  if (Node45.isIdentifier(unwrapped2) && unwrapped2.getText() === "undefined") {
+  if (Node44.isIdentifier(unwrapped2) && unwrapped2.getText() === "undefined") {
     return { type: "undefined" };
   }
-  if (Node45.isConditionalExpression(unwrapped2)) {
+  if (Node44.isConditionalExpression(unwrapped2)) {
     const whenTrue = extractShape(unwrapped2.getWhenTrue());
     const whenFalse = extractShape(unwrapped2.getWhenFalse());
     const variants = [];
@@ -10953,7 +10788,7 @@ function shapeFromArrayLiteral(arr) {
   }
   const shapes = [];
   for (const el of elements) {
-    if (Node45.isSpreadElement(el)) {
+    if (Node44.isSpreadElement(el)) {
       const inner = el.getExpression();
       const innerShape = extractShape(inner);
       if (innerShape?.type === "array") {
@@ -10972,7 +10807,7 @@ function shapeFromObjectLiteral(obj) {
   const properties = {};
   const unresolvedSpreads = [];
   for (const prop of obj.getProperties()) {
-    if (Node45.isPropertyAssignment(prop)) {
+    if (Node44.isPropertyAssignment(prop)) {
       const name = propertyName2(prop);
       if (name === null) {
         continue;
@@ -10988,7 +10823,7 @@ function shapeFromObjectLiteral(obj) {
       };
       continue;
     }
-    if (Node45.isShorthandPropertyAssignment(prop)) {
+    if (Node44.isShorthandPropertyAssignment(prop)) {
       const name = prop.getName();
       const valueExpr = prop.getNameNode();
       properties[name] = extractShape(valueExpr) ?? {
@@ -10997,7 +10832,7 @@ function shapeFromObjectLiteral(obj) {
       };
       continue;
     }
-    if (Node45.isSpreadAssignment(prop)) {
+    if (Node44.isSpreadAssignment(prop)) {
       const expr = prop.getExpression();
       const spreadShape = extractShape(expr);
       if (spreadShape?.type === "record") {
@@ -11016,7 +10851,7 @@ function shapeFromObjectLiteral(obj) {
 }
 function propertyName2(prop) {
   const nameNode = prop.getNameNode();
-  if (Node45.isIdentifier(nameNode) || Node45.isStringLiteral(nameNode) || Node45.isNoSubstitutionTemplateLiteral(nameNode) || Node45.isNumericLiteral(nameNode)) {
+  if (Node44.isIdentifier(nameNode) || Node44.isStringLiteral(nameNode) || Node44.isNoSubstitutionTemplateLiteral(nameNode) || Node44.isNumericLiteral(nameNode)) {
     return nameNode.getText().replace(/^["']|["']$/g, "");
   }
   return null;
@@ -11042,24 +10877,20 @@ function collapseVariants2(shapes) {
 }
 
 // src/terminals/extract.ts
-import {
-  Node as Node46
-} from "ts-morph";
-import { constantOf } from "@suss/values";
 function unwrapAs(node) {
   return peelSyntax(node);
 }
 function unwrapJsonStringify(node) {
   const outer = unwrapAs(node);
-  if (!Node46.isCallExpression(outer)) {
+  if (!Node45.isCallExpression(outer)) {
     return node;
   }
   const callee = outer.getExpression();
-  if (!Node46.isPropertyAccessExpression(callee) || callee.getName() !== "stringify") {
+  if (!Node45.isPropertyAccessExpression(callee) || callee.getName() !== "stringify") {
     return node;
   }
   const receiver = callee.getExpression();
-  if (!Node46.isIdentifier(receiver) || receiver.getText() !== "JSON") {
+  if (!Node45.isIdentifier(receiver) || receiver.getText() !== "JSON") {
     return node;
   }
   const args = outer.getArguments();
@@ -11069,7 +10900,7 @@ function unwrapJsonStringify(node) {
   return unwrapAs(args[0]);
 }
 function substituted(value, ctx) {
-  if (ctx.substitutions === void 0 || !Node46.isIdentifier(value)) {
+  if (ctx.substitutions === void 0 || !Node45.isIdentifier(value)) {
     return value;
   }
   return ctx.substitutions.get(value.getText()) ?? value;
@@ -11082,10 +10913,10 @@ function extractStatusCode(ctx) {
   if (result !== null) {
     return result;
   }
-  if (ctx.extraction.defaultStatusCode !== void 0) {
-    return { type: "literal", value: ctx.extraction.defaultStatusCode };
-  }
-  return null;
+  return declaredStatusCode(ctx.extraction);
+}
+function declaredStatusCode(extraction) {
+  return extraction.defaultStatusCode !== void 0 ? { type: "literal", value: extraction.defaultStatusCode } : null;
 }
 function matchConstructorCode(ctorText, codes) {
   const fullMatch = codes[ctorText];
@@ -11113,10 +10944,10 @@ function statusFromProperty(obj, name, ctx) {
   if (prop === void 0) {
     return null;
   }
-  if (Node46.isShorthandPropertyAssignment(prop)) {
+  if (Node45.isShorthandPropertyAssignment(prop)) {
     return { type: "dynamic", sourceText: prop.getName() };
   }
-  if (!Node46.isPropertyAssignment(prop)) {
+  if (!Node45.isPropertyAssignment(prop)) {
     return null;
   }
   const value = prop.getInitializer();
@@ -11139,7 +10970,7 @@ function extractStatusCodeFromRule(ctx) {
       return null;
     }
     const first = ctx.throwCallArgs?.[0];
-    if (first !== void 0 && Node46.isNumericLiteral(first)) {
+    if (first !== void 0 && Node45.isNumericLiteral(first)) {
       const value = first.getLiteralValue();
       if (value >= 100 && value <= 599) {
         return { type: "literal", value };
@@ -11152,7 +10983,7 @@ function extractStatusCodeFromRule(ctx) {
       return null;
     }
     const arg = ctx.throwCallArgs[sc.position];
-    if (arg === void 0 || !Node46.isNewExpression(arg)) {
+    if (arg === void 0 || !Node45.isNewExpression(arg)) {
       return null;
     }
     const ctorText = arg.getExpression().getText();
@@ -11161,7 +10992,7 @@ function extractStatusCodeFromRule(ctx) {
   if (sc.from === "argumentProperty") {
     const args = ctx.throwCallArgs ?? ctx.calls?.[0]?.getArguments();
     const arg = args?.[sc.position];
-    if (arg === void 0 || !Node46.isObjectLiteralExpression(arg)) {
+    if (arg === void 0 || !Node45.isObjectLiteralExpression(arg)) {
       return null;
     }
     return statusFromProperty(arg, sc.name, ctx);
@@ -11171,8 +11002,8 @@ function extractStatusCodeFromRule(ctx) {
       return null;
     }
     for (const prop of ctx.returnedObj.getProperties()) {
-      if (!Node46.isPropertyAssignment(prop)) {
-        if (Node46.isShorthandPropertyAssignment(prop)) {
+      if (!Node45.isPropertyAssignment(prop)) {
+        if (Node45.isShorthandPropertyAssignment(prop)) {
           if (prop.getName() === sc.name) {
             const resolved = ctx.substitutions?.get(prop.getName());
             if (resolved !== void 0) {
@@ -11230,8 +11061,8 @@ function extractBody(ctx) {
       return null;
     }
     for (const prop of ctx.returnedObj.getProperties()) {
-      if (!Node46.isPropertyAssignment(prop)) {
-        if (Node46.isShorthandPropertyAssignment(prop)) {
+      if (!Node45.isPropertyAssignment(prop)) {
+        if (Node45.isShorthandPropertyAssignment(prop)) {
           if (prop.getName() === b.name) {
             const resolved = ctx.substitutions?.get(prop.getName());
             if (resolved !== void 0) {
@@ -11285,6 +11116,199 @@ function extractBody(ctx) {
   return null;
 }
 
+// src/terminals/jsx.ts
+import { Node as Node46 } from "ts-morph";
+function tryMatchJsxReturn(node, pattern) {
+  let expr;
+  let source;
+  if (Node46.isReturnStatement(node)) {
+    expr = node.getExpression();
+    source = node;
+  } else if (Node46.isArrowFunction(node)) {
+    const body = node.getBody();
+    if (body !== void 0 && !Node46.isBlock(body)) {
+      expr = body;
+      source = body;
+    }
+  }
+  if (expr === void 0 || source === void 0) {
+    return null;
+  }
+  const tree = jsxToRenderNode(expr);
+  if (tree === null) {
+    return null;
+  }
+  const component = tree.type === "element" ? tree.tag : "Fragment";
+  const terminal = {
+    kind: pattern.kind,
+    statusCode: null,
+    body: null,
+    exceptionType: null,
+    message: null,
+    component,
+    delegateTarget: null,
+    emitEvent: null,
+    renderTree: tree,
+    location: {
+      start: startLineOf(node),
+      end: endLineOf(node)
+    }
+  };
+  return { node, source, terminal };
+}
+function componentTargetOf(tagNode) {
+  if (!Node46.isIdentifier(tagNode) || !/^[A-Z]/.test(tagNode.getText())) {
+    return null;
+  }
+  const target = functionTargetOf(tagNode);
+  return target === null ? null : { file: target.file, name: target.name };
+}
+function jsxToRenderNode(node) {
+  if (Node46.isJsxElement(node)) {
+    const opening = node.getOpeningElement();
+    const tag = opening.getTagNameNode().getText();
+    const attrs = collectJsxAttributes(opening);
+    const target = componentTargetOf(opening.getTagNameNode());
+    const children = node.getJsxChildren().map(jsxChildToRenderNode).filter((n) => n !== null);
+    return {
+      type: "element",
+      tag,
+      children,
+      ...attrs !== null ? { attrs } : {},
+      ...target !== null ? { target } : {}
+    };
+  }
+  if (Node46.isJsxSelfClosingElement(node)) {
+    const tag = node.getTagNameNode().getText();
+    const attrs = collectJsxAttributes(node);
+    const target = componentTargetOf(node.getTagNameNode());
+    return {
+      type: "element",
+      tag,
+      children: [],
+      ...attrs !== null ? { attrs } : {},
+      ...target !== null ? { target } : {}
+    };
+  }
+  if (Node46.isJsxFragment(node)) {
+    const children = node.getJsxChildren().map(jsxChildToRenderNode).filter((n) => n !== null);
+    return { type: "element", tag: "Fragment", children };
+  }
+  if (Node46.isParenthesizedExpression(node)) {
+    return jsxToRenderNode(node.getExpression());
+  }
+  return null;
+}
+function collectJsxAttributes(opening) {
+  const entries = {};
+  for (const attr of opening.getAttributes()) {
+    if (Node46.isJsxSpreadAttribute(attr)) {
+      const exprText = attr.getExpression().getText();
+      entries[`...${exprText}`] = exprText;
+      continue;
+    }
+    if (!Node46.isJsxAttribute(attr)) {
+      continue;
+    }
+    const name = attr.getNameNode().getText();
+    const initializer = attr.getInitializer();
+    if (initializer === void 0) {
+      entries[name] = "";
+      continue;
+    }
+    if (Node46.isJsxExpression(initializer)) {
+      const inner = initializer.getExpression();
+      entries[name] = inner !== void 0 ? inner.getText() : "";
+      continue;
+    }
+    entries[name] = initializer.getText();
+  }
+  return Object.keys(entries).length > 0 ? entries : null;
+}
+function jsxChildToRenderNode(child) {
+  if (Node46.isJsxText(child)) {
+    const text = child.getLiteralText().trim();
+    if (text.length === 0) {
+      return null;
+    }
+    return { type: "text", value: text };
+  }
+  if (Node46.isJsxExpression(child)) {
+    const inner = child.getExpression();
+    if (inner === void 0) {
+      return null;
+    }
+    return jsxExpressionToRenderNode(inner);
+  }
+  if (Node46.isJsxElement(child) || Node46.isJsxSelfClosingElement(child) || Node46.isJsxFragment(child)) {
+    return jsxToRenderNode(child);
+  }
+  return null;
+}
+function jsxExpressionToRenderNode(expr) {
+  if (Node46.isParenthesizedExpression(expr)) {
+    return jsxExpressionToRenderNode(expr.getExpression());
+  }
+  if (Node46.isBinaryExpression(expr)) {
+    const op = expr.getOperatorToken().getText();
+    if (op === "&&") {
+      const right = renderAlternative(peelParens(expr.getRight()));
+      if (right.kind === "jsx") {
+        return {
+          type: "conditional",
+          condition: expr.getLeft().getText(),
+          whenTrue: right.node,
+          whenFalse: null
+        };
+      }
+    }
+  }
+  if (Node46.isConditionalExpression(expr)) {
+    const truthy = renderAlternative(peelParens(expr.getWhenTrue()));
+    const falsy = renderAlternative(peelParens(expr.getWhenFalse()));
+    if (truthy.kind === "jsx") {
+      return {
+        type: "conditional",
+        condition: expr.getCondition().getText(),
+        whenTrue: truthy.node,
+        whenFalse: falsy.kind === "jsx" ? falsy.node : null
+      };
+    }
+    if (falsy.kind === "jsx") {
+      return {
+        type: "conditional",
+        condition: `!(${expr.getCondition().getText()})`,
+        whenTrue: falsy.node,
+        whenFalse: null
+      };
+    }
+  }
+  return { type: "expression", sourceText: expr.getText() };
+}
+function renderAlternative(node) {
+  if (Node46.isNullLiteral(node)) {
+    return { kind: "noRender" };
+  }
+  if (Node46.isFalseLiteral(node)) {
+    return { kind: "noRender" };
+  }
+  if (Node46.isIdentifier(node) && node.getText() === "undefined") {
+    return { kind: "noRender" };
+  }
+  if (Node46.isJsxElement(node) || Node46.isJsxSelfClosingElement(node) || Node46.isJsxFragment(node)) {
+    const tree = jsxToRenderNode(node);
+    if (tree !== null) {
+      return { kind: "jsx", node: tree };
+    }
+  }
+  return { kind: "notStatic" };
+}
+
+// src/terminals/returns.ts
+import {
+  Node as Node49
+} from "ts-morph";
+
 // src/terminals/helperResolution.ts
 import { Node as Node47, SyntaxKind as SyntaxKind11 } from "ts-morph";
 function resolveHelperReturn(call, resolveCallee2) {
@@ -11856,10 +11880,9 @@ function tryMatchReturnStatement(node, pattern, func, allPatterns) {
   return null;
 }
 function buildReturnTerminal(locationNode, pattern, body) {
-  const statusCode = pattern.extraction.defaultStatusCode !== void 0 ? { type: "literal", value: pattern.extraction.defaultStatusCode } : null;
   const terminal = {
     kind: pattern.kind,
-    statusCode,
+    statusCode: declaredStatusCode(pattern.extraction),
     body,
     exceptionType: null,
     message: null,
@@ -12148,15 +12171,15 @@ function functionMayFallThrough(func) {
   }
   return true;
 }
-function makeFallthroughTerminal(func) {
+function makeFallthroughTerminal(func, pattern) {
   const body = func.getBody();
   const anchor = body ?? func;
   const line = endLineOf(anchor);
   return {
     node: anchor,
     terminal: {
-      kind: "return",
-      statusCode: null,
+      kind: pattern.kind,
+      statusCode: declaredStatusCode(pattern.extraction),
       body: null,
       exceptionType: null,
       message: null,
@@ -12276,15 +12299,15 @@ function extractRawBranches(func, terminalPatterns, invocationRecognizers = [],
     terminals.map(({ node }) => node),
     barriers
   );
-  const wantsFallthrough = terminalPatterns.some(
+  const fallthroughPattern = terminalPatterns.find(
     (p) => p.match.type === "functionFallthrough"
   );
-  if (wantsFallthrough && functionMayFallThrough(func)) {
+  if (fallthroughPattern !== void 0 && functionMayFallThrough(func)) {
     const hasDefaultTerminal = terminals.some(
       ({ node }) => (byTerminal.get(node) ?? []).some(isDefaultConditionList)
     );
     if (!hasDefaultTerminal) {
-      const synthetic = makeFallthroughTerminal(func);
+      const synthetic = makeFallthroughTerminal(func, fallthroughPattern);
       terminals.push(synthetic);
       const pathResult = computePathConditions(
         func,