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

package/dist/src/workspace.js

@@ -6,42 +6,30 @@
  * member is the workspace root or a directory the patterns name that holds a named
  * manifest, never one below `node_modules`.
  */
-import { DiscoveryError } from "./discover.js";
+import { DiscoveryError, isConfigFile } from "./discover.js";
 import { commonDirectory } from "./emit-map.js";
-import { dirnamePath, joinPath, relativePath } from "./paths.js";
-import { pnpmPackages } from "./pnpm-workspace.js";
-const MANIFEST = "package.json";
+import { ancestors, dirnamePath, joinPath, relativePath } from "./paths.js";
+import { bytewise } from "./text/compare.js";
+import { isRecord } from "./json-document.js";
+import { directoriesIn, filesIn, repositoryOf } from "./fs/tree.js";
+import { holdsManifest, inInstalledPackages, INSTALLED_PACKAGES, MANIFEST, manifestAt, } from "./fs/manifest.js";
+import { braceExpanded, pathMatches, segmentMatches } from "./text/glob.js";
+import { yamlKey } from "./text/yaml.js";
 const PNPM_WORKSPACE = "pnpm-workspace.yaml";
-const CONFIG_FILE = /^tsconfig.*\.json$/u;
-function isRecord(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-/** One manifest, decoded, or `undefined` where there is none to read. */
-function manifestAt(host, dir) {
-    let text;
-    try {
-        text = host.readFile(joinPath(dir, MANIFEST));
-    }
-    catch {
-        return undefined;
-    }
-    try {
-        const value = JSON.parse(text);
-        return isRecord(value) ? value : undefined;
-    }
-    catch {
-        return undefined;
-    }
-}
 /** The patterns one directory declares a workspace with, or `undefined` where it declares none. */
 function declarationAt(host, dir) {
     const pnpm = joinPath(dir, PNPM_WORKSPACE);
     if (host.kindOf(pnpm) === "file") {
-        const read = pnpmPackages(host.readFile(pnpm));
-        if (read.kind === "refused") {
-            throw new DiscoveryError(`${pnpm}: ${read.reason}; the workspace's packages are read from a sequence of strings`, []);
+        const read = yamlKey(host.readFile(pnpm), "packages");
+        if (read.kind === "absent") {
+            return { file: pnpm, patterns: [] };
+        }
+        const listed = read.kind === "value" ? read.value : undefined;
+        if (!Array.isArray(listed) || !listed.every((entry) => typeof entry === "string")) {
+            const reason = read.kind === "refused" ? read.reason : "packages is not a sequence of strings";
+            throw new DiscoveryError(`${pnpm}: ${reason}; the workspace's packages are read from a sequence of strings`, []);
         }
-        return { file: pnpm, patterns: read.kind === "listed" ? read.patterns : [] };
+        return { file: pnpm, patterns: listed };
     }
     const manifest = manifestAt(host, dir);
     if (manifest === undefined || !Object.hasOwn(manifest, "workspaces")) {
@@ -62,20 +50,6 @@ function declaresWorkspace(host, dir) {
     const manifest = manifestAt(host, dir);
     return manifest !== undefined && Object.hasOwn(manifest, "workspaces");
 }
-/** A pattern with every brace list expanded into its alternatives. */
-function braceExpanded(pattern) {
-    const open = pattern.indexOf("{");
-    const close = open < 0 ? -1 : pattern.indexOf("}", open);
-    if (close < 0) {
-        return [pattern];
-    }
-    const before = pattern.slice(0, open);
-    const after = pattern.slice(close + 1);
-    return pattern
-        .slice(open + 1, close)
-        .split(",")
-        .flatMap((member) => braceExpanded(before + member + after));
-}
 /**
  * The segments of one pattern below the workspace root, `.` and empty segments
  * dropped and `..` taken back, or `undefined` where it leaves the root.
@@ -96,52 +70,6 @@ function segmentsOf(pattern) {
     }
     return segments;
 }
-/**
- * Whether one directory name matches one pattern segment: `*` stands for any run of
- * characters and `?` for one, and neither matches a leading dot.
- */
-function segmentMatches(segment, name) {
-    if (name.startsWith(".") && !segment.startsWith(".")) {
-        return false;
-    }
-    const source = Array.from(segment)
-        .map((character) => {
-        if (character === "*") {
-            return ".*";
-        }
-        if (character === "?") {
-            return ".";
-        }
-        return character.replaceAll(/[.+^${}()|[\]\\/]/gu, (c) => `\\${c}`);
-    })
-        .join("");
-    return new RegExp(`^${source}$`, "u").test(name);
-}
-/** Whether one path's segments match one pattern's, `**` standing for any run of segments. */
-function pathMatches(pattern, path) {
-    const [head, ...rest] = pattern;
-    if (head === undefined) {
-        return path.length === 0;
-    }
-    if (head === "**") {
-        return (pathMatches(rest, path) ||
-            (path.length > 0 && !(path[0] ?? "").startsWith(".") && pathMatches(pattern, path.slice(1))));
-    }
-    const [name, ...below] = path;
-    return name !== undefined && segmentMatches(head, name) && pathMatches(rest, below);
-}
-function subdirectories(host, dir) {
-    try {
-        return host
-            .readDirectory(dir)
-            .filter((entry) => entry.directory && entry.name !== "node_modules" && entry.name !== ".git")
-            .map((entry) => entry.name)
-            .sort();
-    }
-    catch {
-        return [];
-    }
-}
 /**
  * Every directory below `dir` one pattern names. `**` does not descend into a
  * directory that declares a workspace of its own, whose packages are that
@@ -155,7 +83,7 @@ function expand(host, dir, pattern, into) {
     }
     if (head === "**") {
         expand(host, dir, rest, into);
-        for (const name of subdirectories(host, dir)) {
+        for (const name of directoriesIn(host, dir)) {
             if (name.startsWith(".")) {
                 continue;
             }
@@ -166,12 +94,12 @@ function expand(host, dir, pattern, into) {
     }
     if (!head.includes("*") && !head.includes("?")) {
         const child = joinPath(dir, head);
-        if (head !== "node_modules" && host.kindOf(child) === "directory") {
+        if (head !== INSTALLED_PACKAGES && host.kindOf(child) === "directory") {
             expand(host, child, rest, into);
         }
         return;
     }
-    for (const name of subdirectories(host, dir)) {
+    for (const name of directoriesIn(host, dir)) {
         if (segmentMatches(head, name)) {
             expand(host, joinPath(dir, name), rest, into);
         }
@@ -208,10 +136,10 @@ function namesDirectory(root, patterns, dir) {
     if (below === undefined) {
         return false;
     }
-    const path = below.split("/");
-    if (path.includes("node_modules")) {
+    if (inInstalledPackages(below)) {
         return false;
     }
+    const path = below.split("/");
     let named = false;
     for (const written of patterns) {
         const negated = written.startsWith("!");
@@ -238,18 +166,7 @@ function layoutOf(configFile, parsed) {
     return { outDir: parsed.outDir, declarationDir: parsed.declarationDir, sourceDirs };
 }
 function configurationsOf(host, dir, parse) {
-    let names;
-    try {
-        names = host
-            .readDirectory(dir)
-            .filter((entry) => !entry.directory && CONFIG_FILE.test(entry.name))
-            .map((entry) => entry.name)
-            .sort();
-    }
-    catch {
-        return [];
-    }
-    return names.flatMap((name) => {
+    return filesIn(host, dir, isConfigFile).flatMap((name) => {
         const configFile = joinPath(dir, name);
         const parsed = parse(configFile);
         return parsed === undefined
@@ -267,22 +184,17 @@ function configurationsOf(host, dir, parse) {
  * highest directory below it, at or above the target root, that holds a manifest.
  */
 function nearestDeclaration(host, targetRoot) {
-    let dir = targetRoot;
     let highestPackage;
-    for (;;) {
+    for (const dir of ancestors(targetRoot, repositoryOf(host, targetRoot)?.root)) {
         const declared = declarationAt(host, dir);
         if (declared !== undefined) {
             return { root: dir, ...declared, highestPackage };
         }
-        if (host.kindOf(joinPath(dir, MANIFEST)) === "file") {
+        if (holdsManifest(host, dir)) {
             highestPackage = dir;
         }
-        const up = dirnamePath(dir);
-        if (up === dir || host.kindOf(joinPath(dir, ".git")) !== "absent") {
-            return undefined;
-        }
-        dir = up;
     }
+    return undefined;
 }
 /**
  * The workspace the target sits in, or `undefined` where none holds it: no directory
@@ -320,7 +232,7 @@ export function findWorkspace(host, targetRoot, parse) {
     if (members.length < 2) {
         return undefined;
     }
-    members.sort((a, b) => a.dir === declared.root ? -1 : b.dir === declared.root ? 1 : a.dir < b.dir ? -1 : 1);
+    members.sort((a, b) => a.dir === declared.root ? -1 : b.dir === declared.root ? 1 : bytewise(a.dir, b.dir));
     const named = new Map();
     for (const member of members) {
         named.set(member.name, [...(named.get(member.name) ?? []), member]);
@@ -332,7 +244,7 @@ export function findWorkspace(host, targetRoot, parse) {
             return scopes.get(dir);
         }
         const up = dirnamePath(dir);
-        const found = host.kindOf(joinPath(dir, MANIFEST)) === "file" ? dir : up === dir ? undefined : scopeOf(up);
+        const found = holdsManifest(host, dir) ? dir : up === dir ? undefined : scopeOf(up);
         scopes.set(dir, found);
         return found;
     };

package/jsr.json

@@ -1,6 +1,6 @@
 {
   "name": "@cplieger/deadset-ts",
-  "version": "8.0.0-dev.6",
+  "version": "8.0.0-dev.8",
   "license": "GPL-3.0-or-later",
   "exports": {
     ".": "./src/index.ts"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cplieger/deadset-ts",
-  "version": "8.0.0-dev.6",
+  "version": "8.0.0-dev.8",
   "type": "module",
   "sideEffects": false,
   "description": "Deterministic dead-code analysis for TypeScript, class and type members included",

package/src/analysis.ts

@@ -8,7 +8,7 @@
 
 import { isStringLiteralLikeNode, type SourceFile } from "@typescript/native/ast";
 import { lineOf, readComponent } from "./component-files.ts";
-import { kindOf, type Config, type Provenance } from "./config.ts";
+import { kindOf, type PartialConfig, type Provenance, type ResolvedConfig } from "./config.ts";
 import {
   consumerLoads,
   consumerReferences,
@@ -62,7 +62,6 @@ import {
 } from "./exempt.ts";
 import type { TSExemptionClass } from "./exempt-classes.ts";
 import { heldByInclusion, sourcePaths, sourceTree } from "./file-facts.ts";
-import { globExpression } from "./glob.ts";
 import type { Finding } from "./finding.ts";
 import { findingsPass, recordedFindings, rowKey, type PassResult } from "./findings-pass.ts";
 import type { EmitterInput } from "./findings/emitter.ts";
@@ -85,6 +84,7 @@ import {
   type SweepResult,
 } from "./matrix.ts";
 import {
+  ancestors,
   dirnamePath,
   extensionOf,
   joinPath,
@@ -94,7 +94,7 @@ import {
 } from "./paths.ts";
 import type { UnansweredQuestion } from "./query.ts";
 import { byPosition, isComponentFile, type Position } from "./position.ts";
-import { LANGUAGE, type TypeErrorSkip, type UnansweredCount } from "./report.ts";
+import type { TypeErrorSkip, UnansweredCount } from "./report.ts";
 import { SetupError, setupLine, type SetupFailure } from "./setup-failure.ts";
 import {
   pathsOf,
@@ -136,6 +136,9 @@ import { inlineDirectives, inlineSuppressions, type InlineDirective } from "./su
 import type { Exemption, Mode, SweepInput } from "./sweep.ts";
 import { readTemplates, templateField } from "./template-field.ts";
 import { ownErrors, workspaceRun } from "./workspace-run.ts";
+import { bytewise } from "./text/compare.ts";
+import { holdsManifest, inInstalledPackages, MANIFEST, manifestAt } from "./fs/manifest.ts";
+import { globExpression } from "./text/glob.ts";
 
 /** The setting whose source decides where a finding about a configured root sits. */
 const ROOTS_SETTING = "roots.patterns";
@@ -192,14 +195,6 @@ function documentOf(
   return relativePath(resolvePath(host.workingDirectory(), targetRoot), document) ?? "";
 }
 
-/** Two strings ordered bytewise. */
-function compare(a: string, b: string): number {
-  if (a === b) {
-    return 0;
-  }
-  return a < b ? -1 : 1;
-}
-
 /** What every stage after the root set reads of one project. */
 interface ProjectRead {
   readonly configuration: string;
@@ -272,8 +267,8 @@ function conventionManifests(
   nestedDirs: readonly string[],
 ): readonly ConventionManifest[] {
   const found = new Map<string, ConventionManifest>();
-  if (host.kindOf(joinPath(targetRoot, "package.json")) === "file") {
-    found.set(targetRoot, { dir: targetRoot, path: "package.json" });
+  if (holdsManifest(host, targetRoot)) {
+    found.set(targetRoot, { dir: targetRoot, path: MANIFEST });
   }
   for (const [dirs, nested] of [
     [memberDirs, false],
@@ -303,23 +298,18 @@ function nestedPackageDirs(
   const seen = new Set<string>();
   const found: string[] = [];
   for (const file of files) {
-    for (
-      let dir = dirnamePath(file);
-      dir !== targetRoot && !seen.has(dir) && relativePath(targetRoot, dir) !== undefined;
-      dir = dirnamePath(dir)
-    ) {
+    for (const dir of ancestors(dirnamePath(file), targetRoot)) {
+      if (seen.has(dir) || relativePath(targetRoot, dir) === undefined) {
+        break;
+      }
       seen.add(dir);
       const below = relativePath(targetRoot, dir) ?? "";
-      if (
-        !below.split("/").includes("node_modules") &&
-        !known.has(dir) &&
-        host.kindOf(joinPath(dir, "package.json")) === "file"
-      ) {
+      if (!inInstalledPackages(below) && !known.has(dir) && holdsManifest(host, dir)) {
         found.push(dir);
       }
     }
   }
-  return found.sort(compare);
+  return found.sort(bytewise);
 }
 
 /**
@@ -334,7 +324,7 @@ function readProjects<Answer>(
   engine: Engine,
   host: Host,
   scope: Scope,
-  config: Config,
+  config: PartialConfig,
   stage: <Brand>(project: ProjectView<Brand>, opened: OpenedProject) => Answer,
 ): ReadProjects<Answer> {
   const targetRoot = scope.target.path;
@@ -365,7 +355,7 @@ function readProjects<Answer>(
   // The nested packages are known only once every program is open, and every visit reads
   // the conventions and options they decide, so both are set in the session's first step.
   let nestedDirs: readonly string[] = [];
-  let conventions = readConventions(host, parse, [], config.ts.disabledConventions);
+  let conventions = readConventions(host, parse, [], config.ts.disabled_conventions);
   let options: RootOptions & { readonly parse: typeof parse; readonly conventions: Conventions };
   const readManifests = (opened: readonly OpenedFiles[]): void => {
     nestedDirs = nestedPackageDirs(
@@ -380,7 +370,7 @@ function readProjects<Answer>(
       host,
       parse,
       conventionManifests(host, absoluteRoot, memberDirs, nestedDirs),
-      config.ts.disabledConventions,
+      config.ts.disabled_conventions,
     );
     options = {
       host,
@@ -389,12 +379,12 @@ function readProjects<Answer>(
         ...(workspace?.entries ?? []),
         ...packageEntries(host, normalizePath(absoluteRoot), nestedDirs),
       ],
-      patterns: config.rootPatterns,
-      entryFiles: config.ts.entryFiles,
+      patterns: config.roots.patterns,
+      entryFiles: config.ts.entry_files,
       conventions,
-      testFiles: config.ts.testFiles,
+      testFiles: config.ts.test_files,
       parse,
-      publishedAPI: config.targetKind !== "" && kindOf(config.targetKind, LANGUAGE) === "library",
+      publishedAPI: config.target.kind !== undefined && kindOf(config.target.kind) === "library",
       publishedMembers: new Set(
         (workspace?.entries ?? []).filter((entry) => entry.published).map((entry) => entry.dir),
       ),
@@ -429,7 +419,7 @@ function readProjects<Answer>(
       unbuildable.push(...met);
     }
   };
-  const testPatterns = config.ts.testFiles.map(globExpression);
+  const testPatterns = config.ts.test_files.map(globExpression);
   const joins = discovered.derived
     ? joinedTestFiles(engine, host, absoluteRoot, discovered.configFiles, testPatterns)
     : new Map<string, readonly string[]>();
@@ -666,7 +656,12 @@ interface RunProjects {
  * for the errors and setup failures that decide whether it is analyzed, dropped or
  * fails the run, exactly as the analysis reads them.
  */
-export function runProjects(engine: Engine, host: Host, scope: Scope, config: Config): RunProjects {
+export function runProjects(
+  engine: Engine,
+  host: Host,
+  scope: Scope,
+  config: PartialConfig,
+): RunProjects {
   const read = readProjects(
     engine,
     host,
@@ -687,7 +682,7 @@ export function runRoots(
   engine: Engine,
   host: Host,
   scope: Scope,
-  config: Config,
+  config: ResolvedConfig,
   provenance: Provenance,
 ): RunRoots {
   const targetRoot = scope.target.path;
@@ -723,10 +718,12 @@ export function runRoots(
 
   const ordered = [...merged.values()].sort(
     (a, b) =>
-      byPosition(a.position, b.position) || compare(a.kind, b.kind) || compare(a.source, b.source),
+      byPosition(a.position, b.position) ||
+      bytewise(a.kind, b.kind) ||
+      bytewise(a.source, b.source),
   );
   const unmatched = unmatchedEverywhere(
-    config.rootPatterns,
+    config.roots.patterns,
     projects.map((answer) => answer.rooted),
   );
   return {
@@ -872,20 +869,9 @@ function testEvidence(
     }
   }
   const manifests = new Map<string, Readonly<Record<string, unknown>> | undefined>();
-  const manifestAt = (dir: string): Readonly<Record<string, unknown>> | undefined => {
+  const manifestIn = (dir: string): Readonly<Record<string, unknown>> | undefined => {
     if (!manifests.has(dir)) {
-      let value: unknown;
-      try {
-        value = JSON.parse(host.readFile(joinPath(dir, "package.json")));
-      } catch {
-        value = undefined;
-      }
-      manifests.set(
-        dir,
-        typeof value === "object" && value !== null && !Array.isArray(value)
-          ? (value as Record<string, unknown>)
-          : undefined,
-      );
+      manifests.set(dir, manifestAt(host, dir));
     }
     return manifests.get(dir);
   };
@@ -895,16 +881,14 @@ function testEvidence(
   return {
     imports,
     devDependency: (path, name) => {
-      for (let dir = dirnamePath(joinPath(root, path)); ; dir = dirnamePath(dir)) {
-        const manifest = manifestAt(dir);
+      for (const dir of ancestors(dirnamePath(joinPath(root, path)), root)) {
+        const manifest = manifestIn(dir);
         const other = OTHER_SECTIONS.some((one) => declares(manifest?.[one], name));
         if (declares(manifest?.[DEV_SECTION], name) || other) {
           return !other;
         }
-        if (normalizePath(dir) === normalizePath(root) || dirnamePath(dir) === dir) {
-          return false;
-        }
       }
+      return false;
     },
   };
 }
@@ -919,7 +903,7 @@ function readRun<Extra>(
   engine: Engine,
   host: Host,
   scope: Scope,
-  config: Config,
+  config: ResolvedConfig,
   mode: Mode,
   detectors: Detectors,
   extra: <Brand>(
@@ -932,13 +916,13 @@ function readRun<Extra>(
   const targetRoot = scope.target.path;
   const disabled = disabledClasses(config);
   const templates = disabled.has("template-field")
-    ? { delimiters: config.analysis.templateDelimiters, files: [] }
+    ? { delimiters: config.analysis.template_delimiters, files: [] }
     : readTemplates(host, targetRoot, config.analysis);
   const consumers = scope.consumers.map((consumer) => consumer.path);
   const read = readProjects<ReadProject<Extra>>(engine, host, scope, config, (project, opened) => {
     const projectRead = opened.read();
     const resolved = references(project, projectRead.held, targetRoot, {
-      testFiles: config.ts.testFiles,
+      testFiles: config.ts.test_files,
       testFileNames: projectRead.testFileNames,
     });
     const evidence = evidenceRecords(
@@ -949,7 +933,7 @@ function readRun<Extra>(
         templates,
         ts: config.ts,
         consumers,
-        ...(config.analysis.generatedFiles === "include"
+        ...(config.analysis.generated_files === "include"
           ? {}
           : { generated: projectRead.generated }),
       },
@@ -1056,8 +1040,8 @@ function readRun<Extra>(
     const exempt = detected.records;
     const made = supportReferences([...one.references, ...(satisfied?.references ?? [])], support);
     const held = new Set(projectRead.held.symbols.map((symbol) => symbol.position.path));
-    const supportFiles = [...support].filter((path) => held.has(path)).sort();
-    const testUsedFiles = [...testUsed].filter((path) => held.has(path)).sort();
+    const supportFiles = [...support].filter((path) => held.has(path)).sort(bytewise);
+    const testUsedFiles = [...testUsed].filter((path) => held.has(path)).sort(bytewise);
     const configured: Configured = {
       configuration: projectRead.configuration,
       symbols: projectRead.held.symbols,
@@ -1285,7 +1269,7 @@ function sweptOf<Extra>(
     unanswered: read.unanswered,
     heldByUnanswered: [...held],
     skipped: read.projects.flatMap((one) => one.skipped),
-    componentFiles: [...new Set(read.projects.flatMap((one) => one.componentFiles))].sort(compare),
+    componentFiles: [...new Set(read.projects.flatMap((one) => one.componentFiles))].sort(bytewise),
   };
 }
 
@@ -1301,7 +1285,7 @@ export function runSweep(
   engine: Engine,
   host: Host,
   scope: Scope,
-  config: Config,
+  config: ResolvedConfig,
   input: Pick<SweepInput, "marked" | "mode">,
   detectors: Detectors = DETECTORS,
 ): RunSweep {
@@ -1344,7 +1328,7 @@ export function readEmitterRun(
   engine: Engine,
   host: Host,
   scope: Scope,
-  config: Config,
+  config: ResolvedConfig,
   mode: Mode,
   detectors: Detectors,
 ): ReadRun<EmitterExtra> {
@@ -1427,12 +1411,7 @@ function judgedMembers(
 
 /** The directory of the nearest `package.json` at or above a file, inside `root`, else `root`. */
 function nearestManifestDir(host: Host, root: string, file: string): string {
-  for (let dir = dirnamePath(file); relativePath(root, dir) !== undefined; dir = dirnamePath(dir)) {
-    if (host.kindOf(joinPath(dir, "package.json")) === "file") {
-      return dir;
-    }
-  }
-  return root;
+  return ancestors(dirnamePath(file), root).find((dir) => holdsManifest(host, dir)) ?? root;
 }
 
 /**
@@ -1442,7 +1421,7 @@ function nearestManifestDir(host: Host, root: string, file: string): string {
 export function emitterInputOver(
   host: Host,
   scope: Scope,
-  config: Config,
+  config: ResolvedConfig,
   read: ReadRun<EmitterExtra>,
   input: Pick<SweepInput, "marked" | "mode">,
   selfCheck: SelfCheckFacts,
@@ -1530,7 +1509,7 @@ function readAnalysis(
   engine: Engine,
   host: Host,
   scope: Scope,
-  config: Config,
+  config: ResolvedConfig,
   provenance: Provenance,
   mode: Mode,
   detectors: Detectors,
@@ -1551,7 +1530,7 @@ function readAnalysis(
         configFile: one.configFile,
       })),
       testFileRules: testFileRulesOf(
-        config.ts.testFiles,
+        config.ts.test_files,
         read.projects.flatMap((one) => one.configured.testFiles),
         read.projects.flatMap((one) => one.configured.supportFiles ?? []),
       ),
@@ -1582,7 +1561,7 @@ function readAnalysis(
 function inputsOver(
   host: Host,
   scope: Scope,
-  config: Config,
+  config: ResolvedConfig,
   provenance: Provenance,
   mode: Mode,
   read: ReadRun<EmitterExtra>,
@@ -1596,7 +1575,7 @@ function inputsOver(
   const facts: SelfCheckFacts = {
     refusals: suppressions.refusals,
     unmatchedRoots: unmatchedEverywhere(
-      config.rootPatterns,
+      config.roots.patterns,
       read.projects.map((one) => one.extra.rooted),
     ),
     rootsDocument: documentOf(host, provenance, ROOTS_SETTING, targetRoot),
@@ -1706,7 +1685,7 @@ export function runAnalysis(
   engine: Engine,
   host: Host,
   scope: Scope,
-  config: Config,
+  config: ResolvedConfig,
   provenance: Provenance,
   mode: Mode,
   detectors: Detectors = DETECTORS,
@@ -1762,7 +1741,7 @@ export function runBaselineWrite(
   engine: Engine,
   host: Host,
   scope: Scope,
-  config: Config,
+  config: ResolvedConfig,
   provenance: Provenance,
   mode: Mode,
   reason: string,