@cplieger/deadset-ts 7.0.0-dev.1 → 7.0.0-dev.2

package/src/suppress.ts

@@ -65,9 +65,6 @@ export interface Suppressions {
   readonly refusals: readonly Refusal[];
 }
 
-/** A target that carries no suppression. */
-export const NO_SUPPRESSIONS: Suppressions = { records: [], refusals: [] };
-
 /**
  * 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
@@ -151,27 +148,26 @@ export interface Dials<F extends Finding = Finding> {
 }
 
 /** What every record did, and the findings the records withhold. */
-export interface Ledger<F extends Finding = Finding> {
+export interface Ledger {
   /** One verdict per record, in reading order. */
   readonly verdicts: readonly Verdict[];
-  /** Per record, the finding it claimed, where it claimed one. */
-  readonly claims: readonly (F | undefined)[];
   /** Whether a record withholds one finding of the run. */
   readonly withheld: (finding: Finding) => boolean;
 }
 
 /**
- * The subject kinds that are a row of a document rather than a declaration of the program.
- * A record binds to a declaration, so nothing withholds a finding about one.
+ * The subject kinds that are a row of a document rather than a declaration of the program,
+ * each with the codes that report one. A record binds to a declaration, so nothing
+ * withholds a finding about one.
  */
-const ROW_SUBJECTS: ReadonlySet<string> = new Set([
-  "file",
-  "dependency",
-  "module-directive",
-  "root",
-  "configured-declaration",
-  "suppression",
-  "edge",
+const ROW_SUBJECTS: ReadonlyMap<string, readonly string[]> = new Map([
+  ["file", ["DS1501", "DS1502"]],
+  ["dependency", ["DS1601"]],
+  ["module-directive", ["DS1605"]],
+  ["root", ["DS1704"]],
+  ["configured-declaration", ["DS1706"]],
+  ["suppression", ["DS1701", "DS1702", "DS1703"]],
+  ["edge", ["DS1705"]],
 ]);
 
 /** Whether a finding's subject is a row of a document, which no record can withhold. */
@@ -179,6 +175,11 @@ export function isRowSubject(kind: string): boolean {
   return ROW_SUBJECTS.has(kind);
 }
 
+/** Whether a code reports a row of a document, so no record naming it can match. */
+export function isRowCode(code: string): boolean {
+  return [...ROW_SUBJECTS.values()].some((codes) => codes.includes(code));
+}
+
 /**
  * The subject kinds that are a part of a declaration rather than a declaration: a part
  * has no reference of its own, so a finding about one names the declaration that holds
@@ -242,20 +243,17 @@ export function ledgerOf<F extends Finding>(
   records: readonly SuppressionRecord[],
   would: readonly F[],
   dials: Dials<F>,
-): Ledger<F> {
+): Ledger {
   const taken = new Set<string>();
   const verdicts: Verdict[] = [];
-  const claims: (F | undefined)[] = [];
   for (const record of records) {
     if (record.bound !== "" && dials.withholdsCode(record.code, record.bound)) {
       verdicts.push("dormant");
-      claims.push(undefined);
       continue;
     }
     const claimed = would.find(
       (finding) => !taken.has(claimKey(finding)) && pairs(record, finding),
     );
-    claims.push(claimed);
     if (claimed === undefined) {
       verdicts.push("stale");
       continue;
@@ -265,13 +263,12 @@ export function ledgerOf<F extends Finding>(
   }
   return {
     verdicts,
-    claims,
     withheld: (finding) => taken.has(claimKey(finding)) && !ROW_SUBJECTS.has(finding.symbol.kind),
   };
 }
 
 /** The two suppression counts a report's totals carry. */
-export interface SuppressionCounts {
+interface SuppressionCounts {
   /** The records in effect. */
   readonly inEffect: number;
   /** The directives, entries and rows that carry a reason, each once whatever its codes. */
@@ -279,9 +276,9 @@ export interface SuppressionCounts {
 }
 
 /** The suppression counts of one run's records and the ledger over them. */
-export function suppressionCounts<F extends Finding>(
+export function suppressionCounts(
   records: readonly SuppressionRecord[],
-  ledger: Ledger<F>,
+  ledger: Ledger,
 ): SuppressionCounts {
   const sites = new Set(
     records.map((record) => `${record.mechanism}\u0000${positionKey(record.site)}`),

package/src/template-field.ts

@@ -22,7 +22,7 @@ import { isAbsolutePath, joinPath, normalizePath, relativePath } from "./paths.t
 import { isComponentFile, type Position } from "./position.ts";
 
 /** One template, by its path below the target root. */
-export interface TemplateFile {
+interface TemplateFile {
   readonly path: string;
   readonly text: string;
 }

package/src/value-reach.ts

@@ -38,7 +38,7 @@ export interface Reached {
 }
 
 /** What each type's values carry, each type asked of the checker once. */
-export interface ValueReach {
+interface ValueReach {
   reachedFrom(type: Type): Reached;
 }
 

package/src/verbs/verb.ts

@@ -1,5 +1,4 @@
 import type { Config, Inputs } from "../config.ts";
-import type { Emitters } from "../findings/emitter.ts";
 import type { Host } from "../host.ts";
 import type { Writer } from "../run.ts";
 import type { Scope } from "../scope.ts";
@@ -16,7 +15,7 @@ export const EXIT_FAILURE = 3;
  * options that follow its name, read only when the verb asks for what they name, so
  * a verb that asks for nothing refuses no option.
  */
-export interface Invocation {
+interface Invocation {
   readonly out: Writer;
   readonly err: Writer;
   readonly host: Host;
@@ -29,8 +28,6 @@ export interface Invocation {
    * closed if the verb throws.
    */
   readonly openClient: (config: Config) => Engine;
-  /** The emitter of every kind family, which a verb that reports findings runs. */
-  readonly emitters: Emitters;
   /** The arguments after the verb's name, as written. */
   readonly args: readonly string[];
   /** The last value one of the verb's own options was given, undefined where none was. */

package/src/workspace-programs.ts

@@ -22,12 +22,10 @@ import type { Engine } from "./session.ts";
 import type { WorkspaceResolver } from "./workspace-resolution.ts";
 
 /** One member import no member source answers for. */
-export interface UnresolvedImport {
+interface UnresolvedImport {
   /** The importing file, absolute. */
   readonly file: string;
   readonly specifier: string;
-  readonly member: string;
-  readonly subpath: string;
   readonly reason: string;
 }
 
@@ -36,8 +34,6 @@ export interface MemberReading {
   readonly configFile: string;
   /** The files the configuration itself compiles, absolute. */
   readonly fileNames: readonly string[];
-  /** The static resolutions its program is built with; none for a configuration opened as a project. */
-  readonly entries: readonly ModuleResolutionEntry[];
   readonly unresolved: readonly UnresolvedImport[];
   /**
    * Why the configuration's component files are not read, where the snapshots read
@@ -53,7 +49,7 @@ export type WorkspaceProgram =
   | { readonly kind: "configuration"; readonly file: string; readonly text: string };
 
 /** The programs one run builds instead of opening projects, with what reading them did. */
-export interface WorkspacePrograms {
+interface WorkspacePrograms {
   /** Per configuration that imports a member, how the snapshot reads it. */
   readonly programs: ReadonlyMap<string, WorkspaceProgram>;
   readonly readings: readonly MemberReading[];
@@ -320,8 +316,6 @@ function scan(
       reading.unresolved.push({
         file: usage.file,
         specifier,
-        member: answer.member,
-        subpath: answer.subpath,
         reason: answer.reason,
       });
     }
@@ -449,7 +443,6 @@ export function workspacePrograms(
     readings: readings.map((reading) => ({
       configFile: reading.configFile,
       fileNames: reading.parsed.fileNames,
-      entries: reading.entries,
       unresolved: reading.unresolved,
       componentsUnread: unread.get(reading.configFile),
     })),

package/src/workspace-resolution.ts

@@ -30,7 +30,6 @@ export type MemberResolution =
   | {
       readonly kind: "unresolved";
       readonly member: string;
-      readonly subpath: string;
       readonly reason: string;
     };
 
@@ -343,7 +342,6 @@ export function workspaceResolver(host: Host, workspace: Workspace): WorkspaceRe
         return {
           kind: "unresolved",
           member: name,
-          subpath,
           reason: `${String(linked.dirs.length)} workspace packages are named ${name} (${linked.dirs.join(", ")}) and nothing links the importer to one of them; install the workspace, or declare the dependency with a range only one of them satisfies`,
         };
       }
@@ -381,7 +379,6 @@ export function workspaceResolver(host: Host, workspace: Workspace): WorkspaceRe
       return {
         kind: "unresolved",
         member: name,
-        subpath,
         reason: built
           ? `its manifest names ${named}, output no tsconfig*.json of the package maps back to source, and nothing installed links the importer to it; install the workspace, or point an exports condition the importing configuration's customConditions lists at its source`
           : member.configurations.length === 0

package/src/workspace-run.ts

@@ -20,7 +20,7 @@ import {
 import { workspaceResolver } from "./workspace-resolution.ts";
 
 /** One run's workspace. */
-export interface WorkspaceRun {
+interface WorkspaceRun {
   /** Per configuration that imports a member, how the snapshot reads it. */
   readonly programs: ReadonlyMap<string, WorkspaceProgram>;
   /**

package/src/workspace.ts

@@ -24,8 +24,7 @@ export interface ParsedLayout {
 }
 
 /** One compiler configuration in a member's directory. */
-export interface MemberConfiguration {
-  readonly configFile: string;
+interface MemberConfiguration {
   /** The files it compiles, absolute. */
   readonly fileNames: ReadonlySet<string>;
   /** Where it writes its output, where it writes any. */
@@ -46,10 +45,6 @@ export interface WorkspaceMember {
 
 /** The workspace one target sits in. */
 export interface Workspace {
-  /** The directory that declares it. */
-  readonly root: string;
-  /** The file that declares it. */
-  readonly declaredIn: string;
   /** Every member, the root first, then by directory. */
   readonly members: readonly WorkspaceMember[];
   /** The members one package name names; two members may share a name. */
@@ -336,7 +331,6 @@ function configurationsOf(
       ? []
       : [
           {
-            configFile,
             fileNames: new Set(parsed.fileNames),
             layout: layoutOf(configFile, parsed),
           },
@@ -439,8 +433,6 @@ export function findWorkspace(
     return found;
   };
   return {
-    root: declared.root,
-    declaredIn: declared.file,
     members,
     named,
     memberOf: (path) => {