@clerc/plugin-completions 1.0.0-beta.25 → 1.0.0-beta.27

package/dist/index.js

@@ -1,5 +1,5 @@
 import t from "@bomb.sh/tab";
-import { Clerc, NoCommandSpecifiedError, NoSuchCommandError, Types, definePlugin, normalizeFlagValue, resolveCommand } from "@clerc/core";
+import { Clerc, DOUBLE_DASH, NoCommandSpecifiedError, NoSuchCommandError, Types, definePlugin, normalizeFlagValue, resolveCommand } from "@clerc/core";
 import tty from "node:tty";
 
 //#region rolldown:runtime
@@ -384,8 +384,8 @@ var HelpRenderer = class {
 		if (command) {
 			if (command.name) usage += ` ${command.name}`;
 			if (command.parameters) usage += ` ${command.parameters.map((p$1) => typeof p$1 === "string" ? p$1 : p$1.key).join(" ")}`;
-		} else if (this._cli._commands.size > 0 && !(this._cli._commands.has("") && this._cli._commands.size === 1)) usage += this._cli._commands.has("") ? " [command]" : " <command>";
-		if (command?.flags && !objectIsEmpty(command.flags) || !objectIsEmpty(this._globalFlags)) usage += " [flags]";
+		} else if (this._cli._commands.size > 0 && !(this._cli._commands.has("") && this._cli._commands.size === 1)) usage += this._cli._commands.has("") ? ` ${dim("[command]")}` : ` ${dim("<command>")}`;
+		if (command?.flags && !objectIsEmpty(command.flags) || !objectIsEmpty(this._globalFlags)) usage += ` ${dim("[flags]")}`;
 		return {
 			title: "Usage",
 			body: [usage]
@@ -396,13 +396,14 @@ var HelpRenderer = class {
 		if (!command?.parameters || command.parameters.length === 0) return;
 		return {
 			title: "Parameters",
-			body: splitTable(command.parameters.map((parameter) => {
+			body: splitTable(command.parameters.filter((p$1) => p$1 !== DOUBLE_DASH).map((parameter) => {
 				const key = typeof parameter === "string" ? parameter : parameter.key;
 				const type = typeof parameter === "string" ? void 0 : parameter.type;
+				const formattedType = type ? this._formatters.formatTypeValue(type) : "string";
 				const description = typeof parameter === "string" ? void 0 : parameter.description;
 				return [
 					bold(key),
-					type ? this._formatters.formatTypeValue(type) : "string",
+					dim(formattedType),
 					description
 				].filter(isTruthy);
 			}))
@@ -481,14 +482,15 @@ var HelpRenderer = class {
 	}
 	renderFlagItem(name, flag) {
 		flag = normalizeFlagValue(flag);
-		const flagName = formatFlagName(name);
-		const shortFlag = flag.short ? formatFlagName(flag.short) : "";
+		let flagName = formatFlagName(name);
+		if (flag.short) flagName += `, ${formatFlagName(flag.short)}`;
 		const type = this._formatters.formatTypeValue(flag.type);
+		const default_ = flag.default !== void 0 && dim(`[default: ${bold(this._formatters.formatFlagDefault(flag.default))}]`);
 		return [
-			bold([flagName, shortFlag].filter(Boolean).join(", ")),
+			bold(flagName),
 			dim(type),
 			flag.description,
-			flag.default !== void 0 && dim(`[default: ${bold(this._formatters.formatFlagDefault(flag.default))}]`)
+			default_
 		].filter(isTruthy);
 	}
 	renderGroupedFlags(flags, groupMap, itemType) {
@@ -642,9 +644,8 @@ const helpPlugin = ({ command = true, flag = true, showHelpWhenNoCommandSpecifie
 //#endregion
 //#region ../plugin-version/src/index.ts
 const versionPlugin = ({ command = true, flag = true } = {}) => definePlugin({ setup: (cli) => {
-	const formattedVersion = formatVersion(cli._version);
 	if (command) cli.command("version", "Prints current version", {}).on("version", () => {
-		console.log(formattedVersion);
+		console.log(formatVersion(cli._version));
 	});
 	if (flag) cli.globalFlag("version", "Prints current version", {
 		short: "V",
@@ -653,7 +654,7 @@ const versionPlugin = ({ command = true, flag = true } = {}) => definePlugin({ s
 	}).interceptor({
 		enforce: "pre",
 		handler: async (ctx, next) => {
-			if (ctx.flags.version) console.log(formattedVersion);
+			if (ctx.flags.version) console.log(formatVersion(cli._version));
 			else await next();
 		}
 	});
@@ -1485,7 +1486,7 @@ const notFoundPlugin = () => definePlugin({ setup: (cli) => cli.interceptor({
 const strictFlagsPlugin = () => definePlugin({ setup: (cli) => {
 	cli.interceptor(async (ctx, next) => {
 		const keys = Object.keys(ctx.rawParsed.unknown);
-		if (!ctx.resolved || keys.length === 0) await next();
+		if (!ctx.command || keys.length === 0) await next();
 		else throw keys.length > 1 ? /* @__PURE__ */ new Error(`Unexpected flags: ${joinWithAnd(keys)}`) : /* @__PURE__ */ new Error(`Unexpected flag: ${keys[0]}`);
 	});
 } });
@@ -1539,8 +1540,11 @@ function buildTabModel(globalFlags, commands) {
 	registerGlobalFlags(globalFlags, t);
 	for (const cmd of commands.values()) {
 		if (cmd.completions?.show === false) continue;
-		const command = t.command(cmd.name, cmd.description ?? "");
-		registerGlobalFlags(globalFlags, command);
+		let command = t;
+		if (cmd.name !== "") {
+			command = t.command(cmd.name, cmd.description ?? "");
+			registerGlobalFlags(globalFlags, command);
+		}
 		for (const [flagName, def] of Object.entries(cmd.flags ?? {})) {
 			const normalized = (0, src_exports.normalizeFlagValue)(def);
 			const desc = normalized.description ?? "";
@@ -1560,7 +1564,7 @@ const completionsPlugin = () => definePlugin({ setup: (cli) => {
 		} },
 		parameters: [{
 			key: "[shell]",
-			description: "Shell type (zsh, bash, fish, powershell)",
+			description: "Shell type",
 			type: supportedShellEnum
 		}]
 	}).on("completions", async (ctx) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clerc/plugin-completions",
-  "version": "1.0.0-beta.25",
+  "version": "1.0.0-beta.27",
   "author": "Ray <i@mk1.io> (https://github.com/so1ve)",
   "type": "module",
   "description": "Clerc plugin completions",
@@ -27,6 +27,9 @@
   "exports": {
     ".": "./dist/index.js"
   },
+  "bin": {
+    "my-cli": "./src/a.mjs"
+  },
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "dist/index.d.ts",
@@ -48,8 +51,8 @@
     "@bomb.sh/tab": "^0.0.10"
   },
   "devDependencies": {
-    "@clerc/core": "1.0.0-beta.25",
-    "@clerc/utils": "1.0.0-beta.25"
+    "@clerc/core": "1.0.0-beta.27",
+    "@clerc/utils": "1.0.0-beta.27"
   },
   "peerDependencies": {
     "@clerc/core": "*"