@suss/adapter-typescript 0.5.4 → 0.5.5

package/dist/index.cjs

@@ -1664,8 +1664,13 @@ function collectPackGates(pack) {
 
 // src/bootstrap/lazyProjectInit.ts
 async function createLazyProject(tsConfigFilePath, packs) {
-  const allFiles = parseTsconfigFileList(tsConfigFilePath);
-  const candidates = await selectCandidateFiles(allFiles, packs);
+  const parsed = parseTsconfig(tsConfigFilePath);
+  const allFiles = parsed.fileNames;
+  const candidates = await selectCandidateFiles(
+    allFiles,
+    packs,
+    parsed.options
+  );
   const project = new import_ts_morph9.Project({
     tsConfigFilePath,
     skipAddingFilesFromTsConfig: true
@@ -1682,7 +1687,7 @@ async function createLazyProject(tsConfigFilePath, packs) {
   };
 }
 function readTsconfigFileList(tsConfigFilePath) {
-  return parseTsconfigFileList(tsConfigFilePath);
+  return parseTsconfig(tsConfigFilePath).fileNames;
 }
 function lazyAddSourceFile(project, projectFileSet, filePath) {
   if (!projectFileSet.has(filePath)) {
@@ -1833,10 +1838,10 @@ function readFileText(project, filePath) {
     return null;
   }
 }
-function parseTsconfigFileList(tsConfigFilePath) {
+function parseTsconfig(tsConfigFilePath) {
   const configFile = import_ts_morph9.ts.readConfigFile(tsConfigFilePath, import_ts_morph9.ts.sys.readFile);
   if (configFile.error !== void 0) {
-    return [];
+    return { fileNames: [], options: {} };
   }
   const parsed = import_ts_morph9.ts.parseJsonConfigFileContent(
     configFile.config,
@@ -1846,9 +1851,9 @@ function parseTsconfigFileList(tsConfigFilePath) {
     void 0,
     tsConfigFilePath
   );
-  return parsed.fileNames;
+  return { fileNames: parsed.fileNames, options: parsed.options };
 }
-async function selectCandidateFiles(allFiles, packs) {
+async function selectCandidateFiles(allFiles, packs, options) {
   const ungatedExists = packs.some(packIsUngated);
   if (ungatedExists) {
     return [...allFiles];
@@ -1858,13 +1863,101 @@ async function selectCandidateFiles(allFiles, packs) {
     return [];
   }
   const fileImports = await readImportsConcurrently(allFiles);
-  const matched = [];
+  const matched = /* @__PURE__ */ new Set();
   for (const { path: p, importedModules } of fileImports) {
     if (namesAnyPackage(importedModules, gates)) {
-      matched.push(p);
+      matched.add(p);
     }
   }
-  return matched;
+  addImportersOfMatches(fileImports, matched, options);
+  return allFiles.filter((p) => matched.has(p));
+}
+function addImportersOfMatches(fileImports, matched, options) {
+  const resolve2 = internalSpecifierResolver(
+    fileImports.map((fi) => fi.path),
+    options
+  );
+  const importersOf = /* @__PURE__ */ new Map();
+  for (const { path: from, importedModules } of fileImports) {
+    for (const spec of importedModules) {
+      const target = resolve2(from, spec);
+      if (target === null || target === from) {
+        continue;
+      }
+      const list = importersOf.get(target);
+      if (list === void 0) {
+        importersOf.set(target, [from]);
+      } else {
+        list.push(from);
+      }
+    }
+  }
+  const queue = [...matched];
+  while (queue.length > 0) {
+    const target = queue.pop();
+    for (const importer of importersOf.get(target) ?? []) {
+      if (!matched.has(importer)) {
+        matched.add(importer);
+        queue.push(importer);
+      }
+    }
+  }
+}
+function internalSpecifierResolver(files, options) {
+  const fileSet = new Set(files);
+  const probe = (base) => {
+    const stems = [base];
+    const swapped = base.replace(/\.(mjs|cjs|jsx|js)$/, "");
+    if (swapped !== base) {
+      stems.push(swapped);
+    }
+    for (const stem of stems) {
+      for (const candidate of [
+        stem,
+        `${stem}.ts`,
+        `${stem}.tsx`,
+        import_node_path.default.join(stem, "index.ts"),
+        import_node_path.default.join(stem, "index.tsx")
+      ]) {
+        if (fileSet.has(candidate)) {
+          return candidate;
+        }
+      }
+    }
+    return null;
+  };
+  const pathsBase = options.baseUrl ?? (typeof options.pathsBasePath === "string" ? options.pathsBasePath : "");
+  const aliasTargets = (spec) => {
+    const out = [];
+    for (const [pattern, targets] of Object.entries(options.paths ?? {})) {
+      const star = pattern.indexOf("*");
+      if (star === -1) {
+        if (spec === pattern) {
+          out.push(...targets);
+        }
+        continue;
+      }
+      const prefix = pattern.slice(0, star);
+      const suffix = pattern.slice(star + 1);
+      if (spec.length >= prefix.length + suffix.length && spec.startsWith(prefix) && spec.endsWith(suffix)) {
+        const filler = spec.slice(prefix.length, spec.length - suffix.length);
+        out.push(...targets.map((t) => t.replace("*", filler)));
+      }
+    }
+    return out.map((t) => import_node_path.default.resolve(pathsBase, t));
+  };
+  return (fromFile, spec) => {
+    if (spec.startsWith(".")) {
+      return probe(import_node_path.default.resolve(import_node_path.default.dirname(fromFile), spec));
+    }
+    for (const target of aliasTargets(spec)) {
+      const hit = probe(target);
+      if (hit !== null) {
+        return hit;
+      }
+    }
+    return null;
+  };
 }
 function collectAllGates(packs) {
   const gates = /* @__PURE__ */ new Set();

package/dist/index.js

@@ -1634,8 +1634,13 @@ function collectPackGates(pack) {
 
 // src/bootstrap/lazyProjectInit.ts
 async function createLazyProject(tsConfigFilePath, packs) {
-  const allFiles = parseTsconfigFileList(tsConfigFilePath);
-  const candidates = await selectCandidateFiles(allFiles, packs);
+  const parsed = parseTsconfig(tsConfigFilePath);
+  const allFiles = parsed.fileNames;
+  const candidates = await selectCandidateFiles(
+    allFiles,
+    packs,
+    parsed.options
+  );
   const project = new Project({
     tsConfigFilePath,
     skipAddingFilesFromTsConfig: true
@@ -1652,7 +1657,7 @@ async function createLazyProject(tsConfigFilePath, packs) {
   };
 }
 function readTsconfigFileList(tsConfigFilePath) {
-  return parseTsconfigFileList(tsConfigFilePath);
+  return parseTsconfig(tsConfigFilePath).fileNames;
 }
 function lazyAddSourceFile(project, projectFileSet, filePath) {
   if (!projectFileSet.has(filePath)) {
@@ -1803,10 +1808,10 @@ function readFileText(project, filePath) {
     return null;
   }
 }
-function parseTsconfigFileList(tsConfigFilePath) {
+function parseTsconfig(tsConfigFilePath) {
   const configFile = ts.readConfigFile(tsConfigFilePath, ts.sys.readFile);
   if (configFile.error !== void 0) {
-    return [];
+    return { fileNames: [], options: {} };
   }
   const parsed = ts.parseJsonConfigFileContent(
     configFile.config,
@@ -1816,9 +1821,9 @@ function parseTsconfigFileList(tsConfigFilePath) {
     void 0,
     tsConfigFilePath
   );
-  return parsed.fileNames;
+  return { fileNames: parsed.fileNames, options: parsed.options };
 }
-async function selectCandidateFiles(allFiles, packs) {
+async function selectCandidateFiles(allFiles, packs, options) {
   const ungatedExists = packs.some(packIsUngated);
   if (ungatedExists) {
     return [...allFiles];
@@ -1828,13 +1833,101 @@ async function selectCandidateFiles(allFiles, packs) {
     return [];
   }
   const fileImports = await readImportsConcurrently(allFiles);
-  const matched = [];
+  const matched = /* @__PURE__ */ new Set();
   for (const { path: p, importedModules } of fileImports) {
     if (namesAnyPackage(importedModules, gates)) {
-      matched.push(p);
+      matched.add(p);
     }
   }
-  return matched;
+  addImportersOfMatches(fileImports, matched, options);
+  return allFiles.filter((p) => matched.has(p));
+}
+function addImportersOfMatches(fileImports, matched, options) {
+  const resolve2 = internalSpecifierResolver(
+    fileImports.map((fi) => fi.path),
+    options
+  );
+  const importersOf = /* @__PURE__ */ new Map();
+  for (const { path: from, importedModules } of fileImports) {
+    for (const spec of importedModules) {
+      const target = resolve2(from, spec);
+      if (target === null || target === from) {
+        continue;
+      }
+      const list = importersOf.get(target);
+      if (list === void 0) {
+        importersOf.set(target, [from]);
+      } else {
+        list.push(from);
+      }
+    }
+  }
+  const queue = [...matched];
+  while (queue.length > 0) {
+    const target = queue.pop();
+    for (const importer of importersOf.get(target) ?? []) {
+      if (!matched.has(importer)) {
+        matched.add(importer);
+        queue.push(importer);
+      }
+    }
+  }
+}
+function internalSpecifierResolver(files, options) {
+  const fileSet = new Set(files);
+  const probe = (base) => {
+    const stems = [base];
+    const swapped = base.replace(/\.(mjs|cjs|jsx|js)$/, "");
+    if (swapped !== base) {
+      stems.push(swapped);
+    }
+    for (const stem of stems) {
+      for (const candidate of [
+        stem,
+        `${stem}.ts`,
+        `${stem}.tsx`,
+        path.join(stem, "index.ts"),
+        path.join(stem, "index.tsx")
+      ]) {
+        if (fileSet.has(candidate)) {
+          return candidate;
+        }
+      }
+    }
+    return null;
+  };
+  const pathsBase = options.baseUrl ?? (typeof options.pathsBasePath === "string" ? options.pathsBasePath : "");
+  const aliasTargets = (spec) => {
+    const out = [];
+    for (const [pattern, targets] of Object.entries(options.paths ?? {})) {
+      const star = pattern.indexOf("*");
+      if (star === -1) {
+        if (spec === pattern) {
+          out.push(...targets);
+        }
+        continue;
+      }
+      const prefix = pattern.slice(0, star);
+      const suffix = pattern.slice(star + 1);
+      if (spec.length >= prefix.length + suffix.length && spec.startsWith(prefix) && spec.endsWith(suffix)) {
+        const filler = spec.slice(prefix.length, spec.length - suffix.length);
+        out.push(...targets.map((t) => t.replace("*", filler)));
+      }
+    }
+    return out.map((t) => path.resolve(pathsBase, t));
+  };
+  return (fromFile, spec) => {
+    if (spec.startsWith(".")) {
+      return probe(path.resolve(path.dirname(fromFile), spec));
+    }
+    for (const target of aliasTargets(spec)) {
+      const hit = probe(target);
+      if (hit !== null) {
+        return hit;
+      }
+    }
+    return null;
+  };
 }
 function collectAllGates(packs) {
   const gates = /* @__PURE__ */ new Set();

package/package.json

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