@suss/extractor 0.26.0 → 0.28.0

package/dist/index.cjs

@@ -673,9 +673,12 @@ function composeWrappers(summaries, options = {}) {
   const byKey = /* @__PURE__ */ new Map();
   for (const summary of summaries) {
     const key = summaryKey(summary.location.file, summary.identity.name);
-    if (!byKey.has(key)) {
-      byKey.set(key, summary);
+    const sharing = byKey.get(key);
+    if (sharing === void 0) {
+      byKey.set(key, [summary]);
+      continue;
     }
+    sharing.push(summary);
   }
   const keepGaps = options.gapHandling !== "silent";
   return summaries.map((summary) => composeOne(summary, byKey, keepGaps));
@@ -683,6 +686,13 @@ function composeWrappers(summaries, options = {}) {
 function summaryKey(file, name) {
   return `${file}::${name}`;
 }
+function summaryOf(reference, byKey) {
+  const sharing = byKey.get(summaryKey(reference.file, reference.name)) ?? [];
+  if (reference.line === void 0) {
+    return sharing[0];
+  }
+  return sharing.find((one) => one.location.range.start === reference.line) ?? sharing[0];
+}
 function composeOne(summary, byKey, keepGaps) {
   const recorded = (0, import_behavioral_ir3.readWrapperMetadata)(summary);
   const applied = recorded?.applied ?? [];
@@ -696,7 +706,7 @@ function composeOne(summary, byKey, keepGaps) {
     })
   };
   const wrappers = covering.flatMap((reference) => {
-    const found = byKey.get(summaryKey(reference.file, reference.name));
+    const found = summaryOf(reference, byKey);
     return found === void 0 ? [] : [{ reference, summary: found }];
   });
   if (wrappers.length === 0) {
@@ -776,8 +786,8 @@ function applyWrapper(wrapper, inner) {
     wrapper.summary.transitions.filter((t) => t.output.type !== "delegate"),
     wrapper.reference
   );
-  const passThroughs = wrapper.summary.transitions.filter(
-    (t) => t.output.type === "delegate"
+  const passThroughs = withoutCoveredPassThroughs(
+    wrapper.summary.transitions.filter((t) => t.output.type === "delegate")
   );
   if (passThroughs.length === 0 || shortCircuits.length + passThroughs.length * inner.transitions.length > MAX_PATHS) {
     return {
@@ -790,6 +800,20 @@ function applyWrapper(wrapper, inner) {
   );
   return { transitions: [...shortCircuits, ...continued], degraded: false };
 }
+function withoutCoveredPassThroughs(passThroughs) {
+  return passThroughs.filter(
+    (candidate, i) => !passThroughs.some(
+      (other, j) => j !== i && covers(other, candidate) && (j < i || !covers(candidate, other))
+    )
+  );
+}
+function covers(wider, narrower) {
+  if (JSON.stringify(wider.effects) !== JSON.stringify(narrower.effects)) {
+    return false;
+  }
+  const required = new Set(narrower.conditions.map((c) => JSON.stringify(c)));
+  return wider.conditions.every((c) => required.has(JSON.stringify(c)));
+}
 function applyThrowWrapper(wrapper, inner) {
   const thrown = inner.transitions.filter((t) => t.output.type === "throw");
   if (thrown.length === 0) {

package/dist/index.d.cts

@@ -173,6 +173,12 @@ type DiscoveryMatch = {
      * `axios.get(...)`.
      */
     factoryMethods?: string[];
+    /**
+     * The import and every instance built from it can be called as a
+     * function, so `axios(config)` and `api(config)` are requests the
+     * same as a call through a method in `methodFilter`.
+     */
+    callable?: boolean;
 } | {
     /**
      * A constructor or factory call that takes a configuration object

package/dist/index.d.ts

@@ -173,6 +173,12 @@ type DiscoveryMatch = {
      * `axios.get(...)`.
      */
     factoryMethods?: string[];
+    /**
+     * The import and every instance built from it can be called as a
+     * function, so `axios(config)` and `api(config)` are requests the
+     * same as a call through a method in `methodFilter`.
+     */
+    callable?: boolean;
 } | {
     /**
      * A constructor or factory call that takes a configuration object

package/dist/index.js

@@ -595,9 +595,12 @@ function composeWrappers(summaries, options = {}) {
   const byKey = /* @__PURE__ */ new Map();
   for (const summary of summaries) {
     const key = summaryKey(summary.location.file, summary.identity.name);
-    if (!byKey.has(key)) {
-      byKey.set(key, summary);
+    const sharing = byKey.get(key);
+    if (sharing === void 0) {
+      byKey.set(key, [summary]);
+      continue;
     }
+    sharing.push(summary);
   }
   const keepGaps = options.gapHandling !== "silent";
   return summaries.map((summary) => composeOne(summary, byKey, keepGaps));
@@ -605,6 +608,13 @@ function composeWrappers(summaries, options = {}) {
 function summaryKey(file, name) {
   return `${file}::${name}`;
 }
+function summaryOf(reference, byKey) {
+  const sharing = byKey.get(summaryKey(reference.file, reference.name)) ?? [];
+  if (reference.line === void 0) {
+    return sharing[0];
+  }
+  return sharing.find((one) => one.location.range.start === reference.line) ?? sharing[0];
+}
 function composeOne(summary, byKey, keepGaps) {
   const recorded = readWrapperMetadata2(summary);
   const applied = recorded?.applied ?? [];
@@ -618,7 +628,7 @@ function composeOne(summary, byKey, keepGaps) {
     })
   };
   const wrappers = covering.flatMap((reference) => {
-    const found = byKey.get(summaryKey(reference.file, reference.name));
+    const found = summaryOf(reference, byKey);
     return found === void 0 ? [] : [{ reference, summary: found }];
   });
   if (wrappers.length === 0) {
@@ -698,8 +708,8 @@ function applyWrapper(wrapper, inner) {
     wrapper.summary.transitions.filter((t) => t.output.type !== "delegate"),
     wrapper.reference
   );
-  const passThroughs = wrapper.summary.transitions.filter(
-    (t) => t.output.type === "delegate"
+  const passThroughs = withoutCoveredPassThroughs(
+    wrapper.summary.transitions.filter((t) => t.output.type === "delegate")
   );
   if (passThroughs.length === 0 || shortCircuits.length + passThroughs.length * inner.transitions.length > MAX_PATHS) {
     return {
@@ -712,6 +722,20 @@ function applyWrapper(wrapper, inner) {
   );
   return { transitions: [...shortCircuits, ...continued], degraded: false };
 }
+function withoutCoveredPassThroughs(passThroughs) {
+  return passThroughs.filter(
+    (candidate, i) => !passThroughs.some(
+      (other, j) => j !== i && covers(other, candidate) && (j < i || !covers(candidate, other))
+    )
+  );
+}
+function covers(wider, narrower) {
+  if (JSON.stringify(wider.effects) !== JSON.stringify(narrower.effects)) {
+    return false;
+  }
+  const required = new Set(narrower.conditions.map((c) => JSON.stringify(c)));
+  return wider.conditions.every((c) => required.has(JSON.stringify(c)));
+}
 function applyThrowWrapper(wrapper, inner) {
   const thrown = inner.transitions.filter((t) => t.output.type === "throw");
   if (thrown.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/extractor",
-  "version": "0.26.0",
+  "version": "0.28.0",
   "type": "module",
   "description": "The suss extraction pipeline, which turns what a language adapter read into the summaries the checker pairs across a boundary.",
   "keywords": [
@@ -46,7 +46,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@suss/behavioral-ir": "0.26.0",
+    "@suss/behavioral-ir": "0.28.0",
     "zod": "^4.0.0"
   },
   "devDependencies": {