usage text fixes

Author: chenasraf

.vscode/launch.json

@@ -0,0 +1,23 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "pwa-node",
+      "request": "launch",
+      "name": "Launch Program",
+      "skipFiles": [
+        "<node_internals>/**"
+      ],
+      "program": "${workspaceFolder}/build/index.js",
+      "outFiles": [
+        "${workspaceFolder}/**/*.js"
+      ],
+      "args": [
+        "--help"
+      ]
+    }
+  ]
+}

src/index.ts

@@ -112,10 +112,13 @@ export class Massarg<Options extends OptionsBase = OptionsBase> {
       console.log(color(titleColor, this._help.header))
     }
 
-    console.log()
+    if (this._commands.length) {
+      console.log("")
+      console.log(color(titleColor, chalk.bold`Commands:`))
+      this._printCommands()
+    }
 
-    console.log(color(titleColor, chalk.bold`Commands:`))
-    this._printCommands()
+    console.log()
 
     console.log(color(titleColor, chalk.bold`Options:`))
     this._printOptions()
@@ -225,6 +228,7 @@ export class Massarg<Options extends OptionsBase = OptionsBase> {
         indent: nameFullSize + INDENT_LEN,
         colorCount: COLOR_COUNT,
         firstLineIndent: INDENT_LEN,
+        printWidth: this._help.printWidth,
       })) {
         lines.push(line)
       }
@@ -237,15 +241,19 @@ export class Massarg<Options extends OptionsBase = OptionsBase> {
     for (const line of this._getWrappedLines(
       this._commands.map((c) => ({ name: this._fullCmdName(c), description: c.description }))
     )) {
-      console.log(line)
+      if (line.trim().length) {
+        console.log(line)
+      }
     }
   }
 
   private _printOptions() {
     for (const line of this._getWrappedLines(
       this._options.map((c) => ({ name: this._fullOptName(c), description: c.description }))
     )) {
-      console.log(line)
+      if (line.trim().length) {
+        console.log(line)
+      }
     }
   }
 
@@ -259,6 +267,7 @@ export class Massarg<Options extends OptionsBase = OptionsBase> {
 
 massarg()
   .help({
+    // printWidth: 0,
     binName: "my-cmd",
     useGlobalColumns: true,
     header: "This is the app description",
@@ -287,7 +296,8 @@ massarg()
   .command({
     name: "my-custom-command",
     description:
-      "This is another command that does something. It's a different one just to see more available. This description is just to fill the blanks. Don't kill the messenger.",
+      "This is another command that does something. It's a different one just to see more available. This " +
+      "description is just to fill the blanks. Don't kill the messenger.",
     aliases: ["cc", "c"],
     run: console.log.bind(undefined, "do"),
   })

src/utils.ts

@@ -1,10 +1,10 @@
 import chalk from "chalk"
-import chunk from "lodash/chunk"
+// import chunk from "lodash/chunk"
 import repeat from "lodash/repeat"
 import merge from "lodash/merge"
 
 export function color(color: keyof typeof chalk, ...text: any[]): string {
-  return (chalk[color] as typeof chalk.dim)(...text)
+  return chalk.reset((chalk[color] as typeof chalk.dim)(...text))
 }
 
 export interface WrapOptions {
@@ -30,29 +30,47 @@ export function wrap(text: string, options?: WrapOptions): string[] {
 
   function indent(i: number, l: string): string {
     const INDENT_FIX = -2
-    return repeat(" ", INDENT_FIX + (i === 0 ? firstIndentSize : indentSize)) + l
+    return repeat(" ", i === 0 ? firstIndentSize : indentSize) + l
   }
 
-  if (maxLineLength <= 0) {
-    console.debug("Returning early")
-    return text.split("\n")
+  if (!_opts.printWidth || maxLineLength <= 0) {
+    return text.split("\n").map((l, i) => indent(i, l))
   }
 
-  let lines = chunk(text, maxLineLength).map((l, i) => indent(i, l.join("")))
+  let lines = chunk(text, maxLineLength).map((l, i) => indent(i, l))
 
   lines = [
     lines[0],
     ...chunk(
       lines
         .slice(1)
         .map((l) => l.trim())
-        .join("")
+        .join(" ")
         .trim(),
       maxLineLength - indentSize - COLOR_CODE_LEN
-    ).map((l, i) => indent(i + 1, l.join(""))),
-  ]
+    ).map((l, i) => indent(i + 1, l)),
+  ].filter((l) => l.trim().length)
 
   return lines
 }
 
 export const COLOR_CODE_LEN = chalk.yellow` `.length - 1
+
+function chunk(text: string, len: number): string[] {
+  const arr = text.split(" ")
+  const result = []
+  let subStr = arr[0]
+  for (let i = 1; i < arr.length; i++) {
+    let word = arr[i]
+    if (subStr.length + word.length + 1 <= len) {
+      subStr = subStr + " " + word
+    } else {
+      result.push(subStr)
+      subStr = word
+    }
+  }
+  if (subStr.length) {
+    result.push(subStr)
+  }
+  return result
+}