@sasjs/cli 4.0.3 → 4.0.5

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

@@ -469,6 +469,7 @@ describe('sasjs compile outside project', function () {
             });
         }); });
         beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
+            var configuration;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -482,12 +483,16 @@ describe('sasjs compile outside project', function () {
                     case 1:
                         _a.sent();
                         process.projectDir = '';
-                        return [4 /*yield*/, (0, utils_2.setConstants)()];
+                        return [4 /*yield*/, (0, config_1.getGlobalRcFile)()];
                     case 2:
+                        configuration = _a.sent();
+                        return [4 /*yield*/, (0, utils_2.setConstants)(false, undefined, configuration)];
+                    case 3:
                         _a.sent();
+                        process.sasjsConfig = configuration;
                         process.currentDir = path_1.default.join(__dirname, appName);
                         return [4 /*yield*/, (0, utils_1.createFolder)(process.currentDir)];
-                    case 3:
+                    case 4:
                         _a.sent();
                         return [2 /*return*/];
                 }
@@ -541,19 +546,17 @@ describe('sasjs compile outside project', function () {
                             '-s',
                             '../services/example1.sas'
                         ]);
-                        return [4 /*yield*/, command.output];
-                    case 1:
-                        output = _a.sent();
+                        output = command.output;
                         return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)(undefined, 'service', command.source, output)).resolves.toEqual({
                                 destinationPath: destinationPath
                             })];
-                    case 2:
+                    case 1:
                         _a.sent();
                         return [4 /*yield*/, expect((0, utils_1.fileExists)(destinationPath)).resolves.toEqual(true)];
-                    case 3:
+                    case 2:
                         _a.sent();
                         return [4 /*yield*/, (0, utils_1.readFile)(destinationPath)];
-                    case 4:
+                    case 3:
                         compiledContent = _a.sent();
                         macrosToTest = [
                             'mf_nobs',
@@ -561,7 +564,7 @@ describe('sasjs compile outside project', function () {
                             'yetanothermacro'
                         ];
                         return [4 /*yield*/, (0, test_1.verifyCompiledService)(compiledContent, macrosToTest, false, false)];
-                    case 5:
+                    case 4:
                         _a.sent();
                         return [2 /*return*/];
                 }
@@ -619,7 +622,7 @@ describe('sasjs compile outside project', function () {
             });
         }); });
         it('should fail to compile single file', function () { return __awaiter(void 0, void 0, void 0, function () {
-            var buildOutputFolder, dependencies, command, output;
+            var buildOutputFolder, dependencies, configuration, command, output;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -631,6 +634,10 @@ describe('sasjs compile outside project', function () {
                             }, false)];
                     case 1:
                         _a.sent();
+                        return [4 /*yield*/, (0, config_1.getGlobalRcFile)()];
+                    case 2:
+                        configuration = _a.sent();
+                        process.sasjsConfig = configuration;
                         command = new compileCommand_1.CompileCommand([
                             'node',
                             'sasjs',
@@ -640,17 +647,17 @@ describe('sasjs compile outside project', function () {
                             '../services/example1.sas'
                         ]);
                         return [4 /*yield*/, command.output];
-                    case 2:
+                    case 3:
                         output = _a.sent();
                         return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)(undefined, 'service', command.source, output)).rejects.toEqual("Unable to locate dependencies: ".concat(dependencies.join(', ')))];
-                    case 3:
+                    case 4:
                         _a.sent();
                         return [2 /*return*/];
                 }
             });
         }); });
-        it('should compile single file at absolute path in global config.buildConfig.buildOutputFolder', function () { return __awaiter(void 0, void 0, void 0, function () {
-            var buildOutputFolder, destinationPath, command, output, compiledContent, macrosToTest;
+        it('should compile single file at absolute path in global config.sasjsBuildFolder', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var buildOutputFolder, destinationPath, configuration, command, output, compiledContent, macrosToTest;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -663,8 +670,11 @@ describe('sasjs compile outside project', function () {
                             }, false)];
                     case 1:
                         _a.sent();
-                        return [4 /*yield*/, (0, utils_2.setConstants)()];
+                        return [4 /*yield*/, (0, config_1.getGlobalRcFile)()];
                     case 2:
+                        configuration = _a.sent();
+                        return [4 /*yield*/, (0, utils_2.setConstants)(false, undefined, configuration)];
+                    case 3:
                         _a.sent();
                         command = new compileCommand_1.CompileCommand([
                             'node',
@@ -675,18 +685,18 @@ describe('sasjs compile outside project', function () {
                             '../services/example1.sas'
                         ]);
                         return [4 /*yield*/, command.output];
-                    case 3:
+                    case 4:
                         output = _a.sent();
                         return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)(undefined, 'service', command.source, output)).resolves.toEqual({
                                 destinationPath: destinationPath
                             })];
-                    case 4:
+                    case 5:
                         _a.sent();
                         return [4 /*yield*/, expect((0, utils_1.fileExists)(destinationPath)).resolves.toEqual(true)];
-                    case 5:
+                    case 6:
                         _a.sent();
                         return [4 /*yield*/, (0, utils_1.readFile)(destinationPath)];
-                    case 6:
+                    case 7:
                         compiledContent = _a.sent();
                         macrosToTest = [
                             'mf_nobs',
@@ -694,14 +704,14 @@ describe('sasjs compile outside project', function () {
                             'yetanothermacro'
                         ];
                         return [4 /*yield*/, (0, test_1.verifyCompiledService)(compiledContent, macrosToTest, false, false)];
-                    case 7:
+                    case 8:
                         _a.sent();
                         return [2 /*return*/];
                 }
             });
         }); });
-        it('should compile single file at relative path in global config.buildConfig.buildOutputFolder', function () { return __awaiter(void 0, void 0, void 0, function () {
-            var buildOutputFolder, destinationPath, command, output, compiledContent, macrosToTest;
+        it('should compile single file at relative path in global config.sasjsBuildFolder', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var buildOutputFolder, destinationPath, configuration, command, output, compiledContent, macrosToTest;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -714,8 +724,11 @@ describe('sasjs compile outside project', function () {
                             }, false)];
                     case 1:
                         _a.sent();
-                        return [4 /*yield*/, (0, utils_2.setConstants)()];
+                        return [4 /*yield*/, (0, config_1.getGlobalRcFile)()];
                     case 2:
+                        configuration = _a.sent();
+                        return [4 /*yield*/, (0, utils_2.setConstants)(false, undefined, configuration)];
+                    case 3:
                         _a.sent();
                         command = new compileCommand_1.CompileCommand([
                             'node',
@@ -726,18 +739,18 @@ describe('sasjs compile outside project', function () {
                             '../services/example1.sas'
                         ]);
                         return [4 /*yield*/, command.output];
-                    case 3:
+                    case 4:
                         output = _a.sent();
                         return [4 /*yield*/, expect((0, compileSingleFile_1.compileSingleFile)(undefined, 'service', command.source, output)).resolves.toEqual({
                                 destinationPath: destinationPath
                             })];
-                    case 4:
+                    case 5:
                         _a.sent();
                         return [4 /*yield*/, expect((0, utils_1.fileExists)(destinationPath)).resolves.toEqual(true)];
-                    case 5:
+                    case 6:
                         _a.sent();
                         return [4 /*yield*/, (0, utils_1.readFile)(destinationPath)];
-                    case 6:
+                    case 7:
                         compiledContent = _a.sent();
                         macrosToTest = [
                             'mf_nobs',
@@ -745,7 +758,7 @@ describe('sasjs compile outside project', function () {
                             'yetanothermacro'
                         ];
                         return [4 /*yield*/, (0, test_1.verifyCompiledService)(compiledContent, macrosToTest, false, false)];
-                    case 7:
+                    case 8:
                         _a.sent();
                         return [2 /*return*/];
                 }
@@ -761,9 +774,10 @@ describe('sasjs compile outside project', function () {
                         return [4 /*yield*/, (0, config_1.saveGlobalRcFile)('')];
                     case 1:
                         _a.sent();
-                        return [4 /*yield*/, (0, utils_2.setConstants)()];
+                        return [4 /*yield*/, (0, utils_2.setConstants)(false)];
                     case 2:
                         _a.sent();
+                        process.sasjsConfig = {};
                         process.projectDir = '';
                         process.currentDir = path_1.default.join(__dirname, appName);
                         return [4 /*yield*/, (0, utils_1.createFolder)(process.currentDir)];

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

@@ -93,9 +93,10 @@ var compileModule = __importStar(require("../compile"));
 var compileSingleFileModule = __importStar(require("../compileSingleFile"));
 var compileCommand_1 = require("../compileCommand");
 var utils_1 = require("@sasjs/utils");
+var utils_2 = require("../../../utils");
 var configUtils = __importStar(require("../../../utils/config"));
+var setConstantsUtils = __importStar(require("../../../utils/setConstants"));
 var command_1 = require("../../../types/command");
-var utils_2 = require("../../../utils");
 var target = new utils_1.Target({
     name: 'test',
     appLoc: '/Public/test/',
@@ -107,7 +108,7 @@ describe('CompileCommand', function () {
     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, utils_2.setConstants)()];
+                case 0: return [4 /*yield*/, (0, utils_2.setConstants)(false)];
                 case 1:
                     _a.sent();
                     return [2 /*return*/];
@@ -229,7 +230,7 @@ describe('CompileCommand', function () {
     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, utils_2.setConstants)()];
+                case 0: return [4 /*yield*/, (0, utils_2.setConstants)(false)];
                 case 1:
                     _a.sent();
                     return [2 /*return*/];
@@ -441,12 +442,19 @@ var setupMocks = function () {
     jest.mock('../compile');
     jest.mock('../compileSingleFile');
     jest.mock('../../../utils/config');
+    jest.mock('../../../utils/setConstants');
     jest
         .spyOn(compileModule, 'compile')
         .mockImplementation(function () { return Promise.resolve(); });
     jest
         .spyOn(configUtils, 'findTargetInConfiguration')
         .mockImplementation(function () { return Promise.resolve({ target: target, isLocal: true }); });
+    jest
+        .spyOn(configUtils, 'getLocalConfig')
+        .mockImplementation(function () { return Promise.resolve({}); });
+    jest
+        .spyOn(setConstantsUtils, 'setConstants')
+        .mockImplementation(function () { return Promise.resolve(); });
     process.logger = new utils_1.Logger(utils_1.LogLevel.Off);
     jest.spyOn(process.logger, 'success');
     jest.spyOn(process.logger, 'error');

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

@@ -140,21 +140,26 @@ describe('loadDependencies', function () {
     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, utils_2.setConstants)()];
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, (0, utils_2.setConstants)(false)];
                 case 1:
-                    _a.sent();
+                    _b.sent();
                     compileTree = (0, loadDependencies_1.getCompileTree)(target);
                     return [4 /*yield*/, (0, test_1.createTestMinimalApp)(__dirname, target.name)];
                 case 2:
-                    _a.sent();
+                    _b.sent();
                     return [4 /*yield*/, (0, test_1.updateConfig)({
                             jobConfig: jobConfig(),
                             serviceConfig: serviceConfig()
                         })];
                 case 3:
-                    _a.sent();
+                    _b.sent();
+                    _a = process;
+                    return [4 /*yield*/, (0, utils_2.getLocalConfig)()];
+                case 4:
+                    _a.sasjsConfig = _b.sent();
                     return [2 /*return*/];
             }
         });

package/build/commands/context/spec/contextCommand.spec.js

@@ -93,6 +93,7 @@ var contextCommand_1 = require("../contextCommand");
 var utils_1 = require("@sasjs/utils");
 var fileModule = __importStar(require("@sasjs/utils/file"));
 var configUtils = __importStar(require("../../../utils/config"));
+var setConstantsUtils = __importStar(require("../../../utils/setConstants"));
 var command_1 = require("../../../types/command");
 var mocks_1 = require("./mocks");
 var defaultArgs = ['node', 'sasjs'];
@@ -964,6 +965,7 @@ var setupMocks = function () {
     jest.mock('../export');
     jest.mock('../list');
     jest.mock('../../../utils/config');
+    jest.mock('../../../utils/setConstants');
     jest
         .spyOn(fileModule, 'readFile')
         .mockImplementation(function () { return Promise.resolve(JSON.stringify(mocks_1.mockContext)); });
@@ -982,9 +984,15 @@ var setupMocks = function () {
     jest
         .spyOn(configUtils, 'findTargetInConfiguration')
         .mockImplementation(function () { return Promise.resolve({ target: target, isLocal: true }); });
+    jest
+        .spyOn(configUtils, 'getLocalConfig')
+        .mockImplementation(function () { return Promise.resolve({}); });
     jest
         .spyOn(configUtils, 'getAuthConfig')
         .mockImplementation(function () { return Promise.resolve(mocks_1.mockAuthConfig); });
+    jest
+        .spyOn(setConstantsUtils, 'setConstants')
+        .mockImplementation(function () { return Promise.resolve(); });
     process.logger = new utils_1.Logger(utils_1.LogLevel.Off);
     jest.spyOn(process.logger, 'success');
     jest.spyOn(process.logger, 'error');

package/build/commands/deploy/internal/getDeployScripts.js

@@ -60,27 +60,16 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDeployScripts = void 0;
-var path_1 = __importDefault(require("path"));
-var config_1 = require("../../../utils/config");
 function getDeployScripts(target) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
-        var buildSourceFolder, configuration, allDeployScripts;
+        var configuration, allDeployScripts;
         return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0:
-                    buildSourceFolder = process.sasjsConstants.buildSourceFolder;
-                    return [4 /*yield*/, (0, config_1.getConfiguration)(path_1.default.join(buildSourceFolder, 'sasjs', 'sasjsconfig.json'))];
-                case 1:
-                    configuration = _c.sent();
-                    allDeployScripts = __spreadArray(__spreadArray([], __read((((_a = configuration === null || configuration === void 0 ? void 0 : configuration.deployConfig) === null || _a === void 0 ? void 0 : _a.deployScripts) || [])), false), __read((((_b = target.deployConfig) === null || _b === void 0 ? void 0 : _b.deployScripts) || [])), false);
-                    return [2 /*return*/, __spreadArray([], __read(new Set(allDeployScripts.filter(function (d) { return !!d; }))), false)];
-            }
+            configuration = process.sasjsConfig;
+            allDeployScripts = __spreadArray(__spreadArray([], __read((((_a = configuration === null || configuration === void 0 ? void 0 : configuration.deployConfig) === null || _a === void 0 ? void 0 : _a.deployScripts) || [])), false), __read((((_b = target.deployConfig) === null || _b === void 0 ? void 0 : _b.deployScripts) || [])), false);
+            return [2 /*return*/, __spreadArray([], __read(new Set(allDeployScripts.filter(function (d) { return !!d; }))), false)];
         });
     });
 }

package/build/commands/deploy/spec/cbd.spec.js

@@ -104,9 +104,9 @@ describe('sasjs cbd with server type SASJS', function () {
         });
     }); });
     it("should deploy compile and build to sasjs/server", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var deployMock, customTarget, macroCorePath, mf_getuser, _a, mp_jsonout, ms_webout, webout, mocksPath, appinitJSPath, getdataJSPath, appinitJSContents, getdataJSContents, depsInserts, appinit, getdata, getCode;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var deployMock, _a, customTarget, macroCorePath, mf_getuser, _b, mp_jsonout, ms_webout, webout, mocksPath, appinitJSPath, getdataJSPath, appinitJSContents, getdataJSContents, depsInserts, appinit, getdata, getCode;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     jest.spyOn(fileModule, 'fileExists').mockImplementation(function (filePath) {
                         if (filePath.endsWith('.zip'))
@@ -130,7 +130,7 @@ describe('sasjs cbd with server type SASJS', function () {
                             }
                         })];
                 case 1:
-                    _b.sent();
+                    _c.sent();
                     return [4 /*yield*/, (0, utils_2.updateLocalTarget)(target.name, {
                             jobConfig: undefined,
                             serviceConfig: undefined,
@@ -140,37 +140,41 @@ describe('sasjs cbd with server type SASJS', function () {
                             }
                         })];
                 case 2:
-                    _b.sent();
-                    return [4 /*yield*/, (0, config_1.findTargetInConfiguration)(target.name, types_1.TargetScope.Local)];
+                    _c.sent();
+                    _a = process;
+                    return [4 /*yield*/, (0, config_1.getLocalConfig)()];
                 case 3:
-                    customTarget = (_b.sent()).target;
-                    return [4 /*yield*/, expect((0, build_1.build)(customTarget)).toResolve()];
+                    _a.sasjsConfig = _c.sent();
+                    return [4 /*yield*/, (0, config_1.findTargetInConfiguration)(target.name, types_1.TargetScope.Local)];
                 case 4:
-                    _b.sent();
-                    return [4 /*yield*/, (0, deploy_1.deploy)(customTarget, true)];
+                    customTarget = (_c.sent()).target;
+                    return [4 /*yield*/, expect((0, build_1.build)(customTarget)).toResolve()];
                 case 5:
-                    _b.sent();
+                    _c.sent();
+                    return [4 /*yield*/, (0, deploy_1.deploy)(customTarget, true)];
+                case 6:
+                    _c.sent();
                     macroCorePath = process.sasjsConstants.macroCorePath;
-                    _a = utils_1.removeHeader;
+                    _b = utils_1.removeHeader;
                     return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/base/mf_getuser.sas"))];
-                case 6:
-                    mf_getuser = _a.apply(void 0, [_b.sent()]);
-                    return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/base/mp_jsonout.sas"))];
                 case 7:
-                    mp_jsonout = _b.sent();
-                    return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/server/ms_webout.sas"))];
+                    mf_getuser = _b.apply(void 0, [_c.sent()]);
+                    return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/base/mp_jsonout.sas"))];
                 case 8:
-                    ms_webout = _b.sent();
+                    mp_jsonout = _c.sent();
+                    return [4 /*yield*/, (0, utils_1.readFile)("".concat(macroCorePath, "/server/ms_webout.sas"))];
+                case 9:
+                    ms_webout = _c.sent();
                     webout = "%macro webout(action,ds,dslabel=,fmt=,missing=NULL,showmeta=NO,maxobs=MAX);\n  %ms_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt\n    ,missing=&missing\n    ,showmeta=&showmeta\n    ,maxobs=&maxobs\n  ) %mend;\n";
                     mocksPath = path_1.default.join(__dirname, appName, 'sasjs', 'mocks');
                     appinitJSPath = path_1.default.join(mocksPath, 'services', 'common', 'appinit.js');
                     getdataJSPath = path_1.default.join(mocksPath, 'services', 'common', 'getdata.js');
                     return [4 /*yield*/, (0, utils_1.readFile)(appinitJSPath)];
-                case 9:
-                    appinitJSContents = _b.sent();
-                    return [4 /*yield*/, (0, utils_1.readFile)(getdataJSPath)];
                 case 10:
-                    getdataJSContents = _b.sent();
+                    appinitJSContents = _c.sent();
+                    return [4 /*yield*/, (0, utils_1.readFile)(getdataJSPath)];
+                case 11:
+                    getdataJSContents = _c.sent();
                     depsInserts = "\n\n* Service Variables start;\n\n\n* Service Variables end;\n* SAS Macros start;\n\n\n\n* SAS Macros end;\n* SAS Includes start;\n\n* SAS Includes end;\n* Binary Files start;\n\n* Binary Files end;\n\n    \n* Service start;\n";
                     appinit = "/**\n  @file appinit.sas\n  @brief Initialisation service - runs on app startup\n  @details  This is always the first service called when the app is opened.\n\n  <h4> SAS Macros </h4>\n\n**/\n\nproc sql;\ncreate table areas as select distinct area\n  from mydb.springs;\n\n%webout(OPEN)\n%webout(OBJ,areas)\n%webout(CLOSE)\n\n";
                     getdata = "/**\n  @file getdata.sas\n  @brief Get Data service - runs on app startup\n  @details  This is always the first service called when the app is opened.\n\n  <h4> SAS Macros </h4>\n\n**/\n\n%webout(FETCH)\n\nproc sql;\ncreate table springs as select * from mydb.springs\n  where area in (select area from work.areas);\n\n%webout(OPEN)\n%webout(OBJ,springs)\n%webout(CLOSE)\n\n";

package/build/commands/deploy/spec/compileBuildDeployCommand.spec.js

@@ -90,8 +90,9 @@ var deployModule = __importStar(require("../deploy"));
 var compileBuildDeployCommand_1 = require("../compileBuildDeployCommand");
 var utils_1 = require("@sasjs/utils");
 var configUtils = __importStar(require("../../../utils/config"));
-var command_1 = require("../../../types/command");
+var setConstantsUtils = __importStar(require("../../../utils/setConstants"));
 var utils_2 = require("../../../utils");
+var command_1 = require("../../../types/command");
 describe('CompileBuildDeployCommand', function () {
     var defaultArgs = ['node', 'sasjs'];
     var target = new utils_1.Target({
@@ -103,7 +104,7 @@ describe('CompileBuildDeployCommand', function () {
     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, utils_2.setConstants)()];
+                case 0: return [4 /*yield*/, (0, utils_2.setConstants)(false)];
                 case 1:
                     _a.sent();
                     return [2 /*return*/];
@@ -126,6 +127,12 @@ describe('CompileBuildDeployCommand', function () {
         jest
             .spyOn(configUtils, 'findTargetInConfiguration')
             .mockImplementation(function () { return Promise.resolve({ target: target, isLocal: true }); });
+        jest
+            .spyOn(configUtils, 'getLocalConfig')
+            .mockImplementation(function () { return Promise.resolve({}); });
+        jest
+            .spyOn(setConstantsUtils, 'setConstants')
+            .mockImplementation(function () { return Promise.resolve(); });
         process.logger = new utils_1.Logger(utils_1.LogLevel.Off);
         jest.spyOn(process.logger, 'success');
         jest.spyOn(process.logger, 'error');

package/build/commands/deploy/spec/deployCommand.spec.js

@@ -88,6 +88,7 @@ var deployModule = __importStar(require("../deploy"));
 var deployCommand_1 = require("../deployCommand");
 var utils_1 = require("@sasjs/utils");
 var configUtils = __importStar(require("../../../utils/config"));
+var setConstantsUtils = __importStar(require("../../../utils/setConstants"));
 var command_1 = require("../../../types/command");
 var defaultArgs = ['node', 'sasjs'];
 var target = new utils_1.Target({
@@ -183,6 +184,12 @@ var setupMocks = function () {
     jest
         .spyOn(configUtils, 'findTargetInConfiguration')
         .mockImplementation(function () { return Promise.resolve({ target: target, isLocal: true }); });
+    jest
+        .spyOn(configUtils, 'getLocalConfig')
+        .mockImplementation(function () { return Promise.resolve({}); });
+    jest
+        .spyOn(setConstantsUtils, 'setConstants')
+        .mockImplementation(function () { return Promise.resolve(); });
     process.logger = new utils_1.Logger(utils_1.LogLevel.Off);
     jest.spyOn(process.logger, 'success');
     jest.spyOn(process.logger, 'error');

package/build/commands/docs/generateDocs.js

@@ -95,7 +95,8 @@ var getDocConfig_1 = require("./internal/getDocConfig");
 function generateDocs(target, config, outDirectory) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
-        var _c, serverUrl, newOutDirectory, enableLineage, doxyContentFromConfig, _d, macroCoreFolders, macroFolders, programFolders, serviceFolders, jobFolders, combinedFolders, PROJECT_NAME, PROJECT_BRIEF, packageJsonContent, packageJson, e_1, doxyContent, doxyParams, doxyConfigPath, spinner, pathExists, _e, stderr, code, foldersListForDot;
+        var _c, serverUrl, newOutDirectory, enableLineage, doxyContentFromConfig, _d, macroCoreFolders, macroFolders, programFolders, serviceFolders, jobFolders, combinedFolders, PROJECT_NAME, PROJECT_BRIEF, packageJsonContent, packageJson, e_1, doxyContent, layoutFilePath, LAYOUT_FILE, doxyParams, doxyConfigPath, spinner, pathExists, _e, stderr, code, foldersListForDot;
+        var _this = this;
         return __generator(this, function (_f) {
             switch (_f.label) {
                 case 0:
@@ -132,6 +133,29 @@ function generateDocs(target, config, outDirectory) {
                     doxyContent = __assign({ favIcon: 'favicon.ico', footer: 'new_footer.html', header: 'new_header.html', layout: 'DoxygenLayout.xml', logo: 'logo.png', readMe: '../../README.md', stylesheet: 'new_stylesheet.css', path: path_1.default.join(process.projectDir, 'sasjs', 'doxy') }, doxyContentFromConfig);
                     if (doxyContentFromConfig === null || doxyContentFromConfig === void 0 ? void 0 : doxyContentFromConfig.path)
                         doxyContent.path = (0, utils_1.getAbsolutePath)(doxyContentFromConfig.path, process.projectDir);
+                    layoutFilePath = path_1.default.join(doxyContent.path, doxyContent.layout);
+                    return [4 /*yield*/, (0, utils_1.readFile)(layoutFilePath).then(function (content) { return __awaiter(_this, void 0, void 0, function () {
+                            var testString, replaced, timeStamp, tmpFilePath;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        if (enableLineage)
+                                            return [2 /*return*/, layoutFilePath
+                                                // if enableLineage is false, create a tmp layout file without lineage tab
+                                            ];
+                                        testString = "<tab type=\"user\" url=\"data_lineage.svg\" title=\"Lineage\"/>";
+                                        replaced = content.replace(testString, '');
+                                        timeStamp = (0, utils_1.generateTimestamp)();
+                                        tmpFilePath = path_1.default.join(doxyContent.path, "".concat(timeStamp, "-DoxygenLayout.xml"));
+                                        return [4 /*yield*/, (0, utils_1.createFile)(tmpFilePath, replaced)];
+                                    case 1:
+                                        _a.sent();
+                                        return [2 /*return*/, tmpFilePath];
+                                }
+                            });
+                        }); })];
+                case 5:
+                    LAYOUT_FILE = _f.sent();
                     doxyParams = setVariableCmd({
                         DOXY_HTML_OUTPUT: newOutDirectory,
                         DOXY_INPUT: "\"".concat(path_1.default.join(doxyContent.path, doxyContent.readMe), "\" ").concat(combinedFolders),
@@ -139,47 +163,59 @@ function generateDocs(target, config, outDirectory) {
                         HTML_EXTRA_STYLESHEET: "\"".concat(path_1.default.join(doxyContent.path, doxyContent.stylesheet), "\""),
                         HTML_FOOTER: path_1.default.join(doxyContent.path, doxyContent.footer),
                         HTML_HEADER: path_1.default.join(doxyContent.path, doxyContent.header),
-                        LAYOUT_FILE: path_1.default.join(doxyContent.path, doxyContent.layout),
+                        LAYOUT_FILE: LAYOUT_FILE,
                         PROJECT_BRIEF: PROJECT_BRIEF,
                         PROJECT_LOGO: path_1.default.join(doxyContent.path, doxyContent.logo),
                         PROJECT_NAME: PROJECT_NAME
                     });
                     return [4 /*yield*/, getDoxyConfigPath(doxyContent.path)];
-                case 5:
+                case 6:
                     doxyConfigPath = _f.sent();
                     (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Using ".concat(doxyConfigPath, " as Doxygen Configuration."));
                     spinner = (0, ora_1.default)(chalk_1.default.greenBright('Generating docs', chalk_1.default.cyanBright(newOutDirectory)));
                     if (process.env.LOG_LEVEL !== utils_1.LogLevel.Debug)
                         spinner.start();
                     return [4 /*yield*/, (0, utils_1.fileExists)(newOutDirectory)];
-                case 6:
+                case 7:
                     pathExists = _f.sent();
-                    if (!pathExists) return [3 /*break*/, 8];
+                    if (!pathExists) return [3 /*break*/, 9];
                     return [4 /*yield*/, (0, utils_1.deleteFolder)(newOutDirectory)];
-                case 7:
+                case 8:
                     _f.sent();
-                    _f.label = 8;
-                case 8: return [4 /*yield*/, (0, utils_1.createFolder)(newOutDirectory)];
-                case 9:
+                    _f.label = 9;
+                case 9: return [4 /*yield*/, (0, utils_1.createFolder)(newOutDirectory)];
+                case 10:
                     _f.sent();
                     _e = shelljs_1.default.exec("".concat(doxyParams, " doxygen \"").concat(doxyConfigPath, "\""), {
                         silent: process.env.LOG_LEVEL !== utils_1.LogLevel.Debug
                     }), stderr = _e.stderr, code = _e.code;
                     if (process.env.LOG_LEVEL !== utils_1.LogLevel.Debug)
                         spinner.stop();
+                    if (!!enableLineage) return [3 /*break*/, 12];
+                    // when enable lineage is false, we are creating a tmp DoxygenLayout.xml file
+                    // this is same a original but just with removed tab for lineage
+                    // therefor, we are removing this tmp file once the shell command for doxygen is completed
+                    return [4 /*yield*/, (0, utils_1.deleteFile)(LAYOUT_FILE)];
+                case 11:
+                    // when enable lineage is false, we are creating a tmp DoxygenLayout.xml file
+                    // this is same a original but just with removed tab for lineage
+                    // therefor, we are removing this tmp file once the shell command for doxygen is completed
+                    _f.sent();
+                    _f.label = 12;
+                case 12:
                     if (code !== 0) {
                         if (stderr.startsWith('error: ')) {
                             throw new Error("\n".concat(stderr));
                         }
                         throw new Error("The Doxygen application is not installed or configured. This external tool is used by 'sasjs doc'.\n".concat(stderr, "\nPlease download and install from here: https://www.doxygen.nl/download.html#srcbin"));
                     }
-                    if (!enableLineage) return [3 /*break*/, 11];
+                    if (!enableLineage) return [3 /*break*/, 14];
                     foldersListForDot = __spreadArray([], __read(new Set(__spreadArray(__spreadArray([], __read(serviceFolders), false), __read(jobFolders), false))), false);
                     return [4 /*yield*/, (0, createDotFiles_1.createDotFiles)(foldersListForDot, newOutDirectory, serverUrl)];
-                case 10:
+                case 13:
                     _f.sent();
-                    _f.label = 11;
-                case 11: return [2 /*return*/, { outDirectory: newOutDirectory }];
+                    _f.label = 14;
+                case 14: return [2 /*return*/, { outDirectory: newOutDirectory }];
             }
         });
     });

package/build/commands/docs/spec/docsCommand.spec.js

@@ -90,6 +90,7 @@ var generateDotModule = __importStar(require("../generateDot"));
 var initDocsModule = __importStar(require("../initDocs"));
 var command_1 = require("../../../types/command");
 var configUtils = __importStar(require("../../../utils/config"));
+var setConstantsUtils = __importStar(require("../../../utils/setConstants"));
 var logger_1 = require("@sasjs/utils/logger");
 var utils_1 = require("@sasjs/utils");
 var target = new utils_1.Target({
@@ -361,4 +362,7 @@ var setupMocks = function () {
     jest
         .spyOn(configUtils, 'getLocalConfig')
         .mockImplementation(function () { return Promise.resolve(config); });
+    jest
+        .spyOn(setConstantsUtils, 'setConstants')
+        .mockImplementation(function () { return Promise.resolve(); });
 };