refactor: replace command inputs and options by a dictionary-like high-level data abstraction

actions/abstract.action.ts

@@ -1,9 +1,9 @@
-import { Input } from '../commands';
+import { CommandStorage } from '../commands';
 
 export abstract class AbstractAction {
   public abstract handle(
-    inputs?: Input[],
-    options?: Input[],
+    inputs?: CommandStorage,
+    options?: CommandStorage,
     extraFlags?: string[],
   ): Promise<void>;
 }

actions/add.action.ts

@@ -1,5 +1,5 @@
 import * as chalk from 'chalk';
-import { Input } from '../commands';
+import { CommandStorage, CommandStorageEntry } from '../commands';
 import { getValueOrDefault } from '../lib/compiler/helpers/get-value-or-default';
 import {
   AbstractPackageManager,
@@ -23,7 +23,11 @@ import { AbstractAction } from './abstract.action';
 const schematicName = 'nest-add';
 
 export class AddAction extends AbstractAction {
-  public async handle(inputs: Input[], options: Input[], extraFlags: string[]) {
+  public async handle(
+    inputs: CommandStorage,
+    options: CommandStorage,
+    extraFlags: string[],
+  ) {
     const libraryName = this.getLibraryName(inputs);
     const packageName = this.getPackageName(libraryName);
     const collectionName = this.getCollectionName(libraryName, packageName);
@@ -32,10 +36,13 @@ export class AddAction extends AbstractAction {
     const packageInstallSuccess =
       skipInstall || (await this.installPackage(collectionName, tagName));
     if (packageInstallSuccess) {
-      const sourceRootOption: Input = await this.getSourceRoot(
-        inputs.concat(options),
-      );
-      options.push(sourceRootOption);
+      const sourceRootOption: CommandStorageEntry = await this.getSourceRoot([
+        inputs,
+        options,
+      ]);
+      if (sourceRootOption) {
+        options.add(sourceRootOption);
+      }
 
       await this.addLibrary(collectionName, options, extraFlags);
     } else {
@@ -50,12 +57,20 @@ export class AddAction extends AbstractAction {
     }
   }
 
-  private async getSourceRoot(inputs: Input[]): Promise<Input> {
+  private async getSourceRoot(
+    storages: CommandStorage[],
+  ): Promise<CommandStorageEntry> {
     const configuration = await loadConfiguration();
     const configurationProjects = configuration.projects;
 
-    const appName = inputs.find((option) => option.name === 'project')!
-      .value as string;
+    let appName: string | undefined;
+    for (const storage of storages) {
+      const maybeProject = storage.get<string>('project');
+      if (maybeProject) {
+        appName = maybeProject.value;
+        break;
+      }
+    }
 
     let sourceRoot = appName
       ? getValueOrDefault(configuration, 'sourceRoot', appName)
@@ -117,15 +132,15 @@ export class AddAction extends AbstractAction {
 
   private async addLibrary(
     collectionName: string,
-    options: Input[],
+    options: CommandStorage,
     extraFlags: string[],
   ) {
     console.info(MESSAGES.LIBRARY_INSTALLATION_STARTS);
     const schematicOptions: SchematicOption[] = [];
     schematicOptions.push(
       new SchematicOption(
         'sourceRoot',
-        options.find((option) => option.name === 'sourceRoot')!.value as string,
+        options.get<string>('sourceRoot', true).value,
       ),
     );
     const extraFlagsString = extraFlags ? extraFlags.join(' ') : undefined;
@@ -146,15 +161,13 @@ export class AddAction extends AbstractAction {
     }
   }
 
-  private getLibraryName(inputs: Input[]): string {
-    const libraryInput: Input = inputs.find(
-      (input) => input.name === 'library',
-    ) as Input;
+  private getLibraryName(inputs: CommandStorage): string {
+    const libraryInput = inputs.get<string>('library');
 
     if (!libraryInput) {
       throw new Error('No library found in command input');
     }
-    return libraryInput.value as string;
+    return libraryInput.value;
   }
 
   private getPackageName(library: string): string {

actions/build.action.ts

@@ -1,7 +1,7 @@
 import * as chalk from 'chalk';
 import { join } from 'path';
 import * as ts from 'typescript';
-import { Input } from '../commands';
+import { CommandStorage } from '../commands';
 import { AssetsManager } from '../lib/compiler/assets-manager';
 import { getBuilder } from '../lib/compiler/helpers/get-builder';
 import { getTscConfigPath } from '../lib/compiler/helpers/get-tsc-config.path';
@@ -36,19 +36,14 @@ export class BuildAction extends AbstractAction {
   protected readonly assetsManager = new AssetsManager();
   protected readonly workspaceUtils = new WorkspaceUtils();
 
-  public async handle(commandInputs: Input[], commandOptions: Input[]) {
+  public async handle(
+    commandInputs: CommandStorage,
+    commandOptions: CommandStorage,
+  ) {
     try {
-      const watchModeOption = commandOptions.find(
-        (option) => option.name === 'watch',
-      );
-      const watchMode = !!(watchModeOption && watchModeOption.value);
-
-      const watchAssetsModeOption = commandOptions.find(
-        (option) => option.name === 'watchAssets',
-      );
-      const watchAssetsMode = !!(
-        watchAssetsModeOption && watchAssetsModeOption.value
-      );
+      const watchMode = commandOptions.get<boolean>('watch')?.value ?? false;
+      const watchAssetsMode =
+        commandOptions.get<boolean>('watchAssets')?.value ?? false;
 
       await this.runBuild(
         commandInputs,
@@ -67,19 +62,16 @@ export class BuildAction extends AbstractAction {
   }
 
   public async runBuild(
-    commandInputs: Input[],
-    commandOptions: Input[],
+    commandInputs: CommandStorage,
+    commandOptions: CommandStorage,
     watchMode: boolean,
     watchAssetsMode: boolean,
     isDebugEnabled = false,
     onSuccess?: () => void,
   ) {
-    const configFileName = commandOptions.find(
-      (option) => option.name === 'config',
-    )!.value as string;
+    const configFileName = commandOptions.get<string>('config')?.value;
     const configuration = await this.loader.load(configFileName);
-    const appName = commandInputs.find((input) => input.name === 'app')!
-      .value as string;
+    const appName = commandInputs.get<string>('app', true).value;
 
     const pathToTsconfig = getTscConfigPath(
       configuration,
@@ -151,7 +143,7 @@ export class BuildAction extends AbstractAction {
     appName: string,
     pathToTsconfig: string,
     watchMode: boolean,
-    options: Input[],
+    options: CommandStorage,
     tsOptions: ts.CompilerOptions,
     onSuccess: (() => void) | undefined,
   ) {
@@ -180,7 +172,7 @@ export class BuildAction extends AbstractAction {
   private async runWebpack(
     configuration: Required<Configuration>,
     appName: string,
-    commandOptions: Input[],
+    commandOptions: CommandStorage,
     pathToTsconfig: string,
     debug: boolean,
     watchMode: boolean,
@@ -216,7 +208,7 @@ export class BuildAction extends AbstractAction {
 
   private async runTsc(
     watchMode: boolean,
-    options: Input[],
+    options: CommandStorage,
     configuration: Required<Configuration>,
     pathToTsconfig: string,
     appName: string,
@@ -229,10 +221,8 @@ export class BuildAction extends AbstractAction {
         this.tsConfigProvider,
         this.tsLoader,
       );
-      const isPreserveWatchOutputEnabled = options.find(
-        (option) =>
-          option.name === 'preserveWatchOutput' && option.value === true,
-      )?.value as boolean | undefined;
+      const isPreserveWatchOutputEnabled =
+        options.get<boolean>('preserveWatchOutput')?.value ?? false;
       watchCompiler.run(
         configuration,
         pathToTsconfig,