@dashai/cli 0.18.1 → 0.18.2

package/dist/bin.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
+import pc from 'picocolors';
 import { existsSync, readFileSync, writeFileSync, rmSync, mkdirSync, watch, readdirSync, chmodSync, renameSync, mkdtempSync, statSync } from 'fs';
 import { tmpdir, platform, homedir } from 'os';
 import { resolve, join, relative, dirname, basename, sep } from 'path';
-import pc from 'picocolors';
 import { spawn, spawnSync } from 'child_process';
 import { intro, log, select, isCancel, cancel, spinner, outro, text, multiselect, confirm } from '@clack/prompts';
 import { Command, Option } from 'commander';
@@ -20,6 +20,41 @@ var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
+function success(msg) {
+  process.stderr.write(`${pc.green("\u2713")} ${msg}
+`);
+}
+function info(msg) {
+  process.stderr.write(`${pc.cyan("\u2139")} ${msg}
+`);
+}
+function warn(msg) {
+  process.stderr.write(`${pc.yellow("\u26A0")} ${msg}
+`);
+}
+function fail(msg) {
+  process.stderr.write(`${pc.red("\u2717")} ${msg}
+`);
+}
+function out(msg) {
+  process.stdout.write(`${msg}
+`);
+}
+function kv(key, value, padTo = 14) {
+  const padded = key.padEnd(padTo);
+  process.stdout.write(`${pc.bold(padded)} ${value}
+`);
+}
+function code(s) {
+  return pc.cyan(s);
+}
+function dim(s) {
+  return pc.dim(s);
+}
+var init_output = __esm({
+  "src/lib/output.ts"() {
+  }
+});
 function configDir() {
   if (process.env.XDG_CONFIG_HOME) {
     return join(process.env.XDG_CONFIG_HOME, DIR_NAME);
@@ -499,41 +534,6 @@ var init_api_client = __esm({
     };
   }
 });
-function success(msg) {
-  process.stderr.write(`${pc.green("\u2713")} ${msg}
-`);
-}
-function info(msg) {
-  process.stderr.write(`${pc.cyan("\u2139")} ${msg}
-`);
-}
-function warn(msg) {
-  process.stderr.write(`${pc.yellow("\u26A0")} ${msg}
-`);
-}
-function fail(msg) {
-  process.stderr.write(`${pc.red("\u2717")} ${msg}
-`);
-}
-function out(msg) {
-  process.stdout.write(`${msg}
-`);
-}
-function kv(key, value, padTo = 14) {
-  const padded = key.padEnd(padTo);
-  process.stdout.write(`${pc.bold(padded)} ${value}
-`);
-}
-function code(s) {
-  return pc.cyan(s);
-}
-function dim(s) {
-  return pc.dim(s);
-}
-var init_output = __esm({
-  "src/lib/output.ts"() {
-  }
-});
 
 // src/lib/connect-status.ts
 async function reportConnectStatus(opts) {
@@ -5278,7 +5278,81 @@ var init_set_type = __esm({
   }
 });
 
+// src/lib/excess-args.ts
+init_output();
+var SMART_DASH_RE = /^[‒–—―−]/;
+var ExcessArgumentsError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "ExcessArgumentsError";
+  }
+};
+function commandPath(cmd) {
+  const parts = [];
+  let cursor = cmd;
+  while (cursor) {
+    parts.unshift(cursor.name());
+    cursor = cursor.parent;
+  }
+  return parts.join(" ");
+}
+function excessOperandsError(actionCommand) {
+  const registered = actionCommand.registeredArguments;
+  if (registered.length > 0 && registered[registered.length - 1].variadic) {
+    return null;
+  }
+  const operands = actionCommand.args;
+  const stray = operands.slice(registered.length);
+  const accepted = operands.slice(0, registered.length);
+  const smartDashAccepted = accepted.filter((s) => SMART_DASH_RE.test(s));
+  if (stray.length === 0 && smartDashAccepted.length === 0) return null;
+  const path = commandPath(actionCommand);
+  const expects = registered.length === 0 ? "takes no positional arguments" : `takes at most ${registered.length} positional argument${registered.length > 1 ? "s" : ""} (${registered.map((a) => `${a.required ? "<" : "["}${a.name()}${a.required ? ">" : "]"}`).join(" ")})`;
+  const lines = [];
+  if (stray.length > 0) {
+    lines.push(
+      `Unexpected argument${stray.length > 1 ? "s" : ""} ${stray.map((s) => `"${s}"`).join(", ")} \u2014 ${code(path)} ${expects}.`
+    );
+  }
+  for (const tok of smartDashAccepted) {
+    const slot = registered[accepted.indexOf(tok)];
+    lines.push(
+      `"${tok}" was read as the ${slot ? `<${slot.name()}>` : "positional"} argument but looks like a flag typed with a typographic dash (\u2013 / \u2014) instead of ASCII "--".`
+    );
+  }
+  if ([...stray, ...smartDashAccepted].some((s) => SMART_DASH_RE.test(s))) {
+    lines.push(
+      `A token starts with a typographic dash (\u2013 / \u2014) instead of ASCII "--". If this command was copy-pasted, the editor/chat likely rewrote the double hyphen \u2014 retype the flag by hand (e.g. ${code("--force")}, ${code("--grant")}).`
+    );
+  }
+  if (stray.some((s) => /^(module|datahub):/.test(s)) && actionCommand.options.some((o) => o.long === "--grant")) {
+    lines.push(
+      `Grant specs must be passed via the (repeatable) ${code("--grant")} flag, e.g. ${code("--grant module:employees:create,read")}.`
+    );
+  }
+  if (stray.some((s) => s.startsWith("--"))) {
+    lines.push(
+      `Tokens after a bare ${code("--")} separator are treated as plain arguments, not flags \u2014 remove the ${code("--")}.`
+    );
+  }
+  lines.push(
+    "Refusing to continue: silently ignoring these arguments is how grantless (deny-all) API keys \u2014 or half-applied commands \u2014 happen by accident."
+  );
+  return lines.join("\n  ");
+}
+function installExcessArgumentsGuard(program2) {
+  program2.hook("preAction", (_thisCommand, actionCommand) => {
+    const message = excessOperandsError(actionCommand);
+    if (message === null) return;
+    fail(message);
+    throw new ExcessArgumentsError(message);
+  });
+}
+
 // src/bin.ts
+init_output();
+
+// src/program.ts
 init_dev();
 
 // src/commands/login.ts
@@ -6676,7 +6750,7 @@ async function moduleDiffCommand(options) {
   return 0;
 }
 
-// src/bin.ts
+// src/program.ts
 init_init();
 
 // src/commands/module/install.ts
@@ -9714,7 +9788,7 @@ function surfacePullFailure(err) {
   return 1;
 }
 
-// src/bin.ts
+// src/program.ts
 init_scaffold();
 
 // src/commands/api-keys.ts
@@ -9722,32 +9796,6 @@ init_api_client();
 init_config();
 init_manifest_io();
 init_output();
-var SMART_DASH_RE = /^[‒–—―−]/;
-function strayArgsError(stray, usage) {
-  if (!stray || stray.length === 0) return null;
-  const lines = [
-    `Unexpected argument${stray.length > 1 ? "s" : ""} ${stray.map((s) => `"${s}"`).join(", ")} \u2014 ${usage}`
-  ];
-  if (stray.some((s) => SMART_DASH_RE.test(s))) {
-    lines.push(
-      `A token starts with a typographic dash (\u2013 / \u2014) instead of ASCII "--". If this command was copy-pasted, the editor/chat likely rewrote the double hyphen \u2014 retype the flag by hand (e.g. ${code("--grant")}, ${code("--full-access")}).`
-    );
-  }
-  if (stray.some((s) => /^(module|datahub):/.test(s))) {
-    lines.push(
-      `Grant specs must be passed via the (repeatable) ${code("--grant")} flag, e.g. ${code("--grant module:employees:create,read")}.`
-    );
-  }
-  if (stray.some((s) => s.startsWith("--"))) {
-    lines.push(
-      `Tokens after a bare ${code("--")} separator are treated as plain arguments, not flags \u2014 remove the ${code("--")}.`
-    );
-  }
-  lines.push(
-    "Refusing to continue: silently ignoring these arguments is how grantless (deny-all) keys get minted by accident."
-  );
-  return lines.join("\n  ");
-}
 function loadContext4(opts) {
   const cfg = readConfig();
   if (!cfg) {
@@ -9813,14 +9861,6 @@ async function resolveInstallKind(ctx) {
   return void 0;
 }
 async function apiKeysListCommand(options) {
-  const strayErr = strayArgsError(
-    options.stray,
-    "`dashwise api-keys list` takes no positional arguments."
-  );
-  if (strayErr) {
-    fail(strayErr);
-    return 1;
-  }
   let ctx;
   try {
     ctx = loadContext4(options);
@@ -9871,20 +9911,6 @@ async function apiKeysListCommand(options) {
   return 0;
 }
 async function apiKeysCreateCommand(nameArg, options) {
-  if (nameArg !== void 0 && SMART_DASH_RE.test(nameArg)) {
-    fail(
-      `"${nameArg}" was read as the key NAME but looks like a flag typed with a typographic dash (\u2013 / \u2014) instead of ASCII "--". If this command was copy-pasted, the editor/chat likely rewrote the double hyphen \u2014 retype the flag by hand (e.g. ${code("--grant")}, ${code("--full-access")}).`
-    );
-    return 1;
-  }
-  const strayErr = strayArgsError(
-    options.stray,
-    "`dashwise api-keys create` takes a single <name>."
-  );
-  if (strayErr) {
-    fail(strayErr);
-    return 1;
-  }
   const name = nameArg ?? options.name;
   if (!name) {
     fail("Usage: `dashwise api-keys create <name>` (e.g. `dashwise api-keys create production`)");
@@ -9973,14 +9999,6 @@ async function apiKeysCreateCommand(nameArg, options) {
   return 0;
 }
 async function apiKeysRevokeCommand(keyIdArg, options) {
-  const strayErr = strayArgsError(
-    options.stray,
-    "`dashwise api-keys revoke` takes a single <key-id> \u2014 extra ids would be silently skipped."
-  );
-  if (strayErr) {
-    fail(strayErr);
-    return 1;
-  }
   if (!keyIdArg) {
     fail("Usage: `dashwise api-keys revoke <key-id>` \u2014 id from `dashwise api-keys list`");
     return 1;
@@ -11430,7 +11448,7 @@ async function sleep4(ms, aborted) {
   }
 }
 
-// src/bin.ts
+// src/program.ts
 init_output();
 var program = new Command();
 program.name("dashwise").description("DashWise CLI \u2014 log in, author modules, publish to the marketplace.").version(getVersion(), "-v, --version", "Show the CLI version + exit").option(
@@ -11443,6 +11461,7 @@ program.hook("preAction", () => {
     process.env.DASHWISE_API_URL = apiUrl.replace(/\/+$/, "");
   }
 });
+installExcessArgumentsGuard(program);
 program.command("login").description("Sign in via the device-code flow.").option("--no-prompt", 'Skip the "open browser" prompt; just print the URL.').option("--name <name>", "Suggested name for the minted token (default: dashwise-cli).").action(async (cmdOpts) => {
   const apiUrl = program.opts().apiUrl;
   const exit = await loginCommand({
@@ -11817,15 +11836,12 @@ apiKeysCmd.command("list").description(
   "Target a specific installation id instead of the cached dev install (production installs included). Find ids via `dashwise module status <slug>`.",
   parseIntOption
 ).option("--all", "Include revoked + expired keys in the output.").option("--json", "Emit JSON instead of the human-friendly table.").action(
-  async (cmdOpts, cmd) => {
+  async (cmdOpts) => {
     process.exitCode = await apiKeysListCommand({
       ...cmdOpts.dir !== void 0 ? { dir: cmdOpts.dir } : {},
       ...cmdOpts.install !== void 0 ? { install: cmdOpts.install } : {},
       ...cmdOpts.all !== void 0 ? { all: cmdOpts.all } : {},
-      ...cmdOpts.json !== void 0 ? { json: cmdOpts.json } : {},
-      // Operands commander would otherwise SILENTLY drop (default
-      // allowExcessArguments) — the command hard-errors on them.
-      ...cmd.args.length > 0 ? { stray: cmd.args } : {}
+      ...cmdOpts.json !== void 0 ? { json: cmdOpts.json } : {}
     });
   }
 );
@@ -11851,8 +11867,7 @@ apiKeysCmd.command("create [name]").description(
   "--raw-only",
   "Print only the plaintext key on stdout; chatter goes to stderr. Useful for shell capture: `KEY=$(dashwise api-keys create prod --raw-only)`"
 ).action(
-  async (nameArg, cmdOpts, cmd) => {
-    const stray = cmd.args.slice(1);
+  async (nameArg, cmdOpts) => {
     process.exitCode = await apiKeysCreateCommand(nameArg, {
       ...cmdOpts.dir !== void 0 ? { dir: cmdOpts.dir } : {},
       ...cmdOpts.install !== void 0 ? { install: cmdOpts.install } : {},
@@ -11860,8 +11875,7 @@ apiKeysCmd.command("create [name]").description(
       ...cmdOpts.grant !== void 0 && cmdOpts.grant.length > 0 ? { grant: cmdOpts.grant } : {},
       ...cmdOpts.fullAccess !== void 0 ? { fullAccess: cmdOpts.fullAccess } : {},
       ...cmdOpts.expires !== void 0 ? { expires: cmdOpts.expires } : {},
-      ...cmdOpts.rawOnly !== void 0 ? { rawOnly: cmdOpts.rawOnly } : {},
-      ...stray.length > 0 ? { stray } : {}
+      ...cmdOpts.rawOnly !== void 0 ? { rawOnly: cmdOpts.rawOnly } : {}
     });
   }
 );
@@ -11872,13 +11886,11 @@ apiKeysCmd.command("revoke [key-id]").description(
   "Target a specific installation id instead of the cached dev install (production installs included). Find ids via `dashwise module status <slug>`.",
   parseIntOption
 ).option("-y, --yes", "Skip the per-key confirmation message (for CI / scripts).").action(
-  async (keyIdArg, cmdOpts, cmd) => {
-    const stray = cmd.args.slice(1);
+  async (keyIdArg, cmdOpts) => {
     process.exitCode = await apiKeysRevokeCommand(keyIdArg, {
       ...cmdOpts.dir !== void 0 ? { dir: cmdOpts.dir } : {},
       ...cmdOpts.install !== void 0 ? { install: cmdOpts.install } : {},
-      ...cmdOpts.yes !== void 0 ? { yes: cmdOpts.yes } : {},
-      ...stray.length > 0 ? { stray } : {}
+      ...cmdOpts.yes !== void 0 ? { yes: cmdOpts.yes } : {}
     });
   }
 );
@@ -12213,19 +12225,8 @@ fieldCmd.command("set-type <table-slug> <field-slug> <new-type>").description(
     );
   }
 );
-(async () => {
-  try {
-    await program.parseAsync(process.argv);
-  } catch (err) {
-    fail(`Unhandled error: ${err.message ?? String(err)}`);
-    if (process.env.DASHWISE_DEBUG) {
-      console.error(err);
-    }
-    process.exitCode = 1;
-  }
-})();
 function getVersion() {
-  return "0.18.1";
+  return "0.18.2";
 }
 function parseIntOption(value) {
   const n = Number.parseInt(value, 10);
@@ -12237,5 +12238,22 @@ function parseIntOption(value) {
 function collectRepeated(value, previous) {
   return [...previous, value];
 }
+
+// src/bin.ts
+(async () => {
+  try {
+    await program.parseAsync(process.argv);
+  } catch (err) {
+    if (err instanceof ExcessArgumentsError) {
+      process.exitCode = 1;
+      return;
+    }
+    fail(`Unhandled error: ${err.message ?? String(err)}`);
+    if (process.env.DASHWISE_DEBUG) {
+      console.error(err);
+    }
+    process.exitCode = 1;
+  }
+})();
 //# sourceMappingURL=bin.js.map
 //# sourceMappingURL=bin.js.map