🐛 fix(plugin-help): wrongly merged pr

Author: so1ve

packages/plugin-help/src/index.ts

@@ -1,6 +1,6 @@
 import type { HandlerContext, RootType } from "@clerc/core";
 import { NoSuchCommandError, Root, definePlugin, formatCommandName, resolveCommandStrict, withBrackets } from "@clerc/core";
-import { toArray } from "@clerc/utils";
+import { gracefulFlagName, toArray } from "@clerc/utils";
 import pc from "picocolors";
 
 import type { Render, Renderers, Section } from "./renderer";
@@ -95,7 +95,22 @@ const generateSubcommandHelp = (render: Render, ctx: HandlerContext, command: st
   if (subcommand.flags) {
     sections.push({
       title: t("help.flags")!,
-      body: splitTable(formatFlags(subcommand.flags)),
+      body: splitTable(
+        Object.entries(subcommand.flags).map(([name, flag]) => {
+          const hasDefault = flag.default !== undefined;
+          let flagNameWithAlias: string[] = [gracefulFlagName(name)];
+          if (flag.alias) {
+            flagNameWithAlias.push(gracefulFlagName(flag.alias));
+          }
+          flagNameWithAlias = flagNameWithAlias.map(renderers.renderFlagName);
+          const items = [pc.blue(flagNameWithAlias.join(", ")), renderers.renderType(flag.type, hasDefault)];
+          items.push(DELIMITER, flag.description || t("help.noDescription")!);
+          if (hasDefault) {
+            items.push(`(${t("help.default", renderers.renderDefault(flag.default))})`);
+          }
+          return items;
+        }),
+      ),
     });
   }
   if (subcommand.notes) {
@@ -157,7 +172,7 @@ export const helpPlugin = ({
     };
 
     if (command) {
-      cli = cli.command("help", t("help.helpDdescription")!, {
+      cli = cli.command("help", t("help.comamndDescription")!, {
         parameters: [
           "[command...]",
         ],
@@ -182,7 +197,7 @@ export const helpPlugin = ({
     }
 
     if (flag) {
-      cli = cli.flag("help", t("help.helpDdescription")!, {
+      cli = cli.flag("help", t("help.commandDescription")!, {
         alias: "h",
         type: Boolean,
         default: false,

packages/plugin-help/src/locales.ts

@@ -2,35 +2,37 @@ import type { Locales } from "@clerc/core";
 
 export const locales: Locales = {
   "en": {
-    "help.name": "Name",
-    "help.version": "Version",
-    "help.subcommand": "Subcommand",
-    "help.commands": "Commands",
-    "help.globalFlags": "Global Flags",
-    "help.flags": "Flags",
-    "help.description": "Description",
-    "help.usage": "Usage",
-    "help.examples": "Examples",
-    "help.notes": "Notes",
+    "help.name": "Name:",
+    "help.version": "Version:",
+    "help.subcommand": "Subcommand:",
+    "help.commands": "Commands:",
+    "help.globalFlags": "Global Flags:",
+    "help.flags": "Flags:",
+    "help.description": "Description:",
+    "help.usage": "Usage:",
+    "help.examples": "Examples:",
+    "help.notes": "Notes:",
+    "help.noDescription": "(No description)",
     "help.notes.1": "If no command is specified, show help for the CLI.",
     "help.notes.2": "If a command is specified, show help for the command.",
     "help.notes.3": "-h is an alias for --help.",
     "help.examples.1": "Show help",
     "help.examples.2": "Show help for a specific command",
     "help.commandDescription": "Show help",
-    "help.default": "Default: ",
+    "help.default": "Default: %s",
   },
   "zh-CN": {
-    "help.name": "名称",
-    "help.version": "版本",
-    "help.subcommand": "子命令",
-    "help.commands": "命令",
-    "help.globalFlags": "全局标志",
-    "help.flags": "标志",
-    "help.description": "描述",
-    "help.usage": "使用",
-    "help.examples": "示例",
-    "help.notes": "备注",
+    "help.name": "名称:",
+    "help.version": "版本:",
+    "help.subcommand": "子命令:",
+    "help.commands": "命令:",
+    "help.globalFlags": "全局标志:",
+    "help.flags": "标志:",
+    "help.description": "描述:",
+    "help.usage": "使用:",
+    "help.examples": "示例:",
+    "help.notes": "备注:",
+    "help.noDescription": "(无描述)",
     "help.notes.1": "如果没有指定展示哪个命令的帮助信息，默认展示CLI的。",
     "help.notes.2": "如果指定了则展示该命令帮助信息。",
     "help.notes.3": "-h 是 --help 的一个别名。",

packages/plugin-help/src/renderer.ts

@@ -34,10 +34,10 @@ export const render: Render = (sections: Section[]) => {
         .map(line => indent + line);
       formattedBody.unshift("");
       const body = formattedBody.join("\n");
-      rendered.push(table([[pc.bold(`${section.title}:`)], [body]]).toString());
+      rendered.push(table([[pc.bold(`${section.title}`)], [body]]).toString());
     } else if (section.type === "inline") {
       const formattedBody = section.items
-        .map(item => [pc.bold(`${item.title}:`), item.body]);
+        .map(item => [pc.bold(`${item.title}`), item.body]);
       const tableGenerated = table(formattedBody);
       rendered.push(tableGenerated.toString());
     }