@sasjs/cli 4.6.0 → 4.8.0

package/build/commands/docs/spec/docsCommand.spec.js

@@ -358,7 +358,6 @@ var setupMocks = function () {
     jest
         .spyOn(configUtils, 'findTargetInConfiguration')
         .mockImplementation(function () { return Promise.resolve({ target: target, isLocal: true }); });
-    jest.spyOn(process.logger, 'error');
     jest
         .spyOn(configUtils, 'getLocalConfig')
         .mockImplementation(function () { return Promise.resolve(config); });

package/build/commands/flow/execute.js

@@ -73,10 +73,14 @@ function execute(target, sasjs, authConfig, source, logFolder, csvFile, streamLo
                                 _b = (0, internal_1.checkPredecessorDeadlock)(flows), predecessorDeadlock = _b.present, deadlockChain = _b.chain;
                                 if (predecessorDeadlock)
                                     return [2 /*return*/, reject('Circular dependency found in flows, cannot proceed\n- ' +
-                                            deadlockChain.join(' -> '))];
+                                            deadlockChain.join(' -> '))
+                                        // job state poll options
+                                        // maxPollCount and pollInterval are set to 0 to use default polling options
+                                        // configured in @sasjs/adapter/src/api/viya/pollJobState.ts
+                                    ];
                                 pollOptions = {
-                                    maxPollCount: 24 * 60 * 60,
-                                    pollInterval: 1000,
+                                    maxPollCount: 0,
+                                    pollInterval: 0,
                                     streamLog: streamLog,
                                     logFolderPath: logFolderRealPath
                                 };

package/build/commands/flow/internal/spec/executeFlow.spec.js

@@ -70,8 +70,8 @@ var saveToCsvModule = __importStar(require("../saveToCsv"));
 var normalizeFilePath = __importStar(require("../normalizeFilePath"));
 var csvColumns_1 = __importDefault(require("../csvColumns"));
 var pollOptions = {
-    maxPollCount: 24 * 60 * 60,
-    pollInterval: 1000,
+    maxPollCount: 0,
+    pollInterval: 0,
     streamLog: false,
     logFolderPath: 'fake/log/folder/path'
 };

package/build/commands/help/help.js

@@ -274,7 +274,7 @@ function printHelpText() {
                         "[2spaces]NOTE: Providing output flag (--output or -o) is optional. If present, CLI will immediately print out the response JSON. If value is provided, it will be treated as file path to save the response JSON.",
                         "[2spaces]NOTE: Providing log flag (--log or -l) is optional. If present, CLI will fetch and save job log to local file.",
                         "[2spaces]NOTE: Providing ignore warnings (--ignoreWarnings or -i) flag is optional. If present, CLI will return status '0', when the job state is warning.",
-                        "[2spaces]NOTE: Providing verbose (--verbose or -v) flag is optional. If present, CLI will log summary of every HTTP response."
+                        "[2spaces]NOTE: Providing verbose (--verbose or -v) flag is optional. If present, CLI will log summary of every HTTP response. If set to 'bleached', CLI will log summary of every HTTP response without extra colors."
                     ]
                 },
                 {
@@ -322,6 +322,17 @@ function printHelpText() {
                         "[2spaces]NOTE: Providing outDirectory flag is optional. If not present, CLI will use save outputs into sasjsresults folder.",
                         "[2spaces]NOTE: Providing force (--force or -f) flag is optional. If present, CLI will force command to finish running all tests and will not return an error code even when some are failing. Useful when the requirement is not to make CI Pipeline fail."
                     ]
+                },
+                {
+                    name: 'snippets',
+                    title: 'snippets',
+                    description: [
+                        "Generates VS Code snippets from the Doxygen headers in the SAS Macros.",
+                        "[2spaces]command example: sasjs snippets --outDirectory <folderPath> --target <targetName>",
+                        "",
+                        "[2spaces]NOTE: Providing <folderPath> is optional. If not present, generated snippets will be saved to 'sasjsresults/sasjs-macro-snippets.json' file.",
+                        "[2spaces]NOTE: more information can be found here https://cli.sasjs.io/snippets/."
+                    ]
                 }
             ];
             aliases = [

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

@@ -1,13 +1,15 @@
-import { Target } from '@sasjs/utils';
+import { AuthConfig, Target } from '@sasjs/utils';
+import SASjs from '@sasjs/adapter/node';
 /**
  * Triggers existing job for execution on SASJS server.
+ * @param {object} sasjs - configuration object of SAS adapter.
  * @param target - SASJS server configuration.
  * @param jobPath - location of the job.
  * @param logFile - flag indicating if CLI should fetch and save log to provided file path. If filepath wasn't provided, {job}.log file will be created in current folder.
  * @param output - flag indicating if CLI should save output to provided file path.
  * @returns - promise that resolves into an object with log and output.
  */
-export declare function executeJobSasjs(target: Target, jobPath: string, logFile?: string, output?: string): Promise<{
+export declare function executeJobSasjs(sasjs: SASjs, target: Target, jobPath: string, logFile?: string, output?: string, authConfig?: AuthConfig): Promise<{
     result: any;
     log: any;
-}>;
+} | undefined>;

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

@@ -37,58 +37,44 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeJobSasjs = void 0;
-var node_1 = require("@sasjs/adapter/node");
-var utils_1 = require("../../../../utils");
-var utils_2 = require("../utils");
+var utils_1 = require("../utils");
 /**
  * Triggers existing job for execution on SASJS server.
+ * @param {object} sasjs - configuration object of SAS adapter.
  * @param target - SASJS server configuration.
  * @param jobPath - location of the job.
  * @param logFile - flag indicating if CLI should fetch and save log to provided file path. If filepath wasn't provided, {job}.log file will be created in current folder.
  * @param output - flag indicating if CLI should save output to provided file path.
  * @returns - promise that resolves into an object with log and output.
  */
-function executeJobSasjs(target, jobPath, logFile, output) {
+function executeJobSasjs(sasjs, target, jobPath, logFile, output, authConfig) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var authConfig, _b, sasjsApiClient, response;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4 /*yield*/, (0, utils_1.isSasJsServerInServerMode)(target)];
+        var response;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, sasjs.executeJob({
+                        _program: jobPath
+                    }, target.appLoc, authConfig)];
                 case 1:
-                    if (!(_c.sent())) return [3 /*break*/, 3];
-                    return [4 /*yield*/, (0, utils_1.getAuthConfig)(target)];
-                case 2:
-                    _b = _c.sent();
-                    return [3 /*break*/, 4];
-                case 3:
-                    _b = undefined;
-                    _c.label = 4;
-                case 4:
-                    authConfig = _b;
-                    sasjsApiClient = new node_1.SASjsApiClient(new node_1.SasjsRequestClient(target.serverUrl, target.httpsAgentOptions));
-                    return [4 /*yield*/, sasjsApiClient.executeJob({
-                            _program: jobPath
-                        }, target.appLoc, authConfig)];
-                case 5:
-                    response = _c.sent();
-                    if (!response) return [3 /*break*/, 9];
+                    response = _b.sent();
+                    if (!response) return [3 /*break*/, 5];
                     // handle success
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success('Job executed successfully!');
-                    if (!(!!logFile && response.log)) return [3 /*break*/, 7];
-                    return [4 /*yield*/, (0, utils_2.saveLog)(response.log, logFile, jobPath)
+                    if (!(!!logFile && response.log)) return [3 /*break*/, 3];
+                    return [4 /*yield*/, (0, utils_1.saveLog)(response.log, logFile, jobPath)
                         // save output if it is present
                     ];
-                case 6:
-                    _c.sent();
-                    _c.label = 7;
-                case 7:
-                    if (!(!!output && response.result)) return [3 /*break*/, 9];
-                    return [4 /*yield*/, (0, utils_2.saveOutput)(response.result, output)];
-                case 8:
-                    _c.sent();
-                    _c.label = 9;
-                case 9: return [2 /*return*/, response];
+                case 2:
+                    _b.sent();
+                    _b.label = 3;
+                case 3:
+                    if (!(!!output && response.result)) return [3 /*break*/, 5];
+                    return [4 /*yield*/, (0, utils_1.saveOutput)(response.result, output)];
+                case 4:
+                    _b.sent();
+                    _b.label = 5;
+                case 5: return [2 /*return*/, response];
             }
         });
     });

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

@@ -13,9 +13,8 @@ import { Target, AuthConfig } from '@sasjs/utils';
  * @param {boolean} ignoreWarnings - flag indicating if CLI should return status '0', when the job state is warning.
  * @param {string | undefined} source - an optional path to a JSON file containing macro variables.
  * @param {boolean} streamLog - a flag indicating if the logs should be streamed to the supplied log path during job execution. This is useful for getting feedback on long running jobs.
- * @param {boolean} verbose - enables verbose mode that logs summary of every HTTP response.
  */
-export declare function executeJobViya(sasjs: SASjs, authConfig: AuthConfig, jobPath: string, target: Target, waitForJob: boolean, output: string | boolean, logFile: string | undefined, statusFile: string | undefined, ignoreWarnings: boolean, source: string | undefined, streamLog: boolean, verbose: boolean): Promise<any>;
+export declare function executeJobViya(sasjs: SASjs, authConfig: AuthConfig, jobPath: string, target: Target, waitForJob: boolean, output: string | boolean, logFile: string | undefined, statusFile: string | undefined, ignoreWarnings: boolean, source: string | undefined, streamLog: boolean): Promise<any>;
 /**
  * Gets job execution context name.
  * @param target - SAS server configuration.

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

@@ -62,9 +62,8 @@ var utils_3 = require("../utils");
  * @param {boolean} ignoreWarnings - flag indicating if CLI should return status '0', when the job state is warning.
  * @param {string | undefined} source - an optional path to a JSON file containing macro variables.
  * @param {boolean} streamLog - a flag indicating if the logs should be streamed to the supplied log path during job execution. This is useful for getting feedback on long running jobs.
- * @param {boolean} verbose - enables verbose mode that logs summary of every HTTP response.
  */
-function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output, logFile, statusFile, ignoreWarnings, source, streamLog, verbose) {
+function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output, logFile, statusFile, ignoreWarnings, source, streamLog) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
         var pollOptions, result, startTime, contextName, macroVars, submittedJob, endTime, outputJson, currentDirPath, outputPath, folderPath, parentFolderPath, logObj, logUrl, logCount, logData, error_1;
@@ -73,8 +72,8 @@ function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output,
             switch (_c.label) {
                 case 0:
                     pollOptions = {
-                        maxPollCount: 24 * 60 * 60,
-                        pollInterval: 1000,
+                        maxPollCount: 0,
+                        pollInterval: 0,
                         streamLog: streamLog,
                         logFolderPath: logFile
                     };
@@ -106,7 +105,7 @@ function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output,
                     }
                     _c.label = 5;
                 case 5: return [4 /*yield*/, sasjs
-                        .startComputeJob(jobPath, null, { contextName: contextName }, authConfig, waitForJob || !!logFile, pollOptions, true, macroVars === null || macroVars === void 0 ? void 0 : macroVars.macroVars, verbose || undefined)
+                        .startComputeJob(jobPath, null, { contextName: contextName }, authConfig, waitForJob || !!logFile, pollOptions, true, macroVars === null || macroVars === void 0 ? void 0 : macroVars.macroVars)
                         .catch(function (err) { return __awaiter(_this, void 0, void 0, function () {
                         var logData;
                         var _a;

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

@@ -3,6 +3,9 @@ import { ReturnCode } from '../../types/command';
 import { TargetCommand } from '../../types/command/targetCommand';
 export declare class JobCommand extends TargetCommand {
     private jobSubCommands;
+    private verbose;
+    private sasjs;
+    private authConfig?;
     constructor(args: string[]);
     /**
      * Method responsible for command execution.

package/build/commands/job/jobCommand.js

@@ -63,6 +63,7 @@ var utils_2 = require("../../utils");
 var getLogFilePath_1 = require("../../utils/getLogFilePath");
 var prefixAppLoc_1 = require("../../utils/prefixAppLoc");
 var execute_1 = require("./internal/execute");
+var node_1 = __importDefault(require("@sasjs/adapter/node"));
 var JobSubCommand;
 (function (JobSubCommand) {
     JobSubCommand["Execute"] = "execute";
@@ -121,10 +122,10 @@ var executeParseOptions = {
         description: 'Flag indicating whether the logs should be streamed to a local file as the job executes.'
     },
     verbose: {
-        type: 'boolean',
+        type: 'string',
         alias: 'v',
         default: false,
-        description: 'If present, CLI will return status 0, 1 or 2 together with HTTP response summaries.'
+        description: "If present, CLI will return status 0, 1 or 2 together with HTTP response summaries. If set to 'bleached', HTTP response summaries will be logged without extra colors."
     }
 };
 var JobCommand = /** @class */ (function (_super) {
@@ -143,7 +144,10 @@ var JobCommand = /** @class */ (function (_super) {
             examples: examples,
             syntax: syntax
         }) || this;
+        _this.verbose = false;
+        _this.sasjs = new node_1.default();
         _this.jobSubCommands = jobSubCommands;
+        _this.verbose = getVerbose(args, _this.parsed.verbose);
         return _this;
     }
     /**
@@ -153,58 +157,78 @@ var JobCommand = /** @class */ (function (_super) {
     JobCommand.prototype.execute = function () {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var target, returnStatusOnly, _b, _c, _d, _e;
+            var returnStatusOnly, target, sasjsAndAuthConfig, sasjs, authConfig, authConfigSas9, _b, _c, _d, _e;
             return __generator(this, function (_f) {
                 switch (_f.label) {
-                    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;
+                    case 0:
                         returnStatusOnly = !!this.parsed.returnStatusOnly;
                         if (returnStatusOnly) {
                             process.logger.warn('--returnStatusOnly (-r) flag is deprecated.');
                         }
+                        return [4 /*yield*/, this.getTargetInfo()];
+                    case 1:
+                        target = (_f.sent()).target;
+                        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,
+                                    authConfigSas9: undefined
+                                };
+                            })];
+                    case 2:
+                        sasjsAndAuthConfig = _f.sent();
+                        sasjs = sasjsAndAuthConfig.sasjs;
+                        authConfig = sasjsAndAuthConfig.authConfig;
+                        authConfigSas9 = sasjsAndAuthConfig.authConfigSas9;
+                        if (!sasjs || (!authConfig && !authConfigSas9)) {
+                            return [2 /*return*/, command_1.ReturnCode.InternalError];
+                        }
+                        this.sasjs = sasjs;
+                        this.sasjs.setVerboseMode(this.verbose);
+                        this.authConfig = authConfig || authConfigSas9;
                         _b = target.serverType;
                         switch (_b) {
-                            case utils_1.ServerType.SasViya: return [3 /*break*/, 2];
-                            case utils_1.ServerType.Sas9: return [3 /*break*/, 6];
-                            case utils_1.ServerType.Sasjs: return [3 /*break*/, 10];
+                            case utils_1.ServerType.SasViya: return [3 /*break*/, 3];
+                            case utils_1.ServerType.Sas9: return [3 /*break*/, 7];
+                            case utils_1.ServerType.Sasjs: return [3 /*break*/, 11];
                         }
-                        return [3 /*break*/, 14];
-                    case 2:
-                        if (!this.jobSubCommands.includes(this.parsed.subCommand)) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this.executeJobViya(target)];
+                        return [3 /*break*/, 15];
                     case 3:
-                        _c = _f.sent();
-                        return [3 /*break*/, 5];
+                        if (!this.jobSubCommands.includes(this.parsed.subCommand)) return [3 /*break*/, 5];
+                        return [4 /*yield*/, this.executeJobViya(target)];
                     case 4:
+                        _c = _f.sent();
+                        return [3 /*break*/, 6];
+                    case 5:
                         _c = command_1.ReturnCode.InvalidCommand;
-                        _f.label = 5;
-                    case 5: return [2 /*return*/, _c];
-                    case 6:
-                        if (!this.jobSubCommands.includes(this.parsed.subCommand)) return [3 /*break*/, 8];
-                        return [4 /*yield*/, this.executeJobSas9(target)];
+                        _f.label = 6;
+                    case 6: return [2 /*return*/, _c];
                     case 7:
-                        _d = _f.sent();
-                        return [3 /*break*/, 9];
+                        if (!this.jobSubCommands.includes(this.parsed.subCommand)) return [3 /*break*/, 9];
+                        return [4 /*yield*/, this.executeJobSas9(target)];
                     case 8:
+                        _d = _f.sent();
+                        return [3 /*break*/, 10];
+                    case 9:
                         _d = command_1.ReturnCode.InvalidCommand;
-                        _f.label = 9;
-                    case 9: return [2 /*return*/, _d];
-                    case 10:
+                        _f.label = 10;
+                    case 10: return [2 /*return*/, _d];
+                    case 11:
                         if (typeof this.parsed.jobPath !== 'string')
                             return [2 /*return*/, command_1.ReturnCode.InvalidCommand];
-                        if (!this.jobSubCommands.includes(this.parsed.subCommand)) return [3 /*break*/, 12];
+                        if (!this.jobSubCommands.includes(this.parsed.subCommand)) return [3 /*break*/, 13];
                         return [4 /*yield*/, this.executeJobSasjs(target)];
-                    case 11:
-                        _e = _f.sent();
-                        return [3 /*break*/, 13];
                     case 12:
+                        _e = _f.sent();
+                        return [3 /*break*/, 14];
+                    case 13:
                         _e = command_1.ReturnCode.InvalidCommand;
-                        _f.label = 13;
-                    case 13: return [2 /*return*/, _e];
-                    case 14:
+                        _f.label = 14;
+                    case 14: return [2 /*return*/, _e];
+                    case 15:
                         (_a = process.logger) === null || _a === void 0 ? void 0 : _a.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];
                 }
@@ -228,7 +252,7 @@ var JobCommand = /** @class */ (function (_super) {
                         output = ((_a = this.parsed.output) === null || _a === void 0 ? void 0 : _a.length)
                             ? this.parsed.output
                             : undefined;
-                        return [4 /*yield*/, (0, execute_1.executeJobSasjs)(target, jobPath, log, output)
+                        return [4 /*yield*/, (0, execute_1.executeJobSasjs)(this.sasjs, target, jobPath, log, output, this.authConfig)
                                 .then(function () { return command_1.ReturnCode.Success; })
                                 .catch(function (err) {
                                 var _a;
@@ -251,9 +275,9 @@ var JobCommand = /** @class */ (function (_super) {
     JobCommand.prototype.executeJobSas9 = function (target) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var jobPath, log, source, output, _b, sasjs, authConfigSas9, userName, password, returnCode;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var jobPath, log, source, output, userName, password, 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);
@@ -261,19 +285,10 @@ var JobCommand = /** @class */ (function (_super) {
                         output = ((_a = this.parsed.output) === null || _a === void 0 ? void 0 : _a.length)
                             ? this.parsed.output
                             : undefined;
-                        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: undefined, authConfigSas9: undefined };
-                            })];
-                    case 1:
-                        _b = _c.sent(), sasjs = _b.sasjs, authConfigSas9 = _b.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)
+                        this.authConfig = this.authConfig;
+                        userName = this.authConfig.userName;
+                        password = (0, utils_1.decodeFromBase64)(this.authConfig.password);
+                        return [4 /*yield*/, (0, execute_1.executeJobSas9)(this.sasjs, { userName: userName, password: password }, jobPath, log, output, source)
                                 .then(function () { return command_1.ReturnCode.Success; })
                                 .catch(function (err) {
                                 var _a;
@@ -281,8 +296,8 @@ var JobCommand = /** @class */ (function (_super) {
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error executing job: ', err);
                                 return command_1.ReturnCode.InternalError;
                             })];
-                    case 2:
-                        returnCode = _c.sent();
+                    case 1:
+                        returnCode = _b.sent();
                         return [2 /*return*/, returnCode];
                 }
             });
@@ -296,16 +311,15 @@ var JobCommand = /** @class */ (function (_super) {
     JobCommand.prototype.executeJobViya = function (target) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var jobPath, statusFile, log, ignoreWarnings, streamLog, verbose, source, wait, output, _c, sasjs, authConfig, returnCode;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var jobPath, statusFile, log, ignoreWarnings, streamLog, source, wait, output, returnCode;
+            return __generator(this, function (_c) {
+                switch (_c.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)
@@ -313,19 +327,9 @@ var JobCommand = /** @class */ (function (_super) {
                             : ((_b = this.parsed.output) === null || _b === void 0 ? void 0 : _b.length) === 0
                                 ? true
                                 : false;
-                        if (verbose && !wait)
+                        if (!!this.verbose && !wait)
                             wait = true;
-                        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: undefined, authConfig: undefined };
-                            })];
-                    case 1:
-                        _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, ignoreWarnings, source, streamLog, verbose)
+                        return [4 /*yield*/, (0, execute_1.executeJobViya)(this.sasjs, this.authConfig, jobPath, target, wait, output, log, statusFile, ignoreWarnings, source, streamLog)
                                 .then(function () { return command_1.ReturnCode.Success; })
                                 .catch(function (err) {
                                 var _a;
@@ -333,8 +337,8 @@ var JobCommand = /** @class */ (function (_super) {
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error executing job: ', err);
                                 return command_1.ReturnCode.InternalError;
                             })];
-                    case 2:
-                        returnCode = _d.sent();
+                    case 1:
+                        returnCode = _c.sent();
                         return [2 /*return*/, returnCode];
                 }
             });
@@ -357,3 +361,20 @@ var getStatusFilePath = function (statusFileArg) {
     }
     return undefined;
 };
+/**
+ * Determines verbose mode based on command arguments.
+ * @param args - command arguments.
+ * @param verboseArg - value of the verbose argument.
+ * @returns - verbose mode.
+ */
+var getVerbose = function (args, verboseArg) {
+    var verboseArgPresent = args.includes('-v') || args.includes('--verbose');
+    if (verboseArgPresent) {
+        // if verboseArg, use the string as verbose mode(any strings not equal to
+        // 'bleached' will be ignored)
+        if (typeof verboseArg === 'string')
+            return verboseArg;
+        return true;
+    }
+    return false;
+};

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

@@ -94,17 +94,17 @@ 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, undefined, true, false)];
+                case 0: return [4 /*yield*/, (0, execute_1.executeJobViya)(sasjs, mocks_1.mockAuthConfig, 'test/job', target, false, false, testLogsPath, testFilePath, false, undefined, true)];
                 case 1:
                     _a.sent();
                     expect(sasjs.startComputeJob).toHaveBeenCalledWith('test/job', null, {
                         contextName: 'Mock Context'
                     }, mocks_1.mockAuthConfig, true, {
-                        maxPollCount: 24 * 60 * 60,
-                        pollInterval: 1000,
+                        maxPollCount: 0,
+                        pollInterval: 0,
                         streamLog: true,
                         logFolderPath: testLogsPath
-                    }, true, undefined, undefined);
+                    }, true, undefined);
                     return [4 /*yield*/, (0, utils_1.deleteFile)(testFilePath)];
                 case 2:
                     _a.sent();
@@ -115,62 +115,17 @@ 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, undefined, false, false)];
+                case 0: return [4 /*yield*/, (0, execute_1.executeJobViya)(sasjs, mocks_1.mockAuthConfig, 'test/job', target, false, false, testLogsPath, testFilePath, false, undefined, 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,
+                        maxPollCount: 0,
+                        pollInterval: 0,
                         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 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);
+                    }, true, undefined);
                     return [4 /*yield*/, (0, utils_1.deleteFile)(testFilePath)];
                 case 2:
                     _a.sent();
@@ -191,11 +146,15 @@ describe('executeJobSasjs', function () {
         });
     }); });
     it('should pass job pass as a _program parameter', 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.executeJobSasjs)(target, 'test/job', path_1.default.join(process.projectDir, 'logs'))];
+        var _a, sasjs, authConfig;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, (0, utils_2.getSASjsAndAuthConfig)(target)];
                 case 1:
-                    _a.sent();
+                    _a = _b.sent(), sasjs = _a.sasjs, authConfig = _a.authConfig;
+                    return [4 /*yield*/, (0, execute_1.executeJobSasjs)(sasjs, target, 'test/job', path_1.default.join(process.projectDir, 'logs'), undefined, authConfig)];
+                case 2:
+                    _b.sent();
                     expect(executeJobMock).toHaveBeenCalledWith({ _program: 'test/job' }, target.appLoc, undefined);
                     return [2 /*return*/];
             }

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

@@ -599,7 +599,7 @@ 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.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 (_k) {
-            return [2 /*return*/, (0, execute_1.executeJobViya)(adapter, authConfig, jobPath, target, waitForJob, output, logFile, statusFile, ignoreWarnings, source, streamLog, false)];
+            return [2 /*return*/, (0, execute_1.executeJobViya)(adapter, authConfig, jobPath, target, waitForJob, output, logFile, statusFile, ignoreWarnings, source, streamLog)];
         });
     });
 };