@sasjs/cli 3.7.8 → 3.7.9

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/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/package.json

@@ -47,8 +47,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "3.7.4",
-    "@sasjs/core": "4.9.2",
+    "@sasjs/adapter": "3.7.6",
+    "@sasjs/core": "4.9.3",
     "@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.7.9"
 }