@sasjs/cli 3.8.6 → 3.8.9

package/build/commands/compile/compile.js

@@ -478,8 +478,7 @@ function compileWeb(target) {
                             .then(function () { var _a; return (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Web app services have been compiled."); })
                             .catch(function (err) {
                             var _a;
-                            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('An error has occurred when compiling web app services.');
-                            throw err;
+                            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('An error has occurred when compiling web app services.', err.toString());
                         })];
                 case 2:
                     _c.sent();

package/build/commands/request/request.js

@@ -117,6 +117,7 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
                             (0, displayResult_1.displayError)(null, 'Login callback called. Request failed.');
                         }, authConfig)
                             .then(function (res) { return __awaiter(_this, void 0, void 0, function () {
+                            var output;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
@@ -127,10 +128,34 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
                                         _a.sent();
                                         return [2 /*return*/];
                                     case 2:
+                                        output = '';
                                         if (res === null || res === void 0 ? void 0 : res.result)
                                             res = res.result;
-                                        return [4 /*yield*/, writeOutput(outputPathParam, res, isLocal)];
+                                        // In sasjs request debug is always on, meaning the response object always contains the log
+                                        // This log goes to a seperate .log file, and should not be added to the output file (*.json)
+                                        // Therefore, we delete it now from the result object
+                                        else if (res === null || res === void 0 ? void 0 : res.log)
+                                            delete res.log;
+                                        // Sometimes res.result contains the log (eg when there is a SAS error)
+                                        // Here we make sure that the content in the output file (*.json) will be in json format
+                                        if (typeof res === 'string') {
+                                            try {
+                                                output = JSON.parse(res);
+                                            }
+                                            catch (error) {
+                                                (0, displayResult_1.displayError)('Error parsing response. JSON is expected.');
+                                            }
+                                        }
+                                        else {
+                                            output = res;
+                                        }
+                                        if (!!!output) return [3 /*break*/, 4];
+                                        return [4 /*yield*/, writeOutput(outputPathParam, output, isLocal)];
                                     case 3:
+                                        _a.sent();
+                                        _a.label = 4;
+                                    case 4: return [4 /*yield*/, saveLogFile(sasjs, sasJobLocation, logFile, jobPath)];
+                                    case 5:
                                         _a.sent();
                                         result = true;
                                         return [2 /*return*/];
@@ -138,6 +163,7 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
                             });
                         }); })
                             .catch(function (err) { return __awaiter(_this, void 0, void 0, function () {
+                            var error;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
@@ -145,7 +171,10 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
                                             (0, utils_2.displaySasjsRunnerError)(configJson.username);
                                         }
                                         else {
-                                            (0, displayResult_1.displayError)(err, 'An error occurred while executing the request.');
+                                            error = {};
+                                            if (err.message)
+                                                error.message = err.message;
+                                            (0, displayResult_1.displayError)(error, 'An error occurred while executing the request.');
                                         }
                                         return [4 /*yield*/, saveLogFile(sasjs, sasJobLocation, logFile, jobPath)];
                                     case 1:

package/package.json

@@ -47,7 +47,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "^3.7.13",
+    "@sasjs/adapter": "^3.7.14",
     "@sasjs/core": "4.15.3",
     "@sasjs/lint": "1.11.2",
     "@sasjs/utils": "2.36.0",
@@ -94,5 +94,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.8.6"
+  "version": "3.8.9"
 }