Merge pull request #574 from magieno/improve-the-cli-module

magieno · Sep 8, 2023 · b6a4c05 · b6a4c05
2 parents 62a1213 + a6c3cbc
commit b6a4c05
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/packages/cli/src/event-handlers/cli.event-handler.ts b/packages/cli/src/event-handlers/cli.event-handler.ts
@@ -32,7 +32,11 @@ export class CliEventHandler implements EventHandlerInterface<any, any>{
             throw new CommandNotFoundError(event.payload.name)
         }
 
-        const mappedArguments = plainToInstance(command.optionsType, event.payload.arguments);
+        let mappedArguments;
+
+        if(event.payload.arguments !== undefined) {
+             mappedArguments = plainToInstance(command.optionsType, event.payload.arguments);
+        }
 
         // Validates if all the conditions are respected in the expected type.
         const errors = await this.validator.validate(mappedArguments);

diff --git a/packages/cli/src/interfaces/command.interface.ts b/packages/cli/src/interfaces/command.interface.ts
@@ -5,5 +5,5 @@ export interface CommandInterface<ArgumentsOptionsType> {
 
     optionsType: ArgumentsOptionsType;
 
-    run(args: {new(...args : any[]): ArgumentsOptionsType ;}): Promise<ExitCodeEnum | number>;
+    run(args: ArgumentsOptionsType ): Promise<ExitCodeEnum | number>;
 }
diff --git a/packages/cli/src/mappers/command-event.mapper.spec.ts b/packages/cli/src/mappers/command-event.mapper.spec.ts
@@ -17,6 +17,7 @@ describe('Command Event Mapper', function () {
 
         const consoleArguments = [
             ["--parameter", "value"],
+            ["--parameter=value"],
             ["-parameter", "value"],
         ];
 

diff --git a/packages/cli/src/mappers/command-event.mapper.ts b/packages/cli/src/mappers/command-event.mapper.ts
@@ -49,6 +49,13 @@ export class CommandEventMapper implements EventMapperInterface<CommandEventPayl
 
             const argumentName = arg.slice(numberOfStartingDashes);
 
+            // If there's an equal sign in the name, that's the value. ex: --parameter=value
+            const indexOfEqualSign = argumentName.indexOf("=");
+            if(numberOfStartingDashes === 2 && indexOfEqualSign != -1) {
+                const actualArgumentName = argumentName.slice(0, indexOfEqualSign);
+                command.arguments[actualArgumentName] = argumentName.slice(indexOfEqualSign+1);
+                continue;
+            }
 
             // If there are no more passed arguments or the next one also starts with '-' or '--', then simply assign true.
             if( (i+1) >= passedArguments.length || passedArguments[i+1].startsWith('-')) {