Correct pass along actions commands

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

cli/src/builders/actions/index.ts

@@ -61,7 +61,7 @@ export class ProjectActions {
       const actionFile = path.join(parent, `actions.json`);
 
       if (this.actions[actionFile]) {
-        allPossibleActions = allPossibleActions.concat(this.actions[actionFile]);
+        allPossibleActions.push(...this.actions[actionFile]);
       }
 
       if (parent === `.`) {

cli/src/builders/iProject.ts

@@ -1,5 +1,4 @@
-import { fromCl } from "../utils";
-import { CompileData, CommandParameters, CompileAttribute, getDefaultCompiles, Action, getObjectType } from "./environment";
+import { CommandParameters, CompileAttribute, getDefaultCompiles } from "./environment";
 
 export class iProject {
   includePaths?: string[] = [];

cli/src/builders/make/index.ts

@@ -14,19 +14,21 @@ import { ProjectActions } from '../actions';
 export class MakeProject {
 	private noChildren: boolean = false;
 	private settings: iProject = new iProject();
-	private actions: ProjectActions;
+	private projectActions: ProjectActions;
 
 	private folderSettings: {[folder: string]: FolderOptions} = {};
 
 	constructor(private cwd: string, private targets: Targets, private rfs: ReadFileSystem) {
-		this.actions = new ProjectActions(this.targets, this.rfs);
+		this.projectActions = new ProjectActions(this.targets, this.rfs);
 	}
 
 	public setNoChildrenInBuild(noChildren: boolean) {
 		this.noChildren = noChildren;
 	}
 
 	async setupSettings() {
+		await this.projectActions.loadAllActions();
+
 		// First, let's setup the project settings
 		try {
 			const content = await this.rfs.readFile(path.join(this.cwd, `iproj.json`));
@@ -41,8 +43,6 @@ export class MakeProject {
 		this.folderSettings = getFolderOptions(this.cwd);
 
 		readAllRules(this.targets, this);
-
-		await this.actions.loadAllActions();
 	}
 
 	public getSettings() {
@@ -222,7 +222,7 @@ export class MakeProject {
 						let customAttributes = this.getObjectAttributes(data, possibleTarget);
 
 						if (ileObject.relativePath) {
-							const possibleAction = this.actions.getActionForPath(ileObject.relativePath);
+							const possibleAction = this.projectActions.getActionForPath(ileObject.relativePath);
 							if (possibleAction) {
 								const clData = fromCl(possibleAction.command);
 								// If there is an action for this object, we want to apply the action's parameters
@@ -231,9 +231,7 @@ export class MakeProject {
 								data = {
 									...data,
 									command: clData.command,
-									parameters: {
-										...data.parameters,
-									}
+									parameters: clData.parameters
 								}
 							}
 						}

cli/test/cs_srvpgm.test.ts

@@ -78,7 +78,7 @@ describe(`pseudo tests`, () => {
 
   test('makefile', async () => {
     const makefile = new MakeProject(targets.getCwd(), targets, fs);
-    await make.setupSettings();
+    await makefile.setupSettings();
 
     const contents = makefile.getMakefile().join(`\n`);
 
@@ -87,6 +87,9 @@ describe(`pseudo tests`, () => {
 
     expect(contents).not.toContain(`EMPDET.SRVPGM`); // Ensure no service program is created
     expect(contents).toContain(`EMPDET.MODULE`);
+
+    // As picked up from the actions.json
+    expect(contents).toContain(`system "CRTBNDRPG THEPARM('''cooldude''')" > .logs/mypgm.splf`);
   });
 
   test('there are actions', async () => {
@@ -106,14 +109,14 @@ describe(`pseudo tests`, () => {
     const actionB = actions.getActionForPath(ddsSrcB);
 
     expect(actionA).toBeDefined();
-    expect(actionA?.command).toBe(`RUNSQLSTM`);
+    expect(actionA?.command).toBe(`RUNSQLSTM SRCSTMF('&RELATIVEPATH')`);
 
     expect(actionB).toBeDefined();
-    expect(actionB?.command).toBe(`RUNSQL`);
+    expect(actionB?.command).toBe(`RUNSQL SRCSTMF('&RELATIVEPATH')`);
 
     const rpgleSrc = path.join(`qrpglesrc`, `mypgm.pgm.rpgle`);
     const actionC = actions.getActionForPath(rpgleSrc);
     expect(actionC).toBeDefined();
-    expect(actionC?.command).toBe(`CRTBNDRPG`);
+    expect(actionC?.command).toBe(`CRTBNDRPG THEPARM('cooldude')`);
   });
 });

cli/test/fixtures/cs_srvpgm/.vscode/actions.json

@@ -5,14 +5,14 @@
     "extensions": [
       "rpgle"
     ],
-    "command": "CRTBNDRPG"
+    "command": "CRTBNDRPG THEPARM('cooldude')"
   },
   {
     "name": "Global run SQL",
     "environment": "ile",
     "extensions": [
       "sql"
     ],
-    "command": "RUNSQL"
+    "command": "RUNSQL SRCSTMF('&RELATIVEPATH')"
   }
 ]

cli/test/fixtures/cs_srvpgm/qddssrc/actions.json

@@ -5,6 +5,6 @@
     "extensions": [
       "sql", "table"
     ],
-    "command": "RUNSQLSTM"
+    "command": "RUNSQLSTM SRCSTMF('&RELATIVEPATH')"
   }
 ]