Merge pull request #184 from mattallty/fix-command-import

fix(command): Fix command discovery

src/command/import.ts

@@ -1,13 +1,19 @@
+/* eslint-disable @typescript-eslint/ban-ts-ignore */
+/* eslint-disable @typescript-eslint/camelcase */
 /**
  * @packageDocumentation
  * @internal
  */
 import { CommandCreator } from "../types"
 import path from "path"
 
+const requireFunc =
+  // @ts-ignore
+  typeof __webpack_require__ === "function" ? __non_webpack_require__ : require
+
 export async function importCommand(file: string): Promise<CommandCreator> {
-  const { dir, base } = path.parse(file)
-  const filename = path.join(dir, base)
-  const mod = await import(filename)
-  return mod.default
+  const { dir, name } = path.parse(file)
+  const filename = path.join(dir, name)
+  const mod = requireFunc(filename)
+  return mod.default ?? mod
 }

src/command/scan.ts

@@ -20,7 +20,7 @@ export async function scanCommands(
   const data = zipObject(files, imp)
   return map(data, (cmdBuilder, filename) => {
     const { dir, name } = path.parse(filename)
-    const cmd = dir.split("/").concat(name).join(" ")
+    const cmd = dir ? [...dir.split("/"), name].join(" ") : name
     const options = {
       createCommand: createCommand.bind(null, program, cmd),
       program,

src/help/templates/program.ts

@@ -7,7 +7,7 @@ import { getOptionsTable, getCommandsTable } from "../utils"
 
 export const program: Template = async (ctx: TemplateContext) => {
   const { prog, globalOptions, eol, eol3, colorize, tpl } = ctx
-  const commands = prog.getCommands()
+  const commands = await prog.getAllCommands()
   const options = Array.from(globalOptions.keys())
   const help =
     (await prog.getSynopsis()) +

src/index.ts

@@ -65,6 +65,8 @@
  * @module @caporal/core
  */
 import { Program } from "./program"
+export { Command } from "./command"
+export * from "./types"
 
 /**
  * @ignore

src/program/index.ts

@@ -60,6 +60,7 @@ export class Program extends EventEmitter {
   private _progCommand?: Command
   private _bin: string
   private _discoveryPath?: string
+  private _discoveredCommands?: Command[]
 
   /**
    * Number validator. Check that the value looks like a numeric one
@@ -371,7 +372,7 @@ export class Program extends EventEmitter {
    */
   async getAllCommands(): Promise<Command[]> {
     const discoveredCommands = await this.scanCommands()
-    return this.commands.concat(discoveredCommands)
+    return [...this.commands, ...discoveredCommands]
   }
 
   /**
@@ -501,9 +502,11 @@ export class Program extends EventEmitter {
     if (this._discoveryPath === undefined) {
       return []
     }
-    const commands = await scanCommands(this, this._discoveryPath)
-    this.commands.push(...commands)
-    return commands
+    if (this._discoveredCommands) {
+      return this._discoveredCommands
+    }
+    this._discoveredCommands = await scanCommands(this, this._discoveryPath)
+    return this._discoveredCommands
   }
 
   /* istanbul ignore next */