@suss/adapter-typescript 0.5.5 → 0.5.7

package/dist/index.cjs

@@ -1905,58 +1905,27 @@ function addImportersOfMatches(fileImports, matched, options) {
 }
 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));
-  };
+  const cache = import_ts_morph9.ts.createModuleResolutionCache(
+    import_ts_morph9.ts.sys.getCurrentDirectory(),
+    (name) => name,
+    options
+  );
   return (fromFile, spec) => {
-    if (spec.startsWith(".")) {
-      return probe(import_node_path.default.resolve(import_node_path.default.dirname(fromFile), spec));
+    const resolved = import_ts_morph9.ts.resolveModuleName(
+      spec,
+      fromFile,
+      options,
+      import_ts_morph9.ts.sys,
+      cache
+    ).resolvedModule?.resolvedFileName;
+    if (resolved === void 0) {
+      return null;
     }
-    for (const target of aliasTargets(spec)) {
-      const hit = probe(target);
-      if (hit !== null) {
-        return hit;
-      }
+    if (fileSet.has(resolved)) {
+      return resolved;
     }
-    return null;
+    const real = import_ts_morph9.ts.sys.realpath?.(resolved) ?? resolved;
+    return fileSet.has(real) ? real : null;
   };
 }
 function collectAllGates(packs) {
@@ -2436,12 +2405,13 @@ function dispatchAccessRecognizers(root, recognizers, isStop) {
   }
   const out = [];
   const sourceFile = root.getSourceFile();
+  const seenEffects = /* @__PURE__ */ new Set();
   root.forEachDescendant((node, traversal) => {
     if (isStop(node)) {
       traversal.skip();
       return;
     }
-    if (!import_ts_morph12.Node.isPropertyAccessExpression(node)) {
+    if (!import_ts_morph12.Node.isPropertyAccessExpression(node) && !import_ts_morph12.Node.isCallExpression(node)) {
       return;
     }
     const ctx = {
@@ -2466,6 +2436,11 @@ function dispatchAccessRecognizers(root, recognizers, isStop) {
         continue;
       }
       for (const eff of emitted) {
+        const key = `${line}:${JSON.stringify(eff)}`;
+        if (seenEffects.has(key)) {
+          continue;
+        }
+        seenEffects.add(key);
         out.push({ effect: eff, line });
       }
     }

package/dist/index.js

@@ -1875,58 +1875,27 @@ function addImportersOfMatches(fileImports, matched, options) {
 }
 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));
-  };
+  const cache = ts.createModuleResolutionCache(
+    ts.sys.getCurrentDirectory(),
+    (name) => name,
+    options
+  );
   return (fromFile, spec) => {
-    if (spec.startsWith(".")) {
-      return probe(path.resolve(path.dirname(fromFile), spec));
+    const resolved = ts.resolveModuleName(
+      spec,
+      fromFile,
+      options,
+      ts.sys,
+      cache
+    ).resolvedModule?.resolvedFileName;
+    if (resolved === void 0) {
+      return null;
     }
-    for (const target of aliasTargets(spec)) {
-      const hit = probe(target);
-      if (hit !== null) {
-        return hit;
-      }
+    if (fileSet.has(resolved)) {
+      return resolved;
     }
-    return null;
+    const real = ts.sys.realpath?.(resolved) ?? resolved;
+    return fileSet.has(real) ? real : null;
   };
 }
 function collectAllGates(packs) {
@@ -2406,12 +2375,13 @@ function dispatchAccessRecognizers(root, recognizers, isStop) {
   }
   const out = [];
   const sourceFile = root.getSourceFile();
+  const seenEffects = /* @__PURE__ */ new Set();
   root.forEachDescendant((node, traversal) => {
     if (isStop(node)) {
       traversal.skip();
       return;
     }
-    if (!Node11.isPropertyAccessExpression(node)) {
+    if (!Node11.isPropertyAccessExpression(node) && !Node11.isCallExpression(node)) {
       return;
     }
     const ctx = {
@@ -2436,6 +2406,11 @@ function dispatchAccessRecognizers(root, recognizers, isStop) {
         continue;
       }
       for (const eff of emitted) {
+        const key = `${line}:${JSON.stringify(eff)}`;
+        if (seenEffects.has(key)) {
+          continue;
+        }
+        seenEffects.add(key);
         out.push({ effect: eff, line });
       }
     }

package/package.json

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