unicommand 0.0.1 → 0.0.3

package/dist/index.js

@@ -346,15 +346,23 @@ var quoteFish = (value) => {
 };
 
 // src/cli/help.ts
-var programExamples = /* @__PURE__ */ new WeakMap();
-var setProgramExamples = (program, examples) => {
-  programExamples.set(program, examples);
+var COMMAND_COLUMN_WIDTH = 36;
+var ANSI_CYAN = "\x1B[36m";
+var ANSI_GRAY = "\x1B[90m";
+var ANSI_RESET = "\x1B[0m";
+var programHelpData = /* @__PURE__ */ new WeakMap();
+var setProgramHelpData = (program, data) => {
+  programHelpData.set(program, data);
 };
 var isGlobalHelpRequest = (args) => args.length === 0 || args.length === 1 && ["--help", "-h"].includes(args[0] ?? "");
 var printProgramHelp = async (program) => {
-  const help = cleanHelp(await captureHelp(() => program.run(["--help"])));
-  const examples = programExamples.get(program) ?? [];
-  console.log([help.trimEnd(), formatExamples(examples)].filter(Boolean).join("\n\n"));
+  const data = programHelpData.get(program);
+  if (!data) throw new Error("Program help data was not registered");
+  const capturedHelp = cleanHelp(await captureHelp(() => program.run(["--help"])));
+  const capturedRows = parseCapturedCommandRows(capturedHelp);
+  const output = [formatHelp(data, capturedRows), formatExamples(data.examples)].filter(Boolean).join("\n");
+  console.log(`${output}
+`);
 };
 async function captureHelp(callback) {
   const originalLog = console.log;
@@ -369,15 +377,130 @@ async function captureHelp(callback) {
   }
   return lines.join("\n");
 }
+function formatHelp(data, capturedRows) {
+  return [
+    "",
+    `  ${data.binName} ${data.version} \u2014 ${data.description}`,
+    "",
+    heading("USAGE"),
+    "  ",
+    `    \u25B8 ${data.binName} <command> [ARGUMENTS...] [OPTIONS...]`,
+    "",
+    heading("COMMANDS"),
+    "",
+    ...formatCommandRows(
+      mergeCommandRows(data.commands.filter(isVisibleCommand).map(commandHelpRow), capturedRows)
+    ),
+    "",
+    heading("GLOBAL OPTIONS"),
+    "",
+    "    -h, --help                           Display global help or command-related help.           ",
+    "    -v, --version                        Show version"
+  ].join("\n");
+}
+function mergeCommandRows(primaryRows, fallbackRows) {
+  const primaryNames = new Set(primaryRows.map((row) => row.name));
+  return [...primaryRows, ...fallbackRows.filter((row) => !primaryNames.has(row.name))];
+}
+function parseCapturedCommandRows(help) {
+  const lines = help.split("\n");
+  const commandsIndex = lines.findIndex((line) => line.trim() === "COMMANDS");
+  const globalOptionsIndex = lines.findIndex((line) => line.trim() === "GLOBAL OPTIONS");
+  const hasCommandSection = commandsIndex >= 0 && globalOptionsIndex > commandsIndex;
+  if (!hasCommandSection) return [];
+  return parseCommandRows(lines.slice(commandsIndex + 1, globalOptionsIndex));
+}
+function parseCommandRows(lines) {
+  return lines.reduce((rows, line) => {
+    const row = parseCommandRow(line);
+    if (row) {
+      rows.push(row);
+      return rows;
+    }
+    const previous = rows.at(-1);
+    const continuation = line.trim();
+    if (!previous || !continuation) return rows;
+    previous.description = `${previous.description} ${continuation}`;
+    return rows;
+  }, []);
+}
+function parseCommandRow(line) {
+  const match = line.match(/^ {4}(.+?) {2,}(.+?)\s*$/);
+  if (!match?.[1] || !match[2]) return void 0;
+  return { name: match[1].trim(), description: match[2].trim() };
+}
 function cleanHelp(help) {
   return help.replace(
     /COMMANDS\s+—\s+Type '[^']+ help <command>' to get some help about a command/g,
     "COMMANDS"
   );
 }
+function commandHelpRow(command) {
+  return { name: command.name, description: command.description };
+}
+function isVisibleCommand(command) {
+  return command.config?.visible !== false;
+}
+function formatCommandRows(rows) {
+  const groups = commandGroups(rows);
+  return groups.flatMap((group) => formatCommandGroup(group));
+}
+function commandGroups(rows) {
+  const visibleRows = rows.filter((row) => !isHiddenCommand(row));
+  const parentRows = new Map(
+    visibleRows.filter((row) => !row.name.includes(" ")).map((row) => [row.name, row])
+  );
+  const childRows = visibleRows.filter((row) => row.name.includes(" "));
+  const childParents = new Set(childRows.map((row) => row.name.split(" ")[0]).filter(Boolean));
+  const groupedParents = [...childParents].map((parent) => ({
+    children: childRows.filter((row) => row.name.startsWith(`${parent} `)),
+    parent: parentRows.get(parent) ?? { name: parent, description: `${parent} commands` }
+  }));
+  const standaloneRows = visibleRows.filter(
+    (row) => !childParents.has(row.name.split(" ")[0] ?? row.name)
+  );
+  return [...groupedParents, ...standaloneRows.map((parent) => ({ children: [], parent }))];
+}
+function isHiddenCommand(row) {
+  return row.name === "on-checkout" || row.name === "on-commit";
+}
+function formatCommandGroup({
+  children,
+  parent
+}) {
+  if (children.length === 0) return [formatCommandLine(parent.name, parent.description)];
+  return [
+    formatCommandLine(parent.name, parentDescription(parent), 4, isSyntheticParent(parent)),
+    ...children.map(
+      (child) => formatCommandLine(child.name.split(" ").slice(1).join(" "), child.description, 6)
+    )
+  ];
+}
+function parentDescription(parent) {
+  return isSyntheticParent(parent) ? "" : parent.description;
+}
+function isSyntheticParent(parent) {
+  return parent.description === `${parent.name} commands`;
+}
+function formatCommandLine(name, description, indent = 4, muted = false) {
+  const paddedName = name.padEnd(COMMAND_COLUMN_WIDTH - indent);
+  const displayName = muted ? gray(paddedName) : paddedName;
+  return `${" ".repeat(indent)}${displayName}${description}`.trimEnd();
+}
+function heading(text) {
+  return `  ${color(text)}`;
+}
+function color(text) {
+  if (!process.stdout.isTTY || process.env.NO_COLOR) return text;
+  return `${ANSI_CYAN}${text}${ANSI_RESET}`;
+}
+function gray(text) {
+  if (!process.stdout.isTTY || process.env.NO_COLOR) return text;
+  return `${ANSI_GRAY}${text}${ANSI_RESET}`;
+}
 function formatExamples(examples) {
   if (examples.length === 0) return "";
-  return ["  EXAMPLES", "", ...examples.map((example) => `    ${example}`)].join("\n");
+  return [heading("EXAMPLES"), "", ...examples.map((example) => `    ${example}`), ""].join("\n");
 }
 
 // src/cli/program.ts
@@ -387,10 +510,10 @@ import { fileURLToPath } from "url";
 
 // src/command/loader.ts
 import { readdir } from "fs/promises";
-import { basename, join } from "path";
+import { basename, extname, join } from "path";
 import { pathToFileURL } from "url";
-var COMMAND_FILE_EXTENSION = ".ts";
-var IGNORED_COMMAND_FILES = /* @__PURE__ */ new Set(["index.ts", "options.ts"]);
+var COMMAND_FILE_EXTENSIONS = /* @__PURE__ */ new Set([".js", ".mjs", ".ts"]);
+var IGNORED_COMMAND_FILE_NAMES = /* @__PURE__ */ new Set(["index", "options"]);
 var loadCommandModules = async (commandsDir) => {
   return loadCommandModulesFromFiles(await commandFiles(commandsDir));
 };
@@ -424,8 +547,12 @@ var commandFiles = async (dir) => {
   return nestedFiles.flat().sort();
 };
 var isCommandFile = (path) => {
-  const fileName = basename(path);
-  return path.endsWith(COMMAND_FILE_EXTENSION) && !IGNORED_COMMAND_FILES.has(fileName);
+  const extension = extname(path);
+  const fileName = basename(path, extension);
+  const isDeclarationFile = path.endsWith(".d.ts");
+  const isSupportedCommandFile = COMMAND_FILE_EXTENSIONS.has(extension);
+  const isIgnoredCommandFile = IGNORED_COMMAND_FILE_NAMES.has(fileName);
+  return !isDeclarationFile && isSupportedCommandFile && !isIgnoredCommandFile;
 };
 var isCommandAdapterExport = (value) => {
   if (!value || typeof value !== "object") return false;
@@ -433,6 +560,134 @@ var isCommandAdapterExport = (value) => {
   return typeof command.cli === "function";
 };
 
+// src/command/metadata.ts
+import { z } from "zod";
+var isCommandMcpToolMetadata = (metadata) => metadata !== void 0 && metadata !== false && metadata.kind === "tool";
+var isCommandMcpResourceMetadata = (metadata) => metadata !== void 0 && metadata !== false && metadata.kind === "resource";
+var defineCommand = (definition) => {
+  const command = {
+    outputSchema: z.unknown(),
+    ...definition
+  };
+  return {
+    ...command,
+    inputSchema: definition.inputSchema ?? commandDefinitionToZodInputSchema(command)
+  };
+};
+var registerCommand = (program, definition) => {
+  const command = definition.arguments?.reduce(
+    (currentCommand, argument) => currentCommand.argument(argument.synopsis, argument.description),
+    program.command(definition.name, definition.description, definition.config)
+  ) ?? program.command(definition.name, definition.description, definition.config);
+  const commandWithOptions = definition.options?.reduce(
+    (currentCommand, option) => currentCommand.option(commandOptionSynopsis(option), option.description, option.config),
+    command
+  ) ?? command;
+  const registeredCommand = definition.aliases?.reduce(
+    (currentCommand, alias) => currentCommand.alias(alias),
+    commandWithOptions
+  ) ?? commandWithOptions;
+  setCommandMetadata(registeredCommand, definition);
+  return registeredCommand;
+};
+var commandInputValue = (args, name) => args[name];
+var commandInputString = (args, name) => {
+  const value = commandInputValue(args, name);
+  return value === void 0 ? "" : String(value);
+};
+var commandActionInput = (definition, args, options) => normalizeCommandInputAliases(definition, {
+  ...normalizeArgumentInput(definition, args),
+  ...options
+});
+var normalizeCommandInputAliases = (definition, input) => ({
+  ...input,
+  ...Object.fromEntries(
+    (definition.options ?? []).flatMap((option) => {
+      const name = optionInputName(option);
+      if (input[name] !== void 0) return [];
+      const alias = optionAliasInputNames(option).find(
+        (candidate) => input[candidate] !== void 0
+      );
+      return alias ? [[name, input[alias]]] : [];
+    })
+  )
+});
+var normalizeArgumentInput = (definition, args) => ({
+  ...args,
+  ...Object.fromEntries(
+    (definition.arguments ?? []).map((argument) => {
+      const name = argumentName(argument.synopsis);
+      const value = commandInputValue(args, name);
+      return value === void 0 ? void 0 : [name, value];
+    }).filter((entry) => entry !== void 0)
+  )
+});
+var commandDefinitionToZodInputSchema = (definition) => {
+  const jsonSchema = commandDefinitionToInputSchema(definition);
+  const shape = Object.fromEntries(
+    Object.entries(jsonSchema.properties).map(([name, property]) => [
+      name,
+      zodInputProperty(property, jsonSchema.required.includes(name))
+    ])
+  );
+  return z.object(shape);
+};
+var commandDefinitionToInputSchema = (definition) => ({
+  type: "object",
+  properties: Object.fromEntries([
+    ...(definition.arguments ?? []).map((argument) => [
+      argumentName(argument.synopsis),
+      argumentSchema(argument)
+    ]),
+    ...(definition.options ?? []).map((option) => [
+      optionInputName(option),
+      option.schema ?? optionSchema(option)
+    ])
+  ]),
+  required: [
+    ...(definition.arguments ?? []).filter((argument) => isRequiredSynopsis(argument.synopsis)).map((argument) => argumentName(argument.synopsis)),
+    ...(definition.options ?? []).filter((option) => option.config?.required).map(optionInputName)
+  ],
+  additionalProperties: false
+});
+var zodInputProperty = (property, required) => {
+  const schema = zodProperty(property);
+  const describedSchema = property.description ? schema.describe(property.description) : schema;
+  return required ? describedSchema : describedSchema.optional();
+};
+var zodProperty = (property) => {
+  if (property.type === "array") return z.array(z.string());
+  if (property.type === "boolean") return z.boolean();
+  if (property.type === "number") return z.number();
+  return z.string();
+};
+var argumentSchema = (argument) => ({
+  type: isVariadicSynopsis(argument.synopsis) ? "array" : "string",
+  description: argument.description,
+  ...isVariadicSynopsis(argument.synopsis) ? { items: { type: "string" } } : {}
+});
+var optionSchema = (option) => ({
+  type: option.value ? "string" : "boolean",
+  description: option.description
+});
+var argumentName = (synopsis) => {
+  return kebabToCamel(
+    synopsis.replace(/[<>[\].]/g, "").replace(/_([a-z])/g, (_match, letter) => letter.toUpperCase())
+  );
+};
+var commandOptionSynopsis = (option) => {
+  const longName = `${option.negated ? "--no-" : "--"}${option.name}`;
+  const aliases = (option.aliases ?? []).map(
+    (alias) => alias.length === 1 ? `-${alias}` : `--${alias}`
+  );
+  return [...aliases, `${longName}${option.value ? ` ${option.value}` : ""}`].join(", ");
+};
+var optionInputName = (option) => kebabToCamel(option.name);
+var optionAliasInputNames = (option) => (option.aliases ?? []).map(kebabToCamel);
+var kebabToCamel = (value) => value.replace(/-([a-z])/g, (_match, letter) => letter.toUpperCase());
+var isRequiredSynopsis = (synopsis) => synopsis.trim().startsWith("<");
+var isVariadicSynopsis = (synopsis) => synopsis.includes("...");
+
 // src/constants.ts
 var DEFAULT_COMMANDS_DIR = "commands";
 var PROGRAM_NAME_ENV_SUFFIX = "_PROG_NAME";
@@ -574,10 +829,23 @@ var createCommandProgram = async ({
   });
   registerUpdateCommand(program, { isDevRun, packageName: packageName ?? binName, version });
   registerCompletionCommand(program, { binNames });
-  setProgramExamples(
-    program,
-    commandDefinitions.flatMap((command) => command.examples?.(binName) ?? [])
-  );
+  setProgramHelpData(program, {
+    binName,
+    commands: [
+      ...commandDefinitions,
+      defineCommand({
+        name: "update",
+        description: `Update ${packageName ?? binName} to latest version`
+      }),
+      defineCommand({
+        name: "completion",
+        description: "Generate shell completion scripts"
+      })
+    ],
+    description,
+    examples: commandDefinitions.flatMap((command) => command.examples?.(binName) ?? []),
+    version
+  });
   return program;
 };
 var registerParentCommandsFromDefinitions = (program, definitions, options = {}) => {
@@ -817,134 +1085,6 @@ var createCommandCliRunner = ({
 // src/mcp/router.ts
 import { z as z3 } from "zod";
 
-// src/command/metadata.ts
-import { z } from "zod";
-var isCommandMcpToolMetadata = (metadata) => metadata !== void 0 && metadata !== false && metadata.kind === "tool";
-var isCommandMcpResourceMetadata = (metadata) => metadata !== void 0 && metadata !== false && metadata.kind === "resource";
-var defineCommand = (definition) => {
-  const command = {
-    outputSchema: z.unknown(),
-    ...definition
-  };
-  return {
-    ...command,
-    inputSchema: definition.inputSchema ?? commandDefinitionToZodInputSchema(command)
-  };
-};
-var registerCommand = (program, definition) => {
-  const command = definition.arguments?.reduce(
-    (currentCommand, argument) => currentCommand.argument(argument.synopsis, argument.description),
-    program.command(definition.name, definition.description, definition.config)
-  ) ?? program.command(definition.name, definition.description, definition.config);
-  const commandWithOptions = definition.options?.reduce(
-    (currentCommand, option) => currentCommand.option(commandOptionSynopsis(option), option.description, option.config),
-    command
-  ) ?? command;
-  const registeredCommand = definition.aliases?.reduce(
-    (currentCommand, alias) => currentCommand.alias(alias),
-    commandWithOptions
-  ) ?? commandWithOptions;
-  setCommandMetadata(registeredCommand, definition);
-  return registeredCommand;
-};
-var commandInputValue = (args, name) => args[name];
-var commandInputString = (args, name) => {
-  const value = commandInputValue(args, name);
-  return value === void 0 ? "" : String(value);
-};
-var commandActionInput = (definition, args, options) => normalizeCommandInputAliases(definition, {
-  ...normalizeArgumentInput(definition, args),
-  ...options
-});
-var normalizeCommandInputAliases = (definition, input) => ({
-  ...input,
-  ...Object.fromEntries(
-    (definition.options ?? []).flatMap((option) => {
-      const name = optionInputName(option);
-      if (input[name] !== void 0) return [];
-      const alias = optionAliasInputNames(option).find(
-        (candidate) => input[candidate] !== void 0
-      );
-      return alias ? [[name, input[alias]]] : [];
-    })
-  )
-});
-var normalizeArgumentInput = (definition, args) => ({
-  ...args,
-  ...Object.fromEntries(
-    (definition.arguments ?? []).map((argument) => {
-      const name = argumentName(argument.synopsis);
-      const value = commandInputValue(args, name);
-      return value === void 0 ? void 0 : [name, value];
-    }).filter((entry) => entry !== void 0)
-  )
-});
-var commandDefinitionToZodInputSchema = (definition) => {
-  const jsonSchema = commandDefinitionToInputSchema(definition);
-  const shape = Object.fromEntries(
-    Object.entries(jsonSchema.properties).map(([name, property]) => [
-      name,
-      zodInputProperty(property, jsonSchema.required.includes(name))
-    ])
-  );
-  return z.object(shape);
-};
-var commandDefinitionToInputSchema = (definition) => ({
-  type: "object",
-  properties: Object.fromEntries([
-    ...(definition.arguments ?? []).map((argument) => [
-      argumentName(argument.synopsis),
-      argumentSchema(argument)
-    ]),
-    ...(definition.options ?? []).map((option) => [
-      optionInputName(option),
-      option.schema ?? optionSchema(option)
-    ])
-  ]),
-  required: [
-    ...(definition.arguments ?? []).filter((argument) => isRequiredSynopsis(argument.synopsis)).map((argument) => argumentName(argument.synopsis)),
-    ...(definition.options ?? []).filter((option) => option.config?.required).map(optionInputName)
-  ],
-  additionalProperties: false
-});
-var zodInputProperty = (property, required) => {
-  const schema = zodProperty(property);
-  const describedSchema = property.description ? schema.describe(property.description) : schema;
-  return required ? describedSchema : describedSchema.optional();
-};
-var zodProperty = (property) => {
-  if (property.type === "array") return z.array(z.string());
-  if (property.type === "boolean") return z.boolean();
-  if (property.type === "number") return z.number();
-  return z.string();
-};
-var argumentSchema = (argument) => ({
-  type: isVariadicSynopsis(argument.synopsis) ? "array" : "string",
-  description: argument.description,
-  ...isVariadicSynopsis(argument.synopsis) ? { items: { type: "string" } } : {}
-});
-var optionSchema = (option) => ({
-  type: option.value ? "string" : "boolean",
-  description: option.description
-});
-var argumentName = (synopsis) => {
-  return kebabToCamel(
-    synopsis.replace(/[<>[\].]/g, "").replace(/_([a-z])/g, (_match, letter) => letter.toUpperCase())
-  );
-};
-var commandOptionSynopsis = (option) => {
-  const longName = `${option.negated ? "--no-" : "--"}${option.name}`;
-  const aliases = (option.aliases ?? []).map(
-    (alias) => alias.length === 1 ? `-${alias}` : `--${alias}`
-  );
-  return [...aliases, `${longName}${option.value ? ` ${option.value}` : ""}`].join(", ");
-};
-var optionInputName = (option) => kebabToCamel(option.name);
-var optionAliasInputNames = (option) => (option.aliases ?? []).map(kebabToCamel);
-var kebabToCamel = (value) => value.replace(/-([a-z])/g, (_match, letter) => letter.toUpperCase());
-var isRequiredSynopsis = (synopsis) => synopsis.trim().startsWith("<");
-var isVariadicSynopsis = (synopsis) => synopsis.includes("...");
-
 // src/mcp/constants.ts
 var DEFAULT_MCP_SERVER_VERSION = "0.0.0";
 var DEFAULT_RESOURCE_MIME_TYPE = "application/json";
@@ -1265,7 +1405,7 @@ var generateReadmeCommandDocs = async ({
   writeFileSync(readmePath, replaceMarker(readme, markerName, generated), "utf8");
 };
 var formatCommandDocs = (commands, binName) => {
-  const visibleCommands = commands.filter(isVisibleCommand).sort(commandSort);
+  const visibleCommands = commands.filter(isVisibleCommand2).sort(commandSort);
   const groups = [...parentCommands2(visibleCommands)].map(
     ([parent, subcommands]) => parentCommandDocs(parent, subcommands, binName)
   );
@@ -1276,7 +1416,7 @@ var formatCommandDocs = (commands, binName) => {
   );
   return ["```sh", ...lines, "```"].join("\n");
 };
-var isVisibleCommand = (command) => command.config?.visible !== false;
+var isVisibleCommand2 = (command) => command.config?.visible !== false;
 var commandSort = (left, right) => (left.order ?? 0) - (right.order ?? 0) || left.name.localeCompare(right.name);
 var parentCommands2 = (commands) => {
   const groups = /* @__PURE__ */ new Map();
@@ -1658,7 +1798,7 @@ export {
   registerParentCommandsFromDefinitions,
   registerUpdateCommand,
   resourceResult,
-  setProgramExamples,
+  setProgramHelpData,
   shortPackageName,
   startCommandMcpServer,
   startPackageCommandMcpServer,