@sasjs/cli 4.4.1 → 4.5.0

package/build/commands/job/jobCommand.js

@@ -82,7 +82,7 @@ var executeParseOptions = {
         type: 'boolean',
         alias: 'i',
         default: false,
-        description: 'If present and return status only is provided, CLI will return status 0 when the job state is warning.'
+        description: 'If present, CLI will return status 0 when the job state is warning.'
     },
     log: {
         type: 'string',
@@ -94,6 +94,7 @@ var executeParseOptions = {
         alias: 'o',
         description: 'path where output of the finished job execution will be saved.'
     },
+    // returnStatusOnly flag is deprecated and is left to display warning if used
     returnStatusOnly: {
         type: 'boolean',
         default: false,
@@ -118,6 +119,12 @@ var executeParseOptions = {
     streamLog: {
         type: 'boolean',
         description: 'Flag indicating whether the logs should be streamed to a local file as the job executes.'
+    },
+    verbose: {
+        type: 'boolean',
+        alias: 'v',
+        default: false,
+        description: 'If present, CLI will return status 0, 1 or 2 together with HTTP response summaries.'
     }
 };
 var JobCommand = /** @class */ (function (_super) {
@@ -139,15 +146,25 @@ var JobCommand = /** @class */ (function (_super) {
         _this.jobSubCommands = jobSubCommands;
         return _this;
     }
+    /**
+     * Method responsible for command execution.
+     * @returns - promise that resolves into return code.
+     */
     JobCommand.prototype.execute = function () {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var target, _b, _c, _d, _e;
+            var target, returnStatusOnly, _b, _c, _d, _e;
             return __generator(this, function (_f) {
                 switch (_f.label) {
-                    case 0: return [4 /*yield*/, this.getTargetInfo()];
+                    case 0: return [4 /*yield*/, this.getTargetInfo()
+                        // returnStatusOnly flag is deprecated and is left to display warning if used
+                    ];
                     case 1:
                         target = (_f.sent()).target;
+                        returnStatusOnly = !!this.parsed.returnStatusOnly;
+                        if (returnStatusOnly) {
+                            process.logger.warn('--returnStatusOnly (-r) flag is deprecated.');
+                        }
                         _b = target.serverType;
                         switch (_b) {
                             case utils_1.ServerType.SasViya: return [3 /*break*/, 2];
@@ -194,6 +211,11 @@ var JobCommand = /** @class */ (function (_super) {
             });
         });
     };
+    /**
+     * Executes job on SASJS server.
+     * @param target - SASJS server configuration.
+     * @returns - promise that resolves into return code.
+     */
     JobCommand.prototype.executeJobSasjs = function (target) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
@@ -210,6 +232,7 @@ var JobCommand = /** @class */ (function (_super) {
                                 .then(function () { return command_1.ReturnCode.Success; })
                                 .catch(function (err) {
                                 var _a;
+                                // handle job execution failure
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error executing job: ', err);
                                 return command_1.ReturnCode.InternalError;
                             })];
@@ -220,36 +243,41 @@ var JobCommand = /** @class */ (function (_super) {
             });
         });
     };
+    /**
+     * Executes job on SAS9 server.
+     * @param target - SAS9 server configuration.
+     * @returns - promise that resolves into return code.
+     */
     JobCommand.prototype.executeJobSas9 = function (target) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var jobPath, log, output, source, _b, sasjs, authConfigSas9, userName, password, returnCode;
+            var jobPath, log, source, output, _b, sasjs, authConfigSas9, userName, password, returnCode;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
                         jobPath = (0, prefixAppLoc_1.prefixAppLoc)(target.appLoc, this.parsed.jobPath);
                         log = (0, getLogFilePath_1.getLogFilePath)(this.parsed.log, jobPath);
+                        source = this.parsed.source;
                         output = ((_a = this.parsed.output) === null || _a === void 0 ? void 0 : _a.length)
                             ? this.parsed.output
                             : undefined;
-                        source = this.parsed.source;
                         return [4 /*yield*/, (0, utils_2.getSASjsAndAuthConfig)(target).catch(function (err) {
                                 var _a;
+                                // handle getting instance of @sasjs/adapter and auth config failure
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Unable to execute job. Error fetching auth config: ', err);
-                                return { sasjs: (0, utils_2.getSASjs)(target), authConfigSas9: undefined };
+                                return { sasjs: undefined, authConfigSas9: undefined };
                             })];
                     case 1:
                         _b = _c.sent(), sasjs = _b.sasjs, authConfigSas9 = _b.authConfigSas9;
-                        if (!authConfigSas9)
+                        if (!authConfigSas9 || !sasjs)
                             return [2 /*return*/, command_1.ReturnCode.InternalError];
                         userName = authConfigSas9.userName;
                         password = (0, utils_1.decodeFromBase64)(authConfigSas9.password);
                         return [4 /*yield*/, (0, execute_1.executeJobSas9)(sasjs, { userName: userName, password: password }, jobPath, log, output, source)
-                                .then(function () {
-                                return command_1.ReturnCode.Success;
-                            })
+                                .then(function () { return command_1.ReturnCode.Success; })
                                 .catch(function (err) {
                                 var _a;
+                                // handle job execution failure
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error executing job: ', err);
                                 return command_1.ReturnCode.InternalError;
                             })];
@@ -260,51 +288,53 @@ var JobCommand = /** @class */ (function (_super) {
             });
         });
     };
+    /**
+     * Executes job on Viya server.
+     * @param target - Viya server configuration.
+     * @returns - promise that resolves into return code.
+     */
     JobCommand.prototype.executeJobViya = function (target) {
-        var _a, _b, _c;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var jobPath, log, wait, output, statusFile, returnStatusOnly, ignoreWarnings, source, streamLog, _d, sasjs, authConfig, returnCode;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
+            var jobPath, statusFile, log, ignoreWarnings, streamLog, verbose, source, wait, output, _c, sasjs, authConfig, returnCode;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         jobPath = (0, prefixAppLoc_1.prefixAppLoc)(target.appLoc, this.parsed.jobPath);
+                        statusFile = getStatusFilePath(this.parsed.statusFile);
                         log = (0, getLogFilePath_1.getLogFilePath)(this.parsed.log, jobPath);
+                        ignoreWarnings = !!this.parsed.ignoreWarnings;
+                        streamLog = !!this.parsed.streamLog;
+                        verbose = !!this.parsed.verbose;
+                        source = this.parsed.source;
                         wait = this.parsed.wait || !!log;
                         output = ((_a = this.parsed.output) === null || _a === void 0 ? void 0 : _a.length)
                             ? this.parsed.output
                             : ((_b = this.parsed.output) === null || _b === void 0 ? void 0 : _b.length) === 0
                                 ? true
                                 : false;
-                        statusFile = getStatusFilePath(this.parsed.statusFile);
-                        returnStatusOnly = !!this.parsed.returnStatusOnly;
-                        ignoreWarnings = !!this.parsed.ignoreWarnings;
-                        source = this.parsed.source;
-                        streamLog = !!this.parsed.streamLog;
-                        if (returnStatusOnly && !wait)
+                        if (verbose && !wait)
                             wait = true;
-                        if (ignoreWarnings && !returnStatusOnly) {
-                            (_c = process.logger) === null || _c === void 0 ? void 0 : _c.warn("Using the 'ignoreWarnings' flag without 'returnStatusOnly' flag will not affect the sasjs job execute command.");
-                        }
                         return [4 /*yield*/, (0, utils_2.getSASjsAndAuthConfig)(target).catch(function (err) {
                                 var _a;
+                                // handle getting instance of @sasjs/adapter and auth config failure
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Unable to execute job. Error fetching auth config: ', err);
-                                return { sasjs: (0, utils_2.getSASjs)(target), authConfig: undefined };
+                                return { sasjs: undefined, authConfig: undefined };
                             })];
                     case 1:
-                        _d = _e.sent(), sasjs = _d.sasjs, authConfig = _d.authConfig;
-                        if (!authConfig)
+                        _c = _d.sent(), sasjs = _c.sasjs, authConfig = _c.authConfig;
+                        if (!authConfig || !sasjs)
                             return [2 /*return*/, command_1.ReturnCode.InternalError];
-                        return [4 /*yield*/, (0, execute_1.executeJobViya)(sasjs, authConfig, jobPath, target, wait, output, log, statusFile, returnStatusOnly, ignoreWarnings, source, streamLog)
-                                .then(function () {
-                                return command_1.ReturnCode.Success;
-                            })
+                        return [4 /*yield*/, (0, execute_1.executeJobViya)(sasjs, authConfig, jobPath, target, wait, output, log, statusFile, ignoreWarnings, source, streamLog, verbose)
+                                .then(function () { return command_1.ReturnCode.Success; })
                                 .catch(function (err) {
                                 var _a;
+                                // handle job execution failure
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error executing job: ', err);
                                 return command_1.ReturnCode.InternalError;
                             })];
                     case 2:
-                        returnCode = _e.sent();
+                        returnCode = _d.sent();
                         return [2 /*return*/, returnCode];
                 }
             });
@@ -313,6 +343,11 @@ var JobCommand = /** @class */ (function (_super) {
     return JobCommand;
 }(targetCommand_1.TargetCommand));
 exports.JobCommand = JobCommand;
+/**
+ * Gets status file path.
+ * @param statusFileArg - file path provided as command attribute.
+ * @returns - absolute status file path or undefined if command attribute wasn't provided.
+ */
 var getStatusFilePath = function (statusFileArg) {
     if (statusFileArg) {
         var currentDirPath = path_1.default.isAbsolute(statusFileArg)

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

@@ -78,7 +78,6 @@ var target = new types_1.Target({
     appLoc: '/test',
     contextName: 'Mock Context'
 });
-var statusFile;
 describe('executeJobViya', function () {
     beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
@@ -95,7 +94,7 @@ describe('executeJobViya', function () {
     it('should set streamLog to true when the flag is passed in', function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, execute_1.executeJobViya)(sasjs, mocks_1.mockAuthConfig, 'test/job', target, false, false, testLogsPath, testFilePath, false, false, undefined, true)];
+                case 0: return [4 /*yield*/, (0, execute_1.executeJobViya)(sasjs, mocks_1.mockAuthConfig, 'test/job', target, false, false, testLogsPath, testFilePath, false, undefined, true, false)];
                 case 1:
                     _a.sent();
                     expect(sasjs.startComputeJob).toHaveBeenCalledWith('test/job', null, {
@@ -105,7 +104,7 @@ describe('executeJobViya', function () {
                         pollInterval: 1000,
                         streamLog: true,
                         logFolderPath: testLogsPath
-                    }, true, undefined);
+                    }, true, undefined, undefined);
                     return [4 /*yield*/, (0, utils_1.deleteFile)(testFilePath)];
                 case 2:
                     _a.sent();
@@ -116,7 +115,7 @@ describe('executeJobViya', function () {
     it('should set streamLog to false when the flag is false', function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, execute_1.executeJobViya)(sasjs, mocks_1.mockAuthConfig, 'test/job', target, false, false, testLogsPath, testFilePath, false, false, undefined, false)];
+                case 0: return [4 /*yield*/, (0, execute_1.executeJobViya)(sasjs, mocks_1.mockAuthConfig, 'test/job', target, false, false, testLogsPath, testFilePath, false, undefined, false, false)];
                 case 1:
                     _a.sent();
                     expect(sasjs.startComputeJob).toHaveBeenCalledWith('test/job', null, {
@@ -126,7 +125,52 @@ describe('executeJobViya', function () {
                         pollInterval: 1000,
                         streamLog: false,
                         logFolderPath: testLogsPath
-                    }, true, undefined);
+                    }, true, undefined, undefined);
+                    return [4 /*yield*/, (0, utils_1.deleteFile)(testFilePath)];
+                case 2:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should pass verbose as undefined when the flag is false', function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, (0, execute_1.executeJobViya)(sasjs, mocks_1.mockAuthConfig, 'test/job', target, false, false, testLogsPath, testFilePath, false, undefined, false, false)];
+                case 1:
+                    _a.sent();
+                    expect(sasjs.startComputeJob).toHaveBeenCalledWith('test/job', null, {
+                        contextName: 'Mock Context'
+                    }, mocks_1.mockAuthConfig, true, {
+                        maxPollCount: 24 * 60 * 60,
+                        pollInterval: 1000,
+                        streamLog: false,
+                        logFolderPath: testLogsPath
+                    }, true, undefined, undefined);
+                    return [4 /*yield*/, (0, utils_1.deleteFile)(testFilePath)];
+                case 2:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should pass verbose as true when the flag is true', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var verbose;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    verbose = true;
+                    return [4 /*yield*/, (0, execute_1.executeJobViya)(sasjs, mocks_1.mockAuthConfig, 'test/job', target, false, false, testLogsPath, testFilePath, false, undefined, false, verbose)];
+                case 1:
+                    _a.sent();
+                    expect(sasjs.startComputeJob).toHaveBeenCalledWith('test/job', null, {
+                        contextName: 'Mock Context'
+                    }, mocks_1.mockAuthConfig, true, {
+                        maxPollCount: 24 * 60 * 60,
+                        pollInterval: 1000,
+                        streamLog: false,
+                        logFolderPath: testLogsPath
+                    }, true, undefined, verbose);
                     return [4 /*yield*/, (0, utils_1.deleteFile)(testFilePath)];
                 case 2:
                     _a.sent();

package/build/commands/job/spec/job.spec.server.viya.js

@@ -470,8 +470,7 @@ describe('sasjs job execute with Viya', function () {
                     mockExit = (0, test_1.mockProcessExit)();
                     return [4 /*yield*/, expect(executeWrapper({
                             jobPath: 'jobs/testJob/job',
-                            waitForJob: true,
-                            returnStatusOnly: true
+                            waitForJob: true
                         })).toResolve()];
                 case 1:
                     _a.sent();
@@ -488,8 +487,7 @@ describe('sasjs job execute with Viya', function () {
                     mockExit = (0, test_1.mockProcessExit)();
                     return [4 /*yield*/, expect(executeWrapper({
                             jobPath: 'jobs/testJob/jobWithWarning',
-                            waitForJob: true,
-                            returnStatusOnly: true
+                            waitForJob: true
                         })).toResolve()];
                 case 1:
                     _a.sent();
@@ -507,7 +505,6 @@ describe('sasjs job execute with Viya', function () {
                     return [4 /*yield*/, expect(executeWrapper({
                             jobPath: 'jobs/testJob/jobWithWarning',
                             waitForJob: true,
-                            returnStatusOnly: true,
                             ignoreWarnings: true
                         })).toResolve()];
                 case 1:
@@ -526,8 +523,7 @@ describe('sasjs job execute with Viya', function () {
                     return [4 /*yield*/, expect(executeWrapper({
                             jobPath: 'jobs/testJob/failingJob',
                             waitForJob: true,
-                            logFile: path_1.default.join(process.projectDir, 'failingJob.log'),
-                            returnStatusOnly: true
+                            logFile: path_1.default.join(process.projectDir, 'failingJob.log')
                         })).toResolve()];
                 case 1:
                     _a.sent();
@@ -556,8 +552,7 @@ describe('sasjs job execute with Viya', function () {
                     mockExit = (0, test_1.mockProcessExit)();
                     return [4 /*yield*/, expect(executeWrapper({
                             jobPath: 'jobs/testJob/failingJob_DOES_NOT_EXIST',
-                            waitForJob: true,
-                            returnStatusOnly: true
+                            waitForJob: true
                         })).toResolve()];
                 case 1:
                     _a.sent();
@@ -601,10 +596,10 @@ describe('sasjs job execute with Viya', function () {
     }); });
 });
 var executeWrapper = function (_a) {
-    var _b = _a.adapter, adapter = _b === void 0 ? sasjs : _b, jobPath = _a.jobPath, _c = _a.waitForJob, waitForJob = _c === void 0 ? false : _c, _d = _a.output, output = _d === void 0 ? false : _d, _e = _a.logFile, logFile = _e === void 0 ? undefined : _e, _f = _a.statusFile, statusFile = _f === void 0 ? undefined : _f, _g = _a.returnStatusOnly, returnStatusOnly = _g === void 0 ? false : _g, _h = _a.ignoreWarnings, ignoreWarnings = _h === void 0 ? false : _h, _j = _a.source, source = _j === void 0 ? undefined : _j, _k = _a.streamLog, streamLog = _k === void 0 ? false : _k;
+    var _b = _a.adapter, adapter = _b === void 0 ? sasjs : _b, jobPath = _a.jobPath, _c = _a.waitForJob, waitForJob = _c === void 0 ? false : _c, _d = _a.output, output = _d === void 0 ? false : _d, _e = _a.logFile, logFile = _e === void 0 ? undefined : _e, _f = _a.statusFile, statusFile = _f === void 0 ? undefined : _f, _g = _a.ignoreWarnings, ignoreWarnings = _g === void 0 ? false : _g, _h = _a.source, source = _h === void 0 ? undefined : _h, _j = _a.streamLog, streamLog = _j === void 0 ? false : _j;
     return __awaiter(void 0, void 0, void 0, function () {
-        return __generator(this, function (_l) {
-            return [2 /*return*/, (0, execute_1.executeJobViya)(adapter, authConfig, jobPath, target, waitForJob, output, logFile, statusFile, returnStatusOnly, ignoreWarnings, source, streamLog)];
+        return __generator(this, function (_k) {
+            return [2 /*return*/, (0, execute_1.executeJobViya)(adapter, authConfig, jobPath, target, waitForJob, output, logFile, statusFile, ignoreWarnings, source, streamLog, false)];
         });
     });
 };

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

@@ -183,17 +183,17 @@ describe('JobCommand', function () {
                 }
             });
         }); });
-        it('should pass wait as true if returnStatusOnly flag is present', function () { return __awaiter(void 0, void 0, void 0, function () {
+        it('should pass wait as true if verbose flag is present', function () { return __awaiter(void 0, void 0, void 0, function () {
             var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
-                    case 0: return [4 /*yield*/, executeCommandWrapper([jobPath, '--returnStatusOnly'])];
+                    case 0: return [4 /*yield*/, executeCommandWrapper([jobPath, '--verbose'])];
                     case 1:
                         _b.sent();
                         (_a = expect(viyaExecuteModule.executeJobViya)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({
                             jobPath: jobPath,
                             waitForJob: true,
-                            returnStatusOnly: true
+                            verbose: true
                         })), false));
                         return [2 /*return*/];
                 }
@@ -215,10 +215,10 @@ describe('JobCommand', function () {
                             statusFile,
                             '--source',
                             source,
-                            '--returnStatusOnly',
                             '--ignoreWarnings',
                             '--wait',
-                            '--streamLog'
+                            '--streamLog',
+                            '--verbose'
                         ])];
                     case 1:
                         _b.sent();
@@ -228,10 +228,10 @@ describe('JobCommand', function () {
                             output: output,
                             logFile: path_1.default.join(projectFolder, log),
                             statusFile: path_1.default.join(projectFolder, statusFile),
-                            returnStatusOnly: true,
                             ignoreWarnings: true,
                             source: source,
-                            streamLog: true
+                            streamLog: true,
+                            verbose: true
                         })), false));
                         return [2 /*return*/];
                 }
@@ -253,10 +253,10 @@ describe('JobCommand', function () {
                             statusFile,
                             '-s',
                             source,
-                            '-r',
                             '-i',
                             '-w',
-                            '--streamLog'
+                            '--streamLog',
+                            '-v'
                         ])];
                     case 1:
                         _b.sent();
@@ -266,10 +266,10 @@ describe('JobCommand', function () {
                             output: output,
                             logFile: path_1.default.join(projectFolder, log),
                             statusFile: path_1.default.join(projectFolder, statusFile),
-                            returnStatusOnly: true,
                             ignoreWarnings: true,
                             source: source,
-                            streamLog: true
+                            streamLog: true,
+                            verbose: true
                         })), false));
                         return [2 /*return*/];
                 }
@@ -478,6 +478,19 @@ describe('JobCommand', function () {
             });
         }); });
     });
+    it('should log deprecation warning if returnStatusOnly flag is present', function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    jest.spyOn(process.logger, 'warn');
+                    return [4 /*yield*/, executeCommandWrapper([jobPath, '--returnStatusOnly'])];
+                case 1:
+                    _a.sent();
+                    expect(process.logger.warn).toHaveBeenCalledWith('--returnStatusOnly (-r) flag is deprecated.');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
 });
 var setupMocksForViya = function () {
     jest.resetAllMocks();
@@ -527,7 +540,7 @@ var setupMocksForSAS9 = function () {
     jest.spyOn(process.logger, 'error');
 };
 var executeCalledWith = function (_a) {
-    var jobPath = _a.jobPath, _b = _a.waitForJob, waitForJob = _b === void 0 ? false : _b, _c = _a.output, output = _c === void 0 ? false : _c, _d = _a.logFile, logFile = _d === void 0 ? undefined : _d, _e = _a.statusFile, statusFile = _e === void 0 ? undefined : _e, _f = _a.returnStatusOnly, returnStatusOnly = _f === void 0 ? false : _f, _g = _a.ignoreWarnings, ignoreWarnings = _g === void 0 ? false : _g, _h = _a.source, source = _h === void 0 ? undefined : _h, _j = _a.streamLog, streamLog = _j === void 0 ? false : _j;
+    var jobPath = _a.jobPath, _b = _a.waitForJob, waitForJob = _b === void 0 ? false : _b, _c = _a.output, output = _c === void 0 ? false : _c, _d = _a.logFile, logFile = _d === void 0 ? undefined : _d, _e = _a.statusFile, statusFile = _e === void 0 ? undefined : _e, _f = _a.ignoreWarnings, ignoreWarnings = _f === void 0 ? false : _f, _g = _a.source, source = _g === void 0 ? undefined : _g, _h = _a.streamLog, streamLog = _h === void 0 ? false : _h, _j = _a.verbose, verbose = _j === void 0 ? false : _j;
     return [
         expect.anything(),
         authConfig,
@@ -537,10 +550,10 @@ var executeCalledWith = function (_a) {
         output,
         logFile,
         statusFile,
-        returnStatusOnly,
         ignoreWarnings,
         source,
-        streamLog
+        streamLog,
+        verbose
     ];
 };
 var executeCommandWrapper = function (additionalParams) { return __awaiter(void 0, void 0, void 0, function () {

package/build/commands/run/run.js

@@ -86,18 +86,18 @@ function runSasCode(target, filePath, compile, logFile, source) {
     var _a;
     if (compile === void 0) { compile = false; }
     return __awaiter(this, void 0, void 0, function () {
-        var isTempFile, sourcefilePathParts, sourceFolderPath, sasFilePath, sasFileContent, linesToExecute, macroVars, macroVarStatements;
-        var _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var isTempFile, sourcefilePathParts, sourceFolderPath, sasFilePath, sasFileContent, linesToExecute, macroVars, macroVarStatements, _b;
+        var _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
                     isTempFile = false;
                     if (!isUrl(filePath)) return [3 /*break*/, 2];
                     ;
                     return [4 /*yield*/, createFileFromUrl(filePath)];
                 case 1:
-                    (_b = _c.sent(), isTempFile = _b.isTempFile, filePath = _b.tempFilePath);
-                    _c.label = 2;
+                    (_c = _d.sent(), isTempFile = _c.isTempFile, filePath = _c.tempFilePath);
+                    _d.label = 2;
                 case 2:
                     if (!compile) return [3 /*break*/, 5];
                     if (!/\.sas$/i.test(filePath)) return [3 /*break*/, 4];
@@ -106,41 +106,46 @@ function runSasCode(target, filePath, compile, logFile, source) {
                     sourceFolderPath = sourcefilePathParts.join(path_1.default.sep);
                     return [4 /*yield*/, (0, __1.compileSingleFile)(target, 'identify', filePath, (0, internal_1.getDestinationServicePath)(sourceFolderPath), true)];
                 case 3:
-                    (filePath = (_c.sent()).destinationPath);
+                    (filePath = (_d.sent()).destinationPath);
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("File Compiled and placed at: ".concat(filePath, " ."));
                     return [3 /*break*/, 5];
                 case 4:
                     process.logger.info('Compile flag has no effect on files with extension type other than sas');
-                    _c.label = 5;
+                    _d.label = 5;
                 case 5:
                     sasFilePath = (0, utils_1.getAbsolutePath)(filePath, process.currentDir);
                     return [4 /*yield*/, (0, utils_1.readFile)(sasFilePath)];
                 case 6:
-                    sasFileContent = _c.sent();
+                    sasFileContent = _d.sent();
                     linesToExecute = sasFileContent.replace(/\r\n/g, '\n').split('\n');
                     if (!source) return [3 /*break*/, 8];
                     return [4 /*yield*/, (0, parseSourceFile_1.parseSourceFile)(source)];
                 case 7:
-                    macroVars = _c.sent();
+                    macroVars = _d.sent();
                     macroVarStatements = (0, utils_2.convertToSASStatements)(macroVars).split('\n');
                     linesToExecute = __spreadArray(__spreadArray([], __read(macroVarStatements), false), __read(linesToExecute), false);
-                    _c.label = 8;
+                    _d.label = 8;
                 case 8:
                     if (!isTempFile) return [3 /*break*/, 10];
                     return [4 /*yield*/, (0, utils_1.deleteFile)(filePath)];
                 case 9:
-                    _c.sent();
-                    _c.label = 10;
+                    _d.sent();
+                    _d.label = 10;
                 case 10:
-                    if (!(target.serverType === utils_1.ServerType.SasViya)) return [3 /*break*/, 12];
-                    return [4 /*yield*/, executeOnSasViya(filePath, target, linesToExecute, logFile)];
-                case 11: return [2 /*return*/, _c.sent()];
-                case 12:
-                    if (!(target.serverType === utils_1.ServerType.Sas9)) return [3 /*break*/, 14];
-                    return [4 /*yield*/, executeOnSas9(target, linesToExecute, logFile)];
-                case 13: return [2 /*return*/, _c.sent()];
-                case 14: return [4 /*yield*/, executeOnSasJS(filePath, target, linesToExecute, logFile)];
-                case 15: return [2 /*return*/, _c.sent()];
+                    _b = target.serverType;
+                    switch (_b) {
+                        case utils_1.ServerType.SasViya: return [3 /*break*/, 11];
+                        case utils_1.ServerType.Sas9: return [3 /*break*/, 13];
+                        case utils_1.ServerType.Sasjs: return [3 /*break*/, 15];
+                    }
+                    return [3 /*break*/, 17];
+                case 11: return [4 /*yield*/, executeOnSasViya(filePath, target, linesToExecute, logFile)];
+                case 12: return [2 /*return*/, _d.sent()];
+                case 13: return [4 /*yield*/, executeOnSas9(target, linesToExecute, logFile)];
+                case 14: return [2 /*return*/, _d.sent()];
+                case 15: return [4 /*yield*/, executeOnSasJS(filePath, target, linesToExecute, logFile)];
+                case 16: return [2 /*return*/, _d.sent()];
+                case 17: return [2 /*return*/];
             }
         });
     });
@@ -245,10 +250,12 @@ function executeOnSas9(target, linesToExecute, logFile) {
 function executeOnSasJS(filePath, target, linesToExecute, logFile) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var authConfig, _b, sasjs, fileExtension, executionResult;
+        var sasjs, authConfig, _b, fileExtension, log;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, (0, utils_2.isSasJsServerInServerMode)(target)];
+                case 0:
+                    sasjs = (0, config_1.getSASjs)(target);
+                    return [4 /*yield*/, (0, utils_2.isSasJsServerInServerMode)(target)];
                 case 1:
                     if (!(_c.sent())) return [3 /*break*/, 3];
                     return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
@@ -260,7 +267,6 @@ function executeOnSasJS(filePath, target, linesToExecute, logFile) {
                     _c.label = 4;
                 case 4:
                     authConfig = _b;
-                    sasjs = (0, config_1.getSASjs)(target);
                     fileExtension = path_1.default.extname(filePath).slice(1);
                     return [4 /*yield*/, sasjs.executeScript({
                             linesOfCode: linesToExecute,
@@ -268,12 +274,15 @@ function executeOnSasJS(filePath, target, linesToExecute, logFile) {
                             authConfig: authConfig
                         })];
                 case 5:
-                    executionResult = _c.sent();
+                    log = (_c.sent()).log;
+                    if (!log) {
+                        throw new node_1.ErrorResponse('We were not able to fetch the log this time.');
+                    }
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success('Job execution completed!');
-                    return [4 /*yield*/, createOutputFile(executionResult || '', logFile)];
+                    return [4 /*yield*/, createOutputFile(log, logFile)];
                 case 6:
                     _c.sent();
-                    return [2 /*return*/, { log: executionResult }];
+                    return [2 /*return*/, { log: log }];
             }
         });
     });
@@ -289,7 +298,7 @@ function createOutputFile(log, logFilePath, silent) {
                     if (!logFilePath) {
                         logFilePath = path_1.default.join(buildDestinationResultsFolder, "sasjs-run-".concat(timestamp, ".log"));
                     }
-                    return [4 /*yield*/, (0, saveLog_1.saveLog)(log || '', logFilePath, '', false, silent)];
+                    return [4 /*yield*/, (0, saveLog_1.saveLog)(log || '', logFilePath, '', silent)];
                 case 1:
                     _a.sent();
                     return [2 /*return*/, logFilePath];

package/build/commands/run/spec/run.spec.d.ts

@@ -0,0 +1 @@
+export {};