@sasjs/cli 3.8.9 → 3.10.1

package/build/commands/build/build.js

@@ -113,78 +113,66 @@ function build(target) {
 }
 exports.build = build;
 function createFinalSasFiles(target) {
-    var _a;
+    var _a, _b, _c, _d, _e, _f, _g;
     return __awaiter(this, void 0, void 0, function () {
-        var streamConfig;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var streamConfig, streamWeb, buildConfig, serverType, name, macroFolders, buildOutputFileName, buildDestinationFolder, finalSasFileContent, finalFilePath, finalFilePathJSON, buildInfo, buildInit, buildTerm, macroCorePath, dependencyFilePaths, dependenciesContent, _h, folderContent, folderContentJSON;
+        return __generator(this, function (_j) {
+            switch (_j.label) {
                 case 0:
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info('Creating output SAS and JSON files.');
                     return [4 /*yield*/, (0, config_1.getStreamConfig)(target)];
                 case 1:
-                    streamConfig = _b.sent();
-                    return [4 /*yield*/, createFinalSasFile(target, streamConfig)];
-                case 2:
-                    _b.sent();
-                    return [2 /*return*/];
-            }
-        });
-    });
-}
-function createFinalSasFile(target, streamConfig) {
-    var _a, _b, _c, _d, _e, _f;
-    return __awaiter(this, void 0, void 0, function () {
-        var streamWeb, buildConfig, serverType, name, macroFolders, buildOutputFileName, buildDestinationFolder, finalSasFileContent, finalFilePath, finalFilePathJSON, buildInfo, buildInit, buildTerm, macroCorePath, dependencyFilePaths, dependenciesContent, _g, folderContent, folderContentJSON;
-        return __generator(this, function (_h) {
-            switch (_h.label) {
-                case 0:
-                    streamWeb = (_a = streamConfig.streamWeb) !== null && _a !== void 0 ? _a : false;
+                    streamConfig = _j.sent();
+                    streamWeb = (_b = streamConfig.streamWeb) !== null && _b !== void 0 ? _b : false;
                     buildConfig = target.buildConfig, serverType = target.serverType, name = target.name;
                     return [4 /*yield*/, (0, config_1.getMacroFolders)(target)];
-                case 1:
-                    macroFolders = _h.sent();
-                    buildOutputFileName = (_b = buildConfig === null || buildConfig === void 0 ? void 0 : buildConfig.buildOutputFileName) !== null && _b !== void 0 ? _b : "".concat(name, ".sas");
+                case 2:
+                    macroFolders = _j.sent();
+                    buildOutputFileName = (_c = buildConfig === null || buildConfig === void 0 ? void 0 : buildConfig.buildOutputFileName) !== null && _c !== void 0 ? _c : "".concat(name, ".sas");
                     buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
                     finalSasFileContent = '';
                     finalFilePath = path_1.default.join(buildDestinationFolder, buildOutputFileName);
                     finalFilePathJSON = path_1.default.join(buildDestinationFolder, "".concat(name, ".json"));
                     return [4 /*yield*/, getBuildInfo(target, streamWeb)];
-                case 2:
-                    buildInfo = _h.sent();
+                case 3:
+                    buildInfo = _j.sent();
                     finalSasFileContent += "\n".concat(buildInfo);
                     return [4 /*yield*/, (0, config_2.getBuildInit)(target)];
-                case 3:
-                    buildInit = _h.sent();
-                    return [4 /*yield*/, (0, config_2.getBuildTerm)(target)];
                 case 4:
-                    buildTerm = _h.sent();
+                    buildInit = _j.sent();
+                    return [4 /*yield*/, (0, config_2.getBuildTerm)(target)];
+                case 5:
+                    buildTerm = _j.sent();
                     macroCorePath = (0, config_1.getMacroCorePath)();
                     return [4 /*yield*/, (0, utils_1.getDependencyPaths)("".concat(buildTerm, "\n").concat(buildInit), macroFolders, macroCorePath)];
-                case 5:
-                    dependencyFilePaths = _h.sent();
-                    return [4 /*yield*/, getDependencies(dependencyFilePaths)];
                 case 6:
-                    dependenciesContent = _h.sent();
+                    dependencyFilePaths = _j.sent();
+                    return [4 /*yield*/, getDependencies(dependencyFilePaths)];
+                case 7:
+                    dependenciesContent = _j.sent();
                     finalSasFileContent += "\n".concat(dependenciesContent, "\n\n").concat(buildInit, "\n");
                     return [4 /*yield*/, getFolderContent(serverType)];
-                case 7:
-                    _g = _h.sent(), folderContent = _g.folderContent, folderContentJSON = _g.folderContentJSON;
+                case 8:
+                    _h = _j.sent(), folderContent = _h.folderContent, folderContentJSON = _h.folderContentJSON;
                     finalSasFileContent += "\n".concat(folderContent);
                     finalSasFileContent += "\n".concat(buildTerm);
                     if (streamWeb) {
-                        finalSasFileContent += (0, getLaunchPageCode_1.getLaunchPageCode)(target.serverType, streamConfig.streamServiceName);
+                        if (target.serverType === utils_1.ServerType.SasViya ||
+                            target.serverType === utils_1.ServerType.Sas9) {
+                            finalSasFileContent += (0, getLaunchPageCode_1.getLaunchPageCode)(target.serverType, streamConfig.streamServiceName);
+                        }
                     }
                     finalSasFileContent = (0, utils_2.removeComments)(finalSasFileContent);
-                    (_c = process.logger) === null || _c === void 0 ? void 0 : _c.debug("Creating file ".concat(finalFilePath, " ."));
+                    (_d = process.logger) === null || _d === void 0 ? void 0 : _d.debug("Creating file ".concat(finalFilePath, " ."));
                     return [4 /*yield*/, (0, utils_1.createFile)(finalFilePath, finalSasFileContent)];
-                case 8:
-                    _h.sent();
-                    (_d = process.logger) === null || _d === void 0 ? void 0 : _d.success("File ".concat(finalFilePath, " has been created."));
-                    (_e = process.logger) === null || _e === void 0 ? void 0 : _e.debug("Creating file ".concat(finalFilePathJSON, " ."));
-                    return [4 /*yield*/, (0, utils_1.createFile)(finalFilePathJSON, JSON.stringify(folderContentJSON, null, 1))];
                 case 9:
-                    _h.sent();
-                    (_f = process.logger) === null || _f === void 0 ? void 0 : _f.success("File ".concat(finalFilePathJSON, " has been created."));
+                    _j.sent();
+                    (_e = process.logger) === null || _e === void 0 ? void 0 : _e.success("File ".concat(finalFilePath, " has been created."));
+                    (_f = process.logger) === null || _f === void 0 ? void 0 : _f.debug("Creating file ".concat(finalFilePathJSON, " ."));
+                    return [4 /*yield*/, (0, utils_1.createFile)(finalFilePathJSON, JSON.stringify(folderContentJSON, null, 1))];
+                case 10:
+                    _j.sent();
+                    (_g = process.logger) === null || _g === void 0 ? void 0 : _g.success("File ".concat(finalFilePathJSON, " has been created."));
                     return [2 /*return*/];
             }
         });

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,17 +138,20 @@ 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:
                     _c.sent();
                     _c.label = 11;
-                case 11: return [4 /*yield*/, (0, compileTestFile_1.compileTestFlow)(target).catch(function (err) { var _a; return (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Test flow compilation has failed.'); })];
+                case 11: return [4 /*yield*/, compileTree.saveTree()];
                 case 12:
                     _c.sent();
-                    return [4 /*yield*/, compileWeb(target)];
+                    return [4 /*yield*/, (0, compileTestFile_1.compileTestFlow)(target).catch(function (err) { var _a; return (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Test flow compilation has failed.'); })];
                 case 13:
+                    _c.sent();
+                    return [4 /*yield*/, compileWeb(target)];
+                case 14:
                     _c.sent();
                     return [2 /*return*/];
             }
@@ -221,7 +226,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;
@@ -249,20 +254,20 @@ function compileJobsServicesTests(target) {
                 case 6:
                     testTearDown = _b.sent();
                     if (!testSetUp) return [3 /*break*/, 8];
-                    return [4 /*yield*/, (0, compileTestFile_1.compileTestFile)(target, testSetUp, '', true, false).catch(function (err) { var _a; return (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Test set up compilation has failed.'); })];
+                    return [4 /*yield*/, (0, compileTestFile_1.compileTestFile)(target, testSetUp, '', true, false, compileTree).catch(function (err) { var _a; return (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Test set up compilation has failed.'); })];
                 case 7:
                     _b.sent();
                     _b.label = 8;
                 case 8:
                     if (!testTearDown) return [3 /*break*/, 10];
-                    return [4 /*yield*/, (0, compileTestFile_1.compileTestFile)(target, testTearDown, '', true, false).catch(function (err) { var _a; return (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Test tear down compilation has failed.'); })];
+                    return [4 /*yield*/, (0, compileTestFile_1.compileTestFile)(target, testTearDown, '', true, false, compileTree).catch(function (err) { var _a; return (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Test tear down compilation has failed.'); })];
                 case 9:
                     _b.sent();
                     _b.label = 10;
                 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 +279,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 +324,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) {
@@ -338,11 +343,11 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
                                 case 0:
                                     filePath = path_1.default.join(destinationPath, fileName);
                                     if (!(0, utils_1.isTestFile)(filePath)) return [3 /*break*/, 2];
-                                    return [4 /*yield*/, (0, compileTestFile_1.compileTestFile)(target, filePath, '', false)];
+                                    return [4 /*yield*/, (0, compileTestFile_1.compileTestFile)(target, filePath, '', false, undefined, compileTree)];
                                 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;
@@ -366,11 +371,11 @@ var compileServiceFolder = function (target, serviceFolder, macroFolders, progra
                                                     case 0:
                                                         filePath = path_1.default.join(destinationPath, subFolder, fileName);
                                                         if (!(0, utils_1.isTestFile)(filePath)) return [3 /*break*/, 2];
-                                                        return [4 /*yield*/, (0, compileTestFile_1.compileTestFile)(target, filePath, '', false)];
+                                                        return [4 /*yield*/, (0, compileTestFile_1.compileTestFile)(target, filePath, '', false, undefined, compileTree)];
                                                     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 +391,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) {
@@ -409,11 +415,11 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
                                 case 0:
                                     filePath = path_1.default.join(destinationPath, fileName);
                                     if (!(0, utils_1.isTestFile)(fileName)) return [3 /*break*/, 2];
-                                    return [4 /*yield*/, (0, compileTestFile_1.compileTestFile)(target, filePath, '', false)];
+                                    return [4 /*yield*/, (0, compileTestFile_1.compileTestFile)(target, filePath, '', false, undefined, compileTree)];
                                 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;
@@ -437,11 +443,11 @@ var compileJobFolder = function (target, jobFolder, macroFolders, programFolders
                                                     case 0:
                                                         filePath = path_1.default.join(destinationPath, subFolder, fileName);
                                                         if (!(0, utils_1.isTestFile)(filePath)) return [3 /*break*/, 2];
-                                                        return [4 /*yield*/, (0, compileTestFile_1.compileTestFile)(target, filePath, '', false)];
+                                                        return [4 /*yield*/, (0, compileTestFile_1.compileTestFile)(target, filePath, '', false, undefined, compileTree)];
                                                     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,22 +112,26 @@ 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];
                 case 15: return [3 /*break*/, 16];
-                case 16: return [2 /*return*/, { destinationPath: destinationPath }];
+                case 16: return [4 /*yield*/, compileTree.saveTree()];
+                case 17:
+                    _c.sent();
+                    return [2 /*return*/, { destinationPath: destinationPath }];
             }
         });
     });

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.d.ts

@@ -1,6 +1,6 @@
 import { TestFlow } from '../../../types';
-import { Target, Configuration } from '@sasjs/utils';
-export declare function compileTestFile(target: Target, filePath: string, testVar?: string, saveToRoot?: boolean, removeOriginalFile?: boolean): Promise<void>;
+import { Target, Configuration, CompileTree } from '@sasjs/utils';
+export declare function compileTestFile(target: Target, filePath: string, testVar: string | undefined, saveToRoot: boolean | undefined, removeOriginalFile: boolean | undefined, compileTree: CompileTree): Promise<void>;
 export declare function moveTestFile(filePath: string): Promise<void>;
 export declare function copyTestMacroFiles(folderAbsolutePath: string): Promise<void>;
 export declare const compileTestFlow: (target: Target, config?: Configuration | undefined) => Promise<TestFlow | undefined>;

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

@@ -77,7 +77,7 @@ var testsBuildFolder = function () {
     return path_1.default.join(process.projectDir, 'sasjsbuild', 'tests');
 };
 var getFileName = function (filePath) { return path_1.default.parse(filePath).base; };
-function compileTestFile(target, filePath, testVar, saveToRoot, removeOriginalFile) {
+function compileTestFile(target, filePath, testVar, saveToRoot, removeOriginalFile, compileTree) {
     if (testVar === void 0) { testVar = ''; }
     if (saveToRoot === void 0) { saveToRoot = true; }
     if (removeOriginalFile === void 0) { removeOriginalFile = true; }
@@ -93,7 +93,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\n\n%put testing, init;\n* TestInit end;");
+                                        testTerm = replaceLineBreaks("* TestTerm start;\n\n\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)];