@sasjs/cli 4.0.4 → 4.0.5

package/build/cli.js

@@ -50,16 +50,13 @@ function cli(args) {
                     _a.sent();
                     return [4 /*yield*/, instantiateLogger()];
                 case 2:
-                    _a.sent();
-                    return [4 /*yield*/, (0, utils_1.setConstants)()];
-                case 3:
                     _a.sent();
                     return [4 /*yield*/, (0, utils_1.loadProjectEnvVariables)()];
-                case 4:
+                case 3:
                     _a.sent();
                     command = (0, parse_1.parse)(args);
                     return [4 /*yield*/, command.execute()];
-                case 5:
+                case 4:
                     returnCode = _a.sent();
                     process.exit(returnCode);
                     return [2 /*return*/];

package/build/commands/add/spec/addCommand.spec.js

@@ -88,6 +88,7 @@ var addCommand_1 = require("../addCommand");
 var addTargetModule = __importStar(require("../addTarget"));
 var addCredentialModule = __importStar(require("../addCredential"));
 var configUtils = __importStar(require("../../../utils/config"));
+var setConstantsUtils = __importStar(require("../../../utils/setConstants"));
 var utils_1 = require("@sasjs/utils");
 var types_1 = require("../../../types");
 var command_1 = require("../../../types/command");
@@ -168,6 +169,12 @@ describe('AddCommand - cred', 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(); });
         jest.spyOn(process.logger, 'success');
         jest.spyOn(process.logger, 'error');
     });

package/build/commands/build/internal/config.js

@@ -35,14 +35,9 @@ 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.getBuildTerm = exports.getBuildInit = void 0;
-var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
-var config_1 = require("../../../utils/config");
 var getBuildInit = function (target) { return __awaiter(void 0, void 0, void 0, function () {
     var buildSourceFolder, buildInitContent, configuration;
     var _a, _b;
@@ -55,16 +50,15 @@ var getBuildInit = function (target) { return __awaiter(void 0, void 0, void 0,
                 return [4 /*yield*/, (0, utils_1.readFile)((0, utils_1.getAbsolutePath)(target.buildConfig.initProgram, buildSourceFolder))];
             case 1:
                 buildInitContent = _c.sent();
-                return [3 /*break*/, 5];
-            case 2: return [4 /*yield*/, (0, config_1.getConfiguration)(path_1.default.join(buildSourceFolder, 'sasjs', 'sasjsconfig.json'))];
-            case 3:
-                configuration = _c.sent();
-                if (!((_b = configuration === null || configuration === void 0 ? void 0 : configuration.buildConfig) === null || _b === void 0 ? void 0 : _b.initProgram)) return [3 /*break*/, 5];
+                return [3 /*break*/, 4];
+            case 2:
+                configuration = process.sasjsConfig;
+                if (!((_b = configuration === null || configuration === void 0 ? void 0 : configuration.buildConfig) === null || _b === void 0 ? void 0 : _b.initProgram)) return [3 /*break*/, 4];
                 return [4 /*yield*/, (0, utils_1.readFile)((0, utils_1.getAbsolutePath)(configuration.buildConfig.initProgram, buildSourceFolder))];
-            case 4:
+            case 3:
                 buildInitContent = _c.sent();
-                _c.label = 5;
-            case 5: return [2 /*return*/, buildInitContent
+                _c.label = 4;
+            case 4: return [2 /*return*/, buildInitContent
                     ? "\n* BuildInit start;\n".concat(buildInitContent, "\n* BuildInit end;")
                     : ''];
         }
@@ -83,16 +77,15 @@ var getBuildTerm = function (target) { return __awaiter(void 0, void 0, void 0,
                 return [4 /*yield*/, (0, utils_1.readFile)((0, utils_1.getAbsolutePath)(target.buildConfig.termProgram, buildSourceFolder))];
             case 1:
                 buildTermContent = _c.sent();
-                return [3 /*break*/, 5];
-            case 2: return [4 /*yield*/, (0, config_1.getConfiguration)(path_1.default.join(buildSourceFolder, 'sasjs', 'sasjsconfig.json'))];
-            case 3:
-                configuration = _c.sent();
-                if (!((_b = configuration === null || configuration === void 0 ? void 0 : configuration.buildConfig) === null || _b === void 0 ? void 0 : _b.termProgram)) return [3 /*break*/, 5];
+                return [3 /*break*/, 4];
+            case 2:
+                configuration = process.sasjsConfig;
+                if (!((_b = configuration === null || configuration === void 0 ? void 0 : configuration.buildConfig) === null || _b === void 0 ? void 0 : _b.termProgram)) return [3 /*break*/, 4];
                 return [4 /*yield*/, (0, utils_1.readFile)((0, utils_1.getAbsolutePath)(configuration.buildConfig.termProgram, buildSourceFolder))];
-            case 4:
+            case 3:
                 buildTermContent = _c.sent();
-                _c.label = 5;
-            case 5: return [2 /*return*/, buildTermContent
+                _c.label = 4;
+            case 4: return [2 /*return*/, buildTermContent
                     ? "\n* BuildTerm start;\n".concat(buildTermContent, "\n* BuildTerm end;")
                     : ''];
         }

package/build/commands/build/spec/buildCommand.spec.js

@@ -88,6 +88,7 @@ var buildModule = __importStar(require("../build"));
 var buildCommand_1 = require("../buildCommand");
 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 utils_2 = require("../../../utils");
 var defaultArgs = ['node', 'sasjs'];
@@ -101,7 +102,7 @@ describe('BuildCommand', 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*/];
@@ -194,6 +195,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/build/spec/compileBuildCommand.spec.js

@@ -89,6 +89,7 @@ var compileModule = __importStar(require("../../compile/compile"));
 var compileBuildCommand_1 = require("../compileBuildCommand");
 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 utils_2 = require("../../../utils");
 describe('CompileBuildCommand', function () {
@@ -102,7 +103,7 @@ describe('CompileBuildCommand', 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*/];
@@ -121,6 +122,12 @@ describe('CompileBuildCommand', 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/compile/compile.js

@@ -531,12 +531,11 @@ function compileWeb(target) {
         var configuration, streamConfig, streamWeb;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, (0, config_1.getLocalOrGlobalConfig)()];
-                case 1:
-                    configuration = (_c.sent()).configuration;
+                case 0:
+                    configuration = process.sasjsConfig;
                     streamConfig = __assign(__assign({}, configuration === null || configuration === void 0 ? void 0 : configuration.streamConfig), target.streamConfig);
                     streamWeb = (_a = streamConfig.streamWeb) !== null && _a !== void 0 ? _a : false;
-                    if (!streamWeb) return [3 /*break*/, 3];
+                    if (!streamWeb) return [3 /*break*/, 2];
                     (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info('Compiling web app services since `streamWeb` is enabled.');
                     return [4 /*yield*/, (0, web_1.createWebAppServices)(target)
                             .then(function () { var _a; return (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Web app services have been compiled."); })
@@ -544,10 +543,10 @@ function compileWeb(target) {
                             var _a;
                             (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('An error has occurred when compiling web app services.', err.toString());
                         })];
-                case 2:
+                case 1:
                     _c.sent();
-                    _c.label = 3;
-                case 3: return [2 /*return*/];
+                    _c.label = 2;
+                case 2: return [2 /*return*/];
             }
         });
     });
@@ -556,21 +555,20 @@ var syncFolder = function (target) { return __awaiter(void 0, void 0, void 0, fu
     var configuration;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, config_1.getLocalOrGlobalConfig)()];
-            case 1:
-                configuration = (_a.sent()).configuration;
-                if (!configuration.syncFolder) return [3 /*break*/, 3];
+            case 0:
+                configuration = process.sasjsConfig;
+                if (!configuration.syncFolder) return [3 /*break*/, 2];
                 return [4 /*yield*/, (0, copySyncFolder_1.copySyncFolder)(configuration.syncFolder)];
-            case 2:
+            case 1:
                 _a.sent();
-                _a.label = 3;
-            case 3:
-                if (!target.syncFolder) return [3 /*break*/, 5];
+                _a.label = 2;
+            case 2:
+                if (!target.syncFolder) return [3 /*break*/, 4];
                 return [4 /*yield*/, (0, copySyncFolder_1.copySyncFolder)(target.syncFolder)];
-            case 4:
+            case 3:
                 _a.sent();
-                _a.label = 5;
-            case 5: return [2 /*return*/];
+                _a.label = 4;
+            case 4: return [2 /*return*/];
         }
     });
 }); };

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

@@ -159,10 +159,10 @@ function copyTestMacroFiles(folderAbsolutePath) {
 }
 exports.copyTestMacroFiles = copyTestMacroFiles;
 var compileTestFlow = function (target, config) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, buildDestinationFolder, buildDestinationTestFolder, testFiles, _b, testFlow, testSetUp, testTearDown, testSetUpFileName_1, testTearDownFileName_1;
-    var _c, _d, _e, _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var _a, buildDestinationFolder, buildDestinationTestFolder, testFiles, config_2, testFlow, testSetUp, testTearDown, testSetUpFileName_1, testTearDownFileName_1;
+    var _b, _c, _d, _e;
+    return __generator(this, function (_f) {
+        switch (_f.label) {
             case 0:
                 if (target.testConfig &&
                     Object.keys(target.testConfig).includes('testFolders')) {
@@ -171,22 +171,14 @@ var compileTestFlow = function (target, config) { return __awaiter(void 0, void
                 _a = process.sasjsConstants, buildDestinationFolder = _a.buildDestinationFolder, buildDestinationTestFolder = _a.buildDestinationTestFolder;
                 return [4 /*yield*/, (0, utils_1.folderExists)(buildDestinationTestFolder)];
             case 1:
-                if (!_g.sent()) return [3 /*break*/, 7];
+                if (!_f.sent()) return [3 /*break*/, 4];
                 return [4 /*yield*/, (0, utils_1.listFilesAndSubFoldersInFolder)(buildDestinationTestFolder)];
             case 2:
-                testFiles = (_g.sent()).map(function (file) { return path_1.default.join('tests', file); });
-                _b = config;
-                if (_b) return [3 /*break*/, 5];
-                return [4 /*yield*/, (0, config_1.getLocalOrGlobalConfig)()];
-            case 3: return [4 /*yield*/, (_g.sent()).configuration];
-            case 4:
-                _b = (_g.sent());
-                _g.label = 5;
-            case 5:
-                config = _b;
+                testFiles = (_f.sent()).map(function (file) { return path_1.default.join('tests', file); });
+                config_2 = process.sasjsConfig;
                 testFlow = { tests: [] };
-                testSetUp = ((_c = target.testConfig) === null || _c === void 0 ? void 0 : _c.testSetUp) || ((_d = config.testConfig) === null || _d === void 0 ? void 0 : _d.testSetUp);
-                testTearDown = ((_e = target.testConfig) === null || _e === void 0 ? void 0 : _e.testTearDown) || ((_f = config.testConfig) === null || _f === void 0 ? void 0 : _f.testTearDown);
+                testSetUp = ((_b = target.testConfig) === null || _b === void 0 ? void 0 : _b.testSetUp) || ((_c = config_2.testConfig) === null || _c === void 0 ? void 0 : _c.testSetUp);
+                testTearDown = ((_d = target.testConfig) === null || _d === void 0 ? void 0 : _d.testTearDown) || ((_e = config_2.testConfig) === null || _e === void 0 ? void 0 : _e.testTearDown);
                 if (testFiles.length) {
                     if (testSetUp) {
                         testSetUpFileName_1 = getFileName(testSetUp);
@@ -207,10 +199,10 @@ var compileTestFlow = function (target, config) { return __awaiter(void 0, void
                     return file.split(path_1.default.sep).join('/');
                 });
                 return [4 /*yield*/, printTestCoverage(testFlow, buildDestinationFolder, target)];
-            case 6:
-                _g.sent();
+            case 3:
+                _f.sent();
                 return [2 /*return*/, Promise.resolve(testFlow)];
-            case 7: return [2 /*return*/];
+            case 4: return [2 /*return*/];
         }
     });
 }); };

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

@@ -63,53 +63,41 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllFolders = exports.SasFileType = void 0;
 var utils_1 = require("@sasjs/utils");
-var config_1 = require("../../../utils/config");
 var SasFileType;
 (function (SasFileType) {
     SasFileType["Service"] = "service";
     SasFileType["Job"] = "job";
 })(SasFileType = exports.SasFileType || (exports.SasFileType = {}));
 var getAllFolders = function (target, type, rootConfig) { return __awaiter(void 0, void 0, void 0, function () {
-    var configuration, _a, allFolders, config, folders, addFolders, buildSourceFolder;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0:
-                _a = rootConfig;
-                if (_a) return [3 /*break*/, 3];
-                return [4 /*yield*/, (0, config_1.getLocalOrGlobalConfig)()];
-            case 1: return [4 /*yield*/, (_b.sent()).configuration];
-            case 2:
-                _a = (_b.sent());
-                _b.label = 3;
-            case 3:
-                configuration = _a;
-                addFolders = function (folders) {
-                    allFolders = __spreadArray(__spreadArray([], __read((allFolders || [])), false), __read((folders || [])), false);
-                };
-                if (type === SasFileType.Service) {
-                    config = configuration.serviceConfig;
-                    folders = config === null || config === void 0 ? void 0 : config.serviceFolders;
-                    addFolders(folders);
-                    config = target.serviceConfig;
-                    folders = config === null || config === void 0 ? void 0 : config.serviceFolders;
-                }
-                else {
-                    config = configuration.jobConfig;
-                    folders = config === null || config === void 0 ? void 0 : config.jobFolders;
-                    addFolders(folders);
-                    config = target.jobConfig;
-                    folders = config === null || config === void 0 ? void 0 : config.jobFolders;
-                }
-                addFolders(folders);
-                if (!allFolders)
-                    return [2 /*return*/, []];
-                allFolders = allFolders.filter(function (p) { return !!p; });
-                buildSourceFolder = process.sasjsConstants.buildSourceFolder;
-                allFolders = allFolders.map(function (sasFile) {
-                    return (0, utils_1.getAbsolutePath)(sasFile, buildSourceFolder);
-                });
-                return [2 /*return*/, __spreadArray([], __read(new Set(allFolders)), false)];
+    var configuration, allFolders, config, folders, addFolders, buildSourceFolder;
+    return __generator(this, function (_a) {
+        configuration = rootConfig || process.sasjsConfig;
+        addFolders = function (folders) {
+            allFolders = __spreadArray(__spreadArray([], __read((allFolders || [])), false), __read((folders || [])), false);
+        };
+        if (type === SasFileType.Service) {
+            config = configuration.serviceConfig;
+            folders = config === null || config === void 0 ? void 0 : config.serviceFolders;
+            addFolders(folders);
+            config = target.serviceConfig;
+            folders = config === null || config === void 0 ? void 0 : config.serviceFolders;
         }
+        else {
+            config = configuration.jobConfig;
+            folders = config === null || config === void 0 ? void 0 : config.jobFolders;
+            addFolders(folders);
+            config = target.jobConfig;
+            folders = config === null || config === void 0 ? void 0 : config.jobFolders;
+        }
+        addFolders(folders);
+        if (!allFolders)
+            return [2 /*return*/, []];
+        allFolders = allFolders.filter(function (p) { return !!p; });
+        buildSourceFolder = process.sasjsConstants.buildSourceFolder;
+        allFolders = allFolders.map(function (sasFile) {
+            return (0, utils_1.getAbsolutePath)(sasFile, buildSourceFolder);
+        });
+        return [2 /*return*/, __spreadArray([], __read(new Set(allFolders)), false)];
     });
 }); };
 exports.getAllFolders = getAllFolders;

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

@@ -38,7 +38,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getServerType = void 0;
 var types_1 = require("@sasjs/utils/types");
-var config_1 = require("../../../utils/config");
 /**
  * Returns server type for 'compile' step.
  * If target is not present, it looks for serverType at root level
@@ -49,17 +48,12 @@ function getServerType(target) {
     return __awaiter(this, void 0, void 0, function () {
         var configuration;
         return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (target === null || target === void 0 ? void 0 : target.serverType)
-                        return [2 /*return*/, target.serverType];
-                    return [4 /*yield*/, (0, config_1.getLocalOrGlobalConfig)()];
-                case 1:
-                    configuration = (_a.sent()).configuration;
-                    return [2 /*return*/, (configuration === null || configuration === void 0 ? void 0 : configuration.serverType)
-                            ? configuration.serverType
-                            : types_1.ServerType.SasViya];
-            }
+            if (target === null || target === void 0 ? void 0 : target.serverType)
+                return [2 /*return*/, target.serverType];
+            configuration = process.sasjsConfig;
+            return [2 /*return*/, (configuration === null || configuration === void 0 ? void 0 : configuration.serverType)
+                    ? configuration.serverType
+                    : types_1.ServerType.SasViya];
         });
     });
 }

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

@@ -46,7 +46,7 @@ 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, _b, leaf, configuration, _c, buildSourceFolder, macroCorePath, binaryFolders;
+        var fileContent, _b, leaf, _c, buildSourceFolder, macroCorePath, binaryFolders, configuration;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
@@ -74,13 +74,12 @@ function loadDependencies(target, filePath, macroFolders, programFolders, type,
                 case 7:
                     fileContent = _d.sent();
                     _d.label = 8;
-                case 8: return [4 /*yield*/, (0, config_1.getLocalOrGlobalConfig)()];
-                case 9:
-                    configuration = (_d.sent()).configuration;
+                case 8:
                     _c = process.sasjsConstants, buildSourceFolder = _c.buildSourceFolder, macroCorePath = _c.macroCorePath;
                     return [4 /*yield*/, (0, config_1.getBinaryFolders)(target)];
-                case 10:
+                case 9:
                     binaryFolders = _d.sent();
+                    configuration = process.sasjsConfig;
                     headerSyntaxNotices(fileContent);
                     return [4 /*yield*/, (0, utils_1.loadDependenciesFile)({
                             fileContent: fileContent,
@@ -95,7 +94,7 @@ function loadDependencies(target, filePath, macroFolders, programFolders, type,
                             binaryFolders: binaryFolders,
                             compileTree: compileTree
                         })];
-                case 11: return [2 /*return*/, _d.sent()];
+                case 10: return [2 /*return*/, _d.sent()];
             }
         });
     });

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

@@ -112,7 +112,7 @@ describe('getAllFolders', function () {
         var _c, _d;
         return __generator(this, function (_e) {
             switch (_e.label) {
-                case 0: return [4 /*yield*/, (0, utils_2.setConstants)()];
+                case 0: return [4 /*yield*/, (0, utils_2.setConstants)(false)];
                 case 1:
                     _e.sent();
                     _b = (_a = JSON).parse;