@intentius/chant 0.124.45 → 0.124.48

package/dist/workspace/flyway-layout.js

@@ -0,0 +1,308 @@
+/**
+ * A Flyway project's layout, read from a workspace tree (#4400): its
+ * `flyway.toml` or `flyway.conf`, the locations it names, read recursively,
+ * and the placeholders it substitutes.
+ *
+ * This is the layout reading of sql-yodeler's `src/check/flyway.ts` (#250),
+ * moved here so the workspace kind and `yodel check` share one reader. It
+ * works on a {@link WorkspaceTree} and tree-relative paths instead of the
+ * file system, and it never runs Flyway or connects to a database.
+ *
+ * The configuration is the first `flyway.toml`, else `flyway.conf`, found in
+ * the directory checked or a directory above it, up to the tree's root. Its
+ * locations are read relative to the file's own directory:
+ *
+ *   filesystem:<path>   that directory
+ *   classpath:<path>    src/main/resources/<path> (and, for code
+ *   <path>              migrations, src/main/java/<path> and src/main/kotlin/<path>)
+ *
+ * With no configuration, or one that names no location, the directory
+ * checked is the one location. A location outside the tree is reported by
+ * {@link FlywayConfig.outside}, not read. A Java or Kotlin migration in a
+ * location is not SQL and is reported by {@link codeMigrations}.
+ *
+ * Placeholders are `${name}` (the prefix and suffix are configurable), from
+ * `flyway.placeholders.<name>` (conf) or `[flyway.placeholders]` (toml), plus
+ * Flyway's own: `flyway:defaultSchema`, `flyway:user`, `flyway:database`,
+ * `flyway:timestamp`, `flyway:filename`, `flyway:workingDirectory`,
+ * `flyway:table` and `flyway:environment`. {@link substitute} replaces them
+ * for a replay; the reader that lists migrations leaves the text as it is.
+ */
+import { posix } from "node:path";
+import { joinPath } from "./tree.js";
+/** The first `flyway.toml`, else `flyway.conf`, in `dir` or a directory above it, up to the tree's root. */
+export function findFlywayConfig(tree, dir) {
+    let at = dir;
+    for (;;) {
+        for (const name of ["flyway.toml", "flyway.conf"]) {
+            const f = joinPath(at, name);
+            if (tree.stat(f) === "file")
+                return f;
+        }
+        if (at === "" || at === ".")
+            return undefined;
+        at = posix.dirname(at) === "." ? "" : posix.dirname(at);
+    }
+}
+/** Java-properties `flyway.*` keys, without the `flyway.` prefix. */
+export function parseFlywayConf(text) {
+    const out = {};
+    const lines = text.split(/\r?\n/);
+    for (let i = 0; i < lines.length; i++) {
+        let line = lines[i] ?? "";
+        while (/\\$/.test(line) && i + 1 < lines.length)
+            line = line.slice(0, -1) + (lines[++i] ?? "").trimStart();
+        const t = line.trim();
+        if (t === "" || t.startsWith("#") || t.startsWith("!"))
+            continue;
+        const m = /^([^=:\s]+)\s*[=:]\s*(.*)$/.exec(t);
+        if (!m)
+            continue;
+        const key = m[1] ?? "";
+        if (!key.startsWith("flyway."))
+            continue;
+        out[key.slice("flyway.".length)] = (m[2] ?? "").trim();
+    }
+    return out;
+}
+/** A TOML document, as far as Flyway's configuration uses it: tables, strings, arrays of strings, booleans and numbers. */
+export function parseToml(text) {
+    const tables = { "": {} };
+    let current = "";
+    const lines = text.split(/\r?\n/);
+    for (let i = 0; i < lines.length; i++) {
+        const t = stripComment(lines[i] ?? "").trim();
+        if (t === "")
+            continue;
+        const table = /^\[\s*([^\]]+?)\s*\]$/.exec(t);
+        if (table) {
+            current = (table[1] ?? "").split(".").map((k) => unquote(k.trim())).join(".");
+            tables[current] ?? (tables[current] = {});
+            continue;
+        }
+        const kv = /^("[^"]*"|'[^']*'|[A-Za-z0-9_.:-]+)\s*=\s*(.*)$/.exec(t);
+        if (!kv)
+            continue;
+        let raw = kv[2] ?? "";
+        // A multi-line array runs to its closing bracket.
+        while (raw.trimStart().startsWith("[") && !balanced(raw) && i + 1 < lines.length)
+            raw += ` ${stripComment(lines[++i] ?? "").trim()}`;
+        const path = unquote(kv[1] ?? "").split(".");
+        const key = path.pop() ?? "";
+        const where = [current, ...path].filter(Boolean).join(".");
+        tables[where] ?? (tables[where] = {});
+        tables[where][key] = tomlValue(raw.trim());
+    }
+    return tables;
+}
+function stripComment(line) {
+    let quote;
+    for (let i = 0; i < line.length; i++) {
+        const c = line[i];
+        if (quote) {
+            if (c === "\\" && quote === '"')
+                i++;
+            else if (c === quote)
+                quote = undefined;
+        }
+        else if (c === '"' || c === "'")
+            quote = c;
+        else if (c === "#")
+            return line.slice(0, i);
+    }
+    return line;
+}
+const balanced = (s) => (s.match(/\[/g) ?? []).length <= (s.match(/\]/g) ?? []).length;
+function unquote(s) {
+    if ((s.startsWith('"') && s.endsWith('"')) || (s.startsWith("'") && s.endsWith("'")))
+        return s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, "\\");
+    return s;
+}
+function tomlValue(raw) {
+    if (raw === "true" || raw === "false")
+        return raw === "true";
+    if (raw.startsWith("[")) {
+        const inner = raw.replace(/^\[/, "").replace(/\]\s*$/, "");
+        return (inner.match(/"(?:[^"\\]|\\.)*"|'[^']*'|[^,\s]+/g) ?? []).map((v) => unquote(v.trim())).filter((v) => v !== "");
+    }
+    return unquote(raw);
+}
+const list = (v) => v === undefined || typeof v === "boolean" ? undefined : Array.isArray(v) ? v : v.split(",").map((s) => s.trim()).filter(Boolean);
+const str = (v) => (typeof v === "string" ? v : Array.isArray(v) ? v.join(",") : undefined);
+/** The database name a JDBC URL names: the path after the host. */
+function databaseOf(url) {
+    const m = url === undefined ? null : /^jdbc:[a-z0-9]+:\/\/[^/]+\/([^?;]+)/i.exec(url);
+    return m?.[1] ?? undefined;
+}
+/** The dialect a JDBC URL names. */
+function dialectOf(url) {
+    const m = url === undefined ? null : /^jdbc:([a-z0-9]+):/i.exec(url);
+    const driver = m?.[1]?.toLowerCase();
+    return driver === "postgresql" ? "postgres" : driver === "clickhouse" ? "clickhouse" : undefined;
+}
+/** The configuration `file` holds, or the defaults with `dir` as the one location when there is none. */
+export function readFlywayConfig(tree, file, dir) {
+    let values = {};
+    let placeholders = {};
+    if (file !== undefined) {
+        const text = tree.read(file);
+        if (file.endsWith(".toml")) {
+            const t = parseToml(text);
+            const flyway = t.flyway ?? {};
+            const name = str(flyway.environment) ?? "default";
+            const env = t[`environments.${name}`] ?? {};
+            values = { ...flyway, ...(t[`environments.${name}.flyway`] ?? {}), ...(env.url !== undefined ? { url: env.url } : {}), ...(env.user !== undefined ? { user: env.user } : {}), ...(env.schemas !== undefined ? { schemas: env.schemas } : {}) };
+            if (str(flyway.environment) !== undefined)
+                values.environment = name;
+            placeholders = Object.fromEntries(Object.entries({ ...(t["flyway.placeholders"] ?? {}), ...(t[`environments.${name}.flyway.placeholders`] ?? {}) }).map(([k, v]) => [k, str(v) ?? String(v)]));
+        }
+        else {
+            values = parseFlywayConf(text);
+            placeholders = Object.fromEntries(Object.entries(values).flatMap(([k, v]) => (k.startsWith("placeholders.") ? [[k.slice("placeholders.".length), str(v) ?? ""]] : [])));
+        }
+    }
+    const root = file === undefined ? dir : posix.dirname(file) === "." ? "" : posix.dirname(file);
+    const named = list(values.locations) ?? [];
+    const locations = [];
+    const codeLocations = [];
+    const outside = [];
+    const inside = (...parts) => {
+        const p = posix.normalize(joinPath(...parts)) || ".";
+        if (p === ".." || p.startsWith("../") || posix.isAbsolute(p))
+            return undefined;
+        return p === "." ? "" : p;
+    };
+    for (const l of named) {
+        const m = /^(filesystem|classpath):(.*)$/.exec(l);
+        const kind = m?.[1] ?? "classpath";
+        const raw = m?.[2] ?? l;
+        if (kind === "filesystem") {
+            const at = posix.isAbsolute(raw) ? undefined : inside(root, raw);
+            if (at === undefined)
+                outside.push(l);
+            else
+                locations.push(at);
+        }
+        else {
+            const path = raw.replace(/^\/+/, "");
+            const res = inside(root, "src/main/resources", path);
+            if (res === undefined)
+                outside.push(l);
+            else {
+                locations.push(res);
+                for (const lang of ["java", "kotlin"]) {
+                    const c = inside(root, "src/main", lang, path);
+                    if (c !== undefined)
+                        codeLocations.push(c);
+                }
+            }
+        }
+    }
+    if (named.length === 0)
+        locations.push(dir);
+    const schemas = list(values.schemas);
+    const replacement = values.placeholderReplacement;
+    const defaultSchema = str(values.defaultSchema) ?? schemas?.[0];
+    const user = str(values.user);
+    const url = str(values.url);
+    const database = databaseOf(url);
+    const dialect = dialectOf(url);
+    const environment = str(values.environment);
+    return {
+        ...(file !== undefined ? { file } : {}),
+        root,
+        locations,
+        codeLocations,
+        outside,
+        placeholders,
+        placeholderPrefix: str(values.placeholderPrefix) ?? "${",
+        placeholderSuffix: str(values.placeholderSuffix) ?? "}",
+        placeholderReplacement: !(replacement === false || replacement === "false"),
+        sqlMigrationPrefix: str(values.sqlMigrationPrefix) ?? "V",
+        repeatableSqlMigrationPrefix: str(values.repeatableSqlMigrationPrefix) ?? "R",
+        baselineMigrationPrefix: str(values.baselineMigrationPrefix) ?? "B",
+        undoSqlMigrationPrefix: str(values.undoSqlMigrationPrefix) ?? "U",
+        sqlMigrationSeparator: str(values.sqlMigrationSeparator) ?? "__",
+        sqlMigrationSuffixes: list(values.sqlMigrationSuffixes) ?? [".sql"],
+        ...(defaultSchema !== undefined ? { defaultSchema } : {}),
+        ...(user !== undefined ? { user } : {}),
+        ...(database !== undefined ? { database } : {}),
+        ...(url !== undefined ? { url } : {}),
+        ...(dialect !== undefined ? { dialect } : {}),
+        table: str(values.table) ?? "flyway_schema_history",
+        ...(environment !== undefined ? { environment } : {}),
+    };
+}
+/** Every file under `dir`, recursively, tree-relative, sorted; none when it does not exist. */
+export function walk(tree, dir) {
+    const entries = tree.list(dir);
+    if (!entries)
+        return [];
+    const out = [];
+    for (const e of [...entries].sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0))) {
+        const p = joinPath(dir, e.name);
+        if (e.type === "dir")
+            out.push(...walk(tree, p));
+        else
+            out.push(p);
+    }
+    return out;
+}
+const base = (f) => posix.basename(f);
+/** A Flyway SQL callback (`beforeMigrate.sql`, `afterEachMigrate__notify.sql`, ...): run around a migrate, not a migration. */
+export const isCallback = (file) => /^(before|after)[A-Z][A-Za-z]*(__.*)?\.[A-Za-z]+$/.test(base(file));
+/** The code migrations (Java, Kotlin) in `config`'s locations, relative to the tree. */
+export function codeMigrations(tree, config) {
+    const code = /\.(java|kt|class)$/;
+    const prefixes = [config.sqlMigrationPrefix, config.repeatableSqlMigrationPrefix, config.baselineMigrationPrefix].filter(Boolean);
+    const migration = (f) => code.test(f) && prefixes.some((p) => base(f).startsWith(p)) && base(f).includes(config.sqlMigrationSeparator);
+    return [...new Set([...config.locations, ...config.codeLocations])].flatMap((d) => walk(tree, d)).filter(migration);
+}
+/** The values Flyway gives its own placeholders, for `file`. */
+function builtins(config, file, fallback) {
+    return {
+        "flyway:defaultSchema": config.defaultSchema ?? fallback.defaultSchema,
+        "flyway:user": config.user,
+        "flyway:database": config.database,
+        "flyway:timestamp": new Date().toISOString().replace("T", " ").replace(/\..*$/, ""),
+        "flyway:filename": base(file),
+        "flyway:workingDirectory": process.cwd(),
+        "flyway:table": config.table,
+        "flyway:environment": config.environment,
+    };
+}
+const escape = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+/** A placeholder with no value; `file` is as the caller passed it, `line` is from 1. */
+export class FlywayPlaceholderError extends Error {
+    constructor(file, line, placeholder, name, where) {
+        super(`${file}:${String(line)}: no value for the placeholder ${placeholder}; set it in ${where} (flyway.placeholders.${name} in flyway.conf, [flyway.placeholders] in flyway.toml)`);
+        this.file = file;
+        this.line = line;
+        this.placeholder = placeholder;
+        this.name = name;
+        this.where = where;
+    }
+}
+/**
+ * `text` with its placeholders replaced, line by line so line numbers hold.
+ * A placeholder with no value throws a {@link FlywayPlaceholderError} naming
+ * `file` and the line, as Flyway's own run would fail.
+ */
+export function substitute(text, file, config, fallback = {}) {
+    if (!config.placeholderReplacement)
+        return text;
+    const values = { ...builtins(config, file, fallback), ...config.placeholders };
+    const lower = new Map(Object.entries(values).map(([k, v]) => [k.toLowerCase(), v]));
+    const pattern = new RegExp(`${escape(config.placeholderPrefix)}([A-Za-z0-9_.:-]+)${escape(config.placeholderSuffix)}`, "g");
+    return text
+        .split("\n")
+        .map((line, i) => line.replace(pattern, (whole, name) => {
+        const v = values[name] ?? lower.get(name.toLowerCase());
+        if (v === undefined) {
+            const where = config.file === undefined ? "a flyway.toml or flyway.conf beside the migrations" : config.file;
+            throw new FlywayPlaceholderError(file, i + 1, whole, name, where);
+        }
+        return v;
+    }))
+        .join("\n");
+}

package/dist/workspace/graph-cache.d.ts

@@ -156,6 +156,14 @@ export interface CacheSplit {
  * line whose stamp can be taken end up in `hits` or in `pending`.
  */
 export declare function splitCached(plan: MemberPlan, args: ParsedArgs, cache: GraphCache, at: string | null, argvFor?: (unit: RunUnit) => string[]): CacheSplit;
+/**
+ * Every member unit's stamp, by unit id, by the rule {@link splitCached} keys
+ * the cache on (ws-059), with no cache read. A read that is never cached, such
+ * as `chant workspace search` (#4374), still stamps its members this way, so a
+ * reader compares stamps across documents with one meaning. A unit whose stamp
+ * can't be taken is left out.
+ */
+export declare function planStamps(plan: MemberPlan, at: string | null): Map<string, string>;
 /** The plan without the units in `ids`; a toolchain left with no units is dropped. */
 export declare function withoutUnits(plan: MemberPlan, ids: ReadonlySet<string>): MemberPlan;
 /**

package/dist/workspace/graph-cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graph-cache.d.ts","sourceRoot":"","sources":["../../src/workspace/graph-cache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"graph-cache.d.ts","sourceRoot":"","sources":["../../src/workspace/graph-cache.ts"],"names":[],"mappings":"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"}

package/dist/workspace/graph-cache.js

@@ -307,9 +307,7 @@ export function splitCached(plan, args, cache, at, argvFor = (u) => memberArgv("
             // A member read through a generated reader project (#2874) is also keyed on
             // the kind's graph block and the version of the package that reads it.
             const reader = unit.reader ? readerStamp(unit.reader) : "";
-            const abs = unit.dir === "." ? plan.workspace.root : join(plan.workspace.root, ...unit.dir.split("/"));
-            const revision = at ? { commit: at, dir: unit.dir } : undefined;
-            const stamp = memberStamp(abs, unit.exclude, revision);
+            const { abs, revision, stamp } = unitStamp(plan, unit, at);
             if (!stamp)
                 continue;
             stamps.set(unit.id, stamp.value);
@@ -325,6 +323,32 @@ export function splitCached(plan, args, cache, at, argvFor = (u) => memberArgv("
     }
     return { hits, stamps, pending, started };
 }
+/** One unit's stamp, and what it was taken over: the member's directory on disk, and the commit for `--at`. */
+function unitStamp(plan, unit, at) {
+    const abs = unit.dir === "." ? plan.workspace.root : join(plan.workspace.root, ...unit.dir.split("/"));
+    const revision = at ? { commit: at, dir: unit.dir } : undefined;
+    return { abs, ...(revision ? { revision } : {}), stamp: memberStamp(abs, unit.exclude, revision) };
+}
+/**
+ * Every member unit's stamp, by unit id, by the rule {@link splitCached} keys
+ * the cache on (ws-059), with no cache read. A read that is never cached, such
+ * as `chant workspace search` (#4374), still stamps its members this way, so a
+ * reader compares stamps across documents with one meaning. A unit whose stamp
+ * can't be taken is left out.
+ */
+export function planStamps(plan, at) {
+    const stamps = new Map();
+    for (const group of plan.groups) {
+        for (const unit of group.units) {
+            if (unit.group)
+                continue;
+            const { stamp } = unitStamp(plan, unit, at);
+            if (stamp)
+                stamps.set(unit.id, stamp.value);
+        }
+    }
+    return stamps;
+}
 /** The plan without the units in `ids`; a toolchain left with no units is dropped. */
 export function withoutUnits(plan, ids) {
     if (ids.size === 0)

package/dist/workspace/graph-cli.d.ts

@@ -26,8 +26,9 @@
 import type { CommandContext, ParsedArgs } from "../cli/registry.js";
 import { type Plantable } from "./box-factory.js";
 import { type WorkspaceGraph } from "./compose-graph.js";
-import { type ErrorLocation } from "./declaration.js";
-import { type MemberPlan, type Toolchain, type UnitResult } from "./member-commands.js";
+import { type Declaration, type ErrorLocation } from "./declaration.js";
+import { type MemberArgv, type MemberPlan, type Toolchain, type UnitResult } from "./member-commands.js";
+import { type KindRegistry } from "./kinds.js";
 import { type LocatedWorkspace } from "./which-chant.js";
 /** The version of the `graph` document this chant writes. */
 export declare const GRAPH_CONTRACT_VERSION = 1;
@@ -109,6 +110,42 @@ export declare function componentGraphArgv(args: Partial<ParsedArgs>): string[];
 export declare function exportRevision(located: LocatedWorkspace, memberDirs: string[]): string;
 /** Plan a graph read without running anything, for `--dry-run`. Throws a {@link WorkspaceReadError}. */
 export declare function planGraph(query: GraphQuery): MemberPlan;
+/** The members of a workspace read, each read under its own toolchain: what graph and search compose (#4374). */
+export interface MemberReads {
+    located: LocatedWorkspace;
+    declaration: Declaration;
+    kinds: KindRegistry;
+    /** The plan the members ran from. */
+    plan: MemberPlan;
+    /** Each member's answer, the cache's included, in no particular order. */
+    results: UnitResult[];
+    /** The members the cache answered. */
+    served: ReadonlySet<string>;
+    /** Each member's stamp, by unit id (ws-059). */
+    stamps: ReadonlyMap<string, string>;
+    /** With {@link GraphQuery.components}: each member's component graph run. */
+    components?: UnitResult[];
+}
+export interface MemberReadOptions {
+    /** The command line each member runs; `chant graph --format ir` and the verb's flags by default. */
+    argvFor?: MemberArgv;
+    /**
+     * Answer members from the per-member cache and store what they print
+     * (ws-059). Only a read whose output is a graph IR may be cached. When
+     * off, every member is still stamped by the same rule.
+     */
+    cache: boolean;
+}
+/**
+ * Plan the members a workspace read covers, run each under its own toolchain
+ * (ws-021) at the revision asked for, and return what they printed. One
+ * fan-out, shared by `chant workspace graph` and `chant workspace search`
+ * (#4374): `--at` exports the tree once, a member of a package's kind runs in
+ * its reader project, and every member is stamped by the rule of ws-059. The
+ * exported tree and the reader projects are removed before this returns.
+ * Throws a {@link WorkspaceReadError} when the declaration can't be read.
+ */
+export declare function readMembers(query: GraphQuery, options: MemberReadOptions): Promise<MemberReads>;
 /** Read and compose the graph, and build the document. Never throws a {@link WorkspaceReadError}. */
 export declare function workspaceGraph(query: GraphQuery): Promise<GraphResult>;
 export declare function runWorkspaceGraph(ctx: CommandContext): Promise<number>;

package/dist/workspace/graph-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graph-cli.d.ts","sourceRoot":"","sources":["../../src/workspace/graph-cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"graph-cli.d.ts","sourceRoot":"","sources":["../../src/workspace/graph-cli.ts"],"names":[],"mappings":"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"}