Speeds up loading commands

.gitignore

@@ -61,6 +61,7 @@ coverage
 docs/site
 # generated commands info
 commands.json
+allCommands.json
 
 # VS env folder
 .vs/

.vscode/launch.json

@@ -27,6 +27,16 @@
       "skipFiles": [
         "<node_internals>/**"
       ]
-    }
+    },
+    {
+      "type": "pwa-node",
+      "request": "launch",
+      "name": "Debug current file",
+      "skipFiles": [
+        "<node_internals>/**"
+      ],
+      "program": "${file}",
+      "args": []
+    },
   ]
 }

package.json

@@ -21,7 +21,7 @@
   },
   "type": "module",
   "scripts": {
-    "build": "tsc -p . && node scripts/copy-files.js",
+    "build": "tsc -p . && node scripts/write-all-commands.js && node scripts/copy-files.js",
     "watch": "tsc -w -p .",
     "clean": "rimraf ./dist",
     "test": "npm run test:version && npm run lint && npm run test:cov",

scripts/write-all-commands.js

@@ -0,0 +1,60 @@
+import fs from 'fs';
+import path from 'path';
+import url, { pathToFileURL } from 'url';
+import Command from '../dist/Command.js';
+import { Cli } from '../dist/cli/Cli.js';
+import { fsUtil } from '../dist/utils/fsUtil.js';
+
+const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
+const commandsFolder = path.join(__dirname, '..', 'dist', 'm365');
+const commandHelpFolder = path.join(commandsFolder, '..', '..', 'docs', 'docs', 'cmd');
+
+async function loadAllCommands() {
+  const files = fsUtil.readdirR(commandsFolder);
+  const cli = Cli.getInstance();
+
+  await Promise.all(files.map(async (filePath) => {
+    const file = pathToFileURL(filePath).toString();
+    if (file.indexOf(`/commands/`) > -1 &&
+      file.indexOf(`/assets/`) < 0 &&
+      file.endsWith('.js') &&
+      !file.endsWith('.spec.js')) {
+
+      const command = await import(file);
+      if (command.default instanceof Command) {
+        const helpFilePath = path.relative(commandHelpFolder, getCommandHelpFilePath(command.default.name));
+        cli.commands.push(Cli.getCommandInfo(command.default, path.relative(commandsFolder, filePath), helpFilePath));
+      }
+    }
+  }));
+
+  cli.commands.forEach(c => {
+    delete c.command;
+    delete c.defaultProperties;
+    delete c.options;
+  });
+
+  fs.writeFileSync('allCommands.json', JSON.stringify(cli.commands));
+}
+
+function getCommandHelpFilePath(commandName) {
+  const commandNameWords = commandName.split(' ');
+  const pathChunks = [];
+
+  if (commandNameWords.length === 1) {
+    pathChunks.push(`${commandNameWords[0]}.mdx`);
+  }
+  else {
+    if (commandNameWords.length === 2) {
+      pathChunks.push(commandNameWords[0], `${commandNameWords.join('-')}.mdx`);
+    }
+    else {
+      pathChunks.push(commandNameWords[0], commandNameWords[1], commandNameWords.slice(1).join('-') + '.mdx');
+    }
+  }
+
+  const helpFilePath = path.join(commandHelpFolder, ...pathChunks);
+  return helpFilePath;
+}
+
+loadAllCommands();

src/api.ts

@@ -1,17 +1,15 @@
 import { Cli, CommandOutput } from "./cli/Cli.js";
-import path from 'path';
 
-export function executeCommand(commandName: string, options: any, listener?: {
+export async function executeCommand(commandName: string, options: any, listener?: {
   stdout: (message: any) => void,
   stderr: (message: any) => void,
 }): Promise<CommandOutput> {
   const cli = Cli.getInstance();
-  cli.commandsFolder = path.join(__dirname, 'm365');
-  cli.commands = [];
-  cli.loadCommandFromArgs(commandName.split(' '));
-  if (cli.commands.length !== 1) {
+  cli.loadAllCommandsInfo();
+  await cli.loadCommandFromArgs(commandName.split(' '));
+  if (!cli.commandToExecute) {
     return Promise.reject(`Command not found: ${commandName}`);
   }
 
-  return Cli.executeCommandWithOutput(cli.commands[0].command, { options: options ?? {} }, listener);
+  return Cli.executeCommandWithOutput(cli.commandToExecute.command, { options: options ?? {} }, listener);
 }

src/autocomplete.spec.ts

@@ -116,7 +116,7 @@ describe('autocomplete', () => {
 
   it('writes sh completion to disk', () => {
     const writeFileSyncStub = sinon.stub(fs, 'writeFileSync').callsFake(() => { });
-    (cli as any).loadCommand(new SimpleCommand());
+    cli.commands.push(Cli.getCommandInfo(new SimpleCommand(), 'command.js', 'command.mdx'));
     autocomplete.generateShCompletion();
     assert(writeFileSyncStub.calledWith(path.join(__dirname, `..${path.sep}commands.json`), JSON.stringify({
       cli: {
@@ -154,7 +154,7 @@ describe('autocomplete', () => {
   });
 
   it('builds clink completion', () => {
-    (cli as any).loadCommand(new SimpleCommand());
+    cli.commands.push(Cli.getCommandInfo(new SimpleCommand(), 'command.js', 'command.mdx'));
     const clink: string = autocomplete.getClinkCompletion();
 
     assert.strictEqual(clink, [
@@ -167,7 +167,7 @@ describe('autocomplete', () => {
   });
 
   it('includes long options in clink completion', () => {
-    (cli as any).loadCommand(new CommandWithOptions());
+    cli.commands.push(Cli.getCommandInfo(new CommandWithOptions(), 'command.js', 'command.mdx'));
     const clink: string = autocomplete.getClinkCompletion();
 
     assert.strictEqual(clink, [
@@ -180,7 +180,7 @@ describe('autocomplete', () => {
   });
 
   it('includes short options in clink completion', () => {
-    (cli as any).loadCommand(new CommandWithOptions());
+    cli.commands.push(Cli.getCommandInfo(new CommandWithOptions(), 'command.js', 'command.mdx'));
     const clink: string = autocomplete.getClinkCompletion();
 
     assert.strictEqual(clink, [
@@ -193,7 +193,7 @@ describe('autocomplete', () => {
   });
 
   it('includes autocomplete for options in clink completion', () => {
-    (cli as any).loadCommand(new CommandWithOptions());
+    cli.commands.push(Cli.getCommandInfo(new CommandWithOptions(), 'command.js', 'command.mdx'));
     const clink: string = autocomplete.getClinkCompletion();
 
     assert.strictEqual(clink, [
@@ -206,7 +206,7 @@ describe('autocomplete', () => {
   });
 
   it('includes command alias in clink completion', () => {
-    (cli as any).loadCommand(new CommandWithAlias());
+    cli.commands.push(Cli.getCommandInfo(new CommandWithAlias(), 'command.js', 'command.mdx'));
     const clink: string = autocomplete.getClinkCompletion();
 
     assert.strictEqual(clink, [