primitive-admin 1.1.0-alpha.44 → 1.1.0-alpha.46

package/dist/src/lib/codegen-shared/resolveCodegenSourceDir.js

@@ -0,0 +1,168 @@
+/**
+ * Shared source-directory resolution for the CLI codegen commands
+ * (`workflows codegen` #1442 and `databases codegen` #814, issue #1510).
+ *
+ * Both commands read a set of `*.toml` schemas out of a synced sub-directory
+ * (`workflows/` or `database-types/`) and render `*.generated.ts` beside them.
+ * Historically each command located that source directory by scanning EVERY
+ * `.primitive/sync/<env>/<appId>/<subdir>` slot and either hard-erroring on
+ * more than one (`workflows`) or silently merging across environments
+ * (`databases`, via a `seenTypes` dedup). Neither did any environment
+ * resolution, so `PRIMITIVE_ENV=dev workflows codegen` would happily generate
+ * from the `alpha` TOML while `databases codegen` followed a different env —
+ * the two generated-type trees could come from different environments in one
+ * run.
+ *
+ * This helper resolves the source directory the same way every other CLI
+ * command targets an environment: `--env` → `PRIMITIVE_ENV` →
+ * `defaultEnvironment` → single-env → error. `--sync-dir` and `--app` remain
+ * explicit overrides. It returns ONLY the resolved source directory; TOML
+ * collection, type filtering/dedup, and output-dir defaulting stay in each
+ * command.
+ *
+ * Design notes (binding, from the plan of record for #1510):
+ *   - Call `getCurrentEnvironment()` DIRECTLY when no `--sync-dir` is given.
+ *     `resolveSyncDir()`'s internal `safeEnv()` swallows the resolver's
+ *     ambiguity error and falls back to `./config`, so genuine ambiguity must
+ *     be surfaced here, not through `resolveSyncDir()`.
+ *   - Throw plain `Error`s; the calling commands keep their existing
+ *     `error(); process.exit(1)` convention (they catch at the boundary).
+ *   - Do NOT use `resolveAppId()` — it is auth-oriented and exits the process,
+ *     which is wrong for an offline codegen path.
+ *   - Preserve the `--app`-alone legacy fallback: when `--app` is given, NO
+ *     environment was explicitly requested, and env resolution fails (or there
+ *     is no project config / legacy bare-dir mode), scan
+ *     `.primitive/sync/<env>/<app>/<subdir>` for that specific app, resolving
+ *     when it appears under exactly one env and erroring (naming the candidate
+ *     envs) when it appears under more than one. This keeps the existing
+ *     integration contract
+ *     (`cli/tests/integration/workflows-codegen.test.ts`) intact.
+ *   - Do NOT fall through to that scan when an environment WAS explicitly named
+ *     (`--env` or `PRIMITIVE_ENV`) but is invalid/unknown: surface the
+ *     resolver's error instead, so an explicit env selection never silently
+ *     generates code from a different synced environment.
+ */
+import { existsSync, readdirSync } from "fs";
+import { basename, dirname, join } from "path";
+import { getCurrentEnvironment, getExplicitEnvName } from "../env-resolver.js";
+import { getCurrentAppId } from "../config.js";
+import { resolveSyncDir, assertSafePathComponent } from "../sync-paths.js";
+/**
+ * Resolves the single source directory a codegen command should read its
+ * `*.toml` schemas from. Throws a plain `Error` (with a user-facing message)
+ * when the directory can't be resolved unambiguously or doesn't exist.
+ */
+export function resolveCodegenSourceDir(args) {
+    const { subdir, options } = args;
+    const cwd = args.cwd ?? process.cwd();
+    // 1. --sync-dir is an explicit override: use <sync-dir>/<subdir> verbatim.
+    if (options.syncDir) {
+        return requireExisting(join(options.syncDir, subdir), subdir, undefined);
+    }
+    // 2. Resolve the active environment. Call getCurrentEnvironment() directly
+    //    (not via resolveSyncDir/safeEnv) so a genuinely ambiguous project
+    //    surfaces the resolver's "No environment selected… Available: …" error
+    //    with a non-zero exit — unless the caller narrowed the target with
+    //    --app AND did not name an environment, in which case we fall back to the
+    //    legacy per-app scan.
+    //
+    //    The `--app`-alone fallback only applies when NO environment was
+    //    explicitly requested (neither `--env` nor `PRIMITIVE_ENV`). When the
+    //    user DID name an env but it's invalid/unknown, getCurrentEnvironment()
+    //    throws; we must surface that error (non-zero exit) rather than silently
+    //    scanning the app under some OTHER synced environment — that would
+    //    generate code from the wrong env instead of honoring the explicit
+    //    selection.
+    const explicitEnvRequested = getExplicitEnvName() !== null || !!process.env.PRIMITIVE_ENV;
+    let env;
+    try {
+        env = getCurrentEnvironment();
+    }
+    catch (err) {
+        if (options.app && !explicitEnvRequested) {
+            return scanSyncTree({ subdir, appId: options.app, cwd });
+        }
+        throw err;
+    }
+    // 3. Project mode: resolve the app id and build the env/app-scoped path.
+    if (env) {
+        const appId = options.app ?? env.config.appId ?? getCurrentAppId();
+        if (!appId) {
+            throw new Error(`No app configured for environment "${env.name}" in .primitive/config.json ` +
+                `and no --app given. Add "appId" to the environment or pass --app <app-id>.`);
+        }
+        // resolveSyncDir re-reads the (cached) resolved env and guards appId via
+        // assertSafePathComponent, so an unsafe --app is rejected here.
+        const dir = join(resolveSyncDir({ appId }), subdir);
+        return requireExisting(dir, subdir, appId);
+    }
+    // 4. Legacy / bare-dir mode (no .primitive/config.json): scan the sync tree,
+    //    filtered to --app when given. This preserves the pre-#1510 behavior.
+    return scanSyncTree({ subdir, appId: options.app, cwd });
+}
+/**
+ * Legacy fallback: scan `<cwd>/.primitive/sync/<env>/<app>/<subdir>` for a
+ * source directory. When `appId` is given, only that app's slots are
+ * considered. Resolves to the single match; errors clearly on zero or on
+ * ambiguity (naming the candidate apps or envs).
+ */
+function scanSyncTree(args) {
+    const { subdir, appId, cwd } = args;
+    // Defence-in-depth: an --app value flows into a file-system path below, so
+    // reject separators / `..` before using it.
+    if (appId)
+        assertSafePathComponent(appId, "appId");
+    const root = join(cwd, ".primitive", "sync");
+    const found = [];
+    if (existsSync(root)) {
+        for (const envName of readdirSync(root)) {
+            const envDir = join(root, envName);
+            try {
+                for (const app of readdirSync(envDir)) {
+                    if (appId && app !== appId)
+                        continue;
+                    const candidate = join(envDir, app, subdir);
+                    if (existsSync(candidate))
+                        found.push(candidate);
+                }
+            }
+            catch {
+                // Not a directory (or unreadable) — skip.
+            }
+        }
+    }
+    if (found.length === 0) {
+        throw new Error(notFoundMessage(subdir, appId));
+    }
+    if (found.length > 1) {
+        if (appId) {
+            const envs = [
+                ...new Set(found.map((d) => basename(dirname(dirname(d))))),
+            ];
+            throw new Error(`App "${appId}" has a ${subdir}/ directory under multiple environments: ` +
+                `${envs.join(", ")}.\n` +
+                found.map((d) => `  ${d}`).join("\n") +
+                `\nPass --env <name> or --sync-dir to select one.`);
+        }
+        const apps = [...new Set(found.map((d) => basename(dirname(d))))];
+        throw new Error(`Found ${subdir}/ directories for more than one app/env:\n` +
+            found.map((d) => `  ${d}`).join("\n") +
+            `\nCodegen writes into one output dir, so it must run against one app. ` +
+            `Pass --app <app-id> (found: ${apps.join(", ")}) or --sync-dir to select one.`);
+    }
+    return found[0];
+}
+/** Verifies `dir` exists, throwing the standard "no source dir" error otherwise. */
+function requireExisting(dir, subdir, appId) {
+    if (!existsSync(dir)) {
+        throw new Error(notFoundMessage(subdir, appId));
+    }
+    return dir;
+}
+function notFoundMessage(subdir, appId) {
+    return appId
+        ? `No ${subdir}/ directory found for app "${appId}" under .primitive/sync/. ` +
+            `Check the --app id, pass --sync-dir, or run \`primitive sync pull\` first.`
+        : `No ${subdir}/ directory found. Pass --sync-dir or run \`primitive sync pull\` first.`;
+}
+//# sourceMappingURL=resolveCodegenSourceDir.js.map

package/dist/src/lib/codegen-shared/resolveCodegenSourceDir.js.map

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

package/dist/src/lib/db-codegen/dbGenerator.d.ts

@@ -19,6 +19,7 @@
  * `return` step (#1437). This file resolves those into the small descriptors
  * the templates consume; the templates stay pure string-emitters.
  */
+import { type GeneratedFileMismatch } from "../codegen-shared/generatedFiles.js";
 export interface DbCodegenInput {
     /** Database type name (drives the output filename). */
     databaseType: string;
@@ -56,15 +57,37 @@ export interface DbCodegenResult {
     /** Only populated under `--check`: files whose on-disk content is out of date. */
     mismatches: DbCheckMismatch[];
 }
-export interface DbCheckMismatch {
-    filePath: string;
-    reason: "missing" | "differs" | "stale";
-}
+/**
+ * Re-exported from the shared generated-file module so existing importers keep
+ * a stable type. The write/`--check`/cleanup lifecycle now lives in
+ * `codegen-shared/generatedFiles.ts` (shared with `workflows codegen`).
+ */
+export type DbCheckMismatch = GeneratedFileMismatch;
 /**
  * Render the in-memory `.generated.ts` content for a single database-type
  * TOML. Exported so tests can assert on the rendered string directly.
  */
 export declare function renderDbTypeFile(input: DbCodegenInput): string;
+/**
+ * Infer the scalar element TS type for op params consumed by a `$in`/`$nin`
+ * filter operator (#1488, Phase 1). Codegen-only: a param compared with
+ * `$in`/`$nin` against a model field is definitionally an array, so the
+ * typed-ops factory (#1441) should emit `<elem>[]` rather than widening an
+ * untyped/object param to `Record<string, unknown>` (which `string[]` is not
+ * assignable to).
+ *
+ * Kept a small local helper next to {@link inferRequiredRecordFields} rather
+ * than a shared cross-runtime analysis pass (sponsor decision on #1488).
+ *
+ * Returns a map of param name → element TS type. The `"unknown"` sentinel means
+ * "emit `unknown[]`" — used when the compared field is missing from the model
+ * schema (or the op has no resolvable model), when the same param is bound to
+ * fields of differing element types, or when the param is also used as a scalar
+ * elsewhere (conservative widen, mirroring #845's disagreement rule / #1488
+ * Fork 4). A param absent from the map is not consumed by any array operator
+ * and keeps its declared-type mapping (inference never widens such a param).
+ */
+export declare function inferArrayParamElementTypes(op: any, fieldTypesByModel: Map<string, Map<string, string>>): Map<string, string>;
 /**
  * Per-model result of {@link inferRequiredRecordFields}. Shaped as an object
  * (rather than a bare `Set`) so it can grow additional inferred metadata later
@@ -109,6 +132,8 @@ export interface InferredRecordModelInfo {
  */
 export declare function inferRequiredRecordFields(operations: any[]): Map<string, InferredRecordModelInfo>;
 /**
- * Run codegen end-to-end across one or more database-type TOML inputs.
+ * Run codegen end-to-end across one or more database-type TOML inputs. The
+ * disk lifecycle (write / `--check` / stale cleanup) is delegated to the
+ * shared `writeOrCheckGeneratedFiles` (shared with `workflows codegen`).
  */
 export declare function generateDbTypes(options: GenerateDbTypesOptions): Promise<DbCodegenResult>;