@cplieger/deadset-ts 8.0.0-dev.1 → 8.0.0-dev.11

package/dist/src/verbs/print-config.js

@@ -1,6 +1,7 @@
+import { EXIT_CLEAN } from "../contract/contract.generated.js";
 import { printConfig } from "../print.js";
 import { resolve } from "../resolve.js";
-import { EXIT_CLEAN } from "./verb.js";
+import {} from "./verb.js";
 /** Writes the resolved configuration with the source of every setting. */
 export const printConfigVerb = ({ out, inputs }) => {
     const { config, provenance } = resolve(inputs());

package/dist/src/verbs/print-projects.js

@@ -1,8 +1,10 @@
+import { EXIT_CLEAN } from "../contract/contract.generated.js";
 import { runProjects } from "../analysis.js";
 import { partialNotes } from "../partial.js";
 import { resolvePath } from "../paths.js";
-import { resolveUnkinded } from "../resolve.js";
-import { EXIT_CLEAN } from "./verb.js";
+import { resolvePartial } from "../resolve.js";
+import {} from "./verb.js";
+import { diagnose } from "../product.js";
 /**
  * Writes the name of every project one run analyzes, one per line: the identifier the
  * build matrix declares for it, or, where discovery derived the project, its
@@ -11,7 +13,7 @@ import { EXIT_CLEAN } from "./verb.js";
  * instead, and one that fails the analysis fails this command the same way.
  */
 export const printProjectsVerb = ({ out, err, host, inputs, scope, openClient }) => {
-    const config = resolveUnkinded(inputs());
+    const config = resolvePartial(inputs());
     const scoped = scope();
     const answer = runProjects(openClient(config), host, scoped, config);
     for (const id of answer.configurations) {
@@ -22,7 +24,7 @@ export const printProjectsVerb = ({ out, err, host, inputs, scope, openClient })
         unanswered: answer.unanswered,
         targetRoot: resolvePath(host.workingDirectory(), scoped.target.path),
     })) {
-        err.write(`deadset-ts: ${note}\n`);
+        diagnose(err, note);
     }
     return EXIT_CLEAN;
 };

package/dist/src/verbs/print-retained.js

@@ -1,9 +1,11 @@
+import { EXIT_CLEAN } from "../contract/contract.generated.js";
 import { runSweep } from "../analysis.js";
 import { retainedLines } from "../exempt.js";
 import { partialNotes } from "../partial.js";
 import { resolvePath } from "../paths.js";
 import { resolve } from "../resolve.js";
-import { EXIT_CLEAN } from "./verb.js";
+import {} from "./verb.js";
+import { diagnose } from "../product.js";
 /**
  * Writes every declaration an exemption held back in the production sweep a report is
  * built from, one per line, and nothing where no exemption held one back. One fact
@@ -26,7 +28,7 @@ export const printRetainedVerb = ({ out, err, host, inputs, scope, openClient })
         unanswered: swept.unanswered,
         targetRoot: resolvePath(host.workingDirectory(), scoped.target.path),
     })) {
-        err.write(`deadset-ts: ${note}\n`);
+        diagnose(err, note);
     }
     return EXIT_CLEAN;
 };

package/dist/src/verbs/print-roots.js

@@ -1,8 +1,10 @@
+import { EXIT_CLEAN, EXIT_FINDINGS } from "../contract/contract.generated.js";
 import { runRoots } from "../analysis.js";
 import { partialNotes } from "../partial.js";
 import { resolvePath } from "../paths.js";
 import { resolve } from "../resolve.js";
-import { EXIT_CLEAN, EXIT_FINDINGS } from "./verb.js";
+import {} from "./verb.js";
+import { diagnose } from "../product.js";
 /**
  * One root as a line: the declaration's reference, why it is a root, and the string
  * that named it, separated by tabs. A run of several configurations adds the ones
@@ -39,7 +41,7 @@ export const printRootsVerb = ({ out, err, host, inputs, scope, openClient }) =>
         unanswered: answer.unanswered,
         targetRoot: resolvePath(host.workingDirectory(), scoped.target.path),
     })) {
-        err.write(`deadset-ts: ${note}\n`);
+        diagnose(err, note);
     }
     return answer.findings.length > 0 ? EXIT_FINDINGS : EXIT_CLEAN;
 };

package/dist/src/verbs/verb.js

@@ -1,5 +1 @@
-/** The exit codes the Contract's exit-code table names. */
-export const EXIT_CLEAN = 0;
-export const EXIT_FINDINGS = 1;
-export const EXIT_USAGE = 2;
-export const EXIT_FAILURE = 3;
+export {};

package/dist/src/verbs/version.js

@@ -1,7 +1,18 @@
-import { CONTRACT_VERSION } from "../version.js";
-import { EXIT_CLEAN } from "./verb.js";
+import { CONTRACT_VERSION, EXIT_CLEAN } from "../contract/contract.generated.js";
+import { productFault } from "../failure.js";
+import {} from "./verb.js";
+import { message, PRODUCT } from "../product.js";
+/** The version the host reports for this analyzer; one it cannot read is a fault of the analyzer. */
+export function ownVersion(host) {
+    try {
+        return host.analyzerVersion();
+    }
+    catch (error) {
+        throw productFault(`cannot read its own version: ${message(error)}`);
+    }
+}
 /** Writes the version the host reports and the Contract version this analyzer implements. */
 export const versionVerb = ({ out, host }) => {
-    out.write(`deadset-ts ${host.analyzerVersion()}\ncontract ${CONTRACT_VERSION}\n`);
+    out.write(`${PRODUCT} ${ownVersion(host)}\ncontract ${CONTRACT_VERSION}\n`);
     return EXIT_CLEAN;
 };

package/dist/src/workflow-steps.js

@@ -3,42 +3,33 @@
  * path from the target root. A workflow or hook file is read as text, line by line, with no
  * YAML parsed.
  */
-import { scriptTokens } from "./manifest.js";
 import { joinPath, relativePath, resolvePath } from "./paths.js";
+import { filesIn } from "./fs/tree.js";
+import { commandsOf, scriptTokens, unquoted, withoutComment } from "./text/shell.js";
 const WORKFLOWS = ".github/workflows";
 /** A line holding a run command: indentation and one sequence marker before `run:`. */
 const RUN_LINE = /^(\s*(?:- )?)run:(.*)$/u;
 /** The directories whose every file is a git hook script, run as the shell runs it. */
 const HOOK_DIRS = [".husky", ".githooks"];
+/** A line setting the directory a workflow step, or each step a `defaults.run` covers, runs in. */
+const WORKING_DIRECTORY = /^(\s*(?:- )?)working-directory:(.*)$/u;
+const LEFTHOOK_FILES = ["lefthook.yml", "lefthook.yaml", ".lefthook.yml"];
+/** A line setting the directory a lefthook command runs in. */
+const LEFTHOOK_ROOT = /^(\s*(?:- )?)root:(.*)$/u;
 /** The hook manager files whose commands are written under a key, with that key. */
 const HOOK_MANAGERS = [
     [".pre-commit-config.yaml", /^(\s*(?:- )?)entry:(.*)$/u],
-    ["lefthook.yml", RUN_LINE],
-    ["lefthook.yaml", RUN_LINE],
-    [".lefthook.yml", RUN_LINE],
+    ...LEFTHOOK_FILES.map((name) => [name, RUN_LINE]),
 ];
 /** The names GNU make reads a makefile under, in the order it tries them. */
 const MAKEFILES = ["GNUmakefile", "makefile", "Makefile"];
-/** The operators that end one shell command of a recipe line. */
-const COMMAND_SEPARATORS = /&&|\|\||;|\|/u;
 const BLOCK_SCALAR = /^[|>][+-]?$/u;
-const QUOTED = /^(["'])(.*)\1$/su;
 /** A token holding one of these is computed or a pattern, so it names no file. */
 const COMPUTED = /[${*?[]/u;
 const INDENT = /^\s*/u;
-/** The files directly in one directory whose name `accepts`, in name order. */
-function filesIn(host, dir, accepts) {
-    let entries;
-    try {
-        entries = host.readDirectory(dir);
-    }
-    catch {
-        return [];
-    }
-    return entries
-        .filter((entry) => !entry.directory && accepts(entry.name))
-        .map((entry) => joinPath(dir, entry.name))
-        .sort();
+/** The files directly in one directory whose name `accepts`, by path in name order. */
+function pathsIn(host, dir, accepts) {
+    return filesIn(host, dir, accepts).map((name) => joinPath(dir, name));
 }
 function readText(host, path) {
     try {
@@ -48,7 +39,7 @@ function readText(host, path) {
         return undefined;
     }
 }
-/** Every command line one workflow file's `run:` steps, or the steps under `key`, hold. */
+/** Every line one workflow file's `run:` steps hold, or every line of the values written under `key`. */
 export function runCommands(text, key = RUN_LINE) {
     const lines = text.split(/\r?\n/u);
     const found = [];
@@ -58,7 +49,7 @@ export function runCommands(text, key = RUN_LINE) {
             continue;
         }
         const column = (match[1] ?? "").length;
-        const value = (match[2] ?? "").trim().replace(QUOTED, "$2");
+        const value = unquoted((match[2] ?? "").trim());
         if (!BLOCK_SCALAR.test(value)) {
             found.push(value);
             continue;
@@ -74,24 +65,32 @@ export function runCommands(text, key = RUN_LINE) {
     return found;
 }
 /**
- * Every token the recipe lines of the target root's makefile hold, each with the directory
- * below the root it is read against: a recipe line is one that starts with a tab, joined
- * with the lines a trailing `\` continues it onto, and make runs each in a shell of its
- * own, so a `cd` moves the directory of the later commands of its line alone.
+ * The commands of the recipe lines of the target root's makefile, each line's in order: a
+ * recipe line is one that starts with a tab, joined with the lines a trailing `\`
+ * continues it onto.
  */
-function recipeTokens(host, root) {
+function recipeLines(host, root) {
     const path = MAKEFILES.map((name) => joinPath(root, name)).find((candidate) => host.kindOf(candidate) === "file");
     const text = path === undefined ? undefined : readText(host, path);
     if (text === undefined) {
         return [];
     }
+    return text
+        .replace(/\\\r?\n/gu, " ")
+        .split(/\r?\n/u)
+        .filter((line) => line.startsWith("\t"))
+        .map((line) => commandsOf(withoutComment(line.slice(1).replace(/^[@+-]+/u, ""))));
+}
+/**
+ * Every token the recipe lines of the target root's makefile hold, each with the directory
+ * below the root it is read against: make runs each line in a shell of its own, so a `cd`
+ * moves the directory of the later commands of its line alone.
+ */
+function recipeTokens(host, root) {
     const found = [];
-    for (const line of text.replace(/\\\r?\n/gu, " ").split(/\r?\n/u)) {
-        if (!line.startsWith("\t")) {
-            continue;
-        }
+    for (const line of recipeLines(host, root)) {
         let dir = root;
-        for (const command of withoutComment(line.slice(1).replace(/^[@+-]+/u, "")).split(COMMAND_SEPARATORS)) {
+        for (const command of line) {
             const tokens = scriptTokens(command);
             const [first, target, ...rest] = tokens;
             if (first === "cd" && target !== undefined && rest.length === 0 && !COMPUTED.test(target)) {
@@ -105,55 +104,54 @@ function recipeTokens(host, root) {
     }
     return found;
 }
-/** One shell line up to its comment: a `#` that starts a word outside quotes. */
-function withoutComment(line) {
-    let quote = "";
-    for (let at = 0; at < line.length; at += 1) {
-        const char = line[at];
-        if (quote !== "") {
-            if (char === quote) {
-                quote = "";
-            }
-            else if (char === "\\" && quote === '"') {
-                at += 1;
-            }
-        }
-        else if (char === "'" || char === '"') {
-            quote = char;
-        }
-        else if (char === "\\") {
-            at += 1;
-        }
-        else if (char === "#" && (at === 0 || /\s/u.test(line[at - 1] ?? ""))) {
-            return line.slice(0, at);
-        }
-    }
-    return line;
-}
 /**
- * Every token the target root's workflow steps, git hooks and makefile hold: the `run:`
+ * Every command the target root's workflow steps, git hooks and makefile run: the `run:`
  * steps of the workflow files in `.github/workflows`, every line of each file in `.husky`
  * and `.githooks`, the `entry:` commands of `.pre-commit-config.yaml`, the `run:` commands
  * of a lefthook file and the makefile's recipe lines.
  */
+export function workflowCommands(host, targetRoot) {
+    const root = resolvePath(host.workingDirectory(), targetRoot);
+    return [...stepCommands(host, root), ...recipeLines(host, root).flat()];
+}
+/**
+ * Every directory the target root's workflow steps and lefthook commands are set to run in, as
+ * written: each `working-directory` of a workflow file and each `root` of a lefthook file.
+ */
+export function commandDirectories(host, targetRoot) {
+    const root = resolvePath(host.workingDirectory(), targetRoot);
+    return [
+        ...workflowFiles(host, root).flatMap((path) => runCommands(readText(host, path) ?? "", WORKING_DIRECTORY)),
+        ...LEFTHOOK_FILES.flatMap((name) => runCommands(readText(host, joinPath(root, name)) ?? "", LEFTHOOK_ROOT)),
+    ];
+}
+/** The workflow files in `.github/workflows` at one root, by path in name order. */
+function workflowFiles(host, root) {
+    return pathsIn(host, joinPath(root, WORKFLOWS), (name) => /\.ya?ml$/u.test(name));
+}
+/** Every token the commands {@link workflowCommands} reads hold. */
 export function workflowTokens(host, targetRoot) {
     const root = resolvePath(host.workingDirectory(), targetRoot);
+    return [
+        ...stepCommands(host, root).flatMap((command) => scriptTokens(command)),
+        ...recipeTokens(host, root).map(({ token }) => token),
+    ];
+}
+/** The commands of the workflow steps, git hooks and hook managers at one root. */
+function stepCommands(host, root) {
     const commands = [];
-    for (const path of filesIn(host, joinPath(root, WORKFLOWS), (name) => /\.ya?ml$/u.test(name))) {
+    for (const path of workflowFiles(host, root)) {
         commands.push(...runCommands(readText(host, path) ?? ""));
     }
     for (const dir of HOOK_DIRS) {
-        for (const path of filesIn(host, joinPath(root, dir), () => true)) {
+        for (const path of pathsIn(host, joinPath(root, dir), () => true)) {
             commands.push(...(readText(host, path) ?? "").split(/\r?\n/u).map(withoutComment));
         }
     }
     for (const [name, key] of HOOK_MANAGERS) {
         commands.push(...runCommands(readText(host, joinPath(root, name)) ?? "", key));
     }
-    return [
-        ...commands.flatMap((command) => scriptTokens(command)),
-        ...recipeTokens(host, root).map(({ token }) => token),
-    ];
+    return commands;
 }
 /**
  * The own files the target root's workflow steps and git hooks name, as

package/jsr.json

@@ -1,6 +1,6 @@
 {
   "name": "@cplieger/deadset-ts",
-  "version": "8.0.0-dev.1",
+  "version": "8.0.0-dev.11",
   "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.1",
+  "version": "8.0.0-dev.11",
   "type": "module",
   "sideEffects": false,
   "description": "Deterministic dead-code analysis for TypeScript, class and type members included",
@@ -19,6 +19,7 @@
   },
   "scripts": {
     "build": "tsc -p tsconfig.build.json",
+    "gen": "node scripts/gen-contract.ts",
     "prepack": "npm run build",
     "typecheck": "tsc -p tsconfig.json",
     "typecheck:tests": "tsc -p tsconfig.test.json",
@@ -30,7 +31,7 @@
     "lint:fix": "eslint . --fix && prettier --write ."
   },
   "dependencies": {
-    "@typescript/native": "npm:typescript@7.1.0-dev.20261010.1"
+    "@typescript/native": "npm:typescript@7.1.0-dev.20261015.1"
   },
   "overrides": {
     "qs": "^6.15.2"
@@ -45,8 +46,8 @@
     "fast-check": "4.10.2",
     "prettier": "3.9.10",
     "typescript": "npm:@typescript/typescript6@6.0.2",
-    "typescript-eslint": "8.71.1",
-    "vitest": "5.0.4"
+    "typescript-eslint": "8.71.2",
+    "vitest": "5.0.5"
   },
   "publishConfig": {
     "access": "public"