@suss/adapter-typescript 0.16.0 → 0.17.0

package/dist/index.cjs

@@ -12484,19 +12484,35 @@ function resolveCallee(call, calleeName, scan) {
     }
   };
 }
+function resolveJsxReference(node) {
+  if (!import_ts_morph56.Node.isJsxOpeningElement(node) && !import_ts_morph56.Node.isJsxSelfClosingElement(node)) {
+    return null;
+  }
+  const tag = node.getTagNameNode();
+  if (!import_ts_morph56.Node.isIdentifier(tag) || !/^[A-Z]/.test(tag.getText())) {
+    return null;
+  }
+  const name = tag.getText();
+  const declarations = declarationsBehind(tag.getSymbol());
+  for (const decl of declarations) {
+    const resolved = resolveDecl(decl, name);
+    if (resolved !== null) {
+      return { tag: name, outcome: { kind: "followed", candidate: resolved } };
+    }
+  }
+  return {
+    tag: name,
+    outcome: {
+      kind: "stopped",
+      stop: { callee: name, reason: classifyStop(declarations) }
+    }
+  };
+}
 function collectReachable(func, scan) {
   const candidates = [];
   const stops = [];
   const seen = /* @__PURE__ */ new Set();
-  func.forEachDescendant((node) => {
-    if (!import_ts_morph56.Node.isCallExpression(node)) {
-      return;
-    }
-    const calleeText = normalizeCallee(node.getExpression().getText());
-    const outcome = resolveCallee(node, calleeText, scan);
-    if (outcome === null) {
-      return;
-    }
+  const record = (outcome) => {
     if (outcome.kind === "stopped") {
       const stopKey = `${outcome.stop.reason}:${outcome.stop.callee}`;
       if (!seen.has(stopKey) && worthRecording(outcome.stop.reason)) {
@@ -12511,6 +12527,22 @@ function collectReachable(func, scan) {
     }
     seen.add(key);
     candidates.push(outcome.candidate);
+  };
+  func.forEachDescendant((node) => {
+    const jsx = resolveJsxReference(node);
+    if (jsx !== null) {
+      record(jsx.outcome);
+      return;
+    }
+    if (!import_ts_morph56.Node.isCallExpression(node)) {
+      return;
+    }
+    const calleeText = normalizeCallee(node.getExpression().getText());
+    const outcome = resolveCallee(node, calleeText, scan);
+    if (outcome === null) {
+      return;
+    }
+    record(outcome);
   });
   return { candidates, stops };
 }
@@ -14386,8 +14418,8 @@ function collectAccessRecognizers(frameworks, tallies) {
   }
   return out;
 }
-function computeSubUnitBarriers(unit, pack, ctx, tally, file) {
-  if (pack.subUnits === void 0 || unit.func === null) {
+function computeSubUnitBarriers(unit, packs, ctx, tallies, file) {
+  if (unit.func === null) {
     return NO_BARRIERS;
   }
   const parentHandle = {
@@ -14395,27 +14427,27 @@ function computeSubUnitBarriers(unit, pack, ctx, tally, file) {
     name: unit.name,
     kind: unit.kind
   };
-  try {
-    const subUnits = pack.subUnits(parentHandle, ctx);
-    if (subUnits.length === 0) {
-      return NO_BARRIERS;
+  const barriers = /* @__PURE__ */ new Set();
+  for (const pack of packs) {
+    if (pack.subUnits === void 0) {
+      continue;
     }
-    const barriers = /* @__PURE__ */ new Set();
-    for (const su of subUnits) {
-      barriers.add(su.func);
+    try {
+      for (const su of pack.subUnits(parentHandle, ctx)) {
+        barriers.add(su.func);
+      }
+    } catch (err) {
+      process.stderr.write(
+        recordPackFailure(tallies?.get(pack.name), {
+          pack: pack.name,
+          hook: "subUnits",
+          file,
+          error: err
+        })
+      );
     }
-    return barriers;
-  } catch (err) {
-    process.stderr.write(
-      recordPackFailure(tally, {
-        pack: pack.name,
-        hook: "subUnits",
-        file,
-        error: err
-      })
-    );
-    return NO_BARRIERS;
   }
+  return barriers.size === 0 ? NO_BARRIERS : barriers;
 }
 function extractFromSourceFile(sourceFile, frameworks, claimedUnits, options, tallies, resolution, mountPrefixes) {
   const summaries = [];
@@ -14497,9 +14529,9 @@ function extractFromSourceFile(sourceFile, frameworks, claimedUnits, options, ta
       }
       const barriers = computeSubUnitBarriers(
         unit,
-        pack,
+        frameworks,
         subUnitCtx,
-        tally,
+        tallies,
         sourceFile.getFilePath()
       );
       const raw = extractCodeStructure(
@@ -15268,6 +15300,7 @@ function createTypeScriptAdapter(suppliedConfig) {
           pipeline,
           project,
           config.frameworks,
+          packsByFile,
           config.extractorOptions,
           tallies,
           (created, parent) => {
@@ -15608,11 +15641,15 @@ function buildCacheAttribution(args) {
   ];
   return { roots, owners };
 }
-function synthesizeSubUnits(summaries, project, frameworks, options, tallies, onCreated) {
+function synthesizeSubUnits(summaries, project, frameworks, packsByFile, options, tallies, onCreated) {
   const packByRecognition = /* @__PURE__ */ new Map();
   for (const pack of frameworks) {
     packByRecognition.set(pack.name, pack);
   }
+  const packsByPath = /* @__PURE__ */ new Map();
+  for (const [sf, packs] of packsByFile) {
+    packsByPath.set(sf.getFilePath(), packs);
+  }
   const allInvocationRecognizers = collectInvocationRecognizers(
     frameworks,
     tallies
@@ -15626,8 +15663,15 @@ function synthesizeSubUnits(summaries, project, frameworks, options, tallies, on
     if (binding === null) {
       continue;
     }
-    const pack = packByRecognition.get(binding.recognition);
-    if (pack?.subUnits === void 0) {
+    const discovering = packByRecognition.get(binding.recognition);
+    const applicable = packsByPath.get(parent.location.file) ?? (discovering !== void 0 ? [discovering] : []);
+    const hooked = [
+      ...discovering?.subUnits !== void 0 ? [discovering] : [],
+      ...applicable.filter(
+        (one) => one.subUnits !== void 0 && one !== discovering
+      )
+    ];
+    if (hooked.length === 0) {
       continue;
     }
     lookup ??= createSourceFileLookup(project);
@@ -15640,7 +15684,17 @@ function synthesizeSubUnits(summaries, project, frameworks, options, tallies, on
       name: parent.identity.name,
       kind: parent.kind
     };
-    const subUnits = pack.subUnits(parentHandle, subUnitCtx);
+    const claimedFuncs = /* @__PURE__ */ new Set();
+    const subUnits = [];
+    for (const pack of hooked) {
+      for (const subUnit of pack.subUnits?.(parentHandle, subUnitCtx) ?? []) {
+        if (claimedFuncs.has(subUnit.func)) {
+          continue;
+        }
+        claimedFuncs.add(subUnit.func);
+        subUnits.push(subUnit);
+      }
+    }
     for (const subUnit of subUnits) {
       const summary = buildSubUnitSummary(
         subUnit,

package/dist/index.js

@@ -12490,19 +12490,35 @@ function resolveCallee(call, calleeName, scan) {
     }
   };
 }
+function resolveJsxReference(node) {
+  if (!Node54.isJsxOpeningElement(node) && !Node54.isJsxSelfClosingElement(node)) {
+    return null;
+  }
+  const tag = node.getTagNameNode();
+  if (!Node54.isIdentifier(tag) || !/^[A-Z]/.test(tag.getText())) {
+    return null;
+  }
+  const name = tag.getText();
+  const declarations = declarationsBehind(tag.getSymbol());
+  for (const decl of declarations) {
+    const resolved = resolveDecl(decl, name);
+    if (resolved !== null) {
+      return { tag: name, outcome: { kind: "followed", candidate: resolved } };
+    }
+  }
+  return {
+    tag: name,
+    outcome: {
+      kind: "stopped",
+      stop: { callee: name, reason: classifyStop(declarations) }
+    }
+  };
+}
 function collectReachable(func, scan) {
   const candidates = [];
   const stops = [];
   const seen = /* @__PURE__ */ new Set();
-  func.forEachDescendant((node) => {
-    if (!Node54.isCallExpression(node)) {
-      return;
-    }
-    const calleeText = normalizeCallee(node.getExpression().getText());
-    const outcome = resolveCallee(node, calleeText, scan);
-    if (outcome === null) {
-      return;
-    }
+  const record = (outcome) => {
     if (outcome.kind === "stopped") {
       const stopKey = `${outcome.stop.reason}:${outcome.stop.callee}`;
       if (!seen.has(stopKey) && worthRecording(outcome.stop.reason)) {
@@ -12517,6 +12533,22 @@ function collectReachable(func, scan) {
     }
     seen.add(key);
     candidates.push(outcome.candidate);
+  };
+  func.forEachDescendant((node) => {
+    const jsx = resolveJsxReference(node);
+    if (jsx !== null) {
+      record(jsx.outcome);
+      return;
+    }
+    if (!Node54.isCallExpression(node)) {
+      return;
+    }
+    const calleeText = normalizeCallee(node.getExpression().getText());
+    const outcome = resolveCallee(node, calleeText, scan);
+    if (outcome === null) {
+      return;
+    }
+    record(outcome);
   });
   return { candidates, stops };
 }
@@ -14398,8 +14430,8 @@ function collectAccessRecognizers(frameworks, tallies) {
   }
   return out;
 }
-function computeSubUnitBarriers(unit, pack, ctx, tally, file) {
-  if (pack.subUnits === void 0 || unit.func === null) {
+function computeSubUnitBarriers(unit, packs, ctx, tallies, file) {
+  if (unit.func === null) {
     return NO_BARRIERS;
   }
   const parentHandle = {
@@ -14407,27 +14439,27 @@ function computeSubUnitBarriers(unit, pack, ctx, tally, file) {
     name: unit.name,
     kind: unit.kind
   };
-  try {
-    const subUnits = pack.subUnits(parentHandle, ctx);
-    if (subUnits.length === 0) {
-      return NO_BARRIERS;
+  const barriers = /* @__PURE__ */ new Set();
+  for (const pack of packs) {
+    if (pack.subUnits === void 0) {
+      continue;
     }
-    const barriers = /* @__PURE__ */ new Set();
-    for (const su of subUnits) {
-      barriers.add(su.func);
+    try {
+      for (const su of pack.subUnits(parentHandle, ctx)) {
+        barriers.add(su.func);
+      }
+    } catch (err) {
+      process.stderr.write(
+        recordPackFailure(tallies?.get(pack.name), {
+          pack: pack.name,
+          hook: "subUnits",
+          file,
+          error: err
+        })
+      );
     }
-    return barriers;
-  } catch (err) {
-    process.stderr.write(
-      recordPackFailure(tally, {
-        pack: pack.name,
-        hook: "subUnits",
-        file,
-        error: err
-      })
-    );
-    return NO_BARRIERS;
   }
+  return barriers.size === 0 ? NO_BARRIERS : barriers;
 }
 function extractFromSourceFile(sourceFile, frameworks, claimedUnits, options, tallies, resolution, mountPrefixes) {
   const summaries = [];
@@ -14509,9 +14541,9 @@ function extractFromSourceFile(sourceFile, frameworks, claimedUnits, options, ta
       }
       const barriers = computeSubUnitBarriers(
         unit,
-        pack,
+        frameworks,
         subUnitCtx,
-        tally,
+        tallies,
         sourceFile.getFilePath()
       );
       const raw = extractCodeStructure(
@@ -15280,6 +15312,7 @@ function createTypeScriptAdapter(suppliedConfig) {
           pipeline,
           project,
           config.frameworks,
+          packsByFile,
           config.extractorOptions,
           tallies,
           (created, parent) => {
@@ -15620,11 +15653,15 @@ function buildCacheAttribution(args) {
   ];
   return { roots, owners };
 }
-function synthesizeSubUnits(summaries, project, frameworks, options, tallies, onCreated) {
+function synthesizeSubUnits(summaries, project, frameworks, packsByFile, options, tallies, onCreated) {
   const packByRecognition = /* @__PURE__ */ new Map();
   for (const pack of frameworks) {
     packByRecognition.set(pack.name, pack);
   }
+  const packsByPath = /* @__PURE__ */ new Map();
+  for (const [sf, packs] of packsByFile) {
+    packsByPath.set(sf.getFilePath(), packs);
+  }
   const allInvocationRecognizers = collectInvocationRecognizers(
     frameworks,
     tallies
@@ -15638,8 +15675,15 @@ function synthesizeSubUnits(summaries, project, frameworks, options, tallies, on
     if (binding === null) {
       continue;
     }
-    const pack = packByRecognition.get(binding.recognition);
-    if (pack?.subUnits === void 0) {
+    const discovering = packByRecognition.get(binding.recognition);
+    const applicable = packsByPath.get(parent.location.file) ?? (discovering !== void 0 ? [discovering] : []);
+    const hooked = [
+      ...discovering?.subUnits !== void 0 ? [discovering] : [],
+      ...applicable.filter(
+        (one) => one.subUnits !== void 0 && one !== discovering
+      )
+    ];
+    if (hooked.length === 0) {
       continue;
     }
     lookup ??= createSourceFileLookup(project);
@@ -15652,7 +15696,17 @@ function synthesizeSubUnits(summaries, project, frameworks, options, tallies, on
       name: parent.identity.name,
       kind: parent.kind
     };
-    const subUnits = pack.subUnits(parentHandle, subUnitCtx);
+    const claimedFuncs = /* @__PURE__ */ new Set();
+    const subUnits = [];
+    for (const pack of hooked) {
+      for (const subUnit of pack.subUnits?.(parentHandle, subUnitCtx) ?? []) {
+        if (claimedFuncs.has(subUnit.func)) {
+          continue;
+        }
+        claimedFuncs.add(subUnit.func);
+        subUnits.push(subUnit);
+      }
+    }
     for (const subUnit of subUnits) {
       const summary = buildSubUnitSummary(
         subUnit,

package/package.json

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