@suss/adapter-typescript 0.24.4 → 0.26.0

package/dist/index.js

@@ -21,6 +21,7 @@ import {
 import { Database as Database5 } from "@suss/datalog";
 import {
   assembleSummary as assembleSummary3,
+  commonDirectoryOf as commonDirectoryOf2,
   composeWrappers,
   createCacheLayer,
   runDigest,
@@ -4382,181 +4383,8 @@ function declarationOf(value) {
 import { Node as Node18 } from "ts-morph";
 
 // src/discovery/importScan.ts
-import path3 from "path";
-
-// src/diagnostics.ts
 import path2 from "path";
-import { ts as ts3 } from "ts-morph";
-import {
-  createPackTallies,
-  emptyTally,
-  recordPackFailure,
-  summaryCountsByPack
-} from "@suss/extractor";
-function commonDirectoryOf(files) {
-  const absolute = files.filter((f) => path2.isAbsolute(f));
-  const first = absolute[0];
-  if (first === void 0) {
-    return void 0;
-  }
-  let shared = path2.dirname(first).split(path2.sep);
-  for (const file of absolute.slice(1)) {
-    const parts = path2.dirname(file).split(path2.sep);
-    let i = 0;
-    while (i < shared.length && i < parts.length && shared[i] === parts[i]) {
-      i += 1;
-    }
-    shared = shared.slice(0, i);
-  }
-  const joined2 = shared.join(path2.sep);
-  return joined2.length > 1 ? joined2 : void 0;
-}
-var DEFAULT_RESOLUTION = {
-  moduleResolution: ts3.ModuleResolutionKind.Bundler,
-  target: ts3.ScriptTarget.ESNext,
-  module: ts3.ModuleKind.ESNext
-};
-function resolutionContext(args) {
-  if (args.tsConfigFilePath !== void 0) {
-    const configFile = ts3.readConfigFile(
-      args.tsConfigFilePath,
-      ts3.sys.readFile
-    );
-    if (configFile.error !== void 0) {
-      return null;
-    }
-    const dir = path2.dirname(args.tsConfigFilePath);
-    const parsed = ts3.parseJsonConfigFileContent(
-      configFile.config,
-      ts3.sys,
-      dir,
-      /*existingOptions*/
-      void 0,
-      args.tsConfigFilePath
-    );
-    return {
-      containingFile: path2.join(dir, "index.ts"),
-      options: parsed.options
-    };
-  }
-  if (args.projectRoot === void 0 || !path2.isAbsolute(args.projectRoot)) {
-    return null;
-  }
-  return {
-    containingFile: path2.join(args.projectRoot, "index.ts"),
-    options: DEFAULT_RESOLUTION
-  };
-}
-function unresolvedGatesFor(gates, args) {
-  if (gates.length === 0) {
-    return [];
-  }
-  const context = resolutionContext(args);
-  if (context === null) {
-    return [];
-  }
-  const unresolved = [];
-  for (const gate of gates) {
-    const resolved = ts3.resolveModuleName(
-      gate,
-      context.containingFile,
-      context.options,
-      ts3.sys
-    );
-    if (resolved.resolvedModule === void 0) {
-      unresolved.push(gate);
-    }
-  }
-  return unresolved;
-}
-function helpersWithNoCall(patterns, matched, projectRoot) {
-  const missing = [];
-  for (const pattern of patterns) {
-    if (pattern.match.type !== "registrationTemplate" || matched.has(pattern.match.helperName)) {
-      continue;
-    }
-    const from = pattern.match.importModule;
-    missing.push(
-      from === void 0 ? pattern.match.helperName : `${pattern.match.helperName} from ${shortModule(from, projectRoot)}`
-    );
-  }
-  return missing;
-}
-function shortModule(module, projectRoot) {
-  if (projectRoot === void 0 || !path2.isAbsolute(module)) {
-    return module;
-  }
-  return path2.relative(projectRoot, module);
-}
-function buildExtractionReport(args) {
-  const bySummary = summaryCountsByPack(args.summaries);
-  const packFunnels = args.packs.map((pack) => {
-    const gates = packIsUngated(pack) ? [] : collectPackGates(pack);
-    const tally = args.tallies.get(pack.name) ?? emptyTally();
-    const counted = bySummary.get(pack.name) ?? {
-      bound: 0,
-      providers: 0,
-      withBehavior: 0
-    };
-    return {
-      pack: pack.name,
-      version: pack.version ?? null,
-      discovers: pack.discovery.length > 0 || pack.discoverUnits !== void 0,
-      recognizes: (pack.invocationRecognizers?.length ?? 0) > 0 || (pack.accessRecognizers?.length ?? 0) > 0,
-      gates,
-      unresolvedGates: unresolvedGatesFor(gates, {
-        tsConfigFilePath: args.tsConfigFilePath,
-        projectRoot: args.projectRoot
-      }),
-      candidateFiles: tally.candidateFiles,
-      unitsDiscovered: tally.unitsDiscovered,
-      unitsInGatedFiles: tally.unitsInGatedFiles,
-      effectsRecognized: tally.effectsRecognized,
-      unitsClaimed: tally.unitsClaimed,
-      selfCollisions: tally.selfCollisions,
-      summariesProduced: tally.summariesProduced,
-      failures: tally.failures,
-      helpersUnmatched: helpersWithNoCall(
-        [...pack.discovery, ...args.contributedPatterns?.(pack.name) ?? []],
-        tally.helpersMatched,
-        args.projectRoot
-      ),
-      summariesBound: counted.bound,
-      providerSummaries: counted.providers,
-      summariesWithBehavior: counted.withBehavior,
-      declarations: pack.declarations ?? null
-    };
-  });
-  return {
-    filesInProject: args.filesInProject,
-    filesWalked: args.filesWalked,
-    packs: packFunnels,
-    summaries: args.summaries.length,
-    filesWithUnreadableExports: [...args.filesWithUnreadableExports ?? []],
-    reassignedNamesUnstated: args.reassignedNamesUnstated ?? 0,
-    emptyStage: args.summaries.length === 0 ? firstEmptyStage(packFunnels, args) : null
-  };
-}
-function firstEmptyStage(packs, args) {
-  if (args.filesInProject === 0) {
-    return "tsconfig";
-  }
-  const gateFailed = packs.some(
-    (p) => p.unresolvedGates.length > 0 && p.candidateFiles > 0
-  );
-  if (gateFailed) {
-    return "gateResolution";
-  }
-  if (args.filesWalked === 0 || packs.every((p) => p.candidateFiles === 0)) {
-    return "candidateFiles";
-  }
-  if (packs.every((p) => p.unitsDiscovered === 0)) {
-    return "discovery";
-  }
-  return "assembly";
-}
-
-// src/discovery/importScan.ts
+import { commonDirectoryOf } from "@suss/extractor";
 function specifierMatches(specifier, moduleName, subpaths) {
   if (specifier === moduleName) {
     return true;
@@ -4648,7 +4476,7 @@ function resolvedModuleFile(project, importModule, resolution) {
 function projectFileNamedBy(project, specifier) {
   const files = project.getSourceFiles().filter((sf) => !sf.isDeclarationFile());
   const root = commonDirectoryOf(files.map((sf) => sf.getFilePath())) ?? "/";
-  const target = withoutSourceExtension(path3.resolve(root, specifier));
+  const target = withoutSourceExtension(path2.resolve(root, specifier));
   for (const candidate of files) {
     if (withoutSourceExtension(candidate.getFilePath()) === target) {
       return candidate;
@@ -6107,7 +5935,7 @@ import { Node as Node26 } from "ts-morph";
 
 // src/discovery/graphqlShared.ts
 import fs2 from "fs";
-import path4 from "path";
+import path3 from "path";
 import {
   Kind as GraphqlKind,
   parse as graphqlParse,
@@ -6650,8 +6478,8 @@ function resolveGraphqlFileImport(decl) {
     return null;
   }
   const sourceFile = importDecl.getSourceFile();
-  const baseDir = path4.dirname(sourceFile.getFilePath());
-  const absolute = path4.resolve(baseDir, specifier);
+  const baseDir = path3.dirname(sourceFile.getFilePath());
+  const absolute = path3.resolve(baseDir, specifier);
   try {
     return fs2.readFileSync(absolute, "utf8");
   } catch {
@@ -7258,13 +7086,13 @@ import { Node as Node30 } from "ts-morph";
 
 // src/packageExports.ts
 import fs3 from "fs";
-import path5 from "path";
+import path4 from "path";
 function resolvePackageExports(packageJsonPath, opts = {}) {
-  const absPkgJson = path5.resolve(packageJsonPath);
-  const pkgDir = path5.dirname(absPkgJson);
+  const absPkgJson = path4.resolve(packageJsonPath);
+  const pkgDir = path4.dirname(absPkgJson);
   const raw = fs3.readFileSync(absPkgJson, "utf8");
   const pkg = JSON.parse(raw);
-  const packageName = pkg.name ?? path5.basename(pkgDir);
+  const packageName = pkg.name ?? path4.basename(pkgDir);
   const warnings = [];
   const entries = [];
   const pushEntry = (subPath, distPath) => {
@@ -7283,7 +7111,7 @@ function resolvePackageExports(packageJsonPath, opts = {}) {
       subPath,
       exportPathPrefix: subPathToPrefix(subPath),
       sourceFile: src,
-      publishedFile: path5.resolve(pkgDir, distPath)
+      publishedFile: path4.resolve(pkgDir, distPath)
     });
   };
   const exportsField = pkg.exports;
@@ -7325,12 +7153,12 @@ function resolvePackageExportsCached(packageJsonPath) {
   return fresh;
 }
 function namedPackageDirAbove(start) {
-  let at = path5.resolve(start);
+  let at = path4.resolve(start);
   for (let up = 0; up < 12; up += 1) {
     if (packageNameAt(at) !== null) {
       return at;
     }
-    const parent = path5.dirname(at);
+    const parent = path4.dirname(at);
     if (parent === at) {
       break;
     }
@@ -7341,7 +7169,7 @@ function namedPackageDirAbove(start) {
 function packageNameAt(dir) {
   try {
     const manifest = JSON.parse(
-      fs3.readFileSync(path5.join(dir, "package.json"), "utf8")
+      fs3.readFileSync(path4.join(dir, "package.json"), "utf8")
     );
     if (typeof manifest.name === "string" && manifest.name.length > 0) {
       return manifest.name;
@@ -7391,7 +7219,7 @@ function resolveSourceFor(pkgDir, distPath, srcRoot) {
   const stem = withoutDist.replace(/\.d\.ts$/, "").replace(/\.js$/, "").replace(/\.cjs$/, "").replace(/\.mjs$/, "").replace(/\.ts$/, "");
   const candidates = [`${stem}.ts`, `${stem}.tsx`];
   for (const candidate of candidates) {
-    const abs = path5.resolve(pkgDir, candidate);
+    const abs = path4.resolve(pkgDir, candidate);
     if (fs3.existsSync(abs)) {
       return abs;
     }
@@ -7400,20 +7228,20 @@ function resolveSourceFor(pkgDir, distPath, srcRoot) {
 }
 
 // src/resolve/sourceDeclaration.ts
-import path6 from "path";
+import path5 from "path";
 function sourceDeclarationsBehind(decl, resolution, visited = /* @__PURE__ */ new Set()) {
   const file = decl.getSourceFile();
   if (!file.isDeclarationFile() || file.isInNodeModules()) {
     return [decl];
   }
-  const packageDir = namedPackageDirAbove(path6.dirname(file.getFilePath()));
+  const packageDir = namedPackageDirAbove(path5.dirname(file.getFilePath()));
   if (packageDir === null || visited.has(packageDir)) {
     return [decl];
   }
   visited.add(packageDir);
   const project = file.getProject();
   const { entries } = resolvePackageExportsCached(
-    path6.join(packageDir, "package.json")
+    path5.join(packageDir, "package.json")
   );
   const found = [];
   for (const entry of entries) {
@@ -8515,7 +8343,7 @@ function handlerName(value) {
 }
 
 // src/discovery/registrationTemplate.ts
-import path7 from "path";
+import path6 from "path";
 import { Node as Node35 } from "ts-morph";
 import { joinMountedPath as joinMountedPath2 } from "@suss/resolution";
 
@@ -8671,7 +8499,7 @@ function subjectOfCall(sourceFile, args, match, resolution) {
 }
 function helperCallsOf(sourceFile, match, resolution) {
   const module = match.importModule;
-  if (module !== void 0 && !path7.isAbsolute(module)) {
+  if (module !== void 0 && !path6.isAbsolute(module)) {
     const store = resolution ?? new ResolutionStore();
     return callsResolvingTo(sourceFile, store, {
       module,
@@ -12839,6 +12667,159 @@ function readContractForClientCall(callExpression, methodName, pattern, framewor
   return null;
 }
 
+// src/diagnostics.ts
+import path7 from "path";
+import { ts as ts3 } from "ts-morph";
+import {
+  createPackTallies,
+  emptyTally,
+  recordPackFailure,
+  summaryCountsByPack
+} from "@suss/extractor";
+var DEFAULT_RESOLUTION = {
+  moduleResolution: ts3.ModuleResolutionKind.Bundler,
+  target: ts3.ScriptTarget.ESNext,
+  module: ts3.ModuleKind.ESNext
+};
+function resolutionContext(args) {
+  if (args.tsConfigFilePath !== void 0) {
+    const configFile = ts3.readConfigFile(
+      args.tsConfigFilePath,
+      ts3.sys.readFile
+    );
+    if (configFile.error !== void 0) {
+      return null;
+    }
+    const dir = path7.dirname(args.tsConfigFilePath);
+    const parsed = ts3.parseJsonConfigFileContent(
+      configFile.config,
+      ts3.sys,
+      dir,
+      /*existingOptions*/
+      void 0,
+      args.tsConfigFilePath
+    );
+    return {
+      containingFile: path7.join(dir, "index.ts"),
+      options: parsed.options
+    };
+  }
+  if (args.projectRoot === void 0 || !path7.isAbsolute(args.projectRoot)) {
+    return null;
+  }
+  return {
+    containingFile: path7.join(args.projectRoot, "index.ts"),
+    options: DEFAULT_RESOLUTION
+  };
+}
+function unresolvedGatesFor(gates, args) {
+  if (gates.length === 0) {
+    return [];
+  }
+  const context = resolutionContext(args);
+  if (context === null) {
+    return [];
+  }
+  const unresolved = [];
+  for (const gate of gates) {
+    const resolved = ts3.resolveModuleName(
+      gate,
+      context.containingFile,
+      context.options,
+      ts3.sys
+    );
+    if (resolved.resolvedModule === void 0) {
+      unresolved.push(gate);
+    }
+  }
+  return unresolved;
+}
+function helpersWithNoCall(patterns, matched, projectRoot) {
+  const missing = [];
+  for (const pattern of patterns) {
+    if (pattern.match.type !== "registrationTemplate" || matched.has(pattern.match.helperName)) {
+      continue;
+    }
+    const from = pattern.match.importModule;
+    missing.push(
+      from === void 0 ? pattern.match.helperName : `${pattern.match.helperName} from ${shortModule(from, projectRoot)}`
+    );
+  }
+  return missing;
+}
+function shortModule(module, projectRoot) {
+  if (projectRoot === void 0 || !path7.isAbsolute(module)) {
+    return module;
+  }
+  return path7.relative(projectRoot, module);
+}
+function buildExtractionReport(args) {
+  const bySummary = summaryCountsByPack(args.summaries);
+  const packFunnels = args.packs.map((pack) => {
+    const gates = packIsUngated(pack) ? [] : collectPackGates(pack);
+    const tally = args.tallies.get(pack.name) ?? emptyTally();
+    const counted = bySummary.get(pack.name) ?? {
+      bound: 0,
+      providers: 0,
+      withBehavior: 0
+    };
+    return {
+      pack: pack.name,
+      version: pack.version ?? null,
+      discovers: pack.discovery.length > 0 || pack.discoverUnits !== void 0,
+      recognizes: (pack.invocationRecognizers?.length ?? 0) > 0 || (pack.accessRecognizers?.length ?? 0) > 0,
+      gates,
+      unresolvedGates: unresolvedGatesFor(gates, {
+        tsConfigFilePath: args.tsConfigFilePath,
+        projectRoot: args.projectRoot
+      }),
+      candidateFiles: tally.candidateFiles,
+      unitsDiscovered: tally.unitsDiscovered,
+      unitsInGatedFiles: tally.unitsInGatedFiles,
+      effectsRecognized: tally.effectsRecognized,
+      unitsClaimed: tally.unitsClaimed,
+      summariesProduced: tally.summariesProduced,
+      failures: tally.failures,
+      helpersUnmatched: helpersWithNoCall(
+        [...pack.discovery, ...args.contributedPatterns?.(pack.name) ?? []],
+        tally.helpersMatched,
+        args.projectRoot
+      ),
+      summariesBound: counted.bound,
+      providerSummaries: counted.providers,
+      summariesWithBehavior: counted.withBehavior,
+      declarations: pack.declarations ?? null
+    };
+  });
+  return {
+    filesInProject: args.filesInProject,
+    filesWalked: args.filesWalked,
+    packs: packFunnels,
+    summaries: args.summaries.length,
+    filesWithUnreadableExports: [...args.filesWithUnreadableExports ?? []],
+    reassignedNamesUnstated: args.reassignedNamesUnstated ?? 0,
+    emptyStage: args.summaries.length === 0 ? firstEmptyStage(packFunnels, args) : null
+  };
+}
+function firstEmptyStage(packs, args) {
+  if (args.filesInProject === 0) {
+    return "tsconfig";
+  }
+  const gateFailed = packs.some(
+    (p) => p.unresolvedGates.length > 0 && p.candidateFiles > 0
+  );
+  if (gateFailed) {
+    return "gateResolution";
+  }
+  if (args.filesWalked === 0 || packs.every((p) => p.candidateFiles === 0)) {
+    return "candidateFiles";
+  }
+  if (packs.every((p) => p.unitsDiscovered === 0)) {
+    return "discovery";
+  }
+  return "assembly";
+}
+
 // src/discovery/filenameRoute.ts
 function routePathFromFile(filePath, convention) {
   const belowRoot = segmentsBelowRoot(filePath, convention.root);
@@ -16528,9 +16509,6 @@ function extractFromSourceFile(sourceFile, frameworks, claimedUnits, options, ta
       const claimKey = unitDedupKey(unit);
       const claimant = claimed.get(claimKey);
       if (claimant !== void 0) {
-        if (claimant.pack === pack.name && claimant.file === sourceFile.getFilePath() && tally !== void 0) {
-          tally.selfCollisions += 1;
-        }
         if (claimant.file !== sourceFile.getFilePath()) {
           recordFileDependency(claimant.file);
         }
@@ -17083,7 +17061,7 @@ function buildCallerSummary(wrapper, callerFunc, callExpr, path15, options) {
   return summary;
 }
 function named(summaries, workspace, runRoot) {
-  const projectRoot = runRoot ?? commonDirectoryOf(summaries.map((s) => s.location.file));
+  const projectRoot = runRoot ?? commonDirectoryOf2(summaries.map((s) => s.location.file));
   nameSummaries(summaries, {
     workspace: workspace ?? workspaceNameFor(projectRoot),
     projectRoot
@@ -17520,7 +17498,7 @@ function createTypeScriptAdapter(suppliedConfig) {
             filesWalked: walkList.length,
             summaries: composed,
             tsConfigFilePath: config.tsConfigFilePath,
-            projectRoot: commonDirectoryOf(
+            projectRoot: commonDirectoryOf2(
               sourceFiles.map((f) => f.getFilePath())
             ),
             filesWithUnreadableExports: unreadableExportFiles(),
@@ -17532,7 +17510,7 @@ function createTypeScriptAdapter(suppliedConfig) {
       return named(
         composed,
         config.workspace,
-        runRoot ?? commonDirectoryOf(sourceFiles.map((f) => f.getFilePath()))
+        runRoot ?? commonDirectoryOf2(sourceFiles.map((f) => f.getFilePath()))
       );
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/adapter-typescript",
-  "version": "0.24.4",
+  "version": "0.26.0",
   "type": "module",
   "description": "Read a TypeScript or JavaScript codebase with suss and check what each handler returns against every caller, spec and template it can see.",
   "keywords": [
@@ -48,11 +48,11 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@suss/behavioral-ir": "0.24.4",
-    "@suss/datalog": "0.24.4",
-    "@suss/extractor": "0.24.4",
-    "@suss/resolution": "0.24.4",
-    "@suss/values": "0.24.4",
+    "@suss/behavioral-ir": "0.26.0",
+    "@suss/datalog": "0.26.0",
+    "@suss/extractor": "0.26.0",
+    "@suss/resolution": "0.26.0",
+    "@suss/values": "0.26.0",
     "graphql": "^16.8.0",
     "picomatch": "^4.0.4",
     "ts-morph": "^23.0.0",