@sasjs/cli 3.9.0 → 3.10.0

package/build/commands/compile/compile.d.ts

@@ -1,4 +1,5 @@
+import { CompileTree } from '@sasjs/utils';
 import { Target } from '@sasjs/utils/types';
 export declare function compile(target: Target, forceCompile?: boolean): Promise<void>;
 export declare function copyFilesToBuildFolder(target: Target): Promise<void>;
-export declare function compileJobsServicesTests(target: Target): Promise<void>;
+export declare function compileJobsServicesTests(target: Target, compileTree: CompileTree): Promise<void>;

package/build/commands/compile/compile.js

@@ -82,11 +82,12 @@ var compileServiceFile_1 = require("./internal/compileServiceFile");
 var compileJobFile_1 = require("./internal/compileJobFile");
 var compileTestFile_1 = require("./internal/compileTestFile");
 var getDestinationPath_1 = require("./internal/getDestinationPath");
+var loadDependencies_1 = require("./internal/loadDependencies");
 function compile(target, forceCompile) {
     var _a, _b;
     if (forceCompile === void 0) { forceCompile = false; }
     return __awaiter(this, void 0, void 0, function () {
-        var result, macroFolders, programFolders_1, buildMacroTestFolder_1, macroTestFiles;
+        var result, compileTree, macroFolders, programFolders_1, buildMacroTestFolder_1, macroTestFiles;
         var _this = this;
         return __generator(this, function (_c) {
             switch (_c.label) {
@@ -108,7 +109,8 @@ function compile(target, forceCompile) {
                         })];
                 case 2:
                     _c.sent();
-                    return [4 /*yield*/, compileModule.compileJobsServicesTests(target)];
+                    compileTree = (0, loadDependencies_1.getCompileTree)(target);
+                    return [4 /*yield*/, compileModule.compileJobsServicesTests(target, compileTree)];
                 case 3:
                     _c.sent();
                     return [4 /*yield*/, (0, config_1.getMacroFolders)(target)];
@@ -136,7 +138,7 @@ function compile(target, forceCompile) {
                     macroTestFiles = _c.sent();
                     return [4 /*yield*/, (0, utils_1.asyncForEach)(macroTestFiles, function (macroTestFile) { return __awaiter(_this, void 0, void 0, function () {
                             return __generator(this, function (_a) {
-                                return [2 /*return*/, (0, compileServiceFile_1.compileServiceFile)(target, path_1.default.join(buildMacroTestFolder_1, macroTestFile), macroFolders, programFolders_1)];
+                                return [2 /*return*/, (0, compileServiceFile_1.compileServiceFile)(target, path_1.default.join(buildMacroTestFolder_1, macroTestFile), macroFolders, programFolders_1, undefined, compileTree)];
                             });
                         }); })];
                 case 10:
@@ -221,7 +223,7 @@ function copyFilesToBuildFolder(target) {
     });
 }
 exports.copyFilesToBuildFolder = copyFilesToBuildFolder;
-function compileJobsServicesTests(target) {
+function compileJobsServicesTests(target, compileTree) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
         var serviceFolders, jobFolders, macroFolders_1, programFolders_2, testSetUp, testTearDown, error_2;
@@ -262,7 +264,7 @@ function compileJobsServicesTests(target) {
                 case 10: return [4 /*yield*/, (0, utils_1.asyncForEach)(serviceFolders, function (serviceFolder) { return __awaiter(_this, void 0, void 0, function () {
                         return __generator(this, function (_a) {
                             switch (_a.label) {
-                                case 0: return [4 /*yield*/, compileServiceFolder(target, serviceFolder, macroFolders_1, programFolders_2)];
+                                case 0: return [4 /*yield*/, compileServiceFolder(target, serviceFolder, macroFolders_1, programFolders_2, compileTree)];
                                 case 1:
                                     _a.sent();
                                     return [2 /*return*/];
@@ -274,7 +276,7 @@ function compileJobsServicesTests(target) {
                     return [4 /*yield*/, (0, utils_1.asyncForEach)(jobFolders, function (jobFolder) { return __awaiter(_this, void 0, void 0, function () {
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
-                                    case 0: return [4 /*yield*/, compileJobFolder(target, jobFolder, macroFolders_1, programFolders_2)];
+                                    case 0: return [4 /*yield*/, compileJobFolder(target, jobFolder, macroFolders_1, programFolders_2, compileTree)];
                                     case 1:
                                         _a.sent();
                                         return [2 /*return*/];
@@ -319,7 +321,7 @@ function recreateBuildFolder() {
         });
     });
 }
-var compileServiceFolder = function (target, serviceFolder, macroFolders, programFolders) { return __awaiter(void 0, void 0, void 0, function () {
+var compileServiceFolder = function (target, serviceFolder, macroFolders, programFolders, compileTree) { return __awaiter(void 0, void 0, void 0, function () {
     var destinationPath, subFolders, filesNamesInPath;
     return __generator(this, function (_a) {
         switch (_a.label) {
@@ -342,7 +344,7 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
                                 case 1:
                                     _a.sent();
                                     return [3 /*break*/, 4];
-                                case 2: return [4 /*yield*/, (0, compileServiceFile_1.compileServiceFile)(target, filePath, macroFolders, programFolders)];
+                                case 2: return [4 /*yield*/, (0, compileServiceFile_1.compileServiceFile)(target, filePath, macroFolders, programFolders, undefined, compileTree)];
                                 case 3:
                                     _a.sent();
                                     _a.label = 4;
@@ -370,7 +372,7 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
                                                     case 1:
                                                         _a.sent();
                                                         return [3 /*break*/, 4];
-                                                    case 2: return [4 /*yield*/, (0, compileServiceFile_1.compileServiceFile)(target, filePath, macroFolders, programFolders)];
+                                                    case 2: return [4 /*yield*/, (0, compileServiceFile_1.compileServiceFile)(target, filePath, macroFolders, programFolders, undefined, compileTree)];
                                                     case 3:
                                                         _a.sent();
                                                         _a.label = 4;
@@ -386,11 +388,12 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
                     }); })];
             case 4:
                 _a.sent();
+                compileTree.saveTree();
                 return [2 /*return*/];
         }
     });
 }); };
-var compileJobFolder = function (target, jobFolder, macroFolders, programFolders) { return __awaiter(void 0, void 0, void 0, function () {
+var compileJobFolder = function (target, jobFolder, macroFolders, programFolders, compileTree) { return __awaiter(void 0, void 0, void 0, function () {
     var destinationPath, subFolders, filesNamesInPath;
     return __generator(this, function (_a) {
         switch (_a.label) {
@@ -413,7 +416,7 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
                                 case 1:
                                     _a.sent();
                                     return [3 /*break*/, 4];
-                                case 2: return [4 /*yield*/, (0, compileJobFile_1.compileJobFile)(target, filePath, macroFolders, programFolders)];
+                                case 2: return [4 /*yield*/, (0, compileJobFile_1.compileJobFile)(target, filePath, macroFolders, programFolders, undefined, compileTree)];
                                 case 3:
                                     _a.sent();
                                     _a.label = 4;
@@ -441,7 +444,7 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
                                                     case 1:
                                                         _a.sent();
                                                         return [3 /*break*/, 4];
-                                                    case 2: return [4 /*yield*/, (0, compileJobFile_1.compileJobFile)(target, filePath, macroFolders, programFolders)];
+                                                    case 2: return [4 /*yield*/, (0, compileJobFile_1.compileJobFile)(target, filePath, macroFolders, programFolders, undefined, compileTree)];
                                                     case 3:
                                                         _a.sent();
                                                         _a.label = 4;

package/build/commands/compile/compileSingleFile.js

@@ -46,12 +46,13 @@ var utils_1 = require("@sasjs/utils");
 var compileServiceFile_1 = require("./internal/compileServiceFile");
 var compileJobFile_1 = require("./internal/compileJobFile");
 var identifySasFile_1 = require("./internal/identifySasFile");
+var loadDependencies_1 = require("./internal/loadDependencies");
 function compileSingleFile(target, subCommand, source, output, insertProgramVar) {
     var _a;
     if (subCommand === void 0) { subCommand = 'identify'; }
     if (insertProgramVar === void 0) { insertProgramVar = false; }
     return __awaiter(this, void 0, void 0, function () {
-        var subCommands, commandExample, sourcePath, outputPathParts, leafFolderName, parentOutputFolder, pathExists, sourceFileName, destinationPath, sourceFileNameWithoutExt, macroFolders, programFolders, psMaxOption, programVar, _b;
+        var subCommands, commandExample, sourcePath, outputPathParts, leafFolderName, parentOutputFolder, pathExists, sourceFileName, destinationPath, sourceFileNameWithoutExt, macroFolders, programFolders, psMaxOption, programVar, compileTree, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -111,17 +112,18 @@ function compileSingleFile(target, subCommand, source, output, insertProgramVar)
                     programVar = insertProgramVar
                         ? "%let _program=".concat(target.appLoc, "/").concat(subCommand, "s/").concat(leafFolderName, "/").concat(sourceFileNameWithoutExt, ";\n").concat(psMaxOption)
                         : "".concat(psMaxOption);
+                    compileTree = (0, loadDependencies_1.getCompileTree)(target);
                     _b = subCommand;
                     switch (_b) {
                         case subCommands.service: return [3 /*break*/, 11];
                         case subCommands.job: return [3 /*break*/, 13];
                     }
                     return [3 /*break*/, 15];
-                case 11: return [4 /*yield*/, (0, compileServiceFile_1.compileServiceFile)(target, destinationPath, macroFolders, programFolders, programVar)];
+                case 11: return [4 /*yield*/, (0, compileServiceFile_1.compileServiceFile)(target, destinationPath, macroFolders, programFolders, programVar, compileTree)];
                 case 12:
                     _c.sent();
                     return [3 /*break*/, 16];
-                case 13: return [4 /*yield*/, (0, compileJobFile_1.compileJobFile)(target, destinationPath, macroFolders, programFolders, programVar)];
+                case 13: return [4 /*yield*/, (0, compileJobFile_1.compileJobFile)(target, destinationPath, macroFolders, programFolders, programVar, compileTree)];
                 case 14:
                     _c.sent();
                     return [3 /*break*/, 16];

package/build/commands/compile/internal/compileJobFile.d.ts

@@ -1,2 +1,3 @@
 import { Target } from '@sasjs/utils/types';
-export declare function compileJobFile(target: Target, filePath: string, macroFolders: string[], programFolders: string[], programVar?: string): Promise<void>;
+import { CompileTree } from '@sasjs/utils';
+export declare function compileJobFile(target: Target, filePath: string, macroFolders: string[], programFolders: string[], programVar: string | undefined, compileTree: CompileTree): Promise<void>;

package/build/commands/compile/internal/compileJobFile.js

@@ -39,13 +39,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileJobFile = void 0;
 var utils_1 = require("@sasjs/utils");
 var loadDependencies_1 = require("./loadDependencies");
-function compileJobFile(target, filePath, macroFolders, programFolders, programVar) {
+function compileJobFile(target, filePath, macroFolders, programFolders, programVar, compileTree) {
     if (programVar === void 0) { programVar = ''; }
     return __awaiter(this, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, filePath, macroFolders, programFolders, (0, utils_1.isTestFile)(filePath) ? utils_1.SASJsFileType.test : utils_1.SASJsFileType.job)];
+                case 0: return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, filePath, macroFolders, programFolders, (0, utils_1.isTestFile)(filePath) ? utils_1.SASJsFileType.test : utils_1.SASJsFileType.job, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     dependencies = "".concat(programVar ? programVar + '\n' : '').concat(dependencies);

package/build/commands/compile/internal/compileServiceFile.d.ts

@@ -1,3 +1,4 @@
+import { CompileTree } from '@sasjs/utils';
 import { Target, ServerType } from '@sasjs/utils/types';
-export declare function compileServiceFile(target: Target, filePath: string, macroFolders: string[], programFolders: string[], programVar?: string): Promise<void>;
+export declare function compileServiceFile(target: Target, filePath: string, macroFolders: string[], programFolders: string[], programVar: string | undefined, compileTree: CompileTree): Promise<void>;
 export declare function getPreCodeForServicePack(serverType: ServerType): Promise<string>;

package/build/commands/compile/internal/compileServiceFile.js

@@ -43,13 +43,13 @@ var types_1 = require("@sasjs/utils/types");
 var error_1 = require("@sasjs/utils/error");
 var loadDependencies_1 = require("./loadDependencies");
 var getServerType_1 = require("./getServerType");
-function compileServiceFile(target, filePath, macroFolders, programFolders, programVar) {
+function compileServiceFile(target, filePath, macroFolders, programFolders, programVar, compileTree) {
     if (programVar === void 0) { programVar = ''; }
     return __awaiter(this, void 0, void 0, function () {
         var dependencies, serverType, preCode;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, filePath, macroFolders, programFolders, (0, utils_1.isTestFile)(filePath) ? types_1.SASJsFileType.test : types_1.SASJsFileType.service)];
+                case 0: return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, filePath, macroFolders, programFolders, (0, utils_1.isTestFile)(filePath) ? types_1.SASJsFileType.test : types_1.SASJsFileType.service, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     return [4 /*yield*/, (0, getServerType_1.getServerType)(target)];

package/build/commands/compile/internal/compileTestFile.js

@@ -82,10 +82,11 @@ function compileTestFile(target, filePath, testVar, saveToRoot, removeOriginalFi
     if (saveToRoot === void 0) { saveToRoot = true; }
     if (removeOriginalFile === void 0) { removeOriginalFile = true; }
     return __awaiter(this, void 0, void 0, function () {
-        var dependencies, _a, _b, preCode, destinationPath;
+        var compileTree, dependencies, _a, _b, preCode, destinationPath;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
+                    compileTree = (0, loadDependencies_1.getCompileTree)(target);
                     _a = loadDependencies_1.loadDependencies;
                     _b = [target,
                         (0, utils_1.getAbsolutePath)(filePath, process.projectDir)];
@@ -93,7 +94,8 @@ function compileTestFile(target, filePath, testVar, saveToRoot, removeOriginalFi
                 case 1:
                     _b = _b.concat([_c.sent()]);
                     return [4 /*yield*/, (0, config_1.getProgramFolders)(target)];
-                case 2: return [4 /*yield*/, _a.apply(void 0, _b.concat([_c.sent(), utils_1.SASJsFileType.test]))];
+                case 2: return [4 /*yield*/, _a.apply(void 0, _b.concat([_c.sent(), utils_1.SASJsFileType.test,
+                        compileTree]))];
                 case 3:
                     dependencies = _c.sent();
                     return [4 /*yield*/, (0, compileServiceFile_1.getPreCodeForServicePack)(target.serverType)];

package/build/commands/compile/internal/loadDependencies.d.ts

@@ -1,2 +1,3 @@
-import { Target, SASJsFileType } from '@sasjs/utils';
-export declare function loadDependencies(target: Target, filePath: string, macroFolders: string[], programFolders: string[], type: SASJsFileType): Promise<string>;
+import { Target, SASJsFileType, CompileTree } from '@sasjs/utils';
+export declare function loadDependencies(target: Target, filePath: string, macroFolders: string[], programFolders: string[], type: SASJsFileType, compileTree: CompileTree): Promise<string>;
+export declare const getCompileTree: (target: Target) => CompileTree;

package/build/commands/compile/internal/loadDependencies.js

@@ -35,27 +35,43 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadDependencies = void 0;
+exports.getCompileTree = exports.loadDependencies = void 0;
 var utils_1 = require("@sasjs/utils");
 var config_1 = require("../../../utils/config");
-function loadDependencies(target, filePath, macroFolders, programFolders, type) {
+var path_1 = __importDefault(require("path"));
+function loadDependencies(target, filePath, macroFolders, programFolders, type, compileTree) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var fileContent, configuration, _b, buildSourceFolder, macroCorePath, binaryFolders;
+        var fileContent, leaf, configuration, _b, buildSourceFolder, macroCorePath, binaryFolders;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Loading dependencies for ".concat(filePath));
-                    return [4 /*yield*/, (0, utils_1.readFile)(filePath)];
-                case 1:
-                    fileContent = _c.sent();
-                    return [4 /*yield*/, (0, config_1.getLocalOrGlobalConfig)()];
+                    fileContent = '';
+                    if (!(compileTree && Object.keys(compileTree).length)) return [3 /*break*/, 4];
+                    leaf = compileTree.getLeaf(filePath);
+                    if (!leaf) return [3 /*break*/, 1];
+                    fileContent = leaf.content;
+                    return [3 /*break*/, 3];
+                case 1: return [4 /*yield*/, (0, utils_1.readFile)(filePath)];
                 case 2:
+                    fileContent = _c.sent();
+                    _c.label = 3;
+                case 3: return [3 /*break*/, 6];
+                case 4: return [4 /*yield*/, (0, utils_1.readFile)(filePath)];
+                case 5:
+                    fileContent = _c.sent();
+                    _c.label = 6;
+                case 6: return [4 /*yield*/, (0, config_1.getLocalOrGlobalConfig)()];
+                case 7:
                     configuration = (_c.sent()).configuration;
                     _b = process.sasjsConstants, buildSourceFolder = _b.buildSourceFolder, macroCorePath = _b.macroCorePath;
                     return [4 /*yield*/, (0, config_1.getBinaryFolders)(target)];
-                case 3:
+                case 8:
                     binaryFolders = _c.sent();
                     headerSyntaxNotices(fileContent);
                     return [4 /*yield*/, (0, utils_1.loadDependenciesFile)({
@@ -68,9 +84,10 @@ function loadDependencies(target, filePath, macroFolders, programFolders, type)
                             programFolders: programFolders,
                             buildSourceFolder: buildSourceFolder,
                             macroCorePath: macroCorePath,
-                            binaryFolders: binaryFolders
+                            binaryFolders: binaryFolders,
+                            compileTree: compileTree
                         })];
-                case 4: return [2 /*return*/, _c.sent()];
+                case 9: return [2 /*return*/, _c.sent()];
             }
         });
     });
@@ -78,21 +95,21 @@ function loadDependencies(target, filePath, macroFolders, programFolders, type)
 exports.loadDependencies = loadDependencies;
 var headerSyntaxNotices = function (fileContent) {
     var _a, _b, _c;
-    if (fileContent.includes('<h4> Dependencies </h4>')) {
+    if (fileContent.includes(utils_1.DependencyHeader.DeprecatedMacro)) {
         var deprecationDate = new Date(2021, 10, 2);
         var today = new Date();
         if (today < deprecationDate) {
-            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.warn("Please use <h4> SAS Macros </h4> syntax to specify dependencies. Specifying dependencies with a <h4> Dependencies </h4> syntax will not be supported starting from November 1, 2021.");
+            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.warn("Please use ".concat(utils_1.DependencyHeader.Macro, " syntax to specify dependencies. Specifying dependencies with a ").concat(utils_1.DependencyHeader.DeprecatedMacro, " syntax will not be supported starting from November 1, 2021."));
         }
         else {
-            throw new Error('Using <h4> Dependencies </h4> syntax is deprecated. Please use <h4> SAS Macros </h4> instead.');
+            throw new Error("Using ".concat(utils_1.DependencyHeader.DeprecatedMacro, " syntax is deprecated. Please use ").concat(utils_1.DependencyHeader.Macro, " instead."));
         }
     }
-    if (fileContent.includes('<h4> SAS Programs </h4>')) {
+    if (fileContent.includes(utils_1.DependencyHeader.DeprecatedInclude)) {
         var deprecationDate = new Date(2022, 4, 2);
         var warningDate = new Date(2022, 10, 2);
         var today = new Date();
-        var message = "Please use <h4> SAS Includes </h4> syntax to specify programs. Specifying programs with a <h4> SAS Programs </h4> syntax will not be supported starting from April 1, 2022.";
+        var message = "Please use ".concat(utils_1.DependencyHeader.Include, " syntax to specify programs. Specifying programs with a ").concat(utils_1.DependencyHeader.DeprecatedInclude, " syntax will not be supported starting from April 1, 2022.");
         if (today < warningDate) {
             (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info(message);
         }
@@ -100,6 +117,10 @@ var headerSyntaxNotices = function (fileContent) {
             (_c = process.logger) === null || _c === void 0 ? void 0 : _c.warn(message);
         }
         else
-            throw new Error('Using <h4> SAS Programs </h4> syntax is deprecated. Please use <h4> SAS Includes </h4> instead.');
+            throw new Error("Using ".concat(utils_1.DependencyHeader.DeprecatedInclude, " syntax is deprecated. Please use ").concat(utils_1.DependencyHeader.Include, " instead."));
     }
 };
+var getCompileTree = function (target) {
+    return new utils_1.CompileTree(path_1.default.join(process.sasjsConstants.buildDestinationFolder, "".concat(target === null || target === void 0 ? void 0 : target.name, "_compileTree.json")));
+};
+exports.getCompileTree = getCompileTree;

package/build/commands/compile/internal/spec/compileTestFile.spec.js

@@ -129,8 +129,8 @@ describe('compileTestFile', function () {
                                     case 2:
                                         testFileContent = _a.apply(void 0, [_b.sent()]);
                                         testVar = replaceLineBreaks("* Test Variables start;\n\n%let ".concat(Object.keys(target.testConfig.macroVars)[0], "=").concat(Object.values(target.testConfig.macroVars)[0], ";\n\n* Test Variables end;"));
-                                        testInit = replaceLineBreaks("* TestInit start;\n/**\n  @file\n  @brief setting up the test\n\n  <h4> SAS Macros </h4>\n**/\n\n%put testing, init;\n* TestInit end;");
-                                        testTerm = replaceLineBreaks("* TestTerm start;\n/**\n  @file\n  @brief ending the test\n\n  <h4> SAS Macros </h4>\n**/\n\n%put testing, termed;\n* TestTerm end;");
+                                        testInit = replaceLineBreaks("* TestInit start;\n%put testing, init;\n* TestInit end;");
+                                        testTerm = replaceLineBreaks("* TestTerm start;\n%put testing, termed;\n* TestTerm end;");
                                         mvWebout = "%macro mv_webout(action,ds,fref=_mvwtemp,dslabel=,fmt=Y,stream=Y,missing=NULL<br>  ,showmeta=NO<br>);";
                                         expect(testFileContent.indexOf(testVar)).toBeGreaterThan(-1);
                                         expect(testFileContent.indexOf(testInit)).toBeGreaterThan(-1);

package/build/commands/compile/spec/compileJobFile.spec.js

@@ -65,8 +65,9 @@ var getInitTerm_1 = require("@sasjs/utils/sasjsCli/getInitTerm");
 var test_1 = require("../../../utils/test");
 var compileJobFile_1 = require("../internal/compileJobFile");
 var utils_2 = require("@sasjs/utils");
-var fakeJobInit = "/**\n  @file\n  @brief This code is inserted into the beginning of each Viya Job.\n  @details Inserted during the `sasjs compile` step.  Add any code here that\n  should go at the beginning of every deployed job.\n\n  The path to this file should be listed in the `jobInit` property of the\n  sasjsconfig file.\n\n  <h4> SAS Programs </h4>\n  @li test.sas TEST\n\n  <h4> SAS Macros </h4>\n  @li examplemacro.sas\n\n**/\n\n%example(Job Init is executing!)\n\n%let mylib=WORK;";
-var fakeJobTerm = "/**\n  @file serviceterm.sas\n  @brief this file is called at the end of every service\n  @details  This file is included at the *end* of every service.\n\n  <h4> SAS Macros </h4>\n  @li mf_abort.sas\n  @li mf_existds.sas\n\n**/\n\n%put service is finishing.  Thanks, SASjs!;";
+var loadDependencies_1 = require("../internal/loadDependencies");
+var fakeJobInit = "/**\n  @file\n  @brief This code is inserted into the beginning of each Viya Job.\n  @details Inserted during the `sasjs compile` step.  Add any code here that\n  should go at the beginning of every deployed job.\n\n  The path to this file should be listed in the `jobInit` property of the\n  sasjsconfig file.\n\n  ".concat(utils_1.DependencyHeader.DeprecatedInclude, "\n  @li test.sas TEST\n\n  ").concat(utils_1.DependencyHeader.Macro, "\n  @li examplemacro.sas\n\n**/\n\n%example(Job Init is executing!)\n\n%let mylib=WORK;");
+var fakeJobTerm = "/**\n  @file serviceterm.sas\n  @brief this file is called at the end of every service\n  @details  This file is included at the *end* of every service.\n\n  ".concat(utils_1.DependencyHeader.Macro, "\n  @li mf_abort.sas\n  @li mf_existds.sas\n\n**/\n\n%put service is finishing.  Thanks, SASjs!;");
 var fakeProgramLines = [
     'filename TEST temp;',
     'data _null_;',
@@ -103,7 +104,7 @@ describe('compileJobFile', function () {
         });
     }); });
     test('it should compile and create file', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var filePath, buildPath, destinationPath, compiledContent, macrosToTest;
+        var filePath, buildPath, destinationPath, compileTree, compiledContent, macrosToTest;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -111,13 +112,14 @@ describe('compileJobFile', function () {
                     filePath = path_1.default.join(__dirname, './service.sas');
                     buildPath = path_1.default.join(process.projectDir, 'sasjsbuild');
                     destinationPath = path_1.default.join(buildPath, 'service.sas');
+                    compileTree = (0, loadDependencies_1.getCompileTree)(target);
                     return [4 /*yield*/, (0, utils_2.createFolder)(buildPath)];
                 case 1:
                     _a.sent();
                     return [4 /*yield*/, (0, utils_2.copy)(filePath, destinationPath)];
                 case 2:
                     _a.sent();
-                    return [4 /*yield*/, expect((0, compileJobFile_1.compileJobFile)(target, destinationPath, [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')])).toResolve()];
+                    return [4 /*yield*/, expect((0, compileJobFile_1.compileJobFile)(target, destinationPath, [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], undefined, compileTree)).toResolve()];
                 case 3:
                     _a.sent();
                     return [4 /*yield*/, expect((0, utils_2.fileExists)(destinationPath)).resolves.toEqual(true)];

package/build/commands/compile/spec/compileServiceFile.spec.js

@@ -65,8 +65,9 @@ var getInitTerm_1 = require("@sasjs/utils/sasjsCli/getInitTerm");
 var test_1 = require("../../../utils/test");
 var compileServiceFile_1 = require("../internal/compileServiceFile");
 var utils_2 = require("@sasjs/utils");
-var fakeJobInit = "/**\n  @file\n  @brief This code is inserted into the beginning of each Viya Job.\n  @details Inserted during the `sasjs compile` step.  Add any code here that\n  should go at the beginning of every deployed job.\n\n  The path to this file should be listed in the `jobInit` property of the\n  sasjsconfig file.\n\n  <h4> SAS Programs </h4>\n  @li test.sas TEST\n\n  <h4> SAS Macros </h4>\n  @li examplemacro.sas\n\n**/\n\n%example(Job Init is executing!)\n\n%let mylib=WORK;";
-var fakeJobTerm = "/**\n  @file serviceterm.sas\n  @brief this file is called at the end of every service\n  @details  This file is included at the *end* of every service.\n\n  <h4> SAS Macros </h4>\n  @li mf_abort.sas\n  @li mf_existds.sas\n\n**/\n\n%put service is finishing.  Thanks, SASjs!;";
+var loadDependencies_1 = require("../internal/loadDependencies");
+var fakeJobInit = "/**\n  @file\n  @brief This code is inserted into the beginning of each Viya Job.\n  @details Inserted during the `sasjs compile` step.  Add any code here that\n  should go at the beginning of every deployed job.\n\n  The path to this file should be listed in the `jobInit` property of the\n  sasjsconfig file.\n\n  ".concat(utils_1.DependencyHeader.DeprecatedInclude, "\n  @li test.sas TEST\n\n  ").concat(utils_1.DependencyHeader.Macro, "\n  @li examplemacro.sas\n\n**/\n\n%example(Job Init is executing!)\n\n%let mylib=WORK;");
+var fakeJobTerm = "/**\n  @file serviceterm.sas\n  @brief this file is called at the end of every service\n  @details  This file is included at the *end* of every service.\n\n  ".concat(utils_1.DependencyHeader.Macro, "\n  @li mf_abort.sas\n  @li mf_existds.sas\n\n**/\n\n%put service is finishing.  Thanks, SASjs!;");
 var fakeProgramLines = [
     'filename TEST temp;',
     'data _null_;',
@@ -104,7 +105,7 @@ describe('compileServiceFile', function () {
         });
     }); });
     test('it should compile and create file', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var filePath, buildPath, destinationPath, compiledContent, macrosToTest;
+        var filePath, buildPath, destinationPath, compileTree, compiledContent, macrosToTest;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -112,13 +113,14 @@ describe('compileServiceFile', function () {
                     filePath = path_1.default.join(__dirname, './service.sas');
                     buildPath = path_1.default.join(process.projectDir, 'sasjsbuild');
                     destinationPath = path_1.default.join(buildPath, 'service.sas');
+                    compileTree = (0, loadDependencies_1.getCompileTree)(target);
                     return [4 /*yield*/, (0, utils_2.createFolder)(buildPath)];
                 case 1:
                     _a.sent();
                     return [4 /*yield*/, (0, utils_2.copy)(filePath, destinationPath)];
                 case 2:
                     _a.sent();
-                    return [4 /*yield*/, expect((0, compileServiceFile_1.compileServiceFile)(target, destinationPath, [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')])).toResolve()];
+                    return [4 /*yield*/, expect((0, compileServiceFile_1.compileServiceFile)(target, destinationPath, [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], undefined, compileTree)).toResolve()];
                 case 3:
                     _a.sent();
                     return [4 /*yield*/, expect((0, utils_2.fileExists)(destinationPath)).resolves.toEqual(true)];

package/build/commands/compile/spec/loadDependencies.spec.js

@@ -74,13 +74,14 @@ var utils_1 = require("@sasjs/utils");
 var internalModule = __importStar(require("@sasjs/utils/sasjsCli/getInitTerm"));
 var getInitTerm_1 = require("@sasjs/utils/sasjsCli/getInitTerm");
 var test_1 = require("../../../utils/test");
+var utils_2 = require("../../../utils");
 var loadDependencies_1 = require("../internal/loadDependencies");
-var fakeInit = "/**\n  @file serviceinit.sas\n  @brief this file is called with every service\n  @details  This file is included in *every* service, *after* the macros and *before* the service code.\n\n  <h4> SAS Macros </h4>\n  @li mf_abort.sas\n\n**/\n\noptions\n  DATASTMTCHK=ALLKEYWORDS /* some sites have this enabled */\n  PS=MAX /* reduce log size slightly */\n;\n%put service is starting!!;";
-var fakeTerm = "/**\n  @file serviceterm.sas\n  @brief this file is called at the end of every service\n  @details  This file is included at the *end* of every service.\n\n  <h4> SAS Macros </h4>\n  @li mf_abort.sas\n  @li mf_existds.sas\n\n**/\n\n%put service is finishing.  Thanks, SASjs!;";
-var fakeInit2 = "/**\n  @file serviceinit.sas\n  @brief this file is called with every service\n  @details  This file is included in *every* service, *after* the macros and *before* the service code.\n\n  <h4> SAS Macros </h4>\n  @li mf_abort.sas\n\n**/\n\noptions\n  DATASTMTCHK=ALLKEYWORDS /* some sites have this enabled */\n  PS=MAX /* reduce log size slightly */\n;\n%put service is starting!!;";
-var fakeTerm2 = "/**\n  @file serviceterm.sas\n  @brief this file is called at the end of every service\n  @details  This file is included at the *end* of every service.\n\n  <h4> SAS Macros </h4>\n  @li mf_abort.sas\n  @li mf_existds.sas\n\n**/\n\n%put service is finishing.  Thanks, SASjs!;";
-var fakeJobInit = "/**\n  @file\n  @brief This code is inserted into the beginning of each Viya Job.\n  @details Inserted during the `sasjs compile` step.  Add any code here that\n  should go at the beginning of every deployed job.\n\n  The path to this file should be listed in the `jobInit` property of the\n  sasjsconfig file.\n\n  <h4> SAS Programs </h4>\n  @li test.sas TEST\n\n  <h4> SAS Macros </h4>\n  @li examplemacro.sas\n\n**/\n\n%example(Job Init is executing!)\n\n%let mylib=WORK;";
-var fakeJobInit2 = "/**\n  @file\n  @brief This code is inserted into the beginning of each Viya Job.\n  @details Inserted during the `sasjs compile` step.  Add any code here that\n  should go at the beginning of every deployed job.\n\n  The path to this file should be listed in the `jobInit` property of the\n  sasjsconfig file.\n\n  <h4> SAS Includes </h4>\n  @li test.sas TEST\n\n  <h4> SAS Macros </h4>\n  @li examplemacro.sas\n\n**/\n\n%example(Job Init is executing!)\n\n%let mylib=WORK;";
+var fakeInit = "/**\n  @file serviceinit.sas\n  @brief this file is called with every service\n  @details  This file is included in *every* service, *after* the macros and *before* the service code.\n\n  ".concat(utils_1.DependencyHeader.Macro, "\n  @li mf_abort.sas\n\n**/\n\noptions\n  DATASTMTCHK=ALLKEYWORDS /* some sites have this enabled */\n  PS=MAX /* reduce log size slightly */\n;\n%put service is starting!!;");
+var fakeTerm = "/**\n  @file serviceterm.sas\n  @brief this file is called at the end of every service\n  @details  This file is included at the *end* of every service.\n\n  ".concat(utils_1.DependencyHeader.Macro, "\n  @li mf_abort.sas\n  @li mf_existds.sas\n\n**/\n\n%put service is finishing.  Thanks, SASjs!;");
+var fakeInit2 = "/**\n  @file serviceinit.sas\n  @brief this file is called with every service\n  @details  This file is included in *every* service, *after* the macros and *before* the service code.\n\n  ".concat(utils_1.DependencyHeader.Macro, "\n  @li mf_abort.sas\n\n**/\n\noptions\n  DATASTMTCHK=ALLKEYWORDS /* some sites have this enabled */\n  PS=MAX /* reduce log size slightly */\n;\n%put service is starting!!;");
+var fakeTerm2 = "/**\n  @file serviceterm.sas\n  @brief this file is called at the end of every service\n  @details  This file is included at the *end* of every service.\n\n  ".concat(utils_1.DependencyHeader.Macro, "\n  @li mf_abort.sas\n  @li mf_existds.sas\n\n**/\n\n%put service is finishing.  Thanks, SASjs!;");
+var fakeJobInit = "/**\n  @file\n  @brief This code is inserted into the beginning of each Viya Job.\n  @details Inserted during the `sasjs compile` step.  Add any code here that\n  should go at the beginning of every deployed job.\n\n  The path to this file should be listed in the `jobInit` property of the\n  sasjsconfig file.\n\n  ".concat(utils_1.DependencyHeader.DeprecatedInclude, "\n  @li test.sas TEST\n\n  ").concat(utils_1.DependencyHeader.Macro, "\n  @li examplemacro.sas\n\n**/\n\n%example(Job Init is executing!)\n\n%let mylib=WORK;");
+var fakeJobInit2 = "/**\n  @file\n  @brief This code is inserted into the beginning of each Viya Job.\n  @details Inserted during the `sasjs compile` step.  Add any code here that\n  should go at the beginning of every deployed job.\n\n  The path to this file should be listed in the `jobInit` property of the\n  sasjsconfig file.\n\n  ".concat(utils_1.DependencyHeader.Include, "\n  @li test.sas TEST\n\n  ").concat(utils_1.DependencyHeader.Macro, "\n  @li examplemacro.sas\n\n**/\n\n%example(Job Init is executing!)\n\n%let mylib=WORK;");
 var fakeProgramLines = [
     'filename TEST temp;',
     'data _null_;',
@@ -132,17 +133,22 @@ describe('loadDependencies', function () {
         macroVars: {}
     }, utils_1.ServerType.SasViya);
     var target = new utils_1.Target(__assign(__assign({}, temp.toJson()), { jobConfig: jobConfig(false), serviceConfig: serviceConfig(false) }));
+    var compileTree;
     beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, test_1.createTestMinimalApp)(__dirname, target.name)];
+                case 0: return [4 /*yield*/, (0, utils_2.setConstants)()];
                 case 1:
+                    _a.sent();
+                    compileTree = (0, loadDependencies_1.getCompileTree)(target);
+                    return [4 /*yield*/, (0, test_1.createTestMinimalApp)(__dirname, target.name)];
+                case 2:
                     _a.sent();
                     return [4 /*yield*/, (0, test_1.updateConfig)({
                             jobConfig: jobConfig(),
                             serviceConfig: serviceConfig()
                         })];
-                case 2:
+                case 3:
                     _a.sent();
                     return [2 /*return*/];
             }
@@ -158,13 +164,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test('it should load dependencies for a service with <h4> Dependencies </h4>', function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load dependencies for a service with ".concat(utils_1.DependencyHeader.DeprecatedMacro), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeInit, fakeTerm);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.service)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.service, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));
@@ -178,13 +184,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test('it should load dependencies for a job <h4> SAS Macros </h4>', function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load dependencies for a job ".concat(utils_1.DependencyHeader.Macro), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeInit, fakeTerm);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.job)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.job, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -198,13 +204,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test('it should load dependencies for a service with <h4> SAS MAcros </h4>', function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load dependencies for a service with ".concat(utils_1.DependencyHeader.Macro), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeInit2, fakeTerm2);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.service)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.service, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));
@@ -218,13 +224,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test('it should load dependencies for a job <h4> SAS MAcros </h4>', function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load dependencies for a job ".concat(utils_1.DependencyHeader.Macro), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeInit2, fakeTerm2);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.job)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.job, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -238,13 +244,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test('it should load programs for a service with <h4> SAS Programs </h4>', function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load programs for a service with ".concat(utils_1.DependencyHeader.DeprecatedInclude), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeJobInit, fakeTerm);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));
@@ -258,13 +264,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test('it should load programs for a job <h4> SAS Programs </h4>', function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load programs for a job ".concat(utils_1.DependencyHeader.DeprecatedInclude), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeJobInit, fakeTerm);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -278,13 +284,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test('it should load programs for a service with <h4> SAS Includes </h4>', function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load programs for a service with ".concat(utils_1.DependencyHeader.Include), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeJobInit2, fakeTerm2);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));
@@ -298,13 +304,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test('it should load programs for a job <h4> SAS Includes </h4>', function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load programs for a job ".concat(utils_1.DependencyHeader.Include), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeJobInit2, fakeTerm2);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -318,13 +324,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test("it should load dependencies for a job having jobInit's <h4> SAS Programs </h4>", function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load dependencies for a job having jobInit's ".concat(utils_1.DependencyHeader.DeprecatedInclude), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeJobInit, fakeTerm2);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -341,13 +347,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test("it should load dependencies for a job having jobTerm's <h4> SAS Programs </h4>", function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load dependencies for a job having jobTerm's ".concat(utils_1.DependencyHeader.DeprecatedInclude), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeInit2, fakeJobInit);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -363,13 +369,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test("it should load dependencies for a service having serviceInit's <h4> SAS Programs </h4>", function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load dependencies for a service having serviceInit's ".concat(utils_1.DependencyHeader.DeprecatedInclude), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeJobInit, fakeTerm2);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));
@@ -386,13 +392,13 @@ describe('loadDependencies', function () {
             }
         });
     }); });
-    test("it should load dependencies for a service having serviceTerm's <h4> SAS Programs </h4>", function () { return __awaiter(void 0, void 0, void 0, function () {
+    test("it should load dependencies for a service having serviceTerm's ".concat(utils_1.DependencyHeader.DeprecatedInclude), function () { return __awaiter(void 0, void 0, void 0, function () {
         var dependencies;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     (0, getInitTerm_1.mockGetProgram)(internalModule, fakeInit2, fakeJobInit);
-                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service)];
+                    return [4 /*yield*/, (0, loadDependencies_1.loadDependencies)(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service, compileTree)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));

package/build/commands/docs/generateDocs.js

@@ -84,7 +84,6 @@ var utils_1 = require("@sasjs/utils");
 var getFoldersForDocs_1 = require("./internal/getFoldersForDocs");
 var createDotFiles_1 = require("./internal/createDotFiles");
 var getDocConfig_1 = require("./internal/getDocConfig");
-var utils_2 = require("../../utils");
 /**
  * Generates documentation(Doxygen)
  * By default the docs will be at 'sasjsbuild/docs' folder
@@ -188,16 +187,13 @@ function generateDocs(target, config, outDirectory) {
 exports.generateDocs = generateDocs;
 function setVariableCmd(params) {
     var command = '';
-    var isWin = (0, utils_2.isWindows)();
-    if (isWin) {
-        for (var param in params) {
+    if ((0, utils_1.isWindows)()) {
+        for (var param in params)
             command += "set ".concat(param, "=").concat(params[param], " && ");
-        }
     }
     else {
-        for (var param in params) {
+        for (var param in params)
             command += "".concat(param, "='").concat(params[param], "' ");
-        }
     }
     return command;
 }

package/build/commands/docs/internal/getFileInputs.js

@@ -9,7 +9,7 @@ var utils_1 = require("@sasjs/utils");
  * @param {Map} paramNodes- Map for params(Inputs/Outputs)
  */
 function getFileInputs(fileName, fileContent, paramNodes) {
-    var fileInputs = (0, utils_1.getList)('<h4> Data Inputs </h4>', fileContent)
+    var fileInputs = (0, utils_1.getList)(utils_1.DependencyHeader.DataInput, fileContent)
         .map(function (input) { return input.toUpperCase(); })
         .filter(function (input) { return !input.endsWith('.DLL'); });
     fileInputs.forEach(function (inputParam) {

package/build/commands/docs/internal/getFileOutputs.js

@@ -8,7 +8,7 @@ var utils_1 = require("@sasjs/utils");
  * @param {Map} paramNodes- Map for params(Inputs/Outputs)
  */
 function getFileOutputs(fileContent, paramNodes) {
-    var fileOutputs = (0, utils_1.getList)('<h4> Data Outputs </h4>', fileContent)
+    var fileOutputs = (0, utils_1.getList)(utils_1.DependencyHeader.DataOutput, fileContent)
         .map(function (output) { return output.toUpperCase(); })
         .filter(function (output) { return !output.endsWith('.DLL'); });
     fileOutputs.forEach(function (outputParam) {

package/build/utils/spec/removeComments.spec.d.ts

@@ -1 +1 @@
-export declare const sampleSasProgram = "/**\n  @file mv_createfolder.sas\n  @brief Creates a viya folder if that foloder does not already exist\n  @details Expects oauth token in a global macro variable (default\n    ACCESS_TOKEN).\n\n    options mprint;\n    %mv_createfolder(path=/Public)\n\n\n  @param path= The full path of the folder to be created\n  @param access_token_var= The global macro variable to contain the access token\n  @param grant_type= valid values are \"password\" or \"authorization_code\" (unquoted).\n    The default is authorization_code.\n\n\n  @version VIYA V.03.04\n  @author Allan Bowe\n  @source https://github.com/sasjs/core\n\n  <h4> SAS Macros </h4>\n  @li mf_abort.sas\n  @li mf_getuniquefileref.sas\n  @li mf_getuniquelibref.sas\n  @li mf_isblank.sas\n\n**/\n\n/* This is a comment\nthat spans\nmultiple lines */\n\n%macro mv_createfolder(path=\n  ,access_token_var=ACCESS_TOKEN\n  ,grant_type=authorization_code\n);";
+export declare const sampleSasProgram: string;

package/build/utils/spec/removeComments.spec.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sampleSasProgram = void 0;
 var utils_1 = require("../utils");
+var utils_2 = require("@sasjs/utils");
 describe('removeComments', function () {
     test('should remove block comment', function () {
         var text = "/* test\n123\n456\n789 */";
@@ -43,4 +44,4 @@ describe('removeComments', function () {
         expect((0, utils_1.removeComments)(text)).toEqual(text);
     });
 });
-exports.sampleSasProgram = "/**\n  @file mv_createfolder.sas\n  @brief Creates a viya folder if that foloder does not already exist\n  @details Expects oauth token in a global macro variable (default\n    ACCESS_TOKEN).\n\n    options mprint;\n    %mv_createfolder(path=/Public)\n\n\n  @param path= The full path of the folder to be created\n  @param access_token_var= The global macro variable to contain the access token\n  @param grant_type= valid values are \"password\" or \"authorization_code\" (unquoted).\n    The default is authorization_code.\n\n\n  @version VIYA V.03.04\n  @author Allan Bowe\n  @source https://github.com/sasjs/core\n\n  <h4> SAS Macros </h4>\n  @li mf_abort.sas\n  @li mf_getuniquefileref.sas\n  @li mf_getuniquelibref.sas\n  @li mf_isblank.sas\n\n**/\n\n/* This is a comment\nthat spans\nmultiple lines */\n\n%macro mv_createfolder(path=\n  ,access_token_var=ACCESS_TOKEN\n  ,grant_type=authorization_code\n);";
+exports.sampleSasProgram = "/**\n  @file mv_createfolder.sas\n  @brief Creates a viya folder if that foloder does not already exist\n  @details Expects oauth token in a global macro variable (default\n    ACCESS_TOKEN).\n\n    options mprint;\n    %mv_createfolder(path=/Public)\n\n\n  @param path= The full path of the folder to be created\n  @param access_token_var= The global macro variable to contain the access token\n  @param grant_type= valid values are \"password\" or \"authorization_code\" (unquoted).\n    The default is authorization_code.\n\n\n  @version VIYA V.03.04\n  @author Allan Bowe\n  @source https://github.com/sasjs/core\n\n  ".concat(utils_2.DependencyHeader.Macro, "\n  @li mf_abort.sas\n  @li mf_getuniquefileref.sas\n  @li mf_getuniquelibref.sas\n  @li mf_isblank.sas\n\n**/\n\n/* This is a comment\nthat spans\nmultiple lines */\n\n%macro mv_createfolder(path=\n  ,access_token_var=ACCESS_TOKEN\n  ,grant_type=authorization_code\n);");

package/build/utils/utils.d.ts

@@ -34,5 +34,4 @@ export declare function getAdapterInstance(target: Target): SASjs;
 export declare function displaySasjsRunnerError(username: string): void;
 export declare const loadEnvVariables: (fileName: string) => Promise<void>;
 export declare function prefixAppLoc(appLoc?: string, path?: string): string | null;
-export declare const isWindows: () => boolean;
 export declare const terminateProcess: (status: number) => never;

package/build/utils/utils.js

@@ -86,7 +86,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.terminateProcess = exports.isWindows = exports.prefixAppLoc = exports.loadEnvVariables = exports.displaySasjsRunnerError = exports.getAdapterInstance = exports.checkNodeVersion = exports.millisecondsToDdHhMmSs = exports.arrToObj = exports.parseLogLines = exports.executeShellScript = exports.getUniqServicesObj = exports.removeComments = exports.setupDoxygen = exports.setupGhooks = exports.setupGitIgnore = exports.setupNpmProject = exports.createTemplateApp = exports.createMinimalApp = exports.createAngularApp = exports.createReactApp = exports.diff = exports.inExistingProject = void 0;
+exports.terminateProcess = exports.prefixAppLoc = exports.loadEnvVariables = exports.displaySasjsRunnerError = exports.getAdapterInstance = exports.checkNodeVersion = exports.millisecondsToDdHhMmSs = exports.arrToObj = exports.parseLogLines = exports.executeShellScript = exports.getUniqServicesObj = exports.removeComments = exports.setupDoxygen = exports.setupGhooks = exports.setupGitIgnore = exports.setupNpmProject = exports.createTemplateApp = exports.createMinimalApp = exports.createAngularApp = exports.createReactApp = exports.diff = exports.inExistingProject = void 0;
 var shelljs_1 = __importDefault(require("shelljs"));
 var path_1 = __importDefault(require("path"));
 var ora_1 = __importDefault(require("ora"));
@@ -414,7 +414,7 @@ function executeShellScript(filePath, logFilePath) {
                     return __generator(this, function (_b) {
                         switch (_b.label) {
                             case 0:
-                                shellCommand = (0, exports.isWindows)() ? "sh ".concat(filePath) : "bash ".concat(filePath);
+                                shellCommand = (0, utils_1.isWindows)() ? "sh ".concat(filePath) : "bash ".concat(filePath);
                                 result = shelljs_1.default.exec(shellCommand, { silent: true });
                                 if (!result.code) return [3 /*break*/, 1];
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("Error: ".concat(result.stderr));
@@ -555,8 +555,6 @@ function prefixAppLoc(appLoc, path) {
         .join(' ');
 }
 exports.prefixAppLoc = prefixAppLoc;
-var isWindows = function () { return process.platform === 'win32'; };
-exports.isWindows = isWindows;
 var terminateProcess = function (status) {
     var _a;
     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Process will be terminated with the status code ".concat(status, "."));

package/package.json

@@ -50,7 +50,7 @@
     "@sasjs/adapter": "^3.7.14",
     "@sasjs/core": "4.15.3",
     "@sasjs/lint": "1.11.2",
-    "@sasjs/utils": "2.36.0",
+    "@sasjs/utils": "2.38.1",
     "chalk": "4.1.2",
     "csv-stringify": "5.6.5",
     "dotenv": "10.0.0",
@@ -94,5 +94,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.9.0"
+  "version": "3.10.0"
 }