gunshi 0.6.0 → 0.6.2

package/lib/index.js

@@ -1,16 +1,15 @@
 import { COMMAND_OPTIONS_DEFAULT, COMMON_OPTIONS, createCommandContext } from "./context-DmZAeiph.js";
 import { create, log, resolveLazyCommand } from "./utils-NHs5DuHk.js";
-import { renderHeader, renderUsage, renderValidationErrors } from "./renderer-MpQ9U28q.js";
+import { renderHeader, renderUsage, renderValidationErrors } from "./renderer-v5Uq0km9.js";
 import { parseArgs, resolveArgs } from "args-tokens";
 
 //#region src/cli.ts
 async function cli(args, entry, opts = {}) {
 	const tokens = parseArgs(args);
 	const subCommand = getSubCommand(tokens);
-	const resolvedCommandOptions = resolveCommandOptions(opts);
+	const resolvedCommandOptions = resolveCommandOptions(opts, entry);
 	const [name, command] = await resolveCommand(subCommand, entry, resolvedCommandOptions);
 	if (!command) throw new Error(`Command not found: ${name || ""}`);
-	if (command.name && !resolvedCommandOptions.subCommands.has(command.name)) resolvedCommandOptions.subCommands.set(command.name, command);
 	const options = resolveArgOptions(command.options);
 	const { values, positionals, error } = resolveArgs(options, tokens);
 	const omitted = !subCommand;
@@ -20,7 +19,7 @@ async function cli(args, entry, opts = {}) {
 		positionals,
 		omitted,
 		command,
-		commandOptions: opts
+		commandOptions: resolvedCommandOptions
 	});
 	if (values.version) {
 		showVersion(ctx);
@@ -43,9 +42,10 @@ async function cli(args, entry, opts = {}) {
 function resolveArgOptions(options) {
 	return Object.assign(create(), options, COMMON_OPTIONS);
 }
-function resolveCommandOptions(options) {
+function resolveCommandOptions(options, entry) {
 	const subCommands = new Map(options.subCommands);
-	return Object.assign(create(), COMMAND_OPTIONS_DEFAULT, { subCommands }, options);
+	if (typeof entry === "object" && entry.name) subCommands.set(entry.name, entry);
+	return Object.assign(create(), COMMAND_OPTIONS_DEFAULT, options, { subCommands });
 }
 function getSubCommand(tokens) {
 	const firstToken = tokens[0];

package/lib/renderer/index.js

@@ -1,4 +1,4 @@
 import "../utils-NHs5DuHk.js";
-import { renderHeader, renderUsage, renderValidationErrors } from "../renderer-MpQ9U28q.js";
+import { renderHeader, renderUsage, renderValidationErrors } from "../renderer-v5Uq0km9.js";
 
 export { renderHeader, renderUsage, renderValidationErrors };

package/lib/{renderer-MpQ9U28q.js → renderer-v5Uq0km9.js}

@@ -10,7 +10,10 @@ function renderHeader(ctx) {
 //#region src/renderer/usage.ts
 async function renderUsage(ctx) {
 	const messages = [];
-	if (!ctx.omitted && hasDescription(ctx)) messages.push(ctx.description, "");
+	if (!ctx.omitted) {
+		const description = resolveDescription(ctx);
+		if (description) messages.push(description, "");
+	}
 	messages.push(...await renderUsageSection(ctx), "");
 	if (ctx.omitted && await hasCommands(ctx)) messages.push(...await renderCommandsSection(ctx), "");
 	if (hasOptions(ctx)) messages.push(...await renderOptionsSection(ctx), "");
@@ -99,12 +102,12 @@ function resolveSubCommand(ctx) {
 	return ctx.name || ctx.translation("SUBCOMMAND");
 }
 /**
-* Check if the command has a description
+* Resolve the command description
 * @param ctx A {@link CommandContext | command context}
-* @returns True if the command has a description
+* @returns resolved command description
 */
-function hasDescription(ctx) {
-	return !!ctx.description;
+function resolveDescription(ctx) {
+	return ctx.translation("description") || ctx.description || "";
 }
 /**
 * Check if the command has sub commands

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gunshi",
   "description": "Modern javascript command-line library",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "author": {
     "name": "kazuya kawaguchi",
     "email": "kawakazu80@gmail.com"