primitive-admin 1.0.55 → 1.0.57

package/dist/src/lib/swift-codegen/generator.js

@@ -31,8 +31,13 @@ import * as path from "path";
 import { writeOrCheckGeneratedFiles, } from "../codegen-shared/generatedFiles.js";
 import { fingerprintToml } from "../db-codegen/dbFingerprint.js";
 import { describeWorkflowInvoker } from "../workflow-codegen/invokerIR.js";
-import { renderSwiftRootType } from "./schemaToSwift.js";
+import { renderSwiftRootType, SwiftCodegenError } from "./schemaToSwift.js";
 import { structTypeName, workflowSwiftFactoryName } from "./swiftNaming.js";
+// Foreign banner guarded against when a workflow run shares an output dir with
+// the database Swift generator (issue #1653, class 3b). Function-time use only,
+// so the generator.ts ↔ dbGenerator.ts import cycle resolves safely.
+import { DB_SWIFT_BANNER_PREFIX } from "./dbGenerator.js";
+import { assertNoRetainedSiblingCollision, assertNoForeignGeneratorSymbolCollision, } from "./siblingSymbols.js";
 /** Suffix identifying a generated Swift file. */
 export const GENERATED_SWIFT_FILE_SUFFIX = ".generated.swift";
 /**
@@ -149,7 +154,18 @@ export function renderWorkflowSwiftFile(input) {
     ].join("\n");
     const imports = ["import Foundation", `import ${CLIENT_MODULE}`].join("\n");
     const content = [banner, imports, wf.inputDecl, wf.outputDecl, renderInvoker(wf)].join("\n\n") + "\n";
-    return { key: wf.key, content };
+    // Every top-level Swift symbol this file declares: the `<Key>Input` /
+    // `<Key>Output` types, the `<Key>Workflow` invoker struct, and its
+    // free-function factory. Enumerating ALL of them (issue #1653, Codex
+    // refinement) lets the run-scoped registry catch a cross-workflow collision on
+    // any of them, not just Input/Output.
+    const symbols = [
+        wf.inputTypeName,
+        wf.outputTypeName,
+        `${wf.base}Workflow`,
+        workflowSwiftFactoryName(wf.key),
+    ];
+    return { key: wf.key, content, symbols };
 }
 /**
  * Run Swift workflow codegen end-to-end. One `<key>.generated.swift` per
@@ -158,14 +174,78 @@ export function renderWorkflowSwiftFile(input) {
  */
 export async function generateWorkflowSwiftTypes(options) {
     const outAbs = path.resolve(options.outputDir);
+    // Run-scoped registry: emitted top-level Swift symbol → the workflow key that
+    // emitted it. Two DIFFERENT keys emitting the same symbol redeclare when all
+    // `.generated.swift` files compile into one module (issue #1653, class 1).
+    const symbolOwner = new Map();
     const filesToWrite = new Map();
     for (const input of options.inputs) {
         const rendered = renderWorkflowSwiftFile(input);
         if (!rendered)
-            continue; // reserved workflow — no file
+            continue; // reserved workflow — no file, no symbols
+        for (const symbol of rendered.symbols) {
+            const prior = symbolOwner.get(symbol);
+            if (prior !== undefined && prior !== rendered.key) {
+                throw new SwiftCodegenError(`swift workflow codegen: type-name collision — workflow keys ` +
+                    `"${prior}" and "${rendered.key}" both produce Swift type ` +
+                    `"${symbol}", which redeclare when all .generated.swift files ` +
+                    `compile into one module. Rename one workflow key so the two differ ` +
+                    `after Swift PascalCase normalization.`, { sourceFile: `workflows/${rendered.key}.toml` });
+            }
+            symbolOwner.set(symbol, rendered.key);
+        }
         const filePath = path.join(outAbs, `${rendered.key}${GENERATED_SWIFT_FILE_SUFFIX}`);
         filesToWrite.set(filePath, rendered.content);
     }
+    // Filtered-run sibling collision (issue #1653, class 1 for `--single` runs).
+    // A `singleWorkflow` run renders only the selected key; its retained sibling
+    // `.generated.swift` files stay on disk but never enter `symbolOwner` above,
+    // so a symbol this run emits could still redeclare against a sibling once
+    // every file compiles into one module. The foreign-banner write guard does NOT
+    // cover this (siblings carry the SAME banner and a different filename, so there
+    // is no path or banner collision). Compare against the retained siblings' own
+    // declared symbols — no persistent manifest (sponsor decision #1).
+    if (options.singleWorkflow === true) {
+        await assertNoRetainedSiblingCollision({
+            outputDir: outAbs,
+            ownershipBanner: SWIFT_BANNER_PREFIX,
+            suffix: GENERATED_SWIFT_FILE_SUFFIX,
+            emitted: symbolOwner,
+            ownPaths: filesToWrite.keys(),
+            makeError: ({ symbol, owner, siblingStem }) => new SwiftCodegenError(`swift workflow codegen: type-name collision with a retained sibling — ` +
+                `workflow key "${owner}" (this run) and the existing ` +
+                `"${siblingStem}${GENERATED_SWIFT_FILE_SUFFIX}" both declare Swift ` +
+                `symbol "${symbol}", which redeclares when all .generated.swift files ` +
+                `compile into one module. A filtered (single-workflow) run does not ` +
+                `regenerate siblings, so both files coexist. Rename one workflow key, ` +
+                `or regenerate the whole output directory.`, { sourceFile: `workflows/${owner}.toml` }),
+        });
+    }
+    // Cross-generator namespace collision (issue #1857), the mirror of the check
+    // in the DB generator. A workflow's top-level symbol (`<Key>Input`, etc.) can
+    // match the namespace enum name a DATABASE-generated file already declares in
+    // a shared output dir — e.g. workflow `foo` emits a top-level struct `FooInput`
+    // while db type `foo-input` emits `public enum FooInput`. Their filenames
+    // differ, so the foreign-banner WRITE guard below (path-only) never trips, and
+    // the retained-sibling guard above only scans workflow-owned files. This scan
+    // reads the DB-owned siblings' declared top-level symbols and throws if any of
+    // this run's emitted symbols collides. It runs on every workflow run (not just
+    // filtered), because a full workflow run does not regenerate DB files — they
+    // coexist regardless of ordering.
+    await assertNoForeignGeneratorSymbolCollision({
+        outputDir: outAbs,
+        foreignBanner: DB_SWIFT_BANNER_PREFIX,
+        suffix: GENERATED_SWIFT_FILE_SUFFIX,
+        emitted: symbolOwner,
+        makeError: ({ symbol, owner, siblingStem }) => new SwiftCodegenError(`swift workflow codegen: type-name collision with a database-generated ` +
+            `file — workflow key "${owner}" emits Swift type "${symbol}", but the ` +
+            `existing "${siblingStem}${GENERATED_SWIFT_FILE_SUFFIX}" (owned by the ` +
+            `database Swift generator) already declares a top-level "${symbol}" in ` +
+            `the same output directory, which redeclares when all .generated.swift ` +
+            `files compile into one module. Rename the workflow or the ` +
+            `"${siblingStem}" database type so the two differ after Swift ` +
+            `normalization, or give one generator a separate --output directory.`, { sourceFile: `workflows/${owner}.toml` }),
+    });
     return await writeOrCheckGeneratedFiles({
         outputDir: outAbs,
         filesToWrite,
@@ -173,6 +253,14 @@ export async function generateWorkflowSwiftTypes(options) {
         fullOwnership: options.singleWorkflow !== true,
         generatedSuffix: GENERATED_SWIFT_FILE_SUFFIX,
         ownershipBanner: SWIFT_BANNER_PREFIX,
+        // Class 3b: never clobber a file owned by the database Swift generator.
+        foreignOwnershipBanners: [DB_SWIFT_BANNER_PREFIX],
+        onForeignBannerCollision: ({ filePath, foreignBanner }) => new SwiftCodegenError(`swift codegen: output collision — this run would overwrite ` +
+            `"${path.basename(filePath)}" in the shared output directory, which ` +
+            `is already owned by a different generator (banner ` +
+            `"${foreignBanner.trim()}"). A workflow key and a database type with ` +
+            `the same name cannot share an output directory; give one generator a ` +
+            `separate --output directory.`),
     });
 }
 //# sourceMappingURL=generator.js.map

package/dist/src/lib/swift-codegen/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/lib/swift-codegen/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/lib/swift-codegen/generator.ts"],"names":[],"mappings":"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"}

package/dist/src/lib/swift-codegen/siblingSymbols.d.ts

@@ -0,0 +1,90 @@
+/**
+ * Retained-sibling collision detection for filtered Swift codegen runs
+ * (issue #1653, class 3a for `--single` runs).
+ *
+ * A `singleType` / `singleWorkflow` run renders ONLY the selected input, but its
+ * sibling `.generated.swift` files stay on disk (they are deliberately retained
+ * — orphan cleanup is scoped to the filtered file). Those siblings never enter
+ * the run-scoped in-memory registry, which sees only `options.inputs`, so a
+ * symbol the filtered run emits could still redeclare against a sibling once all
+ * files compile into one module.
+ *
+ * The cross-generator foreign-banner write guard does NOT cover this: siblings
+ * carry the SAME ownership banner and a DIFFERENT filename, so there is neither a
+ * path collision nor a foreign banner to trip. This module closes that gap by
+ * re-deriving each retained sibling's declared top-level symbols directly from
+ * the file on disk and comparing them against the run's emitted symbols — no
+ * persistent symbol manifest (sponsor decision #1 reserved that for a follow-up).
+ */
+/** Parse the module-level Swift symbols declared in a generated file's source. */
+export declare function parseTopLevelSwiftSymbols(content: string): string[];
+/**
+ * Map each retained sibling's declared top-level symbol → the sibling's file
+ * stem (its owner). Only generator-owned files (content starts with
+ * `ownershipBanner`) are considered; the run's own output paths are excluded so
+ * a filtered re-run never collides with the file it is about to rewrite. On the
+ * first sibling that declares a symbol, that sibling wins (deterministic by
+ * directory-read order).
+ */
+export declare function collectRetainedSiblingSymbols(opts: {
+    outputDir: string;
+    ownershipBanner: string;
+    suffix: string;
+    excludePaths: Iterable<string>;
+}): Promise<Map<string, string>>;
+/**
+ * Throw if any symbol this filtered run emits collides with a retained sibling
+ * already on disk. `emitted` maps symbol → the emitting input's owner key; a
+ * sibling owning the SAME symbol under a DIFFERENT stem is a redeclaration. The
+ * caller supplies `makeError` so the shared module stays free of the Swift
+ * error type.
+ */
+export declare function assertNoRetainedSiblingCollision(opts: {
+    outputDir: string;
+    ownershipBanner: string;
+    suffix: string;
+    emitted: Map<string, string>;
+    ownPaths: Iterable<string>;
+    makeError: (info: {
+        symbol: string;
+        owner: string;
+        siblingStem: string;
+    }) => Error;
+}): Promise<void>;
+/**
+ * Throw if any symbol this run emits collides with a top-level symbol declared
+ * by a file owned by ANOTHER generator (a DIFFERENT ownership banner) in the
+ * same output dir (issue #1857).
+ *
+ * The same-banner retained-sibling guard above and the foreign-banner WRITE
+ * guard both miss this class. When database and workflow Swift codegen share an
+ * output dir, a database type `foo-input` emits `public enum FooInput` in
+ * `foo-input.generated.swift`, while workflow `foo` emits a top-level struct
+ * `FooInput` in `foo.generated.swift`. The two symbols redeclare when the files
+ * compile into one module, but:
+ *   - the retained-sibling guard only scans files carrying THIS generator's own
+ *     banner, so it never reads the other generator's file; and
+ *   - the foreign-banner write guard only fires on identical file PATHS, and
+ *     these filenames differ.
+ * So both generators succeed and `swift build` fails with an invalid
+ * redeclaration. This guard closes the gap: whichever generator runs second
+ * finds the other's file already on disk and reports the clash. It intentionally
+ * runs on every run (full or filtered), because a full run does not regenerate
+ * the foreign generator's files — they always coexist.
+ *
+ * `emitted` maps symbol → the emitting input's owner key. A foreign file owning
+ * the SAME symbol is always a redeclaration: foreign files carry a different
+ * banner and (because same-path clashes are caught by the write guard) a
+ * different filename, so there is no self-collision to exclude.
+ */
+export declare function assertNoForeignGeneratorSymbolCollision(opts: {
+    outputDir: string;
+    foreignBanner: string;
+    suffix: string;
+    emitted: Map<string, string>;
+    makeError: (info: {
+        symbol: string;
+        owner: string;
+        siblingStem: string;
+    }) => Error;
+}): Promise<void>;

package/dist/src/lib/swift-codegen/siblingSymbols.js

@@ -0,0 +1,152 @@
+/**
+ * Retained-sibling collision detection for filtered Swift codegen runs
+ * (issue #1653, class 3a for `--single` runs).
+ *
+ * A `singleType` / `singleWorkflow` run renders ONLY the selected input, but its
+ * sibling `.generated.swift` files stay on disk (they are deliberately retained
+ * — orphan cleanup is scoped to the filtered file). Those siblings never enter
+ * the run-scoped in-memory registry, which sees only `options.inputs`, so a
+ * symbol the filtered run emits could still redeclare against a sibling once all
+ * files compile into one module.
+ *
+ * The cross-generator foreign-banner write guard does NOT cover this: siblings
+ * carry the SAME ownership banner and a DIFFERENT filename, so there is neither a
+ * path collision nor a foreign banner to trip. This module closes that gap by
+ * re-deriving each retained sibling's declared top-level symbols directly from
+ * the file on disk and comparing them against the run's emitted symbols — no
+ * persistent symbol manifest (sponsor decision #1 reserved that for a follow-up).
+ */
+import * as path from "path";
+import { promises as fsp } from "fs";
+/**
+ * Top-level Swift declarations a generated file exposes to its module. Anchored
+ * to column 0 so nested (indented) enum/struct declarations and the `<Type>Ops`
+ * factory's struct methods are excluded — only module-level symbols can collide
+ * across files. A backtick-escaped reserved-word identifier is unescaped so the
+ * key matches what the emitter tracks in its registry.
+ *
+ * The identifier character class mirrors the emitter's alphabet in
+ * `swiftNaming.ts` exactly (`isLetter` = `\p{L}`, `isAsciiDigit` = ASCII `0`–`9`,
+ * plus `_`), so the parser recognizes precisely what the emitter can emit —
+ * including Unicode-letter identifiers like `ÉFlowInput` that an ASCII-only
+ * `[A-Za-z0-9_]+` capture would miss (issue #1705). The `u` flag makes `\p{L}`
+ * a valid Unicode property escape.
+ */
+const TOP_LEVEL_DECL = /^public (?:struct|typealias|enum|func)\s+`?([\p{L}0-9_]+)`?/u;
+/** Parse the module-level Swift symbols declared in a generated file's source. */
+export function parseTopLevelSwiftSymbols(content) {
+    const symbols = [];
+    for (const line of content.split("\n")) {
+        const m = TOP_LEVEL_DECL.exec(line);
+        if (m)
+            symbols.push(m[1]);
+    }
+    return symbols;
+}
+/**
+ * Map each retained sibling's declared top-level symbol → the sibling's file
+ * stem (its owner). Only generator-owned files (content starts with
+ * `ownershipBanner`) are considered; the run's own output paths are excluded so
+ * a filtered re-run never collides with the file it is about to rewrite. On the
+ * first sibling that declares a symbol, that sibling wins (deterministic by
+ * directory-read order).
+ */
+export async function collectRetainedSiblingSymbols(opts) {
+    const exclude = new Set([...opts.excludePaths].map((p) => path.resolve(p)));
+    const out = new Map();
+    let entries;
+    try {
+        entries = await fsp.readdir(opts.outputDir, { withFileTypes: true });
+    }
+    catch {
+        return out; // output dir absent → no siblings
+    }
+    for (const entry of entries.sort((a, b) => a.name.localeCompare(b.name))) {
+        if (!entry.isFile() || !entry.name.endsWith(opts.suffix))
+            continue;
+        const filePath = path.resolve(opts.outputDir, entry.name);
+        if (exclude.has(filePath))
+            continue;
+        let content;
+        try {
+            content = await fsp.readFile(filePath, "utf-8");
+        }
+        catch {
+            continue;
+        }
+        if (!content.startsWith(opts.ownershipBanner))
+            continue; // not ours
+        const stem = entry.name.slice(0, -opts.suffix.length);
+        for (const symbol of parseTopLevelSwiftSymbols(content)) {
+            if (!out.has(symbol))
+                out.set(symbol, stem);
+        }
+    }
+    return out;
+}
+/**
+ * Throw if any symbol this filtered run emits collides with a retained sibling
+ * already on disk. `emitted` maps symbol → the emitting input's owner key; a
+ * sibling owning the SAME symbol under a DIFFERENT stem is a redeclaration. The
+ * caller supplies `makeError` so the shared module stays free of the Swift
+ * error type.
+ */
+export async function assertNoRetainedSiblingCollision(opts) {
+    const siblings = await collectRetainedSiblingSymbols({
+        outputDir: opts.outputDir,
+        ownershipBanner: opts.ownershipBanner,
+        suffix: opts.suffix,
+        excludePaths: opts.ownPaths,
+    });
+    if (siblings.size === 0)
+        return;
+    for (const [symbol, owner] of opts.emitted) {
+        const siblingStem = siblings.get(symbol);
+        if (siblingStem !== undefined && siblingStem !== owner) {
+            throw opts.makeError({ symbol, owner, siblingStem });
+        }
+    }
+}
+/**
+ * Throw if any symbol this run emits collides with a top-level symbol declared
+ * by a file owned by ANOTHER generator (a DIFFERENT ownership banner) in the
+ * same output dir (issue #1857).
+ *
+ * The same-banner retained-sibling guard above and the foreign-banner WRITE
+ * guard both miss this class. When database and workflow Swift codegen share an
+ * output dir, a database type `foo-input` emits `public enum FooInput` in
+ * `foo-input.generated.swift`, while workflow `foo` emits a top-level struct
+ * `FooInput` in `foo.generated.swift`. The two symbols redeclare when the files
+ * compile into one module, but:
+ *   - the retained-sibling guard only scans files carrying THIS generator's own
+ *     banner, so it never reads the other generator's file; and
+ *   - the foreign-banner write guard only fires on identical file PATHS, and
+ *     these filenames differ.
+ * So both generators succeed and `swift build` fails with an invalid
+ * redeclaration. This guard closes the gap: whichever generator runs second
+ * finds the other's file already on disk and reports the clash. It intentionally
+ * runs on every run (full or filtered), because a full run does not regenerate
+ * the foreign generator's files — they always coexist.
+ *
+ * `emitted` maps symbol → the emitting input's owner key. A foreign file owning
+ * the SAME symbol is always a redeclaration: foreign files carry a different
+ * banner and (because same-path clashes are caught by the write guard) a
+ * different filename, so there is no self-collision to exclude.
+ */
+export async function assertNoForeignGeneratorSymbolCollision(opts) {
+    const foreign = await collectRetainedSiblingSymbols({
+        outputDir: opts.outputDir,
+        ownershipBanner: opts.foreignBanner,
+        suffix: opts.suffix,
+        excludePaths: [], // foreign-banner files are never this run's own outputs
+    });
+    if (foreign.size === 0)
+        return;
+    for (const [symbol, owner] of opts.emitted) {
+        const siblingStem = foreign.get(symbol);
+        if (siblingStem !== undefined) {
+            throw opts.makeError({ symbol, owner, siblingStem });
+        }
+    }
+}
+//# sourceMappingURL=siblingSymbols.js.map

package/dist/src/lib/swift-codegen/siblingSymbols.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"siblingSymbols.js","sourceRoot":"","sources":["../../../../src/lib/swift-codegen/siblingSymbols.ts"],"names":[],"mappings":"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"}