@sasjs/cli 4.0.5 → 4.0.7

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

@@ -1,4 +1,4 @@
-import { Target, ServerType } from '@sasjs/utils';
+import { ServerType, Target } from '@sasjs/utils';
 export declare function build(target: Target): Promise<void>;
 export declare function getWebServiceScriptInvocation(serverType: ServerType, isSASFile?: boolean, encoded?: boolean): string;
 export declare function getBuildVars(target: Target): Promise<string>;

package/build/commands/build/build.js

@@ -87,17 +87,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBuildVars = exports.getWebServiceScriptInvocation = exports.build = void 0;
-var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
 var error_1 = require("@sasjs/utils/error");
-var file_1 = require("../../utils/file");
+var path_1 = __importDefault(require("path"));
+var types_1 = require("@sasjs/utils/types");
+var compressAndSave_1 = require("../../utils/compressAndSave");
 var config_1 = require("../../utils/config");
+var file_1 = require("../../utils/file");
 var compile_1 = require("../compile/compile");
+var loadDependencies_1 = require("../compile/internal/loadDependencies");
 var config_2 = require("./internal/config");
 var getLaunchPageCode_1 = require("./internal/getLaunchPageCode");
-var types_1 = require("@sasjs/utils/types");
-var compressAndSave_1 = require("../../utils/compressAndSave");
-var loadDependencies_1 = require("../compile/internal/loadDependencies");
 function build(target) {
     return __awaiter(this, void 0, void 0, function () {
         var _a;
@@ -515,15 +515,10 @@ function getBuildVars(target) {
     return __awaiter(this, void 0, void 0, function () {
         var targetBuildVars, configuration, commonBuildVars;
         return __generator(this, function (_e) {
-            switch (_e.label) {
-                case 0:
-                    targetBuildVars = (_b = (_a = target === null || target === void 0 ? void 0 : target.buildConfig) === null || _a === void 0 ? void 0 : _a.macroVars) !== null && _b !== void 0 ? _b : {};
-                    return [4 /*yield*/, (0, config_1.getLocalConfig)()];
-                case 1:
-                    configuration = _e.sent();
-                    commonBuildVars = (_d = (_c = configuration === null || configuration === void 0 ? void 0 : configuration.buildConfig) === null || _c === void 0 ? void 0 : _c.macroVars) !== null && _d !== void 0 ? _d : {};
-                    return [2 /*return*/, convertVarsToSasFormat(__assign(__assign({}, commonBuildVars), targetBuildVars))];
-            }
+            targetBuildVars = (_b = (_a = target === null || target === void 0 ? void 0 : target.buildConfig) === null || _a === void 0 ? void 0 : _a.macroVars) !== null && _b !== void 0 ? _b : {};
+            configuration = process.sasjsConfig;
+            commonBuildVars = (_d = (_c = configuration === null || configuration === void 0 ? void 0 : configuration.buildConfig) === null || _c === void 0 ? void 0 : _c.macroVars) !== null && _d !== void 0 ? _d : {};
+            return [2 /*return*/, convertVarsToSasFormat(__assign(__assign({}, commonBuildVars), targetBuildVars))];
         });
     });
 }

package/build/commands/compile/compile.js

@@ -74,20 +74,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileJobsServicesTests = exports.copyFilesToBuildFolder = exports.compile = void 0;
+var utils_1 = require("@sasjs/utils");
+var types_1 = require("@sasjs/utils/types");
+var error_1 = require("@sasjs/utils/error");
 var path_1 = __importDefault(require("path"));
 var config_1 = require("../../utils/config");
-var utils_1 = require("@sasjs/utils");
-var web_1 = require("../web/web");
 var file_1 = require("../../utils/file");
-var types_1 = require("@sasjs/utils/types");
-var checkCompileStatus_1 = require("./internal/checkCompileStatus");
+var web_1 = require("../web/web");
 var compileModule = __importStar(require("./compile"));
-var getAllFolders_1 = require("./internal/getAllFolders");
+var checkCompileStatus_1 = require("./internal/checkCompileStatus");
 var compileFile_1 = require("./internal/compileFile");
+var getAllFolders_1 = require("./internal/getAllFolders");
 var compileTestFile_1 = require("./internal/compileTestFile");
+var copySyncFolder_1 = require("./internal/copySyncFolder");
 var getDestinationPath_1 = require("./internal/getDestinationPath");
 var loadDependencies_1 = require("./internal/loadDependencies");
-var copySyncFolder_1 = require("./internal/copySyncFolder");
 function compile(target, forceCompile) {
     var _a, _b;
     if (forceCompile === void 0) { forceCompile = false; }
@@ -173,7 +174,7 @@ exports.compile = compile;
 function copyFilesToBuildFolder(target) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
-        var buildDestinationFolder, serviceFolders, jobFolders, error_1;
+        var buildDestinationFolder, serviceFolders, jobFolders, error_2;
         var _this = this;
         return __generator(this, function (_c) {
             switch (_c.label) {
@@ -228,9 +229,9 @@ function copyFilesToBuildFolder(target) {
                     _c.sent();
                     return [3 /*break*/, 8];
                 case 7:
-                    error_1 = _c.sent();
+                    error_2 = _c.sent();
                     (_b = process.logger) === null || _b === void 0 ? void 0 : _b.error("An error has occurred when copying files to ".concat(buildDestinationFolder, " ."));
-                    throw error_1;
+                    throw error_2;
                 case 8: return [2 /*return*/];
             }
         });
@@ -238,43 +239,46 @@ function copyFilesToBuildFolder(target) {
 }
 exports.copyFilesToBuildFolder = copyFilesToBuildFolder;
 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;
+        var serviceFolders, jobFolders, macroFolders_1, programFolders_2, testSetUp, testTearDown, error_3;
         var _this = this;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
-                    _b.trys.push([0, 13, , 14]);
+                    _a.trys.push([0, 13, , 14]);
                     return [4 /*yield*/, (0, getAllFolders_1.getAllFolders)(target, getAllFolders_1.SasFileType.Service)];
                 case 1:
-                    serviceFolders = _b.sent();
+                    serviceFolders = _a.sent();
                     return [4 /*yield*/, (0, getAllFolders_1.getAllFolders)(target, getAllFolders_1.SasFileType.Job)];
                 case 2:
-                    jobFolders = _b.sent();
+                    jobFolders = _a.sent();
                     return [4 /*yield*/, (0, config_1.getMacroFolders)(target)];
                 case 3:
-                    macroFolders_1 = _b.sent();
+                    macroFolders_1 = _a.sent();
                     return [4 /*yield*/, (0, config_1.getProgramFolders)(target)];
                 case 4:
-                    programFolders_2 = _b.sent();
+                    programFolders_2 = _a.sent();
                     return [4 /*yield*/, (0, config_1.getTestSetUp)(target)];
                 case 5:
-                    testSetUp = _b.sent();
+                    testSetUp = _a.sent();
                     return [4 /*yield*/, (0, config_1.getTestTearDown)(target)];
                 case 6:
-                    testTearDown = _b.sent();
+                    testTearDown = _a.sent();
                     if (!testSetUp) return [3 /*break*/, 8];
-                    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.'); })];
+                    return [4 /*yield*/, (0, compileTestFile_1.compileTestFile)(target, testSetUp, '', true, false, compileTree).catch(function (err) {
+                            throw (0, error_1.prefixMessage)(err, 'Test set up compilation has failed. ');
+                        })];
                 case 7:
-                    _b.sent();
-                    _b.label = 8;
+                    _a.sent();
+                    _a.label = 8;
                 case 8:
                     if (!testTearDown) return [3 /*break*/, 10];
-                    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.'); })];
+                    return [4 /*yield*/, (0, compileTestFile_1.compileTestFile)(target, testTearDown, '', true, false, compileTree).catch(function (err) {
+                            throw (0, error_1.prefixMessage)(err, 'Test tear down compilation has failed. ');
+                        })];
                 case 9:
-                    _b.sent();
-                    _b.label = 10;
+                    _a.sent();
+                    _a.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) {
@@ -286,7 +290,7 @@ function compileJobsServicesTests(target, compileTree) {
                         });
                     }); })];
                 case 11:
-                    _b.sent();
+                    _a.sent();
                     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) {
@@ -298,12 +302,11 @@ function compileJobsServicesTests(target, compileTree) {
                             });
                         }); })];
                 case 12:
-                    _b.sent();
+                    _a.sent();
                     return [3 /*break*/, 14];
                 case 13:
-                    error_2 = _b.sent();
-                    (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('An error has occurred when compiling your jobs and services.');
-                    throw error_2;
+                    error_3 = _a.sent();
+                    throw error_3;
                 case 14: return [2 /*return*/];
             }
         });

package/build/commands/compile/compileCommand.js

@@ -169,7 +169,7 @@ var CompileCommand = /** @class */ (function (_super) {
                                 return command_1.ReturnCode.Success;
                             })
                                 .catch(function (err) {
-                                (0, utils_1.displayError)(err, 'An error has occurred when compiling services.');
+                                (0, utils_1.displayError)(err, 'An error has occurred during compilation.');
                                 return command_1.ReturnCode.InternalError;
                             })];
                     case 2: return [2 /*return*/, _a.sent()];

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

@@ -1,5 +1,5 @@
+import { CompileTree, Configuration, Target } from '@sasjs/utils';
 import { TestFlow } from '../../../types';
-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 copyTestMacroFiles(folderAbsolutePath: string): Promise<void>;
 export declare const compileTestFlow: (target: Target, config?: Configuration) => Promise<TestFlow | undefined>;

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

@@ -65,13 +65,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileTestFlow = exports.copyTestMacroFiles = exports.compileTestFile = void 0;
-var types_1 = require("../../../types");
-var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
-var loadDependencies_1 = require("./loadDependencies");
-var file_1 = require("../../../utils/file");
 var chalk_1 = __importDefault(require("chalk"));
+var path_1 = __importDefault(require("path"));
+var types_1 = require("../../../types");
 var config_1 = require("../../../utils/config");
+var file_1 = require("../../../utils/file");
+var loadDependencies_1 = require("./loadDependencies");
 var getFileName = function (filePath) { return path_1.default.parse(filePath).base; };
 function compileTestFile(target, filePath, testVar, saveToRoot, removeOriginalFile, compileTree) {
     if (testVar === void 0) { testVar = ''; }

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

@@ -1,4 +1,4 @@
-import { Target, Configuration } from '@sasjs/utils';
+import { Configuration, Target } from '@sasjs/utils';
 export declare enum SasFileType {
     Service = "service",
     Job = "job"

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

@@ -1,3 +1,3 @@
-import { Target, SASJsFileType, CompileTree } from '@sasjs/utils';
+import { CompileTree, SASJsFileType, Target } 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

@@ -41,8 +41,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCompileTree = exports.loadDependencies = void 0;
 var utils_1 = require("@sasjs/utils");
-var config_1 = require("../../../utils/config");
 var path_1 = __importDefault(require("path"));
+var config_1 = require("../../../utils/config");
 function loadDependencies(target, filePath, macroFolders, programFolders, type, compileTree) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {

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

@@ -82,6 +82,8 @@ var compileSingleFile_1 = require("../compileSingleFile");
 var compileFile = __importStar(require("../internal/compileFile"));
 var utils_2 = require("../../../utils");
 var compileCommand_1 = require("../compileCommand");
+var error_1 = require("@sasjs/utils/error");
+var compileTestFileModule = __importStar(require("../internal/compileTestFile"));
 describe('sasjs compile', function () {
     var sharedAppName;
     var appName;
@@ -280,6 +282,46 @@ describe('sasjs compile', function () {
             }
         });
     }); });
+    it('should fail to compile if testSetUp is present and test file compilation failed', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var testSetUpFile, compileTestFileError, testTarget, expectedError;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    testSetUpFile = 'WRONG.sas';
+                    compileTestFileError = "ENOENT: no such file or directory, open '".concat(testSetUpFile, "'");
+                    testTarget = __assign({}, target);
+                    testTarget.testConfig = { testSetUp: testSetUpFile };
+                    jest
+                        .spyOn(compileTestFileModule, 'compileTestFile')
+                        .mockImplementation(function () { return Promise.reject(compileTestFileError); });
+                    expectedError = (0, error_1.prefixMessage)(compileTestFileError, 'Test set up compilation has failed. ');
+                    return [4 /*yield*/, expect(compileModule.compile(testTarget)).rejects.toEqual(expectedError)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should fail to compile if testTearDown is present and test file compilation failed', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var testTearDownFile, compileTestFileError, testTarget, expectedError;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    testTearDownFile = 'WRONG.sas';
+                    compileTestFileError = "ENOENT: no such file or directory, open '".concat(testTearDownFile, "'");
+                    testTarget = __assign({}, target);
+                    testTarget.testConfig = { testTearDown: testTearDownFile };
+                    jest
+                        .spyOn(compileTestFileModule, 'compileTestFile')
+                        .mockImplementation(function () { return Promise.reject(compileTestFileError); });
+                    expectedError = (0, error_1.prefixMessage)(compileTestFileError, 'Test tear down compilation has failed. ');
+                    return [4 /*yield*/, expect(compileModule.compile(testTarget)).rejects.toEqual(expectedError)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
 });
 describe('sasjs compile single file', function () {
     var appName;

package/build/commands/docs/docsCommand.js

@@ -55,7 +55,6 @@ exports.DocsCommand = void 0;
 var __1 = require("..");
 var command_1 = require("../../types/command");
 var targetCommand_1 = require("../../types/command/targetCommand");
-var utils_1 = require("../../utils");
 var DocSubCommand;
 (function (DocSubCommand) {
     DocSubCommand["Init"] = "init";
@@ -137,9 +136,7 @@ var DocsCommand = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.getTargetInfo()];
                     case 1:
                         target = (_a.sent()).target;
-                        return [4 /*yield*/, (0, utils_1.getLocalConfig)()];
-                    case 2:
-                        config = _a.sent();
+                        config = process.sasjsConfig;
                         return [4 /*yield*/, (0, __1.generateDocs)(target, config, this.parsed.outDirectory)
                                 .then(function (res) {
                                 var _a;
@@ -151,7 +148,7 @@ var DocsCommand = /** @class */ (function (_super) {
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error generating docs: ', err);
                                 return command_1.ReturnCode.InternalError;
                             })];
-                    case 3:
+                    case 2:
                         returnCode = _a.sent();
                         return [2 /*return*/, returnCode];
                 }
@@ -166,9 +163,7 @@ var DocsCommand = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.getTargetInfo()];
                     case 1:
                         target = (_a.sent()).target;
-                        return [4 /*yield*/, (0, utils_1.getLocalConfig)()];
-                    case 2:
-                        config = _a.sent();
+                        config = process.sasjsConfig;
                         return [4 /*yield*/, (0, __1.generateDot)(target, config, this.parsed.outDirectory)
                                 .then(function (res) {
                                 var _a;
@@ -180,7 +175,7 @@ var DocsCommand = /** @class */ (function (_super) {
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error generating docs: ', err);
                                 return command_1.ReturnCode.InternalError;
                             })];
-                    case 3:
+                    case 2:
                         returnCode = _a.sent();
                         return [2 /*return*/, returnCode];
                 }

package/build/utils/config.js

@@ -879,26 +879,31 @@ function getAuthConfig(target) {
 }
 exports.getAuthConfig = getAuthConfig;
 var saveTokens = function (targetName, client, secret, access_token, refresh_token) { return __awaiter(void 0, void 0, void 0, function () {
-    var localConfig, isLocalTarget, envFileContent, envFilePath, globalConfig, target, targetJson;
-    var _a, _b, _c, _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
-            case 0: return [4 /*yield*/, getLocalConfig()];
+    var isLocalTarget, envFileContent, envFilePath, globalConfig, target, targetJson;
+    var _a, _b, _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
+            case 0: return [4 /*yield*/, getLocalConfig()
+                    .then(function (localConfig) { var _a; return (_a = localConfig.targets) === null || _a === void 0 ? void 0 : _a.some(function (t) { return t.name === targetName; }); })
+                    .catch(function () {
+                    var _a;
+                    (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info('Local sasjsconfig.json file could not be found! Now finding target in global .sasjsrc file');
+                    return false;
+                })];
             case 1:
-                localConfig = _e.sent();
-                isLocalTarget = (_a = localConfig.targets) === null || _a === void 0 ? void 0 : _a.some(function (t) { return t.name === targetName; });
+                isLocalTarget = _d.sent();
                 if (!isLocalTarget) return [3 /*break*/, 3];
                 envFileContent = "CLIENT=".concat(client, "\nSECRET=").concat(secret, "\nACCESS_TOKEN=").concat(access_token, "\nREFRESH_TOKEN=").concat(refresh_token, "\n");
                 envFilePath = path_1.default.join(process.projectDir, ".env.".concat(targetName));
                 return [4 /*yield*/, (0, utils_1.createFile)(envFilePath, envFileContent)];
             case 2:
-                _e.sent();
-                (_b = process.logger) === null || _b === void 0 ? void 0 : _b.success("Environment file saved at ".concat(envFilePath));
+                _d.sent();
+                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Environment file saved at ".concat(envFilePath));
                 return [3 /*break*/, 6];
             case 3: return [4 /*yield*/, getGlobalRcFile()];
             case 4:
-                globalConfig = _e.sent();
-                target = (_c = globalConfig.targets) === null || _c === void 0 ? void 0 : _c.find(function (t) { return t.name === targetName; });
+                globalConfig = _d.sent();
+                target = (_b = globalConfig.targets) === null || _b === void 0 ? void 0 : _b.find(function (t) { return t.name === targetName; });
                 if (!target) {
                     throw new Error(ERROR_MESSAGE(targetName).NOT_FOUND_TARGET_NAME);
                 }
@@ -906,9 +911,9 @@ var saveTokens = function (targetName, client, secret, access_token, refresh_tok
                 targetJson.authConfig = { client: client, secret: secret, access_token: access_token, refresh_token: refresh_token };
                 return [4 /*yield*/, saveToGlobalConfig(new utils_1.Target(targetJson), globalConfig.defaultTarget === targetName)];
             case 5:
-                _e.sent();
-                (_d = process.logger) === null || _d === void 0 ? void 0 : _d.success("Target saved to global .sasjsrc file at ~/.sasjsrc.");
-                _e.label = 6;
+                _d.sent();
+                (_c = process.logger) === null || _c === void 0 ? void 0 : _c.success("Target saved to global .sasjsrc file at ~/.sasjsrc.");
+                _d.label = 6;
             case 6: return [2 /*return*/];
         }
     });

package/package.json

@@ -102,5 +102,5 @@
     "typescript": "4.9.5",
     "util": "0.12.4"
   },
-  "version": "4.0.5"
+  "version": "4.0.7"
 }