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

package/dist/src/verbs/analyze.js

@@ -1,12 +1,12 @@
 import { CONTRACT_VERSION, EXIT_CLEAN, EXIT_FAILURE, } from "../contract/contract.generated.js";
 import { runAnalysis, runBaselineWrite, unansweredCounts, } from "../analysis.js";
-import { ConfigError, kindOf } from "../config.js";
+import { kindOf } from "../config.js";
 import { CONFORMANCE, DECLARED_GAPS } from "../conformance.js";
 import { moduleIdentity } from "../consumers.js";
 import { analyzerProvenance, verdictOf } from "../findings-pass.js";
 import { dirnamePath, joinPath, normalizePath, relativePath, resolvePath } from "../paths.js";
 import { partialNotes } from "../partial.js";
-import { buildReport, LANGUAGE, capFindings, sortFindings, } from "../report.js";
+import { buildReport, capFindings, sortFindings, } from "../report.js";
 import { reportRefusals } from "../report-schema.js";
 import { json } from "../reporters/json.js";
 import { RENDERINGS } from "../reporters/reporters.js";
@@ -14,6 +14,9 @@ import { parseTemplate, TemplateError } from "../reporters/template.js";
 import { resolve } from "../resolve.js";
 import { otherSchemeRows, rowReason, writeBaseline } from "../suppress-file.js";
 import {} from "./verb.js";
+import { UsageError } from "../usage.js";
+import { bytewise } from "../text/compare.js";
+import { diagnose, message } from "../product.js";
 /** The options `analyze` takes beside the ones every verb takes. */
 export const ANALYZE_OPTIONS = {
     plain: ["report", "baseline-write", "exit-code", "template"],
@@ -31,7 +34,7 @@ class ReportPathError extends Error {
 }
 /** The formats this analyzer renders, for a message that names them. */
 function formatNames() {
-    return [...RENDERINGS.keys()].sort().join(", ");
+    return [...RENDERINGS.keys()].sort(bytewise).join(", ");
 }
 /** The renderings one invocation writes: the ones it named, else the configuration's. */
 function formatsOf(named, configured) {
@@ -39,10 +42,10 @@ function formatsOf(named, configured) {
     const seen = new Set();
     for (const format of formats) {
         if (!RENDERINGS.has(format)) {
-            throw new ConfigError("malformed", "", `${JSON.stringify(format)} is not a format this analyzer renders: the formats are ${formatNames()}`);
+            throw new UsageError(`${JSON.stringify(format)} is not a format this analyzer renders: the formats are ${formatNames()}`);
         }
         if (seen.has(format)) {
-            throw new ConfigError("malformed", "", `the format ${JSON.stringify(format)} is named twice`);
+            throw new UsageError(`the format ${JSON.stringify(format)} is named twice`);
         }
         seen.add(format);
     }
@@ -128,7 +131,7 @@ function counted(n, noun) {
 function templateOf(host, invoked, named, formats) {
     if (named === undefined || named === "") {
         if (formats.includes("template")) {
-            throw new ConfigError("malformed", "", "the template format renders the template --template names, and none was named");
+            throw new UsageError("the template format renders the template --template names, and none was named");
         }
         return undefined;
     }
@@ -137,7 +140,7 @@ function templateOf(host, invoked, named, formats) {
         source = host.readFile(resolvePath(invoked, named));
     }
     catch (error) {
-        throw new ConfigError("malformed", "", `--template=${named}: ${error instanceof Error ? error.message : String(error)}`);
+        throw new UsageError(`--template=${named}: ${message(error)}`);
     }
     try {
         return parseTemplate(source);
@@ -146,7 +149,7 @@ function templateOf(host, invoked, named, formats) {
         if (!(error instanceof TemplateError)) {
             throw error;
         }
-        throw new ConfigError("malformed", "", `--template=${named}: ${error.message}`);
+        throw new UsageError(`--template=${named}: ${error.message}`);
     }
 }
 /**
@@ -160,17 +163,13 @@ function templateOf(host, invoked, named, formats) {
 export const analyzeVerb = ({ err, host, inputs, scope, openClient, option, repeated }) => {
     const reportPath = option("report");
     if (reportPath === undefined || reportPath === "") {
-        throw new ConfigError("malformed", "", "analyze writes its report to the path --report names, and no path was named");
+        throw new UsageError("analyze writes its report to the path --report names, and no path was named");
     }
     const exitCode = option("exit-code") ?? EXIT_CODE_ON;
     if (exitCode !== EXIT_CODE_ON && exitCode !== EXIT_CODE_OFF) {
-        throw new ConfigError("malformed", "", `--exit-code=${JSON.stringify(exitCode)}: the values are ${EXIT_CODE_ON} and ${EXIT_CODE_OFF}`);
+        throw new UsageError(`--exit-code=${JSON.stringify(exitCode)}: the values are ${EXIT_CODE_ON} and ${EXIT_CODE_OFF}`);
     }
     const { config, provenance } = resolve(inputs());
-    const kind = config.targetKind;
-    if (kind === "") {
-        throw new ConfigError("missing-target-kind", "target.kind", "target.kind is not set");
-    }
     const invoked = host.workingDirectory();
     const baseline = option("baseline-write");
     const documents = {
@@ -186,7 +185,7 @@ export const analyzeVerb = ({ err, host, inputs, scope, openClient, option, repe
         version = host.analyzerVersion();
     }
     catch (error) {
-        err.write(`deadset-ts: ${error instanceof Error ? error.message : String(error)}\n`);
+        diagnose(err, message(error));
         return EXIT_FAILURE;
     }
     let report;
@@ -225,7 +224,7 @@ export const analyzeVerb = ({ err, host, inputs, scope, openClient, option, repe
             conformance: CONFORMANCE,
             declaredGaps: DECLARED_GAPS,
             target: {
-                kind: kindOf(kind, LANGUAGE),
+                kind: kindOf(config.target.kind),
                 root,
                 identity: moduleIdentity(host, scoped.target),
             },
@@ -247,14 +246,14 @@ export const analyzeVerb = ({ err, host, inputs, scope, openClient, option, repe
                 ...unseenLoadNotes(run.unseenLoads),
             ],
         });
-        report = capFindings(sortFindings(built, config.reporters.sort), config.reporters.maxFindings);
+        report = capFindings(sortFindings(built, config.reporters.sort), config.reporters.max_findings);
         verdict = verdictOf(result, config);
     }
     catch (error) {
         if (!(error instanceof ReportPathError)) {
             throw error;
         }
-        err.write(`deadset-ts: ${error.message}\n`);
+        diagnose(err, error.message);
         return EXIT_FAILURE;
     }
     try {
@@ -281,30 +280,30 @@ export const analyzeVerb = ({ err, host, inputs, scope, openClient, option, repe
         }
     }
     catch (error) {
-        err.write(`deadset-ts: ${error instanceof Error ? error.message : String(error)}\n`);
+        diagnose(err, message(error));
         return EXIT_FAILURE;
     }
     for (const note of partial) {
-        err.write(`deadset-ts: ${note}\n`);
+        diagnose(err, note);
     }
     for (const line of [...unread, ...unfound]) {
-        err.write(`deadset-ts: ${line}\n`);
+        diagnose(err, line);
     }
     for (const warning of warnings) {
-        err.write(`deadset-ts: ${warning.path}:${String(warning.line)}: a <script> start tag that begins a line is not read as a block: ${warning.reason}\n`);
+        diagnose(err, `${warning.path}:${String(warning.line)}: a <script> start tag that begins a line is not read as a block: ${warning.reason}`);
     }
     for (const skip of report.type_error_skips) {
-        err.write(`deadset-ts: ${skip.path}:${String(skip.line)}: ${skip.message}: the function or statement holding this type error is not evaluated\n`);
+        diagnose(err, `${skip.path}:${String(skip.line)}: ${skip.message}: the function or statement holding this type error is not evaluated`);
     }
     if (report.totals.pending > 0) {
-        err.write(`deadset-ts: ${counted(report.totals.pending, "pending finding")}: the report names a declared cross-language edge, and no merge has resolved it\n`);
+        diagnose(err, `${counted(report.totals.pending, "pending finding")}: the report names a declared cross-language edge, and no merge has resolved it`);
     }
     if (report.totals.stale_suppressions > 0) {
-        err.write(`deadset-ts: ${counted(report.totals.stale_suppressions, "stale suppression")}\n`);
+        diagnose(err, counted(report.totals.stale_suppressions, "stale suppression"));
     }
     if (exitCode === EXIT_CODE_OFF) {
         if (verdict !== EXIT_CLEAN) {
-            err.write(`deadset-ts: the exit code is configured off: the verdict of this run is ${String(verdict)}\n`);
+            diagnose(err, `the exit code is configured off: the verdict of this run is ${String(verdict)}`);
         }
         return EXIT_CLEAN;
     }

package/dist/src/verbs/describe.js

@@ -1,7 +1,7 @@
 import { CONTRACT_VERSION, EXIT_CLEAN, EXIT_FAILURE, EXIT_USAGE, SCHEMA_VERSIONS, } from "../contract/contract.generated.js";
 import { CONFORMANCE } from "../conformance.js";
-import { ANALYZER_NAME, LANGUAGE } from "../report.js";
 import {} from "./verb.js";
+import { diagnose, LANGUAGE, message, PRODUCT } from "../product.js";
 /**
  * The document `describe` writes: the analyzer, the Contract version it implements, the
  * report schema versions it reads, the languages it claims, and its recorded result over
@@ -9,7 +9,7 @@ import {} from "./verb.js";
  */
 export function describeDocument(version, recorded) {
     const document = {
-        name: ANALYZER_NAME,
+        name: PRODUCT,
         version,
         contract_version: CONTRACT_VERSION,
         schema_versions_accepted: SCHEMA_VERSIONS,
@@ -29,7 +29,7 @@ export function describeDocument(version, recorded) {
 /** Writes this analyzer's description to the output stream, and nothing to the error stream. */
 export const describeVerb = ({ out, err, host, args }) => {
     if (args.length > 0) {
-        err.write(`deadset-ts: describe takes no argument, got ${JSON.stringify(args[0])}\n`);
+        diagnose(err, `describe takes no argument, got ${JSON.stringify(args[0])}`);
         return EXIT_USAGE;
     }
     let version;
@@ -37,7 +37,7 @@ export const describeVerb = ({ out, err, host, args }) => {
         version = host.analyzerVersion();
     }
     catch (error) {
-        err.write(`deadset-ts: describe: ${error instanceof Error ? error.message : String(error)}\n`);
+        diagnose(err, `describe: ${message(error)}`);
         return EXIT_FAILURE;
     }
     out.write(describeDocument(version, CONFORMANCE));

package/dist/src/verbs/explain.js

@@ -1,7 +1,6 @@
 import { EXIT_CLEAN, EXIT_USAGE } from "../contract/contract.generated.js";
 import { runAnalysis } from "../analysis.js";
 import { listing } from "../components.js";
-import { ConfigError } from "../config.js";
 import { OUTSIDE, swept as judged } from "../graph.js";
 import { referenceKey } from "../matrix.js";
 import { partialNotes } from "../partial.js";
@@ -9,6 +8,9 @@ import { resolvePath } from "../paths.js";
 import { positionKey } from "../position.js";
 import { resolve } from "../resolve.js";
 import {} from "./verb.js";
+import { UsageError } from "../usage.js";
+import { bytewise } from "../text/compare.js";
+import { diagnose } from "../product.js";
 /**
  * The three spellings of an explanation request, each naming the symbol to explain. They are
  * one request, because exactly one state holds for a symbol and the answer is that state.
@@ -34,10 +36,10 @@ function namedSymbol(option) {
     });
     const [only, ...more] = named;
     if (only === undefined) {
-        throw new ConfigError("malformed", "", "explain explains the symbol --why, --why-live or --why-not names, and none was named");
+        throw new UsageError("explain explains the symbol --why, --why-live or --why-not names, and none was named");
     }
     if (more.length > 0) {
-        throw new ConfigError("malformed", "", `explain explains one symbol, and ${named.map((one) => `--${one.name}`).join(", ")} each name one`);
+        throw new UsageError(`explain explains one symbol, and ${named.map((one) => `--${one.name}`).join(", ")} each name one`);
     }
     return only.value;
 }
@@ -74,7 +76,7 @@ function subjectOf(symbols, named) {
     const partial = symbols
         .filter((symbol) => symbol.ref.toLowerCase().includes(folded) || symbol.name.toLowerCase().includes(folded))
         .map(described)
-        .sort((a, b) => (a < b ? -1 : a > b ? 1 : 0));
+        .sort(bytewise);
     return { candidates: partial.slice(0, MAX_PARTIAL_MATCHES) };
 }
 /** Every reference of the run once, a reference several configurations make counted once. */
@@ -318,7 +320,7 @@ export const explainVerb = ({ out, err, host, inputs, scope, openClient, option
         targetRoot: resolvePath(host.workingDirectory(), scoped.target.path),
     });
     if (subject === undefined) {
-        err.write(`deadset-ts: ${JSON.stringify(named)} names no one symbol of the target\n`);
+        diagnose(err, `${JSON.stringify(named)} names no one symbol of the target`);
         for (const candidate of candidates) {
             err.write(`  ${candidate}\n`);
         }
@@ -330,7 +332,7 @@ export const explainVerb = ({ out, err, host, inputs, scope, openClient, option
         out.write(explanation(analysis, subject, config.reporters.cascade));
     }
     for (const note of notes) {
-        err.write(`deadset-ts: ${note}\n`);
+        diagnose(err, note);
     }
     return subject === undefined ? EXIT_USAGE : EXIT_CLEAN;
 };

package/dist/src/verbs/print-projects.js

@@ -2,8 +2,9 @@ import { EXIT_CLEAN } from "../contract/contract.generated.js";
 import { runProjects } from "../analysis.js";
 import { partialNotes } from "../partial.js";
 import { resolvePath } from "../paths.js";
-import { resolveUnkinded } from "../resolve.js";
+import { resolvePartial } from "../resolve.js";
 import {} from "./verb.js";
+import { diagnose } from "../product.js";
 /**
  * Writes the name of every project one run analyzes, one per line: the identifier the
  * build matrix declares for it, or, where discovery derived the project, its
@@ -12,7 +13,7 @@ import {} from "./verb.js";
  * instead, and one that fails the analysis fails this command the same way.
  */
 export const printProjectsVerb = ({ out, err, host, inputs, scope, openClient }) => {
-    const config = resolveUnkinded(inputs());
+    const config = resolvePartial(inputs());
     const scoped = scope();
     const answer = runProjects(openClient(config), host, scoped, config);
     for (const id of answer.configurations) {
@@ -23,7 +24,7 @@ export const printProjectsVerb = ({ out, err, host, inputs, scope, openClient })
         unanswered: answer.unanswered,
         targetRoot: resolvePath(host.workingDirectory(), scoped.target.path),
     })) {
-        err.write(`deadset-ts: ${note}\n`);
+        diagnose(err, note);
     }
     return EXIT_CLEAN;
 };

package/dist/src/verbs/print-retained.js

@@ -5,6 +5,7 @@ import { partialNotes } from "../partial.js";
 import { resolvePath } from "../paths.js";
 import { resolve } from "../resolve.js";
 import {} from "./verb.js";
+import { diagnose } from "../product.js";
 /**
  * Writes every declaration an exemption held back in the production sweep a report is
  * built from, one per line, and nothing where no exemption held one back. One fact
@@ -27,7 +28,7 @@ export const printRetainedVerb = ({ out, err, host, inputs, scope, openClient })
         unanswered: swept.unanswered,
         targetRoot: resolvePath(host.workingDirectory(), scoped.target.path),
     })) {
-        err.write(`deadset-ts: ${note}\n`);
+        diagnose(err, note);
     }
     return EXIT_CLEAN;
 };

package/dist/src/verbs/print-roots.js

@@ -4,6 +4,7 @@ import { partialNotes } from "../partial.js";
 import { resolvePath } from "../paths.js";
 import { resolve } from "../resolve.js";
 import {} from "./verb.js";
+import { diagnose } from "../product.js";
 /**
  * One root as a line: the declaration's reference, why it is a root, and the string
  * that named it, separated by tabs. A run of several configurations adds the ones
@@ -40,7 +41,7 @@ export const printRootsVerb = ({ out, err, host, inputs, scope, openClient }) =>
         unanswered: answer.unanswered,
         targetRoot: resolvePath(host.workingDirectory(), scoped.target.path),
     })) {
-        err.write(`deadset-ts: ${note}\n`);
+        diagnose(err, note);
     }
     return answer.findings.length > 0 ? EXIT_FINDINGS : EXIT_CLEAN;
 };

package/dist/src/verbs/version.js

@@ -1,7 +1,8 @@
 import { CONTRACT_VERSION, EXIT_CLEAN } from "../contract/contract.generated.js";
 import {} from "./verb.js";
+import { PRODUCT } from "../product.js";
 /** Writes the version the host reports and the Contract version this analyzer implements. */
 export const versionVerb = ({ out, host }) => {
-    out.write(`deadset-ts ${host.analyzerVersion()}\ncontract ${CONTRACT_VERSION}\n`);
+    out.write(`${PRODUCT} ${host.analyzerVersion()}\ncontract ${CONTRACT_VERSION}\n`);
     return EXIT_CLEAN;
 };

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;