@suss/adapter-typescript 0.38.0 → 0.38.1

package/dist/index.cjs

@@ -213,7 +213,7 @@ function printedType(type, reader, enclosing, format) {
     );
   }
   const file = enclosing?.getSourceFile().compilerNode ?? NO_FILE;
-  const ordered = containsUnion(typeNode) ? withUnionMembersOrdered(typeNode, file) : typeNode;
+  const ordered = containsReordered(typeNode) ? withMembersOrdered(typeNode, file) : typeNode;
   return withoutImportQualifiers(printed(ordered, file));
 }
 var IMPORT_QUALIFIER = /import\("[^"]*"\)\./g;
@@ -224,24 +224,31 @@ function printed(node, file) {
     ""
   );
 }
-function containsUnion(node) {
-  if (import_ts_morph.ts.isUnionTypeNode(node)) {
+var isReordered = (node) => import_ts_morph.ts.isUnionTypeNode(node) || import_ts_morph.ts.isTypeLiteralNode(node);
+function containsReordered(node) {
+  if (isReordered(node)) {
     return true;
   }
-  return import_ts_morph.ts.forEachChild(node, (child) => containsUnion(child) || void 0) === true;
+  return import_ts_morph.ts.forEachChild(node, (child) => containsReordered(child) || void 0) === true;
 }
-function withUnionMembersOrdered(root, file) {
+function withMembersOrdered(root, file) {
   const result = import_ts_morph.ts.transform(root, [
     (context) => {
       const visit = (node) => {
         const visited = import_ts_morph.ts.visitEachChild(node, visit, context);
-        if (!import_ts_morph.ts.isUnionTypeNode(visited)) {
-          return visited;
+        if (import_ts_morph.ts.isUnionTypeNode(visited)) {
+          return context.factory.updateUnionTypeNode(
+            visited,
+            context.factory.createNodeArray(inStableOrder(visited.types, file))
+          );
         }
-        return context.factory.updateUnionTypeNode(
-          visited,
-          context.factory.createNodeArray(inStableOrder(visited.types, file))
-        );
+        if (import_ts_morph.ts.isTypeLiteralNode(visited)) {
+          return context.factory.updateTypeLiteralNode(
+            visited,
+            context.factory.createNodeArray(inNameOrder(visited.members, file))
+          );
+        }
+        return visited;
       };
       return (node) => visit(node);
     }
@@ -250,6 +257,12 @@ function withUnionMembersOrdered(root, file) {
   result.dispose();
   return ordered;
 }
+function inNameOrder(members, file) {
+  return members.map((member) => ({
+    member,
+    name: member.name === void 0 ? "" : printed(member.name, file)
+  })).sort((a, b) => compareText(a.name, b.name)).map(({ member }) => member);
+}
 function inStableOrder(members, file) {
   return members.map((member) => ({
     member,
@@ -4175,6 +4188,7 @@ var DERIVED_RELATIONS = /* @__PURE__ */ new Set([
   ...(0, import_resolution5.resolutionUnderProgram)().rules.map((r) => r.head.relation)
 ]);
 var QUERY_FACTS = (0, import_resolution5.queryFacts)(RESOLUTION_PROGRAM);
+var DERIVED_AGAIN = new Set(QUERY_FACTS);
 var MODULE_DEMANDS = RESOLUTION_PROGRAM.demands.filter(
   (one) => (one.relation === "moduleExport" || one.relation === "moduleForwards") && one.bound[0] === true
 ).map((one) => one.demand);
@@ -4342,25 +4356,45 @@ var ResolutionStore = class _ResolutionStore {
     );
   }
   /**
-   * A question asked again over the same facts reads the same files and
-   * derives the same answer, so the store gives back the one it found
-   * before. The files that answer read still count as read.
+   * A question asked again, when no fact its derivation looked up has
+   * arrived since, reads the same files and derives the same answer, so
+   * the store gives back the one it found before. The files that answer
+   * read still count as read.
+   *
+   * Noting the lookups costs the question a share of its time, and most
+   * questions are asked once, so a question notes them only once it has
+   * had to be asked again. Until then, as without demand, only an
+   * unchanged fact count says the answer is the same. Without demand the
+   * rules keep every conclusion between questions, so a question's own
+   * lookups miss what earlier questions derived for it. A question that
+   * started on another question's leftovers gets the count too.
    */
   remembered(key, ask) {
     const known = this.answers.get(key);
-    if (known !== void 0 && known.facts === this.sourceFactCount()) {
+    if (known !== void 0 && this.stillDerives(known.check)) {
       for (const walkedPath of known.walked) {
         recordFileDependency(walkedPath);
       }
       return known.answer;
     }
-    const answer = ask();
+    const { value, reads } = known === void 0 || QUERY_FACTS.length === 0 ? { value: ask(), reads: null } : (0, import_datalog2.noteReads)(this.db, DERIVED_AGAIN, ask);
     this.answers.set(key, {
-      answer,
+      answer: value,
       walked: [...this.lastQueryWalked],
-      facts: this.sourceFactCount()
+      check: reads ?? this.sourceFactCount()
     });
-    return answer;
+    return value;
+  }
+  /**
+   * Facts added since the last derivation have not reached the relations
+   * the rules keep between questions, so the reads cannot say yet what
+   * those facts change.
+   */
+  stillDerives(check) {
+    if (typeof check === "number") {
+      return check === this.sourceFactCount();
+    }
+    return !this.stale && check.unchangedIn(this.db);
   }
   /**
    * How many facts the store has read from source. They are only ever
@@ -6871,7 +6905,8 @@ function importedCallOrigins(sourceFile, resolution, module2) {
   const candidates = [];
   forEachDescendantWhere(sourceFile, callsANamedCallee, (node) => {
     const call = node;
-    if (!declaredLocally(call.getExpression())) {
+    const callee = call.getExpression();
+    if (!declaredLocally(callee) && !importedFromAnotherPackage(callee, module2)) {
       candidates.push(call);
     }
     return false;
@@ -6901,6 +6936,26 @@ function callsNamed(found, names) {
 function callsANamedCallee(raw) {
   return (import_ts_morph19.ts.isCallExpression(raw) || import_ts_morph19.ts.isNewExpression(raw)) && import_ts_morph19.ts.isIdentifier(raw.expression);
 }
+var samePackage = (specifier, module2) => specifier === module2 || specifier.startsWith(`${module2}/`) || module2.startsWith(`${specifier}/`);
+function importOf(declaration) {
+  if (import_ts_morph19.Node.isImportSpecifier(declaration)) {
+    return declaration.getImportDeclaration();
+  }
+  const parent = import_ts_morph19.Node.isImportClause(declaration) ? declaration.getParent() : void 0;
+  return parent !== void 0 && import_ts_morph19.Node.isImportDeclaration(parent) ? parent : void 0;
+}
+function importedFromAnotherPackage(callee, module2) {
+  const declarations = callee.getSymbol()?.getDeclarations() ?? [];
+  return declarations.length > 0 && declarations.every((declaration) => {
+    const from = importOf(declaration);
+    if (from === void 0) {
+      return false;
+    }
+    const resolved = from.getModuleSpecifierSourceFile();
+    const specifier = from.getModuleSpecifierValue();
+    return (resolved === void 0 || resolved.isInNodeModules()) && !specifier.startsWith(".") && !samePackage(specifier, module2);
+  });
+}
 function declaredLocally(callee) {
   const declarations = callee.getSymbol()?.getDeclarations() ?? [];
   return declarations.length > 0 && declarations.every(

package/dist/index.d.cts

@@ -202,11 +202,26 @@ declare class ResolutionStore {
     explainCallable(value: Node, options?: ExplainCallableOptions): ExplainedResolution | null;
     resolveObject(value: Node): Node | null;
     /**
-     * A question asked again over the same facts reads the same files and
-     * derives the same answer, so the store gives back the one it found
-     * before. The files that answer read still count as read.
+     * A question asked again, when no fact its derivation looked up has
+     * arrived since, reads the same files and derives the same answer, so
+     * the store gives back the one it found before. The files that answer
+     * read still count as read.
+     *
+     * Noting the lookups costs the question a share of its time, and most
+     * questions are asked once, so a question notes them only once it has
+     * had to be asked again. Until then, as without demand, only an
+     * unchanged fact count says the answer is the same. Without demand the
+     * rules keep every conclusion between questions, so a question's own
+     * lookups miss what earlier questions derived for it. A question that
+     * started on another question's leftovers gets the count too.
      */
     private remembered;
+    /**
+     * Facts added since the last derivation have not reached the relations
+     * the rules keep between questions, so the reads cannot say yet what
+     * those facts change.
+     */
+    private stillDerives;
     /**
      * How many facts the store has read from source. They are only ever
      * added, so work that asked the store questions and found this number

package/dist/index.d.ts

@@ -202,11 +202,26 @@ declare class ResolutionStore {
     explainCallable(value: Node, options?: ExplainCallableOptions): ExplainedResolution | null;
     resolveObject(value: Node): Node | null;
     /**
-     * A question asked again over the same facts reads the same files and
-     * derives the same answer, so the store gives back the one it found
-     * before. The files that answer read still count as read.
+     * A question asked again, when no fact its derivation looked up has
+     * arrived since, reads the same files and derives the same answer, so
+     * the store gives back the one it found before. The files that answer
+     * read still count as read.
+     *
+     * Noting the lookups costs the question a share of its time, and most
+     * questions are asked once, so a question notes them only once it has
+     * had to be asked again. Until then, as without demand, only an
+     * unchanged fact count says the answer is the same. Without demand the
+     * rules keep every conclusion between questions, so a question's own
+     * lookups miss what earlier questions derived for it. A question that
+     * started on another question's leftovers gets the count too.
      */
     private remembered;
+    /**
+     * Facts added since the last derivation have not reached the relations
+     * the rules keep between questions, so the reads cannot say yet what
+     * those facts change.
+     */
+    private stillDerives;
     /**
      * How many facts the store has read from source. They are only ever
      * added, so work that asked the store questions and found this number

package/dist/index.js

@@ -133,7 +133,7 @@ function printedType(type, reader, enclosing, format) {
     );
   }
   const file = enclosing?.getSourceFile().compilerNode ?? NO_FILE;
-  const ordered = containsUnion(typeNode) ? withUnionMembersOrdered(typeNode, file) : typeNode;
+  const ordered = containsReordered(typeNode) ? withMembersOrdered(typeNode, file) : typeNode;
   return withoutImportQualifiers(printed(ordered, file));
 }
 var IMPORT_QUALIFIER = /import\("[^"]*"\)\./g;
@@ -144,24 +144,31 @@ function printed(node, file) {
     ""
   );
 }
-function containsUnion(node) {
-  if (ts.isUnionTypeNode(node)) {
+var isReordered = (node) => ts.isUnionTypeNode(node) || ts.isTypeLiteralNode(node);
+function containsReordered(node) {
+  if (isReordered(node)) {
     return true;
   }
-  return ts.forEachChild(node, (child) => containsUnion(child) || void 0) === true;
+  return ts.forEachChild(node, (child) => containsReordered(child) || void 0) === true;
 }
-function withUnionMembersOrdered(root, file) {
+function withMembersOrdered(root, file) {
   const result = ts.transform(root, [
     (context) => {
       const visit = (node) => {
         const visited = ts.visitEachChild(node, visit, context);
-        if (!ts.isUnionTypeNode(visited)) {
-          return visited;
+        if (ts.isUnionTypeNode(visited)) {
+          return context.factory.updateUnionTypeNode(
+            visited,
+            context.factory.createNodeArray(inStableOrder(visited.types, file))
+          );
         }
-        return context.factory.updateUnionTypeNode(
-          visited,
-          context.factory.createNodeArray(inStableOrder(visited.types, file))
-        );
+        if (ts.isTypeLiteralNode(visited)) {
+          return context.factory.updateTypeLiteralNode(
+            visited,
+            context.factory.createNodeArray(inNameOrder(visited.members, file))
+          );
+        }
+        return visited;
       };
       return (node) => visit(node);
     }
@@ -170,6 +177,12 @@ function withUnionMembersOrdered(root, file) {
   result.dispose();
   return ordered;
 }
+function inNameOrder(members, file) {
+  return members.map((member) => ({
+    member,
+    name: member.name === void 0 ? "" : printed(member.name, file)
+  })).sort((a, b) => compareText(a.name, b.name)).map(({ member }) => member);
+}
 function inStableOrder(members, file) {
   return members.map((member) => ({
     member,
@@ -539,6 +552,7 @@ import {
   clearRelations,
   Database as Database2,
   evaluate as evaluate2,
+  noteReads,
   proofOf,
   tupleKey,
   tupleKeyParts,
@@ -4146,6 +4160,7 @@ var DERIVED_RELATIONS = /* @__PURE__ */ new Set([
   ...resolutionUnderProgram().rules.map((r) => r.head.relation)
 ]);
 var QUERY_FACTS = queryFacts(RESOLUTION_PROGRAM);
+var DERIVED_AGAIN = new Set(QUERY_FACTS);
 var MODULE_DEMANDS = RESOLUTION_PROGRAM.demands.filter(
   (one) => (one.relation === "moduleExport" || one.relation === "moduleForwards") && one.bound[0] === true
 ).map((one) => one.demand);
@@ -4313,25 +4328,45 @@ var ResolutionStore = class _ResolutionStore {
     );
   }
   /**
-   * A question asked again over the same facts reads the same files and
-   * derives the same answer, so the store gives back the one it found
-   * before. The files that answer read still count as read.
+   * A question asked again, when no fact its derivation looked up has
+   * arrived since, reads the same files and derives the same answer, so
+   * the store gives back the one it found before. The files that answer
+   * read still count as read.
+   *
+   * Noting the lookups costs the question a share of its time, and most
+   * questions are asked once, so a question notes them only once it has
+   * had to be asked again. Until then, as without demand, only an
+   * unchanged fact count says the answer is the same. Without demand the
+   * rules keep every conclusion between questions, so a question's own
+   * lookups miss what earlier questions derived for it. A question that
+   * started on another question's leftovers gets the count too.
    */
   remembered(key, ask) {
     const known = this.answers.get(key);
-    if (known !== void 0 && known.facts === this.sourceFactCount()) {
+    if (known !== void 0 && this.stillDerives(known.check)) {
       for (const walkedPath of known.walked) {
         recordFileDependency(walkedPath);
       }
       return known.answer;
     }
-    const answer = ask();
+    const { value, reads } = known === void 0 || QUERY_FACTS.length === 0 ? { value: ask(), reads: null } : noteReads(this.db, DERIVED_AGAIN, ask);
     this.answers.set(key, {
-      answer,
+      answer: value,
       walked: [...this.lastQueryWalked],
-      facts: this.sourceFactCount()
+      check: reads ?? this.sourceFactCount()
     });
-    return answer;
+    return value;
+  }
+  /**
+   * Facts added since the last derivation have not reached the relations
+   * the rules keep between questions, so the reads cannot say yet what
+   * those facts change.
+   */
+  stillDerives(check) {
+    if (typeof check === "number") {
+      return check === this.sourceFactCount();
+    }
+    return !this.stale && check.unchangedIn(this.db);
   }
   /**
    * How many facts the store has read from source. They are only ever
@@ -6872,7 +6907,8 @@ function importedCallOrigins(sourceFile, resolution, module) {
   const candidates = [];
   forEachDescendantWhere(sourceFile, callsANamedCallee, (node) => {
     const call = node;
-    if (!declaredLocally(call.getExpression())) {
+    const callee = call.getExpression();
+    if (!declaredLocally(callee) && !importedFromAnotherPackage(callee, module)) {
       candidates.push(call);
     }
     return false;
@@ -6902,6 +6938,26 @@ function callsNamed(found, names) {
 function callsANamedCallee(raw) {
   return (ts6.isCallExpression(raw) || ts6.isNewExpression(raw)) && ts6.isIdentifier(raw.expression);
 }
+var samePackage = (specifier, module) => specifier === module || specifier.startsWith(`${module}/`) || module.startsWith(`${specifier}/`);
+function importOf(declaration) {
+  if (Node14.isImportSpecifier(declaration)) {
+    return declaration.getImportDeclaration();
+  }
+  const parent = Node14.isImportClause(declaration) ? declaration.getParent() : void 0;
+  return parent !== void 0 && Node14.isImportDeclaration(parent) ? parent : void 0;
+}
+function importedFromAnotherPackage(callee, module) {
+  const declarations = callee.getSymbol()?.getDeclarations() ?? [];
+  return declarations.length > 0 && declarations.every((declaration) => {
+    const from = importOf(declaration);
+    if (from === void 0) {
+      return false;
+    }
+    const resolved = from.getModuleSpecifierSourceFile();
+    const specifier = from.getModuleSpecifierValue();
+    return (resolved === void 0 || resolved.isInNodeModules()) && !specifier.startsWith(".") && !samePackage(specifier, module);
+  });
+}
 function declaredLocally(callee) {
   const declarations = callee.getSymbol()?.getDeclarations() ?? [];
   return declarations.length > 0 && declarations.every(

package/package.json

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