primitive-admin 1.0.62 → 1.0.64

package/dist/src/commands/databases.js

@@ -1,27 +1,23 @@
-import { Option } from "commander";
 import { readFileSync, writeFileSync, appendFileSync, mkdirSync, existsSync, readdirSync } from "fs";
 import * as path from "path";
 import { ApiClient } from "../lib/api-client.js";
-import { getCurrentAppId } from "../lib/config.js";
+import { getCurrentAppId, resolveAppId } from "../lib/config.js";
 import { resolveCodegenSourceDir } from "../lib/codegen-shared/resolveCodegenSourceDir.js";
-import { resolveSyncDirOverride } from "../lib/sync-dir-selector.js";
+import { resolveSyncDir } from "../lib/sync-paths.js";
 import { parseCsv, applyColumnMap, buildRows } from "../lib/csv.js";
 import { chunk, parseBatchSize } from "../lib/batch.js";
 import { generateDbTypes, } from "../lib/db-codegen/dbGenerator.js";
 import { generateDbSwiftTypes } from "../lib/swift-codegen/dbGenerator.js";
 import { success, error, info, warn, keyValue, result as printResult, formatTable, formatId, formatDate, json, } from "../lib/output.js";
 import { confirmPrompt } from "../lib/confirm-prompt.js";
+import { deprecateCommandGroup, warnDeprecated, } from "../lib/deprecation.js";
+/** Successor for the deprecated database CEL context commands and flags. */
+const CEL_CONTEXT_SUCCESSOR = "resource metadata categories (`primitive metadata get|set database <database-id> <category>`; define categories with `primitive config push`)";
 import { parseFilterOptions } from "../lib/record-filter.js";
 import { parseDataOption } from "../lib/data-input.js";
 import { ulid } from "ulid";
-function resolveAppId(appId, options) {
-    const resolved = appId || options.app || getCurrentAppId();
-    if (!resolved) {
-        error("No app specified. Use <app-id>, --app, or 'primitive use <app-id>' to set context.");
-        process.exit(1);
-    }
-    return resolved;
-}
+import { normalizeCliListEnvelope, wholeListEnvelope, } from "../lib/paginate.js";
+import { pageCursorOption, pageLimitOption, parsePageLimit, printEmptyPage, printPageHint, } from "../lib/list-options.js";
 /**
  * Render the flat `{ success, id, appliedFields }` response that
  * `records/save` and `records/patch` return — these endpoints answer with a
@@ -232,21 +228,26 @@ database-type-config' and the 'database-type-configs' group for inspection:
         .argument("[app-id]", "App ID (uses current app if not specified)")
         .option("--app <app-id>", "App ID")
         .option("--owner <user-id>", "Only list databases created by this user")
+        .addOption(pageLimitOption())
+        .addOption(pageCursorOption())
         .option("--json", "Output as JSON")
         .action(async (appId, options) => {
+        const limit = parsePageLimit(options.limit);
         const resolvedAppId = resolveAppId(appId, options);
         const client = new ApiClient();
         try {
-            const result = await client.listDatabases(resolvedAppId, {
+            const page = normalizeCliListEnvelope(await client.listDatabases(resolvedAppId, {
                 owner: options.owner,
-            });
-            const list = Array.isArray(result) ? result : result?.databases ?? [];
+                limit,
+                cursor: options.cursor,
+            }));
+            const list = page.items;
             if (options.json) {
-                json(list);
+                json(page);
                 return;
             }
             if (list.length === 0) {
-                info("No databases found.");
+                printEmptyPage(page, "databases");
                 return;
             }
             console.log(formatTable(list, [
@@ -268,6 +269,7 @@ database-type-config' and the 'database-type-configs' group for inspection:
                     : []),
                 { header: "CREATED", key: "createdAt", format: formatDate },
             ]));
+            printPageHint(page);
         }
         catch (err) {
             error(err.message);
@@ -293,6 +295,9 @@ database-type-config' and the 'database-type-configs' group for inspection:
             // `--cel-context` is the new user-facing name; `--metadata` remains
             // supported for backwards compatibility. When both are provided,
             // --cel-context wins.
+            if (options.celContext !== undefined || options.metadata !== undefined) {
+                warnDeprecated(`primitive databases create ${options.celContext !== undefined ? "--cel-context" : "--metadata"}`, "--initial-metadata (resource metadata categories)", 1815);
+            }
             const contextSource = options.celContext ?? options.metadata;
             if (contextSource) {
                 try {
@@ -451,7 +456,7 @@ database-type-config' and the 'database-type-configs' group for inspection:
             const result = await client.listDatabasePermissions(resolvedAppId, databaseId);
             const list = Array.isArray(result) ? result : result?.permissions ?? [];
             if (options.json) {
-                json(list);
+                json(wholeListEnvelope(list));
                 return;
             }
             if (list.length === 0) {
@@ -1226,8 +1231,11 @@ database-type-config' and the 'database-type-configs' group for inspection:
         const group = databases
             .command(name, { hidden })
             .description(hidden
-            ? "Manage database CEL context (alias of 'cel-context')"
-            : "Manage database CEL context (the dict referenced by access rules and filters)");
+            ? "(deprecated: use resource metadata categories, `primitive metadata`) Manage database CEL context (alias of 'cel-context')"
+            : "(deprecated: use resource metadata categories, `primitive metadata`) Manage database CEL context (the dict referenced by access rules and filters)");
+        // CEL context is deprecated in favour of resource metadata categories
+        // (#1420, #1815), which carry separate read and write rules.
+        deprecateCommandGroup(group, CEL_CONTEXT_SUCCESSOR, { issue: 1815 });
         group
             .command("get")
             .description("Read database CEL context")
@@ -1315,7 +1323,7 @@ database-type-config' and the 'database-type-configs' group for inspection:
             const result = await client.listDatabaseOperations(resolvedAppId, databaseId);
             const list = Array.isArray(result) ? result : [];
             if (options.json) {
-                json(list);
+                json(wholeListEnvelope(list));
                 return;
             }
             if (list.length === 0) {
@@ -1455,7 +1463,7 @@ database-type-config' and the 'database-type-configs' group for inspection:
             const result = await client.listDatabaseIndexes(resolvedAppId, databaseId, options.model);
             const list = result.indexes || [];
             if (options.json) {
-                json(list);
+                json(wholeListEnvelope(list));
                 return;
             }
             if (list.length === 0) {
@@ -1579,8 +1587,14 @@ database-type-config' and the 'database-type-configs' group for inspection:
     databases
         .command("export")
         .description("Export a database (records, indexes, constraints)")
+        // Both positionals are declared optional and the action decides which is
+        // which (#3645). A required positional AFTER an optional one makes the
+        // optional one mandatory: commander binds the first value it sees to
+        // `[app-id]` and then reports the required argument missing, so
+        // `databases export <database-id>` never reached the action. The database
+        // id is still required — enforced below, where the shift is known.
         .argument("[app-id]", "App ID (uses current app if not specified)")
-        .argument("<database-id>", "Database ID to export")
+        .argument("[database-id]", "Database ID to export (required)")
         .option("--app <app-id>", "App ID")
         .option("--output <dir>", "Output directory", "./primitive-export")
         .option("--json", "Output as JSON")
@@ -1611,8 +1625,10 @@ database-type-config' and the 'database-type-configs' group for inspection:
     databases
         .command("import")
         .description("Import a database from an export directory")
+        // Optional in commander, required in the action (#3645) — see `export`
+        // above for why a `<...>` here would make `[app-id]` mandatory.
         .argument("[app-id]", "App ID (uses current app if not specified)")
-        .argument("<path>", "Path to database export directory")
+        .argument("[path]", "Path to database export directory (required)")
         .option("--app <app-id>", "App ID")
         .option("--overwrite", "Replace existing database if ID collides")
         .option("--dry-run", "Show what would be imported without making changes")
@@ -1912,16 +1928,13 @@ database-type-config' and the 'database-type-configs' group for inspection:
         .command("generate")
         .description("Scaffold a starting TOML schema for <database-type> from existing operations + DO introspection, and insert it into the local database-type-configs/<type>.toml file.")
         .argument("<database-type>", "Database type name")
-        .option("--app <app-id>", "App ID")
-        .option("--dir <path>", "Config directory (overrides the auto-resolved per-env path)")
-        .addOption(new Option("--sync-dir <path>", "Deprecated alias of --dir").hideHelp())
         .option("-f, --force", "Overwrite an existing [models.*] block in the local file")
         .option("--json", "Output the generated TOML as JSON")
         .action(async (databaseType, options) => {
-        // Resolve the sync-dir override before the API call, so a caller who
-        // passed both spellings hears about it without a network round trip.
-        const configDir = resolveSyncDirOverride(options, "databases schema generate");
-        const resolvedAppId = resolveAppId(undefined, options);
+        // Resolved before the API call, so a project the CLI cannot resolve is
+        // heard about without a round trip.
+        const targetDir = resolveSyncDir();
+        const resolvedAppId = getCurrentAppId();
         const client = new ApiClient();
         try {
             // 1. Call the server's :scaffold endpoint.
@@ -1931,39 +1944,23 @@ database-type-config' and the 'database-type-configs' group for inspection:
                 json({ schema: scaffoldedToml });
                 return;
             }
-            // 2. Locate the local `database-type-configs/<type>.toml` file. Per the
-            // plan-of-record CLI sync layout, the file lives at
-            // `<config-dir>/database-type-configs/<type>.toml`. We don't need to know
-            // the exact config dir for the happy path — just look for an existing
-            // file relative to the CWD's `.primitive/sync/` directory tree.
+            // 2. Locate the local `database-type-configs/<type>.toml` file, at
+            // `<config-dir>/database-type-configs/<type>.toml`.
+            //
+            // ONE file, for ONE environment (#3153, F4). This used to scan every
+            // `primitive/<env>/` slot under the cwd and edit every
+            // match, which spliced a scaffold generated against the selected
+            // environment's server into other environments' committed files. The
+            // directory now comes from the same resolver every other tree command
+            // uses, so the file it edits is the selected environment's.
             const candidateFiles = [];
-            if (configDir) {
-                candidateFiles.push(path.join(configDir, "database-type-configs", `${databaseType}.toml`));
-            }
-            else {
-                // Search any env/appId subtree under .primitive/sync that matches.
-                const root = path.join(process.cwd(), ".primitive", "sync");
-                if (existsSync(root)) {
-                    for (const env of readdirSync(root)) {
-                        const envDir = path.join(root, env);
-                        try {
-                            for (const app of readdirSync(envDir)) {
-                                const candidate = path.join(envDir, app, "database-type-configs", `${databaseType}.toml`);
-                                if (existsSync(candidate)) {
-                                    candidateFiles.push(candidate);
-                                }
-                            }
-                        }
-                        catch {
-                            // skip non-dirs
-                        }
-                    }
-                }
-            }
+            const candidate = path.join(targetDir, "database-type-configs", `${databaseType}.toml`);
+            if (existsSync(candidate))
+                candidateFiles.push(candidate);
             if (candidateFiles.length === 0) {
                 // No local file found — print the scaffold to stdout and tell
                 // the user where to put it.
-                info(`No local database-type-configs/${databaseType}.toml found under .primitive/sync/. Generated TOML:`);
+                info(`No local database-type-configs/${databaseType}.toml found at ${candidate}. Generated TOML:`);
                 console.log("");
                 console.log(scaffoldedToml);
                 return;
@@ -2017,9 +2014,6 @@ database-type-config' and the 'database-type-configs' group for inspection:
         .command("codegen")
         .description("Generate record + operation types from the local database-type-configs/*.toml schema. TypeScript (default): a <type>.generated.ts per database type (record interfaces, per-op input-params interfaces, per-op result aliases, and a typed <type>Ops factory). Swift (--lang swift): a <type>.generated.swift per database type (record structs, per-op params structs, per-op result typealiases, and a typed <Type>Ops factory).\n\nFormatting: the emitted TypeScript is already formatted the way Prettier's DEFAULT config formats it, so a `codegen` -> `prettier --write` -> `codegen --check` pipeline stays green. If your project uses a NON-default Prettier config (a different printWidth, trailingComma, or quote style), Prettier will reformat the generated files and `--check` will then fail: add the generated directory to `.prettierignore` and commit the raw emission instead.")
         .argument("[database-type]", "Generate for a single database type (defaults to every database-type-configs/*.toml found)")
-        .option("--app <app-id>", "App ID")
-        .option("--dir <path>", "Config directory (overrides the auto-resolved per-env path)")
-        .addOption(new Option("--sync-dir <path>", "Deprecated alias of --dir").hideHelp())
         .option("-o, --output <dir>", "Output directory for the generated files (defaults to <config-dir>/database-type-configs/generated/)")
         .option("--lang <lang>", "Target language for the generated types: 'ts' (default) or 'swift'.", "ts")
         .option("--check", "Exit non-zero if generated output is out of date (CI guard); does not write. Compares byte-for-byte, so the file on disk must match the emission exactly.")
@@ -2033,17 +2027,10 @@ database-type-config' and the 'database-type-configs' group for inspection:
                 error(`Unknown --lang "${options.lang}". Use "ts" or "swift".`);
                 process.exit(1);
             }
-            // 1. Resolve the single source database-type-configs/ directory via the
-            //    shared active-environment resolver (issue #1510). Honors
-            //    --dir / --app overrides and resolves the active env
-            //    (--env → PRIMITIVE_ENV → defaultEnvironment → single-env) instead
-            //    of silently merging types across every synced env.
+            // 1. The single source database-type-configs/ directory: the
+            //    environment's, and only ever the environment's (#1510, #3154).
             const dbTypesSourceDir = resolveCodegenSourceDir({
                 subdir: "database-type-configs",
-                options: {
-                    app: options.app,
-                    syncDir: resolveSyncDirOverride(options, "databases codegen"),
-                },
             });
             // 2. Collect the source .toml files (one per database type), filtered
             //    to a single type when an argument is given.
@@ -2063,7 +2050,7 @@ database-type-config' and the 'database-type-configs' group for inspection:
             }
             if (inputs.length === 0) {
                 error(databaseType
-                    ? `No database-type-configs/${databaseType}.toml found under .primitive/sync/.`
+                    ? `No database-type-configs/${databaseType}.toml found under primitive/<env>/.`
                     : "No database-type-configs/*.toml files found to generate from.");
                 process.exit(1);
             }