changed parameter handling in commands

Author: GuentherJulian

engine/command.ts

@@ -1,4 +1,9 @@
 export class Command{
     public name: string;
-    public parameters: string;
+    public parameterString: string;
+
+    get parameters(): any[] {
+        let params = JSON.parse("[" + this.parameterString + "]");
+        return params;
+    }
 }

engine/parser.def

@@ -52,7 +52,7 @@ stepline
   = !"--" string __ { return { "stepline": text()}; }
 
 string "string"
-  = [a-zA-Z0-9.(),;:/-_- ]+ { return text(); }
+  = [a-zA-Z0-9.(),;:/-_-" ]+ { return text(); }
 
 _ "whitespace"
   = [ \t]*

engine/parser.ts

@@ -54,7 +54,7 @@ export class Parser {
         let result = re.exec(line);
         let retVal = new Command();
         retVal.name = result[1].trim();
-        retVal.parameters = result[2];
+        retVal.parameterString = result[2];
         return retVal;
     }
 

engine/runner.ts

@@ -109,13 +109,4 @@ export abstract class Runner {
         fs.mkdirSync(path, { recursive: true });
         return path;
     }
-
-    protected parseInputParameters(parameterString: string) {
-        let regex = /(((?<array>\[[^\]]+\])|(?<string>[^[,]+))\s*,?\s*)/mg;
-        let parameters = [];
-        for (let matches = regex.exec(parameterString); matches != null; matches = regex.exec(parameterString)) {
-            parameters.push(matches[2]);
-        }
-        return parameters;
-    }
 }

playbooks/cobigen-cli/index.asciidoc

@@ -10,7 +10,7 @@ More information about CobiGen on https://devonfw.com/website/pages/docs/master-
 To use the cobigen cli you first have to install the devonfw ide. You will find more information about devonfw on https://devonfw.com/website/pages/welcome/welcome.html.
 [step]
 --
-installDevonfwIde([java,mvn])
+installDevonfwIde(["java","mvn"])
 --
 
 Now, you have to download cobigen
@@ -20,9 +20,9 @@ installCobiGen()
 --
 
 ====
-The CobiGen plugin for VS Code is already installed. We will use it to generate code from one single java class based on existing templates.
+CobiGen is integrated via plugin in the VS Code IDE. We will use it to generate code from one single java class based on existing templates.
 [step]
 --
-cobiGenJava(Test.java,[1,2,3,4])
+cobiGenJava("Test.java",[1,2,3,4])
 --
-====
+====

runners/console/index.ts

@@ -16,8 +16,7 @@ export class Console extends Runner {
         let settingsDir = this.createFolder(path.join(this.getWorkingDirectory(), "devonfw-settings"), true);
         this.executeCommandSync("git clone https://github.com/devonfw/ide-settings.git settings", settingsDir, result);
 
-        let params = command.parameters.replace(/\[/, "").replace("\]", "").replace(/,/, " ").trim();
-        let tools = "DEVON_IDE_TOOLS=(" + params + ")";
+        let tools = "DEVON_IDE_TOOLS=(" + command.parameters[0].join(" ") + ")";
         fs.writeFileSync(path.join(settingsDir, "settings", "devon.properties"), tools);
         fs.renameSync(path.join(settingsDir, "settings"), path.join(settingsDir, "settings.git"));
         this.executeCommandSync("git add -A && git config user.email \"devonfw\" && git config user.name \"devonfw\" && git commit -m \"devonfw\"", path.join(settingsDir, "settings.git"), result);
@@ -37,7 +36,7 @@ export class Console extends Runner {
     }
 
     async assertInstallDevonfwIde(step: Step, command: Command, result: RunResult) {
-        let installedTools = command.parameters.replace(/\[/, "").replace("\]", "").replace(/mvn/, "maven").split(",");
+        let installedTools = command.parameters[0];
 
         let assert = new Assertions()
         .noErrorCode(result)
@@ -46,6 +45,7 @@ export class Console extends Runner {
         .directoryExits(path.join(this.getWorkingDirectory(), "devonfw", "workspaces", "main"));
 
         for(let i = 0; i < installedTools.length; i++) {
+            if(installedTools[i] == "mvn") installedTools[i] = "maven";
             assert.directoryExits(path.join(this.getWorkingDirectory(), "devonfw", "software", installedTools[i]));
         }
     }

runners/katacoda/index.ts

@@ -66,8 +66,7 @@ export class Katacoda extends Runner {
     }
 
     runInstallDevonfwIde(step: Step, command: Command): RunResult {
-        let params = this.parseInputParameters(command.parameters);
-        let tools = params[0].replace(/\[/, "").replace(/\]/g, "").replace(/,/, " ").replace(/vscode/,"").replace(/eclipse/, "").trim();
+        let tools = command.parameters[0].join(" ").replace(/vscode/,"").replace(/eclipse/, "").trim();
 
         // create script to download devonfw ide settings
         this.renderTemplate(path.join("scripts", "cloneDevonfwIdeSettings.sh"), path.join(this.setupDir, "cloneDevonfwIdeSettings.sh"), { tools: tools, cloneDir: "/root/devonfw-settings/"});
@@ -96,8 +95,8 @@ export class Katacoda extends Runner {
     }
 
     runCobiGenJava(step: Step, command: Command): RunResult {
-        let params = this.parseInputParameters(command.parameters)
-        let cobiGenTemplates = params[1].replace(/\[/, "").replace(/\]/g, "");
+        let params = command.parameters;
+        let cobiGenTemplates = params[1].join(",");
 
         this.renderTemplate(path.join("scripts", "installCobiGenPlugin.sh"), path.join(this.setupDir, "installCobiGenPlugin.sh"), { vsixFile: "cobigen-0.0.1.vsix", pluginName: "cobigen" });
         this.setupScripts.push({