@sasjs/cli 3.7.8 → 3.8.1

package/build/commands/add/addCredential.js

@@ -174,7 +174,7 @@ var getTokens = function (target, client, secret, httpsAgentOptions) { return __
                 });
                 return [4 /*yield*/, (0, auth_1.getNewAccessToken)(adapter, client, secret, target).catch(function (e) {
                         var _a;
-                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("An error has occurred while validating your credentials: ".concat(e, "\nPlease check your Client ID ").concat(target.serverType === types_1.ServerType.Sasjs ? '' : 'and Client Secret ', "and try again.\n"));
+                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("An error has occurred while validating your credentials: ", e, "\nPlease check your Client ID ".concat(target.serverType === types_1.ServerType.Sasjs ? '' : 'and Client Secret ', "and try again.\n"));
                         throw e;
                     })];
             case 1:

package/build/commands/deploy/deploy.js

@@ -259,11 +259,11 @@ function deployToSasViya(deployScriptName, target, isLocal, linesToExecute, logF
  * for printing web app url on console.
  */
 function deployToSas9(deployScriptName, target, linesToExecute, logFolder, streamConfig) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function () {
-        var username, password, sas9CredentialsError, sasjs, executionResult, appLoc, webAppStreamUrl;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
+        var username, password, sas9CredentialsError, sasjs, completedWithError, executionResult, logContent, logFilePath, appLoc, webAppStreamUrl;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
                 case 0:
                     if (target.authConfigSas9) {
                         username = target.authConfigSas9.userName;
@@ -284,6 +284,7 @@ function deployToSas9(deployScriptName, target, linesToExecute, logFolder, strea
                         appLoc: target.appLoc,
                         serverType: target.serverType
                     });
+                    completedWithError = false;
                     return [4 /*yield*/, sasjs
                             .executeScriptSAS9(linesToExecute, username, password)
                             .catch(function (err) {
@@ -292,30 +293,35 @@ function deployToSas9(deployScriptName, target, linesToExecute, logFolder, strea
                             if (err && err.errorCode === 404) {
                                 (0, utils_1.displaySasjsRunnerError)(username);
                             }
+                            completedWithError = true;
+                            return err;
                         })];
                 case 1:
-                    executionResult = _e.sent();
-                    if (!executionResult) return [3 /*break*/, 5];
-                    if (!logFolder) return [3 /*break*/, 3];
-                    return [4 /*yield*/, (0, utils_2.createFile)(path_1.default.join(logFolder, "".concat(deployScriptName.replace('.sas', ''), ".log")), executionResult !== null && executionResult !== void 0 ? executionResult : '')];
+                    executionResult = _f.sent();
+                    if (!executionResult) {
+                        return [2 /*return*/, (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error getting execution log')];
+                    }
+                    if (!logFolder) {
+                        return [2 /*return*/, (_b = process.logger) === null || _b === void 0 ? void 0 : _b.error('Unable to create log file.')];
+                    }
+                    logContent = completedWithError
+                        ? executionResult.result
+                        : executionResult;
+                    logFilePath = path_1.default.join(logFolder, "".concat(deployScriptName.replace('.sas', ''), ".log"));
+                    return [4 /*yield*/, (0, utils_2.createFile)(logFilePath, logContent !== null && logContent !== void 0 ? logContent : '')];
                 case 2:
-                    _e.sent();
-                    (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Deployment completed! Log is available at ".concat(path_1.default.join(logFolder, "".concat(deployScriptName.replace('.sas', ''), ".log"))));
-                    return [3 /*break*/, 4];
-                case 3:
-                    (_b = process.logger) === null || _b === void 0 ? void 0 : _b.error('Unable to create log file.');
-                    _e.label = 4;
-                case 4:
+                    _f.sent();
+                    if (completedWithError) {
+                        (_c = process.logger) === null || _c === void 0 ? void 0 : _c.error("Deployment failed with errors! Log is available at ".concat(logFilePath));
+                        throw new Error("Deployment failed.");
+                    }
+                    (_d = process.logger) === null || _d === void 0 ? void 0 : _d.success("Deployment completed! Log is available at ".concat(logFilePath));
                     if (streamConfig === null || streamConfig === void 0 ? void 0 : streamConfig.streamWeb) {
                         appLoc = target.appLoc.replace(/\ /g, '%20');
                         webAppStreamUrl = "".concat(target.serverUrl, "/SASStoredProcess/?_PROGRAM=").concat(appLoc, "/services/").concat(streamConfig.streamServiceName);
-                        (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info("Web app is available at ".concat(webAppStreamUrl));
+                        (_e = process.logger) === null || _e === void 0 ? void 0 : _e.info("Web app is available at ".concat(webAppStreamUrl));
                     }
-                    return [3 /*break*/, 6];
-                case 5:
-                    (_d = process.logger) === null || _d === void 0 ? void 0 : _d.error('Error getting execution log');
-                    _e.label = 6;
-                case 6: return [2 /*return*/];
+                    return [2 /*return*/];
             }
         });
     });

package/build/commands/job/internal/execute/index.d.ts

@@ -1,2 +1,3 @@
 export * from './viya';
 export * from './sasjs';
+export * from './sas9';

package/build/commands/job/internal/execute/index.js

@@ -12,3 +12,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./viya"), exports);
 __exportStar(require("./sasjs"), exports);
+__exportStar(require("./sas9"), exports);

package/build/commands/job/internal/execute/sas9.d.ts

@@ -0,0 +1,14 @@
+import SASjs from '@sasjs/adapter/node';
+/**
+ * Triggers an existing Stored Process for execution as a "job".  See online documentation here: https://cli.sasjs.io/job/
+ * @param {object} sasjs - Configuration object of the SASJS adapter.
+ * @param {object} config - An object containing the username and password for authentication.
+ * @param {string} jobPath - Location of the Stored Process in SAS metadata (_program).
+ * @param {string | undefined} logFile - If provided, the CLI will write the log here.
+ * @param {string | undefined} output - If provided, and valid JSON is returned (ie using the SASjs macros), it will be written to this file location.
+ * @param {string | undefined} source - An optional path to a JSON file containing input macro variables.
+ */
+export declare function executeJobSas9(sasjs: SASjs, config: {
+    username: string;
+    password: string;
+}, jobPath: string, logFile?: string, output?: string, source?: string): Promise<any>;

package/build/commands/job/internal/execute/sas9.js

@@ -0,0 +1,139 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        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.executeJobSas9 = void 0;
+var path_1 = __importDefault(require("path"));
+var utils_1 = require("@sasjs/utils");
+var file_1 = require("../../../../utils/file");
+var displayResult_1 = require("../../../../utils/displayResult");
+var utils_2 = require("../utils");
+/**
+ * Triggers an existing Stored Process for execution as a "job".  See online documentation here: https://cli.sasjs.io/job/
+ * @param {object} sasjs - Configuration object of the SASJS adapter.
+ * @param {object} config - An object containing the username and password for authentication.
+ * @param {string} jobPath - Location of the Stored Process in SAS metadata (_program).
+ * @param {string | undefined} logFile - If provided, the CLI will write the log here.
+ * @param {string | undefined} output - If provided, and valid JSON is returned (ie using the SASjs macros), it will be written to this file location.
+ * @param {string | undefined} source - An optional path to a JSON file containing input macro variables.
+ */
+function executeJobSas9(sasjs, config, jobPath, logFile, output, source) {
+    return __awaiter(this, void 0, void 0, function () {
+        var macroVars, currentDirPath, startTime, result, endTime, outputJson, currentDirPath, outputPath, folderPath, parentFolderPath, error_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    macroVars = null;
+                    if (!source) return [3 /*break*/, 3];
+                    currentDirPath = path_1.default.isAbsolute(source) ? '' : process.projectDir;
+                    source = path_1.default.join(currentDirPath, source);
+                    if (!(0, file_1.isJsonFile)(source))
+                        throw 'Source file has to be JSON.';
+                    return [4 /*yield*/, (0, utils_1.fileExists)(source).catch(function (_) {
+                            throw 'Error while checking if source file exists.';
+                        })];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, (0, utils_1.readFile)(source).catch(function (_) {
+                            throw 'Error while reading source file.';
+                        })];
+                case 2:
+                    source = _a.sent();
+                    macroVars = JSON.parse(source);
+                    if (!(0, utils_1.isMacroVars)(macroVars)) {
+                        throw "Provided source is not valid. An example of valid source:\n{ macroVars: { name1: 'value1', name2: 'value2' } }";
+                    }
+                    _a.label = 3;
+                case 3:
+                    startTime = new Date().getTime();
+                    return [4 /*yield*/, sasjs.request(jobPath, macroVars, config)];
+                case 4:
+                    result = _a.sent();
+                    endTime = new Date().getTime();
+                    if (!result) return [3 /*break*/, 15];
+                    if (!(result.status === 200)) return [3 /*break*/, 14];
+                    process.logger.success("Job executed successfully! in ".concat((endTime - startTime) / 1000, " seconds"));
+                    if (!(!!logFile && result.log)) return [3 /*break*/, 6];
+                    return [4 /*yield*/, (0, utils_2.saveLog)(result.log, logFile, jobPath, false)];
+                case 5:
+                    _a.sent();
+                    _a.label = 6;
+                case 6:
+                    if (!(!!output && result.result)) return [3 /*break*/, 13];
+                    _a.label = 7;
+                case 7:
+                    _a.trys.push([7, 12, , 13]);
+                    outputJson = JSON.stringify(result.result, null, 2);
+                    currentDirPath = path_1.default.isAbsolute(output)
+                        ? ''
+                        : process.projectDir;
+                    outputPath = path_1.default.join(currentDirPath, /\.[a-z]{3,4}$/i.test(output)
+                        ? output
+                        : path_1.default.join(output, 'output.json'));
+                    folderPath = outputPath.split(path_1.default.sep);
+                    folderPath.pop();
+                    parentFolderPath = folderPath.join(path_1.default.sep);
+                    return [4 /*yield*/, (0, utils_1.folderExists)(parentFolderPath)];
+                case 8:
+                    if (!!(_a.sent())) return [3 /*break*/, 10];
+                    return [4 /*yield*/, (0, utils_1.createFolder)(parentFolderPath)];
+                case 9:
+                    _a.sent();
+                    _a.label = 10;
+                case 10: return [4 /*yield*/, (0, utils_1.createFile)(outputPath, outputJson)];
+                case 11:
+                    _a.sent();
+                    (0, displayResult_1.displaySuccess)("Output saved to: ".concat(outputPath));
+                    return [3 /*break*/, 13];
+                case 12:
+                    error_1 = _a.sent();
+                    (0, displayResult_1.displayError)(error_1, 'An error has occurred when parsing an output of the job.');
+                    return [3 /*break*/, 13];
+                case 13: return [3 /*break*/, 15];
+                case 14:
+                    process.logger.error(result.message);
+                    process.logger.error(JSON.stringify(result.error, null, 2));
+                    _a.label = 15;
+                case 15: return [2 /*return*/, result];
+            }
+        });
+    });
+}
+exports.executeJobSas9 = executeJobSas9;

package/build/commands/job/jobCommand.d.ts

@@ -7,5 +7,9 @@ export declare class JobCommand extends TargetCommand {
     constructor(args: string[]);
     execute(): Promise<ReturnCode>;
     executeJobSasjs(sasjs: SASjs, target: Target): Promise<ReturnCode>;
+    executeJobSas9(sasjs: SASjs, target: Target, config: {
+        username: string;
+        password: string;
+    }): Promise<ReturnCode>;
     executeJobViya(target: Target, sasjs: SASjs, authConfig: AuthConfig): Promise<ReturnCode>;
 }

package/build/commands/job/jobCommand.js

@@ -141,21 +141,14 @@ var JobCommand = /** @class */ (function (_super) {
         return _this;
     }
     JobCommand.prototype.execute = function () {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var target, sasjs, _b, authConfig, _c, _d;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
+            var target, sasjs, _c, authConfig, _d, username, password, _e, _f;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
                     case 0: return [4 /*yield*/, this.getTargetInfo()];
                     case 1:
-                        target = (_e.sent()).target;
-                        _b = target.serverType;
-                        switch (_b) {
-                            case utils_1.ServerType.SasViya: return [3 /*break*/, 2];
-                            case utils_1.ServerType.Sasjs: return [3 /*break*/, 7];
-                        }
-                        return [3 /*break*/, 11];
-                    case 2:
+                        target = (_g.sent()).target;
                         sasjs = new node_1.default({
                             serverUrl: target.serverUrl,
                             httpsAgentOptions: target.httpsAgentOptions,
@@ -163,42 +156,74 @@ var JobCommand = /** @class */ (function (_super) {
                             serverType: target.serverType,
                             debug: true
                         });
-                        return [4 /*yield*/, (0, utils_2.getAuthConfig)(target).catch(function (err) {
-                                var _a;
-                                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Unable to execute job. Error fetching auth config: ', err);
-                                return null;
-                            })];
+                        _c = target.serverType;
+                        switch (_c) {
+                            case utils_1.ServerType.SasViya: return [3 /*break*/, 2];
+                            case utils_1.ServerType.Sas9: return [3 /*break*/, 7];
+                            case utils_1.ServerType.Sasjs: return [3 /*break*/, 11];
+                        }
+                        return [3 /*break*/, 15];
+                    case 2: return [4 /*yield*/, (0, utils_2.getAuthConfig)(target).catch(function (err) {
+                            var _a;
+                            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Unable to execute job. Error fetching auth config: ', err);
+                            return null;
+                        })];
                     case 3:
-                        authConfig = _e.sent();
+                        authConfig = _g.sent();
                         if (!authConfig)
                             return [2 /*return*/, command_1.ReturnCode.InternalError];
                         if (!this.jobSubCommands.includes(this.parsed.subCommand)) return [3 /*break*/, 5];
                         return [4 /*yield*/, this.executeJobViya(target, sasjs, authConfig)];
                     case 4:
-                        _c = _e.sent();
+                        _d = _g.sent();
                         return [3 /*break*/, 6];
                     case 5:
-                        _c = command_1.ReturnCode.InvalidCommand;
-                        _e.label = 6;
-                    case 6: return [2 /*return*/, _c];
+                        _d = command_1.ReturnCode.InvalidCommand;
+                        _g.label = 6;
+                    case 6: return [2 /*return*/, _d];
                     case 7:
+                        username = void 0;
+                        password = void 0;
+                        if (target.authConfigSas9) {
+                            username = target.authConfigSas9.userName;
+                            password = target.authConfigSas9.password;
+                        }
+                        else {
+                            username = process.env.SAS_USERNAME;
+                            password = process.env.SAS_PASSWORD;
+                        }
+                        if (!username || !password) {
+                            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Unable to execute job. username and password not found');
+                            return [2 /*return*/, command_1.ReturnCode.InternalError];
+                        }
+                        password = (0, utils_1.decodeFromBase64)(password);
+                        if (!this.jobSubCommands.includes(this.parsed.subCommand)) return [3 /*break*/, 9];
+                        return [4 /*yield*/, this.executeJobSas9(sasjs, target, { username: username, password: password })];
+                    case 8:
+                        _e = _g.sent();
+                        return [3 /*break*/, 10];
+                    case 9:
+                        _e = command_1.ReturnCode.InvalidCommand;
+                        _g.label = 10;
+                    case 10: return [2 /*return*/, _e];
+                    case 11:
                         sasjs = new node_1.default({
                             serverType: target.serverType,
                             serverUrl: target.serverUrl
                         });
                         if (typeof this.parsed.jobPath !== 'string')
                             return [2 /*return*/, command_1.ReturnCode.InvalidCommand];
-                        if (!this.jobSubCommands.includes(this.parsed.subCommand)) return [3 /*break*/, 9];
+                        if (!this.jobSubCommands.includes(this.parsed.subCommand)) return [3 /*break*/, 13];
                         return [4 /*yield*/, this.executeJobSasjs(sasjs, target)];
-                    case 8:
-                        _d = _e.sent();
-                        return [3 /*break*/, 10];
-                    case 9:
-                        _d = command_1.ReturnCode.InvalidCommand;
-                        _e.label = 10;
-                    case 10: return [2 /*return*/, _d];
-                    case 11:
-                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("This command is only supported for SAS Viya targets.\nPlease try again with a different target.");
+                    case 12:
+                        _f = _g.sent();
+                        return [3 /*break*/, 14];
+                    case 13:
+                        _f = command_1.ReturnCode.InvalidCommand;
+                        _g.label = 14;
+                    case 14: return [2 /*return*/, _f];
+                    case 15:
+                        (_b = process.logger) === null || _b === void 0 ? void 0 : _b.error("This command is not supported for specified server type.\nPlease try again with a different server type.");
                         return [2 /*return*/, command_1.ReturnCode.InternalError];
                 }
             });
@@ -225,6 +250,35 @@ var JobCommand = /** @class */ (function (_super) {
             });
         });
     };
+    JobCommand.prototype.executeJobSas9 = function (sasjs, target, config) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function () {
+            var jobPath, log, output, source, returnCode;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        jobPath = (0, prefixAppLoc_1.prefixAppLoc)(target.appLoc, this.parsed.jobPath);
+                        log = (0, getLogFilePath_1.getLogFilePath)(this.parsed.log, jobPath);
+                        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, execute_1.executeJobSas9)(sasjs, config, jobPath, log, output, source)
+                                .then(function () {
+                                return command_1.ReturnCode.Success;
+                            })
+                                .catch(function (err) {
+                                var _a;
+                                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error executing job: ', err);
+                                return command_1.ReturnCode.InternalError;
+                            })];
+                    case 1:
+                        returnCode = _b.sent();
+                        return [2 /*return*/, returnCode];
+                }
+            });
+        });
+    };
     JobCommand.prototype.executeJobViya = function (target, sasjs, authConfig) {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function () {

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

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
@@ -96,17 +85,37 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var path_1 = __importDefault(require("path"));
 var viyaExecuteModule = __importStar(require("../internal/execute/viya"));
+var sas9ExecuteModule = __importStar(require("../internal/execute/sas9"));
+var node_1 = __importDefault(require("@sasjs/adapter/node"));
 var jobCommand_1 = require("../jobCommand");
 var utils_1 = require("@sasjs/utils");
+var SasjsUtilsFilesModule = __importStar(require("@sasjs/utils/file"));
 var configUtils = __importStar(require("../../../utils/config"));
 var command_1 = require("../../../types/command");
+var utilsModule = __importStar(require("../internal/utils"));
 var defaultArgs = ['node', 'sasjs', 'job', 'execute'];
-var target = new utils_1.Target({
+var targetViya = new utils_1.Target({
     name: 'test',
     appLoc: '/Public/test/',
     serverType: utils_1.ServerType.SasViya,
     contextName: 'test context'
 });
+var target9 = new utils_1.Target({
+    name: 'test',
+    appLoc: '/Public/test/',
+    serverType: utils_1.ServerType.Sas9,
+    contextName: 'test context',
+    authConfigSas9: {
+        userName: 'testUser',
+        password: 'password'
+    }
+});
+var sas9TargetWithoutAuthConfig = new utils_1.Target({
+    name: 'test',
+    appLoc: '/Public/test/',
+    serverType: utils_1.ServerType.Sas9,
+    contextName: 'test context'
+});
 var authConfig = {};
 var jobFileName = 'someJob';
 var jobPath = "/Public/folder/".concat(jobFileName);
@@ -122,215 +131,351 @@ describe('JobCommand', function () {
             return [2 /*return*/];
         });
     }); });
-    beforeEach(function () {
-        setupMocks();
-    });
-    it('should parse sasjs job execute command', 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])];
-                case 1:
-                    _b.sent();
-                    (_a = expect(viyaExecuteModule.executeJobViya)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({ jobPath: jobPath })), false));
-                    return [2 /*return*/];
-            }
-        });
-    }); });
-    it('should pass wait as true if log flag with value 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, '--log', log])];
-                case 1:
-                    _b.sent();
-                    (_a = expect(viyaExecuteModule.executeJobViya)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({
-                        jobPath: jobPath,
-                        waitForJob: true,
-                        logFile: path_1.default.join(projectFolder, log)
-                    })), false));
-                    return [2 /*return*/];
-            }
+    describe('for server type viya', function () {
+        beforeEach(function () {
+            setupMocksForViya();
         });
-    }); });
-    it('should pass path for log file and wait to true if log flag without value 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, '--log'])];
-                case 1:
-                    _b.sent();
-                    (_a = expect(viyaExecuteModule.executeJobViya)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({
-                        jobPath: jobPath,
-                        waitForJob: true,
-                        logFile: path_1.default.join(process.projectDir, "".concat(jobFileName, ".log"))
-                    })), false));
-                    return [2 /*return*/];
-            }
-        });
-    }); });
-    it('should pass wait as true if returnStatusOnly 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 1:
-                    _b.sent();
-                    (_a = expect(viyaExecuteModule.executeJobViya)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({
-                        jobPath: jobPath,
-                        waitForJob: true,
-                        returnStatusOnly: true
-                    })), false));
-                    return [2 /*return*/];
-            }
-        });
-    }); });
-    it('should parse sasjs job execute command with all arguments', 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,
-                        '--target',
-                        'test',
-                        '--log',
-                        log,
-                        '--output',
-                        output,
-                        '--statusFile',
-                        statusFile,
-                        '--source',
-                        source,
-                        '--returnStatusOnly',
-                        '--ignoreWarnings',
-                        '--wait',
-                        '--streamLog'
-                    ])];
-                case 1:
-                    _b.sent();
-                    (_a = expect(viyaExecuteModule.executeJobViya)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({
-                        jobPath: jobPath,
-                        waitForJob: true,
-                        output: output,
-                        logFile: path_1.default.join(projectFolder, log),
-                        statusFile: path_1.default.join(projectFolder, statusFile),
-                        returnStatusOnly: true,
-                        ignoreWarnings: true,
-                        source: source,
-                        streamLog: true
-                    })), false));
-                    return [2 /*return*/];
-            }
-        });
-    }); });
-    it('should parse a sasjs job execute command with all shorthand arguments', 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,
-                        '-t',
-                        'test',
-                        '-l',
-                        log,
-                        '-o',
-                        output,
-                        '--statusFile',
-                        statusFile,
-                        '-s',
-                        source,
-                        '-r',
-                        '-i',
-                        '-w',
-                        '--streamLog'
-                    ])];
-                case 1:
-                    _b.sent();
-                    (_a = expect(viyaExecuteModule.executeJobViya)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({
-                        jobPath: jobPath,
-                        waitForJob: true,
-                        output: output,
-                        logFile: path_1.default.join(projectFolder, log),
-                        statusFile: path_1.default.join(projectFolder, statusFile),
-                        returnStatusOnly: true,
-                        ignoreWarnings: true,
-                        source: source,
-                        streamLog: true
-                    })), false));
-                    return [2 /*return*/];
-            }
-        });
-    }); });
-    it('should log success and return the success code when execution is successful', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var returnCode;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, executeCommandWrapper([jobPath])];
-                case 1:
-                    returnCode = _a.sent();
-                    expect(returnCode).toEqual(command_1.ReturnCode.Success);
-                    return [2 /*return*/];
-            }
+        it('should parse sasjs job execute command', 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])];
+                    case 1:
+                        _b.sent();
+                        (_a = expect(viyaExecuteModule.executeJobViya)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({ jobPath: jobPath })), false));
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should pass wait as true if log flag with value 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, '--log', log])];
+                    case 1:
+                        _b.sent();
+                        (_a = expect(viyaExecuteModule.executeJobViya)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({
+                            jobPath: jobPath,
+                            waitForJob: true,
+                            logFile: path_1.default.join(projectFolder, log)
+                        })), false));
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should pass path for log file and wait to true if log flag without value 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, '--log'])];
+                    case 1:
+                        _b.sent();
+                        (_a = expect(viyaExecuteModule.executeJobViya)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({
+                            jobPath: jobPath,
+                            waitForJob: true,
+                            logFile: path_1.default.join(process.projectDir, "".concat(jobFileName, ".log"))
+                        })), false));
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should pass wait as true if returnStatusOnly 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 1:
+                        _b.sent();
+                        (_a = expect(viyaExecuteModule.executeJobViya)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({
+                            jobPath: jobPath,
+                            waitForJob: true,
+                            returnStatusOnly: true
+                        })), false));
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should parse sasjs job execute command with all arguments', 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,
+                            '--target',
+                            'test',
+                            '--log',
+                            log,
+                            '--output',
+                            output,
+                            '--statusFile',
+                            statusFile,
+                            '--source',
+                            source,
+                            '--returnStatusOnly',
+                            '--ignoreWarnings',
+                            '--wait',
+                            '--streamLog'
+                        ])];
+                    case 1:
+                        _b.sent();
+                        (_a = expect(viyaExecuteModule.executeJobViya)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({
+                            jobPath: jobPath,
+                            waitForJob: true,
+                            output: output,
+                            logFile: path_1.default.join(projectFolder, log),
+                            statusFile: path_1.default.join(projectFolder, statusFile),
+                            returnStatusOnly: true,
+                            ignoreWarnings: true,
+                            source: source,
+                            streamLog: true
+                        })), false));
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should parse a sasjs job execute command with all shorthand arguments', 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,
+                            '-t',
+                            'test',
+                            '-l',
+                            log,
+                            '-o',
+                            output,
+                            '--statusFile',
+                            statusFile,
+                            '-s',
+                            source,
+                            '-r',
+                            '-i',
+                            '-w',
+                            '--streamLog'
+                        ])];
+                    case 1:
+                        _b.sent();
+                        (_a = expect(viyaExecuteModule.executeJobViya)).toHaveBeenCalledWith.apply(_a, __spreadArray([], __read(executeCalledWith({
+                            jobPath: jobPath,
+                            waitForJob: true,
+                            output: output,
+                            logFile: path_1.default.join(projectFolder, log),
+                            statusFile: path_1.default.join(projectFolder, statusFile),
+                            returnStatusOnly: true,
+                            ignoreWarnings: true,
+                            source: source,
+                            streamLog: true
+                        })), false));
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should log success and return the success code when execution is successful', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var returnCode;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, executeCommandWrapper([jobPath])];
+                    case 1:
+                        returnCode = _a.sent();
+                        expect(returnCode).toEqual(command_1.ReturnCode.Success);
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should return the error code when getting Auth Config is unsuccessful', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var returnCode;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        jest
+                            .spyOn(configUtils, 'getAuthConfig')
+                            .mockImplementation(function () { return Promise.reject(new Error('Test Error')); });
+                        return [4 /*yield*/, executeCommandWrapper([jobPath])];
+                    case 1:
+                        returnCode = _a.sent();
+                        expect(returnCode).toEqual(command_1.ReturnCode.InternalError);
+                        expect(process.logger.error).toHaveBeenCalled();
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should log the error and return the error code when execution is unsuccessful', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var returnCode;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        jest
+                            .spyOn(viyaExecuteModule, 'executeJobViya')
+                            .mockImplementation(function () { return Promise.reject(new Error('Test Error')); });
+                        return [4 /*yield*/, executeCommandWrapper([jobPath])];
+                    case 1:
+                        returnCode = _a.sent();
+                        expect(returnCode).toEqual(command_1.ReturnCode.InternalError);
+                        expect(process.logger.error).toHaveBeenCalled();
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+    });
+    describe('for server type sas9', function () {
+        beforeEach(function () {
+            setupMocksForSAS9();
         });
-    }); });
-    it('should return the error code when target is not SASVIYA', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var returnCode;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    jest
-                        .spyOn(configUtils, 'findTargetInConfiguration')
-                        .mockImplementation(function () {
-                        return Promise.resolve({
-                            target: new utils_1.Target(__assign(__assign({}, target.toJson()), { serverType: utils_1.ServerType.Sas9 })),
-                            isLocal: true
+        it('should return the error code when user credentials are not found', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var username, password, returnCode;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        username = process.env.SAS_USERNAME;
+                        password = process.env.SAS_PASSWORD;
+                        process.env.SAS_USERNAME = '';
+                        process.env.SAS_PASSWORD = '';
+                        jest
+                            .spyOn(configUtils, 'findTargetInConfiguration')
+                            .mockImplementation(function () {
+                            return Promise.resolve({
+                                target: sas9TargetWithoutAuthConfig,
+                                isLocal: true
+                            });
                         });
-                    });
-                    return [4 /*yield*/, executeCommandWrapper([jobPath], false)];
-                case 1:
-                    returnCode = _a.sent();
-                    expect(returnCode).toEqual(command_1.ReturnCode.InternalError);
-                    expect(process.logger.error).toHaveBeenCalled();
-                    return [2 /*return*/];
-            }
-        });
-    }); });
-    it('should return the error code when getting Auth Config is unsuccessful', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var returnCode;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    jest
-                        .spyOn(configUtils, 'getAuthConfig')
-                        .mockImplementation(function () { return Promise.reject(new Error('Test Error')); });
-                    return [4 /*yield*/, executeCommandWrapper([jobPath])];
-                case 1:
-                    returnCode = _a.sent();
-                    expect(returnCode).toEqual(command_1.ReturnCode.InternalError);
-                    expect(process.logger.error).toHaveBeenCalled();
-                    return [2 /*return*/];
-            }
-        });
-    }); });
-    it('should log the error and return the error code when execution is unsuccessful', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var returnCode;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    jest
-                        .spyOn(viyaExecuteModule, 'executeJobViya')
-                        .mockImplementation(function () { return Promise.reject(new Error('Test Error')); });
-                    return [4 /*yield*/, executeCommandWrapper([jobPath])];
-                case 1:
-                    returnCode = _a.sent();
-                    expect(returnCode).toEqual(command_1.ReturnCode.InternalError);
-                    expect(process.logger.error).toHaveBeenCalled();
-                    return [2 /*return*/];
-            }
-        });
-    }); });
+                        return [4 /*yield*/, executeCommandWrapper([jobPath])];
+                    case 1:
+                        returnCode = _a.sent();
+                        expect(returnCode).toEqual(command_1.ReturnCode.InternalError);
+                        expect(process.logger.error).toHaveBeenCalled();
+                        process.env.SAS_USERNAME = username;
+                        process.env.SAS_PASSWORD = password;
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should log success and return the success code when execution is successful', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var returnCode;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        jest
+                            .spyOn(sas9ExecuteModule, 'executeJobSas9')
+                            .mockImplementation(function () { return Promise.resolve(); });
+                        return [4 /*yield*/, executeCommandWrapper([jobPath])];
+                    case 1:
+                        returnCode = _a.sent();
+                        expect(returnCode).toEqual(command_1.ReturnCode.Success);
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should log the error and return the error code when execution is unsuccessful', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var returnCode;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        jest
+                            .spyOn(sas9ExecuteModule, 'executeJobSas9')
+                            .mockImplementation(function () { return Promise.reject(new Error('Test Error')); });
+                        return [4 /*yield*/, executeCommandWrapper([jobPath])];
+                    case 1:
+                        returnCode = _a.sent();
+                        expect(returnCode).toEqual(command_1.ReturnCode.InternalError);
+                        expect(process.logger.error).toHaveBeenCalled();
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should log success and return the success code with source argument', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var returnCode;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, executeCommandWrapper([
+                            jobPath,
+                            '--source',
+                            'testSource/source.json'
+                        ])];
+                    case 1:
+                        returnCode = _a.sent();
+                        expect(returnCode).toEqual(command_1.ReturnCode.Success);
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should log the error and return the error code when source argument is provide but source file does not exists', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var returnCode;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, executeCommandWrapper([
+                            jobPath,
+                            '--source',
+                            'source.json'
+                        ])];
+                    case 1:
+                        returnCode = _a.sent();
+                        expect(returnCode).toEqual(command_1.ReturnCode.InternalError);
+                        expect(process.logger.error).toHaveBeenCalled();
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should log the error and return the error code when source argument is provide but source does not contain valid macroVars', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var returnCode;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, executeCommandWrapper([
+                            jobPath,
+                            '--source',
+                            'testSource/invalid.json'
+                        ])];
+                    case 1:
+                        returnCode = _a.sent();
+                        expect(returnCode).toEqual(command_1.ReturnCode.InternalError);
+                        expect(process.logger.error).toHaveBeenCalled();
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should log success and return the success code with log argument', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var returnCode;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        jest
+                            .spyOn(utilsModule, 'saveLog')
+                            .mockImplementation(function () { return Promise.resolve(); });
+                        return [4 /*yield*/, executeCommandWrapper([
+                                jobPath,
+                                '--log',
+                                'sample.log'
+                            ])];
+                    case 1:
+                        returnCode = _a.sent();
+                        expect(returnCode).toEqual(command_1.ReturnCode.Success);
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should log success and return the success code with output argument', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var returnCode;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        jest
+                            .spyOn(SasjsUtilsFilesModule, 'createFile')
+                            .mockImplementation(function () { return Promise.resolve(); });
+                        return [4 /*yield*/, executeCommandWrapper([
+                                jobPath,
+                                '--output',
+                                'output.json'
+                            ])];
+                    case 1:
+                        returnCode = _a.sent();
+                        expect(returnCode).toEqual(command_1.ReturnCode.Success);
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+    });
 });
-var setupMocks = function () {
+var setupMocksForViya = function () {
     jest.resetAllMocks();
     jest.mock('../internal/execute');
     jest.mock('../../../utils/config');
@@ -339,20 +484,40 @@ var setupMocks = function () {
         .mockImplementation(function () { return Promise.resolve(); });
     jest
         .spyOn(configUtils, 'findTargetInConfiguration')
-        .mockImplementation(function () { return Promise.resolve({ target: target, isLocal: true }); });
+        .mockImplementation(function () {
+        return Promise.resolve({ target: targetViya, isLocal: true });
+    });
     jest
         .spyOn(configUtils, 'getAuthConfig')
         .mockImplementation(function () { return Promise.resolve(authConfig); });
     process.logger = new utils_1.Logger(utils_1.LogLevel.Off);
     jest.spyOn(process.logger, 'error');
 };
+var setupMocksForSAS9 = function () {
+    jest.resetAllMocks();
+    jest.mock('../internal/execute');
+    jest.spyOn(node_1.default.prototype, 'request').mockImplementation(function () {
+        return Promise.resolve({
+            status: 200,
+            result: { data: 'test data' },
+            log: 'test log'
+        });
+    });
+    jest
+        .spyOn(configUtils, 'findTargetInConfiguration')
+        .mockImplementation(function () {
+        return Promise.resolve({ target: target9, isLocal: true });
+    });
+    process.logger = new utils_1.Logger(utils_1.LogLevel.Off);
+    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;
     return [
         expect.anything(),
         authConfig,
         jobPath,
-        target,
+        targetViya,
         waitForJob,
         output,
         logFile,
@@ -363,36 +528,26 @@ var executeCalledWith = function (_a) {
         streamLog
     ];
 };
-var executeCommandWrapper = function (additionalParams, checkTarget) {
-    if (checkTarget === void 0) { checkTarget = true; }
-    return __awaiter(void 0, void 0, void 0, function () {
-        var subCommand, args, command, returnCode, targetInfo;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    subCommand = 'execute';
-                    args = __spreadArray(__spreadArray([], __read(defaultArgs), false), __read(additionalParams), false).map(function (arg) {
-                        if (arg === 'execute') {
-                            arg = Math.random() > 0.5 ? 'exec' : arg;
-                            subCommand = arg;
-                        }
-                        return arg;
-                    });
-                    command = new jobCommand_1.JobCommand(args);
-                    return [4 /*yield*/, command.execute()];
-                case 1:
-                    returnCode = _a.sent();
-                    expect(command.name).toEqual('job');
-                    expect(command.subCommand).toEqual(subCommand);
-                    if (!checkTarget) return [3 /*break*/, 3];
-                    return [4 /*yield*/, command.getTargetInfo()];
-                case 2:
-                    targetInfo = _a.sent();
-                    expect(targetInfo.target).toEqual(target);
-                    expect(targetInfo.isLocal).toBeTrue();
-                    _a.label = 3;
-                case 3: return [2 /*return*/, returnCode];
-            }
-        });
+var executeCommandWrapper = function (additionalParams) { return __awaiter(void 0, void 0, void 0, function () {
+    var subCommand, args, command, returnCode;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                subCommand = 'execute';
+                args = __spreadArray(__spreadArray([], __read(defaultArgs), false), __read(additionalParams), false).map(function (arg) {
+                    if (arg === 'execute') {
+                        arg = Math.random() > 0.5 ? 'exec' : arg;
+                        subCommand = arg;
+                    }
+                    return arg;
+                });
+                command = new jobCommand_1.JobCommand(args);
+                return [4 /*yield*/, command.execute()];
+            case 1:
+                returnCode = _a.sent();
+                expect(command.name).toEqual('job');
+                expect(command.subCommand).toEqual(subCommand);
+                return [2 /*return*/, returnCode];
+        }
     });
-};
+}); };

package/build/commands/testing/test.js

@@ -225,13 +225,14 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                                         printTestUrl = function () { return process.logger.info("Test URL: ".concat(testUrl)); };
                                         printTestUrl();
                                         handleRes = function (res) { return __awaiter(_this, void 0, void 0, function () {
-                                            var lineBreak, existingTestTarget, existingTestTarget;
+                                            var lineBreak, test_results, existingTestTarget, existingTestTarget;
                                             var _a, _b;
                                             return __generator(this, function (_c) {
                                                 switch (_c.label) {
                                                     case 0:
                                                         lineBreak = true;
-                                                        if (!res.result) {
+                                                        test_results = (_a = res.result) === null || _a === void 0 ? void 0 : _a.test_results;
+                                                        if (!test_results) {
                                                             (0, displayResult_1.displayError)({}, "Job did not return a response, to debug click ".concat(testUrl));
                                                             printCodeExample();
                                                             lineBreak = false;
@@ -258,8 +259,6 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                                                                 });
                                                             }
                                                         }
-                                                        if (!((_a = res.result) === null || _a === void 0 ? void 0 : _a.test_results))
-                                                            lineBreak = false;
                                                         if (!res.log) return [3 /*break*/, 2];
                                                         return [4 /*yield*/, (0, saveOutput_1.saveLog)(outDirectory, test, res.log, lineBreak)];
                                                     case 1:

package/build/utils/auth.js

@@ -124,7 +124,14 @@ function getNewAccessToken(sasjsInstance, clientId, clientSecret, target) {
                     return [4 /*yield*/, getAuthCode(authUrl)];
                 case 1:
                     authCode = _b.sent();
-                    return [4 /*yield*/, sasjsInstance.getAccessToken(clientId, clientSecret, authCode)];
+                    return [4 /*yield*/, sasjsInstance
+                            .getAccessToken(clientId, clientSecret, authCode)
+                            .then(function (res) {
+                            var access_token = res.access_token, refresh_token = res.refresh_token;
+                            if (access_token && refresh_token)
+                                return res;
+                            throw res;
+                        })];
                 case 2:
                     _a = _b.sent(), access_token = _a.access_token, refresh_token = _a.refresh_token;
                     return [2 /*return*/, { access_token: access_token, refresh_token: refresh_token }];

package/package.json

@@ -47,8 +47,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "3.7.4",
-    "@sasjs/core": "4.9.2",
+    "@sasjs/adapter": "3.7.8",
+    "@sasjs/core": "4.12.0",
     "@sasjs/lint": "1.11.2",
     "@sasjs/utils": "2.36.0",
     "chalk": "4.1.2",
@@ -94,5 +94,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.7.8"
+  "version": "3.8.1"
 }