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

package/src/verbs/analyze.ts

@@ -26,7 +26,7 @@ import { json } from "../reporters/json.ts";
 import { RENDERINGS } from "../reporters/reporters.ts";
 import { parseTemplate, TemplateError, type Template } from "../reporters/template.ts";
 import { resolve } from "../resolve.ts";
-import { rowReason, writeBaseline, type Recorded } from "../suppress-file.ts";
+import { otherSchemeRows, rowReason, writeBaseline, type Recorded } from "../suppress-file.ts";
 import { CONTRACT_VERSION } from "../version.ts";
 import { EXIT_CLEAN, EXIT_FAILURE, type Verb, type VerbOptions } from "./verb.ts";
 
@@ -174,13 +174,12 @@ interface Documents {
 }
 
 /**
- * Analyzes the scope under the configuration and writes the JSON report to the path
- * `--report` names, each rendering `--format` names beside it at the report's path with the
- * format's suffix appended, and where `--baseline-write` names a path the baseline a fixpoint
- * over the analysis records, the report then being its first round, which reads no
- * baseline. The template format renders the template `--template` names. Nothing is written to
- * the output stream; diagnostics go to the error stream and the verdict is the exit code, or 0
- * under `--exit-code=off`, and a rendering that cannot be written ends the run with 3.
+ * Analyzes the scope and writes the JSON report to the path `--report` names, each
+ * `--format` rendering beside it with the format's suffix appended, and under
+ * `--baseline-write` the baseline a fixpoint over the analysis records, the report being its
+ * first round. Diagnostics go to the error stream and nothing to the output stream; the
+ * verdict is the exit code, or 0 under `--exit-code=off`, and a rendering that cannot be
+ * written ends the run with 3.
  */
 export const analyzeVerb: Verb = ({ err, host, inputs, scope, openClient, option, repeated }) => {
   const reportPath = option("report");
@@ -304,7 +303,14 @@ export const analyzeVerb: Verb = ({ err, host, inputs, scope, openClient, option
       }
     }
     if (documents.baseline !== undefined) {
-      host.writeDocument(documents.baseline, writeBaseline(recorded, analyzerProvenance(version)));
+      const kept =
+        host.kindOf(documents.baseline) === "file"
+          ? otherSchemeRows(host.readFile(documents.baseline))
+          : [];
+      host.writeDocument(
+        documents.baseline,
+        writeBaseline(recorded, analyzerProvenance(version), kept),
+      );
     }
   } catch (error: unknown) {
     err.write(`deadset-ts: ${error instanceof Error ? error.message : String(error)}\n`);

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) => {