@gunshi/plugin-renderer 0.27.6 → 0.28.0

package/lib/index.js

@@ -50,7 +50,8 @@ async function resolveLazyCommand(cmd, name, needRunResolving = false) {
 			args: cmd.args,
 			examples: cmd.examples,
 			internal: cmd.internal,
-			entry: cmd.entry
+			entry: cmd.entry,
+			subCommands: cmd.subCommands
 		};
 		if ("resource" in cmd && cmd.resource) baseCommand.resource = cmd.resource;
 		command = Object.assign(create(), baseCommand);
@@ -66,6 +67,7 @@ async function resolveLazyCommand(cmd, name, needRunResolving = false) {
 				command.examples = loaded.examples;
 				command.internal = loaded.internal;
 				command.entry = loaded.entry;
+				command.subCommands = loaded.subCommands || cmd.subCommands;
 				if ("resource" in loaded && loaded.resource) command.resource = loaded.resource;
 			} else throw new TypeError(`Cannot resolve command: ${cmd.name || name}`);
 		}
@@ -311,7 +313,7 @@ const COMMON_ARGS_KEYS = Object.keys(COMMON_ARGS);
 */
 async function renderUsage(ctx) {
 	const messages = [];
-	if (!ctx.omitted) {
+	if (ctx.callMode === "subCommand") {
 		const description = await resolveDescription(ctx);
 		if (description) messages.push(description, "");
 	}
@@ -405,10 +407,11 @@ async function renderCommandsSection(ctx) {
 		return `${command.padStart(ctx.env.leftMargin + command.length)}`;
 	}));
 	messages.push(...commandsStr, "", `${await ctx.extensions[pluginId].text(resolveBuiltInKey("FORMORE"))}:`);
+	const basePath = ctx.commandPath && ctx.commandPath.length > 0 ? `${ctx.env.name} ${ctx.commandPath.join(" ")}` : ctx.env.name;
 	messages.push(...loadedCommands.map((cmd) => {
 		let commandStr = cmd.entry ? "" : cmd.name || "";
 		if (commandStr) commandStr += " ";
-		const commandHelp = `${ctx.env.name} ${commandStr}--help`;
+		const commandHelp = `${basePath} ${commandStr}--help`;
 		return `${commandHelp.padStart(ctx.env.leftMargin + commandHelp.length)}`;
 	}));
 	return messages;
@@ -443,6 +446,7 @@ async function resolveEntry(ctx) {
 * @returns The sub command name
 */
 async function resolveSubCommand(ctx) {
+	if (ctx.commandPath && ctx.commandPath.length > 0) return ctx.commandPath.join(" ");
 	return ctx.name || await ctx.extensions[pluginId].text(resolveBuiltInKey("SUBCOMMAND"));
 }
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gunshi/plugin-renderer",
   "description": "usage renderer plugin for gunshi",
-  "version": "0.27.6",
+  "version": "0.28.0",
   "author": {
     "name": "kazuya kawaguchi",
     "email": "kawakazu80@gmail.com"
@@ -53,10 +53,10 @@
     }
   },
   "dependencies": {
-    "@gunshi/plugin": "0.27.6"
+    "@gunshi/plugin": "0.28.0"
   },
   "peerDependencies": {
-    "@gunshi/plugin-i18n": "0.27.6"
+    "@gunshi/plugin-i18n": "0.28.0"
   },
   "devDependencies": {
     "deno": "^2.6.3",
@@ -66,7 +66,7 @@
     "tsdown": "0.15.12",
     "typedoc": "^0.28.15",
     "typedoc-plugin-markdown": "^4.9.0",
-    "@gunshi/shared": "0.27.6"
+    "@gunshi/shared": "0.28.0"
   },
   "scripts": {
     "build": "tsdown",