@sasjs/cli 4.0.4 → 4.0.5

package/build/commands/fs/spec/fsCommand.spec.js

@@ -91,6 +91,7 @@ var utils_2 = require("../../../utils");
 var FSModule = __importStar(require("@sasjs/utils/fs"));
 var FileModule = __importStar(require("@sasjs/utils/file"));
 var configUtils = __importStar(require("../../../utils/config"));
+var setConstantsUtils = __importStar(require("../../../utils/setConstants"));
 var executeCodeModule = __importStar(require("../internal/executeCode"));
 var defaultArgs = ['node', 'sasjs', 'fs'];
 var target = new utils_1.Target({
@@ -102,10 +103,11 @@ describe('FSCommand', 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:
+                    process.projectDir = __dirname;
+                    return [4 /*yield*/, (0, utils_2.setConstants)()];
                 case 1:
                     _a.sent();
-                    process.projectDir = __dirname;
                     return [2 /*return*/];
             }
         });
@@ -126,11 +128,7 @@ describe('FSCommand', function () {
                         jest
                             .spyOn(FileModule, 'createFile')
                             .mockImplementation(function () { return Promise.resolve(); });
-                        jest
-                            .spyOn(configUtils, 'findTargetInConfiguration')
-                            .mockImplementation(function () {
-                            return Promise.resolve({ target: target, isLocal: true });
-                        });
+                        setupMocks();
                         return [4 /*yield*/, executeCommandWrapper([
                                 'compile',
                                 'localFolder',
@@ -152,11 +150,7 @@ describe('FSCommand', function () {
                         jest
                             .spyOn(FileModule, 'createFile')
                             .mockImplementation(function () { return Promise.reject(); });
-                        jest
-                            .spyOn(configUtils, 'findTargetInConfiguration')
-                            .mockImplementation(function () {
-                            return Promise.resolve({ target: target, isLocal: true });
-                        });
+                        setupMocks();
                         return [4 /*yield*/, executeCommandWrapper(['compile', 'localFolder'])];
                     case 1:
                         returnCode = _a.sent();
@@ -172,11 +166,7 @@ describe('FSCommand', function () {
             process.logger = new utils_1.Logger(utils_1.LogLevel.Off);
             jest.spyOn(process.logger, 'error');
             jest.spyOn(process.logger, 'info');
-            jest
-                .spyOn(configUtils, 'findTargetInConfiguration')
-                .mockImplementation(function () {
-                return Promise.resolve({ target: target, isLocal: true });
-            });
+            setupMocks();
             jest
                 .spyOn(FSModule, 'generateCompileProgram')
                 .mockImplementation(function () { return Promise.resolve(''); });
@@ -235,11 +225,7 @@ describe('FSCommand', function () {
             jest
                 .spyOn(FileModule, 'createFile')
                 .mockImplementation(function () { return Promise.resolve(); });
-            jest
-                .spyOn(configUtils, 'findTargetInConfiguration')
-                .mockImplementation(function () {
-                return Promise.resolve({ target: target, isLocal: true });
-            });
+            setupMocks();
             jest
                 .spyOn(FSModule, 'generateProgramToGetRemoteHash')
                 .mockImplementation(function () { return Promise.resolve(''); });
@@ -355,6 +341,17 @@ describe('FSCommand', function () {
         }); });
     });
 });
+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(); });
+};
 var executeCommandWrapper = function (additionalParams) { return __awaiter(void 0, void 0, void 0, function () {
     var args, command;
     return __generator(this, function (_a) {

package/build/commands/job/spec/jobCommand.spec.js

@@ -491,6 +491,9 @@ var setupMocksForViya = function () {
         .mockImplementation(function () {
         return Promise.resolve({ target: targetViya, isLocal: true });
     });
+    jest
+        .spyOn(configUtils, 'getLocalConfig')
+        .mockImplementation(function () { return Promise.resolve({}); });
     jest
         .spyOn(configUtils, 'getSASjsAndAuthConfig')
         .mockImplementation(function (target) {
@@ -517,6 +520,9 @@ var setupMocksForSAS9 = function () {
         .mockImplementation(function () {
         return Promise.resolve({ target: target9, isLocal: true });
     });
+    jest
+        .spyOn(configUtils, 'getLocalConfig')
+        .mockImplementation(function () { return Promise.resolve({}); });
     process.logger = new utils_1.Logger(utils_1.LogLevel.Off);
     jest.spyOn(process.logger, 'error');
 };

package/build/commands/request/spec/requestCommand.spec.js

@@ -88,8 +88,8 @@ var requestModule = __importStar(require("../request"));
 var requestCommand_1 = require("../requestCommand");
 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'];
 var target = new utils_1.Target({
     name: 'test',
@@ -103,16 +103,6 @@ var configFilePath = 'path/to/config.json';
 var outputPath = './output.txt';
 var logPath = './log.txt';
 describe('RequestCommand', 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 1:
-                    _a.sent();
-                    return [2 /*return*/];
-            }
-        });
-    }); });
     beforeEach(function () {
         setupMocks();
     });
@@ -294,6 +284,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, 'error');
 };

package/build/commands/run/spec/runCommand.spec.js

@@ -88,8 +88,8 @@ var runModule = __importStar(require("../run"));
 var runCommand_1 = require("../runCommand");
 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', 'run'];
 var target = new utils_1.Target({
     name: 'test',
@@ -101,16 +101,6 @@ var sourceFilePath = 'path/to/source.json';
 var sasFilePath = 'path/to/soure.sas';
 var logFilePath = 'path/to/log.log';
 describe('RunCommand', 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 1:
-                    _a.sent();
-                    return [2 /*return*/];
-            }
-        });
-    }); });
     beforeEach(function () {
         setupMocks();
     });
@@ -211,6 +201,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, 'error');
 };

package/build/commands/servicepack/spec/servicepackCommand.spec.js

@@ -88,8 +88,8 @@ var deployModule = __importStar(require("../deploy"));
 var servicePackCommand_1 = require("../servicePackCommand");
 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', 'servicepack', 'deploy'];
 var target = new utils_1.Target({
     name: 'test',
@@ -99,16 +99,6 @@ var target = new utils_1.Target({
 });
 var source = 'path/to/json';
 describe('ServicePackCommand', 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 1:
-                    _a.sent();
-                    return [2 /*return*/];
-            }
-        });
-    }); });
     beforeEach(function () {
         setupMocks();
     });
@@ -191,6 +181,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, 'error');
 };

package/build/commands/testing/spec/testCommand.spec.js

@@ -88,8 +88,8 @@ var testModule = __importStar(require("../test"));
 var testCommand_1 = require("../testCommand");
 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'];
 var target = new utils_1.Target({
     name: 'testTarget',
@@ -98,16 +98,6 @@ var target = new utils_1.Target({
     contextName: 'test context'
 });
 describe('TestCommand', 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 1:
-                    _a.sent();
-                    return [2 /*return*/];
-            }
-        });
-    }); });
     beforeEach(function () {
         setupMocks();
     });
@@ -235,6 +225,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, 'error');
 };

package/build/commands/web/spec/web.spec.js

@@ -117,27 +117,32 @@ var streamConfig = {
 describe('sasjs web', function () {
     var appName;
     beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     appName = "cli-test-web-minimal-".concat((0, utils_1.generateTimestamp)());
                     return [4 /*yield*/, (0, test_1.createTestMinimalApp)(__dirname, appName)];
                 case 1:
-                    _a.sent();
+                    _b.sent();
                     return [4 /*yield*/, (0, test_1.updateConfig)({
                             streamConfig: __assign(__assign({}, streamConfig), { streamServiceName: undefined })
                         })];
                 case 2:
-                    _a.sent();
+                    _b.sent();
                     return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(__dirname, appName, streamConfig.webSourcePath, 'testing.js.map'), '')];
                 case 3:
-                    _a.sent();
+                    _b.sent();
                     return [4 /*yield*/, (0, test_1.updateTarget)({ streamConfig: undefined }, 'viya')];
                 case 4:
-                    _a.sent();
+                    _b.sent();
                     return [4 /*yield*/, (0, test_1.updateTarget)({ serverUrl: undefined, streamConfig: undefined }, 'sas9')];
                 case 5:
-                    _a.sent();
+                    _b.sent();
+                    _a = process;
+                    return [4 /*yield*/, (0, utils_2.getLocalConfig)()];
+                case 6:
+                    _a.sasjsConfig = _b.sent();
                     return [2 /*return*/];
             }
         });

package/build/commands/web/spec/webCommand.spec.js

@@ -88,6 +88,7 @@ var webModule = __importStar(require("../web"));
 var webCommand_1 = require("../webCommand");
 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('WebCommand', function () {
@@ -101,7 +102,7 @@ describe('WebCommand', 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*/];
@@ -118,6 +119,12 @@ describe('WebCommand', 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/types/command/targetCommand.js

@@ -95,11 +95,31 @@ var TargetCommand = /** @class */ (function (_super) {
                     case 1:
                         _a.sent();
                         return [4 /*yield*/, (0, utils_1.findTargetInConfiguration)(targetName)
-                                .then(function (res) {
-                                _this._targetInfo = res;
-                                (0, utils_1.updateSasjsConstants)(res.target, res.isLocal);
-                                return res;
-                            })
+                                .then(function (res) { return __awaiter(_this, void 0, void 0, function () {
+                                var configuration, _a;
+                                return __generator(this, function (_b) {
+                                    switch (_b.label) {
+                                        case 0:
+                                            this._targetInfo = res;
+                                            if (!res.isLocal) return [3 /*break*/, 2];
+                                            return [4 /*yield*/, (0, utils_1.getLocalConfig)()];
+                                        case 1:
+                                            _a = _b.sent();
+                                            return [3 /*break*/, 4];
+                                        case 2: return [4 /*yield*/, (0, utils_1.getGlobalRcFile)()];
+                                        case 3:
+                                            _a = _b.sent();
+                                            _b.label = 4;
+                                        case 4:
+                                            configuration = _a;
+                                            return [4 /*yield*/, (0, utils_1.setConstants)(res.isLocal, res.target, configuration)];
+                                        case 5:
+                                            _b.sent();
+                                            process.sasjsConfig = configuration;
+                                            return [2 /*return*/, res];
+                                    }
+                                });
+                            }); })
                                 .catch(function (err) {
                                 var _a;
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error reading target from configuration: ', err);

package/build/utils/config.js

@@ -652,52 +652,42 @@ exports.getFolders = getFolders;
  */
 function getProgramFolders(target) {
     return __awaiter(this, void 0, void 0, function () {
-        var programFolders, localConfig, buildSourceFolder;
+        var programFolders, configuration, buildSourceFolder, programFoldersWithAbsolutePath;
         return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    programFolders = [];
-                    return [4 /*yield*/, getLocalConfig().catch(function () { return null; })];
-                case 1:
-                    localConfig = _a.sent();
-                    if (localConfig === null || localConfig === void 0 ? void 0 : localConfig.programFolders) {
-                        programFolders = programFolders.concat(localConfig.programFolders);
-                    }
-                    if (target === null || target === void 0 ? void 0 : target.programFolders) {
-                        programFolders = programFolders.concat(target.programFolders);
-                    }
-                    buildSourceFolder = process.sasjsConstants.buildSourceFolder;
-                    programFolders = programFolders.map(function (programFolder) {
-                        return (0, utils_1.getAbsolutePath)(programFolder, buildSourceFolder);
-                    });
-                    return [2 /*return*/, __spreadArray([], __read(new Set(programFolders)), false)];
+            programFolders = [];
+            configuration = process.sasjsConfig;
+            if (configuration === null || configuration === void 0 ? void 0 : configuration.programFolders) {
+                programFolders.push.apply(programFolders, __spreadArray([], __read(configuration.programFolders), false));
             }
+            if (target === null || target === void 0 ? void 0 : target.programFolders) {
+                programFolders.push.apply(programFolders, __spreadArray([], __read(target.programFolders), false));
+            }
+            buildSourceFolder = process.sasjsConstants.buildSourceFolder;
+            programFoldersWithAbsolutePath = programFolders.map(function (programFolder) {
+                return (0, utils_1.getAbsolutePath)(programFolder, buildSourceFolder);
+            });
+            return [2 /*return*/, __spreadArray([], __read(new Set(programFoldersWithAbsolutePath)), false)];
         });
     });
 }
 exports.getProgramFolders = getProgramFolders;
 function getBinaryFolders(target) {
     return __awaiter(this, void 0, void 0, function () {
-        var binaryFolders, localConfig, buildSourceFolder;
+        var binaryFolders, configuration, buildSourceFolder, binaryFoldersWithAbsolutePath;
         return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    binaryFolders = [];
-                    return [4 /*yield*/, getLocalConfig().catch(function () { return null; })];
-                case 1:
-                    localConfig = _a.sent();
-                    if (localConfig === null || localConfig === void 0 ? void 0 : localConfig.binaryFolders) {
-                        binaryFolders = binaryFolders.concat(localConfig.binaryFolders);
-                    }
-                    if (target === null || target === void 0 ? void 0 : target.binaryFolders) {
-                        binaryFolders = binaryFolders.concat(target.binaryFolders);
-                    }
-                    buildSourceFolder = process.sasjsConstants.buildSourceFolder;
-                    binaryFolders = binaryFolders.map(function (binaryFolder) {
-                        return (0, utils_1.getAbsolutePath)(binaryFolder, buildSourceFolder);
-                    });
-                    return [2 /*return*/, __spreadArray([], __read(new Set(binaryFolders)), false)];
+            binaryFolders = [];
+            configuration = process.sasjsConfig;
+            if (configuration === null || configuration === void 0 ? void 0 : configuration.binaryFolders) {
+                binaryFolders.push.apply(binaryFolders, __spreadArray([], __read(configuration.binaryFolders), false));
+            }
+            if (target === null || target === void 0 ? void 0 : target.binaryFolders) {
+                binaryFolders.push.apply(binaryFolders, __spreadArray([], __read(target.binaryFolders), false));
             }
+            buildSourceFolder = process.sasjsConstants.buildSourceFolder;
+            binaryFoldersWithAbsolutePath = binaryFolders.map(function (binaryFolder) {
+                return (0, utils_1.getAbsolutePath)(binaryFolder, buildSourceFolder);
+            });
+            return [2 /*return*/, __spreadArray([], __read(new Set(binaryFoldersWithAbsolutePath)), false)];
         });
     });
 }
@@ -709,25 +699,20 @@ exports.getBinaryFolders = getBinaryFolders;
  */
 function getMacroFolders(target) {
     return __awaiter(this, void 0, void 0, function () {
-        var macroFolders, localConfig, buildSourceFolder;
+        var configuration, macroFolders, buildSourceFolder, macroFoldersWithAbsolutePath;
         return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    macroFolders = [];
-                    return [4 /*yield*/, getLocalOrGlobalConfig()];
-                case 1:
-                    localConfig = (_a.sent()).configuration;
-                    if (target === null || target === void 0 ? void 0 : target.macroFolders)
-                        macroFolders = target.macroFolders;
-                    if (localConfig === null || localConfig === void 0 ? void 0 : localConfig.macroFolders) {
-                        macroFolders = localConfig.macroFolders.concat(macroFolders);
-                    }
-                    buildSourceFolder = process.sasjsConstants.buildSourceFolder;
-                    macroFolders = macroFolders.map(function (macroFolder) {
-                        return (0, utils_1.getAbsolutePath)(macroFolder, buildSourceFolder);
-                    });
-                    return [2 /*return*/, __spreadArray([], __read(new Set(macroFolders)), false)];
+            configuration = process.sasjsConfig;
+            macroFolders = [];
+            if (configuration === null || configuration === void 0 ? void 0 : configuration.macroFolders) {
+                macroFolders.push.apply(macroFolders, __spreadArray([], __read(configuration.macroFolders), false));
             }
+            if (target === null || target === void 0 ? void 0 : target.macroFolders)
+                macroFolders.push.apply(macroFolders, __spreadArray([], __read(target.macroFolders), false));
+            buildSourceFolder = process.sasjsConstants.buildSourceFolder;
+            macroFoldersWithAbsolutePath = macroFolders.map(function (macroFolder) {
+                return (0, utils_1.getAbsolutePath)(macroFolder, buildSourceFolder);
+            });
+            return [2 /*return*/, __spreadArray([], __read(new Set(macroFoldersWithAbsolutePath)), false)];
         });
     });
 }
@@ -739,14 +724,10 @@ exports.getMacroFolders = getMacroFolders;
  */
 function getStreamConfig(target) {
     return __awaiter(this, void 0, void 0, function () {
-        var localConfig;
+        var configuration;
         return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, getLocalConfig()];
-                case 1:
-                    localConfig = _a.sent();
-                    return [2 /*return*/, __assign(__assign({ streamServiceName: 'clickme' }, localConfig === null || localConfig === void 0 ? void 0 : localConfig.streamConfig), target === null || target === void 0 ? void 0 : target.streamConfig)];
-            }
+            configuration = process.sasjsConfig;
+            return [2 /*return*/, __assign(__assign({ streamServiceName: 'clickme' }, configuration === null || configuration === void 0 ? void 0 : configuration.streamConfig), target === null || target === void 0 ? void 0 : target.streamConfig)];
         });
     });
 }

package/build/utils/setConstants.d.ts

@@ -1,4 +1,3 @@
-import { Target } from '@sasjs/utils';
+import { Configuration, Target } from '@sasjs/utils';
 export declare const contextName = "sasjs cli compute context";
-export declare const setConstants: () => Promise<void>;
-export declare const updateSasjsConstants: (target: Target, isLocal: boolean) => void;
+export declare const setConstants: (isLocal?: boolean, target?: Target, configuration?: Configuration) => Promise<void>;