@suss/adapter-typescript 0.5.8 → 0.5.9

package/dist/index.cjs

@@ -4954,7 +4954,7 @@ function indexFunctions(sf) {
 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 = "4";
+var SCHEMA_VERSION = "5";
 var MAX_ENTRIES = 2;
 var ENTRY_PREFIX = "key-";
 var ENTRY_DIR_NAME = new RegExp(`^${ENTRY_PREFIX}[0-9a-f]{16}$`);
@@ -5248,15 +5248,19 @@ function unwrapContractInit(init) {
   if (init === void 0) {
     return null;
   }
-  if (import_ts_morph25.Node.isCallExpression(init)) {
-    const args = init.getArguments();
+  let node = init;
+  while (import_ts_morph25.Node.isAsExpression(node)) {
+    node = node.getExpression();
+  }
+  if (import_ts_morph25.Node.isCallExpression(node)) {
+    const args = node.getArguments();
     if (args.length > 0 && import_ts_morph25.Node.isObjectLiteralExpression(args[0])) {
       return args[0];
     }
     return null;
   }
-  if (import_ts_morph25.Node.isObjectLiteralExpression(init)) {
-    return init;
+  if (import_ts_morph25.Node.isObjectLiteralExpression(node)) {
+    return node;
   }
   return null;
 }
@@ -5317,6 +5321,16 @@ function extractEndpointContract(endpointNode, pattern, framework) {
   };
 }
 function readContract(unit, pattern, framework) {
+  if (pattern.endpoint?.from === "registrationArgument") {
+    const endpointNode = endpointFromRegistrationArgument(
+      unit,
+      pattern.endpoint.position
+    );
+    if (endpointNode === null) {
+      return null;
+    }
+    return extractEndpointContract(endpointNode, pattern, framework);
+  }
   const routerInfo = findRouterCall(unit);
   if (routerInfo === null) {
     return null;
@@ -5340,6 +5354,35 @@ function readContract(unit, pattern, framework) {
   }
   return null;
 }
+function endpointFromRegistrationArgument(unit, position) {
+  const func = unit.func;
+  if (func === null) {
+    return null;
+  }
+  const call = func.getParent();
+  if (call === void 0 || !import_ts_morph25.Node.isCallExpression(call)) {
+    return null;
+  }
+  const args = call.getArguments();
+  if (!args.includes(func)) {
+    return null;
+  }
+  const arg = args[position];
+  if (arg === void 0 || arg === func) {
+    return null;
+  }
+  let node = arg;
+  while (import_ts_morph25.Node.isAsExpression(node)) {
+    node = node.getExpression();
+  }
+  if (import_ts_morph25.Node.isObjectLiteralExpression(node)) {
+    return node;
+  }
+  if (import_ts_morph25.Node.isCallExpression(node)) {
+    return unwrapContractInit(node);
+  }
+  return resolveContractObject(node);
+}
 function readContractForClientCall(callExpression, methodName, pattern, framework) {
   const callee = import_ts_morph25.Node.isCallExpression(callExpression) ? callExpression.getExpression() : null;
   if (callee === null || !import_ts_morph25.Node.isPropertyAccessExpression(callee)) {
@@ -27288,6 +27331,12 @@ function extractFromSourceFile(sourceFile, frameworks, claimedUnits, options, ta
           }
         }
       }
+      if (raw.declaredContract === null && pack.contractReading?.endpoint?.from === "registrationArgument") {
+        const contract = readContract(unit, pack.contractReading, pack.name);
+        if (contract !== null) {
+          raw.declaredContract = contract.declaredContract;
+        }
+      }
       if (raw.boundaryBinding === null) {
         if (unit.packageExportInfo !== void 0) {
           raw.boundaryBinding = (0, import_behavioral_ir5.packageExportBinding)({
@@ -27332,6 +27381,92 @@ function extractFromSourceFile(sourceFile, frameworks, claimedUnits, options, ta
   }
   return summaries;
 }
+function stampModuleImports(summaries, project) {
+  const byFile2 = /* @__PURE__ */ new Map();
+  for (const summary of summaries) {
+    const file2 = summary.location.file;
+    let imports = byFile2.get(file2);
+    if (imports === void 0) {
+      imports = internalImportsOf(project, file2);
+      byFile2.set(file2, imports);
+    }
+    if (imports.length === 0) {
+      continue;
+    }
+    summary.metadata = {
+      ...summary.metadata ?? {},
+      moduleImports: imports
+    };
+  }
+}
+function emitLibraryEnvReadMarkers(summaries, project, frameworks) {
+  for (const pack of frameworks) {
+    for (const declared of pack.libraryEnvVars ?? []) {
+      const importer = fileImporting(project, declared.module);
+      if (importer === void 0) {
+        continue;
+      }
+      summaries.push(libraryEnvReadMarker(pack, declared, importer));
+    }
+  }
+}
+function fileImporting(project, modulePrefix) {
+  for (const sourceFile of project.getSourceFiles()) {
+    if (sourceFile.isInNodeModules() || sourceFile.isDeclarationFile()) {
+      continue;
+    }
+    for (const imp of sourceFile.getImportDeclarations()) {
+      if (imp.getModuleSpecifierValue().startsWith(modulePrefix)) {
+        return sourceFile.getFilePath();
+      }
+    }
+  }
+  return void 0;
+}
+function libraryEnvReadMarker(pack, declared, importer) {
+  return {
+    kind: "library",
+    location: { file: importer, range: { start: 0, end: 0 }, exportName: null },
+    identity: {
+      name: `${declared.module} env reads`,
+      exportPath: null,
+      boundaryBinding: (0, import_behavioral_ir5.functionCallBinding)({
+        transport: "in-process",
+        recognition: pack.name
+      })
+    },
+    inputs: [],
+    transitions: [],
+    gaps: [],
+    confidence: { source: "declared", level: "high" },
+    metadata: {
+      libraryEnvReads: {
+        module: declared.module,
+        ...declared.prefixes !== void 0 ? { prefixes: declared.prefixes } : {},
+        ...declared.names !== void 0 ? { names: declared.names } : {}
+      }
+    }
+  };
+}
+function internalImportsOf(project, file2) {
+  const sourceFile = project.getSourceFile(file2);
+  if (sourceFile === void 0) {
+    return [];
+  }
+  const targets = /* @__PURE__ */ new Set();
+  const record2 = (target) => {
+    if (target !== void 0 && !target.isInNodeModules() && !target.isDeclarationFile()) {
+      targets.add(target.getFilePath());
+    }
+  };
+  for (const imp of sourceFile.getImportDeclarations()) {
+    record2(imp.getModuleSpecifierSourceFile());
+  }
+  for (const exp of sourceFile.getExportDeclarations()) {
+    record2(exp.getModuleSpecifierSourceFile());
+  }
+  return [...targets].sort();
+}
 function expandWrapperCallers(summaries, project, options) {
   const wrappers = [];
   let lookup = null;
@@ -27742,6 +27877,14 @@ function createTypeScriptAdapter(config2) {
           () => deriveBoundaryEffects(enriched, closureFacts)
         );
       }
+      timer.time(
+        "stampModuleImports",
+        () => stampModuleImports(enriched, project)
+      );
+      timer.time(
+        "emitLibraryEnvReadMarkers",
+        () => emitLibraryEnvReadMarkers(enriched, project, config2.frameworks)
+      );
       await timer.timeAsync("cache.write", async () => {
         if (enriched.length === 0) {
           return;

package/dist/index.js

@@ -4931,7 +4931,7 @@ function indexFunctions(sf) {
 import { createHash as createHash2 } from "crypto";
 import fs2 from "fs/promises";
 import path2 from "path";
-var SCHEMA_VERSION = "4";
+var SCHEMA_VERSION = "5";
 var MAX_ENTRIES = 2;
 var ENTRY_PREFIX = "key-";
 var ENTRY_DIR_NAME = new RegExp(`^${ENTRY_PREFIX}[0-9a-f]{16}$`);
@@ -5225,15 +5225,19 @@ function unwrapContractInit(init) {
   if (init === void 0) {
     return null;
   }
-  if (Node24.isCallExpression(init)) {
-    const args = init.getArguments();
+  let node = init;
+  while (Node24.isAsExpression(node)) {
+    node = node.getExpression();
+  }
+  if (Node24.isCallExpression(node)) {
+    const args = node.getArguments();
     if (args.length > 0 && Node24.isObjectLiteralExpression(args[0])) {
       return args[0];
     }
     return null;
   }
-  if (Node24.isObjectLiteralExpression(init)) {
-    return init;
+  if (Node24.isObjectLiteralExpression(node)) {
+    return node;
   }
   return null;
 }
@@ -5294,6 +5298,16 @@ function extractEndpointContract(endpointNode, pattern, framework) {
   };
 }
 function readContract(unit, pattern, framework) {
+  if (pattern.endpoint?.from === "registrationArgument") {
+    const endpointNode = endpointFromRegistrationArgument(
+      unit,
+      pattern.endpoint.position
+    );
+    if (endpointNode === null) {
+      return null;
+    }
+    return extractEndpointContract(endpointNode, pattern, framework);
+  }
   const routerInfo = findRouterCall(unit);
   if (routerInfo === null) {
     return null;
@@ -5317,6 +5331,35 @@ function readContract(unit, pattern, framework) {
   }
   return null;
 }
+function endpointFromRegistrationArgument(unit, position) {
+  const func = unit.func;
+  if (func === null) {
+    return null;
+  }
+  const call = func.getParent();
+  if (call === void 0 || !Node24.isCallExpression(call)) {
+    return null;
+  }
+  const args = call.getArguments();
+  if (!args.includes(func)) {
+    return null;
+  }
+  const arg = args[position];
+  if (arg === void 0 || arg === func) {
+    return null;
+  }
+  let node = arg;
+  while (Node24.isAsExpression(node)) {
+    node = node.getExpression();
+  }
+  if (Node24.isObjectLiteralExpression(node)) {
+    return node;
+  }
+  if (Node24.isCallExpression(node)) {
+    return unwrapContractInit(node);
+  }
+  return resolveContractObject(node);
+}
 function readContractForClientCall(callExpression, methodName, pattern, framework) {
   const callee = Node24.isCallExpression(callExpression) ? callExpression.getExpression() : null;
   if (callee === null || !Node24.isPropertyAccessExpression(callee)) {
@@ -27294,6 +27337,12 @@ function extractFromSourceFile(sourceFile, frameworks, claimedUnits, options, ta
           }
         }
       }
+      if (raw.declaredContract === null && pack.contractReading?.endpoint?.from === "registrationArgument") {
+        const contract = readContract(unit, pack.contractReading, pack.name);
+        if (contract !== null) {
+          raw.declaredContract = contract.declaredContract;
+        }
+      }
       if (raw.boundaryBinding === null) {
         if (unit.packageExportInfo !== void 0) {
           raw.boundaryBinding = packageExportBinding({
@@ -27338,6 +27387,92 @@ function extractFromSourceFile(sourceFile, frameworks, claimedUnits, options, ta
   }
   return summaries;
 }
+function stampModuleImports(summaries, project) {
+  const byFile2 = /* @__PURE__ */ new Map();
+  for (const summary of summaries) {
+    const file2 = summary.location.file;
+    let imports = byFile2.get(file2);
+    if (imports === void 0) {
+      imports = internalImportsOf(project, file2);
+      byFile2.set(file2, imports);
+    }
+    if (imports.length === 0) {
+      continue;
+    }
+    summary.metadata = {
+      ...summary.metadata ?? {},
+      moduleImports: imports
+    };
+  }
+}
+function emitLibraryEnvReadMarkers(summaries, project, frameworks) {
+  for (const pack of frameworks) {
+    for (const declared of pack.libraryEnvVars ?? []) {
+      const importer = fileImporting(project, declared.module);
+      if (importer === void 0) {
+        continue;
+      }
+      summaries.push(libraryEnvReadMarker(pack, declared, importer));
+    }
+  }
+}
+function fileImporting(project, modulePrefix) {
+  for (const sourceFile of project.getSourceFiles()) {
+    if (sourceFile.isInNodeModules() || sourceFile.isDeclarationFile()) {
+      continue;
+    }
+    for (const imp of sourceFile.getImportDeclarations()) {
+      if (imp.getModuleSpecifierValue().startsWith(modulePrefix)) {
+        return sourceFile.getFilePath();
+      }
+    }
+  }
+  return void 0;
+}
+function libraryEnvReadMarker(pack, declared, importer) {
+  return {
+    kind: "library",
+    location: { file: importer, range: { start: 0, end: 0 }, exportName: null },
+    identity: {
+      name: `${declared.module} env reads`,
+      exportPath: null,
+      boundaryBinding: functionCallBinding2({
+        transport: "in-process",
+        recognition: pack.name
+      })
+    },
+    inputs: [],
+    transitions: [],
+    gaps: [],
+    confidence: { source: "declared", level: "high" },
+    metadata: {
+      libraryEnvReads: {
+        module: declared.module,
+        ...declared.prefixes !== void 0 ? { prefixes: declared.prefixes } : {},
+        ...declared.names !== void 0 ? { names: declared.names } : {}
+      }
+    }
+  };
+}
+function internalImportsOf(project, file2) {
+  const sourceFile = project.getSourceFile(file2);
+  if (sourceFile === void 0) {
+    return [];
+  }
+  const targets = /* @__PURE__ */ new Set();
+  const record2 = (target) => {
+    if (target !== void 0 && !target.isInNodeModules() && !target.isDeclarationFile()) {
+      targets.add(target.getFilePath());
+    }
+  };
+  for (const imp of sourceFile.getImportDeclarations()) {
+    record2(imp.getModuleSpecifierSourceFile());
+  }
+  for (const exp of sourceFile.getExportDeclarations()) {
+    record2(exp.getModuleSpecifierSourceFile());
+  }
+  return [...targets].sort();
+}
 function expandWrapperCallers(summaries, project, options) {
   const wrappers = [];
   let lookup = null;
@@ -27748,6 +27883,14 @@ function createTypeScriptAdapter(config2) {
           () => deriveBoundaryEffects(enriched, closureFacts)
         );
       }
+      timer.time(
+        "stampModuleImports",
+        () => stampModuleImports(enriched, project)
+      );
+      timer.time(
+        "emitLibraryEnvReadMarkers",
+        () => emitLibraryEnvReadMarkers(enriched, project, config2.frameworks)
+      );
       await timer.timeAsync("cache.write", async () => {
         if (enriched.length === 0) {
           return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/adapter-typescript",
-  "version": "0.5.8",
+  "version": "0.5.9",
   "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.8",
-    "@suss/datalog": "0.5.8",
-    "@suss/extractor": "0.5.8",
-    "@suss/resolution": "0.5.8",
+    "@suss/behavioral-ir": "0.5.9",
+    "@suss/datalog": "0.5.9",
+    "@suss/extractor": "0.5.9",
+    "@suss/resolution": "0.5.9",
     "graphql": "^16.8.0",
     "picomatch": "^4.0.4",
     "ts-morph": "^23.0.0"