@duyquangnvx/agent-cli 0.1.0 → 0.2.1

package/dist/parse-input.js

@@ -1,39 +1,36 @@
 import * as z from "zod";
 import { UsageError } from "./errors.js";
-import { commandLineRenaming, END_OF_OPTIONS } from "./invocation.js";
+import { CONFIRM_FLAG, DRY_RUN_FLAG, HELP_FLAG, VERSION_FLAG } from "./flags.js";
+import { commandLineRenaming } from "./invocation.js";
+import { PAGE_INPUT, selectedFields } from "./list.js";
 import { closestFlag } from "./suggest.js";
-import { commandLine, unknownOptionError } from "./usage.js";
-const HELP_FLAG = "--help";
-const NEGATIVE_NUMBER = /^-(\d+|\d*\.\d+)(e[+-]?\d+)?$/;
-function isOptionLike(token) {
-    return (token !== undefined && token.length > 1 && token[0] === "-" && !NEGATIVE_NUMBER.test(token));
-}
-// Commander keeps `--` only after an unknown option, so the words after it are counted from the
-// caller's own command line.
-function leftoversOf(tokens, argv) {
-    const end = argv.indexOf(END_OF_OPTIONS);
-    const split = end === -1 ? tokens.length : Math.max(0, tokens.length - (argv.length - end - 1));
-    const head = tokens.slice(0, split);
-    const parsed = end !== -1 && head.at(-1) === END_OF_OPTIONS ? head.slice(0, -1) : head;
-    const literal = tokens.slice(split).map((value) => ({ value, afterUnknownOption: false }));
-    return {
-        operands: [
-            ...parsed.flatMap((value, index) => isOptionLike(value) ? [] : [{ value, afterUnknownOption: isOptionLike(parsed[index - 1]) }]),
-            ...literal,
-        ],
-        unknownOptions: parsed.filter(isOptionLike),
-    };
+import { tokenize } from "./tokenize.js";
+import { invalidInputError, unknownOptionError } from "./usage.js";
+const NO_INPUT = z.object({});
+function knownFlags(spec) {
+    return [
+        ...spec.options.map((field) => ({
+            flag: field.label,
+            takes: field.type === "boolean" ? "nothing" : "optional value",
+        })),
+        ...spec.standardFlags.map(({ flag, takes }) => ({ flag, takes })),
+    ];
 }
-function flagsOf(cmd) {
-    const own = cmd.options.flatMap((option) => (option.long === undefined ? [] : [option.long]));
-    return cmd.parent === null ? [...own, HELP_FLAG] : [...own, ...flagsOf(cmd.parent)];
+function candidateFlags(known) {
+    return [...known.map(({ flag }) => flag), VERSION_FLAG, HELP_FLAG];
 }
-function unknownOptionsOf(tokens, sub) {
-    return tokens.map((token) => {
-        const flag = token.split("=")[0] ?? token;
-        return { flag, suggestion: closestFlag(flag, flagsOf(sub)) };
+function unknownOptionsOf(words, candidates) {
+    return words.map((word) => {
+        const flag = word.split("=")[0] ?? word;
+        return { flag, suggestion: closestFlag(flag, candidates) };
     });
 }
+// A `--no-` switch turns its option off.
+function optionValue(field, raw) {
+    return field.type === "boolean" && raw === true && field.label === `--no-${field.name}`
+        ? false
+        : raw;
+}
 // Strings that read as numbers are converted so authors can write `z.number()`; anything else
 // stays a string for Zod to reject with the caller's own value.
 function converted(field, raw) {
@@ -47,7 +44,7 @@ function parse(schema, values) {
     const input = Object.fromEntries([...values]
         .filter(([, raw]) => raw !== undefined)
         .map(([field, raw]) => [field.key, converted(field, raw)]));
-    return (schema ?? z.object({})).safeParse(input);
+    return schema.safeParse(input);
 }
 function issueLines(result, values, howToPass, reported) {
     if (result.success) {
@@ -70,45 +67,81 @@ function issueLines(result, values, howToPass, reported) {
 function unknownLine({ flag, suggestion }) {
     return `  unknown option '${flag}'${suggestion === undefined ? "" : ` (did you mean ${suggestion}?)`}`;
 }
-function invalidInput(line, invocation, unknown, otherLines) {
+function invalidInput(commandLine, invocation, unknown, otherLines) {
     const renames = new Map(unknown.flatMap(({ flag, suggestion }) => suggestion === undefined ? [] : [[flag, suggestion]]));
     const correctable = otherLines.length === 0 && renames.size === unknown.length;
     return new UsageError({
         code: "INVALID_INPUT",
-        message: [`invalid input for \`${line}\``, ...unknown.map(unknownLine), ...otherLines].join("\n"),
+        message: [
+            `invalid input for \`${commandLine}\``,
+            ...unknown.map(unknownLine),
+            ...otherLines,
+        ].join("\n"),
         hint: correctable
             ? `did you mean \`${commandLineRenaming(invocation, renames)}\`?`
-            : `run \`${line} --help\` to see the expected input`,
+            : `run \`${commandLine} --help\` to see the expected input`,
     });
 }
-export function parseInput(command, sub, fields, invocation) {
-    const { operands, unknownOptions } = leftoversOf(sub.args, invocation.argv);
-    const opts = sub.opts();
+function parseInput(spec, words, invocation) {
+    const { command, args: argFields, options: optionFields } = spec;
+    const pageFields = spec.list?.pageFields ?? [];
+    const known = knownFlags(spec);
+    const { operands, unknownOptions, values } = tokenize(words, known);
+    if (values.get(CONFIRM_FLAG.flag) === true) {
+        throw invalidInputError(spec.commandLine, `option '${CONFIRM_FLAG.usage}' argument missing`);
+    }
     // A value option given without a value is collected as `true`.
-    const missing = fields.options.filter((field) => field.type !== "boolean" && opts[field.key] === true);
-    const argValues = new Map(fields.args.map((field, index) => [field, operands[index]?.value]));
-    const optionValues = new Map(fields.options.map((field) => [field, missing.includes(field) ? undefined : opts[field.key]]));
-    const args = parse(command.args, argValues);
-    const options = parse(command.options, optionValues);
-    const unknown = unknownOptionsOf(unknownOptions, sub);
+    const missing = [...optionFields, ...pageFields].filter((field) => field.type !== "boolean" && values.get(field.label) === true);
+    const argValues = new Map(argFields.map((field, index) => [field, operands[index]?.value]));
+    const valuesOf = (fields) => new Map(fields.map((field) => [
+        field,
+        missing.includes(field) ? undefined : optionValue(field, values.get(field.label)),
+    ]));
+    const optionValues = valuesOf(optionFields);
+    const pageValues = valuesOf(pageFields);
+    const args = parse(command.args ?? NO_INPUT, argValues);
+    const options = parse(command.options ?? NO_INPUT, optionValues);
+    const page = parse(PAGE_INPUT, pageValues);
+    const unknown = unknownOptionsOf(unknownOptions, candidateFlags(known));
     const otherLines = [
         ...missing.map((field) => `  ${field.label}: missing value, pass ${field.usage}`),
         ...operands
-            .slice(fields.args.length)
+            .slice(argFields.length)
             // A word right after an unknown flag may be its value, so it isn't an extra arg.
             .filter((operand) => !operand.afterUnknownOption)
             .map((operand) => `  unexpected argument ${JSON.stringify(operand.value)}`),
-        ...issueLines(args, argValues, (field) => `pass it as argument ${fields.args.indexOf(field) + 1}`, []),
+        ...issueLines(args, argValues, (field) => `pass it as argument ${argFields.indexOf(field) + 1}`, []),
         ...issueLines(options, optionValues, (field) => `pass ${field.usage}`, missing),
+        ...issueLines(page, pageValues, (field) => `pass ${field.usage}`, missing),
     ];
-    if (unknown.length === 0 && otherLines.length === 0 && args.success && options.success) {
-        return { ...args.data, ...options.data };
+    if (unknown.length === 0 &&
+        otherLines.length === 0 &&
+        args.success &&
+        options.success &&
+        page.success) {
+        return { input: { ...args.data, ...options.data }, page: page.data, values };
     }
-    const line = commandLine(sub);
     const [only] = unknown;
     if (only !== undefined && unknown.length === 1 && otherLines.length === 0) {
-        throw unknownOptionError(line, invocation, only.flag, only.suggestion === undefined ? [] : [only.suggestion]);
+        throw unknownOptionError(spec.commandLine, invocation, only.flag, only.suggestion === undefined ? [] : [only.suggestion]);
     }
-    throw invalidInput(line, invocation, unknown, otherLines);
+    throw invalidInput(spec.commandLine, invocation, unknown, otherLines);
+}
+/** The validated input and Standard flag values of the routed Command, or one usage error. */
+export function parseCommand({ spec, words, json }, invocation) {
+    const { input, page, values } = parseInput(spec, words, invocation);
+    const confirm = values.get(CONFIRM_FLAG.flag);
+    return {
+        input,
+        flags: {
+            json,
+            dryRun: values.get(DRY_RUN_FLAG.flag) === true,
+            confirm: typeof confirm === "string" ? confirm : undefined,
+            page,
+            fields: spec.list === undefined
+                ? undefined
+                : selectedFields(values, spec.list.rowFields, spec.commandLine),
+        },
+    };
 }
 //# sourceMappingURL=parse-input.js.map

package/dist/parse-input.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-input.js","sourceRoot":"","sources":["../src/parse-input.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parse-input.js","sourceRoot":"","sources":["../src/parse-input.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAGzB,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAEjF,OAAO,EAAE,mBAAmB,EAAmB,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAkB,cAAc,EAAE,MAAM,WAAW,CAAC;AAEvE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAkB,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAInE,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAuB9B,SAAS,UAAU,CAAC,IAAiB;IACnC,OAAO;QACL,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC9B,IAAI,EAAE,KAAK,CAAC,KAAK;YACjB,KAAK,EAAE,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAE,SAAmB,CAAC,CAAC,CAAE,gBAA0B;SACrF,CAAC,CAAC;QACH,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;KAClE,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,KAA2B;IACjD,OAAO,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;AACrE,CAAC;AAED,SAAS,gBAAgB,CACvB,KAAwB,EACxB,UAA6B;IAE7B,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACxB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;QACxC,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC;IAC7D,CAAC,CAAC,CAAC;AACL,CAAC;AAED,yCAAyC;AACzC,SAAS,WAAW,CAAC,KAAiB,EAAE,GAA8B;IACpE,OAAO,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,IAAI,KAAK,CAAC,KAAK,KAAK,QAAQ,KAAK,CAAC,IAAI,EAAE;QACrF,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,GAAG,CAAC;AACV,CAAC;AAED,8FAA8F;AAC9F,gEAAgE;AAChE,SAAS,SAAS,CAAC,KAAiB,EAAE,GAAa;IACjD,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAC5E,OAAO,GAAG,CAAC;IACb,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC3B,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;AAC7C,CAAC;AAED,SAAS,KAAK,CACZ,MAAc,EACd,MAAyC;IAEzC,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAC9B,CAAC,GAAG,MAAM,CAAC;SACR,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,SAAS,CAAC;SACtC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,CAC7D,CAAC;IACF,OAAO,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,UAAU,CACjB,MAAqC,EACrC,MAAyC,EACzC,SAAwC,EACxC,QAA+B;IAE/B,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAC3C,MAAM,KAAK,GAAG,CAAC,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACtF,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,CAAC,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAChC,CAAC;QACD,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC9B,OAAO,GAAG,KAAK,SAAS;YACtB,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,KAAK,eAAe,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACrD,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,WAAW,CAAC,EAAE,IAAI,EAAE,UAAU,EAAiB;IACtD,OAAO,qBAAqB,IAAI,IAAI,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB,UAAU,IAAI,EAAE,CAAC;AACzG,CAAC;AAED,SAAS,YAAY,CACnB,WAAmB,EACnB,UAAsB,EACtB,OAAiC,EACjC,UAA6B;IAE7B,MAAM,OAAO,GAAG,IAAI,GAAG,CACrB,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,CACvC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CACrD,CACF,CAAC;IACF,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC;IAC/E,OAAO,IAAI,UAAU,CAAC;QACpB,IAAI,EAAE,eAAe;QACrB,OAAO,EAAE;YACP,uBAAuB,WAAW,IAAI;YACtC,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;YAC3B,GAAG,UAAU;SACd,CAAC,IAAI,CAAC,IAAI,CAAC;QACZ,IAAI,EAAE,WAAW;YACf,CAAC,CAAC,kBAAkB,mBAAmB,CAAC,UAAU,EAAE,OAAO,CAAC,KAAK;YACjE,CAAC,CAAC,SAAS,WAAW,qCAAqC;KAC9D,CAAC,CAAC;AACL,CAAC;AAED,SAAS,UAAU,CACjB,IAAiB,EACjB,KAAwB,EACxB,UAAsB;IAMtB,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IACjE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,UAAU,IAAI,EAAE,CAAC;IAC/C,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACpE,IAAI,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;QAC3C,MAAM,iBAAiB,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,YAAY,CAAC,KAAK,oBAAoB,CAAC,CAAC;IAC/F,CAAC;IACD,+DAA+D;IAC/D,MAAM,OAAO,GAAG,CAAC,GAAG,YAAY,EAAE,GAAG,UAAU,CAAC,CAAC,MAAM,CACrD,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,IAAI,CACxE,CAAC;IACF,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAC5F,MAAM,QAAQ,GAAG,CAAC,MAA6B,EAAE,EAAE,CACjD,IAAI,GAAG,CACL,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;QACpB,KAAK;QACL,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;KAClF,CAAC,CACH,CAAC;IACJ,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC5C,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;IACxC,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,IAAI,QAAQ,EAAE,SAAS,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,IAAI,QAAQ,EAAE,YAAY,CAAC,CAAC;IACjE,MAAM,IAAI,GAAG,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,gBAAgB,CAAC,cAAc,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IACxE,MAAM,UAAU,GAAG;QACjB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,CAAC,KAAK,yBAAyB,KAAK,CAAC,KAAK,EAAE,CAAC;QACjF,GAAG,QAAQ;aACR,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC;YACxB,iFAAiF;aAChF,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC;aAChD,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,yBAAyB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7E,GAAG,UAAU,CACX,IAAI,EACJ,SAAS,EACT,CAAC,KAAK,EAAE,EAAE,CAAC,uBAAuB,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAChE,EAAE,CACH;QACD,GAAG,UAAU,CAAC,OAAO,EAAE,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,KAAK,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC;QAC/E,GAAG,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,KAAK,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC;KAC3E,CAAC;IACF,IACE,OAAO,CAAC,MAAM,KAAK,CAAC;QACpB,UAAU,CAAC,MAAM,KAAK,CAAC;QACvB,IAAI,CAAC,OAAO;QACZ,OAAO,CAAC,OAAO;QACf,IAAI,CAAC,OAAO,EACZ,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;IAC/E,CAAC;IACD,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;IACvB,IAAI,IAAI,KAAK,SAAS,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1E,MAAM,kBAAkB,CACtB,IAAI,CAAC,WAAW,EAChB,UAAU,EACV,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CACvD,CAAC;IACJ,CAAC;IACD,MAAM,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;AACxE,CAAC;AAED,8FAA8F;AAC9F,MAAM,UAAU,YAAY,CAC1B,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAgB,EACnC,UAAsB;IAEtB,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IACpE,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAC9C,OAAO;QACL,KAAK;QACL,KAAK,EAAE;YACL,IAAI;YACJ,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,IAAI;YAC9C,OAAO,EAAE,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;YAC1D,IAAI;YACJ,MAAM,EACJ,IAAI,CAAC,IAAI,KAAK,SAAS;gBACrB,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC;SACpE;KACF,CAAC;AACJ,CAAC"}

package/dist/route.d.ts

@@ -0,0 +1,25 @@
+import type { CommandSpec, SpecNode } from "./command-spec.js";
+import type { UsageError } from "./errors.js";
+import { type Invocation } from "./invocation.js";
+/** Where the command line leads; `json` is set when the caller passed `--json` before any `--`. */
+export type Route = {
+    readonly kind: "version";
+    readonly json: boolean;
+} | {
+    readonly kind: "help";
+    readonly node: SpecNode;
+    readonly json: boolean;
+} | {
+    readonly kind: "usage error";
+    readonly error: UsageError;
+    readonly json: boolean;
+} | CommandRoute;
+export interface CommandRoute {
+    readonly kind: "command";
+    readonly spec: CommandSpec;
+    /** The words after the Command's name, without `--json`. */
+    readonly words: readonly string[];
+    readonly json: boolean;
+}
+/** Walks the caller's command line through the Commands to the one it names, or to a stop. */
+export declare function route(root: SpecNode, invocation: Invocation): Route;

package/dist/route.js

@@ -0,0 +1,75 @@
+import { HELP_FLAG, HELP_SHORT, JSON_FLAG, VERSION_FLAG } from "./flags.js";
+import { END_OF_OPTIONS } from "./invocation.js";
+import { closestFlags, closestNames } from "./suggest.js";
+import { unknownCommandError, unknownOptionError } from "./usage.js";
+// The flags a group accepts: `--json` and `--version` count anywhere before `--`.
+const GROUP_FLAGS = [HELP_FLAG, VERSION_FLAG, JSON_FLAG.flag];
+function beforeEnd(words) {
+    const end = words.indexOf(END_OF_OPTIONS);
+    return end === -1 ? words : words.slice(0, end);
+}
+function wantsHelp(words) {
+    return beforeEnd(words).some((word) => word === HELP_FLAG || word === HELP_SHORT);
+}
+function childOf(group, name) {
+    return Object.hasOwn(group.commands, name) ? group.commands[name] : undefined;
+}
+// At a group a negative number is an option too: no group takes an operand.
+function isFlagLike(word) {
+    return word.length > 1 && word[0] === "-";
+}
+function walk(node, words, json, invocation) {
+    const help = { kind: "help", node, json };
+    if (node.kind === "command") {
+        return wantsHelp(words) ? help : { kind: "command", spec: node, words, json };
+    }
+    const [first, ...rest] = words;
+    if (first === undefined) {
+        return help;
+    }
+    const child = childOf(node, first);
+    if (child !== undefined) {
+        return walk(child, rest, json, invocation);
+    }
+    // After `--` every word is an operand, the next Command's name included.
+    if (first === END_OF_OPTIONS) {
+        const [name, ...after] = rest;
+        if (name === undefined) {
+            return help;
+        }
+        const named = childOf(node, name);
+        if (named !== undefined) {
+            return walk(named, [END_OF_OPTIONS, ...after], json, invocation);
+        }
+        return unknownCommand(node, name, json);
+    }
+    if (wantsHelp(words)) {
+        return help;
+    }
+    if (isFlagLike(first)) {
+        const suggestions = closestFlags(first, GROUP_FLAGS);
+        const error = unknownOptionError(node.commandLine, invocation, first, suggestions);
+        return { kind: "usage error", error, json };
+    }
+    return unknownCommand(node, first, json);
+}
+function unknownCommand(group, name, json) {
+    const suggestions = closestNames(name, Object.keys(group.commands));
+    return {
+        kind: "usage error",
+        error: unknownCommandError(group.commandLine, name, suggestions),
+        json,
+    };
+}
+/** Walks the caller's command line through the Commands to the one it names, or to a stop. */
+export function route(root, invocation) {
+    const { argv } = invocation;
+    const options = beforeEnd(argv);
+    const json = options.includes(JSON_FLAG.flag);
+    if (options.includes(VERSION_FLAG)) {
+        return { kind: "version", json };
+    }
+    const words = argv.filter((word, index) => !(index < options.length && word === JSON_FLAG.flag));
+    return walk(root, words, json, invocation);
+}
+//# sourceMappingURL=route.js.map

package/dist/route.js.map

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

package/dist/run-cli.d.ts

@@ -1,4 +1,5 @@
-import { type Cli, type Env } from "./define.js";
+import type { Cli, Env } from "./define.js";
+import { type RunResult } from "./output.js";
 export interface RunOptions {
     readonly env: Env;
     readonly cwd: string;
@@ -11,10 +12,5 @@ export interface RunOptions {
      */
     readonly bin?: string;
 }
-export interface RunResult {
-    readonly stdout: string;
-    readonly stderr: string;
-    readonly exitCode: number;
-}
 export declare function runCli(cli: Cli, argv: readonly string[], options: RunOptions): Promise<RunResult>;
 export declare function runWithProgress(cli: Cli, argv: readonly string[], options: RunOptions, writeProgress: (line: string) => void): Promise<RunResult>;

package/dist/run-cli.js

@@ -1,154 +1,49 @@
-import { Command as Commander } from "commander";
 import { builtInCommands } from "./built-ins.js";
-import { isCommand, } from "./define.js";
-import { FailureWithData, formatRuntimeError, UsageError } from "./errors.js";
-import { execute } from "./execute.js";
-import { fieldsOption, projected, renderRows, rowFieldsOf, selectedFields } from "./fields.js";
-import { JSON_FLAG, runtimeFlagsFor } from "./flags.js";
-import { cliHelp, commandHelp, groupHelp } from "./help.js";
-import { cliHelpJson, commandHelpJson, groupHelpJson } from "./help-json.js";
-import { inputFields, registerInput } from "./input.js";
+import { commandSpec, groupSpec } from "./command-spec.js";
+import { execute, renderOf } from "./execute.js";
 import { RunControl } from "./interrupts.js";
-import { Page, pageFooter, printedPage } from "./page.js";
-import { parseInput } from "./parse-input.js";
+import { commandResult, errorResult, helpResult, versionResult, } from "./output.js";
+import { parseCommand } from "./parse-input.js";
+import { route } from "./route.js";
 import { styleFor } from "./style.js";
-import { commandLine, ParseStop, stopAt, usageErrorOf } from "./usage.js";
-const RUNTIME_EXIT_CODE = 1;
-const USAGE_EXIT_CODE = 2;
-function withTrailingNewline(text) {
-    return text === "" || text.endsWith("\n") ? text : `${text}\n`;
-}
-function isJson(cmd) {
-    return cmd.optsWithGlobals().json === true;
-}
-function isDryRun(cmd) {
-    return cmd.opts().dryRun === true;
-}
-function confirmOf(cmd) {
-    return cmd.opts().confirm;
-}
-function printed(outcome, { json, invocation, style, fields }) {
-    if (!(outcome.value instanceof Page)) {
-        return json ? `${JSON.stringify(outcome.value)}\n` : withTrailingNewline(outcome.render(style));
-    }
-    const page = printedPage(outcome.value, invocation);
-    if (fields === undefined) {
-        return json
-            ? `${JSON.stringify(page)}\n`
-            : `${withTrailingNewline(outcome.render(style))}${pageFooter(page)}`;
-    }
-    const rows = projected(page.items, fields);
-    // The author's render may read any field, so selected rows are rendered by the Runtime.
-    return json
-        ? `${JSON.stringify({ ...page, items: rows })}\n`
-        : `${renderRows(rows, fields)}${pageFooter(page)}`;
-}
-function failure(error, format) {
-    return {
-        stdout: "",
-        stderr: formatRuntimeError(error, format),
-        exitCode: error instanceof UsageError ? USAGE_EXIT_CODE : RUNTIME_EXIT_CODE,
-    };
-}
-async function runCommand(sub, command, fields, { base, signal, style, invocation, errorFormat }) {
-    const json = isJson(sub);
-    let input;
-    let selected;
+async function runCommand(routed, { base, signal, format: baseFormat }) {
+    const { command, commandLine } = routed.spec;
+    const format = { ...baseFormat, json: routed.json };
+    const { invocation } = format;
+    let parsed;
     try {
-        input = parseInput(command, sub, fields, invocation);
-        const rowFields = rowFieldsOf(command);
-        selected =
-            rowFields === undefined
-                ? undefined
-                : selectedFields(sub.opts().fields, rowFields, commandLine(sub));
+        parsed = parseCommand(routed, invocation);
     }
     catch (error) {
-        return failure(error, { ...errorFormat, json });
+        return errorResult(error, format);
     }
-    const control = new RunControl(commandLine(sub), signal);
+    const { input, flags } = parsed;
+    const control = new RunControl(commandLine, signal);
     const ctx = {
         ...base,
         signal: control.signal,
         deadline: (ms) => control.deadline(ms),
         runToEnd: (work) => control.runToEnd(work),
     };
+    let settled;
     try {
         const outcome = await control.settle(execute(command, input, ctx, {
-            dryRun: isDryRun(sub),
-            confirmation: { invocation, commandLine: commandLine(sub), given: confirmOf(sub) },
+            dryRun: flags.dryRun,
+            confirm: flags.confirm,
+            page: flags.page,
+            invocation,
+            commandLine,
         }));
-        return {
-            stdout: printed(outcome, { json, invocation, style, fields: selected }),
-            stderr: "",
-            exitCode: 0,
-        };
+        settled = { ok: true, outcome };
     }
     catch (error) {
-        const reported = control.errorAfter(error);
-        const result = failure(reported, { ...errorFormat, json });
-        if (!(reported instanceof FailureWithData)) {
-            return result;
-        }
-        const outcome = {
-            value: reported.data,
-            render: (renderStyle) => command.render(reported.data, renderStyle),
+        settled = {
+            ok: false,
+            error: control.errorAfter(error),
+            render: renderOf(command),
         };
-        return { ...result, stdout: printed(outcome, { json, invocation, style, fields: selected }) };
     }
-}
-// Commander parses every option before it prints help, so `--json` counts on either side of `--help`.
-function helpFor(cmd, text, json) {
-    cmd.configureHelp({ formatHelp: () => (isJson(cmd) ? json() : text()) });
-}
-function configureCommand(sub, command, setup, json = () => commandHelpJson(commandLine(sub), command)) {
-    const fields = inputFields(command);
-    const rowFields = rowFieldsOf(command);
-    const helpFields = rowFields === undefined
-        ? fields
-        : { ...fields, options: [...fields.options, fieldsOption(rowFields)] };
-    helpFor(sub, () => commandHelp(commandLine(sub), command, helpFields, setup.style), json);
-    registerInput(sub, helpFields.options);
-    // The root already carries --json, for every Command.
-    for (const flag of runtimeFlagsFor(command.effect).filter((flag) => flag !== JSON_FLAG)) {
-        sub.option(flag.usage, flag.description);
-    }
-    sub.action(async () => {
-        setup.finish(await runCommand(sub, command, fields, setup));
-    });
-}
-function addCommand(parent, command, setup) {
-    const sub = stopAt(parent.command(command.name).description(command.description));
-    configureCommand(sub, command, setup);
-}
-function addCommands(parent, commands, setup) {
-    for (const [key, node] of Object.entries(commands)) {
-        if (isCommand(node)) {
-            addCommand(parent, node, setup);
-        }
-        else {
-            const group = stopAt(parent.command(key));
-            helpFor(group, () => groupHelp(commandLine(group), node, setup.style), () => groupHelpJson(commandLine(group), node));
-            addCommands(group, node, setup);
-        }
-    }
-}
-function stopped(error, { commanderOut, invocation, errorFormat }) {
-    if (!(error instanceof ParseStop)) {
-        return failure(error, errorFormat);
-    }
-    if (error.reason.exitCode === 0) {
-        return { stdout: commanderOut, stderr: "", exitCode: 0 };
-    }
-    // A group called without a Command answers with its help, the same as its --help.
-    if (error.reason.code === "commander.help") {
-        return { stdout: error.command.helpInformation(), stderr: "", exitCode: 0 };
-    }
-    return failure(usageErrorOf(error, invocation), { ...errorFormat, json: isJson(error.command) });
-}
-function versionLine({ version, build }) {
-    if (build === undefined)
-        return version;
-    return `${version} (${build.sha}${build.dirty ? "+dirty" : ""})`;
+    return commandResult(settled, { ...format, fields: flags.fields });
 }
 export async function runCli(cli, argv, options) {
     const progress = [];
@@ -157,55 +52,34 @@ export async function runCli(cli, argv, options) {
 }
 // Progress is written as it happens: an Agent harness kills a process that stays silent too long.
 export async function runWithProgress(cli, argv, options, writeProgress) {
-    const style = styleFor(options.env, options.stdoutIsTTY === true);
-    const errorFormat = { cliName: cli.name, json: false, env: options.env, style };
-    const commanderOut = [];
-    // Settings must be on the root before .command(): children copy them at creation.
-    const root = stopAt(new Commander(cli.name))
-        .configureOutput({
-        writeOut: (text) => commanderOut.push(text),
-        // Commander writes here only the help for a group called without a Command, answered below.
-        writeErr: () => { },
-        outputError: () => { },
-        // The Runtime decides colour itself, so commander must not strip it by reading `process`.
-        stripColor: (text) => text,
-    })
-        .helpCommand(false)
-        .version(versionLine(cli), "--version")
-        .option(JSON_FLAG.usage, JSON_FLAG.description);
-    const invocation = { cliName: cli.name, argv };
-    let commandResult;
-    const setup = {
-        base: {
-            cwd: options.cwd,
-            env: options.env,
-            progress: (message) => writeProgress(`${message}\n`),
-        },
-        signal: options.signal,
-        style,
-        invocation,
-        errorFormat,
-        finish: (result) => {
-            commandResult = result;
-        },
+    const format = {
+        cliName: cli.name,
+        env: options.env,
+        style: styleFor(options.env, options.stdoutIsTTY === true),
+        invocation: { cliName: cli.name, argv },
+        json: false,
     };
-    if (cli.commands === undefined) {
-        configureCommand(root, cli.command, setup, () => cliHelpJson(cli.name, cli.version, cli.command));
-    }
-    else {
-        const commands = { ...cli.commands, ...builtInCommands(cli, options.bin) };
-        helpFor(root, () => cliHelp(cli.name, cli.version, commands, style), () => cliHelpJson(cli.name, cli.version, commands));
-        addCommands(root, commands, setup);
-    }
-    try {
-        await root.parseAsync([...argv], { from: "user" });
-    }
-    catch (error) {
-        return stopped(error, { commanderOut: commanderOut.join(""), invocation, errorFormat });
-    }
-    if (commandResult === undefined) {
-        throw new Error("commander finished parsing without running a Command");
+    const root = cli.commands === undefined
+        ? commandSpec(cli.name, cli.command)
+        : groupSpec(cli.name, { ...cli.commands, ...builtInCommands(cli, options.bin) });
+    const routed = route(root, format.invocation);
+    switch (routed.kind) {
+        case "version":
+            return versionResult(cli);
+        case "help":
+            return helpResult(routed.node, root, cli, { ...format, json: routed.json });
+        case "usage error":
+            return errorResult(routed.error, { ...format, json: routed.json });
+        case "command":
+            return runCommand(routed, {
+                base: {
+                    cwd: options.cwd,
+                    env: options.env,
+                    progress: (message) => writeProgress(`${message}\n`),
+                },
+                signal: options.signal,
+                format,
+            });
     }
-    return commandResult;
 }
 //# sourceMappingURL=run-cli.js.map