@suss/adapter-typescript 0.1.1 → 0.2.0

package/dist/index.cjs

@@ -78,25 +78,25 @@ var import_ts_morph2 = require("ts-morph");
 var import_ts_morph = require("ts-morph");
 var MAX_LAYERS = 16;
 function peelSyntax(node) {
-  let current = node;
+  let current2 = node;
   for (let i = 0; i < MAX_LAYERS; i++) {
-    if (import_ts_morph.Node.isAsExpression(current) || import_ts_morph.Node.isTypeAssertion(current) || import_ts_morph.Node.isParenthesizedExpression(current) || import_ts_morph.Node.isNonNullExpression(current) || import_ts_morph.Node.isSatisfiesExpression(current)) {
-      current = current.getExpression();
+    if (import_ts_morph.Node.isAsExpression(current2) || import_ts_morph.Node.isTypeAssertion(current2) || import_ts_morph.Node.isParenthesizedExpression(current2) || import_ts_morph.Node.isNonNullExpression(current2) || import_ts_morph.Node.isSatisfiesExpression(current2)) {
+      current2 = current2.getExpression();
       continue;
     }
     break;
   }
-  return current;
+  return current2;
 }
 function peelParens(node) {
-  let current = node;
+  let current2 = node;
   for (let i = 0; i < MAX_LAYERS; i++) {
-    if (!import_ts_morph.Node.isParenthesizedExpression(current)) {
+    if (!import_ts_morph.Node.isParenthesizedExpression(current2)) {
       break;
     }
-    current = current.getExpression();
+    current2 = current2.getExpression();
   }
-  return current;
+  return current2;
 }
 
 // src/resolve/astResolve.ts
@@ -965,15 +965,15 @@ function collectAncestorConditionInfos(terminalNode, functionRoot) {
 }
 function collectAncestorConditionInfosBelow(terminalNode, stopNode) {
   const result = [];
-  let current = terminalNode;
-  while (current !== void 0 && current !== stopNode) {
-    const parent = current.getParent();
+  let current2 = terminalNode;
+  while (current2 !== void 0 && current2 !== stopNode) {
+    const parent = current2.getParent();
     if (parent !== void 0 && import_ts_morph6.Node.isIfStatement(parent)) {
       const thenBranch = parent.getThenStatement();
       const elseBranch = parent.getElseStatement();
       const expr = parent.getExpression();
-      const inThen = isAncestorOrSelf(thenBranch, current);
-      const inElse = elseBranch !== void 0 && isAncestorOrSelf(elseBranch, current);
+      const inThen = isAncestorOrSelf(thenBranch, current2);
+      const inElse = elseBranch !== void 0 && isAncestorOrSelf(elseBranch, current2);
       if (inThen) {
         result.unshift(
           makeConditionInfo(expr.getText(), "positive", "explicit", expr)
@@ -983,24 +983,24 @@ function collectAncestorConditionInfosBelow(terminalNode, stopNode) {
           makeConditionInfo(expr.getText(), "negative", "explicit", expr)
         );
       }
-    } else if (import_ts_morph6.Node.isCaseClause(current)) {
-      const switchStmt = current.getParent()?.getParent();
+    } else if (import_ts_morph6.Node.isCaseClause(current2)) {
+      const switchStmt = current2.getParent()?.getParent();
       if (switchStmt !== void 0 && import_ts_morph6.Node.isSwitchStatement(switchStmt)) {
         const switchExpr = switchStmt.getExpression().getText();
-        const labels = collectFallthroughCaseLabels(current);
+        const labels = collectFallthroughCaseLabels(current2);
         const condText = labels.length === 1 ? `${switchExpr} === ${labels[0]}` : labels.map((l) => `${switchExpr} === ${l}`).join(" || ");
         result.unshift(
           makeConditionInfo(condText, "positive", "explicit", null)
         );
       }
-    } else if (import_ts_morph6.Node.isCatchClause(current)) {
+    } else if (import_ts_morph6.Node.isCatchClause(current2)) {
       result.unshift(
         makeConditionInfo("catch", "positive", "catchBlock", null)
       );
     } else if (parent !== void 0 && import_ts_morph6.Node.isConditionalExpression(parent)) {
       const expr = parent.getCondition();
-      const inTrue = isAncestorOrSelf(parent.getWhenTrue(), current);
-      const inFalse = isAncestorOrSelf(parent.getWhenFalse(), current);
+      const inTrue = isAncestorOrSelf(parent.getWhenTrue(), current2);
+      const inFalse = isAncestorOrSelf(parent.getWhenFalse(), current2);
       if (inTrue) {
         result.unshift(
           makeConditionInfo(expr.getText(), "positive", "explicit", expr)
@@ -1013,7 +1013,7 @@ function collectAncestorConditionInfosBelow(terminalNode, stopNode) {
     } else if (parent !== void 0 && import_ts_morph6.Node.isBinaryExpression(parent)) {
       const op = parent.getOperatorToken().getText();
       const left = parent.getLeft();
-      if (current === parent.getRight() || isAncestorOrSelf(parent.getRight(), current)) {
+      if (current2 === parent.getRight() || isAncestorOrSelf(parent.getRight(), current2)) {
         if (op === "&&") {
           result.unshift(
             makeConditionInfo(left.getText(), "positive", "explicit", left)
@@ -1025,7 +1025,7 @@ function collectAncestorConditionInfosBelow(terminalNode, stopNode) {
         }
       }
     }
-    current = parent;
+    current2 = parent;
   }
   return result;
 }
@@ -1035,12 +1035,12 @@ function collectAncestorBranches(terminalNode, functionRoot) {
   );
 }
 function isAncestorOrSelf(maybeAncestor, node) {
-  let current = node;
-  while (current !== void 0) {
-    if (current === maybeAncestor) {
+  let current2 = node;
+  while (current2 !== void 0) {
+    if (current2 === maybeAncestor) {
       return true;
     }
-    current = current.getParent();
+    current2 = current2.getParent();
   }
   return false;
 }
@@ -1560,12 +1560,12 @@ function degradedResult(func, terminalNodes, reason) {
   return { byTerminal, fallthrough: [[marker]] };
 }
 function enclosingVisitedStatement(terminal, body, visited) {
-  let current = terminal;
-  while (current !== void 0 && current !== body) {
-    if (import_ts_morph7.Node.isStatement(current) && visited.has(current)) {
-      return current;
+  let current2 = terminal;
+  while (current2 !== void 0 && current2 !== body) {
+    if (import_ts_morph7.Node.isStatement(current2) && visited.has(current2)) {
+      return current2;
     }
-    current = current.getParent();
+    current2 = current2.getParent();
   }
   return null;
 }
@@ -1603,12 +1603,12 @@ function isModuleScopeStop(node) {
   return import_ts_morph8.Node.isFunctionDeclaration(node) || import_ts_morph8.Node.isMethodDeclaration(node) || import_ts_morph8.Node.isArrowFunction(node) || import_ts_morph8.Node.isFunctionExpression(node) || import_ts_morph8.Node.isClassDeclaration(node) || import_ts_morph8.Node.isClassExpression(node);
 }
 function crossesNestedFunctionScope(node, func) {
-  let current = node;
-  while (current !== void 0 && current !== func) {
-    if (startsItsOwnScope(current)) {
+  let current2 = node;
+  while (current2 !== void 0 && current2 !== func) {
+    if (startsItsOwnScope(current2)) {
       return true;
     }
-    current = current.getParent();
+    current2 = current2.getParent();
   }
   return false;
 }
@@ -1931,13 +1931,13 @@ function inlineModuleBinding(ident, depth) {
   return null;
 }
 function isModuleScoped(decl) {
-  let current = decl.getParent();
-  while (current !== void 0) {
-    if (import_ts_morph9.Node.isSourceFile(current)) {
+  let current2 = decl.getParent();
+  while (current2 !== void 0) {
+    if (import_ts_morph9.Node.isSourceFile(current2)) {
       return true;
     }
-    if (import_ts_morph9.Node.isVariableDeclarationList(current) || import_ts_morph9.Node.isVariableStatement(current)) {
-      current = current.getParent();
+    if (import_ts_morph9.Node.isVariableDeclarationList(current2) || import_ts_morph9.Node.isVariableStatement(current2)) {
+      current2 = current2.getParent();
       continue;
     }
     return false;
@@ -1960,12 +1960,12 @@ function unwrapCasts(node) {
   return node;
 }
 function enclosingStatementLine(node) {
-  let current = node;
-  while (current !== void 0) {
-    if (import_ts_morph9.Node.isStatement(current)) {
-      return startLineOf(current);
+  let current2 = node;
+  while (current2 !== void 0) {
+    if (import_ts_morph9.Node.isStatement(current2)) {
+      return startLineOf(current2);
     }
-    current = current.getParent();
+    current2 = current2.getParent();
   }
   return startLineOf(node);
 }
@@ -2172,6 +2172,46 @@ var import_ts_morph17 = require("ts-morph");
 // src/shapes/shapes.ts
 var import_ts_morph11 = require("ts-morph");
 
+// src/shapes/typeShapes.ts
+var import_node_crypto = require("crypto");
+
+// src/shapes/definitions.ts
+var current = null;
+var definitionsInProgress = () => current;
+function createDefinitionTable() {
+  const shapes = /* @__PURE__ */ new Map();
+  return {
+    has: (key) => shapes.has(key),
+    reserve: (key) => {
+      shapes.set(key, null);
+    },
+    define: (key, shape) => {
+      shapes.set(key, shape);
+    },
+    collected: () => {
+      const out = {};
+      let any = false;
+      for (const [key, shape] of shapes) {
+        if (shape !== null) {
+          out[key] = shape;
+          any = true;
+        }
+      }
+      return any ? out : null;
+    }
+  };
+}
+function withDefinitions(read) {
+  const table = createDefinitionTable();
+  const outer = current;
+  current = table;
+  try {
+    return { value: read(), definitions: table.collected() };
+  } finally {
+    current = outer;
+  }
+}
+
 // src/shapes/typeShapes.ts
 var MAX_DEPTH = 6;
 var OPAQUE_NAMED_TYPES = /* @__PURE__ */ new Set([
@@ -2290,7 +2330,7 @@ function typeToShape(type, ctx) {
     return outsideRef;
   }
   if (type.isObject() || type.isClassOrInterface()) {
-    return objectToShape(type, ctx);
+    return namedOnce(type, ctx) ?? objectToShape(type, ctx);
   }
   if (type.isEnum() || type.isEnumLiteral()) {
     return enumToShape(type, ctx);
@@ -2437,6 +2477,43 @@ function isOutsideProject(file) {
   outsideProjectByFile.set(key, outside);
   return outside;
 }
+function namedOnce(type, ctx) {
+  const table = definitionsInProgress();
+  if (table === null) {
+    return null;
+  }
+  const named = refFromType(type, ctx);
+  if (named.type !== "ref") {
+    return null;
+  }
+  const symbol = type.getAliasSymbol() ?? type.getSymbol();
+  const name = symbol?.getName();
+  if (name === void 0 || name === "__type" || name === "__object") {
+    return null;
+  }
+  const key = definitionKeyFor(type, named.name);
+  const filed = { ...named, def: key };
+  if (!table.has(key)) {
+    table.reserve(key);
+    const expanded = objectToShape(type, {
+      enclosing: ctx.enclosing,
+      depth: 0,
+      seen: /* @__PURE__ */ new Set()
+    });
+    if (expanded === null) {
+      return null;
+    }
+    table.define(key, expanded);
+  }
+  return filed;
+}
+function definitionKeyFor(type, name) {
+  const written = withoutImportQualifiers(type.getText());
+  return `${name}@${shortHash(written)}`;
+}
+function shortHash(text) {
+  return (0, import_node_crypto.createHash)("sha1").update(text).digest("hex").slice(0, 12);
+}
 function refFromType(type, ctx) {
   const symbol = type.getAliasSymbol() ?? type.getSymbol();
   if (symbol) {
@@ -2993,22 +3070,22 @@ function branchCanRun(returnValue, substitutions) {
 function guardsAbove(returnValue) {
   const guards = [];
   let child = returnValue;
-  let current = returnValue.getParent();
-  while (current !== void 0) {
-    if (import_ts_morph13.Node.isIfStatement(current)) {
+  let current2 = returnValue.getParent();
+  while (current2 !== void 0) {
+    if (import_ts_morph13.Node.isIfStatement(current2)) {
       guards.push({
-        condition: current.getExpression(),
-        whenTrue: current.getThenStatement() === child
+        condition: current2.getExpression(),
+        whenTrue: current2.getThenStatement() === child
       });
     }
-    if (import_ts_morph13.Node.isBlock(current)) {
-      guards.push(...earlyReturnGuardsBefore(current, child));
+    if (import_ts_morph13.Node.isBlock(current2)) {
+      guards.push(...earlyReturnGuardsBefore(current2, child));
     }
-    if (import_ts_morph13.Node.isFunctionDeclaration(current) || import_ts_morph13.Node.isArrowFunction(current) || import_ts_morph13.Node.isFunctionExpression(current)) {
+    if (import_ts_morph13.Node.isFunctionDeclaration(current2) || import_ts_morph13.Node.isArrowFunction(current2) || import_ts_morph13.Node.isFunctionExpression(current2)) {
       break;
     }
-    child = current;
-    current = current.getParent();
+    child = current2;
+    current2 = current2.getParent();
   }
   return guards;
 }
@@ -3173,12 +3250,12 @@ function returnedObjects(fn) {
   return found;
 }
 function enclosingFunctionOf(node) {
-  let current = node.getParent();
-  while (current !== void 0) {
-    if (import_ts_morph13.Node.isFunctionDeclaration(current) || import_ts_morph13.Node.isArrowFunction(current) || import_ts_morph13.Node.isFunctionExpression(current) || import_ts_morph13.Node.isMethodDeclaration(current)) {
-      return current.getBody();
+  let current2 = node.getParent();
+  while (current2 !== void 0) {
+    if (import_ts_morph13.Node.isFunctionDeclaration(current2) || import_ts_morph13.Node.isArrowFunction(current2) || import_ts_morph13.Node.isFunctionExpression(current2) || import_ts_morph13.Node.isMethodDeclaration(current2)) {
+      return current2.getBody();
     }
-    current = current.getParent();
+    current2 = current2.getParent();
   }
   return void 0;
 }
@@ -3196,16 +3273,16 @@ function bindArguments(callArgs, params) {
 // src/terminals/shared.ts
 var import_ts_morph14 = require("ts-morph");
 function unwrapValue(node) {
-  let current = node;
-  while (import_ts_morph14.Node.isParenthesizedExpression(current) || import_ts_morph14.Node.isAwaitExpression(current) || import_ts_morph14.Node.isAsExpression(current) || import_ts_morph14.Node.isNonNullExpression(current) || import_ts_morph14.Node.isSatisfiesExpression(current)) {
-    current = current.getExpression();
+  let current2 = node;
+  while (import_ts_morph14.Node.isParenthesizedExpression(current2) || import_ts_morph14.Node.isAwaitExpression(current2) || import_ts_morph14.Node.isAsExpression(current2) || import_ts_morph14.Node.isNonNullExpression(current2) || import_ts_morph14.Node.isSatisfiesExpression(current2)) {
+    current2 = current2.getExpression();
   }
-  return current;
+  return current2;
 }
 function returnPositionOf(value) {
-  let current = value;
+  let current2 = value;
   while (true) {
-    const parent = current.getParent();
+    const parent = current2.getParent();
     if (parent === void 0) {
       return null;
     }
@@ -3213,14 +3290,14 @@ function returnPositionOf(value) {
       return parent;
     }
     if (import_ts_morph14.Node.isArrowFunction(parent)) {
-      return parent.getBody() === current ? current : null;
+      return parent.getBody() === current2 ? current2 : null;
     }
     if (import_ts_morph14.Node.isParenthesizedExpression(parent) || import_ts_morph14.Node.isAwaitExpression(parent) || import_ts_morph14.Node.isAsExpression(parent) || import_ts_morph14.Node.isNonNullExpression(parent) || import_ts_morph14.Node.isSatisfiesExpression(parent)) {
-      current = parent;
+      current2 = parent;
       continue;
     }
-    if (import_ts_morph14.Node.isConditionalExpression(parent) && (parent.getWhenTrue() === current || parent.getWhenFalse() === current)) {
-      current = parent;
+    if (import_ts_morph14.Node.isConditionalExpression(parent) && (parent.getWhenTrue() === current2 || parent.getWhenFalse() === current2)) {
+      current2 = parent;
       continue;
     }
     return null;
@@ -3364,12 +3441,12 @@ function writesRunInOrder(declaration, writes) {
   return last !== void 0 && !isReadBefore(declaration, last.node.getStart());
 }
 function statementOf(node) {
-  let current = node;
-  while (current !== void 0) {
-    if (import_ts_morph15.Node.isStatement(current)) {
-      return current;
+  let current2 = node;
+  while (current2 !== void 0) {
+    if (import_ts_morph15.Node.isStatement(current2)) {
+      return current2;
     }
-    current = current.getParent();
+    current2 = current2.getParent();
   }
   return null;
 }
@@ -3463,11 +3540,11 @@ function numberOf(node) {
   return Number.isFinite(value) ? value : null;
 }
 function unwrap(node) {
-  let current = node;
-  while (import_ts_morph16.Node.isParenthesizedExpression(current) || import_ts_morph16.Node.isAsExpression(current) || import_ts_morph16.Node.isNonNullExpression(current)) {
-    current = current.getExpression();
+  let current2 = node;
+  while (import_ts_morph16.Node.isParenthesizedExpression(current2) || import_ts_morph16.Node.isAsExpression(current2) || import_ts_morph16.Node.isNonNullExpression(current2)) {
+    current2 = current2.getExpression();
   }
-  return current;
+  return current2;
 }
 
 // src/terminals/returns.ts
@@ -3476,17 +3553,17 @@ function unwrapMethodChain(call, methodChain, func, paramPos) {
     return null;
   }
   const collected = [];
-  let current = call;
+  let current2 = call;
   for (let i = methodChain.length - 1; i >= 0; i--) {
     const expectedMethod = methodChain[i];
-    const callee = current.getExpression();
+    const callee = current2.getExpression();
     if (!import_ts_morph17.Node.isPropertyAccessExpression(callee)) {
       return null;
     }
     if (callee.getName() !== expectedMethod) {
       return null;
     }
-    collected.unshift(current);
+    collected.unshift(current2);
     const subject = callee.getExpression();
     if (i === 0) {
       if (!import_ts_morph17.Node.isIdentifier(subject)) {
@@ -3513,7 +3590,7 @@ function unwrapMethodChain(call, methodChain, func, paramPos) {
       if (!import_ts_morph17.Node.isCallExpression(subject)) {
         return null;
       }
-      current = subject;
+      current2 = subject;
     }
   }
   return { calls: collected };
@@ -3688,8 +3765,8 @@ function statusArgument(calls, extraction) {
   return calls[0]?.getArguments()[from.position] ?? null;
 }
 function returnCoveredByParameterMethodCall(expr, func, patterns) {
-  const current = unwrapValue(expr);
-  if (!import_ts_morph17.Node.isCallExpression(current)) {
+  const current2 = unwrapValue(expr);
+  if (!import_ts_morph17.Node.isCallExpression(current2)) {
     return false;
   }
   for (const pattern of patterns) {
@@ -3697,7 +3774,7 @@ function returnCoveredByParameterMethodCall(expr, func, patterns) {
       continue;
     }
     const result = unwrapMethodChain(
-      current,
+      current2,
       pattern.match.methodChain,
       func,
       pattern.match.parameterPosition
@@ -4277,17 +4354,17 @@ var ModuleGraph = class {
     const walked = /* @__PURE__ */ new Set();
     const stack = [root];
     while (stack.length > 0) {
-      const current = stack.pop();
-      const currentPath = current.getFilePath();
+      const current2 = stack.pop();
+      const currentPath = current2.getFilePath();
       if (walked.has(currentPath) || settled.has(currentPath)) {
         continue;
       }
       walked.add(currentPath);
-      if (namesPackage(this.specifiersOf(current), name)) {
+      if (namesPackage(this.specifiersOf(current2), name)) {
         this.assert("importsPackage", [currentPath, name]);
         continue;
       }
-      stack.push(...this.importedFilesOf(current));
+      stack.push(...this.importedFilesOf(current2));
     }
     for (const filePath of walked) {
       settled.add(filePath);
@@ -4610,7 +4687,7 @@ function indexFunctions(sf) {
 }
 
 // src/cache.ts
-var import_node_crypto = require("crypto");
+var import_node_crypto2 = require("crypto");
 var import_promises2 = __toESM(require("fs/promises"), 1);
 var import_node_path2 = __toESM(require("path"), 1);
 var SCHEMA_VERSION = "3";
@@ -4689,7 +4766,7 @@ function entryDirFor(cacheDir, input) {
     input.adapterPacksDigest,
     input.tsconfigPath ?? ""
   ].join("\0");
-  const name = (0, import_node_crypto.createHash)("sha256").update(key).digest("hex").slice(0, 16);
+  const name = (0, import_node_crypto2.createHash)("sha256").update(key).digest("hex").slice(0, 16);
   return import_node_path2.default.join(cacheDir, `${ENTRY_PREFIX}${name}`);
 }
 function isEntryDir(name) {
@@ -5387,12 +5464,12 @@ function toFunctionRoot(node) {
   return isFunctionRoot(node) ? declarationCarryingTheBody(node) : null;
 }
 function findEnclosingFunction(node) {
-  let current = node.getParent();
-  while (current !== void 0) {
-    if (import_ts_morph25.Node.isFunctionDeclaration(current) || import_ts_morph25.Node.isFunctionExpression(current) || import_ts_morph25.Node.isArrowFunction(current) || import_ts_morph25.Node.isMethodDeclaration(current)) {
-      return current;
+  let current2 = node.getParent();
+  while (current2 !== void 0) {
+    if (import_ts_morph25.Node.isFunctionDeclaration(current2) || import_ts_morph25.Node.isFunctionExpression(current2) || import_ts_morph25.Node.isArrowFunction(current2) || import_ts_morph25.Node.isMethodDeclaration(current2)) {
+      return current2;
     }
-    current = current.getParent();
+    current2 = current2.getParent();
   }
   return null;
 }
@@ -6250,10 +6327,10 @@ function resolveTypedDocumentHeader(arg) {
   return null;
 }
 function documentNodeCastTypeArgs(node) {
-  let current = node;
-  while (import_ts_morph32.Node.isAsExpression(current) || import_ts_morph32.Node.isParenthesizedExpression(current)) {
-    if (import_ts_morph32.Node.isAsExpression(current)) {
-      const typeNode = current.getTypeNode();
+  let current2 = node;
+  while (import_ts_morph32.Node.isAsExpression(current2) || import_ts_morph32.Node.isParenthesizedExpression(current2)) {
+    if (import_ts_morph32.Node.isAsExpression(current2)) {
+      const typeNode = current2.getTypeNode();
       if (typeNode !== void 0 && import_ts_morph32.Node.isTypeReference(typeNode)) {
         const name = typeNode.getTypeName().getText();
         const simpleName = name.includes(".") ? name.split(".").pop() ?? name : name;
@@ -6262,7 +6339,7 @@ function documentNodeCastTypeArgs(node) {
         }
       }
     }
-    current = current.getExpression();
+    current2 = current2.getExpression();
   }
   return null;
 }
@@ -6287,11 +6364,11 @@ function operationHeaderFromResultType(typeNode) {
   return null;
 }
 function stripDocumentNodeCasts(node) {
-  let current = node;
-  while (import_ts_morph32.Node.isAsExpression(current) || import_ts_morph32.Node.isParenthesizedExpression(current)) {
-    current = current.getExpression();
+  let current2 = node;
+  while (import_ts_morph32.Node.isAsExpression(current2) || import_ts_morph32.Node.isParenthesizedExpression(current2)) {
+    current2 = current2.getExpression();
   }
-  return current;
+  return current2;
 }
 function evaluateObjectLiteralAsJson(node) {
   if (import_ts_morph32.Node.isStringLiteral(node) || import_ts_morph32.Node.isNoSubstitutionTemplateLiteral(node)) {
@@ -6369,12 +6446,12 @@ function resolveGraphqlFileImport(decl) {
   }
 }
 function enclosingFunctionRoot(node) {
-  let current = node.getParent();
-  while (current !== void 0) {
-    if (import_ts_morph32.Node.isFunctionDeclaration(current) || import_ts_morph32.Node.isFunctionExpression(current) || import_ts_morph32.Node.isArrowFunction(current) || import_ts_morph32.Node.isMethodDeclaration(current)) {
-      return current;
+  let current2 = node.getParent();
+  while (current2 !== void 0) {
+    if (import_ts_morph32.Node.isFunctionDeclaration(current2) || import_ts_morph32.Node.isFunctionExpression(current2) || import_ts_morph32.Node.isArrowFunction(current2) || import_ts_morph32.Node.isMethodDeclaration(current2)) {
+      return current2;
     }
-    current = current.getParent();
+    current2 = current2.getParent();
   }
   return null;
 }
@@ -6895,12 +6972,12 @@ function isScopeNode(node) {
 function trackFactoryBindings(sourceFile, recognize) {
   const scopes = /* @__PURE__ */ new Map();
   function scopeOf(node) {
-    let current = node.getParent();
-    while (current !== void 0) {
-      if (isScopeNode(current)) {
-        return current;
+    let current2 = node.getParent();
+    while (current2 !== void 0) {
+      if (isScopeNode(current2)) {
+        return current2;
       }
-      current = current.getParent();
+      current2 = current2.getParent();
     }
     return sourceFile;
   }
@@ -6962,16 +7039,16 @@ function trackFactoryBindings(sourceFile, recognize) {
   }
   return {
     resolve(name, fromNode) {
-      let current = fromNode;
-      while (current !== void 0) {
-        const map = scopes.get(current);
+      let current2 = fromNode;
+      while (current2 !== void 0) {
+        const map = scopes.get(current2);
         if (map !== void 0) {
           const found = map.get(name);
           if (found !== void 0) {
             return found;
           }
         }
-        current = current.getParent();
+        current2 = current2.getParent();
       }
       return null;
     }
@@ -7258,21 +7335,21 @@ function literalIndexOf(index) {
   return null;
 }
 function unwrapExpression(expression) {
-  let current = expression;
+  let current2 = expression;
   for (; ; ) {
-    if (import_ts_morph39.Node.isAwaitExpression(current)) {
-      current = current.getExpression();
+    if (import_ts_morph39.Node.isAwaitExpression(current2)) {
+      current2 = current2.getExpression();
       continue;
     }
-    if (import_ts_morph39.Node.isParenthesizedExpression(current)) {
-      current = current.getExpression();
+    if (import_ts_morph39.Node.isParenthesizedExpression(current2)) {
+      current2 = current2.getExpression();
       continue;
     }
-    if (import_ts_morph39.Node.isAsExpression(current) || import_ts_morph39.Node.isSatisfiesExpression(current)) {
-      current = current.getExpression();
+    if (import_ts_morph39.Node.isAsExpression(current2) || import_ts_morph39.Node.isSatisfiesExpression(current2)) {
+      current2 = current2.getExpression();
       continue;
     }
-    return current;
+    return current2;
   }
 }
 function emitValue(db, table, value) {
@@ -7570,13 +7647,13 @@ function recordBodyNode(db, table, fnId, node) {
   return false;
 }
 function descendantIsReturned(fn) {
-  let current = fn.getParent();
-  while (current !== void 0) {
-    if (import_ts_morph39.Node.isReturnStatement(current)) {
+  let current2 = fn.getParent();
+  while (current2 !== void 0) {
+    if (import_ts_morph39.Node.isReturnStatement(current2)) {
       return true;
     }
-    if (import_ts_morph39.Node.isParenthesizedExpression(current) || import_ts_morph39.Node.isAsExpression(current) || import_ts_morph39.Node.isSatisfiesExpression(current)) {
-      current = current.getParent();
+    if (import_ts_morph39.Node.isParenthesizedExpression(current2) || import_ts_morph39.Node.isAsExpression(current2) || import_ts_morph39.Node.isSatisfiesExpression(current2)) {
+      current2 = current2.getParent();
       continue;
     }
     return false;
@@ -8531,11 +8608,11 @@ function configString(arg, property, resolution) {
   return null;
 }
 function peelExpression(node) {
-  let current = node;
-  while (current !== void 0 && (import_ts_morph45.Node.isAsExpression(current) || import_ts_morph45.Node.isSatisfiesExpression(current) || import_ts_morph45.Node.isParenthesizedExpression(current) || import_ts_morph45.Node.isNonNullExpression(current))) {
-    current = current.getExpression();
+  let current2 = node;
+  while (current2 !== void 0 && (import_ts_morph45.Node.isAsExpression(current2) || import_ts_morph45.Node.isSatisfiesExpression(current2) || import_ts_morph45.Node.isParenthesizedExpression(current2) || import_ts_morph45.Node.isNonNullExpression(current2))) {
+    current2 = current2.getExpression();
   }
-  return current;
+  return current2;
 }
 function toObjectLiteral(node, resolution) {
   const peeled = peelExpression(node);
@@ -8598,11 +8675,11 @@ function hasJsxReturn(func) {
   return found;
 }
 function isJsxOrFragment(node) {
-  let current = node;
-  while (import_ts_morph45.Node.isParenthesizedExpression(current)) {
-    current = current.getExpression();
+  let current2 = node;
+  while (import_ts_morph45.Node.isParenthesizedExpression(current2)) {
+    current2 = current2.getExpression();
   }
-  return import_ts_morph45.Node.isJsxElement(current) || import_ts_morph45.Node.isJsxSelfClosingElement(current) || import_ts_morph45.Node.isJsxFragment(current);
+  return import_ts_morph45.Node.isJsxElement(current2) || import_ts_morph45.Node.isJsxSelfClosingElement(current2) || import_ts_morph45.Node.isJsxFragment(current2);
 }
 
 // src/facts/store.ts
@@ -9588,19 +9665,19 @@ function findBareRethrow(func, location) {
   return found;
 }
 function enclosingTry(throwStmt) {
-  let current = throwStmt.getParent();
+  let current2 = throwStmt.getParent();
   let sawCatchClause = false;
-  while (current !== void 0) {
-    if (import_ts_morph48.Node.isCatchClause(current)) {
+  while (current2 !== void 0) {
+    if (import_ts_morph48.Node.isCatchClause(current2)) {
       sawCatchClause = true;
     }
-    if (import_ts_morph48.Node.isTryStatement(current)) {
-      return sawCatchClause ? current : null;
+    if (import_ts_morph48.Node.isTryStatement(current2)) {
+      return sawCatchClause ? current2 : null;
     }
-    if (import_ts_morph48.Node.isFunctionDeclaration(current) || import_ts_morph48.Node.isFunctionExpression(current) || import_ts_morph48.Node.isArrowFunction(current) || import_ts_morph48.Node.isMethodDeclaration(current)) {
+    if (import_ts_morph48.Node.isFunctionDeclaration(current2) || import_ts_morph48.Node.isFunctionExpression(current2) || import_ts_morph48.Node.isArrowFunction(current2) || import_ts_morph48.Node.isMethodDeclaration(current2)) {
       return null;
     }
-    current = current.getParent();
+    current2 = current2.getParent();
   }
   return null;
 }
@@ -9670,12 +9747,12 @@ function functionFromDecl(decl) {
 // src/shapes/fieldAccesses.ts
 var import_ts_morph49 = require("ts-morph");
 function findResponseAccessor(callExpr) {
-  let current = callExpr;
-  const parent1 = current.getParent();
+  let current2 = callExpr;
+  const parent1 = current2.getParent();
   if (parent1 !== void 0 && import_ts_morph49.Node.isAwaitExpression(parent1)) {
-    current = parent1;
+    current2 = parent1;
   }
-  const parent2 = current.getParent();
+  const parent2 = current2.getParent();
   if (parent2 === void 0 || !import_ts_morph49.Node.isVariableDeclaration(parent2)) {
     return null;
   }
@@ -9832,12 +9909,12 @@ function collectPropertyAccesses(subtree, accessor) {
         return;
       }
       const chain = [];
-      let current = node;
-      while (import_ts_morph49.Node.isPropertyAccessExpression(current)) {
-        chain.unshift(current.getName());
-        current = current.getExpression();
+      let current2 = node;
+      while (import_ts_morph49.Node.isPropertyAccessExpression(current2)) {
+        chain.unshift(current2.getName());
+        current2 = current2.getExpression();
       }
-      if (import_ts_morph49.Node.isIdentifier(current) && current.getText() === varName) {
+      if (import_ts_morph49.Node.isIdentifier(current2) && current2.getText() === varName) {
         pushChain(chain);
       }
     });
@@ -9865,10 +9942,10 @@ function collectPropertyAccesses(subtree, accessor) {
       parent = chainTop.getParent();
     }
     const segments = [];
-    let current = chainTop;
-    while (import_ts_morph49.Node.isPropertyAccessExpression(current)) {
-      segments.push(current.getName());
-      current = current.getExpression();
+    let current2 = chainTop;
+    while (import_ts_morph49.Node.isPropertyAccessExpression(current2)) {
+      segments.push(current2.getName());
+      current2 = current2.getExpression();
     }
     segments.reverse();
     pushChain([...prefix, ...segments]);
@@ -9883,15 +9960,15 @@ function isBindingDeclarationSite(node) {
   return parent !== void 0 && import_ts_morph49.Node.isParameterDeclaration(parent) && parent.getNameNode() === node;
 }
 function isInsideObjectBindingPattern(node) {
-  let current = node.getParent();
-  while (current !== void 0) {
-    if (import_ts_morph49.Node.isObjectBindingPattern(current)) {
+  let current2 = node.getParent();
+  while (current2 !== void 0) {
+    if (import_ts_morph49.Node.isObjectBindingPattern(current2)) {
       return true;
     }
-    if (import_ts_morph49.Node.isFunctionLikeDeclaration(current) || import_ts_morph49.Node.isVariableStatement(current)) {
+    if (import_ts_morph49.Node.isFunctionLikeDeclaration(current2) || import_ts_morph49.Node.isVariableStatement(current2)) {
       break;
     }
-    current = current.getParent();
+    current2 = current2.getParent();
   }
   return false;
 }
@@ -9945,9 +10022,9 @@ function findBranchSubtree(func, byLineRange, terminalStartLine, terminalEndLine
   if (terminalNode === null) {
     return func;
   }
-  let current = terminalNode;
-  while (current !== func) {
-    const parent = current.getParent();
+  let current2 = terminalNode;
+  while (current2 !== func) {
+    const parent = current2.getParent();
     if (parent === void 0) {
       break;
     }
@@ -9962,17 +10039,17 @@ function findBranchSubtree(func, byLineRange, terminalStartLine, terminalEndLine
         return elseBlock;
       }
     }
-    current = parent;
+    current2 = parent;
   }
   return func;
 }
 function isDescendantOf(node, ancestor) {
-  let current = node;
-  while (current !== void 0) {
-    if (current === ancestor) {
+  let current2 = node;
+  while (current2 !== void 0) {
+    if (current2 === ancestor) {
       return true;
     }
-    current = current.getParent();
+    current2 = current2.getParent();
   }
   return false;
 }
@@ -10126,12 +10203,12 @@ function tryExtractFunction(decl) {
   return null;
 }
 function isWithinFunction(node, func) {
-  let current = node.getParent();
-  while (current !== void 0) {
-    if (current === func) {
+  let current2 = node.getParent();
+  while (current2 !== void 0) {
+    if (current2 === func) {
       return true;
     }
-    current = current.getParent();
+    current2 = current2.getParent();
   }
   return false;
 }
@@ -10201,7 +10278,7 @@ function createTimer() {
 }
 
 // src/version.ts
-var import_node_crypto2 = require("crypto");
+var import_node_crypto3 = require("crypto");
 var import_node_fs4 = __toESM(require("fs"), 1);
 var import_node_module = require("module");
 var import_node_path6 = __toESM(require("path"), 1);
@@ -10241,7 +10318,7 @@ function computeContentHash(paths) {
   if (paths.length === 0) {
     return "";
   }
-  const hash = (0, import_node_crypto2.createHash)("sha256");
+  const hash = (0, import_node_crypto3.createHash)("sha256");
   for (const file of paths) {
     try {
       hash.update(import_node_fs4.default.readFileSync(file));
@@ -10548,6 +10625,18 @@ function announcedBoundaryStructure(unit) {
   };
 }
 function extractCodeStructure(unit, pack, invocationRecognizers = [], accessRecognizers = [], barriers = NO_BARRIERS) {
+  const read = withDefinitions(
+    () => readCodeStructure(
+      unit,
+      pack,
+      invocationRecognizers,
+      accessRecognizers,
+      barriers
+    )
+  );
+  return read.definitions === null ? read.value : { ...read.value, definitions: read.definitions };
+}
+function readCodeStructure(unit, pack, invocationRecognizers, accessRecognizers, barriers) {
   const { func, kind, name } = unit;
   if (func === null) {
     return announcedBoundaryStructure(unit);
@@ -11145,13 +11234,13 @@ function wrapperNameNode(func) {
   return null;
 }
 function enclosingCall(node) {
-  let current = node.getParent();
-  while (current !== void 0) {
-    if (import_ts_morph51.Node.isCallExpression(current)) {
-      return current;
+  let current2 = node.getParent();
+  while (current2 !== void 0) {
+    if (import_ts_morph51.Node.isCallExpression(current2)) {
+      return current2;
     }
-    if (import_ts_morph51.Node.isPropertyAccessExpression(current)) {
-      current = current.getParent();
+    if (import_ts_morph51.Node.isPropertyAccessExpression(current2)) {
+      current2 = current2.getParent();
       continue;
     }
     return null;
@@ -11159,12 +11248,12 @@ function enclosingCall(node) {
   return null;
 }
 function enclosingFunction(node) {
-  let current = node.getParent();
-  while (current !== void 0) {
-    if (import_ts_morph51.Node.isFunctionDeclaration(current) || import_ts_morph51.Node.isFunctionExpression(current) || import_ts_morph51.Node.isArrowFunction(current) || import_ts_morph51.Node.isMethodDeclaration(current)) {
-      return current;
+  let current2 = node.getParent();
+  while (current2 !== void 0) {
+    if (import_ts_morph51.Node.isFunctionDeclaration(current2) || import_ts_morph51.Node.isFunctionExpression(current2) || import_ts_morph51.Node.isArrowFunction(current2) || import_ts_morph51.Node.isMethodDeclaration(current2)) {
+      return current2;
     }
-    current = current.getParent();
+    current2 = current2.getParent();
   }
   return null;
 }