@suss/adapter-typescript 0.1.1 → 0.2.0

package/dist/index.js

@@ -35,25 +35,25 @@ import { Node as Node2, SyntaxKind } from "ts-morph";
 import { Node } from "ts-morph";
 var MAX_LAYERS = 16;
 function peelSyntax(node) {
-  let current = node;
+  let current2 = node;
   for (let i = 0; i < MAX_LAYERS; i++) {
-    if (Node.isAsExpression(current) || Node.isTypeAssertion(current) || Node.isParenthesizedExpression(current) || Node.isNonNullExpression(current) || Node.isSatisfiesExpression(current)) {
-      current = current.getExpression();
+    if (Node.isAsExpression(current2) || Node.isTypeAssertion(current2) || Node.isParenthesizedExpression(current2) || Node.isNonNullExpression(current2) || 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 (!Node.isParenthesizedExpression(current)) {
+    if (!Node.isParenthesizedExpression(current2)) {
       break;
     }
-    current = current.getExpression();
+    current2 = current2.getExpression();
   }
-  return current;
+  return current2;
 }
 
 // src/resolve/astResolve.ts
@@ -924,15 +924,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 && Node6.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)
@@ -942,24 +942,24 @@ function collectAncestorConditionInfosBelow(terminalNode, stopNode) {
           makeConditionInfo(expr.getText(), "negative", "explicit", expr)
         );
       }
-    } else if (Node6.isCaseClause(current)) {
-      const switchStmt = current.getParent()?.getParent();
+    } else if (Node6.isCaseClause(current2)) {
+      const switchStmt = current2.getParent()?.getParent();
       if (switchStmt !== void 0 && Node6.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 (Node6.isCatchClause(current)) {
+    } else if (Node6.isCatchClause(current2)) {
       result.unshift(
         makeConditionInfo("catch", "positive", "catchBlock", null)
       );
     } else if (parent !== void 0 && Node6.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)
@@ -972,7 +972,7 @@ function collectAncestorConditionInfosBelow(terminalNode, stopNode) {
     } else if (parent !== void 0 && Node6.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)
@@ -984,7 +984,7 @@ function collectAncestorConditionInfosBelow(terminalNode, stopNode) {
         }
       }
     }
-    current = parent;
+    current2 = parent;
   }
   return result;
 }
@@ -994,12 +994,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;
 }
@@ -1519,12 +1519,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 (Node7.isStatement(current) && visited.has(current)) {
-      return current;
+  let current2 = terminal;
+  while (current2 !== void 0 && current2 !== body) {
+    if (Node7.isStatement(current2) && visited.has(current2)) {
+      return current2;
     }
-    current = current.getParent();
+    current2 = current2.getParent();
   }
   return null;
 }
@@ -1562,12 +1562,12 @@ function isModuleScopeStop(node) {
   return Node8.isFunctionDeclaration(node) || Node8.isMethodDeclaration(node) || Node8.isArrowFunction(node) || Node8.isFunctionExpression(node) || Node8.isClassDeclaration(node) || Node8.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;
 }
@@ -1890,13 +1890,13 @@ function inlineModuleBinding(ident, depth) {
   return null;
 }
 function isModuleScoped(decl) {
-  let current = decl.getParent();
-  while (current !== void 0) {
-    if (Node9.isSourceFile(current)) {
+  let current2 = decl.getParent();
+  while (current2 !== void 0) {
+    if (Node9.isSourceFile(current2)) {
       return true;
     }
-    if (Node9.isVariableDeclarationList(current) || Node9.isVariableStatement(current)) {
-      current = current.getParent();
+    if (Node9.isVariableDeclarationList(current2) || Node9.isVariableStatement(current2)) {
+      current2 = current2.getParent();
       continue;
     }
     return false;
@@ -1919,12 +1919,12 @@ function unwrapCasts(node) {
   return node;
 }
 function enclosingStatementLine(node) {
-  let current = node;
-  while (current !== void 0) {
-    if (Node9.isStatement(current)) {
-      return startLineOf(current);
+  let current2 = node;
+  while (current2 !== void 0) {
+    if (Node9.isStatement(current2)) {
+      return startLineOf(current2);
     }
-    current = current.getParent();
+    current2 = current2.getParent();
   }
   return startLineOf(node);
 }
@@ -2136,6 +2136,46 @@ import {
   SyntaxKind as SyntaxKind3
 } from "ts-morph";
 
+// src/shapes/typeShapes.ts
+import { createHash } from "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([
@@ -2254,7 +2294,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);
@@ -2401,6 +2441,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 createHash("sha1").update(text).digest("hex").slice(0, 12);
+}
 function refFromType(type, ctx) {
   const symbol = type.getAliasSymbol() ?? type.getSymbol();
   if (symbol) {
@@ -2959,22 +3036,22 @@ function branchCanRun(returnValue, substitutions) {
 function guardsAbove(returnValue) {
   const guards = [];
   let child = returnValue;
-  let current = returnValue.getParent();
-  while (current !== void 0) {
-    if (Node13.isIfStatement(current)) {
+  let current2 = returnValue.getParent();
+  while (current2 !== void 0) {
+    if (Node13.isIfStatement(current2)) {
       guards.push({
-        condition: current.getExpression(),
-        whenTrue: current.getThenStatement() === child
+        condition: current2.getExpression(),
+        whenTrue: current2.getThenStatement() === child
       });
     }
-    if (Node13.isBlock(current)) {
-      guards.push(...earlyReturnGuardsBefore(current, child));
+    if (Node13.isBlock(current2)) {
+      guards.push(...earlyReturnGuardsBefore(current2, child));
     }
-    if (Node13.isFunctionDeclaration(current) || Node13.isArrowFunction(current) || Node13.isFunctionExpression(current)) {
+    if (Node13.isFunctionDeclaration(current2) || Node13.isArrowFunction(current2) || Node13.isFunctionExpression(current2)) {
       break;
     }
-    child = current;
-    current = current.getParent();
+    child = current2;
+    current2 = current2.getParent();
   }
   return guards;
 }
@@ -3139,12 +3216,12 @@ function returnedObjects(fn) {
   return found;
 }
 function enclosingFunctionOf(node) {
-  let current = node.getParent();
-  while (current !== void 0) {
-    if (Node13.isFunctionDeclaration(current) || Node13.isArrowFunction(current) || Node13.isFunctionExpression(current) || Node13.isMethodDeclaration(current)) {
-      return current.getBody();
+  let current2 = node.getParent();
+  while (current2 !== void 0) {
+    if (Node13.isFunctionDeclaration(current2) || Node13.isArrowFunction(current2) || Node13.isFunctionExpression(current2) || Node13.isMethodDeclaration(current2)) {
+      return current2.getBody();
     }
-    current = current.getParent();
+    current2 = current2.getParent();
   }
   return void 0;
 }
@@ -3162,16 +3239,16 @@ function bindArguments(callArgs, params) {
 // src/terminals/shared.ts
 import { Node as Node14 } from "ts-morph";
 function unwrapValue(node) {
-  let current = node;
-  while (Node14.isParenthesizedExpression(current) || Node14.isAwaitExpression(current) || Node14.isAsExpression(current) || Node14.isNonNullExpression(current) || Node14.isSatisfiesExpression(current)) {
-    current = current.getExpression();
+  let current2 = node;
+  while (Node14.isParenthesizedExpression(current2) || Node14.isAwaitExpression(current2) || Node14.isAsExpression(current2) || Node14.isNonNullExpression(current2) || Node14.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;
     }
@@ -3179,14 +3256,14 @@ function returnPositionOf(value) {
       return parent;
     }
     if (Node14.isArrowFunction(parent)) {
-      return parent.getBody() === current ? current : null;
+      return parent.getBody() === current2 ? current2 : null;
     }
     if (Node14.isParenthesizedExpression(parent) || Node14.isAwaitExpression(parent) || Node14.isAsExpression(parent) || Node14.isNonNullExpression(parent) || Node14.isSatisfiesExpression(parent)) {
-      current = parent;
+      current2 = parent;
       continue;
     }
-    if (Node14.isConditionalExpression(parent) && (parent.getWhenTrue() === current || parent.getWhenFalse() === current)) {
-      current = parent;
+    if (Node14.isConditionalExpression(parent) && (parent.getWhenTrue() === current2 || parent.getWhenFalse() === current2)) {
+      current2 = parent;
       continue;
     }
     return null;
@@ -3330,12 +3407,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 (Node15.isStatement(current)) {
-      return current;
+  let current2 = node;
+  while (current2 !== void 0) {
+    if (Node15.isStatement(current2)) {
+      return current2;
     }
-    current = current.getParent();
+    current2 = current2.getParent();
   }
   return null;
 }
@@ -3429,11 +3506,11 @@ function numberOf(node) {
   return Number.isFinite(value) ? value : null;
 }
 function unwrap(node) {
-  let current = node;
-  while (Node16.isParenthesizedExpression(current) || Node16.isAsExpression(current) || Node16.isNonNullExpression(current)) {
-    current = current.getExpression();
+  let current2 = node;
+  while (Node16.isParenthesizedExpression(current2) || Node16.isAsExpression(current2) || Node16.isNonNullExpression(current2)) {
+    current2 = current2.getExpression();
   }
-  return current;
+  return current2;
 }
 
 // src/terminals/returns.ts
@@ -3442,17 +3519,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 (!Node17.isPropertyAccessExpression(callee)) {
       return null;
     }
     if (callee.getName() !== expectedMethod) {
       return null;
     }
-    collected.unshift(current);
+    collected.unshift(current2);
     const subject = callee.getExpression();
     if (i === 0) {
       if (!Node17.isIdentifier(subject)) {
@@ -3479,7 +3556,7 @@ function unwrapMethodChain(call, methodChain, func, paramPos) {
       if (!Node17.isCallExpression(subject)) {
         return null;
       }
-      current = subject;
+      current2 = subject;
     }
   }
   return { calls: collected };
@@ -3654,8 +3731,8 @@ function statusArgument(calls, extraction) {
   return calls[0]?.getArguments()[from.position] ?? null;
 }
 function returnCoveredByParameterMethodCall(expr, func, patterns) {
-  const current = unwrapValue(expr);
-  if (!Node17.isCallExpression(current)) {
+  const current2 = unwrapValue(expr);
+  if (!Node17.isCallExpression(current2)) {
     return false;
   }
   for (const pattern of patterns) {
@@ -3663,7 +3740,7 @@ function returnCoveredByParameterMethodCall(expr, func, patterns) {
       continue;
     }
     const result = unwrapMethodChain(
-      current,
+      current2,
       pattern.match.methodChain,
       func,
       pattern.match.parameterPosition
@@ -4243,17 +4320,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);
@@ -4576,7 +4653,7 @@ function indexFunctions(sf) {
 }
 
 // src/cache.ts
-import { createHash } from "crypto";
+import { createHash as createHash2 } from "crypto";
 import fs2 from "fs/promises";
 import path2 from "path";
 var SCHEMA_VERSION = "3";
@@ -4655,7 +4732,7 @@ function entryDirFor(cacheDir, input) {
     input.adapterPacksDigest,
     input.tsconfigPath ?? ""
   ].join("\0");
-  const name = createHash("sha256").update(key).digest("hex").slice(0, 16);
+  const name = createHash2("sha256").update(key).digest("hex").slice(0, 16);
   return path2.join(cacheDir, `${ENTRY_PREFIX}${name}`);
 }
 function isEntryDir(name) {
@@ -5353,12 +5430,12 @@ function toFunctionRoot(node) {
   return isFunctionRoot(node) ? declarationCarryingTheBody(node) : null;
 }
 function findEnclosingFunction(node) {
-  let current = node.getParent();
-  while (current !== void 0) {
-    if (Node23.isFunctionDeclaration(current) || Node23.isFunctionExpression(current) || Node23.isArrowFunction(current) || Node23.isMethodDeclaration(current)) {
-      return current;
+  let current2 = node.getParent();
+  while (current2 !== void 0) {
+    if (Node23.isFunctionDeclaration(current2) || Node23.isFunctionExpression(current2) || Node23.isArrowFunction(current2) || Node23.isMethodDeclaration(current2)) {
+      return current2;
     }
-    current = current.getParent();
+    current2 = current2.getParent();
   }
   return null;
 }
@@ -6222,10 +6299,10 @@ function resolveTypedDocumentHeader(arg) {
   return null;
 }
 function documentNodeCastTypeArgs(node) {
-  let current = node;
-  while (Node30.isAsExpression(current) || Node30.isParenthesizedExpression(current)) {
-    if (Node30.isAsExpression(current)) {
-      const typeNode = current.getTypeNode();
+  let current2 = node;
+  while (Node30.isAsExpression(current2) || Node30.isParenthesizedExpression(current2)) {
+    if (Node30.isAsExpression(current2)) {
+      const typeNode = current2.getTypeNode();
       if (typeNode !== void 0 && Node30.isTypeReference(typeNode)) {
         const name = typeNode.getTypeName().getText();
         const simpleName = name.includes(".") ? name.split(".").pop() ?? name : name;
@@ -6234,7 +6311,7 @@ function documentNodeCastTypeArgs(node) {
         }
       }
     }
-    current = current.getExpression();
+    current2 = current2.getExpression();
   }
   return null;
 }
@@ -6259,11 +6336,11 @@ function operationHeaderFromResultType(typeNode) {
   return null;
 }
 function stripDocumentNodeCasts(node) {
-  let current = node;
-  while (Node30.isAsExpression(current) || Node30.isParenthesizedExpression(current)) {
-    current = current.getExpression();
+  let current2 = node;
+  while (Node30.isAsExpression(current2) || Node30.isParenthesizedExpression(current2)) {
+    current2 = current2.getExpression();
   }
-  return current;
+  return current2;
 }
 function evaluateObjectLiteralAsJson(node) {
   if (Node30.isStringLiteral(node) || Node30.isNoSubstitutionTemplateLiteral(node)) {
@@ -6341,12 +6418,12 @@ function resolveGraphqlFileImport(decl) {
   }
 }
 function enclosingFunctionRoot(node) {
-  let current = node.getParent();
-  while (current !== void 0) {
-    if (Node30.isFunctionDeclaration(current) || Node30.isFunctionExpression(current) || Node30.isArrowFunction(current) || Node30.isMethodDeclaration(current)) {
-      return current;
+  let current2 = node.getParent();
+  while (current2 !== void 0) {
+    if (Node30.isFunctionDeclaration(current2) || Node30.isFunctionExpression(current2) || Node30.isArrowFunction(current2) || Node30.isMethodDeclaration(current2)) {
+      return current2;
     }
-    current = current.getParent();
+    current2 = current2.getParent();
   }
   return null;
 }
@@ -6867,12 +6944,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;
   }
@@ -6934,16 +7011,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;
     }
@@ -7233,21 +7310,21 @@ function literalIndexOf(index) {
   return null;
 }
 function unwrapExpression(expression) {
-  let current = expression;
+  let current2 = expression;
   for (; ; ) {
-    if (Node37.isAwaitExpression(current)) {
-      current = current.getExpression();
+    if (Node37.isAwaitExpression(current2)) {
+      current2 = current2.getExpression();
       continue;
     }
-    if (Node37.isParenthesizedExpression(current)) {
-      current = current.getExpression();
+    if (Node37.isParenthesizedExpression(current2)) {
+      current2 = current2.getExpression();
       continue;
     }
-    if (Node37.isAsExpression(current) || Node37.isSatisfiesExpression(current)) {
-      current = current.getExpression();
+    if (Node37.isAsExpression(current2) || Node37.isSatisfiesExpression(current2)) {
+      current2 = current2.getExpression();
       continue;
     }
-    return current;
+    return current2;
   }
 }
 function emitValue(db, table, value) {
@@ -7545,13 +7622,13 @@ function recordBodyNode(db, table, fnId, node) {
   return false;
 }
 function descendantIsReturned(fn) {
-  let current = fn.getParent();
-  while (current !== void 0) {
-    if (Node37.isReturnStatement(current)) {
+  let current2 = fn.getParent();
+  while (current2 !== void 0) {
+    if (Node37.isReturnStatement(current2)) {
       return true;
     }
-    if (Node37.isParenthesizedExpression(current) || Node37.isAsExpression(current) || Node37.isSatisfiesExpression(current)) {
-      current = current.getParent();
+    if (Node37.isParenthesizedExpression(current2) || Node37.isAsExpression(current2) || Node37.isSatisfiesExpression(current2)) {
+      current2 = current2.getParent();
       continue;
     }
     return false;
@@ -8506,11 +8583,11 @@ function configString(arg, property, resolution) {
   return null;
 }
 function peelExpression(node) {
-  let current = node;
-  while (current !== void 0 && (Node43.isAsExpression(current) || Node43.isSatisfiesExpression(current) || Node43.isParenthesizedExpression(current) || Node43.isNonNullExpression(current))) {
-    current = current.getExpression();
+  let current2 = node;
+  while (current2 !== void 0 && (Node43.isAsExpression(current2) || Node43.isSatisfiesExpression(current2) || Node43.isParenthesizedExpression(current2) || Node43.isNonNullExpression(current2))) {
+    current2 = current2.getExpression();
   }
-  return current;
+  return current2;
 }
 function toObjectLiteral(node, resolution) {
   const peeled = peelExpression(node);
@@ -8573,11 +8650,11 @@ function hasJsxReturn(func) {
   return found;
 }
 function isJsxOrFragment(node) {
-  let current = node;
-  while (Node43.isParenthesizedExpression(current)) {
-    current = current.getExpression();
+  let current2 = node;
+  while (Node43.isParenthesizedExpression(current2)) {
+    current2 = current2.getExpression();
   }
-  return Node43.isJsxElement(current) || Node43.isJsxSelfClosingElement(current) || Node43.isJsxFragment(current);
+  return Node43.isJsxElement(current2) || Node43.isJsxSelfClosingElement(current2) || Node43.isJsxFragment(current2);
 }
 
 // src/facts/store.ts
@@ -9578,19 +9655,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 (Node46.isCatchClause(current)) {
+  while (current2 !== void 0) {
+    if (Node46.isCatchClause(current2)) {
       sawCatchClause = true;
     }
-    if (Node46.isTryStatement(current)) {
-      return sawCatchClause ? current : null;
+    if (Node46.isTryStatement(current2)) {
+      return sawCatchClause ? current2 : null;
     }
-    if (Node46.isFunctionDeclaration(current) || Node46.isFunctionExpression(current) || Node46.isArrowFunction(current) || Node46.isMethodDeclaration(current)) {
+    if (Node46.isFunctionDeclaration(current2) || Node46.isFunctionExpression(current2) || Node46.isArrowFunction(current2) || Node46.isMethodDeclaration(current2)) {
       return null;
     }
-    current = current.getParent();
+    current2 = current2.getParent();
   }
   return null;
 }
@@ -9662,12 +9739,12 @@ import {
   Node as Node47
 } from "ts-morph";
 function findResponseAccessor(callExpr) {
-  let current = callExpr;
-  const parent1 = current.getParent();
+  let current2 = callExpr;
+  const parent1 = current2.getParent();
   if (parent1 !== void 0 && Node47.isAwaitExpression(parent1)) {
-    current = parent1;
+    current2 = parent1;
   }
-  const parent2 = current.getParent();
+  const parent2 = current2.getParent();
   if (parent2 === void 0 || !Node47.isVariableDeclaration(parent2)) {
     return null;
   }
@@ -9824,12 +9901,12 @@ function collectPropertyAccesses(subtree, accessor) {
         return;
       }
       const chain = [];
-      let current = node;
-      while (Node47.isPropertyAccessExpression(current)) {
-        chain.unshift(current.getName());
-        current = current.getExpression();
+      let current2 = node;
+      while (Node47.isPropertyAccessExpression(current2)) {
+        chain.unshift(current2.getName());
+        current2 = current2.getExpression();
       }
-      if (Node47.isIdentifier(current) && current.getText() === varName) {
+      if (Node47.isIdentifier(current2) && current2.getText() === varName) {
         pushChain(chain);
       }
     });
@@ -9857,10 +9934,10 @@ function collectPropertyAccesses(subtree, accessor) {
       parent = chainTop.getParent();
     }
     const segments = [];
-    let current = chainTop;
-    while (Node47.isPropertyAccessExpression(current)) {
-      segments.push(current.getName());
-      current = current.getExpression();
+    let current2 = chainTop;
+    while (Node47.isPropertyAccessExpression(current2)) {
+      segments.push(current2.getName());
+      current2 = current2.getExpression();
     }
     segments.reverse();
     pushChain([...prefix, ...segments]);
@@ -9875,15 +9952,15 @@ function isBindingDeclarationSite(node) {
   return parent !== void 0 && Node47.isParameterDeclaration(parent) && parent.getNameNode() === node;
 }
 function isInsideObjectBindingPattern(node) {
-  let current = node.getParent();
-  while (current !== void 0) {
-    if (Node47.isObjectBindingPattern(current)) {
+  let current2 = node.getParent();
+  while (current2 !== void 0) {
+    if (Node47.isObjectBindingPattern(current2)) {
       return true;
     }
-    if (Node47.isFunctionLikeDeclaration(current) || Node47.isVariableStatement(current)) {
+    if (Node47.isFunctionLikeDeclaration(current2) || Node47.isVariableStatement(current2)) {
       break;
     }
-    current = current.getParent();
+    current2 = current2.getParent();
   }
   return false;
 }
@@ -9937,9 +10014,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;
     }
@@ -9954,17 +10031,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;
 }
@@ -10120,12 +10197,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;
 }
@@ -10195,7 +10272,7 @@ function createTimer() {
 }
 
 // src/version.ts
-import { createHash as createHash2 } from "crypto";
+import { createHash as createHash3 } from "crypto";
 import fs6 from "fs";
 import { createRequire } from "module";
 import path6 from "path";
@@ -10234,7 +10311,7 @@ function computeContentHash(paths) {
   if (paths.length === 0) {
     return "";
   }
-  const hash = createHash2("sha256");
+  const hash = createHash3("sha256");
   for (const file of paths) {
     try {
       hash.update(fs6.readFileSync(file));
@@ -10541,6 +10618,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);
@@ -11138,13 +11227,13 @@ function wrapperNameNode(func) {
   return null;
 }
 function enclosingCall(node) {
-  let current = node.getParent();
-  while (current !== void 0) {
-    if (Node49.isCallExpression(current)) {
-      return current;
+  let current2 = node.getParent();
+  while (current2 !== void 0) {
+    if (Node49.isCallExpression(current2)) {
+      return current2;
     }
-    if (Node49.isPropertyAccessExpression(current)) {
-      current = current.getParent();
+    if (Node49.isPropertyAccessExpression(current2)) {
+      current2 = current2.getParent();
       continue;
     }
     return null;
@@ -11152,12 +11241,12 @@ function enclosingCall(node) {
   return null;
 }
 function enclosingFunction(node) {
-  let current = node.getParent();
-  while (current !== void 0) {
-    if (Node49.isFunctionDeclaration(current) || Node49.isFunctionExpression(current) || Node49.isArrowFunction(current) || Node49.isMethodDeclaration(current)) {
-      return current;
+  let current2 = node.getParent();
+  while (current2 !== void 0) {
+    if (Node49.isFunctionDeclaration(current2) || Node49.isFunctionExpression(current2) || Node49.isArrowFunction(current2) || Node49.isMethodDeclaration(current2)) {
+      return current2;
     }
-    current = current.getParent();
+    current2 = current2.getParent();
   }
   return null;
 }