okmodel 0.8.0 → 0.9.1

package/dist/tooling/cli.js

@@ -1,6 +1,7 @@
 import"../shared/12z7aznj.js";
 import"../shared/n442h54c.js";
-import"../shared/35q0n9tz.js";
+import"../shared/fk9vef30.js";
+import"../shared/jvxcp1qk.js";
 import {
   formatFindings,
   hasError,
@@ -8,12 +9,12 @@ import {
   buildProject,
   generateProject,
   planProject,
-  checkProject
-} from "../shared/f4jy1j7x.js";
+  checkProject,
+  exportProject
+} from "../shared/wp7y8q3y.js";
 import {
   sessionFailure
-} from "../shared/dpc2r7rb.js";
-import"../shared/sjk86yrx.js";
+} from "../shared/bdekbvmt.js";
 import {
   OkmError2
 } from "../shared/52szzakm.js";
@@ -53,8 +54,18 @@ async function run(argv, io) {
 `);
     return;
   }
+  if (command === "catalog") {
+    const sub = rest[0];
+    if (sub !== "export") {
+      throw new OkmError2("invalid", `Unknown command catalog ${sub ?? ""}.`, {
+        fix: { summary: "Use okm catalog export." }
+      });
+    }
+    stdout(await exportProject(cwd, rest.slice(1)));
+    return;
+  }
   if (command === "check") {
-    const findings = await checkProject(cwd, invoke(splitFlags(rest)));
+    const findings = await checkProject(cwd, invoke(splitFlags(rest, "check")));
     const warnings = formatFindings(findings);
     if (warnings.length > 0)
       stdout(warnings);
@@ -63,7 +74,7 @@ async function run(argv, io) {
     return;
   }
   if (command === "generate") {
-    const parsed = splitFlags(rest);
+    const parsed = splitFlags(rest, "generate");
     const written = await generateProject(cwd, parsed.name ?? "migration", parsed.flags);
     stdout(written === undefined ? `no changes
 ` : `${written.path}
@@ -73,60 +84,86 @@ async function run(argv, io) {
     return;
   }
   if (command === "dev") {
-    const { devProject } = await import("../shared/zgex00fd.js");
+    const { devProject } = await import("../shared/ak61ye1f.js");
     stdout(await devProject(cwd));
     return;
   }
   if (command === "push") {
-    const { pushProject } = await import("../shared/njga14v4.js");
-    stdout(await pushProject(cwd, invoke(splitFlags(rest))));
+    const { pushProject } = await import("../shared/6vfvsdkt.js");
+    stdout(await pushProject(cwd, invoke(splitFlags(rest, "push"))));
+    return;
+  }
+  if (command === "pull") {
+    const { pullProject } = await import("../shared/esy4dyxe.js");
+    stdout((await pullProject(cwd, rest)).text);
+    return;
+  }
+  if (command === "import") {
+    const sub = rest[0];
+    if (sub !== "drizzle") {
+      throw new OkmError2("invalid", `Unknown command import ${sub ?? ""}.`, {
+        fix: { summary: "Use okm import drizzle <path>." }
+      });
+    }
+    const { importDrizzle } = await import("../shared/8gdbty5v.js");
+    stdout((await importDrizzle(cwd, rest.slice(1))).text);
     return;
   }
   if (command === "migrate") {
     const sub = rest[0];
-    const parsed = splitFlags(rest.slice(1));
+    const migrateArgs = rest.slice(1);
+    const commandKey = sub === "plan" ? "migrate plan" : sub === "apply" ? "migrate apply" : sub === "status" ? "migrate status" : sub === "check" ? "migrate check" : undefined;
+    if (commandKey === undefined) {
+      throw new OkmError2("invalid", `Unknown command migrate ${sub ?? ""}.`, {
+        fix: { summary: "Use okm migrate plan, apply, status, or check." }
+      });
+    }
+    const parsed = splitFlags(sub === "plan" ? migrateArgs.filter((arg) => arg !== "--json") : migrateArgs, commandKey);
     if (sub === "plan") {
       if (parsed.name === undefined) {
         throw new OkmError2("invalid", "okm migrate plan needs a name.");
       }
       const planned = await planProject(cwd, parsed.name, parsed.flags, invoke(parsed));
-      stdout(planned.text);
-      stdout(formatFindings(planned.findings));
+      if (migrateArgs.includes("--json"))
+        stdout(planned.json);
+      else {
+        stdout(planned.text);
+        stdout(formatFindings(planned.findings));
+      }
       if (hasError(planned.findings))
         throw lintRefusal(planned.findings);
       return;
     }
     if (sub === "apply") {
-      const { applyProject } = await import("../shared/njga14v4.js");
+      const { applyProject } = await import("../shared/6vfvsdkt.js");
       stdout(await applyProject(cwd, invoke(parsed), stdout));
       return;
     }
     if (sub === "status") {
-      const { statusProject } = await import("../shared/195pzzzz.js");
+      const { statusProject } = await import("../shared/kzgrcy8s.js");
       stdout(await statusProject(cwd, invoke(parsed)));
       return;
     }
     if (sub === "check") {
-      const { checkMigrations } = await import("../shared/jp36k7dp.js");
-      const provision = parsed.flags.includes("--provision") || rest.slice(1).includes("--provision");
-      stdout(await checkMigrations(cwd, invoke(parsed), { provision }));
+      const { checkMigrations } = await import("../shared/rw4tpcd0.js");
+      stdout(await checkMigrations(cwd, invoke(parsed), { provision: parsed.provision }));
       return;
     }
   }
   if (command === "seed") {
-    const parsed = splitFlags(rest);
+    const parsed = splitFlags(rest, "seed");
     if (parsed.name === undefined) {
       throw new OkmError2("invalid", "okm seed needs a file.", {
         fix: { summary: "Pass okm seed <file>." }
       });
     }
-    const { seedProject } = await import("../shared/hfqmpasr.js");
+    const { seedProject } = await import("../shared/8v7vzpgt.js");
     stdout(await seedProject(cwd, parsed.name, invoke(parsed)));
     return;
   }
   if (command === "doctor") {
-    const parsed = splitFlags(rest);
-    const { doctorProject } = await import("../shared/hm5f8jby.js");
+    const parsed = splitFlags(rest, "doctor");
+    const { doctorProject } = await import("../shared/3vvpcphd.js");
     stdout(await doctorProject(cwd, parsed.name, invoke(parsed)));
     return;
   }
@@ -144,22 +181,54 @@ async function run(argv, io) {
   }
   if (command === "ext") {
     const sub = rest[0];
-    if (sub === "test" || sub === "scaffold") {
-      throw new OkmError2("invalid", `okm ext ${sub} is not available yet.`, {
-        fix: { summary: "okm ext list and okm ext check are the commands in this version." }
-      });
+    if (sub === "scaffold" || sub === "test") {
+      const parsed = extInvocation(rest.slice(1));
+      const { extScaffold, extTest } = await import("../shared/py2zrrm6.js");
+      const text = sub === "scaffold" ? await extScaffold(cwd, requireName(parsed, "okm ext scaffold <name>"), parsed.flags, parsed.out) : await extTest(cwd, requireName(parsed, "okm ext test <file>"), parsed.flags);
+      stdout(text);
+      return;
     }
     if (sub === "list" || sub === "check") {
-      const { extProject } = await import("../shared/n41w4fbz.js");
-      stdout(await extProject(cwd, sub, invoke(splitFlags(rest.slice(1)))));
+      const { extProject } = await import("../shared/py2zrrm6.js");
+      stdout(await extProject(cwd, sub, invoke(splitFlags(rest.slice(1), "ext"))));
       return;
     }
     throw new OkmError2("invalid", `Unknown command ext ${sub ?? ""}.`, {
-      fix: { summary: "Use okm ext list or okm ext check." }
+      fix: { summary: "Use okm ext list, okm ext check, okm ext scaffold, or okm ext test." }
     });
   }
   throw new OkmError2("invalid", `Unknown command ${command ?? ""}.`);
 }
+function requireName(parsed, usage) {
+  if (parsed.name === undefined || parsed.name.length === 0) {
+    throw new OkmError2("invalid", `${usage} needs a name.`, {
+      fix: { summary: `Pass ${usage}.` }
+    });
+  }
+  return parsed.name;
+}
+function extInvocation(args) {
+  const rest = [];
+  let out;
+  for (let index = 0;index < args.length; index += 1) {
+    const arg = args[index] ?? "";
+    if (arg === "--out" || arg.startsWith("--out=")) {
+      const value = arg === "--out" ? args[index + 1] : arg.slice("--out=".length);
+      if (value === undefined || value.length === 0 || value.startsWith("--")) {
+        throw new OkmError2("invalid", "--out needs a file.", {
+          fix: { summary: "Pass --out <file>. The command never overwrites." }
+        });
+      }
+      out = value;
+      if (arg === "--out")
+        index += 1;
+      continue;
+    }
+    rest.push(arg);
+  }
+  const parsed = splitFlags(rest, "ext");
+  return { name: parsed.name, out, flags: invoke(parsed) };
+}
 function invoke(parsed) {
   return {
     ...parsed.target !== undefined ? { target: parsed.target } : {},
@@ -169,55 +238,90 @@ function invoke(parsed) {
     ...parsed.statementTimeoutMs !== undefined ? { statementTimeoutMs: parsed.statementTimeoutMs } : {}
   };
 }
-function splitFlags(args) {
+var COMMAND_FLAGS = {
+  check: ["--target", "--allow-pooler", "--lock-timeout", "--statement-timeout"],
+  generate: ["--replace"],
+  push: ["--target", "--allow-protected", "--allow-pooler"],
+  seed: ["--target", "--allow-protected", "--allow-pooler"],
+  doctor: ["--target"],
+  ext: ["--target", "--allow-pooler", "--out"],
+  "migrate plan": ["--target", "--allow-protected", "--replace", "--json"],
+  "migrate apply": [
+    "--target",
+    "--allow-protected",
+    "--allow-pooler",
+    "--lock-timeout",
+    "--statement-timeout"
+  ],
+  "migrate status": ["--target"],
+  "migrate check": [
+    "--target",
+    "--allow-protected",
+    "--allow-pooler",
+    "--provision",
+    "--lock-timeout",
+    "--statement-timeout"
+  ]
+};
+function splitFlags(args, command) {
+  const allowed = new Set(COMMAND_FLAGS[command]);
   const flags = [];
   const positionals = [];
   let target;
   let allowProtected = false;
   let allowPooler = false;
+  let provision = false;
   let lockTimeoutMs;
   let statementTimeoutMs;
   for (let index = 0;index < args.length; index += 1) {
     const arg = args[index] ?? "";
-    if (arg === "--replace") {
-      const value = args[index + 1];
-      if (value === undefined) {
+    if (arg === "--replace" || arg.startsWith("--replace=")) {
+      refuseUnknown(command, "--replace", allowed);
+      const value = arg === "--replace" ? args[index + 1] : arg.slice("--replace=".length);
+      if (value === undefined || value.length === 0 || arg === "--replace" && value.startsWith("--")) {
         throw new OkmError2("OKM1541", "--replace needs table.column.old=new.", {
           fix: { summary: "Pass --replace <table>.<column>.<old>=<new>." }
         });
       }
       flags.push(value);
-      index += 1;
-      continue;
-    }
-    if (arg.startsWith("--replace=")) {
-      flags.push(arg.slice("--replace=".length));
+      if (arg === "--replace")
+        index += 1;
       continue;
     }
     if (arg === "--allow-protected") {
+      refuseUnknown(command, arg, allowed);
       allowProtected = true;
       continue;
     }
     if (arg === "--allow-pooler") {
+      refuseUnknown(command, arg, allowed);
       allowPooler = true;
       continue;
     }
-    if (arg === "--target") {
-      const value = args[index + 1];
-      if (value === undefined || value.startsWith("--")) {
+    if (arg === "--provision") {
+      refuseUnknown(command, arg, allowed);
+      provision = true;
+      continue;
+    }
+    if (arg === "--json") {
+      refuseUnknown(command, arg, allowed);
+      continue;
+    }
+    if (arg === "--target" || arg.startsWith("--target=")) {
+      refuseUnknown(command, "--target", allowed);
+      const value = arg === "--target" ? args[index + 1] : arg.slice("--target=".length);
+      if (value === undefined || value.length === 0 || arg === "--target" && value.startsWith("--")) {
         throw new OkmError2("OKM1853", "--target needs a name.", {
           fix: { summary: "Pass --target <name>." }
         });
       }
       target = value;
-      index += 1;
-      continue;
-    }
-    if (arg.startsWith("--target=")) {
-      target = arg.slice("--target=".length);
+      if (arg === "--target")
+        index += 1;
       continue;
     }
     if (arg === "--lock-timeout" || arg === "--statement-timeout") {
+      refuseUnknown(command, arg, allowed);
       const value = numberFlag(arg, args[index + 1]);
       if (arg === "--lock-timeout")
         lockTimeoutMs = value;
@@ -226,6 +330,13 @@ function splitFlags(args) {
       index += 1;
       continue;
     }
+    if (arg.startsWith("-")) {
+      throw new OkmError2("invalid", `Unknown flag ${arg}.`, {
+        fix: {
+          summary: `Use okm ${command} --help for the flags this command accepts.`
+        }
+      });
+    }
     positionals.push(arg);
   }
   return {
@@ -234,24 +345,42 @@ function splitFlags(args) {
     target,
     allowProtected,
     allowPooler,
+    provision,
     lockTimeoutMs,
     statementTimeoutMs
   };
 }
+function refuseUnknown(command, flag, allowed) {
+  if (allowed.has(flag))
+    return;
+  throw new OkmError2("invalid", `Unknown flag ${flag}.`, {
+    fix: {
+      summary: `Use okm ${command} --help for the flags this command accepts.`
+    }
+  });
+}
 var COMMANDS = [
   ["build", "Write the schema build."],
+  ["catalog export", "Write the catalog snapshot."],
   ["check", "Lint the schema and compare it with one target."],
-  ["dev", "Watch the schema and reload."],
+  ["dev", "Open a PGlite database in .okm/dev-db, or name a target called dev."],
   ["doctor [code]", "Print a target report, or one error code."],
   ["driver test <driver>", "Run conformance against one driver."],
   ["ext list", "List extensions the server can install."],
   ["ext check", "Compare declared extensions with the server."],
+  ["ext scaffold <name>", "Print a starting extension() definition."],
+  ["ext test <file>", "Check an extension() definition against the server."],
   ["generate [name]", "Write the next migration."],
-  ["migrate plan <name>", "Print the plan and its lock estimates."],
+  [
+    "import drizzle <path>",
+    "Import a Drizzle schema. This runs that file. Writes table files and needs no database."
+  ],
+  ["migrate plan <name>", "Print the plan and its lock estimates. --json prints a document."],
   ["migrate apply", "Apply pending migrations."],
   ["migrate status", "Print whether the target is current."],
   ["migrate check", "Replay migration history in a scratch schema."],
   ["push", "Apply the schema diff to one target."],
+  ["pull", "Write table files and a schema from one database."],
   ["seed <file>", "Run a seed file on one target."]
 ];
 function commandsTable() {
@@ -271,10 +400,31 @@ function commandHelp(argv) {
 
 ${commandsTable()}`;
   }
-  return `${found[0]}
-${found[1]}
+  const flags = flagsForHelp(found[0]);
+  const lines = [found[0], found[1]];
+  if (flags.length > 0) {
+    lines.push("", "Flags:");
+    for (const flag of flags)
+      lines.push(`  ${flag}`);
+  }
+  return `${lines.join(`
+`)}
 `;
 }
+function flagsForHelp(commandLine) {
+  const key = helpCommandKey(commandLine);
+  if (key === undefined)
+    return [];
+  return COMMAND_FLAGS[key];
+}
+function helpCommandKey(commandLine) {
+  const name = commandLine.replace(/\s+\[.*?\]/g, "").replace(/\s+<.*?>/g, "").trim();
+  if (name in COMMAND_FLAGS)
+    return name;
+  if (name.startsWith("ext "))
+    return "ext";
+  return;
+}
 function numberFlag(flag, value) {
   const parsed = value === undefined ? Number.NaN : Number(value);
   if (!Number.isFinite(parsed) || parsed < 0) {