@cplieger/deadset-ts 8.0.0-dev.6 → 8.0.0-dev.7

package/dist/src/workflow-steps.js

@@ -3,8 +3,9 @@
  * path from the target root. A workflow or hook file is read as text, line by line, with no
  * YAML parsed.
  */
-import { scriptTokens } from "./manifest.js";
 import { joinPath, relativePath, resolvePath } from "./paths.js";
+import { filesIn } from "./fs/tree.js";
+import { commandsOf, scriptTokens, unquoted, withoutComment } from "./text/shell.js";
 const WORKFLOWS = ".github/workflows";
 /** A line holding a run command: indentation and one sequence marker before `run:`. */
 const RUN_LINE = /^(\s*(?:- )?)run:(.*)$/u;
@@ -19,26 +20,13 @@ const HOOK_MANAGERS = [
 ];
 /** The names GNU make reads a makefile under, in the order it tries them. */
 const MAKEFILES = ["GNUmakefile", "makefile", "Makefile"];
-/** The operators that end one shell command of a recipe line. */
-const COMMAND_SEPARATORS = /&&|\|\||;|\|/u;
 const BLOCK_SCALAR = /^[|>][+-]?$/u;
-const QUOTED = /^(["'])(.*)\1$/su;
 /** A token holding one of these is computed or a pattern, so it names no file. */
 const COMPUTED = /[${*?[]/u;
 const INDENT = /^\s*/u;
-/** The files directly in one directory whose name `accepts`, in name order. */
-function filesIn(host, dir, accepts) {
-    let entries;
-    try {
-        entries = host.readDirectory(dir);
-    }
-    catch {
-        return [];
-    }
-    return entries
-        .filter((entry) => !entry.directory && accepts(entry.name))
-        .map((entry) => joinPath(dir, entry.name))
-        .sort();
+/** The files directly in one directory whose name `accepts`, by path in name order. */
+function pathsIn(host, dir, accepts) {
+    return filesIn(host, dir, accepts).map((name) => joinPath(dir, name));
 }
 function readText(host, path) {
     try {
@@ -58,7 +46,7 @@ export function runCommands(text, key = RUN_LINE) {
             continue;
         }
         const column = (match[1] ?? "").length;
-        const value = (match[2] ?? "").trim().replace(QUOTED, "$2");
+        const value = unquoted((match[2] ?? "").trim());
         if (!BLOCK_SCALAR.test(value)) {
             found.push(value);
             continue;
@@ -88,7 +76,7 @@ function recipeLines(host, root) {
         .replace(/\\\r?\n/gu, " ")
         .split(/\r?\n/u)
         .filter((line) => line.startsWith("\t"))
-        .map((line) => withoutComment(line.slice(1).replace(/^[@+-]+/u, "")).split(COMMAND_SEPARATORS));
+        .map((line) => commandsOf(withoutComment(line.slice(1).replace(/^[@+-]+/u, ""))));
 }
 /**
  * Every token the recipe lines of the target root's makefile hold, each with the directory
@@ -113,31 +101,6 @@ function recipeTokens(host, root) {
     }
     return found;
 }
-/** One shell line up to its comment: a `#` that starts a word outside quotes. */
-function withoutComment(line) {
-    let quote = "";
-    for (let at = 0; at < line.length; at += 1) {
-        const char = line[at];
-        if (quote !== "") {
-            if (char === quote) {
-                quote = "";
-            }
-            else if (char === "\\" && quote === '"') {
-                at += 1;
-            }
-        }
-        else if (char === "'" || char === '"') {
-            quote = char;
-        }
-        else if (char === "\\") {
-            at += 1;
-        }
-        else if (char === "#" && (at === 0 || /\s/u.test(line[at - 1] ?? ""))) {
-            return line.slice(0, at);
-        }
-    }
-    return line;
-}
 /**
  * Every command the target root's workflow steps, git hooks and makefile run: the `run:`
  * steps of the workflow files in `.github/workflows`, every line of each file in `.husky`
@@ -159,11 +122,11 @@ export function workflowTokens(host, targetRoot) {
 /** The commands of the workflow steps, git hooks and hook managers at one root. */
 function stepCommands(host, root) {
     const commands = [];
-    for (const path of filesIn(host, joinPath(root, WORKFLOWS), (name) => /\.ya?ml$/u.test(name))) {
+    for (const path of pathsIn(host, joinPath(root, WORKFLOWS), (name) => /\.ya?ml$/u.test(name))) {
         commands.push(...runCommands(readText(host, path) ?? ""));
     }
     for (const dir of HOOK_DIRS) {
-        for (const path of filesIn(host, joinPath(root, dir), () => true)) {
+        for (const path of pathsIn(host, joinPath(root, dir), () => true)) {
             commands.push(...(readText(host, path) ?? "").split(/\r?\n/u).map(withoutComment));
         }
     }

package/dist/src/workspace-manifests.js

@@ -8,6 +8,7 @@
 import { emittedFrom } from "./emit-map.js";
 import { readManifest } from "./manifest.js";
 import { joinPath, relativePath } from "./paths.js";
+import { MANIFEST } from "./fs/manifest.js";
 /** The one character a subpath pattern of a manifest's `exports` holds. */
 const SUBPATH_WILDCARD = "*";
 /** The paths one written target stands for in its member's sources, itself included. */
@@ -53,8 +54,7 @@ export function memberEntries(host, resolver, targetRoot) {
             return [];
         }
         const manifest = readManifest(host, member.dir);
-        const where = relativePath(targetRoot, joinPath(member.dir, "package.json")) ??
-            joinPath(member.dir, "package.json");
+        const where = relativePath(targetRoot, joinPath(member.dir, MANIFEST)) ?? joinPath(member.dir, MANIFEST);
         const kept = manifest.entries.flatMap((entry) => {
             const exported = entry.member.startsWith("exports");
             if (member.private && exported) {

package/dist/src/workspace-programs.js

@@ -9,6 +9,8 @@ import { ModuleKind, ModuleResolutionKind } from "@typescript/native/sync";
 import { isStringLiteralLikeNode } from "@typescript/native/ast";
 import { baseUrlPaths } from "./base-url.js";
 import { dirnamePath, resolvePath } from "./paths.js";
+import { bytewise } from "./text/compare.js";
+import { PRODUCT } from "./product.js";
 /** The most questions one round trip carries. */
 const BATCH = 2048;
 /**
@@ -55,7 +57,7 @@ function unstatable(reading) {
 export function writtenPath(host, configFile) {
     const stem = configFile.replace(/\.json$/u, "");
     for (let counter = 0;; counter += 1) {
-        const path = `${stem}.deadset-ts${counter === 0 ? "" : `-${String(counter)}`}.json`;
+        const path = `${stem}.${PRODUCT}${counter === 0 ? "" : `-${String(counter)}`}.json`;
         if (host.kindOf(path) === "absent") {
             return path;
         }
@@ -102,10 +104,10 @@ function configurationOf(engine, host, reading) {
         ...(exclude === undefined ? {} : { exclude }),
     });
     const file = writtenPath(host, reading.configFile);
-    const expected = [...reading.parsed.fileNames].sort().join("\u0000");
+    const expected = [...reading.parsed.fileNames].sort(bytewise).join("\u0000");
     const listed = (value) => {
         try {
-            return [...engine.parseConfigJson(value, file).fileNames].sort().join("\u0000");
+            return [...engine.parseConfigJson(value, file).fileNames].sort(bytewise).join("\u0000");
         }
         catch {
             return undefined;

package/dist/src/workspace-resolution.js

@@ -7,8 +7,10 @@
  */
 import { emittedFrom } from "./emit-map.js";
 import { gitIgnored } from "./git-ignore.js";
-import { dirnamePath, isAbsolutePath, joinPath, relativePath, resolvePath } from "./paths.js";
+import { ancestors, dirnamePath, isAbsolutePath, joinPath, relativePath, resolvePath, } from "./paths.js";
 import { satisfies } from "./version-range.js";
+import { isRecord } from "./json-document.js";
+import { INSTALLED_PACKAGES, MANIFEST, manifestAt } from "./fs/manifest.js";
 /** The manifest members that name an entry point for the subpath `.` without `exports`. */
 const LEGACY_MEMBERS = ["types", "typings", "module", "main"];
 /** The dependency members a manifest declares other packages under. */
@@ -20,9 +22,6 @@ const DEPENDENCY_MEMBERS = [
 ];
 const SOURCE = /(?<!\.d)\.(?:[mc]?ts|tsx)$/u;
 const OUTPUT = /(?:\.d\.[mc]?ts|\.[mc]?js|\.jsx)$/u;
-function isRecord(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 /** The package name a bare specifier names, or `undefined` for any other specifier. */
 export function packageNameOf(specifier) {
     if (specifier === "" ||
@@ -146,7 +145,7 @@ export function workspaceResolver(host, workspace) {
         if (links.has(key)) {
             return links.get(key);
         }
-        const candidate = joinPath(dir, "node_modules", name);
+        const candidate = joinPath(dir, INSTALLED_PACKAGES, name);
         let found;
         if (host.kindOf(candidate) === "absent") {
             const up = dirnamePath(dir);
@@ -171,16 +170,13 @@ export function workspaceResolver(host, workspace) {
         if (manifests.has(dir)) {
             return manifests.get(dir);
         }
-        let found;
-        try {
-            const value = JSON.parse(host.readFile(joinPath(dir, "package.json")));
-            found = isRecord(value) ? { dir, manifest: value } : undefined;
-        }
-        catch {
-            const up = dirnamePath(dir);
-            found =
-                up === dir || root === undefined || !inside(root, up) ? undefined : nearestManifest(up);
-        }
+        const manifest = manifestAt(host, dir);
+        const up = dirnamePath(dir);
+        const found = manifest !== undefined
+            ? { dir, manifest }
+            : up === dir || root === undefined || !inside(root, up)
+                ? undefined
+                : nearestManifest(up);
         manifests.set(dir, found);
         return found;
     };
@@ -191,7 +187,7 @@ export function workspaceResolver(host, workspace) {
             const member = candidates.find((one) => one.dir === linked);
             return member === undefined ? { kind: "none" } : { kind: "member", member };
         }
-        const scope = workspace.memberOf(joinPath(fromDir, "package.json"));
+        const scope = workspace.memberOf(joinPath(fromDir, MANIFEST));
         if (scope?.name === name) {
             return { kind: "member", member: scope };
         }
@@ -221,7 +217,7 @@ export function workspaceResolver(host, workspace) {
      * directory however its configuration writes it.
      */
     const mirrored = (member, path) => {
-        for (let dir = dirnamePath(path); inside(member.dir, dir); dir = dirnamePath(dir)) {
+        for (const dir of ancestors(dirnamePath(path), member.dir).filter((at) => at !== member.dir)) {
             const found = emittedFrom(path, { outDir: dir, sourceDirs: [member.dir] }).find((candidate) => SOURCE.test(candidate) && !ignored(candidate) && host.kindOf(candidate) === "file");
             if (found !== undefined) {
                 return found;

package/dist/src/workspace.js

@@ -6,42 +6,30 @@
  * member is the workspace root or a directory the patterns name that holds a named
  * manifest, never one below `node_modules`.
  */
-import { DiscoveryError } from "./discover.js";
+import { DiscoveryError, isConfigFile } from "./discover.js";
 import { commonDirectory } from "./emit-map.js";
-import { dirnamePath, joinPath, relativePath } from "./paths.js";
-import { pnpmPackages } from "./pnpm-workspace.js";
-const MANIFEST = "package.json";
+import { ancestors, dirnamePath, joinPath, relativePath } from "./paths.js";
+import { bytewise } from "./text/compare.js";
+import { isRecord } from "./json-document.js";
+import { directoriesIn, filesIn, repositoryOf } from "./fs/tree.js";
+import { holdsManifest, inInstalledPackages, INSTALLED_PACKAGES, MANIFEST, manifestAt, } from "./fs/manifest.js";
+import { braceExpanded, pathMatches, segmentMatches } from "./text/glob.js";
+import { yamlKey } from "./text/yaml.js";
 const PNPM_WORKSPACE = "pnpm-workspace.yaml";
-const CONFIG_FILE = /^tsconfig.*\.json$/u;
-function isRecord(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-/** One manifest, decoded, or `undefined` where there is none to read. */
-function manifestAt(host, dir) {
-    let text;
-    try {
-        text = host.readFile(joinPath(dir, MANIFEST));
-    }
-    catch {
-        return undefined;
-    }
-    try {
-        const value = JSON.parse(text);
-        return isRecord(value) ? value : undefined;
-    }
-    catch {
-        return undefined;
-    }
-}
 /** The patterns one directory declares a workspace with, or `undefined` where it declares none. */
 function declarationAt(host, dir) {
     const pnpm = joinPath(dir, PNPM_WORKSPACE);
     if (host.kindOf(pnpm) === "file") {
-        const read = pnpmPackages(host.readFile(pnpm));
-        if (read.kind === "refused") {
-            throw new DiscoveryError(`${pnpm}: ${read.reason}; the workspace's packages are read from a sequence of strings`, []);
+        const read = yamlKey(host.readFile(pnpm), "packages");
+        if (read.kind === "absent") {
+            return { file: pnpm, patterns: [] };
+        }
+        const listed = read.kind === "value" ? read.value : undefined;
+        if (!Array.isArray(listed) || !listed.every((entry) => typeof entry === "string")) {
+            const reason = read.kind === "refused" ? read.reason : "packages is not a sequence of strings";
+            throw new DiscoveryError(`${pnpm}: ${reason}; the workspace's packages are read from a sequence of strings`, []);
         }
-        return { file: pnpm, patterns: read.kind === "listed" ? read.patterns : [] };
+        return { file: pnpm, patterns: listed };
     }
     const manifest = manifestAt(host, dir);
     if (manifest === undefined || !Object.hasOwn(manifest, "workspaces")) {
@@ -62,20 +50,6 @@ function declaresWorkspace(host, dir) {
     const manifest = manifestAt(host, dir);
     return manifest !== undefined && Object.hasOwn(manifest, "workspaces");
 }
-/** A pattern with every brace list expanded into its alternatives. */
-function braceExpanded(pattern) {
-    const open = pattern.indexOf("{");
-    const close = open < 0 ? -1 : pattern.indexOf("}", open);
-    if (close < 0) {
-        return [pattern];
-    }
-    const before = pattern.slice(0, open);
-    const after = pattern.slice(close + 1);
-    return pattern
-        .slice(open + 1, close)
-        .split(",")
-        .flatMap((member) => braceExpanded(before + member + after));
-}
 /**
  * The segments of one pattern below the workspace root, `.` and empty segments
  * dropped and `..` taken back, or `undefined` where it leaves the root.
@@ -96,52 +70,6 @@ function segmentsOf(pattern) {
     }
     return segments;
 }
-/**
- * Whether one directory name matches one pattern segment: `*` stands for any run of
- * characters and `?` for one, and neither matches a leading dot.
- */
-function segmentMatches(segment, name) {
-    if (name.startsWith(".") && !segment.startsWith(".")) {
-        return false;
-    }
-    const source = Array.from(segment)
-        .map((character) => {
-        if (character === "*") {
-            return ".*";
-        }
-        if (character === "?") {
-            return ".";
-        }
-        return character.replaceAll(/[.+^${}()|[\]\\/]/gu, (c) => `\\${c}`);
-    })
-        .join("");
-    return new RegExp(`^${source}$`, "u").test(name);
-}
-/** Whether one path's segments match one pattern's, `**` standing for any run of segments. */
-function pathMatches(pattern, path) {
-    const [head, ...rest] = pattern;
-    if (head === undefined) {
-        return path.length === 0;
-    }
-    if (head === "**") {
-        return (pathMatches(rest, path) ||
-            (path.length > 0 && !(path[0] ?? "").startsWith(".") && pathMatches(pattern, path.slice(1))));
-    }
-    const [name, ...below] = path;
-    return name !== undefined && segmentMatches(head, name) && pathMatches(rest, below);
-}
-function subdirectories(host, dir) {
-    try {
-        return host
-            .readDirectory(dir)
-            .filter((entry) => entry.directory && entry.name !== "node_modules" && entry.name !== ".git")
-            .map((entry) => entry.name)
-            .sort();
-    }
-    catch {
-        return [];
-    }
-}
 /**
  * Every directory below `dir` one pattern names. `**` does not descend into a
  * directory that declares a workspace of its own, whose packages are that
@@ -155,7 +83,7 @@ function expand(host, dir, pattern, into) {
     }
     if (head === "**") {
         expand(host, dir, rest, into);
-        for (const name of subdirectories(host, dir)) {
+        for (const name of directoriesIn(host, dir)) {
             if (name.startsWith(".")) {
                 continue;
             }
@@ -166,12 +94,12 @@ function expand(host, dir, pattern, into) {
     }
     if (!head.includes("*") && !head.includes("?")) {
         const child = joinPath(dir, head);
-        if (head !== "node_modules" && host.kindOf(child) === "directory") {
+        if (head !== INSTALLED_PACKAGES && host.kindOf(child) === "directory") {
             expand(host, child, rest, into);
         }
         return;
     }
-    for (const name of subdirectories(host, dir)) {
+    for (const name of directoriesIn(host, dir)) {
         if (segmentMatches(head, name)) {
             expand(host, joinPath(dir, name), rest, into);
         }
@@ -208,10 +136,10 @@ function namesDirectory(root, patterns, dir) {
     if (below === undefined) {
         return false;
     }
-    const path = below.split("/");
-    if (path.includes("node_modules")) {
+    if (inInstalledPackages(below)) {
         return false;
     }
+    const path = below.split("/");
     let named = false;
     for (const written of patterns) {
         const negated = written.startsWith("!");
@@ -238,18 +166,7 @@ function layoutOf(configFile, parsed) {
     return { outDir: parsed.outDir, declarationDir: parsed.declarationDir, sourceDirs };
 }
 function configurationsOf(host, dir, parse) {
-    let names;
-    try {
-        names = host
-            .readDirectory(dir)
-            .filter((entry) => !entry.directory && CONFIG_FILE.test(entry.name))
-            .map((entry) => entry.name)
-            .sort();
-    }
-    catch {
-        return [];
-    }
-    return names.flatMap((name) => {
+    return filesIn(host, dir, isConfigFile).flatMap((name) => {
         const configFile = joinPath(dir, name);
         const parsed = parse(configFile);
         return parsed === undefined
@@ -267,22 +184,17 @@ function configurationsOf(host, dir, parse) {
  * highest directory below it, at or above the target root, that holds a manifest.
  */
 function nearestDeclaration(host, targetRoot) {
-    let dir = targetRoot;
     let highestPackage;
-    for (;;) {
+    for (const dir of ancestors(targetRoot, repositoryOf(host, targetRoot)?.root)) {
         const declared = declarationAt(host, dir);
         if (declared !== undefined) {
             return { root: dir, ...declared, highestPackage };
         }
-        if (host.kindOf(joinPath(dir, MANIFEST)) === "file") {
+        if (holdsManifest(host, dir)) {
             highestPackage = dir;
         }
-        const up = dirnamePath(dir);
-        if (up === dir || host.kindOf(joinPath(dir, ".git")) !== "absent") {
-            return undefined;
-        }
-        dir = up;
     }
+    return undefined;
 }
 /**
  * The workspace the target sits in, or `undefined` where none holds it: no directory
@@ -320,7 +232,7 @@ export function findWorkspace(host, targetRoot, parse) {
     if (members.length < 2) {
         return undefined;
     }
-    members.sort((a, b) => a.dir === declared.root ? -1 : b.dir === declared.root ? 1 : a.dir < b.dir ? -1 : 1);
+    members.sort((a, b) => a.dir === declared.root ? -1 : b.dir === declared.root ? 1 : bytewise(a.dir, b.dir));
     const named = new Map();
     for (const member of members) {
         named.set(member.name, [...(named.get(member.name) ?? []), member]);
@@ -332,7 +244,7 @@ export function findWorkspace(host, targetRoot, parse) {
             return scopes.get(dir);
         }
         const up = dirnamePath(dir);
-        const found = host.kindOf(joinPath(dir, MANIFEST)) === "file" ? dir : up === dir ? undefined : scopeOf(up);
+        const found = holdsManifest(host, dir) ? dir : up === dir ? undefined : scopeOf(up);
         scopes.set(dir, found);
         return found;
     };

package/jsr.json

@@ -1,6 +1,6 @@
 {
   "name": "@cplieger/deadset-ts",
-  "version": "8.0.0-dev.6",
+  "version": "8.0.0-dev.7",
   "license": "GPL-3.0-or-later",
   "exports": {
     ".": "./src/index.ts"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cplieger/deadset-ts",
-  "version": "8.0.0-dev.6",
+  "version": "8.0.0-dev.7",
   "type": "module",
   "sideEffects": false,
   "description": "Deterministic dead-code analysis for TypeScript, class and type members included",

package/src/analysis.ts

@@ -62,7 +62,6 @@ import {
 } from "./exempt.ts";
 import type { TSExemptionClass } from "./exempt-classes.ts";
 import { heldByInclusion, sourcePaths, sourceTree } from "./file-facts.ts";
-import { globExpression } from "./glob.ts";
 import type { Finding } from "./finding.ts";
 import { findingsPass, recordedFindings, rowKey, type PassResult } from "./findings-pass.ts";
 import type { EmitterInput } from "./findings/emitter.ts";
@@ -85,6 +84,7 @@ import {
   type SweepResult,
 } from "./matrix.ts";
 import {
+  ancestors,
   dirnamePath,
   extensionOf,
   joinPath,
@@ -94,7 +94,7 @@ import {
 } from "./paths.ts";
 import type { UnansweredQuestion } from "./query.ts";
 import { byPosition, isComponentFile, type Position } from "./position.ts";
-import { LANGUAGE, type TypeErrorSkip, type UnansweredCount } from "./report.ts";
+import type { TypeErrorSkip, UnansweredCount } from "./report.ts";
 import { SetupError, setupLine, type SetupFailure } from "./setup-failure.ts";
 import {
   pathsOf,
@@ -136,6 +136,10 @@ import { inlineDirectives, inlineSuppressions, type InlineDirective } from "./su
 import type { Exemption, Mode, SweepInput } from "./sweep.ts";
 import { readTemplates, templateField } from "./template-field.ts";
 import { ownErrors, workspaceRun } from "./workspace-run.ts";
+import { bytewise } from "./text/compare.ts";
+import { holdsManifest, inInstalledPackages, MANIFEST, manifestAt } from "./fs/manifest.ts";
+import { globExpression } from "./text/glob.ts";
+import { LANGUAGE } from "./product.ts";
 
 /** The setting whose source decides where a finding about a configured root sits. */
 const ROOTS_SETTING = "roots.patterns";
@@ -192,14 +196,6 @@ function documentOf(
   return relativePath(resolvePath(host.workingDirectory(), targetRoot), document) ?? "";
 }
 
-/** Two strings ordered bytewise. */
-function compare(a: string, b: string): number {
-  if (a === b) {
-    return 0;
-  }
-  return a < b ? -1 : 1;
-}
-
 /** What every stage after the root set reads of one project. */
 interface ProjectRead {
   readonly configuration: string;
@@ -272,8 +268,8 @@ function conventionManifests(
   nestedDirs: readonly string[],
 ): readonly ConventionManifest[] {
   const found = new Map<string, ConventionManifest>();
-  if (host.kindOf(joinPath(targetRoot, "package.json")) === "file") {
-    found.set(targetRoot, { dir: targetRoot, path: "package.json" });
+  if (holdsManifest(host, targetRoot)) {
+    found.set(targetRoot, { dir: targetRoot, path: MANIFEST });
   }
   for (const [dirs, nested] of [
     [memberDirs, false],
@@ -303,23 +299,18 @@ function nestedPackageDirs(
   const seen = new Set<string>();
   const found: string[] = [];
   for (const file of files) {
-    for (
-      let dir = dirnamePath(file);
-      dir !== targetRoot && !seen.has(dir) && relativePath(targetRoot, dir) !== undefined;
-      dir = dirnamePath(dir)
-    ) {
+    for (const dir of ancestors(dirnamePath(file), targetRoot)) {
+      if (seen.has(dir) || relativePath(targetRoot, dir) === undefined) {
+        break;
+      }
       seen.add(dir);
       const below = relativePath(targetRoot, dir) ?? "";
-      if (
-        !below.split("/").includes("node_modules") &&
-        !known.has(dir) &&
-        host.kindOf(joinPath(dir, "package.json")) === "file"
-      ) {
+      if (!inInstalledPackages(below) && !known.has(dir) && holdsManifest(host, dir)) {
         found.push(dir);
       }
     }
   }
-  return found.sort(compare);
+  return found.sort(bytewise);
 }
 
 /**
@@ -723,7 +714,9 @@ export function runRoots(
 
   const ordered = [...merged.values()].sort(
     (a, b) =>
-      byPosition(a.position, b.position) || compare(a.kind, b.kind) || compare(a.source, b.source),
+      byPosition(a.position, b.position) ||
+      bytewise(a.kind, b.kind) ||
+      bytewise(a.source, b.source),
   );
   const unmatched = unmatchedEverywhere(
     config.rootPatterns,
@@ -872,20 +865,9 @@ function testEvidence(
     }
   }
   const manifests = new Map<string, Readonly<Record<string, unknown>> | undefined>();
-  const manifestAt = (dir: string): Readonly<Record<string, unknown>> | undefined => {
+  const manifestIn = (dir: string): Readonly<Record<string, unknown>> | undefined => {
     if (!manifests.has(dir)) {
-      let value: unknown;
-      try {
-        value = JSON.parse(host.readFile(joinPath(dir, "package.json")));
-      } catch {
-        value = undefined;
-      }
-      manifests.set(
-        dir,
-        typeof value === "object" && value !== null && !Array.isArray(value)
-          ? (value as Record<string, unknown>)
-          : undefined,
-      );
+      manifests.set(dir, manifestAt(host, dir));
     }
     return manifests.get(dir);
   };
@@ -895,16 +877,14 @@ function testEvidence(
   return {
     imports,
     devDependency: (path, name) => {
-      for (let dir = dirnamePath(joinPath(root, path)); ; dir = dirnamePath(dir)) {
-        const manifest = manifestAt(dir);
+      for (const dir of ancestors(dirnamePath(joinPath(root, path)), root)) {
+        const manifest = manifestIn(dir);
         const other = OTHER_SECTIONS.some((one) => declares(manifest?.[one], name));
         if (declares(manifest?.[DEV_SECTION], name) || other) {
           return !other;
         }
-        if (normalizePath(dir) === normalizePath(root) || dirnamePath(dir) === dir) {
-          return false;
-        }
       }
+      return false;
     },
   };
 }
@@ -1056,8 +1036,8 @@ function readRun<Extra>(
     const exempt = detected.records;
     const made = supportReferences([...one.references, ...(satisfied?.references ?? [])], support);
     const held = new Set(projectRead.held.symbols.map((symbol) => symbol.position.path));
-    const supportFiles = [...support].filter((path) => held.has(path)).sort();
-    const testUsedFiles = [...testUsed].filter((path) => held.has(path)).sort();
+    const supportFiles = [...support].filter((path) => held.has(path)).sort(bytewise);
+    const testUsedFiles = [...testUsed].filter((path) => held.has(path)).sort(bytewise);
     const configured: Configured = {
       configuration: projectRead.configuration,
       symbols: projectRead.held.symbols,
@@ -1285,7 +1265,7 @@ function sweptOf<Extra>(
     unanswered: read.unanswered,
     heldByUnanswered: [...held],
     skipped: read.projects.flatMap((one) => one.skipped),
-    componentFiles: [...new Set(read.projects.flatMap((one) => one.componentFiles))].sort(compare),
+    componentFiles: [...new Set(read.projects.flatMap((one) => one.componentFiles))].sort(bytewise),
   };
 }
 
@@ -1427,12 +1407,7 @@ function judgedMembers(
 
 /** The directory of the nearest `package.json` at or above a file, inside `root`, else `root`. */
 function nearestManifestDir(host: Host, root: string, file: string): string {
-  for (let dir = dirnamePath(file); relativePath(root, dir) !== undefined; dir = dirnamePath(dir)) {
-    if (host.kindOf(joinPath(dir, "package.json")) === "file") {
-      return dir;
-    }
-  }
-  return root;
+  return ancestors(dirnamePath(file), root).find((dir) => holdsManifest(host, dir)) ?? root;
 }
 
 /**