@cplieger/deadset-ts 5.1.1 → 5.2.1

package/src/test-support.ts

@@ -1,8 +1,8 @@
 /**
- * Test-support code: a file that is not a test file by name and that only test code
- * imports. At least one test file reaches it, directly or through other such files, and
- * nothing else does, so it is judged with the tests: what it references is referenced by
- * test code, and a declaration of it is live while test code references it.
+ * Test-support code: the files only tests reach. A test reaches each one through a chain
+ * of references, and every reference to a declaration of one, an import for its effects
+ * included, is written in a test file or in another such file, so it is judged with the
+ * tests: what it references is referenced by test code.
  */
 
 import type { InventorySymbol } from "./inventory.ts";
@@ -13,10 +13,11 @@ import type { Root } from "./roots.ts";
 const SKIP_ROOT = "type-error";
 
 /**
- * The files of one project that are test-support code, below the target root. A file
- * holding a root is not one, because a root has a caller outside the import graph: a
- * runtime, a tool, a configuration, or a consumer of a library's published API.
- * `testFiles` are the files the test-file rules classified.
+ * The files of one project that are test-support code, below the target root: the
+ * largest set of files a test file reaches, none of them a test file or holding a root,
+ * whose every user outside the set is a test file. A root has a caller outside the
+ * reference graph: a runtime, a tool, a configuration, or a consumer of a library's
+ * published API. `testFiles` are the files the test-file rules classified.
  */
 export function testSupportFiles(
   symbols: readonly InventorySymbol[],
@@ -26,34 +27,45 @@ export function testSupportFiles(
 ): ReadonlySet<string> {
   const fileOf = new Map(symbols.map((symbol) => [symbol.id, symbol.position.path]));
   const users = new Map<string, Set<string>>();
+  const uses = new Map<string, Set<string>>();
+  const add = (map: Map<string, Set<string>>, key: string, value: string): void => {
+    const held = map.get(key);
+    if (held === undefined) {
+      map.set(key, new Set([value]));
+    } else {
+      held.add(value);
+    }
+  };
   for (const reference of references) {
     const used = fileOf.get(reference.to);
     const from = reference.position.path;
     if (reference.consumer !== undefined || used === undefined || used === from) {
       continue;
     }
-    const held = users.get(used);
-    if (held === undefined) {
-      users.set(used, new Set([from]));
-    } else {
-      held.add(from);
-    }
+    add(users, used, from);
+    add(uses, from, used);
   }
   const tests = new Set(testFiles);
   const rooted = new Set(
     roots.filter((root) => root.kind !== SKIP_ROOT).flatMap((root) => fileOf.get(root.id) ?? []),
   );
-  const candidates = [...users.keys()].filter((path) => !tests.has(path) && !rooted.has(path));
-  const support = new Set<string>();
+  const reached = new Set<string>();
+  const queue = [...tests];
+  for (let path = queue.pop(); path !== undefined; path = queue.pop()) {
+    for (const next of uses.get(path) ?? []) {
+      if (!reached.has(next) && !tests.has(next)) {
+        reached.add(next);
+        queue.push(next);
+      }
+    }
+  }
+  const support = new Set([...reached].filter((path) => !rooted.has(path)));
   for (let changed = true; changed;) {
     changed = false;
-    for (const path of candidates) {
-      if (support.has(path)) {
-        continue;
-      }
+    for (const path of support) {
       const from = users.get(path) ?? new Set<string>();
-      if ([...from].every((one) => tests.has(one) || support.has(one))) {
-        support.add(path);
+      if (![...from].every((one) => tests.has(one) || support.has(one))) {
+        support.delete(path);
         changed = true;
       }
     }

package/src/version.ts

@@ -4,4 +4,4 @@
  * independently of the analyzer's own version, which is the one the host answers
  * from the package the analyzer was installed from.
  */
-export const CONTRACT_VERSION = "5.2.0";
+export const CONTRACT_VERSION = "5.3.0";