@xmorse/cac 6.0.0 → 6.0.1

package/deno/CAC.ts

@@ -160,27 +160,18 @@ class CAC extends EventEmitter {
     }
     let shouldParse = true;
 
-    // Sort by name length (longest first) so "mcp login" matches before "mcp"
-    const sortedCommands = [...this.commands].sort((a, b) => {
-      const aLength = a.name.split(' ').filter(Boolean).length;
-      const bLength = b.name.split(' ').filter(Boolean).length;
-      return bLength - aLength;
-    });
-
     // Search sub-commands
-    for (const command of sortedCommands) {
+    for (const command of this.commands) {
       const parsed = this.mri(argv.slice(2), command);
-      const result = command.isMatched((parsed.args as string[]));
-      if (result.matched) {
+      const commandName = parsed.args[0];
+      if (command.isMatched(commandName)) {
         shouldParse = false;
-        const matchedCommandName = parsed.args.slice(0, result.consumedArgs).join(' ');
         const parsedInfo = {
           ...parsed,
-          args: parsed.args.slice(result.consumedArgs)
+          args: parsed.args.slice(1)
         };
-        this.setParsedInfo(parsedInfo, command, matchedCommandName);
-        this.emit(`command:${matchedCommandName}`, command);
-        break; // Stop after first match (greedy matching)
+        this.setParsedInfo(parsedInfo, command, commandName);
+        this.emit(`command:${commandName}`, command);
       }
     }
     if (shouldParse) {

package/deno/Command.ts

@@ -1,6 +1,6 @@
 import CAC from "./CAC.ts";
 import Option, { OptionConfig } from "./Option.ts";
-import { removeBrackets, findAllBrackets, findLongest, padRight, CACError } from "./utils.ts";
+import { removeBrackets, findAllBrackets, findLongest, padRight, CACError, wrapText } from "./utils.ts";
 import { platformInfo } from "./deno.ts";
 interface CommandArg {
   required: boolean;
@@ -77,38 +77,13 @@ class Command {
     this.commandAction = callback;
     return this;
   }
-  isMatched(args: string[]): {
-    matched: boolean;
-    consumedArgs: number;
-  } {
-    const nameParts = this.name.split(' ').filter(Boolean);
-    if (nameParts.length === 0) {
-      return {
-        matched: false,
-        consumedArgs: 0
-      };
-    }
-    if (args.length < nameParts.length) {
-      return {
-        matched: false,
-        consumedArgs: 0
-      };
-    }
-    for (let i = 0; i < nameParts.length; i++) {
-      if (nameParts[i] !== args[i]) {
-        if (i === 0 && this.aliasNames.includes(args[i])) {
-          continue;
-        }
-        return {
-          matched: false,
-          consumedArgs: 0
-        };
-      }
-    }
-    return {
-      matched: true,
-      consumedArgs: nameParts.length
-    };
+
+  /**
+   * Check if a command name is matched by this command
+   * @param name Command name
+   */
+  isMatched(name: string) {
+    return this.name === name || this.aliasNames.includes(name);
   }
   get isDefaultCommand() {
     return this.name === '' || this.aliasNames.includes('!');
@@ -144,13 +119,24 @@ class Command {
       title: 'Usage',
       body: `  $ ${name} ${this.usageText || this.rawName}`
     });
+
+    // Show description for specific commands (not global/default)
+    if (!this.isGlobalCommand && !this.isDefaultCommand && this.description) {
+      const terminalWidth = process.stdout?.columns || 80;
+      sections.push({
+        title: 'Description',
+        body: wrapText(this.description, terminalWidth)
+      });
+    }
     const showCommands = (this.isGlobalCommand || this.isDefaultCommand) && commands.length > 0;
     if (showCommands) {
       const longestCommandName = findLongest(commands.map(command => command.rawName));
       sections.push({
         title: 'Commands',
         body: commands.map(command => {
-          return `  ${padRight(command.rawName, longestCommandName.length)}  ${command.description}`;
+          // Only show first line of description in commands listing
+          const firstLine = command.description.split('\n')[0].trim();
+          return `  ${padRight(command.rawName, longestCommandName.length)}  ${firstLine}`;
         }).join('\n')
       });
       sections.push({

package/deno/utils.ts

@@ -126,4 +126,44 @@ export class CACError extends Error {
       this.stack = new Error(message).stack;
     }
   }
-}
+}
+
+/**
+ * Wrap text to fit within a given width, preserving existing line breaks
+ * and special formatting (lists, code blocks, etc.)
+ */
+export const wrapText = (text: string, width = 80, indent = '  '): string => {
+  const lines = text.split('\n');
+  const result: string[] = [];
+  for (const line of lines) {
+    // Preserve empty lines
+    if (line.trim() === '') {
+      result.push('');
+      continue;
+    }
+
+    // Preserve lines that start with special chars (bullets, headers, code, indented)
+    if (/^(\s*[-*>#`]|\s{4,}|#{1,6}\s)/.test(line)) {
+      result.push(indent + line);
+      continue;
+    }
+
+    // Wrap normal paragraphs
+    const words = line.split(' ');
+    let currentLine = indent;
+    for (const word of words) {
+      if (currentLine.length + word.length + 1 > width) {
+        if (currentLine.trim()) {
+          result.push(currentLine);
+        }
+        currentLine = indent + word;
+      } else {
+        currentLine = currentLine === indent ? indent + word : `${currentLine} ${word}`;
+      }
+    }
+    if (currentLine.trim()) {
+      result.push(currentLine);
+    }
+  }
+  return result.join('\n');
+};

package/dist/index.js

@@ -4,6 +4,37 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var events = require('events');
 
+function wrapText(text, width = 80, indent = '  ') {
+  const lines = text.split('\n');
+  const result = [];
+  for (const line of lines) {
+    if (line.trim() === '') {
+      result.push('');
+      continue;
+    }
+    if (/^(\s*[-*>#`]|\s{4,}|#{1,6}\s)/.test(line)) {
+      result.push(indent + line);
+      continue;
+    }
+    const words = line.split(' ');
+    let currentLine = indent;
+    for (const word of words) {
+      if (currentLine.length + word.length + 1 > width) {
+        if (currentLine.trim()) {
+          result.push(currentLine);
+        }
+        currentLine = indent + word;
+      } else {
+        currentLine = currentLine === indent ? indent + word : `${currentLine} ${word}`;
+      }
+    }
+    if (currentLine.trim()) {
+      result.push(currentLine);
+    }
+  }
+  return result.join('\n');
+}
+
 function toArr(any) {
 	return any == null ? [] : Array.isArray(any) ? any : [any];
 }
@@ -352,13 +383,21 @@ class Command {
       title: "Usage",
       body: `  $ ${name} ${this.usageText || this.rawName}`
     });
+    if (!this.isGlobalCommand && !this.isDefaultCommand && this.description) {
+      const terminalWidth = process.stdout?.columns || 80;
+      sections.push({
+        title: "Description",
+        body: wrapText(this.description, terminalWidth)
+      });
+    }
     const showCommands = (this.isGlobalCommand || this.isDefaultCommand) && commands.length > 0;
     if (showCommands) {
       const longestCommandName = findLongest(commands.map((command) => command.rawName));
       sections.push({
         title: "Commands",
         body: commands.map((command) => {
-          return `  ${padRight(command.rawName, longestCommandName.length)}  ${command.description}`;
+          const firstLine = command.description.split('\n')[0].trim();
+          return `  ${padRight(command.rawName, longestCommandName.length)}  ${firstLine}`;
         }).join("\n")
       });
       sections.push({

package/dist/index.mjs

@@ -1,5 +1,36 @@
 import { EventEmitter } from 'events';
 
+function wrapText(text, width = 80, indent = '  ') {
+  const lines = text.split('\n');
+  const result = [];
+  for (const line of lines) {
+    if (line.trim() === '') {
+      result.push('');
+      continue;
+    }
+    if (/^(\s*[-*>#`]|\s{4,}|#{1,6}\s)/.test(line)) {
+      result.push(indent + line);
+      continue;
+    }
+    const words = line.split(' ');
+    let currentLine = indent;
+    for (const word of words) {
+      if (currentLine.length + word.length + 1 > width) {
+        if (currentLine.trim()) {
+          result.push(currentLine);
+        }
+        currentLine = indent + word;
+      } else {
+        currentLine = currentLine === indent ? indent + word : `${currentLine} ${word}`;
+      }
+    }
+    if (currentLine.trim()) {
+      result.push(currentLine);
+    }
+  }
+  return result.join('\n');
+}
+
 function toArr(any) {
 	return any == null ? [] : Array.isArray(any) ? any : [any];
 }
@@ -348,13 +379,21 @@ class Command {
       title: "Usage",
       body: `  $ ${name} ${this.usageText || this.rawName}`
     });
+    if (!this.isGlobalCommand && !this.isDefaultCommand && this.description) {
+      const terminalWidth = process.stdout?.columns || 80;
+      sections.push({
+        title: "Description",
+        body: wrapText(this.description, terminalWidth)
+      });
+    }
     const showCommands = (this.isGlobalCommand || this.isDefaultCommand) && commands.length > 0;
     if (showCommands) {
       const longestCommandName = findLongest(commands.map((command) => command.rawName));
       sections.push({
         title: "Commands",
         body: commands.map((command) => {
-          return `  ${padRight(command.rawName, longestCommandName.length)}  ${command.description}`;
+          const firstLine = command.description.split('\n')[0].trim();
+          return `  ${padRight(command.rawName, longestCommandName.length)}  ${firstLine}`;
         }).join("\n")
       });
       sections.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmorse/cac",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "Simple yet powerful framework for building command-line apps.",
   "repository": {
     "url": "egoist/cac",
@@ -26,6 +26,16 @@
     "/deno",
     "/index-compat.js"
   ],
+  "scripts": {
+    "test": "jest",
+    "test:cov": "jest --coverage",
+    "build:deno": "node -r sucrase/register scripts/build-deno.ts",
+    "build:node": "rollup -c",
+    "build": "yarn build:deno && yarn build:node",
+    "toc": "markdown-toc -i README.md",
+    "prepublishOnly": "npm run build && cp mod.js mod.mjs",
+    "docs:api": "typedoc --out api-doc --readme none --exclude \"**/__test__/**\" --theme minimal"
+  },
   "author": "egoist <0x142857@gmail.com>",
   "license": "MIT",
   "devDependencies": {
@@ -90,14 +100,5 @@
     "hooks": {
       "pre-commit": "npm t && lint-staged"
     }
-  },
-  "scripts": {
-    "test": "jest",
-    "test:cov": "jest --coverage",
-    "build:deno": "node -r sucrase/register scripts/build-deno.ts",
-    "build:node": "rollup -c",
-    "build": "yarn build:deno && yarn build:node",
-    "toc": "markdown-toc -i README.md",
-    "docs:api": "typedoc --out api-doc --readme none --exclude \"**/__test__/**\" --theme minimal"
   }
-}
+}