@suss/adapter-typescript 0.27.0 → 0.28.0

package/dist/index.cjs

@@ -2595,22 +2595,15 @@ function writesToBindingUncached(declaration) {
   }
   return { values, inOrder: writesRunInOrder(declaration, writes) };
 }
-function sameConstructionAcrossWrites(values) {
-  const candidates = values.filter((value) => !isNotYetPlaceholder(value));
-  if (candidates.length === 0) {
-    return null;
-  }
-  let construction = null;
-  for (const value of candidates) {
-    if (!isConstruction(value)) {
-      return null;
-    }
-    if (construction !== null && sourceOf(value) !== sourceOf(construction)) {
-      return null;
-    }
-    construction = value;
-  }
-  return construction;
+function describeWrites(values) {
+  return values.map((value, index) => ({
+    value: String(index),
+    placeholder: isNotYetPlaceholder(value),
+    construction: isConstruction(value) ? sourceOf(value) : null,
+    // Which name each value was written to does not reach here, and
+    // that is what a narrowing write is compared against.
+    narrowsName: false
+  }));
 }
 function isNotYetPlaceholder(value) {
   return value.getKind() === import_ts_morph14.SyntaxKind.NullKeyword || import_ts_morph14.Node.isIdentifier(value) && value.getText() === "undefined";
@@ -3101,6 +3094,13 @@ function emitValue(db, table, value) {
   fact(db, "writtenValue", id);
   return id;
 }
+function settledWrite(values, inOrder) {
+  const key = (0, import_resolution.valueLeftByWrites)(describeWrites(values), inOrder);
+  if (key === null) {
+    return null;
+  }
+  return values[Number(key)] ?? null;
+}
 function emitBindingValues(db, table, declaration) {
   const declarationId = nodeId(declaration);
   if (!isWrittenAgain(declaration)) {
@@ -3111,17 +3111,12 @@ function emitBindingValues(db, table, declaration) {
     return;
   }
   const { values, inOrder } = writesToBinding(declaration);
-  const last = values[values.length - 1];
-  if (inOrder && last !== void 0) {
-    fact(db, "endsHolding", declarationId, emitValue(db, table, last));
-    return;
-  }
-  const construction = sameConstructionAcrossWrites(values);
-  if (construction !== null) {
-    fact(db, "endsHolding", declarationId, emitValue(db, table, construction));
+  const settled2 = settledWrite(values, inOrder);
+  if (settled2 === null) {
+    reassignedUnstated.add(declarationId);
     return;
   }
-  reassignedUnstated.add(declarationId);
+  fact(db, "endsHolding", declarationId, emitValue(db, table, settled2));
 }
 var reassignedUnstated = /* @__PURE__ */ new Set();
 function reassignedNamesUnstated() {
@@ -3132,32 +3127,24 @@ function forgetReassignedNamesUnstated() {
 }
 function emitFieldValues(db, table, declaration) {
   const { values, inOrder } = writesToField(declaration);
-  const last = values[values.length - 1];
-  if (inOrder && last !== void 0 && import_ts_morph15.Node.isExpression(last)) {
-    fact(db, "binds", nodeId(declaration), emitValue(db, table, last));
+  const settled2 = settledWrite(values, inOrder);
+  if (settled2 === null || !import_ts_morph15.Node.isExpression(settled2)) {
     return;
   }
-  const construction = sameConstructionAcrossWrites(values);
-  if (construction !== null) {
-    fact(db, "binds", nodeId(declaration), emitValue(db, table, construction));
-  }
+  fact(db, "binds", nodeId(declaration), emitValue(db, table, settled2));
 }
 function emitParameterPropertyRead(db, table, referenceId, declaration) {
   const { values, inOrder } = writesToField(declaration);
-  const last = values[values.length - 1];
-  if (inOrder && last !== void 0 && import_ts_morph15.Node.isExpression(last)) {
-    fact(db, "binds", referenceId, emitValue(db, table, last));
+  const settled2 = settledWrite(values, inOrder);
+  if (settled2 === null) {
     return;
   }
-  if (inOrder && last !== void 0) {
-    table.byId.set(nodeId(last), last);
-    fact(db, "binds", referenceId, nodeId(last));
+  if (import_ts_morph15.Node.isExpression(settled2)) {
+    fact(db, "binds", referenceId, emitValue(db, table, settled2));
     return;
   }
-  const construction = sameConstructionAcrossWrites(values);
-  if (construction !== null) {
-    fact(db, "binds", referenceId, emitValue(db, table, construction));
-  }
+  table.byId.set(nodeId(settled2), settled2);
+  fact(db, "binds", referenceId, nodeId(settled2));
 }
 function emitBindingElementFacts(db, table, element) {
   const id = nodeId(element);
@@ -3619,36 +3606,16 @@ var JS_RULES = [
     "bind"
   )
 ];
-var RESOLUTION_PROGRAM = process.env.SUSS_RESOLUTION_ON_DEMAND === "0" ? {
-  rules: [...import_resolution2.RESOLUTION_RULES, ...JS_RULES, ...import_resolution2.RESOLUTION_QUESTIONS],
-  demandDriven: [],
-  demands: []
-} : (0, import_datalog2.deriveOnDemand)(
-  [...import_resolution2.RESOLUTION_RULES, ...JS_RULES, ...import_resolution2.RESOLUTION_QUESTIONS],
-  import_resolution2.ANSWER_RELATIONS
-);
+var RESOLUTION_PROGRAM = (0, import_resolution2.resolutionProgram)(JS_RULES);
 var WITNESS_RULES = [...import_resolution2.RESOLUTION_RULES, ...JS_RULES];
 var NOT_BASE_FACTS = /* @__PURE__ */ new Set([
   ...[...import_resolution2.RESOLUTION_RULES, ...JS_RULES, ...import_resolution2.RESOLUTION_QUESTIONS].map(
     (r) => r.head.relation
   ),
   ...RESOLUTION_PROGRAM.rules.map((r) => r.head.relation),
-  "wanted",
-  "wantedOrigin",
-  "wantedCallOrigin",
-  "wantedExportsOf",
-  "wantedAnchor",
-  "wantedSubject"
+  ...import_resolution2.ASKING_RELATIONS
 ]);
-var QUERY_FACTS = RESOLUTION_PROGRAM.demandDriven.length === 0 ? [] : [
-  ...RESOLUTION_PROGRAM.demandDriven,
-  "wanted",
-  "wantedOrigin",
-  "wantedCallOrigin",
-  "wantedExportsOf",
-  "wantedAnchor",
-  "wantedSubject"
-];
+var QUERY_FACTS = (0, import_resolution2.queryFacts)(RESOLUTION_PROGRAM);
 var MODULE_DEMANDS = RESOLUTION_PROGRAM.demands.filter(
   (one) => (one.relation === "moduleExport" || one.relation === "moduleForwards") && one.bound[0] === true
 ).map((one) => one.demand);

package/dist/index.js

@@ -2441,7 +2441,6 @@ import { Node as Node15 } from "ts-morph";
 import {
   clearRelations,
   Database as Database2,
-  deriveOnDemand,
   evaluate as evaluate2,
   lit as lit2,
   proofOf,
@@ -2452,8 +2451,10 @@ import {
   witnesses
 } from "@suss/datalog";
 import {
-  ANSWER_RELATIONS,
+  ASKING_RELATIONS,
+  queryFacts,
   RESOLUTION_QUESTIONS,
+  resolutionProgram,
   RESOLUTION_RULES as SHARED_RULES,
   VALUE_STEP
 } from "@suss/resolution";
@@ -2537,7 +2538,7 @@ import {
   SyntaxKind as SyntaxKind4,
   ts as ts2
 } from "ts-morph";
-import { NAMESPACE_IMPORT_NAME } from "@suss/resolution";
+import { NAMESPACE_IMPORT_NAME, valueLeftByWrites } from "@suss/resolution";
 
 // src/facts/assignments.ts
 import { Node as Node13, SyntaxKind as SyntaxKind3, VariableDeclarationKind } from "ts-morph";
@@ -2575,22 +2576,15 @@ function writesToBindingUncached(declaration) {
   }
   return { values, inOrder: writesRunInOrder(declaration, writes) };
 }
-function sameConstructionAcrossWrites(values) {
-  const candidates = values.filter((value) => !isNotYetPlaceholder(value));
-  if (candidates.length === 0) {
-    return null;
-  }
-  let construction = null;
-  for (const value of candidates) {
-    if (!isConstruction(value)) {
-      return null;
-    }
-    if (construction !== null && sourceOf(value) !== sourceOf(construction)) {
-      return null;
-    }
-    construction = value;
-  }
-  return construction;
+function describeWrites(values) {
+  return values.map((value, index) => ({
+    value: String(index),
+    placeholder: isNotYetPlaceholder(value),
+    construction: isConstruction(value) ? sourceOf(value) : null,
+    // Which name each value was written to does not reach here, and
+    // that is what a narrowing write is compared against.
+    narrowsName: false
+  }));
 }
 function isNotYetPlaceholder(value) {
   return value.getKind() === SyntaxKind3.NullKeyword || Node13.isIdentifier(value) && value.getText() === "undefined";
@@ -3081,6 +3075,13 @@ function emitValue(db, table, value) {
   fact(db, "writtenValue", id);
   return id;
 }
+function settledWrite(values, inOrder) {
+  const key = valueLeftByWrites(describeWrites(values), inOrder);
+  if (key === null) {
+    return null;
+  }
+  return values[Number(key)] ?? null;
+}
 function emitBindingValues(db, table, declaration) {
   const declarationId = nodeId(declaration);
   if (!isWrittenAgain(declaration)) {
@@ -3091,17 +3092,12 @@ function emitBindingValues(db, table, declaration) {
     return;
   }
   const { values, inOrder } = writesToBinding(declaration);
-  const last = values[values.length - 1];
-  if (inOrder && last !== void 0) {
-    fact(db, "endsHolding", declarationId, emitValue(db, table, last));
-    return;
-  }
-  const construction = sameConstructionAcrossWrites(values);
-  if (construction !== null) {
-    fact(db, "endsHolding", declarationId, emitValue(db, table, construction));
+  const settled2 = settledWrite(values, inOrder);
+  if (settled2 === null) {
+    reassignedUnstated.add(declarationId);
     return;
   }
-  reassignedUnstated.add(declarationId);
+  fact(db, "endsHolding", declarationId, emitValue(db, table, settled2));
 }
 var reassignedUnstated = /* @__PURE__ */ new Set();
 function reassignedNamesUnstated() {
@@ -3112,32 +3108,24 @@ function forgetReassignedNamesUnstated() {
 }
 function emitFieldValues(db, table, declaration) {
   const { values, inOrder } = writesToField(declaration);
-  const last = values[values.length - 1];
-  if (inOrder && last !== void 0 && Node14.isExpression(last)) {
-    fact(db, "binds", nodeId(declaration), emitValue(db, table, last));
+  const settled2 = settledWrite(values, inOrder);
+  if (settled2 === null || !Node14.isExpression(settled2)) {
     return;
   }
-  const construction = sameConstructionAcrossWrites(values);
-  if (construction !== null) {
-    fact(db, "binds", nodeId(declaration), emitValue(db, table, construction));
-  }
+  fact(db, "binds", nodeId(declaration), emitValue(db, table, settled2));
 }
 function emitParameterPropertyRead(db, table, referenceId, declaration) {
   const { values, inOrder } = writesToField(declaration);
-  const last = values[values.length - 1];
-  if (inOrder && last !== void 0 && Node14.isExpression(last)) {
-    fact(db, "binds", referenceId, emitValue(db, table, last));
+  const settled2 = settledWrite(values, inOrder);
+  if (settled2 === null) {
     return;
   }
-  if (inOrder && last !== void 0) {
-    table.byId.set(nodeId(last), last);
-    fact(db, "binds", referenceId, nodeId(last));
+  if (Node14.isExpression(settled2)) {
+    fact(db, "binds", referenceId, emitValue(db, table, settled2));
     return;
   }
-  const construction = sameConstructionAcrossWrites(values);
-  if (construction !== null) {
-    fact(db, "binds", referenceId, emitValue(db, table, construction));
-  }
+  table.byId.set(nodeId(settled2), settled2);
+  fact(db, "binds", referenceId, nodeId(settled2));
 }
 function emitBindingElementFacts(db, table, element) {
   const id = nodeId(element);
@@ -3599,36 +3587,16 @@ var JS_RULES = [
     "bind"
   )
 ];
-var RESOLUTION_PROGRAM = process.env.SUSS_RESOLUTION_ON_DEMAND === "0" ? {
-  rules: [...SHARED_RULES, ...JS_RULES, ...RESOLUTION_QUESTIONS],
-  demandDriven: [],
-  demands: []
-} : deriveOnDemand(
-  [...SHARED_RULES, ...JS_RULES, ...RESOLUTION_QUESTIONS],
-  ANSWER_RELATIONS
-);
+var RESOLUTION_PROGRAM = resolutionProgram(JS_RULES);
 var WITNESS_RULES = [...SHARED_RULES, ...JS_RULES];
 var NOT_BASE_FACTS = /* @__PURE__ */ new Set([
   ...[...SHARED_RULES, ...JS_RULES, ...RESOLUTION_QUESTIONS].map(
     (r) => r.head.relation
   ),
   ...RESOLUTION_PROGRAM.rules.map((r) => r.head.relation),
-  "wanted",
-  "wantedOrigin",
-  "wantedCallOrigin",
-  "wantedExportsOf",
-  "wantedAnchor",
-  "wantedSubject"
+  ...ASKING_RELATIONS
 ]);
-var QUERY_FACTS = RESOLUTION_PROGRAM.demandDriven.length === 0 ? [] : [
-  ...RESOLUTION_PROGRAM.demandDriven,
-  "wanted",
-  "wantedOrigin",
-  "wantedCallOrigin",
-  "wantedExportsOf",
-  "wantedAnchor",
-  "wantedSubject"
-];
+var QUERY_FACTS = queryFacts(RESOLUTION_PROGRAM);
 var MODULE_DEMANDS = RESOLUTION_PROGRAM.demands.filter(
   (one) => (one.relation === "moduleExport" || one.relation === "moduleForwards") && one.bound[0] === true
 ).map((one) => one.demand);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/adapter-typescript",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "type": "module",
   "description": "Read a TypeScript or JavaScript codebase with suss and check what each handler returns against every caller, spec and template it can see.",
   "keywords": [
@@ -48,11 +48,11 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@suss/behavioral-ir": "0.27.0",
-    "@suss/datalog": "0.27.0",
-    "@suss/extractor": "0.27.0",
-    "@suss/resolution": "0.27.0",
-    "@suss/values": "0.27.0",
+    "@suss/behavioral-ir": "0.28.0",
+    "@suss/datalog": "0.28.0",
+    "@suss/extractor": "0.28.0",
+    "@suss/resolution": "0.28.0",
+    "@suss/values": "0.28.0",
     "graphql": "^16.8.0",
     "picomatch": "^4.0.4",
     "ts-morph": "^23.0.0",