@suss/adapter-typescript 0.5.11 → 0.6.0

package/dist/index.cjs

@@ -2431,7 +2431,7 @@ function dispatchAccessRecognizers(root, recognizers, isStop, resolveWrittenValu
       traversal.skip();
       return;
     }
-    if (!import_ts_morph12.Node.isPropertyAccessExpression(node) && !import_ts_morph12.Node.isCallExpression(node)) {
+    if (!import_ts_morph12.Node.isPropertyAccessExpression(node) && !import_ts_morph12.Node.isCallExpression(node) && !import_ts_morph12.Node.isTaggedTemplateExpression(node)) {
       return;
     }
     const ctx = {
@@ -4005,10 +4005,59 @@ function writesToBindingUncached(declaration) {
   }
   return { values, inOrder: writesRunInOrder(declaration, writes) };
 }
+function writesToField(declaration) {
+  const remembered = byDeclaration.get(declaration);
+  if (remembered !== void 0) {
+    return remembered;
+  }
+  const answer = writesToFieldUncached(declaration);
+  byDeclaration.set(declaration, answer);
+  return answer;
+}
+function writesToFieldUncached(declaration) {
+  const initializer = declaration.getInitializer();
+  const assignments = assignmentsTo(declaration);
+  if (assignments.length === 0) {
+    return {
+      values: initializer === void 0 ? [] : [initializer],
+      inOrder: true
+    };
+  }
+  const values = [];
+  for (const write of assignments) {
+    if (write.value === null) {
+      return { values: [], inOrder: false };
+    }
+    values.push(write.value);
+  }
+  const withInitializer = initializer === void 0 ? values : [initializer, ...values];
+  return {
+    values: withInitializer,
+    inOrder: assignments.every(
+      (write) => writeRunsInConstructor(declaration, write)
+    )
+  };
+}
+function writeRunsInConstructor(declaration, write) {
+  const statement = statementOf(write.node);
+  if (statement === null) {
+    return false;
+  }
+  const body = statement.getParent();
+  if (body === void 0 || !import_ts_morph18.Node.isBlock(body)) {
+    return false;
+  }
+  const owner = body.getParent();
+  return owner !== void 0 && import_ts_morph18.Node.isConstructorDeclaration(owner) && owner.getParent() === declaration.getParent();
+}
 function isWrittenAgain(declaration) {
   return assignmentsTo(declaration).length > 0;
 }
 function assignmentsTo(declaration) {
+  if (import_ts_morph18.Node.isPropertyDeclaration(declaration)) {
+    const sourceFile2 = declaration.getSourceFile();
+    return sourceFile2.isDeclarationFile() ? [] : assignmentsInFile(sourceFile2).get(declaration) ?? [];
+  }
   if (declaration.getVariableStatement()?.getDeclarationKind() === import_ts_morph18.VariableDeclarationKind.Const) {
     return [];
   }
@@ -4048,7 +4097,7 @@ function writeAt(node) {
   if (import_ts_morph18.Node.isBinaryExpression(node)) {
     const operator = node.getOperatorToken().getKind();
     const target = node.getLeft();
-    if (!isAssignmentOperator(operator) || !import_ts_morph18.Node.isIdentifier(target)) {
+    if (!isAssignmentOperator(operator) || !(import_ts_morph18.Node.isIdentifier(target) || import_ts_morph18.Node.isPropertyAccessExpression(target))) {
       return null;
     }
     const value = operator === import_ts_morph18.SyntaxKind.EqualsToken ? node.getRight() : null;
@@ -4065,13 +4114,14 @@ function writeAt(node) {
   return null;
 }
 function declarationsOf(name) {
-  const symbol = name.getSymbol();
+  const nameNode = import_ts_morph18.Node.isPropertyAccessExpression(name) ? name.getNameNode() : name;
+  const symbol = nameNode.getSymbol();
   if (symbol === void 0) {
     return [];
   }
   const declarations = [];
   for (const declaration of symbol.getDeclarations()) {
-    if (import_ts_morph18.Node.isVariableDeclaration(declaration)) {
+    if (import_ts_morph18.Node.isVariableDeclaration(declaration) || import_ts_morph18.Node.isPropertyDeclaration(declaration)) {
       declarations.push(declaration);
     }
   }
@@ -6093,6 +6143,14 @@ function emitBindingValues(db, table, declaration) {
   }
   fact(db, "endsHolding", declarationId, emitValue(db, table, last));
 }
+function emitFieldValues(db, table, declaration) {
+  const { values, inOrder } = writesToField(declaration);
+  const last = values[values.length - 1];
+  if (!inOrder || last === void 0) {
+    return;
+  }
+  fact(db, "binds", nodeId(declaration), emitValue(db, table, last));
+}
 function emitBindingElementFacts(db, table, element) {
   const id = nodeId(element);
   table.byId.set(id, element);
@@ -6168,6 +6226,11 @@ function emitReferenceFacts(db, table, reference) {
       emitBindingValues(db, table, declaration);
       continue;
     }
+    if (import_ts_morph28.Node.isPropertyDeclaration(declaration)) {
+      fact(db, "binds", referenceId, declarationId);
+      emitFieldValues(db, table, declaration);
+      continue;
+    }
     if (import_ts_morph28.Node.isParameterDeclaration(declaration)) {
       fact(db, "binds", referenceId, declarationId);
       continue;
@@ -8657,6 +8720,9 @@ function trackFactoryBindings(sourceFile, recognize) {
 }
 
 // src/discovery/packageImport.ts
+function isLanguageLib(file) {
+  return /[\\/]typescript[\\/]lib[\\/]lib\..*\.d\.ts$/.test(file.getFilePath());
+}
 function splitPackageSpec(spec) {
   if (spec.startsWith("@")) {
     const parts2 = spec.split("/");
@@ -8774,6 +8840,9 @@ function discoverPackageImports(sourceFile, match, kind) {
       if (subjectProvenance === null) {
         return null;
       }
+      if (!methodComesFromSource(callee)) {
+        return subjectProvenance;
+      }
       return {
         packageName: subjectProvenance.packageName,
         exportPath: [...subjectProvenance.exportPath, callee.getName()]
@@ -8781,6 +8850,15 @@ function discoverPackageImports(sourceFile, match, kind) {
     }
     return null;
   }
+  function methodComesFromSource(callee) {
+    const declarations = callee.getNameNode().getSymbol()?.getDeclarations();
+    if (declarations === void 0 || declarations.length === 0) {
+      return true;
+    }
+    return declarations.some(
+      (declaration) => !isLanguageLib(declaration.getSourceFile())
+    );
+  }
   const results = [];
   const seen = /* @__PURE__ */ new Set();
   sourceFile.forEachDescendant((node) => {
@@ -10381,8 +10459,8 @@ function bindingLabel(binding) {
   if (semantics.name === "rest") {
     return `${semantics.method} ${semantics.path}`;
   }
-  if (semantics.name === "storage-relational") {
-    return `${semantics.storageSystem}:${semantics.table}`;
+  if (semantics.name === "storage") {
+    return `${semantics.storageSystem}:${semantics.container}`;
   }
   if (semantics.name === "message-bus") {
     return `${semantics.messageBus}:${semantics.channel}`;
@@ -10616,7 +10694,9 @@ function extractReachableSummary(candidate, options, recognizers) {
     unit,
     reachablePack,
     recognizers.invocation,
-    recognizers.access
+    recognizers.access,
+    void 0,
+    recognizers.resolveWrittenValue
   );
   raw.boundaryBinding = (0, import_behavioral_ir4.functionCallBinding)({
     transport: "in-process",
@@ -13056,7 +13136,8 @@ function createTypeScriptAdapter(config) {
               config.frameworks,
               tallies
             ),
-            access: collectAccessRecognizers(config.frameworks, tallies)
+            access: collectAccessRecognizers(config.frameworks, tallies),
+            resolveWrittenValue: (value) => resolution.resolveWrittenValue(value)
           }
         )
       ) : withSubUnits;

package/dist/index.js

@@ -2394,7 +2394,7 @@ function dispatchAccessRecognizers(root, recognizers, isStop, resolveWrittenValu
       traversal.skip();
       return;
     }
-    if (!Node11.isPropertyAccessExpression(node) && !Node11.isCallExpression(node)) {
+    if (!Node11.isPropertyAccessExpression(node) && !Node11.isCallExpression(node) && !Node11.isTaggedTemplateExpression(node)) {
       return;
     }
     const ctx = {
@@ -3975,10 +3975,59 @@ function writesToBindingUncached(declaration) {
   }
   return { values, inOrder: writesRunInOrder(declaration, writes) };
 }
+function writesToField(declaration) {
+  const remembered = byDeclaration.get(declaration);
+  if (remembered !== void 0) {
+    return remembered;
+  }
+  const answer = writesToFieldUncached(declaration);
+  byDeclaration.set(declaration, answer);
+  return answer;
+}
+function writesToFieldUncached(declaration) {
+  const initializer = declaration.getInitializer();
+  const assignments = assignmentsTo(declaration);
+  if (assignments.length === 0) {
+    return {
+      values: initializer === void 0 ? [] : [initializer],
+      inOrder: true
+    };
+  }
+  const values = [];
+  for (const write of assignments) {
+    if (write.value === null) {
+      return { values: [], inOrder: false };
+    }
+    values.push(write.value);
+  }
+  const withInitializer = initializer === void 0 ? values : [initializer, ...values];
+  return {
+    values: withInitializer,
+    inOrder: assignments.every(
+      (write) => writeRunsInConstructor(declaration, write)
+    )
+  };
+}
+function writeRunsInConstructor(declaration, write) {
+  const statement = statementOf(write.node);
+  if (statement === null) {
+    return false;
+  }
+  const body = statement.getParent();
+  if (body === void 0 || !Node17.isBlock(body)) {
+    return false;
+  }
+  const owner = body.getParent();
+  return owner !== void 0 && Node17.isConstructorDeclaration(owner) && owner.getParent() === declaration.getParent();
+}
 function isWrittenAgain(declaration) {
   return assignmentsTo(declaration).length > 0;
 }
 function assignmentsTo(declaration) {
+  if (Node17.isPropertyDeclaration(declaration)) {
+    const sourceFile2 = declaration.getSourceFile();
+    return sourceFile2.isDeclarationFile() ? [] : assignmentsInFile(sourceFile2).get(declaration) ?? [];
+  }
   if (declaration.getVariableStatement()?.getDeclarationKind() === VariableDeclarationKind.Const) {
     return [];
   }
@@ -4018,7 +4067,7 @@ function writeAt(node) {
   if (Node17.isBinaryExpression(node)) {
     const operator = node.getOperatorToken().getKind();
     const target = node.getLeft();
-    if (!isAssignmentOperator(operator) || !Node17.isIdentifier(target)) {
+    if (!isAssignmentOperator(operator) || !(Node17.isIdentifier(target) || Node17.isPropertyAccessExpression(target))) {
       return null;
     }
     const value = operator === SyntaxKind5.EqualsToken ? node.getRight() : null;
@@ -4035,13 +4084,14 @@ function writeAt(node) {
   return null;
 }
 function declarationsOf(name) {
-  const symbol = name.getSymbol();
+  const nameNode = Node17.isPropertyAccessExpression(name) ? name.getNameNode() : name;
+  const symbol = nameNode.getSymbol();
   if (symbol === void 0) {
     return [];
   }
   const declarations = [];
   for (const declaration of symbol.getDeclarations()) {
-    if (Node17.isVariableDeclaration(declaration)) {
+    if (Node17.isVariableDeclaration(declaration) || Node17.isPropertyDeclaration(declaration)) {
       declarations.push(declaration);
     }
   }
@@ -6070,6 +6120,14 @@ function emitBindingValues(db, table, declaration) {
   }
   fact(db, "endsHolding", declarationId, emitValue(db, table, last));
 }
+function emitFieldValues(db, table, declaration) {
+  const { values, inOrder } = writesToField(declaration);
+  const last = values[values.length - 1];
+  if (!inOrder || last === void 0) {
+    return;
+  }
+  fact(db, "binds", nodeId(declaration), emitValue(db, table, last));
+}
 function emitBindingElementFacts(db, table, element) {
   const id = nodeId(element);
   table.byId.set(id, element);
@@ -6145,6 +6203,11 @@ function emitReferenceFacts(db, table, reference) {
       emitBindingValues(db, table, declaration);
       continue;
     }
+    if (Node26.isPropertyDeclaration(declaration)) {
+      fact(db, "binds", referenceId, declarationId);
+      emitFieldValues(db, table, declaration);
+      continue;
+    }
     if (Node26.isParameterDeclaration(declaration)) {
       fact(db, "binds", referenceId, declarationId);
       continue;
@@ -8640,6 +8703,9 @@ function trackFactoryBindings(sourceFile, recognize) {
 }
 
 // src/discovery/packageImport.ts
+function isLanguageLib(file) {
+  return /[\\/]typescript[\\/]lib[\\/]lib\..*\.d\.ts$/.test(file.getFilePath());
+}
 function splitPackageSpec(spec) {
   if (spec.startsWith("@")) {
     const parts2 = spec.split("/");
@@ -8757,6 +8823,9 @@ function discoverPackageImports(sourceFile, match, kind) {
       if (subjectProvenance === null) {
         return null;
       }
+      if (!methodComesFromSource(callee)) {
+        return subjectProvenance;
+      }
       return {
         packageName: subjectProvenance.packageName,
         exportPath: [...subjectProvenance.exportPath, callee.getName()]
@@ -8764,6 +8833,15 @@ function discoverPackageImports(sourceFile, match, kind) {
     }
     return null;
   }
+  function methodComesFromSource(callee) {
+    const declarations = callee.getNameNode().getSymbol()?.getDeclarations();
+    if (declarations === void 0 || declarations.length === 0) {
+      return true;
+    }
+    return declarations.some(
+      (declaration) => !isLanguageLib(declaration.getSourceFile())
+    );
+  }
   const results = [];
   const seen = /* @__PURE__ */ new Set();
   sourceFile.forEachDescendant((node) => {
@@ -10381,8 +10459,8 @@ function bindingLabel(binding) {
   if (semantics.name === "rest") {
     return `${semantics.method} ${semantics.path}`;
   }
-  if (semantics.name === "storage-relational") {
-    return `${semantics.storageSystem}:${semantics.table}`;
+  if (semantics.name === "storage") {
+    return `${semantics.storageSystem}:${semantics.container}`;
   }
   if (semantics.name === "message-bus") {
     return `${semantics.messageBus}:${semantics.channel}`;
@@ -10616,7 +10694,9 @@ function extractReachableSummary(candidate, options, recognizers) {
     unit,
     reachablePack,
     recognizers.invocation,
-    recognizers.access
+    recognizers.access,
+    void 0,
+    recognizers.resolveWrittenValue
   );
   raw.boundaryBinding = functionCallBinding({
     transport: "in-process",
@@ -13062,7 +13142,8 @@ function createTypeScriptAdapter(config) {
               config.frameworks,
               tallies
             ),
-            access: collectAccessRecognizers(config.frameworks, tallies)
+            access: collectAccessRecognizers(config.frameworks, tallies),
+            resolveWrittenValue: (value) => resolution.resolveWrittenValue(value)
           }
         )
       ) : withSubUnits;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/adapter-typescript",
-  "version": "0.5.11",
+  "version": "0.6.0",
   "type": "module",
   "description": "TypeScript adapter for suss — walks source files with ts-morph and emits raw extractions for the suss pipeline.",
   "keywords": [
@@ -46,10 +46,10 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@suss/behavioral-ir": "0.5.11",
-    "@suss/datalog": "0.5.11",
-    "@suss/extractor": "0.5.11",
-    "@suss/resolution": "0.5.11",
+    "@suss/behavioral-ir": "0.6.0",
+    "@suss/datalog": "0.6.0",
+    "@suss/extractor": "0.6.0",
+    "@suss/resolution": "0.6.0",
     "graphql": "^16.8.0",
     "picomatch": "^4.0.4",
     "ts-morph": "^23.0.0"