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

package/dist/src/configuration-files.js

@@ -7,8 +7,12 @@
  * uses it and each relative one that names a source file of the program roots the file.
  */
 import { isCallExpression, isExportDeclaration, isIdentifier, isImportDeclaration, isNoSubstitutionTemplateLiteral, isStringLiteral, SyntaxKind, } from "@typescript/native/ast";
-import { dirnamePath, joinPath, relativePath, resolvePath } from "./paths.js";
-const MANIFEST = "package.json";
+import { ancestors, dirnamePath, joinPath, relativePath, resolvePath } from "./paths.js";
+import { bytewise } from "./text/compare.js";
+import { isRecord } from "./json-document.js";
+import { filesIn } from "./fs/tree.js";
+import { holdsManifest, inInstalledPackages, manifestAt, readJSON } from "./fs/manifest.js";
+import { shellWords } from "./text/shell.js";
 /** A configuration module's name, each form with the spelling a root reports it by. */
 const MODULE_FORMS = [
     { name: /^[\w-]+\.config\.(?:js|mjs|cjs|ts|mts|cts)$/u, form: "<stem>.config.<ext>" },
@@ -50,18 +54,14 @@ export const RESOLVED_EXTENSIONS = [
     ".mjs",
     ".cjs",
 ];
-/** The directory a package manager installs packages into, whose files are no project's own. */
-const MODULES_DIR = "node_modules";
 /** The file's name, the last segment of its path. */
 function basename(path) {
     return path.slice(path.lastIndexOf("/") + 1);
 }
 /** Whether one path is the project's own: below the target root and in no `node_modules`. */
 function isProjectPath(root, path) {
-    return relativePath(root, path)?.split("/").includes(MODULES_DIR) === false;
-}
-function isRecord(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
+    const below = relativePath(root, path);
+    return below !== undefined && !inInstalledPackages(below);
 }
 /** The form one file name is as a configuration module, or undefined where it is none. */
 export function configurationModuleForm(name) {
@@ -75,122 +75,13 @@ export function isConfigurationDocumentName(name) {
 const CONFIG_FLAGS = new Set(["--config", "-c"]);
 /** The extensions of a module a configuration flag may name. */
 const MODULE_EXTENSIONS = [".js", ".mjs", ".cjs", ".ts", ".mts", ".cts"];
-/** The characters that end a word outside quotes and separate nothing: blanks. */
-// Stryker disable next-line Regex: its \v to \V mutant is no valid escape under the u flag, so the whole module fails to parse
-const BLANK = /[ \t\r\f\v]/u;
-/** The characters that end a word outside quotes and begin an operator: newline included. */
-const OPERATOR = /[\n;&|()<>]/u;
-/** The characters a backslash escapes inside double quotes; before any other it stands for itself. */
-const DOUBLE_QUOTE_ESCAPES = new Set(["$", "`", '"', "\\"]);
-/**
- * The words of one command line, as POSIX token recognition reads quotes, backslashes,
- * line continuations, comments and operators. A word an expansion may change (an unquoted
- * `$`, backquote, glob character or leading `~`, or a `$` or backquote in double quotes)
- * is computed, and so is the rest of a line whose quote is never closed. A computed word
- * and each operator are undefined, so a flag's file is never read across them.
- */
-function shellWords(command) {
-    const words = [];
-    let word;
-    let computed = false;
-    const end = () => {
-        if (word !== undefined) {
-            words.push(computed ? undefined : word);
-        }
-        word = undefined;
-        computed = false;
-    };
-    for (let at = 0; at < command.length; at += 1) {
-        const char = command.charAt(at);
-        if (char === "\\" && command.charAt(at + 1) === "\n") {
-            at += 1;
-        }
-        else if (BLANK.test(char)) {
-            end();
-        }
-        else if (OPERATOR.test(char)) {
-            end();
-            words.push(undefined);
-        }
-        else if (char === "#" && word === undefined) {
-            const newline = command.indexOf("\n", at);
-            at = newline < 0 ? command.length : newline - 1;
-        }
-        else if (char === "\\") {
-            at += 1;
-            word = (word ?? "") + command.charAt(at);
-        }
-        else if (char === "'" || char === '"') {
-            const close = closingQuote(command, at);
-            if (close < 0) {
-                word ??= "";
-                computed = true;
-                break;
-            }
-            const quoted = char === "'"
-                ? { text: command.slice(at + 1, close), computed: false }
-                : doubleQuoted(command.slice(at + 1, close));
-            word = (word ?? "") + quoted.text;
-            computed ||= quoted.computed;
-            at = close;
-        }
-        else {
-            computed ||= /[$`*?[]/u.test(char) || (char === "~" && word === undefined);
-            word = (word ?? "") + char;
-        }
-    }
-    end();
-    return words;
-}
-/** The text between one pair of double quotes, unescaped, and whether an expansion may change it. */
-function doubleQuoted(inner) {
-    let text = "";
-    let computed = false;
-    for (let at = 0; at < inner.length; at += 1) {
-        const char = inner.charAt(at);
-        const next = inner.charAt(at + 1);
-        if (char === "\\" && next === "\n") {
-            at += 1;
-        }
-        else if (char === "\\" && DOUBLE_QUOTE_ESCAPES.has(next)) {
-            text += next;
-            at += 1;
-        }
-        else {
-            computed ||= char === "$" || char === "`";
-            text += char;
-        }
-    }
-    return { text, computed };
-}
-/** The index of the quote that closes the one at `open`, or -1 where none does. */
-function closingQuote(command, open) {
-    const quote = command.charAt(open);
-    for (let at = open + 1; at < command.length; at += 1) {
-        const char = command.charAt(at);
-        if (char === quote) {
-            return at;
-        }
-        if (quote === '"' && char === "\\") {
-            at += 1;
-        }
-    }
-    return -1;
-}
 /**
  * The files the scripts of the manifest in one directory name after a configuration flag,
  * `--config <file>`, `-c <file>` or `--config=<file>`, each a JSON file or a module below
  * the target root and in no `node_modules`.
  */
 function scriptConfigurations(host, root, dir) {
-    let scripts;
-    try {
-        const manifest = JSON.parse(host.readFile(joinPath(dir, MANIFEST)));
-        scripts = isRecord(manifest) ? manifest["scripts"] : undefined;
-    }
-    catch {
-        return [];
-    }
+    const scripts = manifestAt(host, dir)?.["scripts"];
     if (!isRecord(scripts)) {
         return [];
     }
@@ -217,15 +108,6 @@ function scriptConfigurations(host, root, dir) {
     }
     return found;
 }
-/** The decoded value of one JSON file, or undefined where it cannot be read or parsed. */
-function readDocument(host, path) {
-    try {
-        return JSON.parse(host.readFile(path));
-    }
-    catch {
-        return undefined;
-    }
-}
 /** Every string value one decoded JSON value holds at any depth. */
 export function documentStrings(value) {
     if (typeof value === "string") {
@@ -258,10 +140,10 @@ export function moduleStrings(file) {
 export function configurationFiles(host, targetRoot, files, parse) {
     const root = resolvePath(host.workingDirectory(), targetRoot);
     const manifests = new Map();
-    const holdsManifest = (dir) => {
+    const manifestHeld = (dir) => {
         let held = manifests.get(dir);
         if (held === undefined) {
-            held = host.kindOf(joinPath(dir, MANIFEST)) === "file";
+            held = holdsManifest(host, dir);
             manifests.set(dir, held);
         }
         return held;
@@ -271,30 +153,23 @@ export function configurationFiles(host, targetRoot, files, parse) {
     for (const file of files.byPath.values()) {
         const form = configurationModuleForm(basename(file.fileName));
         const fileDir = dirnamePath(file.fileName);
-        if (form !== undefined && holdsManifest(fileDir)) {
+        if (form !== undefined && manifestHeld(fileDir)) {
             modules.push({ file, form, manifestDir: fileDir });
         }
-        for (let dir = dirnamePath(file.fileName); relativePath(root, dir) !== undefined && !dirs.has(dir); dir = dirnamePath(dir)) {
+        for (const dir of ancestors(dirnamePath(file.fileName), root)) {
+            if (dirs.has(dir)) {
+                break;
+            }
             dirs.add(dir);
         }
     }
     const pending = [];
     const named = [];
-    for (const dir of [...dirs].sort()) {
-        if (!holdsManifest(dir)) {
+    for (const dir of [...dirs].sort(bytewise)) {
+        if (!manifestHeld(dir)) {
             continue;
         }
-        let names;
-        try {
-            names = host
-                .readDirectory(dir)
-                .filter((entry) => !entry.directory && isConfigurationDocumentName(entry.name))
-                .map((entry) => entry.name)
-                .sort();
-        }
-        catch {
-            names = [];
-        }
+        const names = filesIn(host, dir, isConfigurationDocumentName);
         pending.push(...names.map((name) => ({ path: joinPath(dir, name), manifestDir: dir })));
         for (const path of scriptConfigurations(host, root, dir)) {
             const held = files.byName.get(path);
@@ -318,7 +193,7 @@ export function configurationFiles(host, targetRoot, files, parse) {
             continue;
         }
         if (document === undefined) {
-            const value = readDocument(host, next.path);
+            const value = readJSON(host, next.path);
             if (value === undefined) {
                 unreadable.add(next.path);
                 continue;
@@ -343,7 +218,7 @@ export function configurationFiles(host, targetRoot, files, parse) {
         documents: [...documents.values()],
         outside: parse === undefined
             ? []
-            : outsideModules(host, root, [...dirs], files, holdsManifest, parse, named),
+            : outsideModules(host, root, [...dirs], files, manifestHeld, parse, named),
     };
 }
 /** The literal module specifier one `require(...)` or `import(...)` call names, if any. */
@@ -429,23 +304,13 @@ export function resolveRelativeSpecifier(host, dir, specifier) {
  * does not hold, and the project files below `root` they import by a relative specifier,
  * until no further file joins. A file that cannot be read is skipped.
  */
-function outsideModules(host, root, dirs, files, holdsManifest, parse, named) {
+function outsideModules(host, root, dirs, files, manifestHeld, parse, named) {
     const pending = [...named];
-    for (const dir of [...dirs].sort()) {
-        if (!holdsManifest(dir)) {
-            continue;
-        }
-        let names;
-        try {
-            names = host
-                .readDirectory(dir)
-                .filter((entry) => !entry.directory && configurationModuleForm(entry.name) !== undefined)
-                .map((entry) => entry.name)
-                .sort();
-        }
-        catch {
+    for (const dir of [...dirs].sort(bytewise)) {
+        if (!manifestHeld(dir)) {
             continue;
         }
+        const names = filesIn(host, dir, (name) => configurationModuleForm(name) !== undefined);
         pending.push(...names.map((name) => ({ path: joinPath(dir, name), manifestDir: dir })));
     }
     const found = new Map();
@@ -481,14 +346,8 @@ function outsideModules(host, root, dirs, files, holdsManifest, parse, named) {
 }
 /** Every dependency the manifest in one directory declares, or none where it holds none to read. */
 export function declaredIn(host, dir) {
-    let value;
-    try {
-        value = JSON.parse(host.readFile(joinPath(dir, MANIFEST)));
-    }
-    catch {
-        return [];
-    }
-    if (!isRecord(value)) {
+    const value = manifestAt(host, dir);
+    if (value === undefined) {
         return [];
     }
     const names = new Set();

package/dist/src/configured-declarations.js

@@ -179,19 +179,19 @@ export function resolveEntries(project, held, entries) {
     for (const symbol of held.symbols) {
         byRef.set(symbol.ref, [...(byRef.get(symbol.ref) ?? []), symbol.id]);
     }
-    const modules = modulesNamed(project, new Set(entries.flatMap((entry) => (entry.shape === "module" ? [entry.module] : []))));
+    const modules = modulesNamed(project, new Set(entries.flatMap((entry) => ("module" in entry ? [entry.module] : []))));
     return entries.map((entry) => {
-        if (entry.shape === "symbol") {
+        if ("symbol" in entry) {
             return { entry, handles: new Set(), ids: new Set(byRef.get(entry.symbol) ?? []) };
         }
-        const { components, static: isStatic } = componentsOf(entry.shape === "module" ? entry.name : entry.global);
+        const { components, static: isStatic } = componentsOf("module" in entry ? entry.name : entry.global);
         const [first = "", ...rest] = components;
         let start;
         if (isStatic && rest.length === 0) {
             // Only a member is static, and a path of one component names no member.
             start = undefined;
         }
-        else if (entry.shape === "module") {
+        else if ("module" in entry) {
             const module = modules.get(entry.module);
             start = module === undefined ? undefined : memberOf(project, module, first, false);
         }
@@ -246,14 +246,10 @@ export function entriesAt(project, chains, nodes, resolved) {
  * program the display name the inventory gives it.
  */
 export function spelledEntry(entry, held) {
-    switch (entry.shape) {
-        case "symbol":
-            return held.symbols.find((symbol) => symbol.ref === entry.symbol)?.name ?? entry.symbol;
-        case "module":
-            return entry.name;
-        case "global":
-            return entry.global;
+    if ("symbol" in entry) {
+        return held.symbols.find((symbol) => symbol.ref === entry.symbol)?.name ?? entry.symbol;
     }
+    return "module" in entry ? entry.name : entry.global;
 }
 /** The key under which a lifecycle contract's declarations are configured. */
 const LIFECYCLE_KEY = "ts.lifecycle_contracts";
@@ -264,11 +260,14 @@ const LIFECYCLE_KEY = "ts.lifecycle_contracts";
  */
 export function configuredDeclarations(config) {
     return [
-        ...config.ts.injectionRegistrations.map((entry) => ({
+        ...config.ts.injection_registrations.map((entry) => ({
             key: "ts.injection_registrations",
             entry,
         })),
-        ...config.ts.lifecycleContracts.flatMap((contract) => [...contract.components, ...contract.bases].map((entry) => ({ key: LIFECYCLE_KEY, entry }))),
+        ...config.ts.lifecycle_contracts.flatMap((contract) => [...(contract.components ?? []), ...(contract.bases ?? [])].map((entry) => ({
+            key: LIFECYCLE_KEY,
+            entry,
+        }))),
         ...config.ts.serializers.map((entry) => ({ key: "ts.serializers", entry })),
     ];
 }
@@ -294,12 +293,8 @@ export function declarationsNamed(project, held, configured) {
  * sign and its name, and a global entry's path after a number sign.
  */
 export function configuredRef(entry) {
-    switch (entry.shape) {
-        case "symbol":
-            return entry.symbol;
-        case "module":
-            return `${entry.module}#${entry.name}`;
-        case "global":
-            return `#${entry.global}`;
+    if ("symbol" in entry) {
+        return entry.symbol;
     }
+    return "module" in entry ? `${entry.module}#${entry.name}` : `#${entry.global}`;
 }

package/dist/src/consumers.js

@@ -39,10 +39,10 @@ export function consumerLoads(engine, host, scope, targetConfigFiles) {
 export function consumerReferences(project, host, targetRoot, consumer, config) {
     const held = inventory(narrowedTo(project, (file) => relativePath(targetRoot, file.fileName) !== undefined), host, targetRoot);
     const found = references(project, held, targetRoot, {
-        testFiles: config.ts.testFiles,
+        testFiles: config.ts.test_files,
         consumer,
     }).references;
-    if (config.analysis.consumerTests !== "production") {
+    if (config.analysis.consumer_tests !== "production") {
         return found;
     }
     return found.map((reference) => (reference.test ? { ...reference, test: false } : reference));