@suss/extractor 0.9.0 → 0.11.0

package/dist/index.js

@@ -3,7 +3,8 @@ import { createHash } from "crypto";
 import {
   exchangesHttpResponses,
   withGraphqlMetadata,
-  withHttpMetadata
+  withHttpMetadata,
+  withSourceDocumentMetadata
 } from "@suss/behavioral-ir";
 
 // src/inputReads.ts
@@ -124,6 +125,7 @@ function unwrapJsonStringify(body) {
 }
 
 // src/paths/enumeratePaths.ts
+import { CATCH_ENTRY_TEXT } from "@suss/behavioral-ir";
 var MAX_PATHS = 256;
 var UnmodeledFlow = class extends Error {
 };
@@ -167,7 +169,7 @@ var loopCompletedCond = (headerText, exit) => fixedCond(
   exit === "throw" ? "earlyThrow" : "earlyReturn"
 );
 var catchEntryCond = () => fixedCond(
-  { sourceText: "catch", expression: null },
+  { sourceText: CATCH_ENTRY_TEXT, expression: null },
   "positive",
   "catchBlock"
 );
@@ -177,7 +179,7 @@ function classify(path, home, isAncestorOrSelf) {
       return cond.info;
     }
     const encloses = home !== null && isAncestorOrSelf(cond.branchStmt, home);
-    if (encloses || cond.info.polarity === "positive") {
+    if (encloses || cond.info.polarity === "positive" || cond.oppositeExit === null) {
       return { ...cond.info, source: "explicit" };
     }
     const source = cond.oppositeExit === "throw" ? "earlyThrow" : "earlyReturn";
@@ -185,6 +187,9 @@ function classify(path, home, isAncestorOrSelf) {
   });
 }
 function childrenOf(stmt) {
+  return [...ownBlocksOf(stmt), ...(stmt.callbacks ?? []).flat()];
+}
+function ownBlocksOf(stmt) {
   if (stmt.kind === "if") {
     return stmt.elseBody === null ? stmt.thenBody : [...stmt.thenBody, ...stmt.elseBody];
   }
@@ -211,7 +216,7 @@ function hasStrayBreak(nodes) {
     if (node.kind === "switch" || node.kind === "loop") {
       return false;
     }
-    return hasStrayBreak(childrenOf(node));
+    return hasStrayBreak(ownBlocksOf(node));
   });
 }
 function exitKindOfList(stmts) {
@@ -248,11 +253,6 @@ function containsTerminal(ctx, stmt) {
   return childrenOf(stmt).some((child) => containsTerminal(ctx, child));
 }
 function stepIf(stmt, path, ctx) {
-  const armsExit = stmt.exitKind !== null;
-  const armsHaveTerminals = containsTerminal(ctx, stmt);
-  if (!armsExit && !armsHaveTerminals) {
-    return [path];
-  }
   const thenExit = exitKindOfList(stmt.thenBody);
   const elseExit = stmt.elseBody === null ? null : exitKindOfList(stmt.elseBody);
   const thenPath = [
@@ -261,7 +261,12 @@ function stepIf(stmt, path, ctx) {
   ];
   const elsePath = [
     ...path,
-    branchCond(stmt, stmt.condition, "negative", thenExit)
+    branchCond(
+      stmt,
+      stmt.condition,
+      "negative",
+      stmt.elseBody === null ? thenExit : null
+    )
   ];
   const out = [];
   out.push(...enumerate(ctx, stmt.thenBody, thenPath));
@@ -333,7 +338,11 @@ function stepTry(stmt, path, ctx) {
   }
   return out;
 }
-function stepExit(_stmt, _path, _ctx) {
+function stepExit(stmt, path, ctx) {
+  const collector = ctx.state.callbackExits[ctx.state.callbackExits.length - 1];
+  if (collector !== void 0 && (stmt.exit === "return" || stmt.exit === "throw")) {
+    collector.push(path);
+  }
   return [];
 }
 function stepOpaque(_stmt, path, _ctx) {
@@ -347,16 +356,36 @@ var stepHandlers = {
   exit: stepExit,
   opaque: stepOpaque
 };
+function stepCallback(ctx, body, path) {
+  const exits = [];
+  ctx.state.callbackExits.push(exits);
+  let fellThrough;
+  try {
+    fellThrough = enumerate(ctx, body, path);
+  } finally {
+    ctx.state.callbackExits.pop();
+  }
+  const out = [...fellThrough, ...exits];
+  return out.length === 0 ? [path] : out;
+}
 function stepStatement(ctx, stmt, path) {
+  let paths = [path];
+  for (const body of stmt.callbacks ?? []) {
+    paths = paths.flatMap((each) => stepCallback(ctx, body, each));
+  }
   const ownTerminals = ctx.terminalsByStmt.get(stmt) ?? [];
-  for (const terminal of ownTerminals) {
-    recordTerminal(ctx, terminal, stmt, path);
+  for (const each of withRejoined(paths)) {
+    for (const terminal of ownTerminals) {
+      recordTerminal(ctx, terminal, stmt, each);
+    }
   }
   const handler = stepHandlers[stmt.kind];
-  return handler(
-    stmt,
-    path,
-    ctx
+  return paths.flatMap(
+    (each) => handler(
+      stmt,
+      each,
+      ctx
+    )
   );
 }
 function soleDisagreement(left, right) {
@@ -413,14 +442,18 @@ function mergeRejoined(paths) {
   }
   return current;
 }
+function withRejoined(paths) {
+  const merged = mergeRejoined(paths);
+  return merged.length === paths.length ? paths : [...merged, ...paths];
+}
 function enumerate(ctx, stmts, prefix) {
   let frontiers = [[...prefix]];
   for (const stmt of stmts) {
     const nextFrontiers = [];
-    for (const path of frontiers) {
+    for (const path of mergeRejoined(frontiers)) {
       nextFrontiers.push(...stepStatement(ctx, stmt, path));
     }
-    frontiers = mergeRejoined(nextFrontiers);
+    frontiers = nextFrontiers;
     if (frontiers.length > MAX_PATHS) {
       throw new PathBudgetExceeded(
         `path budget exceeded, more than ${MAX_PATHS} paths`
@@ -460,14 +493,15 @@ function enumerateStructuredPaths(input) {
   const state = {
     byTerminal: /* @__PURE__ */ new Map(),
     fallthrough: [],
-    pathCount: 0
+    pathCount: 0,
+    callbackExits: []
   };
   const ctx = {
     terminalsByStmt: input.terminalsByStmt,
     state,
     isAncestorOrSelf
   };
-  const continuations = enumerate(ctx, input.statements, []);
+  const continuations = withRejoined(enumerate(ctx, input.statements, []));
   for (const path of continuations) {
     chargeBudget(state);
     state.fallthrough.push(classify(path, null, isAncestorOrSelf));
@@ -766,6 +800,11 @@ function buildMetadata(raw) {
   if (graphql !== null) {
     metadata = withGraphqlMetadata(metadata, graphql);
   }
+  if (raw.sourceDocumentLabel !== void 0) {
+    metadata = withSourceDocumentMetadata(metadata, {
+      label: raw.sourceDocumentLabel
+    });
+  }
   return Object.keys(metadata).length > 0 ? metadata : null;
 }
 function buildHttpMetadataValue(raw) {
@@ -783,6 +822,12 @@ function buildHttpMetadataValue(raw) {
   if (raw.statusAccessors !== void 0 && raw.statusAccessors.length > 0) {
     http.statusAccessors = raw.statusAccessors;
   }
+  if (raw.successAccessors !== void 0 && raw.successAccessors.length > 0) {
+    http.successAccessors = raw.successAccessors;
+  }
+  if (raw.failureDelivery !== void 0) {
+    http.failureDelivery = raw.failureDelivery;
+  }
   return Object.keys(http).length > 0 ? http : null;
 }
 function buildGraphqlMetadataValue(raw) {
@@ -796,6 +841,9 @@ function buildGraphqlMetadataValue(raw) {
   if (raw.graphqlDeclaredContract !== void 0) {
     graphql.declaredContract = raw.graphqlDeclaredContract;
   }
+  if (raw.graphqlUnresolvedFragments !== void 0) {
+    graphql.unresolvedFragments = raw.graphqlUnresolvedFragments;
+  }
   if (raw.graphqlUnresolvedDocument !== void 0) {
     graphql.unresolvedDocument = raw.graphqlUnresolvedDocument;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/extractor",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "type": "module",
   "description": "Framework-agnostic extraction pipeline that turns raw extractions into suss behavioral summaries.",
   "keywords": [
@@ -45,7 +45,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@suss/behavioral-ir": "0.9.0"
+    "@suss/behavioral-ir": "0.11.0"
   },
   "devDependencies": {
     "tsup": "*",