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

package/dist/src/references.js

@@ -1,10 +1,10 @@
 import { isArrayLiteralExpression, isAsExpression, isBinaryExpression, isCallExpression, isDecorator, isDeleteExpression, isElementAccessExpression, isExportDeclaration, isExpressionStatement, isExternalModuleReference, isForInStatement, isForOfStatement, isForStatement, isIdentifier, isImportDeclaration, isImportEqualsDeclaration, isInterfaceDeclaration, isMetaProperty, isModuleBlock, isModuleDeclaration, isNewExpression, isNamespaceExport, isNoSubstitutionTemplateLiteral, isObjectLiteralExpression, isParenthesizedExpression, isPostfixUnaryExpression, isPrefixUnaryExpression, isPropertyAccessExpression, isPropertyAssignment, isShorthandPropertyAssignment, isSpreadAssignment, isSpreadElement, isStringLiteral, isVoidExpression, SyntaxKind, } from "@typescript/native/ast";
+import { parenthesesRemoved } from "./unwrap.js";
 import { aliasChains } from "./alias-chain.js";
 import { contextualUses } from "./contextual-uses.js";
 import { destructuring, propertyReadsOf } from "./destructuring.js";
 import { specifierCandidates } from "./configuration-files.js";
 import { namespaceUses } from "./namespace-objects.js";
-import { globExpression } from "./glob.js";
 import { declarationsByName, isParameterProperty, nodeKey, } from "./inventory.js";
 import { ambientGlobalInterfaces, augmentationReferences } from "./augmentations.js";
 import { elementAccessReferences } from "./element-access.js";
@@ -20,6 +20,8 @@ import { typeParameterReads } from "./type-parameter-reads.js";
 import { typeQueryAliases } from "./type-query-alias.js";
 import { computedKeyNames, iterationReferences, keyNameOf, keyedUses, } from "./symbol-keys.js";
 import { handedOn, valuesOf } from "./value-flow.js";
+import { bytewise } from "./text/compare.js";
+import { globExpression } from "./text/glob.js";
 /**
  * The operators whose left side one assignment stores into. A compound assignment is
  * among them: where its value is discarded it reads its target only to write the result
@@ -77,14 +79,6 @@ function valueDiscarded(node) {
 function isName(node) {
     return node.kind === SyntaxKind.Identifier || node.kind === SyntaxKind.PrivateIdentifier;
 }
-/** The expression one node is, through however many parentheses are written around it. */
-function unparenthesized(node) {
-    let held = node;
-    while (isParenthesizedExpression(held)) {
-        held = held.expression;
-    }
-    return held;
-}
 /**
  * Records the name one store writes into.
  *
@@ -94,7 +88,7 @@ function unparenthesized(node) {
  * target writes each name it binds, through its spreads and nested patterns.
  */
 function markWrite(target, writes, accesses) {
-    const held = unparenthesized(target);
+    const held = parenthesesRemoved(target);
     if (isName(held)) {
         writes.add(held.pos);
         return;
@@ -109,7 +103,7 @@ function markWrite(target, writes, accesses) {
         accesses.add(held);
         // A store through a member's value lands in storage every holder of the value
         // reads, so it reads the member; a variable only ever stored into stays written.
-        if (!isPropertyAccessExpression(unparenthesized(held.expression))) {
+        if (!isPropertyAccessExpression(parenthesesRemoved(held.expression))) {
             markWrite(held.expression, writes, accesses);
         }
         return;
@@ -181,7 +175,7 @@ function markStores(node, writes, reads, accesses) {
 }
 /** Whether one node is `import.meta.url`. */
 function isImportMetaURL(node) {
-    const at = unparenthesized(node);
+    const at = parenthesesRemoved(node);
     return (isPropertyAccessExpression(at) &&
         isMetaProperty(at.expression) &&
         at.expression.keywordToken === SyntaxKind.ImportKeyword &&
@@ -190,7 +184,7 @@ function isImportMetaURL(node) {
 /** The module URL one node builds, where it builds one. */
 function moduleURLOf(node) {
     const relative = (argument) => {
-        const at = argument === undefined ? undefined : unparenthesized(argument);
+        const at = argument === undefined ? undefined : parenthesesRemoved(argument);
         return at !== undefined &&
             (isStringLiteral(at) || isNoSubstitutionTemplateLiteral(at)) &&
             /^\.\.?\//u.test(at.text)
@@ -205,7 +199,7 @@ function moduleURLOf(node) {
             : undefined;
     }
     if (isCallExpression(node)) {
-        const callee = unparenthesized(node.expression);
+        const callee = parenthesesRemoved(node.expression);
         const specifier = relative(node.arguments[0]);
         if (specifier !== undefined &&
             isPropertyAccessExpression(callee) &&
@@ -490,7 +484,7 @@ export function testFileRulesOf(testFiles, paths, supportFiles = []) {
             };
         }),
         ...(support === 0 ? [] : [{ rule: TEST_SUPPORT_RULE, matched: support }]),
-    ].sort((a, b) => compare(a.rule, b.rule));
+    ].sort((a, b) => bytewise(a.rule, b.rule));
 }
 const importedCache = new WeakMap();
 /**
@@ -609,20 +603,13 @@ function aloneIn(file, uses, writes, found) {
             .filter(([, nodes]) => nodes.some((node) => inside(node, write.value)) &&
             nodes.every((node) => sameTarget.some((one) => inside(node, one.value))))
             .map(([name]) => name)
-            .sort(compare);
+            .sort(bytewise);
         if (names.length > 0) {
             result.push({ index: write.index, names });
         }
     }
     return result;
 }
-/** Two strings ordered bytewise, which is the order every set of a run is read in. */
-function compare(a, b) {
-    if (a === b) {
-        return 0;
-    }
-    return a < b ? -1 : 1;
-}
 /**
  * Every reference one project's own files make to the project's own declarations, in
  * position order, and the files the test-file rules classified.
@@ -1192,14 +1179,14 @@ export function references(project, held, targetRoot, options) {
     const scripts = new Set(walked.filter((one) => one.file.externalModuleIndicator === undefined).map((one) => one.fileId));
     found.push(...augmentationReferences(held, found, scripts, libraryMerged(scripts)));
     found.sort((a, b) => byPosition(a.position, b.position) ||
-        compare(a.to, b.to) ||
-        compare(a.from, b.from) ||
-        compare(a.use, b.use));
+        bytewise(a.to, b.to) ||
+        bytewise(a.from, b.from) ||
+        bytewise(a.use, b.use));
     return {
         references: consumer === undefined
             ? found
             : found.map((reference) => ({ ...reference, consumer: consumer.id })),
-        testFilePaths: tests.sort(compare),
+        testFilePaths: tests.sort(bytewise),
         cost: {
             batched,
             fileBatches,

package/dist/src/report-schema.js

@@ -6,6 +6,8 @@
  * ECMAScript.
  */
 import { REPORT_SCHEMAS } from "./contract/report.generated.js";
+import { bytewise } from "./text/compare.js";
+import { isRecord } from "./json-document.js";
 /**
  * Every keyword the validator evaluates or knows to carry no assertion. A schema naming
  * another fails every check rather than passing values the keyword would refuse.
@@ -26,9 +28,6 @@ function pattern(source) {
     }
     return held;
 }
-function isObject(value) {
-    return value !== null && typeof value === "object" && !Array.isArray(value);
-}
 function typeOf(value) {
     if (value === null) {
         return "null";
@@ -50,9 +49,9 @@ function canonical(value) {
     if (Array.isArray(value)) {
         return `[${value.map(canonical).join(",")}]`;
     }
-    if (isObject(value)) {
+    if (isRecord(value)) {
         return `{${Object.keys(value)
-            .sort()
+            .sort(bytewise)
             .map((key) => `${JSON.stringify(key)}:${canonical(value[key])}`)
             .join(",")}}`;
     }
@@ -78,11 +77,11 @@ class Checker {
         const target = file === "" ? doc : file;
         let schema = this.documents[target];
         for (const token of pointer.split("/").filter((one) => one !== "")) {
-            schema = isObject(schema)
+            schema = isRecord(schema)
                 ? schema[token.replaceAll("~1", "/").replaceAll("~0", "~")]
                 : undefined;
         }
-        if (!isObject(schema)) {
+        if (!isRecord(schema)) {
             throw new Error(`report schema: ${ref} names no schema`);
         }
         return [target, schema];
@@ -115,7 +114,7 @@ class Checker {
         if (Array.isArray(value)) {
             this.checkArray(doc, schema, value, at, found, refuse);
         }
-        else if (isObject(value)) {
+        else if (isRecord(value)) {
             this.checkObject(doc, schema, value, at, found, refuse);
         }
         this.checkApplicators(doc, schema, value, at, found, refuse);
@@ -146,18 +145,18 @@ class Checker {
         }
     }
     checkObject(doc, schema, value, at, found, refuse) {
-        const properties = isObject(schema["properties"]) ? schema["properties"] : {};
+        const properties = isRecord(schema["properties"]) ? schema["properties"] : {};
         const additional = schema["additionalProperties"];
-        for (const name of Object.keys(value).sort()) {
+        for (const name of Object.keys(value).sort(bytewise)) {
             const member = `${at}/${escape(name)}`;
             const declared = properties[name];
-            if (isObject(declared)) {
+            if (isRecord(declared)) {
                 this.check(doc, declared, value[name], member, found);
             }
             else if (additional === false) {
                 refuse("additionalProperties", `the member ${JSON.stringify(name)} is not one the schema declares`);
             }
-            else if (isObject(additional)) {
+            else if (isRecord(additional)) {
                 this.check(doc, additional, value[name], member, found);
             }
         }
@@ -173,7 +172,7 @@ class Checker {
     }
     checkArray(doc, schema, value, at, found, refuse) {
         const items = schema["items"];
-        if (isObject(items)) {
+        if (isRecord(items)) {
             value.forEach((item, i) => {
                 this.check(doc, items, item, `${at}/${String(i)}`, found);
             });
@@ -200,12 +199,12 @@ class Checker {
         if (schema["oneOf"] !== undefined && matching("oneOf") !== 1) {
             refuse("oneOf", `the value matches ${String(matching("oneOf"))} of the alternatives, want exactly one`);
         }
-        if (isObject(schema["not"]) && this.matches(doc, schema["not"], value, at)) {
+        if (isRecord(schema["not"]) && this.matches(doc, schema["not"], value, at)) {
             refuse("not", "the value matches a schema it must not match");
         }
-        if (isObject(schema["if"])) {
+        if (isRecord(schema["if"])) {
             const branch = this.matches(doc, schema["if"], value, at) ? schema["then"] : schema["else"];
-            if (isObject(branch)) {
+            if (isRecord(branch)) {
                 this.check(doc, branch, value, at, found);
             }
         }

package/dist/src/report.js

@@ -4,10 +4,8 @@
  * renders this document, so no two renderings disagree about which findings exist.
  */
 import { SCHEMA_VERSION, SCHEMA_VERSIONS } from "./contract/contract.generated.js";
-/** The name this analyzer writes every document under and mints every identifier with. */
-export const ANALYZER_NAME = "deadset-ts";
-/** The language this analyzer claims. */
-export const LANGUAGE = "ts";
+import { bytewise } from "./text/compare.js";
+import { LANGUAGE, PRODUCT } from "./product.js";
 /**
  * Each component the findings name, once, with the members the first finding naming it
  * carries, in the order the findings are: `findings` paired with their wire forms and
@@ -26,13 +24,6 @@ function componentsOf(findings) {
     }
     return [...listed.values()];
 }
-/** Two strings ordered bytewise. */
-function compare(a, b) {
-    if (a === b) {
-        return 0;
-    }
-    return a < b ? -1 : 1;
-}
 function wirePosition(position) {
     return {
         path: position.path,
@@ -140,19 +131,19 @@ function wireStale(stale) {
 }
 /** The canonical key over two findings: path, line, column, code, then the symbol reference. */
 function canonical(a, b) {
-    return (compare(a.position.path, b.position.path) ||
+    return (bytewise(a.position.path, b.position.path) ||
         a.position.line - b.position.line ||
         a.position.column - b.position.column ||
-        compare(a.code, b.code) ||
-        compare(a.symbol.ref, b.symbol.ref));
+        bytewise(a.code, b.code) ||
+        bytewise(a.symbol.ref, b.symbol.ref));
 }
 /** The canonical key over two stale suppressions, each component from the record's own member. */
 function canonicalStale(a, b) {
-    return (compare(a.position.path, b.position.path) ||
+    return (bytewise(a.position.path, b.position.path) ||
         a.position.line - b.position.line ||
         a.position.column - b.position.column ||
-        compare(a.code, b.code) ||
-        compare(a.symbol, b.symbol));
+        bytewise(a.code, b.code) ||
+        bytewise(a.symbol, b.symbol));
 }
 /** One declared gap as a report carries it, its members in the schema's order. */
 function wireGap(gap) {
@@ -165,9 +156,9 @@ function wireGap(gap) {
 }
 /** Edge evaluations by edge, then side, then their compact encodings. */
 function byEdge(a, b) {
-    return (compare(a.edge, b.edge) ||
-        compare(a.side, b.side) ||
-        compare(JSON.stringify(a), JSON.stringify(b)));
+    return (bytewise(a.edge, b.edge) ||
+        bytewise(a.side, b.side) ||
+        bytewise(JSON.stringify(a), JSON.stringify(b)));
 }
 /**
  * The lines a reader deletes by acting on every finding: each distinct component a root
@@ -216,16 +207,16 @@ export function buildReport(input) {
     const findings = paired.map(([wire]) => wire);
     const evaluated = input.result.edgeEvaluations.flatMap((one) => one.finding === undefined ? [] : [[wireFinding(one.finding), one.finding]]);
     const unavailable = [...new Map(input.unavailable.map((one) => [one.id, one])).values()]
-        .sort((a, b) => compare(a.id, b.id))
+        .sort((a, b) => bytewise(a.id, b.id))
         .map((one) => ({ id: one.id, role: "consumer", reason: one.reason }));
     const loaded = [...input.loaded]
-        .sort((a, b) => compare(a.id, b.id) || compare(a.path, b.path))
+        .sort((a, b) => bytewise(a.id, b.id) || bytewise(a.path, b.path))
         .map((one) => ({ id: one.id, role: "consumer", path: one.path }));
     return {
         schema_version: SCHEMA_VERSION,
         contract_version: input.contractVersion,
         analyzer: {
-            name: ANALYZER_NAME,
+            name: PRODUCT,
             version: input.version,
             languages: [LANGUAGE],
             schema_versions_accepted: SCHEMA_VERSIONS,
@@ -237,10 +228,10 @@ export function buildReport(input) {
         },
         target: { kind: input.target.kind, root: input.target.root, identity: input.target.identity },
         configurations: [...input.configurations]
-            .sort((a, b) => compare(a.id, b.id))
+            .sort((a, b) => bytewise(a.id, b.id))
             .map((one) => ({ id: one.id, project: one.project })),
         configurations_not_built: [...input.notBuilt]
-            .sort((a, b) => compare(a.id, b.id))
+            .sort((a, b) => bytewise(a.id, b.id))
             .map((one) => ({ id: one.id, project: one.project, error: one.error })),
         consumers: { declared: loaded.length + unavailable.length, loaded, unavailable },
         findings,
@@ -253,10 +244,10 @@ export function buildReport(input) {
         // name, so the compact encodings alone order them.
         declared_gaps: input.declaredGaps
             .map(wireGap)
-            .sort((a, b) => compare(JSON.stringify(a), JSON.stringify(b))),
+            .sort((a, b) => bytewise(JSON.stringify(a), JSON.stringify(b))),
         excluded_by_cgo: [],
         test_file_rules: [...input.testFileRules]
-            .sort((a, b) => compare(a.rule, b.rule) || a.matched - b.matched)
+            .sort((a, b) => bytewise(a.rule, b.rule) || a.matched - b.matched)
             .map((one) => ({ rule: one.rule, matched: one.matched })),
         type_error_skips: [
             ...new Map(input.typeErrorSkips.map((one) => {
@@ -264,14 +255,14 @@ export function buildReport(input) {
                 return [JSON.stringify(skip), skip];
             })),
         ]
-            .sort(([a, x], [b, y]) => compare(x.path, y.path) || x.line - y.line || compare(a, b))
+            .sort(([a, x], [b, y]) => bytewise(x.path, y.path) || x.line - y.line || bytewise(a, b))
             .map(([, skip]) => skip),
         notes: [...new Map((input.notes ?? []).map((one) => [JSON.stringify(one), one])).entries()]
-            .sort(([a, x], [b, y]) => compare(x.kind, y.kind) || compare(x.path, y.path) || compare(a, b))
+            .sort(([a, x], [b, y]) => bytewise(x.kind, y.kind) || bytewise(x.path, y.path) || bytewise(a, b))
             .map(([, note]) => note),
         unanswered_questions: [...input.unanswered]
-            .sort((a, b) => compare(a.configuration, b.configuration) ||
-            compare(JSON.stringify(a), JSON.stringify(b)))
+            .sort((a, b) => bytewise(a.configuration, b.configuration) ||
+            bytewise(JSON.stringify(a), JSON.stringify(b)))
             .map((one) => ({
             configuration: one.configuration,
             questions: one.questions,

package/dist/src/reporters/sarif.js

@@ -5,6 +5,8 @@ import { lineHashes, symbolFingerprint } from "./fingerprint.js";
 import { RenderError } from "./reporter.js";
 import { utf8Bytes } from "./sha256.js";
 import { withheldLine } from "./text.js";
+import { bytewise } from "../text/compare.js";
+import { message } from "../product.js";
 const SCHEMA = "https://docs.oasis-open.org/sarif/sarif/v2.1.0/errata01/os/schemas/sarif-schema-2.1.0.json";
 const VERSION = "2.1.0";
 /** The unit a finding's column counts. */
@@ -101,7 +103,7 @@ function lineHashCache(read) {
                 text = read(at.path);
             }
             catch (error) {
-                throw new RenderError(`read ${at.path} for its line fingerprint: ${error instanceof Error ? error.message : String(error)}`);
+                throw new RenderError(`read ${at.path} for its line fingerprint: ${message(error)}`);
             }
             hashes = lineHashes(text);
             held.set(at.path, hashes);
@@ -226,7 +228,7 @@ export function sarif(report, options) {
         ...report.findings.map((found) => findingResult(found, index, hashOf, members)),
         ...report.stale_suppressions.map((stale) => staleResult(stale, index, hashOf)),
     ];
-    const languages = [...report.analyzer.languages].sort().join("+");
+    const languages = [...report.analyzer.languages].sort(bytewise).join("+");
     const withheld = withheldLine(report.totals);
     const log = {
         $schema: SCHEMA,

package/dist/src/reporters/template.js

@@ -9,6 +9,7 @@
 import { CHUNK_LENGTH } from "../json-chunks.js";
 import { RenderError } from "./reporter.js";
 import { utf8Bytes } from "./sha256.js";
+import { bytewise } from "../text/compare.js";
 /** A template that does not parse, which refuses the invocation before any analysis. */
 export class TemplateError extends Error {
     constructor(message) {
@@ -513,7 +514,7 @@ function formatted(value, nested) {
     }
     const object = value;
     const entries = Object.keys(object)
-        .sort()
+        .sort(bytewise)
         .map((key) => `${key}:${formatted(object[key] ?? null, true)}`);
     return `map[${entries.join(" ")}]`;
 }
@@ -538,26 +539,10 @@ function compareBasic(name, a, b) {
         return Number.NaN;
     }
     if (kind === "string") {
-        return byCodePoints(a, b);
+        return bytewise(a, b);
     }
     return a < b ? -1 : 1;
 }
-/**
- * Two strings ordered by the bytes of their UTF-8 encodings, which is the order of their
- * code points: the order of their UTF-16 code units differs above U+FFFF.
- */
-function byCodePoints(a, b) {
-    let at = 0;
-    while (at < a.length && at < b.length) {
-        const x = a.codePointAt(at) ?? 0;
-        const y = b.codePointAt(at) ?? 0;
-        if (x !== y) {
-            return x < y ? -1 : 1;
-        }
-        at += x > 0xffff ? 2 : 1;
-    }
-    return a.length - b.length;
-}
 /** The escapes `%q` writes for the control characters that have one of their own. */
 const QUOTED_ESCAPES = {
     '"': '\\"',
@@ -903,7 +888,7 @@ class Execution {
             }
             else if (isObject(value)) {
                 entries = Object.keys(value)
-                    .sort()
+                    .sort(bytewise)
                     .map((key) => [key, value[key] ?? null]);
             }
             else {

package/dist/src/resolve.js

@@ -1,12 +1,15 @@
 import { SEVERITIES, LANGUAGES, CONFIDENCES, FORMATS, FAMILY_KEY_LENGTH, } from "./contract/contract.generated.js";
 import { ConfigError, defaultConfig, } from "./config.js";
 import { CONVENTION_ROWS } from "./convention-rows.js";
+import { EXEMPTION_CLASS_NAMES } from "./exempt-classes.js";
 import { FIXED_SEVERITY_CODES, LIVE_CODES } from "./kinds.js";
 import { checkDocument, malformed, nestFlags, SCHEMA_ROOT, SEVERITY_SECTION, } from "./schema.js";
+import { bytewise } from "./text/compare.js";
+import { isRecord } from "./json-document.js";
+import { message } from "./product.js";
 /** Names the command-line flags in a refusal, where a document is named by its path. */
 const FLAGS_LABEL = "the command-line flags";
 const SEVERITY_KEY = /^DS[0-9]{2}([0-9]{2})?$/u;
-const EXEMPTION_CLASS = /^[a-z][a-z0-9-]*$/u;
 const CONTRACT_VERSION_PATTERN = /^[0-9]+\.[0-9]+\.[0-9]+$/u;
 const ANALYZER_NAME = /^[a-z][a-z0-9]*(-[a-z0-9]+)*$/u;
 const PROVIDER_SOURCE = /^(go|npm):[^ \t\r\n]+$/u;
@@ -43,9 +46,6 @@ function originOf(source, path) {
     }
     return { source: source.kind, label: source.label };
 }
-function isRecord(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 function member(parent, name) {
     if (parent === undefined || !Object.hasOwn(parent, name)) {
         return undefined;
@@ -292,7 +292,7 @@ function unimplementedSeverityKey(label, path, reason) {
  * them all rather than the first one found.
  */
 function fixedByContract(code) {
-    return FIXED_SEVERITY_CODES.filter((candidate) => code === candidate || (code.length === FAMILY_KEY_LENGTH && candidate.startsWith(code))).sort();
+    return FIXED_SEVERITY_CODES.filter((candidate) => code === candidate || (code.length === FAMILY_KEY_LENGTH && candidate.startsWith(code))).sort(bytewise);
 }
 /** The codes a refusal names: one on its own, and several with the last joined by and. */
 function spellCodes(codes) {
@@ -321,7 +321,7 @@ function readSeverity(document, label) {
         return undefined;
     }
     const severity = new Map();
-    for (const code of Object.keys(object).sort()) {
+    for (const code of Object.keys(object).sort(bytewise)) {
         const path = `${SEVERITY_SECTION}.${code}`;
         if (!SEVERITY_KEY.test(code)) {
             throw unimplementedSeverityKey(label, path, "a severity key is one issue-kind code or one two-digit family prefix");
@@ -342,19 +342,10 @@ function readSeverity(document, label) {
     }
     return severity;
 }
-/** The exemption classes named for switching off. */
+/** The exemption classes named for switching off, each one the vocabulary holds. */
 function readExemptions(document, label) {
     const exemptions = section(document, "exemptions", "exemptions", label);
-    const disabled = readStrings(exemptions, "disabled", "exemptions.disabled", label, 0);
-    if (disabled === undefined) {
-        return undefined;
-    }
-    for (const entry of disabled) {
-        if (!EXEMPTION_CLASS.test(entry)) {
-            throw malformed(label, "exemptions.disabled", `${JSON.stringify(entry)} is not an exemption class name`);
-        }
-    }
-    return disabled;
+    return readStrings(exemptions, "disabled", "exemptions.disabled", label, 0, EXEMPTION_CLASS_NAMES);
 }
 /** The members that name a declaration, each belonging to exactly one shape. */
 const SHAPE_MEMBERS = ["symbol", "module", "name", "global"];
@@ -572,7 +563,7 @@ function parseDocument(text, node, label) {
         value = JSON.parse(text);
     }
     catch (error) {
-        throw malformed(label, "", error instanceof Error ? error.message : String(error));
+        throw malformed(label, "", message(error));
     }
     checkDocument(text, node, label);
     return value;
@@ -656,7 +647,7 @@ function settleSeverity(provenance, sources) {
         }
     }
     const severity = new Map();
-    for (const code of [...codes].sort()) {
+    for (const code of [...codes].sort(bytewise)) {
         const path = `${SEVERITY_SECTION}.${code}`;
         for (const source of sources) {
             const value = source.doc.severity?.get(code);
@@ -692,7 +683,7 @@ function describeSource(named, text, label) {
  * print a provenance value the closed key list refuses to read back.
  */
 function checkLabels(provenance) {
-    for (const path of [...provenance.keys()].sort()) {
+    for (const path of [...provenance.keys()].sort(bytewise)) {
         const origin = provenance.get(path);
         if (origin !== undefined && origin.source !== "default" && origin.label === "") {
             throw malformed(origin.source === "flag" ? FLAGS_LABEL : origin.source, path, `came from ${origin.source}, which names no file or flag`);

package/dist/src/roots.js

@@ -13,13 +13,15 @@ import { isGlobalBlock } from "./augmentations.js";
 import { filesNamedBy, outsideChain, relativeSpecifiers, } from "./configuration-files.js";
 import { conventionEntries } from "./conventions.js";
 import { entryPoints } from "./entry-points.js";
-import { globExpression } from "./glob.js";
 import { nodeKey } from "./inventory.js";
-import { dirnamePath, joinPath, relativePath, resolvePath } from "./paths.js";
+import { ancestors, dirnamePath, relativePath, resolvePath } from "./paths.js";
 import { byPosition } from "./position.js";
 import { UNANSWERED } from "./query.js";
 import { sourceFilesOf } from "./source-files.js";
 import { typeQueryAliases } from "./type-query-alias.js";
+import { bytewise } from "./text/compare.js";
+import { holdsManifest } from "./fs/manifest.js";
+import { globExpression } from "./text/glob.js";
 /** Whether one declaration is written below the directory of a published workspace member. */
 function inPublishedMember(held, id, root, members) {
     const path = held.symbols.find((symbol) => symbol.id === id)?.position.path;
@@ -47,13 +49,8 @@ const OUTPUT_EXTENSION = /\.(?:d\.ts|d\.mts|d\.cts|js|mjs|cjs|jsx)$/u;
 const SOURCE_EXTENSION = /\.(?:d\.)?[cm]?[jt]sx?$/u;
 /** Whether no `package.json` sits between one file and the manifest's directory, which holds it. */
 function ofPackage(host, dir, file) {
-    for (let at = dirnamePath(file); at !== dir; at = dirnamePath(at)) {
-        if (relativePath(dir, at) === undefined ||
-            host.kindOf(joinPath(at, "package.json")) === "file") {
-            return false;
-        }
-    }
-    return true;
+    const between = ancestors(dirnamePath(file), dir);
+    return between.length > 0 && !between.slice(0, -1).some((at) => holdsManifest(host, at));
 }
 /**
  * The rooted files one manifest target reads back to by name: its path below the
@@ -163,13 +160,6 @@ export function matchRef(pattern, ref) {
     }
     return matchGlob(Array.from(pattern), Array.from(ref));
 }
-/** Two strings ordered bytewise, which is the order every set of a run is read in. */
-function compare(a, b) {
-    if (a === b) {
-        return 0;
-    }
-    return a < b ? -1 : 1;
-}
 /** The members of one declaration, indexed by the container that holds them. */
 function childrenOf(held) {
     const byParent = new Map();
@@ -344,7 +334,7 @@ export function roots(project, held, targetRoot, options) {
         const left = sites.get(a.id);
         const right = sites.get(b.id);
         const site = left === undefined || right === undefined ? 0 : byPosition(left, right);
-        return site || compare(a.kind, b.kind) || compare(a.source, b.source);
+        return site || bytewise(a.kind, b.kind) || bytewise(a.source, b.source);
     });
     return {
         liveUnderReachability: ordered,

package/dist/src/run.js

@@ -14,6 +14,7 @@ import { describeVerb } from "./verbs/describe.js";
 import { EXPLAIN_OPTIONS, explainVerb } from "./verbs/explain.js";
 import {} from "./verbs/verb.js";
 import { versionVerb } from "./verbs/version.js";
+import { diagnose, message, PRODUCT } from "./product.js";
 /** Every verb this command answers, in the order the usage text lists them. */
 const VERBS = [
     { name: "analyze", run: analyzeVerb, options: ANALYZE_OPTIONS },
@@ -25,7 +26,7 @@ const VERBS = [
     { name: "describe", run: describeVerb },
     { name: "version", run: versionVerb },
 ];
-const USAGE = `usage: deadset-ts <verb> [options]\nverbs: ${VERBS.map((verb) => verb.name).join(", ")}\n`;
+const USAGE = `usage: ${PRODUCT} <verb> [options]\nverbs: ${VERBS.map((verb) => verb.name).join(", ")}\n`;
 /**
  * The tokens whose presence in an option's name makes that option a request to
  * edit a source file. The set is closed, and a token is matched in any position of
@@ -109,7 +110,7 @@ function readFileOr(host, path, orUndefined) {
         if (orUndefined) {
             return undefined;
         }
-        throw new ConfigError("malformed", "", `${path}: ${error instanceof Error ? error.message : String(error)}`);
+        throw new ConfigError("malformed", "", `${path}: ${message(error)}`);
     }
 }
 /**
@@ -162,7 +163,7 @@ function scopeOf(host, options) {
 export function run(args, out, err, host, openClient = openEngine) {
     const editing = sourceEditOption(args);
     if (editing !== undefined) {
-        err.write(`deadset-ts: ${editing} is not supported: deadset-ts reports and never edits a source file\n`);
+        diagnose(err, `${editing} is not supported: ${PRODUCT} reports and never edits a source file`);
         err.write(USAGE);
         return EXIT_USAGE;
     }
@@ -172,7 +173,7 @@ export function run(args, out, err, host, openClient = openEngine) {
         return invoke(verb.run, verb.options ?? NO_OPTIONS, args.slice(1), { out, err, host }, openClient);
     }
     if (name !== undefined) {
-        err.write(`deadset-ts: unknown verb ${JSON.stringify(name)}\n`);
+        diagnose(err, `unknown verb ${JSON.stringify(name)}`);
     }
     err.write(USAGE);
     return EXIT_USAGE;
@@ -211,7 +212,7 @@ function invoke(verb, own, args, streams, openClient) {
 /** Turns one refusal into the exit code the Contract's table gives it. */
 function refuse(error, err) {
     if (error instanceof ConfigError) {
-        err.write(`deadset-ts: ${error.message}\n`);
+        diagnose(err, error.message);
         err.write(USAGE);
         return EXIT_USAGE;
     }
@@ -219,7 +220,7 @@ function refuse(error, err) {
         for (const diagnostic of error.diagnostics) {
             err.write(`${renderDiagnostic(diagnostic)}\n`);
         }
-        err.write(`deadset-ts: ${error.message}\n`);
+        diagnose(err, error.message);
         return EXIT_FAILURE;
     }
     if (error instanceof SetupError) {
@@ -229,7 +230,7 @@ function refuse(error, err) {
         return EXIT_FAILURE;
     }
     if (error instanceof ScopeError) {
-        err.write(`deadset-ts: ${error.message}\n`);
+        diagnose(err, error.message);
         return EXIT_FAILURE;
     }
     throw error;