makefile actions now support action variables

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

Author: worksofliam

cli/src/builders/environment.ts

@@ -1,5 +1,6 @@
 import { str } from "crc-32/crc32c";
 import { ObjectType } from "../targets";
+import path from "path";
 
 // Always try and store parmId as lowercase
 export type CommandParameters = { [parmId: string]: string };
@@ -43,6 +44,22 @@ export function extCanBeProgram(ext: string): boolean {
   return ([`MODULE`, `PGM`].includes(getObjectType(ext)));
 }
 
+export function getTrueBasename(name: string) {
+  // Logic to handle second extension, caused by bob.
+  const sourceObjectTypes = [`.PGM`, `.SRVPGM`, `.TEST`];
+  const secondName = path.parse(name);
+  if (secondName.ext && sourceObjectTypes.includes(secondName.ext.toUpperCase())) {
+    name = secondName.name;
+  }
+
+  // Remove bob text convention
+  if (name.includes(`-`)) {
+    name = name.substring(0, name.indexOf(`-`));
+  }
+
+  return name;
+}
+
 export function getObjectType(ext: string): ObjectType {
   switch (ext.toLowerCase()) {
     case `dspf`:

cli/src/builders/make/index.ts

@@ -6,7 +6,7 @@ import { warningOut } from '../../cli';
 import { name } from '../../../webpack.config';
 import { FolderOptions, getFolderOptions } from './folderSettings';
 import { readAllRules } from './customRules';
-import { CompileData, CommandParameters } from '../environment';
+import { CompileData, CommandParameters, getTrueBasename } from '../environment';
 import { iProject } from '../iProject';
 import { ReadFileSystem } from '../../readFileSystem';
 import { ProjectActions } from '../actions';
@@ -271,12 +271,30 @@ export class MakeProject {
 		const parentName = ileObject.relativePath ? path.dirname(ileObject.relativePath) : undefined;
 		const qsysTempName: string | undefined = (parentName && parentName.length > 10 ? parentName.substring(0, 10) : parentName);
 
+		const simpleReplace = (str: string, search: string, replace: string) => {
+			return str.replace(new RegExp(search, `gi`), replace);
+		}
+
 		const resolve = (command: string) => {
 			command = command.replace(new RegExp(`\\*CURLIB`, `g`), `$(BIN_LIB)`);
 			command = command.replace(new RegExp(`\\$\\*`, `g`), ileObject.systemName);
 			command = command.replace(new RegExp(`\\$<`, `g`), asPosix(ileObject.relativePath));
 			command = command.replace(new RegExp(`\\$\\(SRCPF\\)`, `g`), qsysTempName);
 
+			// Additionally, we have to support Actions variables
+			command = simpleReplace(command, `&BUILDLIB`, `$(BIN_LIB)`);
+			command = simpleReplace(command, `&CURLIB`, `$(BIN_LIB)`);
+			command = simpleReplace(command, `&LIBLS`, ``);
+			command = simpleReplace(command, `&BRANCHLIB`, `$(BIN_LIB)`);
+
+			const pathDetail = path.parse(ileObject.relativePath || ``);
+
+			command = simpleReplace(command, `&RELATIVEPATH`, asPosix(ileObject.relativePath));
+			command = simpleReplace(command, `&BASENAME`, pathDetail.base);
+			command = simpleReplace(command, `{filename}`, pathDetail.base);
+			command = simpleReplace(command, `&NAME`, getTrueBasename(pathDetail.name));
+			command = simpleReplace(command, `&EXTENSION`, pathDetail.ext.startsWith(`.`) ? pathDetail.ext.substring(1) : pathDetail.ext);
+
 			if (ileObject.deps && ileObject.deps.length > 0) {
 				// This piece of code adds special variables that can be used for building dependencies
 				const uniqueObjectTypes = ileObject.deps.map(d => d.type).filter((value, index, array) => array.indexOf(value) === index);

cli/test/cs_srvpgm.test.ts

@@ -88,8 +88,10 @@ describe(`pseudo tests`, () => {
     expect(contents).not.toContain(`EMPDET.SRVPGM`); // Ensure no service program is created
     expect(contents).toContain(`EMPDET.MODULE`);
 
+    console.log(contents);
+
     // As picked up from the actions.json
-    expect(contents).toContain(`system "CRTBNDRPG THEPARM('''cooldude''')" > .logs/mypgm.splf`);
+    expect(contents).toContain(`system "CRTBNDRPG NAME(mypgm) THEPARM('qrpglesrc/mypgm.pgm.rpgle')" > .logs/mypgm.splf`);
   });
 
   test('there are actions', async () => {
@@ -117,6 +119,6 @@ describe(`pseudo tests`, () => {
     const rpgleSrc = path.join(`qrpglesrc`, `mypgm.pgm.rpgle`);
     const actionC = actions.getActionForPath(rpgleSrc);
     expect(actionC).toBeDefined();
-    expect(actionC?.command).toBe(`CRTBNDRPG THEPARM('cooldude')`);
+    expect(actionC?.command).toBe(`CRTBNDRPG NAME(&NAME) THEPARM('&RELATIVEPATH')`);
   });
 });

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

@@ -5,7 +5,7 @@
     "extensions": [
       "rpgle"
     ],
-    "command": "CRTBNDRPG THEPARM('cooldude')"
+    "command": "CRTBNDRPG NAME(&NAME) THEPARM('&RELATIVEPATH')"
   },
   {
     "name": "Global run SQL",