@intentius/chant 0.124.46 → 0.124.49

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

@@ -85,7 +85,9 @@ export declare function memberStamp(abs: string, exclude?: readonly string[], at
 export declare function toolchainStamp(toolchain: Toolchain): string;
 /** What a kind's reader adds to the key: its graph block, and the installed version of the package supplying it. */
 export declare function readerStamp(reader: {
-    lexicon: string;
+    lexicon?: string;
+    reader?: string;
+    readerFile?: string;
     config: unknown;
     packageDir: string;
 }): string;

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":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AAMH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,EAAc,KAAK,UAAU,EAAE,KAAK,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/G,gFAAgF;AAChF,eAAO,MAAM,YAAY,IAAI,CAAC;AAE9B,mHAAmH;AACnH,eAAO,MAAM,aAAa,oBAAoB,CAAC;AAE/C,eAAO,MAAM,WAAW,MAAM,CAAC;AAC/B,eAAO,MAAM,SAAS,QAAoB,CAAC;AAE3C,gFAAgF;AAChF,eAAO,MAAM,eAAe,OAAO,CAAC;AAEpC,qFAAqF;AACrF,eAAO,MAAM,UAAU,YAAI,QAAQ,EAAE,WAAW,EAAE,WAAW,CAAU,CAAC;AAExE,yFAAyF;AACzF,eAAO,MAAM,YAAY,EAAE,SAAS,CAAC,MAAM,GAAG,MAAM,CAAC,EAiBpD,CAAC;AAgBF,4EAA4E;AAC5E,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAEhE;AAMD,MAAM,WAAW,KAAK;IACpB,sBAAsB;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,+EAA+E;IAC/E,MAAM,EAAE,MAAM,CAAC;CAChB;AAgDD;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,SAAS,MAAM,EAAO,EAAE,EAAE,CAAC,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG,KAAK,GAAG,SAAS,CASjI;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,SAAS,GAAG,MAAM,CAc3D;AAED,oHAAoH;AACpH,wBAAgB,WAAW,CAAC,MAAM,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAkB3I;AAED,yEAAyE;AACzE,wBAAgB,gBAAgB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAK7E;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACxB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAEhD;AAED,uBAAuB;AACvB,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,oDAAoD;IACpD,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,qDAAqD;IACrD,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAAC;IACzC,GAAG,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAAC;CAC9B;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CASxF;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,UAAU,CA4B7F;AAyBD,8EAA8E;AAC9E,UAAU,OAAO;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,KAAK,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,EAAE,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,UAAU;IACzB,4EAA4E;IAC5E,IAAI,EAAE,UAAU,EAAE,CAAC;IACnB,mEAAmE;IACnE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,oHAAoH;IACpH,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,GAAE,CAAC,IAAI,EAAE,OAAO,KAAK,MAAM,EAAwC,GAAG,UAAU,CA4B5L;AASD;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAUnF;AAED,sFAAsF;AACtF,wBAAgB,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,UAAU,CAInF;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,UAAU,EAAE,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI,CASrG"}

package/dist/workspace/graph-cache.js

@@ -197,7 +197,18 @@ export function readerStamp(reader) {
     catch {
         // An unreadable manifest keys on the directory alone.
     }
-    return JSON.stringify([reader.lexicon, reader.config, reader.packageDir, version]);
+    // A reader module is code: its size and mtime key too, so an edit under the same version is a new read (#4413).
+    let module = "";
+    if (reader.readerFile) {
+        try {
+            const st = statSync(reader.readerFile);
+            module = `${reader.reader}:${st.size}:${st.mtimeMs}`;
+        }
+        catch {
+            module = `${reader.reader}:unreadable`;
+        }
+    }
+    return JSON.stringify([reader.lexicon, reader.config, reader.packageDir, version, ...(module ? [module] : [])]);
 }
 /** The ambient environment, less {@link VOLATILE_ENV}, as one digest. */
 export function environmentStamp(env = process.env) {

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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"}

package/dist/workspace/graph-cli.js

@@ -35,7 +35,8 @@ import { refusedCapabilityView } from "./nested-graph.js";
 import { openGraphCache, planStamps, splitCached, storeReads, withoutUnits } from "./graph-cache.js";
 import { readDeclaration, readerVersion, WORKSPACE_ERROR_CODES, WorkspaceReadError } from "./declaration.js";
 import { describePlan, emitDocument, executePlan, memberStatus, planJson, planMembers } from "./member-commands.js";
-import { loadKindRegistry } from "./kinds.js";
+import { loadKindRegistry, REPO_KIND } from "./kinds.js";
+import { repoIdentity } from "./repo-ref.js";
 import { readKindLinks } from "./kind-link-readers.js";
 import { prepareKindReaders } from "./kind-readers.js";
 import { recordLinkRows } from "./record-assets.js";
@@ -247,11 +248,12 @@ export async function workspaceGraph(query) {
         }
         // Links (#2539) resolve against the declaration that was read, the revision's for --at, and the kinds installed now.
         // A kind's link reader (#3932) reads the member's files in the tree read, as check does.
-        const graph = composeWorkspaceGraph({ name: declaration.name, root: located.root }, inputs, { declaration, kinds, read: readKindLinks(declaration, located.tree, kinds) });
+        const graph = composeWorkspaceGraph({ name: declaration.name, root: located.root, repo: repoIdentity(located.rootOnDisk) }, inputs, { declaration, kinds, read: readKindLinks(declaration, located.tree, kinds) });
         // The box's factory and listing (#3146), from the declaration read, so --at gives them at that revision.
         for (const member of graph.members)
             member.box = graphBox(declaration.members.find((m) => m.name === member.name)?.box ?? null, located.tree, declaration.members);
         // Nested workspaces (#2551, ws-071): read-only, through their own chant workspace graph.
+        // Repo members (#3168): another repository's workspace at its pinned revision, read the same way.
         const nestedFailed = await expandNested(graph, declaration.members, query, located.rootOnDisk, located.at);
         let recordsFailed = false;
         if (query.kind !== undefined) {
@@ -281,28 +283,44 @@ export async function workspaceGraph(query) {
 }
 /**
  * Expand every member of kind `workspace` the query covers, read-only (#2551,
- * ws-071). Returns whether one could not be read.
+ * ws-071), and every member of kind `repo` the same way, at its pinned
+ * revision, fetched into the user's cache (#3168). Returns whether one could
+ * not be read.
  */
 async function expandNested(graph, members, query, rootOnDisk, at) {
-    const nested = members.filter((m) => m.kind === "workspace" && (!query.members?.length || query.members.includes(m.name)));
+    const covered = (m) => !query.members?.length || query.members.includes(m.name);
+    const nested = members.filter((m) => (m.kind === "workspace" || (m.kind === REPO_KIND && m.repo !== null)) && covered(m));
     if (nested.length === 0)
         return false;
     const { foldNested, readNested } = await import("./nested-graph.js");
+    const { fetchRepoAt } = await import("./repo-ref.js");
     const reads = await Promise.all(nested.map(async (m) => {
+        if (m.repo) {
+            // The other repository at its pinned revision, whatever revision the outer read is at.
+            const fetched = fetchRepoAt(m.repo, rootOnDisk);
+            if (!fetched.ok)
+                return { m, read: null, missing: fetched.message };
+            if (!existsSync(fetched.dir))
+                return { m, read: null, missing: `${m.repo.url} at ${m.repo.rev} has no directory ${m.repo.workspace}` };
+            return { m, read: await readNested(fetched.dir, query.args ?? {}, m.repo.rev, GRAPH_OUTPUT_SCHEMA_ID, GRAPH_CONTRACT_VERSION, query.reader), missing: null };
+        }
         const abs = join(rootOnDisk, ...m.dir.split("/"));
         if (!existsSync(abs))
-            return { m, read: null };
-        return { m, read: await readNested(abs, query.args ?? {}, at, GRAPH_OUTPUT_SCHEMA_ID, GRAPH_CONTRACT_VERSION, query.reader) };
+            return { m, read: null, missing: null };
+        return { m, read: await readNested(abs, query.args ?? {}, at, GRAPH_OUTPUT_SCHEMA_ID, GRAPH_CONTRACT_VERSION, query.reader), missing: null };
     }));
     let failed = false;
-    for (const { m, read } of reads) {
+    for (const { m, read, missing } of reads) {
         const member = graph.members.find((x) => x.name === m.name);
         if (!member)
             continue;
+        if (m.repo)
+            member.repo = { ...m.repo, read: read?.ok ? (read.doc.workspace.repo ?? null) : null };
         if (!read) {
             failed = true;
             member.status = "failed";
-            member.reason = { code: "dir-missing", message: `the nested workspace's directory ${m.dir} does not exist` };
+            // A repo that can't be fetched is a read that failed; the contract's codes stay as they are.
+            member.reason = missing !== null ? { code: "command-failed", message: missing } : { code: "dir-missing", message: `the nested workspace's directory ${m.dir} does not exist` };
             continue;
         }
         if (read.stderr.trim() && query.onStderr)

package/dist/workspace/graph.schema.json

@@ -67,6 +67,13 @@
               "type": "string",
               "description": "The declared name. With `at`, it identifies the workspace."
             },
+            "repo": {
+              "type": [
+                "string",
+                "null"
+              ],
+              "description": "Added in contract 1 by #3168. The repository the document came from: the URL of the remote origin of the git repository that holds the workspace, with any user name or password removed, or null when there is no origin or the workspace is outside git. With name, root and the revision, it says which repository's workspace a document describes, so a reader that gathers several repositories' documents, such as an org workspace's repo members, tells them apart."
+            },
             "root": {
               "type": "string",
               "description": "The workspace root relative to the git root, with / separators, \".\" for the git root itself. An absolute path outside a git repository."
@@ -287,6 +294,33 @@
           "type": "string",
           "description": "Relative to the workspace root, with / separators; \".\" is the root member."
         },
+        "repo": {
+          "type": "object",
+          "description": "Added in contract 1 by #3168. For a member of kind repo, the other repository's workspace it names: url, the pinned rev and the workspace root inside that repository. Absent for every other kind. A repo member's dir is @repo/<name>, a marker that names no directory of this repository.",
+          "required": [
+            "url",
+            "rev",
+            "workspace"
+          ],
+          "properties": {
+            "url": {
+              "type": "string"
+            },
+            "rev": {
+              "type": "string"
+            },
+            "workspace": {
+              "type": "string"
+            },
+            "read": {
+              "type": [
+                "string",
+                "null"
+              ],
+              "description": "The repo identity the other repository's own graph document gave (its workspace.repo), or null when it gave none or the read failed."
+            }
+          }
+        },
         "kind": {
           "type": "string"
         },

package/dist/workspace/import-fetch.d.ts

@@ -0,0 +1,38 @@
+/**
+ * The network half of `chant workspace init --from tfc|spacelift` (#3178).
+ *
+ * Reads the Terraform Cloud API or the Spacelift GraphQL API into the input
+ * documents `import-source.ts` maps. The transport is a parameter, so a test
+ * feeds fixture responses and nothing here is reached without a token. A
+ * token is read from `--token`, else `TFE_TOKEN` / `TF_TOKEN_app_terraform_io`
+ * for Terraform Cloud and `SPACELIFT_API_TOKEN` for Spacelift. Only reads:
+ * every request is a GET, or a GraphQL query with no mutation.
+ */
+import type { SpaceliftInput, TfcInput } from "./import-source.js";
+export type Fetcher = (url: string, init?: {
+    method?: string;
+    headers?: Record<string, string>;
+    body?: string;
+}) => Promise<{
+    ok: boolean;
+    status: number;
+    json(): Promise<unknown>;
+}>;
+export declare class ImportFetchError extends Error {
+}
+export interface TfcFetchOptions {
+    organization: string;
+    token: string;
+    /** Default `https://app.terraform.io`; a Terraform Enterprise host works too. */
+    host?: string;
+    fetcher?: Fetcher;
+}
+export declare function fetchTfc(options: TfcFetchOptions): Promise<TfcInput>;
+export interface SpaceliftFetchOptions {
+    /** The account's endpoint, e.g. `https://acme.app.spacelift.io/graphql`. */
+    endpoint: string;
+    token: string;
+    fetcher?: Fetcher;
+}
+export declare function fetchSpacelift(options: SpaceliftFetchOptions): Promise<SpaceliftInput>;
+//# sourceMappingURL=import-fetch.d.ts.map

package/dist/workspace/import-fetch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"import-fetch.d.ts","sourceRoot":"","sources":["../../src/workspace/import-fetch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEhE,MAAM,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,KAAK,OAAO,CAAC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC,CAAA;CAAE,CAAC,CAAC;AAEvL,qBAAa,gBAAiB,SAAQ,KAAK;CAAG;AAa9C,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,iFAAiF;IACjF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAsB,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC,CAqD1E;AAID,MAAM,WAAW,qBAAqB;IACpC,4EAA4E;IAC5E,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AASD,wBAAsB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,cAAc,CAAC,CA2C5F"}

package/dist/workspace/import-fetch.js

@@ -0,0 +1,99 @@
+/**
+ * The network half of `chant workspace init --from tfc|spacelift` (#3178).
+ *
+ * Reads the Terraform Cloud API or the Spacelift GraphQL API into the input
+ * documents `import-source.ts` maps. The transport is a parameter, so a test
+ * feeds fixture responses and nothing here is reached without a token. A
+ * token is read from `--token`, else `TFE_TOKEN` / `TF_TOKEN_app_terraform_io`
+ * for Terraform Cloud and `SPACELIFT_API_TOKEN` for Spacelift. Only reads:
+ * every request is a GET, or a GraphQL query with no mutation.
+ */
+export class ImportFetchError extends Error {
+}
+const defaultFetch = (url, init) => fetch(url, init);
+export async function fetchTfc(options) {
+    const fetcher = options.fetcher ?? defaultFetch;
+    const base = (options.host ?? "https://app.terraform.io").replace(/\/$/, "");
+    const headers = { Authorization: `Bearer ${options.token}`, "Content-Type": "application/vnd.api+json" };
+    const list = async (path) => {
+        const out = [];
+        let url = `${base}/api/v2${path}${path.includes("?") ? "&" : "?"}page%5Bsize%5D=100`;
+        while (url) {
+            const res = await fetcher(url, { method: "GET", headers });
+            if (!res.ok)
+                throw new ImportFetchError(`Terraform Cloud answered ${res.status} for ${url.replace(base, "")}`);
+            const body = (await res.json());
+            out.push(...(body.data ?? []));
+            url = body.links?.next ?? undefined;
+        }
+        return out;
+    };
+    const org = encodeURIComponent(options.organization);
+    const [projects, workspaces, policySets] = await Promise.all([list(`/organizations/${org}/projects`), list(`/organizations/${org}/workspaces`), list(`/organizations/${org}/policy-sets`)]);
+    const full = [];
+    for (const w of workspaces) {
+        const a = w.attributes ?? {};
+        const [vars, triggers] = await Promise.all([list(`/workspaces/${w.id}/vars`), list(`/workspaces/${w.id}/run-triggers?filter%5Brun-trigger%5D%5Btype%5D=inbound`)]);
+        const project = w.relationships?.project?.data;
+        full.push({
+            id: w.id,
+            name: String(a.name ?? w.id),
+            ...(project && !Array.isArray(project) ? { project: project.id } : {}),
+            ...(a["working-directory"] ? { workingDirectory: String(a["working-directory"]) } : {}),
+            ...(a["terraform-version"] ? { terraformVersion: String(a["terraform-version"]) } : {}),
+            ...(a["vcs-repo"]?.identifier ? { vcsRepo: a["vcs-repo"].identifier } : {}),
+            tags: Array.isArray(a["tag-names"]) ? a["tag-names"] : [],
+            variables: vars.map((v) => ({ key: String(v.attributes?.key ?? ""), category: String(v.attributes?.category ?? ""), sensitive: v.attributes?.sensitive === true })),
+            runTriggers: triggers
+                .map((t) => t.relationships?.sourceable?.data?.id)
+                .filter((id) => typeof id === "string"),
+        });
+    }
+    return {
+        organization: options.organization,
+        projects: projects.map((p) => ({ id: p.id, name: String(p.attributes?.name ?? p.id) })),
+        workspaces: full,
+        policySets: policySets.map((p) => ({
+            id: p.id,
+            name: String(p.attributes?.name ?? p.id),
+            kind: String(p.attributes?.kind ?? "sentinel"),
+            global: p.attributes?.global === true,
+            workspaces: (p.relationships?.workspaces?.data ?? []).map((x) => x.id),
+        })),
+    };
+}
+const SPACELIFT_QUERY = `query ChantImport {
+  stacks { id name space repository branch projectRoot vendor { __typename } labels
+    attachedPolicies: attachedPolicies { id }
+    dependsOn: dependencies { stackId references { outputName inputName } } }
+  policies { id name type }
+}`;
+export async function fetchSpacelift(options) {
+    const fetcher = options.fetcher ?? defaultFetch;
+    const res = await fetcher(options.endpoint, {
+        method: "POST",
+        headers: { Authorization: `Bearer ${options.token}`, "Content-Type": "application/json" },
+        body: JSON.stringify({ query: SPACELIFT_QUERY }),
+    });
+    if (!res.ok)
+        throw new ImportFetchError(`Spacelift answered ${res.status} for ${options.endpoint}`);
+    const body = (await res.json());
+    if (body.errors?.length)
+        throw new ImportFetchError(`Spacelift: ${body.errors.map((e) => e.message).join("; ")}`);
+    return {
+        account: new URL(options.endpoint).hostname.split(".")[0],
+        stacks: (body.data?.stacks ?? []).map((s) => ({
+            id: s.id,
+            name: s.name,
+            ...(s.space ? { space: s.space } : {}),
+            ...(s.repository ? { repository: s.repository } : {}),
+            ...(s.branch ? { branch: s.branch } : {}),
+            ...(s.projectRoot ? { projectRoot: s.projectRoot } : {}),
+            vendor: (s.vendor?.__typename ?? "TerraformStackVendor").replace(/StackVendor$|Vendor$/, "").toLowerCase() || "terraform",
+            labels: s.labels ?? [],
+            policies: (s.attachedPolicies ?? []).map((p) => p.id),
+            dependsOn: (s.dependsOn ?? []).map((d) => ({ stack: d.stackId, references: d.references ?? [] })),
+        })),
+        policies: body.data?.policies ?? [],
+    };
+}