@sasjs/cli 3.19.3 → 3.19.4

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

@@ -35,15 +35,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         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 displayResult_1 = require("../../../../utils/displayResult");
-var utils_2 = require("../utils");
+var utils_1 = require("../utils");
 var parseSourceFile_1 = require("../../../../utils/parseSourceFile");
 /**
  * Triggers an existing Stored Process for execution as a "job".  See online documentation here: https://cli.sasjs.io/job/
@@ -56,7 +50,7 @@ var parseSourceFile_1 = require("../../../../utils/parseSourceFile");
  */
 function executeJobSas9(sasjs, config, jobPath, logFile, output, source) {
     return __awaiter(this, void 0, void 0, function () {
-        var macroVars, startTime, result, endTime, outputJson, currentDirPath, outputPath, folderPath, parentFolderPath, error_1;
+        var macroVars, startTime, result, endTime;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -72,51 +66,24 @@ function executeJobSas9(sasjs, config, jobPath, logFile, output, source) {
                 case 3:
                     result = _a.sent();
                     endTime = new Date().getTime();
-                    if (!result) return [3 /*break*/, 14];
-                    if (!(result.status === 200)) return [3 /*break*/, 13];
+                    if (!result) return [3 /*break*/, 7];
+                    if (!(result.status === 200)) return [3 /*break*/, 6];
                     process.logger.success("Job executed successfully! in ".concat((endTime - startTime) / 1000, " seconds"));
                     if (!(!!logFile && result.log)) return [3 /*break*/, 5];
-                    return [4 /*yield*/, (0, utils_2.saveLog)(result.log, logFile, jobPath, false)];
+                    return [4 /*yield*/, (0, utils_1.saveLog)(result.log, logFile, jobPath, false)];
                 case 4:
                     _a.sent();
                     _a.label = 5;
                 case 5:
-                    if (!(!!output && result.result)) return [3 /*break*/, 12];
-                    _a.label = 6;
+                    if (!!output && result.result) {
+                        (0, utils_1.saveOutput)(result.result, output, false);
+                    }
+                    return [3 /*break*/, 7];
                 case 6:
-                    _a.trys.push([6, 11, , 12]);
-                    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 7:
-                    if (!!(_a.sent())) return [3 /*break*/, 9];
-                    return [4 /*yield*/, (0, utils_1.createFolder)(parentFolderPath)];
-                case 8:
-                    _a.sent();
-                    _a.label = 9;
-                case 9: return [4 /*yield*/, (0, utils_1.createFile)(outputPath, outputJson)];
-                case 10:
-                    _a.sent();
-                    (0, displayResult_1.displaySuccess)("Output saved to: ".concat(outputPath));
-                    return [3 /*break*/, 12];
-                case 11:
-                    error_1 = _a.sent();
-                    (0, displayResult_1.displayError)(error_1, 'An error has occurred when parsing an output of the job.');
-                    return [3 /*break*/, 12];
-                case 12: return [3 /*break*/, 14];
-                case 13:
                     process.logger.error(result.message);
                     process.logger.error(JSON.stringify(result.error, null, 2));
-                    _a.label = 14;
-                case 14: return [2 /*return*/, result];
+                    _a.label = 7;
+                case 7: return [2 /*return*/, result];
             }
         });
     });

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

@@ -1,10 +1,6 @@
 import SASjs from '@sasjs/adapter/node';
 import { AuthConfig } from '@sasjs/utils';
-export declare function executeJobSasjs(sasjs: SASjs, jobPath: string, logFile: string | undefined, authConfig?: AuthConfig): Promise<{
-    status: string;
-    message: string;
-    log?: string | undefined;
-    logPath?: string | undefined;
-    error?: {} | undefined;
-    _webout?: string | undefined;
+export declare function executeJobSasjs(sasjs: SASjs, jobPath: string, logFile?: string, output?: string, authConfig?: AuthConfig): Promise<{
+    result: any;
+    log: any;
 } | undefined>;

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

@@ -38,30 +38,30 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeJobSasjs = void 0;
 var utils_1 = require("../utils");
-function executeJobSasjs(sasjs, jobPath, logFile, authConfig) {
+function executeJobSasjs(sasjs, jobPath, logFile, output, authConfig) {
     return __awaiter(this, void 0, void 0, function () {
-        var result;
+        var response;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, sasjs.executeJobSASjs({
                         _program: jobPath
                     }, authConfig)];
                 case 1:
-                    result = _a.sent();
-                    if (!result) return [3 /*break*/, 5];
-                    if (!(result.status === 'success')) return [3 /*break*/, 4];
+                    response = _a.sent();
+                    if (!response) return [3 /*break*/, 5];
                     process.logger.success('Job executed successfully!');
-                    if (!(logFile && result.log)) return [3 /*break*/, 3];
-                    return [4 /*yield*/, (0, utils_1.saveLog)(result.log, logFile, jobPath, false)];
+                    if (!(!!logFile && response.log)) return [3 /*break*/, 3];
+                    return [4 /*yield*/, (0, utils_1.saveLog)(response.log, logFile, jobPath, false)];
                 case 2:
                     _a.sent();
                     _a.label = 3;
-                case 3: return [3 /*break*/, 5];
+                case 3:
+                    if (!(!!output && response.result)) return [3 /*break*/, 5];
+                    return [4 /*yield*/, (0, utils_1.saveOutput)(response.result, output, false)];
                 case 4:
-                    process.logger.error(result.message);
-                    process.logger.error(JSON.stringify(result.error, null, 2));
+                    _a.sent();
                     _a.label = 5;
-                case 5: return [2 /*return*/, result];
+                case 5: return [2 /*return*/, response];
             }
         });
     });

package/build/commands/job/internal/utils.d.ts

@@ -1 +1,2 @@
 export declare const saveLog: (logData: any, logFile: string | undefined, jobPath: string, returnStatusOnly: boolean) => Promise<void>;
+export declare const saveOutput: (outputData: any, outputFile: string, returnStatusOnly: boolean) => Promise<void>;

package/build/commands/job/internal/utils.js

@@ -39,7 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.saveLog = void 0;
+exports.saveOutput = exports.saveLog = void 0;
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
 var utils_2 = require("../../../utils/utils");
@@ -77,3 +77,38 @@ var saveLog = function (logData, logFile, jobPath, returnStatusOnly) { return __
     });
 }); };
 exports.saveLog = saveLog;
+var saveOutput = function (outputData, outputFile, returnStatusOnly) { return __awaiter(void 0, void 0, void 0, function () {
+    var currentDirPath, outputPath, folderPath, parentFolderPath;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                try {
+                    outputData = JSON.stringify(outputData, null, 2);
+                }
+                catch (error) {
+                    (0, displayResult_1.displayError)(error, 'An error has occurred when parsing the output of the job.');
+                }
+                currentDirPath = path_1.default.isAbsolute(outputFile) ? '' : process.projectDir;
+                outputPath = path_1.default.join(currentDirPath, /\.[a-z]{3,4}$/i.test(outputFile)
+                    ? outputFile
+                    : path_1.default.join(outputFile, '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 1:
+                if (!!(_a.sent())) return [3 /*break*/, 3];
+                return [4 /*yield*/, (0, utils_1.createFolder)(parentFolderPath)];
+            case 2:
+                _a.sent();
+                _a.label = 3;
+            case 3: return [4 /*yield*/, (0, utils_1.createFile)(outputPath, outputData)];
+            case 4:
+                _a.sent();
+                if (!returnStatusOnly)
+                    (0, displayResult_1.displaySuccess)("Output saved to: ".concat(outputPath));
+                return [2 /*return*/];
+        }
+    });
+}); };
+exports.saveOutput = saveOutput;

package/build/commands/job/jobCommand.js

@@ -241,13 +241,18 @@ var JobCommand = /** @class */ (function (_super) {
         });
     };
     JobCommand.prototype.executeJobSasjs = function (sasjs, target, authConfig) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var jobPath, returnCode;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var jobPath, log, output, returnCode;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         jobPath = (0, prefixAppLoc_1.prefixAppLoc)(target.appLoc, this.parsed.jobPath);
-                        return [4 /*yield*/, (0, execute_1.executeJobSasjs)(sasjs, jobPath, this.parsed.log, authConfig)
+                        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;
+                        return [4 /*yield*/, (0, execute_1.executeJobSasjs)(sasjs, jobPath, log, output, authConfig)
                                 .then(function () { return command_1.ReturnCode.Success; })
                                 .catch(function (err) {
                                 var _a;
@@ -255,7 +260,7 @@ var JobCommand = /** @class */ (function (_super) {
                                 return command_1.ReturnCode.InternalError;
                             })];
                     case 1:
-                        returnCode = _a.sent();
+                        returnCode = _b.sent();
                         return [2 /*return*/, returnCode];
                 }
             });

package/package.json

@@ -48,7 +48,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "3.10.15",
+    "@sasjs/adapter": "3.10.16",
     "@sasjs/core": "4.35.3",
     "@sasjs/lint": "1.12.0",
     "@sasjs/utils": "2.47.1",
@@ -97,5 +97,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.19.3"
+  "version": "3.19.4"
 }