@cplieger/deadset-ts 7.2.0-dev.4 → 8.0.0-dev.10

package/dist/src/session.js

@@ -1,8 +1,18 @@
 import { API, SymbolFlags } from "@typescript/native/sync";
 import { componentLayer, mapperManifest } from "./component-layer.js";
-import { DiscoveryError } from "./discover.js";
 import { joinPath } from "./paths.js";
 import { queriesOf, UnansweredLog, } from "./query.js";
+import { MANIFEST } from "./fs/manifest.js";
+/** The most questions one round trip carries. */
+const BATCH = 2048;
+/** Asks one question of every item, in round trips of at most {@link BATCH}, answers in order. */
+export function batched(engine, items, question) {
+    const answers = [];
+    for (let at = 0; at < items.length; at += BATCH) {
+        answers.push(...engine.batch(items.slice(at, at + BATCH).map(question)));
+    }
+    return answers;
+}
 /**
  * Opens the compiler client the analysis reads through.
  *
@@ -16,7 +26,7 @@ export function openEngine(options) {
     if (components !== undefined && components.extensions.length > 0) {
         const made = components.host.temporaryDirectory();
         try {
-            components.host.writeDocument(joinPath(made.path, "package.json"), [
+            components.host.writeDocument(joinPath(made.path, MANIFEST), [
                 mapperManifest(components.host.componentMapperCommand()),
             ]);
         }
@@ -31,6 +41,7 @@ export function openEngine(options) {
         ...(mapper === undefined ? {} : { runExternalCode: true }),
     });
     let closed = false;
+    const parsed = new Map();
     return {
         parseConfigFile: (file) => api.parseConfigFile(file),
         parseConfigJson: (json, configFile) => api.parseJsonConfigFileContent(json, { configFileName: configFile }),
@@ -54,8 +65,14 @@ export function openEngine(options) {
             moduleResolutions: { fallback: "resolve", entries: [...entries] },
         }),
         parseSourceFile: (fileName, text) => {
+            // Every project of a run reads the same files outside its program, so one parse serves all.
+            const known = parsed.get(fileName);
+            if (known?.text === text) {
+                return known.file;
+            }
             const retained = api.createSourceFile(fileName, text);
             try {
+                parsed.set(fileName, { text, file: retained.sourceFile });
                 return retained.sourceFile;
             }
             finally {
@@ -245,14 +262,13 @@ function projectsOf(snapshot, built, written) {
     return opened;
 }
 /**
- * Runs `visit` over every project the compiler configurations name, inside one never updated
- * snapshot of one client, and answers in their order. A configuration `programs` describes is
- * built as that program, or opened from the configuration it writes. One the snapshot holds
- * nothing for ends the run under `"refuse"` and is named in the result under `"record"`.
- * `first` runs over every opened project before the first visit and `last` after the last,
- * both while the client answers; the snapshot and the client are then released.
+ * Opens every project the compiler configurations name in one never updated snapshot of one
+ * client, and hands them to `use` while the client answers; the snapshot and the client are
+ * then released. A configuration `options.programs` describes is built as that program, or
+ * opened from the configuration it writes. One the snapshot holds nothing for has no view.
  */
-export function runSession(engine, configFiles, visit, unopened = "refuse", programs = new Map(), last = () => undefined, first = () => undefined) {
+export function openSession(engine, configFiles, options, use) {
+    const programs = options.programs ?? new Map();
     try {
         const built = [];
         const params = [];
@@ -274,30 +290,13 @@ export function runSession(engine, configFiles, visit, unopened = "refuse", prog
             const opened = projectsOf(snapshot, built, written);
             const log = new UnansweredLog();
             const views = [];
-            const missing = [];
             for (const configFile of configFiles) {
                 const project = opened.get(configFile);
-                if (project === undefined) {
-                    if (unopened === "refuse") {
-                        throw new DiscoveryError(`${configFile} opened no project`, []);
-                    }
-                    missing.push(configFile);
-                    continue;
+                if (project !== undefined) {
+                    views.push(viewOf(project, configFile, engine, log));
                 }
-                views.push(viewOf(project, configFile, engine, log));
             }
-            first(views.map((view) => ({
-                configFile: view.configFile,
-                fileNames: () => view.ownSourceFiles().map((file) => file.fileName),
-            })));
-            const projects = views.map((view) => visit(view));
-            last();
-            return {
-                projects,
-                unopened: missing,
-                timing: engine.getTimingInfo(),
-                unanswered: log.questions,
-            };
+            return use({ views }, () => log.questions);
         }
         finally {
             snapshot.dispose();
@@ -307,3 +306,16 @@ export function runSession(engine, configFiles, visit, unopened = "refuse", prog
         engine.close();
     }
 }
+/**
+ * Runs `visit` over the project {@link openSession} opens for each configuration, and answers
+ * in their order; a configuration the snapshot opens nothing for throws before any visit.
+ */
+export function runSession(engine, configFiles, visit) {
+    return openSession(engine, configFiles, {}, (opened) => {
+        const unopened = configFiles.find((configFile) => !opened.views.some((view) => view.configFile === configFile));
+        if (unopened !== undefined) {
+            throw new Error(`${unopened} opened no project`);
+        }
+        return { projects: opened.views.map((view) => visit(view)), timing: engine.getTimingInfo() };
+    });
+}

package/dist/src/source-files.js

@@ -3,10 +3,14 @@
  * in a document or a string names one: as the file itself, or as a file the
  * compiler emits from it.
  */
-import { commonDirectory, emittedFrom } from "./emit-map.js";
-import { dirnamePath, relativePath, resolvePath } from "./paths.js";
+import { commonDirectory, emittedFrom } from "./load/emit-map.js";
+import { dirnamePath, joinPath, relativePath, resolvePath } from "./paths.js";
 /** The one character a subpath pattern of a manifest's `exports` holds. */
 const SUBPATH_WILDCARD = "*";
+/** The extension a source file's name drops when the project writes it out. */
+const SOURCE_EXTENSION = /\.[cm]?[jt]sx?$/u;
+/** The extensions the project may write a source file's output under. */
+const OUTPUT_EXTENSIONS = [".js", ".mjs", ".cjs", ".jsx", ".d.ts", ".d.mts", ".d.cts"];
 /**
  * Whether one path is what a subpath pattern stands for: the text before the
  * wildcard, any run of characters including the solidus, then the text after it.
@@ -17,6 +21,27 @@ function matchesSubpath(pattern, path) {
     const after = pattern.slice(at + SUBPATH_WILDCARD.length);
     return (path.length >= before.length + after.length && path.startsWith(before) && path.endsWith(after));
 }
+/** The first own file of the paths given that the project holds, or none. */
+function heldAt(byName, paths) {
+    for (const candidate of paths) {
+        const file = byName.get(candidate);
+        if (file !== undefined) {
+            return [file];
+        }
+    }
+    return [];
+}
+/** Where one project writes its output, and the directory it writes it from, absolute. */
+function layoutOf(project, fileNames) {
+    const options = project.program.getCompilerOptions();
+    const configDir = dirnamePath(project.configFile);
+    const at = (option) => option === undefined ? undefined : resolvePath(configDir, option);
+    return {
+        outDir: at(options.outDir),
+        declarationDir: at(options.declarationDir),
+        sourceDir: at(options.rootDir) ?? commonDirectory(fileNames),
+    };
+}
 /**
  * The lookups over one project's own files.
  *
@@ -36,12 +61,7 @@ export function sourceFilesOf(project, targetRoot) {
             byPath.set(path, file);
         }
     }
-    const options = project.program.getCompilerOptions();
-    const configDir = dirnamePath(project.configFile);
-    const at = (option) => option === undefined ? undefined : resolvePath(configDir, option);
-    const outDir = at(options.outDir);
-    const declarationDir = at(options.declarationDir);
-    const sourceDir = at(options.rootDir) ?? commonDirectory([...byName.keys()]);
+    const { outDir, declarationDir, sourceDir } = layoutOf(project, [...byName.keys()]);
     const layout = { outDir, declarationDir, sourceDirs: [sourceDir] };
     /** The source paths one written path may stand for, the path itself first. */
     const candidates = (path) => [path, ...emittedFrom(path, layout)];
@@ -49,15 +69,20 @@ export function sourceFilesOf(project, targetRoot) {
         byPath,
         byName,
         outputDirs: [...new Set([outDir, declarationDir])].filter((dir) => dir !== undefined),
+        writtenAs: (file) => {
+            const below = relativePath(sourceDir, file.fileName);
+            if (below === undefined) {
+                return [];
+            }
+            const written = [outDir, declarationDir].flatMap((dir) => dir === undefined
+                ? []
+                : OUTPUT_EXTENSIONS.map((extension) => joinPath(dir, below.replace(SOURCE_EXTENSION, extension))));
+            return [...new Set(written)].filter((path) => heldAt(byName, candidates(path))[0] === file);
+        },
+        namedAsOutput: (outputDir, path) => heldAt(byName, emittedFrom(path, { outDir: outputDir, sourceDirs: [sourceDir] })),
         named: (path) => {
             if (!path.includes(SUBPATH_WILDCARD)) {
-                for (const candidate of candidates(path)) {
-                    const held = byName.get(candidate);
-                    if (held !== undefined) {
-                        return [held];
-                    }
-                }
-                return [];
+                return heldAt(byName, candidates(path));
             }
             const patterns = candidates(path).filter((candidate) => candidate.includes(SUBPATH_WILDCARD));
             return [...byName.values()].filter((file) => patterns.some((pattern) => matchesSubpath(pattern, file.fileName)));

package/dist/src/suppress-file.js

@@ -4,11 +4,13 @@
  * one record shape, so one decoder and one matcher serve both, and a row moves into the
  * ignore file by gaining a maintainer's reason.
  */
+import { CODE } from "./contract/contract.generated.js";
+import { readTargetDocument } from "./fs/document.js";
 import { jsonChunks } from "./json-chunks.js";
-import { joinPath } from "./paths.js";
-import { positionAt, walkDocument } from "./json-document.js";
+import { isRecord, positionAt, readStrict, StrictJSONError } from "./json-document.js";
 import { declarationKey } from "./ref.js";
-import { CODE_FORM, SUPPRESSION_WITHOUT_REASON, SuppressionError, UNSCOPED_ENTRY, blankReason, isEntryPath, isSymbolRef, siteText, } from "./suppress.js";
+import { CODE_FORM, SuppressionError, blankReason, isEntryPath, isPartKind, isSymbolRef, siteText, } from "./suppress.js";
+import { message } from "./product.js";
 /** The name and the location the grammar fixes for the ignore file. */
 export const IGNORE_FILE = "deadset-ignore.json";
 /** The name and the location the grammar fixes for the baseline. */
@@ -42,9 +44,6 @@ const PATH_WANT = "a path relative to the target root, with the solidus as separ
 function documentSite(shape) {
     return { path: shape.file, line: 0, column: 0 };
 }
-function isObject(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 /**
  * Reads one entry or row: the records it binds, the refusals it carries, or the
  * malformed value that ends the run.
@@ -53,7 +52,7 @@ function readRecord(value, site, byReference, shape) {
     const refuse = (text, want) => {
         throw new SuppressionError(shape.mechanism, siteText(site), text, want);
     };
-    if (!isObject(value)) {
+    if (!isRecord(value)) {
         return refuse(JSON.stringify(value), shape.recordWant);
     }
     for (const [key, held] of Object.entries(value)) {
@@ -99,20 +98,28 @@ function readRecord(value, site, byReference, shape) {
     };
     const refusals = [];
     if (blankReason(reason)) {
-        refusals.push({ ...written, reported: SUPPRESSION_WITHOUT_REASON });
+        refusals.push({ ...written, reported: CODE.suppressionWithoutReason });
     }
     if (written.path === "") {
-        refusals.push({ ...written, reported: UNSCOPED_ENTRY });
+        refusals.push({ ...written, reported: CODE.unscopedIgnoreEntry });
     }
     if (refusals.length > 0) {
         return { records: [], refusals };
     }
-    const named = byReference.get(declarationKey(symbol, written.path)) ?? [];
+    const named = byReference.get(declarationKey(symbol, written.path)) ??
+        (isPartKind(code)
+            ? byReference.get(declarationKey(parameterHolder(symbol), written.path))
+            : undefined) ??
+        [];
     if (named.length === 0) {
         return { records: [{ ...written, bound: "" }], refusals: [] };
     }
     return { records: named.map((one) => ({ ...written, bound: one.id })), refusals: [] };
 }
+/** The reference of the declaration a parameter's reference names it under, or `ref` itself. */
+function parameterHolder(ref) {
+    return ref.endsWith(")") ? ref.slice(0, ref.lastIndexOf("(")) : ref;
+}
 function byReferenceOf(symbols) {
     const byReference = new Map();
     for (const symbol of symbols) {
@@ -123,28 +130,27 @@ function byReferenceOf(symbols) {
 }
 /** Reads one document at the target root, binding each record against the run's declarations. */
 function readDocument(host, targetRoot, symbols, shape) {
-    const file = joinPath(targetRoot, shape.file);
-    if (host.kindOf(file) === "absent") {
+    const text = readTargetDocument(host, targetRoot, shape.file);
+    if (text === undefined) {
         return { records: [], refusals: [] };
     }
-    const text = host.readFile(file);
     const malformed = (detail, site = documentSite(shape)) => {
         throw new SuppressionError(shape.mechanism, siteText(site), detail, shape.documentWant);
     };
-    let parsed;
+    let document;
     try {
-        parsed = JSON.parse(text);
+        document = readStrict(text, shape.array);
     }
     catch (error) {
-        return malformed(`${shape.file}: ${error instanceof Error ? error.message : String(error)}`);
+        if (!(error instanceof StrictJSONError)) {
+            throw error;
+        }
+        return malformed(error.message, positionAt(text, shape.file, error.offset));
     }
-    if (!isObject(parsed)) {
+    const parsed = document.value;
+    if (!isRecord(parsed)) {
         return malformed(shape.file);
     }
-    const walk = walkDocument(text, shape.array);
-    if (walk.twice !== undefined) {
-        malformed(`the member ${JSON.stringify(walk.twice.name)} is written twice, so neither value is chosen`, positionAt(text, shape.file, walk.twice.offset));
-    }
     for (const key of Object.keys(parsed)) {
         if (key !== "description" && key !== shape.array) {
             malformed(`the member ${JSON.stringify(key)} is not one the grammar declares`);
@@ -159,7 +165,7 @@ function readDocument(host, targetRoot, symbols, shape) {
     const records = [];
     const refusals = [];
     held.forEach((value, index) => {
-        const offset = walk.starts[index];
+        const offset = document.starts.get(index);
         const site = offset === undefined ? documentSite(shape) : positionAt(text, shape.file, offset);
         const read = readRecord(value, site, byReference, shape);
         records.push(...read.records);
@@ -219,9 +225,9 @@ export function otherSchemeRows(text, own = OWN_SCHEME) {
         parsed = JSON.parse(text);
     }
     catch (error) {
-        return refuse(error instanceof Error ? error.message : String(error));
+        return refuse(message(error));
     }
-    const held = isObject(parsed) ? parsed[BASELINE_SHAPE.array] : undefined;
+    const held = isRecord(parsed) ? parsed[BASELINE_SHAPE.array] : undefined;
     if (!Array.isArray(held)) {
         return refuse(BASELINE_SHAPE.documentWant);
     }
@@ -230,7 +236,7 @@ export function otherSchemeRows(text, own = OWN_SCHEME) {
             readRecord(value, documentSite(BASELINE_SHAPE), new Map(), BASELINE_SHAPE);
         }
         catch (error) {
-            return refuse(error instanceof Error ? error.message : String(error));
+            return refuse(message(error));
         }
         // readRecord has checked every member is a string and the code and symbol are present.
         const { code, symbol, path, reason } = value;
@@ -271,10 +277,9 @@ function* separatorsEscaped(pieces) {
  * A baseline holding one row per finding, in the order given, which is the report's, and
  * the other language's rows `kept`, Go's rows ahead of TypeScript's and each scheme's in
  * the order given, so two analyzers writing one document in either order write the same
- * bytes, in the form grammar/suppression.md fixes. Every recorded row carries the
- * provenance as its reason. A finding
- * missing a value a row needs, and an identity missing its name or version, are refused
- * rather than written, because the grammar requires a reason on every row.
+ * bytes, in the form grammar/suppression.md fixes. Every row carries the provenance as
+ * its reason, so a finding missing a value a row needs, or an identity missing its name
+ * or version, is refused rather than written.
  */
 export function writeBaseline(findings, provenance, kept = []) {
     if (provenance.analyzer === "" || provenance.version === "") {

package/dist/src/suppress-inline.js

@@ -3,11 +3,14 @@
  * one or more codes and a reason, and binding to every declaration that begins on the line
  * below it, or on its own line where it trails a token there.
  */
+import { CODE } from "./contract/contract.generated.js";
 import { isConstructorDeclaration, SyntaxKind, } from "@typescript/native/ast";
+import { importBindings } from "./import-bindings.js";
 import { isParameterProperty, nodeKey } from "./inventory.js";
 import { byPosition, positionKey, renderPosition } from "./position.js";
+import { importRef } from "./ref.js";
 import { signatureOf } from "./signatures.js";
-import { isPartKind, SUPPRESSION_WITHOUT_REASON, SuppressionError, siteText, } from "./suppress.js";
+import { isPartKind, SuppressionError, siteText, } from "./suppress.js";
 /**
  * The three expressions the grammar applies to the text of each line comment, in this
  * order: a comment in the namespace, a well-formed directive, and a directive that lacks
@@ -144,7 +147,7 @@ function bindingKey(one) {
  * function also begins, for a directive, on the line of each of its parameters, and a
  * class, for a part kind, on the lines of its constructor and its constructor's parameters.
  */
-function declarationLines(file, held, symbols) {
+function declarationLines(file, held, symbols, targetRoot) {
     const below = new Map();
     const add = (offset, one) => {
         const line = file.getLineAndCharacterOfPosition(tokenStart(file.text, offset)).line + 1;
@@ -186,6 +189,20 @@ function declarationLines(file, held, symbols) {
         node.forEachChild(visit);
     };
     file.forEachChild(visit);
+    // An import binding is a subject of its own, bound on its line as a declaration is.
+    const fileId = held.declarations.get(nodeKey(file, file));
+    const moduleRef = held.symbols.find((symbol) => symbol.id === fileId)?.ref ?? "";
+    for (const name of moduleRef === "" ? [] : importBindings(file)) {
+        const position = renderPosition(file, targetRoot, name.getStart());
+        const one = { id: positionKey(position), ref: importRef(moduleRef, name.text), position };
+        let statement = name;
+        while (statement.parent.kind !== SyntaxKind.SourceFile) {
+            statement = statement.parent;
+        }
+        for (const at of [statement.pos, name.getStart()]) {
+            add(at, { declared: one, part: one });
+        }
+    }
     return below;
 }
 /**
@@ -210,7 +227,7 @@ export function inlineDirectives(project, held, targetRoot) {
         if (comments.length === 0) {
             continue;
         }
-        const below = declarationLines(file, held, symbols);
+        const below = declarationLines(file, held, symbols, targetRoot);
         for (const comment of comments) {
             const site = renderPosition(file, targetRoot, comment.offset);
             const target = trails(file, comment.offset) ? site.line : site.line + 1;
@@ -258,7 +275,7 @@ export function inlineSuppressions(perProject) {
             case "no-reason":
                 for (const code of directive.codes) {
                     refusals.push({
-                        reported: SUPPRESSION_WITHOUT_REASON,
+                        reported: CODE.suppressionWithoutReason,
                         code,
                         symbol: "",
                         path: site.path,

package/dist/src/suppress.js

@@ -6,23 +6,18 @@
  * withholds a finding its code would have produced there, dormant when the configuration
  * withholds every such finding anyway, and stale otherwise.
  */
-import { ConfigError } from "./config.js";
+import { KIND_ROWS, SYMBOL_SUBJECTS, } from "./contract/contract.generated.js";
+import { UsageError } from "./usage.js";
 import { positionKey } from "./position.js";
 import { isRef } from "./ref.js";
-/** The code a suppression that carries no reason is reported under. */
-export const SUPPRESSION_WITHOUT_REASON = "DS1701";
-/** The code an ignore entry or a baseline row that names no path is reported under. */
-export const UNSCOPED_ENTRY = "DS1702";
-/** The code a suppression that withholds nothing is reported under. */
-export const STALE_SUPPRESSION = "DS1703";
 /**
  * A directive, an entry or a document the grammar refuses before any finding exists: an
  * instruction the analysis cannot carry out. It is a malformed input, so the command line
  * answers it with the usage code.
  */
-export class SuppressionError extends ConfigError {
+export class SuppressionError extends UsageError {
     constructor(mechanism, at, text, want) {
-        super("malformed", at, `${mechanism} ${at}: ${text}: want ${want}`);
+        super(`${mechanism} ${at}: ${text}: want ${want}`);
         this.name = "SuppressionError";
     }
 }
@@ -57,6 +52,7 @@ export const GO_REF_EXPRESSIONS = [
     `^go://${GO_PATH}#${GO_IDENT}$`,
     `^go://${GO_PATH}#${GO_IDENT}(?:\\.${GO_IDENT})+$`,
     `^go://${GO_PATH}#${GO_IDENT}(?:\\.${GO_IDENT})?\\[${GO_IDENT}\\]$`,
+    `^go://${GO_PATH}#(?:${GO_IDENT}(?:\\.${GO_IDENT})?)?\\(${GO_IDENT}\\)$`,
     `^go://${GO_PATH}#${GO_FILE}:file$`,
     `^go://${GO_PATH}#${GO_PATH}(?:@${GO_VERSION})?:require$`,
     `^go://${GO_PATH}#${GO_PATH}(?:@${GO_VERSION})?:replace$`,
@@ -70,73 +66,59 @@ export function isSymbolRef(value) {
 export function blankReason(reason) {
     return reason === undefined || /^[ \t\r\n]*$/u.test(reason);
 }
+/** The subject of the kind each live code names. */
+const SUBJECT_OF_CODE = new Map(KIND_ROWS.map((row) => [row.code, row.subject]));
+/** The subject a finding about one symbol kind is about. */
+function subjectOf(kind) {
+    return Object.hasOwn(SYMBOL_SUBJECTS, kind)
+        ? SYMBOL_SUBJECTS[kind]
+        : undefined;
+}
+/** Whether a subject is a row of a document rather than a declaration of the program. */
+function rowOf(subject) {
+    return subject === "file" || subject === "dependency" || subject === "record";
+}
 /**
- * The subject kinds that are a dependency row, each with the code that reports one. An
- * ignore entry or a baseline row naming the row's reference and file withholds its finding
- * and marks nothing, and an inline directive never binds one.
- */
-const DEPENDENCY_SUBJECTS = new Map([
-    ["dependency", ["DS1601"]],
-    ["module-directive", ["DS1605"]],
-]);
-/**
- * The subject kinds that are a row of a document rather than a declaration of the program,
- * each with the codes that report one. Apart from a dependency row, nothing withholds a
- * finding about one.
+ * Whether a finding's subject is a row of a document rather than a declaration. Apart
+ * from a dependency row, nothing withholds a finding about one.
  */
-const ROW_SUBJECTS = new Map([
-    ["file", ["DS1501", "DS1502"]],
-    ...DEPENDENCY_SUBJECTS,
-    ["root", ["DS1704"]],
-    ["configured-declaration", ["DS1706"]],
-    ["suppression", ["DS1701", "DS1702", "DS1703"]],
-    ["edge", ["DS1705"]],
-]);
-/** Whether a finding's subject is a row of a document rather than a declaration. */
 export function isRowSubject(kind) {
-    return ROW_SUBJECTS.has(kind);
+    return rowOf(subjectOf(kind));
 }
 /** Whether a code reports a row of a document. */
 export function isRowCode(code) {
-    return [...ROW_SUBJECTS.values()].some((codes) => codes.includes(code));
+    return rowOf(SUBJECT_OF_CODE.get(code));
 }
-/** Whether a finding's subject is a dependency row. */
+/**
+ * Whether a finding's subject is a dependency row. An ignore entry or a baseline row
+ * naming the row's reference and file withholds its finding and marks nothing, and an
+ * inline directive never binds one.
+ */
 export function isDependencySubject(kind) {
-    return DEPENDENCY_SUBJECTS.has(kind);
+    return subjectOf(kind) === "dependency";
 }
 /** Whether a code reports a dependency row, which only an ignore entry or a baseline row names. */
 export function isDependencyCode(code) {
-    return [...DEPENDENCY_SUBJECTS.values()].some((codes) => codes.includes(code));
+    return SUBJECT_OF_CODE.get(code) === "dependency";
 }
 /** Whether a code reports a row of a document that no record of any mechanism can name. */
 export function isUnsuppressibleCode(code) {
     return isRowCode(code) && !isDependencyCode(code);
 }
 /**
- * The subject kinds that are a part of a declaration rather than a declaration: a part
+ * Whether a finding's subject is a part of the declaration its reference names: a part
  * has no reference of its own, so a finding about one names the declaration that holds
  * it, and the part is decided inside that declaration whatever uses it.
  */
-const PART_SUBJECTS = new Set([
-    "parameter",
-    "receiver",
-    "result",
-    "statement",
-    "case",
-    "store",
-]);
-/** Whether a finding's subject is a part of the declaration its reference names. */
 export function isPartSubject(kind) {
-    return PART_SUBJECTS.has(kind);
+    return subjectOf(kind) === "part";
 }
-/** The prefix of the codes of the part kinds, the intra-function range. */
-const PART_KIND_PREFIX = "DS18";
 /**
  * Whether a code is a part kind, whose record withholds its finding and marks nothing:
  * the record says the part is wanted, not that the declaration holding it is.
  */
 export function isPartKind(code) {
-    return code.startsWith(PART_KIND_PREFIX);
+    return SUBJECT_OF_CODE.get(code) === "part";
 }
 /** One finding's identity: its code and the position of the thing it names. */
 function claimKey(finding) {
@@ -144,27 +126,29 @@ function claimKey(finding) {
 }
 /**
  * Whether one record names one finding. A record reaches a finding in two ways: it bound
- * the declaration at the finding's position, or it names the finding's reference and the
- * file the finding is reported in, each exactly. The second is how an entry copied from a
- * finding about a part of a declaration reaches the part, and the only way any record
- * reaches a dependency row.
+ * the declaration at the finding's position, or it names the finding's reference, or the
+ * reference of the declaration holding a part that has one of its own, and the file the
+ * finding is reported in, each exactly. The second is how an entry copied from a finding
+ * about a part of a declaration reaches the part, and the only way any record reaches a
+ * dependency row.
  */
 export function pairs(record, finding) {
     if (record.code !== finding.code) {
         return false;
     }
-    if (DEPENDENCY_SUBJECTS.has(finding.symbol.kind)) {
+    if (isDependencySubject(finding.symbol.kind)) {
         return (record.mechanism !== "inline" &&
             record.symbol === finding.symbol.ref &&
             record.path === finding.position.path);
     }
-    if (ROW_SUBJECTS.has(finding.symbol.kind)) {
+    if (isRowSubject(finding.symbol.kind)) {
         return false;
     }
     if (record.bound !== "" && record.bound === positionKey(finding.position)) {
         return true;
     }
-    return record.symbol === finding.symbol.ref && record.path === finding.position.path;
+    return ((record.symbol === finding.symbol.ref || record.symbol === finding.symbol.holder) &&
+        record.path === finding.position.path);
 }
 /**
  * Decides every record against `would`, the findings the run would produce were no record