@suss/adapter-typescript 0.22.2 → 0.22.4

package/dist/index.js

@@ -3716,6 +3716,18 @@ var ResolutionStore = class {
     const target = factKeyOf(value);
     return this.askAbout(target, "wanted", () => this.lookupObject(target));
   }
+  /**
+   * The function a call returns: `app.use(requireCaller(config))`
+   * registers what the factory gives back. A separate question from
+   * `resolveCallable`, which keeps a call unresolved on purpose so an
+   * unwrapping answer wins; this one is asked only after that has
+   * declined. Two returned functions give null, like every other
+   * single-answer question here.
+   */
+  resolveReturnedCallable(call) {
+    const target = factKeyOf(call);
+    return this.askAbout(target, "wanted", () => this.lookupReturned(target));
+  }
   /**
    * For a value that is neither a function nor an object, such as a
    * GraphQL document kept in a constant in another file.
@@ -4159,6 +4171,21 @@ var ResolutionStore = class {
     }
     return [...candidates][0];
   }
+  lookupReturned(call) {
+    this.derive();
+    const candidates = /* @__PURE__ */ new Set();
+    for (const target of this.answersFor("wantedGivesBack", nodeId(call))) {
+      const node = this.table.byId.get(target);
+      if (node === void 0 || !isFunctionRoot(node)) {
+        continue;
+      }
+      candidates.add(node);
+    }
+    if (candidates.size !== 1) {
+      return null;
+    }
+    return [...candidates][0];
+  }
   /**
    * Two candidates give null, since ambiguity is nothing. The value
    * itself is never a result either, or an identifier whose chain went
@@ -4647,6 +4674,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";
@@ -5266,7 +5313,27 @@ function functionValueOf(value, resolution) {
     return null;
   }
   const resolved = resolution.resolveCallable(written);
-  return resolved === null ? null : toFunctionRoot(resolved);
+  if (resolved !== null) {
+    return toFunctionRoot(resolved);
+  }
+  if (!Node17.isCallExpression(written)) {
+    return null;
+  }
+  const returned = resolution.resolveReturnedCallable(written);
+  return returned === null ? null : toFunctionRoot(returned);
+}
+function propertyNameOf(property) {
+  if (Node17.isPropertyAssignment(property) || Node17.isShorthandPropertyAssignment(property) || Node17.isMethodDeclaration(property)) {
+    return property.getName();
+  }
+  return null;
+}
+function propertyFunctionOf(property, resolution) {
+  if (Node17.isMethodDeclaration(property)) {
+    return property;
+  }
+  const held = propertyValueOf(property);
+  return held === null ? null : functionValueOf(held, resolution);
 }
 function objectLiteralOf(value, resolution) {
   return literalValueOf(
@@ -8093,13 +8160,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 +8176,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 +8189,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 +8235,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);
     }
   });
@@ -8738,7 +8807,7 @@ function discoverResolverMaps(sourceFile, match, kind, resolution) {
     }
     const schemaSdl = extractTypeDefsSdl(config, store);
     for (const typeProp of propertiesOf(resolversObj, store)) {
-      const typeName = resolverPropertyName(typeProp);
+      const typeName = propertyNameOf(typeProp);
       if (typeName === null || excludeTypes.has(typeName)) {
         continue;
       }
@@ -8747,11 +8816,11 @@ function discoverResolverMaps(sourceFile, match, kind, resolution) {
         continue;
       }
       for (const fieldProp of propertiesOf(typeObj, store)) {
-        const fieldName = resolverPropertyName(fieldProp);
+        const fieldName = propertyNameOf(fieldProp);
         if (fieldName === null) {
           continue;
         }
-        const fn = resolverPropertyFunction(fieldProp, store);
+        const fn = propertyFunctionOf(fieldProp, store);
         if (fn === null) {
           continue;
         }
@@ -8815,22 +8884,6 @@ function writtenSdl(expr) {
   }
   return null;
 }
-function resolverPropertyName(prop) {
-  if (Node36.isPropertyAssignment(prop) || Node36.isMethodDeclaration(prop)) {
-    return prop.getName();
-  }
-  if (Node36.isShorthandPropertyAssignment(prop)) {
-    return prop.getName();
-  }
-  return null;
-}
-function resolverPropertyFunction(prop, resolution) {
-  if (Node36.isMethodDeclaration(prop)) {
-    return prop;
-  }
-  const held = propertyValueOf(prop);
-  return held === null ? null : functionValueOf(held, resolution);
-}
 
 // src/discovery/index.ts
 function runPattern(sourceFile, pattern, resolution, mountPrefixes, expandedElsewhere) {
@@ -10213,202 +10266,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 +10735,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 +10772,7 @@ function extractShapeInner(node) {
       }
     }
   }
-  if (Node45.isBigIntLiteral(unwrapped2)) {
+  if (Node44.isBigIntLiteral(unwrapped2)) {
     return { type: "ref", name: "bigint" };
   }
   const kind = unwrapped2.getKind();
@@ -10919,10 +10785,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 +10819,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 +10838,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 +10854,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 +10863,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 +10882,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 +10908,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 +10931,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 +10944,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 +10975,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 +11001,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 +11014,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 +11023,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 +11033,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 +11092,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 +11147,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 +11911,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 +12202,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,
@@ -12242,7 +12296,7 @@ function countUnmatchedReturns(func, terminals, barriers = NO_BARRIERS) {
   });
   return unmatched;
 }
-function extractRawBranches(func, terminalPatterns, invocationRecognizers = [], accessRecognizers = [], barriers = NO_BARRIERS, resolution, originatesFrom, anchorCallsOf, resolveCallee2) {
+function extractRawBranches(func, terminalPatterns, invocationRecognizers = [], accessRecognizers = [], barriers = NO_BARRIERS, resolution, originatesFrom, anchorCallsOf, resolveCallee2, collectCallAccounting = false) {
   const terminals = findTerminals(
     func,
     terminalPatterns,
@@ -12276,15 +12330,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,
@@ -12330,8 +12384,8 @@ function extractRawBranches(func, terminalPatterns, invocationRecognizers = [],
     seenBranches.add(key);
     return true;
   });
+  const terminalNodes = new Set(terminals.map(({ node }) => node));
   if (invocations.length > 0) {
-    const terminalNodes = new Set(terminals.map(({ node }) => node));
     const sideEffects = invocations.filter(
       (i) => !writesTerminal(i.node, terminalNodes)
     );
@@ -12347,7 +12401,39 @@ function extractRawBranches(func, terminalPatterns, invocationRecognizers = [],
       branch.extraEffects = [...branch.extraEffects ?? [], ...extra];
     }
   }
-  return { branches: distinctBranches, terminals };
+  return {
+    branches: distinctBranches,
+    terminals,
+    ...collectCallAccounting ? {
+      callAccounting: invocations.map(
+        (site) => accountFor(site, terminalNodes, distinctBranches)
+      )
+    } : {}
+  };
+}
+function accountFor(site, terminalNodes, branches) {
+  const { node, line } = site;
+  const callee = node.getExpression().getText();
+  if (writesTerminal(node, terminalNodes)) {
+    return { node, callee, line, outcome: "terminal" };
+  }
+  const call = {
+    line,
+    alwaysRuns: site.alwaysRuns,
+    preconditions: preconditionsOf(site.effect)
+  };
+  if (branches.some((branch) => firesOn(call, branch))) {
+    return { node, callee, line, outcome: "invocation" };
+  }
+  const reachable = branches.some(
+    (branch) => site.alwaysRuns || runsBefore(line, branch.terminal.location.end)
+  );
+  return {
+    node,
+    callee,
+    line,
+    outcome: reachable ? "unrecorded" : "unreachable"
+  };
 }
 
 // src/bootstrap/sourceFileLookup.ts
@@ -12562,7 +12648,7 @@ function unwrapContractInit(init) {
   }
   return null;
 }
-function extractEndpointContract(endpointNode, pattern, framework) {
+function extractEndpointContract(endpointNode, pattern, framework, resolution) {
   if (!Node54.isObjectLiteralExpression(endpointNode)) {
     return null;
   }
@@ -12587,9 +12673,10 @@ function extractEndpointContract(endpointNode, pattern, framework) {
       }
     }
     if (propName === pattern.responseExtraction.property) {
-      const val = prop.getInitializer();
-      if (val !== void 0 && Node54.isObjectLiteralExpression(val)) {
-        for (const respProp of val.getProperties()) {
+      const written = prop.getInitializer();
+      const val = written === void 0 ? null : objectLiteralOf(written, resolution);
+      if (val !== null) {
+        for (const respProp of propertiesOf(val, resolution)) {
           if (!Node54.isPropertyAssignment(respProp)) {
             continue;
           }
@@ -12628,7 +12715,12 @@ function readContract(unit, pattern, framework, resolution) {
     if (endpointNode === null) {
       return null;
     }
-    return extractEndpointContract(endpointNode, pattern, framework);
+    return extractEndpointContract(
+      endpointNode,
+      pattern,
+      framework,
+      resolution
+    );
   }
   const routerInfo = findRouterCall(unit);
   if (routerInfo === null) {
@@ -12649,7 +12741,12 @@ function readContract(unit, pattern, framework, resolution) {
     if (endpointInit === void 0) {
       continue;
     }
-    return extractEndpointContract(endpointInit, pattern, framework);
+    return extractEndpointContract(
+      endpointInit,
+      pattern,
+      framework,
+      resolution
+    );
   }
   return null;
 }
@@ -12726,7 +12823,12 @@ function readContractForClientCall(callExpression, methodName, pattern, framewor
     if (endpointInit === void 0) {
       continue;
     }
-    return extractEndpointContract(endpointInit, pattern, framework);
+    return extractEndpointContract(
+      endpointInit,
+      pattern,
+      framework,
+      resolution
+    );
   }
   return null;
 }
@@ -13486,7 +13588,11 @@ function recordEdge(edgesByChild, candidate) {
 // src/discovery/wrapperIndex.ts
 import { Node as Node58 } from "ts-morph";
 import { joinMountedPath as joinMountedPath3 } from "@suss/resolution";
-var NO_WRAPPERS = { wrappersFor: () => [], unitsIn: () => [] };
+var NO_WRAPPERS = {
+  wrappersFor: () => [],
+  unfollowedFor: () => [],
+  unitsIn: () => []
+};
 var ANONYMOUS = "<anon>";
 function buildWrapperIndex(packsByFile, resolution, mountPrefixes) {
   const workByPack = /* @__PURE__ */ new Map();
@@ -13512,21 +13618,32 @@ function buildWrapperIndex(packsByFile, resolution, mountPrefixes) {
     }
   }
   const bySubject = /* @__PURE__ */ new Map();
+  const unfollowedBySubject = /* @__PURE__ */ new Map();
   const unitsByFile = /* @__PURE__ */ new Map();
+  const stopsSeen = /* @__PURE__ */ new Set();
   let found = false;
   for (const [packName, work] of workByPack) {
     const candidates = [];
     for (const { sourceFile, pattern, match, wraps } of work) {
-      candidates.push(
-        ...discoverWrapperRegistrations(
-          sourceFile,
-          pattern,
-          match,
-          wraps,
-          resolution,
-          mountPrefixes
-        )
+      const scan = discoverWrapperRegistrations(
+        sourceFile,
+        pattern,
+        match,
+        wraps,
+        resolution,
+        mountPrefixes
       );
+      candidates.push(...scan.candidates);
+      for (const { subjectId, callId, stop } of scan.unresolved) {
+        if (stopsSeen.has(callId)) {
+          continue;
+        }
+        stopsSeen.add(callId);
+        found = true;
+        const stops = unfollowedBySubject.get(subjectId) ?? [];
+        stops.push(stop);
+        unfollowedBySubject.set(subjectId, stops);
+      }
     }
     for (const candidate of mostSpecific(candidates)) {
       found = true;
@@ -13544,6 +13661,7 @@ function buildWrapperIndex(packsByFile, resolution, mountPrefixes) {
   }
   return {
     wrappersFor: (subjectId) => bySubject.get(subjectId) ?? [],
+    unfollowedFor: (subjectId) => unfollowedBySubject.get(subjectId) ?? [],
     unitsIn: (file, pack) => unitsByFile.get(unitKey(file, pack)) ?? []
   };
 }
@@ -13577,10 +13695,20 @@ function discoverWrapperRegistrations(sourceFile, pattern, match, wraps, resolut
     match.importName,
     resolution
   );
+  if ("constructorOption" in wraps) {
+    return discoverConstructorOptions(
+      sourceFile,
+      pattern,
+      wraps,
+      subjects,
+      resolution
+    );
+  }
   if (subjects.size === 0 && !storeCanFindSubjects(sourceFile, match, resolution)) {
-    return [];
+    return { candidates: [], unresolved: [] };
   }
   const candidates = [];
+  const unresolved = [];
   sourceFile.forEachDescendant((node) => {
     if (!Node58.isCallExpression(node)) {
       return;
@@ -13603,8 +13731,13 @@ function discoverWrapperRegistrations(sourceFile, pattern, match, wraps, resolut
     if (targetArg === void 0) {
       return;
     }
+    const subjectId = nodeId(subjectNode);
     const target = functionValueOf(targetArg, resolution);
     if (target === null) {
+      const stop = factoryStopOf(targetArg);
+      if (stop !== null) {
+        unresolved.push({ subjectId, callId: nodeId(node), stop });
+      }
       return;
     }
     if (wraps.arity !== void 0 && target.getParameters().length !== wraps.arity) {
@@ -13614,29 +13747,136 @@ function discoverWrapperRegistrations(sourceFile, pattern, match, wraps, resolut
     if (scope === null) {
       return;
     }
-    const subjectId = nodeId(subjectNode);
     const mountedScope = scope === void 0 ? void 0 : mountedAt(subjectId, mountPrefixes, scope);
-    const named2 = functionNameOrAnon(target) !== ANONYMOUS;
-    candidates.push({
-      subjectId,
-      callId: nodeId(node),
-      targetId: nodeId(target),
-      byArity: wraps.arity !== void 0,
-      target,
-      pattern,
-      registeredIn: sourceFile.getFilePath(),
-      named: named2,
-      reference: {
-        file: target.getSourceFile().getFilePath(),
-        // A function written out at the registration call has no name
-        // of its own, so it goes by the method that registered it.
-        name: named2 ? functionNameOrAnon(target) : wraps.method,
-        ...wraps.throwParam === void 0 ? {} : { onThrow: true },
-        ...mountedScope === void 0 ? {} : { scope: mountedScope }
-      }
-    });
+    candidates.push(
+      candidateOf(
+        {
+          subjectId,
+          callId: nodeId(node),
+          target,
+          label: labelFor(targetArg, wraps),
+          byArity: wraps.arity !== void 0,
+          onThrow: wraps.throwParam !== void 0,
+          scope: mountedScope
+        },
+        pattern,
+        sourceFile
+      )
+    );
   });
-  return candidates;
+  return { candidates, unresolved };
+}
+function discoverConstructorOptions(sourceFile, pattern, wraps, subjects, resolution) {
+  const candidates = [];
+  const unresolved = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const construction of subjects.values()) {
+    const subjectId = nodeId(construction);
+    if (seen.has(subjectId) || construction.getSourceFile() !== sourceFile) {
+      continue;
+    }
+    seen.add(subjectId);
+    const option = constructorOptionOf(construction, wraps, resolution);
+    if (option === void 0) {
+      continue;
+    }
+    const callId = nodeId(option);
+    const written = propertyValueOf(option);
+    const target = propertyFunctionOf(option, resolution);
+    if (target === null) {
+      const stop = written === null ? null : factoryStopOf(written);
+      if (stop !== null) {
+        unresolved.push({ subjectId, callId, stop });
+      }
+      continue;
+    }
+    candidates.push(
+      candidateOf(
+        {
+          subjectId,
+          callId,
+          target,
+          label: (written === null ? void 0 : factoryNameOf(written)) ?? wraps.constructorOption,
+          byArity: false,
+          onThrow: wraps.throwParam !== void 0,
+          scope: void 0
+        },
+        pattern,
+        sourceFile
+      )
+    );
+  }
+  return { candidates, unresolved };
+}
+function constructorOptionOf(construction, wraps, resolution) {
+  if (!(Node58.isNewExpression(construction) || Node58.isCallExpression(construction))) {
+    return void 0;
+  }
+  const optionsArg = construction.getArguments()[wraps.targetPosition];
+  if (optionsArg === void 0) {
+    return void 0;
+  }
+  const options = objectLiteralOf(optionsArg, resolution);
+  if (options === null) {
+    return void 0;
+  }
+  return propertiesOf(options, resolution).find(
+    (property) => propertyNameOf(property) === wraps.constructorOption
+  );
+}
+function candidateOf(registration, pattern, sourceFile) {
+  const { target, label, onThrow, scope } = registration;
+  const named2 = functionNameOrAnon(target) !== ANONYMOUS;
+  return {
+    subjectId: registration.subjectId,
+    callId: registration.callId,
+    targetId: nodeId(target),
+    byArity: registration.byArity,
+    target,
+    pattern,
+    registeredIn: sourceFile.getFilePath(),
+    named: named2,
+    reference: {
+      file: target.getSourceFile().getFilePath(),
+      name: named2 ? functionNameOrAnon(target) : label,
+      ...onThrow ? { onThrow: true } : {},
+      ...scope === void 0 ? {} : { scope }
+    }
+  };
+}
+function labelFor(targetArg, wraps) {
+  return factoryNameOf(targetArg) ?? wraps.method;
+}
+function factoryNameOf(targetArg) {
+  const written = factKeyOf(targetArg);
+  if (!Node58.isCallExpression(written)) {
+    return void 0;
+  }
+  const callee = written.getExpression();
+  if (Node58.isIdentifier(callee)) {
+    return callee.getText();
+  }
+  if (Node58.isPropertyAccessExpression(callee)) {
+    return callee.getName();
+  }
+  return void 0;
+}
+function factoryStopOf(targetArg) {
+  const written = factKeyOf(targetArg);
+  if (!Node58.isCallExpression(written)) {
+    return null;
+  }
+  const callee = factoryNameOf(targetArg);
+  if (callee === void 0) {
+    return null;
+  }
+  const reason = classifyStop(
+    declarationsBehind(written.getExpression().getSymbol())
+  );
+  if (!worthRecording(reason)) {
+    return null;
+  }
+  return { callee, reason: "unresolvedWrapper" };
 }
 function mountedAt(subjectId, mountPrefixes, scope) {
   const prefix = mountPrefixes?.prefixForId?.(subjectId) ?? "";
@@ -14011,22 +14251,23 @@ import { Node as Node60 } from "ts-morph";
 import { functionCallBinding, TargetPlacements } from "@suss/behavioral-ir";
 import { Database as Database3, evaluate as evaluate4, lit as lit4, rule as rule4, variable as variable2 } from "@suss/datalog";
 import { assembleSummary as assembleSummary2 } from "@suss/extractor";
+var GENERIC_TERMINALS = [
+  { kind: "return", match: { type: "returnStatement" }, extraction: {} },
+  { kind: "throw", match: { type: "throwExpression" }, extraction: {} },
+  {
+    // Implicit fall-through at the end of a function body: covers
+    // void-returning orchestrators that never write `return`.
+    kind: "return",
+    match: { type: "functionFallthrough" },
+    extraction: {}
+  }
+];
 var reachablePack = {
   name: "reachable",
   languages: ["typescript"],
   protocol: "in-process",
   discovery: [],
-  terminals: [
-    { kind: "return", match: { type: "returnStatement" }, extraction: {} },
-    { kind: "throw", match: { type: "throwExpression" }, extraction: {} },
-    {
-      // Implicit fall-through at the end of a function body: covers
-      // void-returning orchestrators that never write `return`.
-      kind: "return",
-      match: { type: "functionFallthrough" },
-      extraction: {}
-    }
-  ],
+  terminals: GENERIC_TERMINALS,
   inputMapping: { type: "allPositional" }
 };
 function nodeKey(func) {
@@ -15831,10 +16072,10 @@ var FUNCTION_FALLTHROUGH_TERMINAL = {
   match: { type: "functionFallthrough" },
   extraction: {}
 };
-function thrownValueAt(unit) {
-  return unit.pattern?.wraps?.throwParam;
+function frameworkValueAt(unit) {
+  return unit.pattern?.wraps?.throwParam ?? unit.pattern?.wraps?.resultParam;
 }
-function pastThrownValue(terminals, at) {
+function pastFrameworkValue(terminals, at) {
   if (at === void 0) {
     return terminals;
   }
@@ -15848,7 +16089,7 @@ function pastThrownValue(terminals, at) {
     } : pattern
   );
 }
-function rolesPastThrownValue(mapping, at) {
+function rolesPastFrameworkValue(mapping, at) {
   if (at === void 0 || mapping.type !== "positionalParams") {
     return mapping;
   }
@@ -15874,7 +16115,7 @@ function continuationTerminal(unit) {
 }
 function terminalsFor(unit, pack) {
   const declared = [
-    ...unit.terminals ?? pastThrownValue(pack.terminals, thrownValueAt(unit)),
+    ...unit.terminals ?? pastFrameworkValue(pack.terminals, frameworkValueAt(unit)),
     ...continuationTerminal(unit)
   ];
   if (unit.callSite === void 0) {
@@ -15892,7 +16133,7 @@ function readCodeStructure(unit, pack, invocationRecognizers, accessRecognizers,
   }
   const params = extractParameters(
     func,
-    unit.inputMapping ?? rolesPastThrownValue(pack.inputMapping, thrownValueAt(unit))
+    unit.inputMapping ?? rolesPastFrameworkValue(pack.inputMapping, frameworkValueAt(unit))
   );
   const extracted = extractRawBranches(
     func,
@@ -16394,8 +16635,10 @@ function extractFromSourceFile(sourceFile, frameworks, claimedUnits, options, ta
         }
       }
       const summary = assembleSummary3(raw, options);
-      if (unit.unfollowed !== void 0 && options?.gapHandling !== "silent") {
-        summary.gaps.push(unfollowedCallGap(unit.unfollowed));
+      if (options?.gapHandling !== "silent") {
+        for (const stop of unfollowedStopsOf(unit, wrappers)) {
+          summary.gaps.push(unfollowedCallGap(stop));
+        }
       }
       if (unit.metadata !== void 0 && Object.keys(unit.metadata).length > 0) {
         summary.metadata = {
@@ -16448,6 +16691,13 @@ function stampWrappers(raw, unit, wrappers) {
     recordFileDependency(wrapper.file);
   }
 }
+function unfollowedStopsOf(unit, wrappers) {
+  const stops = unit.unfollowed === void 0 ? [] : [unit.unfollowed];
+  if (wrappers === void 0 || unit.registrationSubjectId === void 0) {
+    return stops;
+  }
+  return [...stops, ...wrappers.unfollowedFor(unit.registrationSubjectId)];
+}
 function emitLibraryEnvReadMarkers(summaries, project, frameworks) {
   for (const pack of frameworks) {
     for (const declared of pack.libraryEnvVars ?? []) {
@@ -17162,7 +17412,7 @@ function createTypeScriptAdapter(suppliedConfig) {
       });
       const composed = timer.time(
         "composeWrappers",
-        () => composeWrappers(enriched)
+        () => composeWrappers(enriched, config.extractorOptions ?? {})
       );
       if (config.onTiming !== void 0) {
         config.onTiming(timer.report());
@@ -17786,6 +18036,8 @@ function stubEvidence(options) {
 }
 export {
   ADAPTER_VERSION,
+  GENERIC_TERMINALS,
+  NO_BARRIERS,
   ResolutionStore,
   TypeScriptWhySession,
   accessContextFor,
@@ -17806,6 +18058,7 @@ export {
   findNearestTsconfig,
   findTerminals,
   functionTargetOf,
+  hasBody,
   importDeclarationsOf,
   importedNamesOf,
   importedRootsOf,
@@ -17821,6 +18074,7 @@ export {
   resolveAliasedSymbol,
   resolveSubject,
   rootIdentifier,
+  startsItsOwnScope,
   stubEvidence,
   stubEvidenceIn,
   workspaceRootFor