citty 0.1.0 → 0.1.2

package/LICENSE

@@ -34,14 +34,3 @@ The above copyright notice and this permission notice shall be included in all c
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
----
-
-Colorette dependency is bundled (https://github.com/jorgebucaran/colorette)
-
-Copyright © Jorge Bucaran <https://jorgebucaran.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -65,7 +65,7 @@ const main = defineCommand({
     },
   },
   run({ args }) {
-    console.log(`${args.friendly ? "Hi" : "Greetings"} ${args.name}!`);
+    consol.log(`${args.friendly ? "Hi" : "Greetings"} ${args.name}!`);
   },
 });
 

package/dist/index.cjs

@@ -1,13 +1,17 @@
 'use strict';
 
-const scule = require('scule');
-const colorette = require('colorette');
+const consola = require('consola');
+const utils = require('consola/utils');
+
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
+
+const consola__default = /*#__PURE__*/_interopDefaultCompat(consola);
 
 function toArray(val) {
   if (Array.isArray(val)) {
     return val;
   }
-  return val !== void 0 ? [val] : [];
+  return val === void 0 ? [] : [val];
 }
 function formatLineColumns(lines, linePrefix = "") {
   const maxLengh = [];
@@ -33,6 +37,70 @@ class CLIError extends Error {
   }
 }
 
+const NUMBER_CHAR_RE = /\d/;
+const STR_SPLITTERS = ["-", "_", "/", "."];
+function isUppercase(char = "") {
+  if (NUMBER_CHAR_RE.test(char)) {
+    return void 0;
+  }
+  return char.toUpperCase() === char;
+}
+function splitByCase(string_, separators) {
+  const splitters = separators ?? STR_SPLITTERS;
+  const parts = [];
+  if (!string_ || typeof string_ !== "string") {
+    return parts;
+  }
+  let buff = "";
+  let previousUpper;
+  let previousSplitter;
+  for (const char of string_) {
+    const isSplitter = splitters.includes(char);
+    if (isSplitter === true) {
+      parts.push(buff);
+      buff = "";
+      previousUpper = void 0;
+      continue;
+    }
+    const isUpper = isUppercase(char);
+    if (previousSplitter === false) {
+      if (previousUpper === false && isUpper === true) {
+        parts.push(buff);
+        buff = char;
+        previousUpper = isUpper;
+        continue;
+      }
+      if (previousUpper === true && isUpper === false && buff.length > 1) {
+        const lastChar = buff[buff.length - 1];
+        parts.push(buff.slice(0, Math.max(0, buff.length - 1)));
+        buff = lastChar + char;
+        previousUpper = isUpper;
+        continue;
+      }
+    }
+    buff += char;
+    previousUpper = isUpper;
+    previousSplitter = isSplitter;
+  }
+  parts.push(buff);
+  return parts;
+}
+function upperFirst(string_) {
+  return !string_ ? "" : string_[0].toUpperCase() + string_.slice(1);
+}
+function lowerFirst(string_) {
+  return !string_ ? "" : string_[0].toLowerCase() + string_.slice(1);
+}
+function pascalCase(string_) {
+  return !string_ ? "" : (Array.isArray(string_) ? string_ : splitByCase(string_)).map((p) => upperFirst(p)).join("");
+}
+function camelCase(string_) {
+  return lowerFirst(pascalCase(string_));
+}
+function kebabCase(string_, joiner) {
+  return !string_ ? "" : (Array.isArray(string_) ? string_ : splitByCase(string_)).map((p) => p.toLowerCase()).join(joiner ?? "-");
+}
+
 function toArr(any) {
   return any == void 0 ? [] : Array.isArray(any) ? any : [any];
 }
@@ -151,6 +219,7 @@ function parseArgs(rawArgs, argsDef) {
   const parseOptions = {
     boolean: [],
     string: [],
+    mixed: [],
     alias: {},
     default: {}
   };
@@ -159,7 +228,11 @@ function parseArgs(rawArgs, argsDef) {
     if (arg.type === "positional") {
       continue;
     }
-    parseOptions[arg.type || "boolean"].push(arg.name);
+    if (arg.type === "string") {
+      parseOptions.string.push(arg.name);
+    } else if (arg.type === "boolean") {
+      parseOptions.boolean.push(arg.name);
+    }
     if (arg.default !== void 0) {
       parseOptions.default[arg.name] = arg.default;
     }
@@ -168,10 +241,10 @@ function parseArgs(rawArgs, argsDef) {
     }
   }
   const parsed = parseRawArgs(rawArgs, parseOptions);
-  const [, ...positionalArguments] = parsed._;
+  const [...positionalArguments] = parsed._;
   const parsedArgsProxy = new Proxy(parsed, {
     get(target, prop) {
-      return target[prop] ?? target[scule.camelCase(prop)] ?? target[scule.kebabCase(prop)];
+      return target[prop] ?? target[camelCase(prop)] ?? target[kebabCase(prop)];
     }
   });
   for (const [, arg] of args.entries()) {
@@ -179,13 +252,13 @@ function parseArgs(rawArgs, argsDef) {
       const nextPositionalArgument = positionalArguments.shift();
       if (nextPositionalArgument !== void 0) {
         parsedArgsProxy[arg.name] = nextPositionalArgument;
-      } else if (arg.default !== void 0) {
-        parsedArgsProxy[arg.name] = arg.default;
-      } else {
+      } else if (arg.default === void 0 && arg.required !== false) {
         throw new CLIError(
           `Missing required positional argument: ${arg.name.toUpperCase()}`,
           "EARG"
         );
+      } else {
+        parsedArgsProxy[arg.name] = arg.default;
       }
     } else if (arg.required && parsedArgsProxy[arg.name] === void 0) {
       throw new CLIError(`Missing required argument: --${arg.name}`, "EARG");
@@ -214,6 +287,7 @@ async function runCommand(cmd, opts) {
   const context = {
     rawArgs: opts.rawArgs,
     args: parsedArgs,
+    data: opts.data,
     cmd
   };
   if (typeof cmd.setup === "function") {
@@ -226,21 +300,18 @@ async function runCommand(cmd, opts) {
     );
     const subCommandName = opts.rawArgs[subCommandArgIndex];
     if (!subCommandName && !cmd.run) {
-      throw new CLIError(
-        `Missing sub command. Use --help to see available sub commands.`,
-        "ESUBCOMMAND"
-      );
+      throw new CLIError(`No command specified.`, "E_NO_COMMAND");
     }
     if (!subCommands[subCommandName]) {
       throw new CLIError(
-        `Unknown sub command: ${subCommandName}`,
-        "ESUBCOMMAND"
+        `Unknown command \`${subCommandName}\``,
+        "E_UNKNOWN_COMMAND"
       );
     }
     const subCommand = await resolveValue(subCommands[subCommandName]);
     if (subCommand) {
       await runCommand(subCommand, {
-        rawArgs: opts.rawArgs.slice(subCommandArgIndex)
+        rawArgs: opts.rawArgs.slice(subCommandArgIndex + 1)
       });
     }
   }
@@ -257,7 +328,7 @@ async function resolveSubCommand(cmd, rawArgs, parent) {
     if (subCommand) {
       return resolveSubCommand(
         subCommand,
-        rawArgs.slice(subCommandArgIndex),
+        rawArgs.slice(subCommandArgIndex + 1),
         cmd
       );
     }
@@ -267,9 +338,9 @@ async function resolveSubCommand(cmd, rawArgs, parent) {
 
 async function showUsage(cmd, parent) {
   try {
-    console.log(await renderUsage(cmd, parent) + "\n");
+    consola__default.log(await renderUsage(cmd, parent) + "\n");
   } catch (error) {
-    console.error(error);
+    consola__default.error(error);
   }
 }
 async function renderUsage(cmd, parent) {
@@ -286,7 +357,7 @@ async function renderUsage(cmd, parent) {
       const name = arg.name.toUpperCase();
       const isRequired = arg.required !== false && arg.default === void 0;
       const usageHint = arg.default ? `="${arg.default}"` : "";
-      posLines.push([name + usageHint, arg.description || ""]);
+      posLines.push(["`" + name + usageHint + "`", arg.description || ""]);
       usageLine.push(isRequired ? `<${name}>` : `[${name}]`);
     } else {
       const isRequired = arg.required === true && arg.default === void 0;
@@ -297,7 +368,7 @@ async function renderUsage(cmd, parent) {
         ", "
       )) + (arg.type === "string" && (arg.valueHint || arg.default) ? `=${arg.valueHint ? `<${arg.valueHint}>` : `"${arg.default || ""}"`}` : "");
       argLines.push([
-        argStr + (isRequired ? " (required)" : ""),
+        "`" + argStr + (isRequired ? " (required)" : "") + "`",
         arg.description || ""
       ]);
       if (isRequired) {
@@ -307,8 +378,11 @@ async function renderUsage(cmd, parent) {
   }
   if (cmd.subCommands) {
     const commandNames = [];
-    for (const [name, sub] of Object.entries(cmd.subCommands)) {
-      commandsLines.push([name, sub.meta?.description || ""]);
+    const subCommands = await resolveValue(cmd.subCommands);
+    for (const [name, sub] of Object.entries(subCommands)) {
+      const subCmd = await resolveValue(sub);
+      const meta = await resolveValue(subCmd?.meta);
+      commandsLines.push([`\`${name}\``, meta?.description || ""]);
       commandNames.push(name);
     }
     usageLine.push(commandNames.join("|"));
@@ -316,29 +390,28 @@ async function renderUsage(cmd, parent) {
   const usageLines = [];
   const version = cmdMeta.version || parentMeta.version;
   usageLines.push(
-    commandName + (version ? ` v${version}` : ""),
-    cmdMeta.description,
+    utils.colors.gray(
+      `${cmdMeta.description} (${commandName + (version ? ` v${version}` : "")})`
+    ),
     ""
   );
   const hasOptions = argLines.length > 0 || posLines.length > 0;
   usageLines.push(
-    `USAGE: ${commandName}${hasOptions ? " [OPTIONS]" : ""} ${usageLine.join(
-      " "
-    )}`,
+    `${utils.colors.underline(utils.colors.bold("USAGE"))} \`${commandName}${hasOptions ? " [OPTIONS]" : ""} ${usageLine.join(" ")}\``,
     ""
   );
   if (posLines.length > 0) {
-    usageLines.push("ARGUMENTS:", "");
+    usageLines.push(utils.colors.underline(utils.colors.bold("ARGUMENTS")), "");
     usageLines.push(formatLineColumns(posLines, "  "));
     usageLines.push("");
   }
   if (argLines.length > 0) {
-    usageLines.push("OPTIONS:", "");
+    usageLines.push(utils.colors.underline(utils.colors.bold("OPTIONS")), "");
     usageLines.push(formatLineColumns(argLines, "  "));
     usageLines.push("");
   }
   if (commandsLines.length > 0) {
-    usageLines.push("COMMANDS:", "");
+    usageLines.push(utils.colors.underline(utils.colors.bold("COMMANDS")), "");
     usageLines.push(formatLineColumns(commandsLines, "  "));
     usageLines.push(
       "",
@@ -360,16 +433,12 @@ async function runMain(cmd, opts = {}) {
   } catch (error) {
     const isCLIError = error instanceof CLIError;
     if (!isCLIError) {
-      console.error(error, "\n");
+      consola__default.error(error, "\n");
     }
-    console.error(
-      `
-${colorette.bgRed(` ${error.code || error.name} `)} ${error.message}
-`
-    );
     if (isCLIError) {
       await showUsage(...await resolveSubCommand(cmd, rawArgs));
     }
+    consola__default.error(error.message);
     process.exit(1);
   }
 }

package/dist/index.d.ts

@@ -22,7 +22,7 @@ type ParsedArgs<T extends ArgsDef = ArgsDef> = {
     [K in keyof T]: T[K] extends {
         type: "positional";
     } ? K : never;
-}[keyof T], string | boolean> & Record<{
+}[keyof T], string> & Record<{
     [K in keyof T]: T[K] extends {
         type: "string";
     } ? K : never;
@@ -30,7 +30,7 @@ type ParsedArgs<T extends ArgsDef = ArgsDef> = {
     [K in keyof T]: T[K] extends {
         type: "boolean";
     } ? K : never;
-}[keyof T], boolean>;
+}[keyof T], boolean> & Record<string, string | boolean>;
 interface CommandMeta {
     name?: string;
     version?: string;
@@ -48,8 +48,9 @@ type CommandDef<T extends ArgsDef = ArgsDef> = {
 type CommandContext<T extends ArgsDef = ArgsDef> = {
     rawArgs: string[];
     args: ParsedArgs<T>;
-    cmd: CommandDef;
+    cmd: CommandDef<T>;
     subCommand?: CommandDef<T>;
+    data?: any;
 };
 type Awaitable<T> = () => T | Promise<T>;
 type Resolvable<T> = T | Promise<T> | (() => T) | (() => Promise<T>);
@@ -57,18 +58,19 @@ type Resolvable<T> = T | Promise<T> | (() => T) | (() => Promise<T>);
 declare function defineCommand<T extends ArgsDef = ArgsDef>(def: CommandDef<T>): CommandDef<T>;
 interface RunCommandOptions {
     rawArgs: string[];
+    data?: any;
     showUsage?: boolean;
 }
-declare function runCommand(cmd: CommandDef, opts: RunCommandOptions): Promise<void>;
+declare function runCommand<T extends ArgsDef = ArgsDef>(cmd: CommandDef<T>, opts: RunCommandOptions): Promise<void>;
 
 interface RunMainOptions {
     rawArgs?: string[];
 }
-declare function runMain(cmd: CommandDef, opts?: RunMainOptions): Promise<void>;
+declare function runMain<T extends ArgsDef = ArgsDef>(cmd: CommandDef<T>, opts?: RunMainOptions): Promise<void>;
 
-declare function parseArgs(rawArgs: string[], argsDef: ArgsDef): ParsedArgs;
+declare function parseArgs<T extends ArgsDef = ArgsDef>(rawArgs: string[], argsDef: ArgsDef): ParsedArgs<T>;
 
-declare function showUsage(cmd: CommandDef, parent?: CommandDef): Promise<void>;
-declare function renderUsage(cmd: CommandDef, parent?: CommandDef): Promise<string>;
+declare function showUsage<T extends ArgsDef = ArgsDef>(cmd: CommandDef<T>, parent?: CommandDef<T>): Promise<void>;
+declare function renderUsage<T extends ArgsDef = ArgsDef>(cmd: CommandDef<T>, parent?: CommandDef<T>): Promise<string>;
 
 export { Arg, ArgDef, ArgType, ArgsDef, Awaitable, BooleanArgDef, CommandContext, CommandDef, CommandMeta, ParsedArgs, PositionalArgDef, Resolvable, RunCommandOptions, RunMainOptions, StringArgDef, SubCommandsDef, _ArgDef, defineCommand, parseArgs, renderUsage, runCommand, runMain, showUsage };

package/dist/index.mjs

@@ -1,11 +1,11 @@
-import { camelCase, kebabCase } from 'scule';
-import { bgRed } from 'colorette';
+import consola from 'consola';
+import { colors } from 'consola/utils';
 
 function toArray(val) {
   if (Array.isArray(val)) {
     return val;
   }
-  return val !== void 0 ? [val] : [];
+  return val === void 0 ? [] : [val];
 }
 function formatLineColumns(lines, linePrefix = "") {
   const maxLengh = [];
@@ -31,6 +31,70 @@ class CLIError extends Error {
   }
 }
 
+const NUMBER_CHAR_RE = /\d/;
+const STR_SPLITTERS = ["-", "_", "/", "."];
+function isUppercase(char = "") {
+  if (NUMBER_CHAR_RE.test(char)) {
+    return void 0;
+  }
+  return char.toUpperCase() === char;
+}
+function splitByCase(string_, separators) {
+  const splitters = separators ?? STR_SPLITTERS;
+  const parts = [];
+  if (!string_ || typeof string_ !== "string") {
+    return parts;
+  }
+  let buff = "";
+  let previousUpper;
+  let previousSplitter;
+  for (const char of string_) {
+    const isSplitter = splitters.includes(char);
+    if (isSplitter === true) {
+      parts.push(buff);
+      buff = "";
+      previousUpper = void 0;
+      continue;
+    }
+    const isUpper = isUppercase(char);
+    if (previousSplitter === false) {
+      if (previousUpper === false && isUpper === true) {
+        parts.push(buff);
+        buff = char;
+        previousUpper = isUpper;
+        continue;
+      }
+      if (previousUpper === true && isUpper === false && buff.length > 1) {
+        const lastChar = buff[buff.length - 1];
+        parts.push(buff.slice(0, Math.max(0, buff.length - 1)));
+        buff = lastChar + char;
+        previousUpper = isUpper;
+        continue;
+      }
+    }
+    buff += char;
+    previousUpper = isUpper;
+    previousSplitter = isSplitter;
+  }
+  parts.push(buff);
+  return parts;
+}
+function upperFirst(string_) {
+  return !string_ ? "" : string_[0].toUpperCase() + string_.slice(1);
+}
+function lowerFirst(string_) {
+  return !string_ ? "" : string_[0].toLowerCase() + string_.slice(1);
+}
+function pascalCase(string_) {
+  return !string_ ? "" : (Array.isArray(string_) ? string_ : splitByCase(string_)).map((p) => upperFirst(p)).join("");
+}
+function camelCase(string_) {
+  return lowerFirst(pascalCase(string_));
+}
+function kebabCase(string_, joiner) {
+  return !string_ ? "" : (Array.isArray(string_) ? string_ : splitByCase(string_)).map((p) => p.toLowerCase()).join(joiner ?? "-");
+}
+
 function toArr(any) {
   return any == void 0 ? [] : Array.isArray(any) ? any : [any];
 }
@@ -149,6 +213,7 @@ function parseArgs(rawArgs, argsDef) {
   const parseOptions = {
     boolean: [],
     string: [],
+    mixed: [],
     alias: {},
     default: {}
   };
@@ -157,7 +222,11 @@ function parseArgs(rawArgs, argsDef) {
     if (arg.type === "positional") {
       continue;
     }
-    parseOptions[arg.type || "boolean"].push(arg.name);
+    if (arg.type === "string") {
+      parseOptions.string.push(arg.name);
+    } else if (arg.type === "boolean") {
+      parseOptions.boolean.push(arg.name);
+    }
     if (arg.default !== void 0) {
       parseOptions.default[arg.name] = arg.default;
     }
@@ -166,7 +235,7 @@ function parseArgs(rawArgs, argsDef) {
     }
   }
   const parsed = parseRawArgs(rawArgs, parseOptions);
-  const [, ...positionalArguments] = parsed._;
+  const [...positionalArguments] = parsed._;
   const parsedArgsProxy = new Proxy(parsed, {
     get(target, prop) {
       return target[prop] ?? target[camelCase(prop)] ?? target[kebabCase(prop)];
@@ -177,13 +246,13 @@ function parseArgs(rawArgs, argsDef) {
       const nextPositionalArgument = positionalArguments.shift();
       if (nextPositionalArgument !== void 0) {
         parsedArgsProxy[arg.name] = nextPositionalArgument;
-      } else if (arg.default !== void 0) {
-        parsedArgsProxy[arg.name] = arg.default;
-      } else {
+      } else if (arg.default === void 0 && arg.required !== false) {
         throw new CLIError(
           `Missing required positional argument: ${arg.name.toUpperCase()}`,
           "EARG"
         );
+      } else {
+        parsedArgsProxy[arg.name] = arg.default;
       }
     } else if (arg.required && parsedArgsProxy[arg.name] === void 0) {
       throw new CLIError(`Missing required argument: --${arg.name}`, "EARG");
@@ -212,6 +281,7 @@ async function runCommand(cmd, opts) {
   const context = {
     rawArgs: opts.rawArgs,
     args: parsedArgs,
+    data: opts.data,
     cmd
   };
   if (typeof cmd.setup === "function") {
@@ -224,21 +294,18 @@ async function runCommand(cmd, opts) {
     );
     const subCommandName = opts.rawArgs[subCommandArgIndex];
     if (!subCommandName && !cmd.run) {
-      throw new CLIError(
-        `Missing sub command. Use --help to see available sub commands.`,
-        "ESUBCOMMAND"
-      );
+      throw new CLIError(`No command specified.`, "E_NO_COMMAND");
     }
     if (!subCommands[subCommandName]) {
       throw new CLIError(
-        `Unknown sub command: ${subCommandName}`,
-        "ESUBCOMMAND"
+        `Unknown command \`${subCommandName}\``,
+        "E_UNKNOWN_COMMAND"
       );
     }
     const subCommand = await resolveValue(subCommands[subCommandName]);
     if (subCommand) {
       await runCommand(subCommand, {
-        rawArgs: opts.rawArgs.slice(subCommandArgIndex)
+        rawArgs: opts.rawArgs.slice(subCommandArgIndex + 1)
       });
     }
   }
@@ -255,7 +322,7 @@ async function resolveSubCommand(cmd, rawArgs, parent) {
     if (subCommand) {
       return resolveSubCommand(
         subCommand,
-        rawArgs.slice(subCommandArgIndex),
+        rawArgs.slice(subCommandArgIndex + 1),
         cmd
       );
     }
@@ -265,9 +332,9 @@ async function resolveSubCommand(cmd, rawArgs, parent) {
 
 async function showUsage(cmd, parent) {
   try {
-    console.log(await renderUsage(cmd, parent) + "\n");
+    consola.log(await renderUsage(cmd, parent) + "\n");
   } catch (error) {
-    console.error(error);
+    consola.error(error);
   }
 }
 async function renderUsage(cmd, parent) {
@@ -284,7 +351,7 @@ async function renderUsage(cmd, parent) {
       const name = arg.name.toUpperCase();
       const isRequired = arg.required !== false && arg.default === void 0;
       const usageHint = arg.default ? `="${arg.default}"` : "";
-      posLines.push([name + usageHint, arg.description || ""]);
+      posLines.push(["`" + name + usageHint + "`", arg.description || ""]);
       usageLine.push(isRequired ? `<${name}>` : `[${name}]`);
     } else {
       const isRequired = arg.required === true && arg.default === void 0;
@@ -295,7 +362,7 @@ async function renderUsage(cmd, parent) {
         ", "
       )) + (arg.type === "string" && (arg.valueHint || arg.default) ? `=${arg.valueHint ? `<${arg.valueHint}>` : `"${arg.default || ""}"`}` : "");
       argLines.push([
-        argStr + (isRequired ? " (required)" : ""),
+        "`" + argStr + (isRequired ? " (required)" : "") + "`",
         arg.description || ""
       ]);
       if (isRequired) {
@@ -305,8 +372,11 @@ async function renderUsage(cmd, parent) {
   }
   if (cmd.subCommands) {
     const commandNames = [];
-    for (const [name, sub] of Object.entries(cmd.subCommands)) {
-      commandsLines.push([name, sub.meta?.description || ""]);
+    const subCommands = await resolveValue(cmd.subCommands);
+    for (const [name, sub] of Object.entries(subCommands)) {
+      const subCmd = await resolveValue(sub);
+      const meta = await resolveValue(subCmd?.meta);
+      commandsLines.push([`\`${name}\``, meta?.description || ""]);
       commandNames.push(name);
     }
     usageLine.push(commandNames.join("|"));
@@ -314,29 +384,28 @@ async function renderUsage(cmd, parent) {
   const usageLines = [];
   const version = cmdMeta.version || parentMeta.version;
   usageLines.push(
-    commandName + (version ? ` v${version}` : ""),
-    cmdMeta.description,
+    colors.gray(
+      `${cmdMeta.description} (${commandName + (version ? ` v${version}` : "")})`
+    ),
     ""
   );
   const hasOptions = argLines.length > 0 || posLines.length > 0;
   usageLines.push(
-    `USAGE: ${commandName}${hasOptions ? " [OPTIONS]" : ""} ${usageLine.join(
-      " "
-    )}`,
+    `${colors.underline(colors.bold("USAGE"))} \`${commandName}${hasOptions ? " [OPTIONS]" : ""} ${usageLine.join(" ")}\``,
     ""
   );
   if (posLines.length > 0) {
-    usageLines.push("ARGUMENTS:", "");
+    usageLines.push(colors.underline(colors.bold("ARGUMENTS")), "");
     usageLines.push(formatLineColumns(posLines, "  "));
     usageLines.push("");
   }
   if (argLines.length > 0) {
-    usageLines.push("OPTIONS:", "");
+    usageLines.push(colors.underline(colors.bold("OPTIONS")), "");
     usageLines.push(formatLineColumns(argLines, "  "));
     usageLines.push("");
   }
   if (commandsLines.length > 0) {
-    usageLines.push("COMMANDS:", "");
+    usageLines.push(colors.underline(colors.bold("COMMANDS")), "");
     usageLines.push(formatLineColumns(commandsLines, "  "));
     usageLines.push(
       "",
@@ -358,16 +427,12 @@ async function runMain(cmd, opts = {}) {
   } catch (error) {
     const isCLIError = error instanceof CLIError;
     if (!isCLIError) {
-      console.error(error, "\n");
+      consola.error(error, "\n");
     }
-    console.error(
-      `
-${bgRed(` ${error.code || error.name} `)} ${error.message}
-`
-    );
     if (isCLIError) {
       await showUsage(...await resolveSubCommand(cmd, rawArgs));
     }
+    consola.error(error.message);
     process.exit(1);
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "citty",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Elegant CLI Builder",
   "repository": "unjs/citty",
   "license": "MIT",
@@ -30,18 +30,20 @@
     "test": "pnpm lint && vitest run --coverage"
   },
   "dependencies": {
-    "@types/node": "^18.15.11",
-    "@vitest/coverage-c8": "^0.29.8",
-    "changelogen": "^0.5.2",
-    "colorette": "^2.0.19",
-    "eslint": "^8.37.0",
-    "eslint-config-unjs": "^0.1.0",
-    "jiti": "^1.18.2",
-    "prettier": "^2.8.7",
+    "consola": "^3.2.3"
+  },
+  "devDependencies": {
+    "@types/node": "^20.4.0",
+    "@vitest/coverage-v8": "^0.32.4",
+    "changelogen": "^0.5.4",
+    "eslint": "^8.44.0",
+    "eslint-config-unjs": "^0.2.1",
+    "jiti": "^1.19.1",
+    "prettier": "^3.0.0",
     "scule": "^1.0.0",
-    "typescript": "^5.0.3",
-    "unbuild": "^1.1.2",
-    "vitest": "^0.29.8"
+    "typescript": "^5.1.6",
+    "unbuild": "^1.2.1",
+    "vitest": "^0.32.4"
   },
-  "packageManager": "pnpm@8.1.0"
+  "packageManager": "pnpm@8.6.6"
 }