@sasjs/cli 3.0.4 → 3.1.0

package/build/commands/add/spec/addTarget.spec.js

@@ -175,7 +175,7 @@ describe('addTarget', function () {
                         serverType: utils_1.ServerType.Sasjs,
                         name: sasjsTargetName,
                         appLoc: '/Public/app',
-                        serverUrl: process.env.SASJS_SERVER_URL,
+                        serverUrl: process.env.SASJS_SERVER_URL || '',
                         existingTarget: {}
                     };
                     jest
@@ -374,7 +374,7 @@ describe('addTarget', function () {
                         serverType: utils_1.ServerType.Sasjs,
                         name: 'server',
                         appLoc: '/Public/app/new/location/2',
-                        serverUrl: process.env.SASJS_SERVER_URL,
+                        serverUrl: process.env.SASJS_SERVER_URL || '',
                         existingTarget: targetJson
                     };
                     jest

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

@@ -170,12 +170,6 @@ function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output,
                     if (!result)
                         result = true;
                     sessionLink = submittedJob.links.find(function (l) { return l.method === 'GET' && l.rel === 'self'; }).href;
-                    if (!returnStatusOnly) {
-                        displayResult_1.displaySuccess((waitForJob
-                            ? "Job located at '" + jobPath + "' has been executed.\nJob details"
-                            : "Job session") +
-                            (" can be found at " + (target.serverUrl + sessionLink)));
-                    }
                     if (!(output || logFile)) return [3 /*break*/, 20];
                     _c.label = 9;
                 case 9:

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

@@ -46,9 +46,8 @@ var utils_2 = require("../../../utils/utils");
 var displayResult_1 = require("../../../utils/displayResult");
 var saveLog = function (logData, logFile, jobPath, returnStatusOnly) { return __awaiter(void 0, void 0, void 0, function () {
     var logPath, folderPath, parentFolderPath, logLines;
-    var _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    return __generator(this, function (_a) {
+        switch (_a.label) {
             case 0:
                 if (logFile) {
                     logPath = logFile;
@@ -61,17 +60,16 @@ var saveLog = function (logData, logFile, jobPath, returnStatusOnly) { return __
                 parentFolderPath = folderPath.join(path_1.default.sep);
                 return [4 /*yield*/, utils_1.folderExists(parentFolderPath)];
             case 1:
-                if (!!(_b.sent())) return [3 /*break*/, 3];
+                if (!!(_a.sent())) return [3 /*break*/, 3];
                 return [4 /*yield*/, utils_1.createFolder(parentFolderPath)];
             case 2:
-                _b.sent();
-                _b.label = 3;
+                _a.sent();
+                _a.label = 3;
             case 3:
                 logLines = typeof logData === 'object' ? utils_2.parseLogLines(logData) : logData;
-                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Creating log file at " + logPath + " .");
                 return [4 /*yield*/, utils_1.createFile(logPath, logLines)];
             case 4:
-                _b.sent();
+                _a.sent();
                 if (!returnStatusOnly)
                     displayResult_1.displaySuccess("Log saved to " + logPath);
                 return [2 /*return*/];

package/build/commands/shared/fetchLogFileContent.js

@@ -68,28 +68,26 @@ exports.fetchLogFileContent = void 0;
  */
 var fetchLogFileContent = function (sasjs, accessToken, logUrl, logCount) { return __awaiter(void 0, void 0, void 0, function () {
     var logJson, loglimit, start, logChunkJson, _a, _b;
-    var _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 logJson = { items: [] };
                 loglimit = logCount < 10000 ? logCount : 10000;
                 start = 0;
-                _d.label = 1;
+                _c.label = 1;
             case 1:
-                (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info("Fetching logs from line no: " + (start + 1) + " to " + (start + loglimit) + " of " + logCount + ".");
                 _b = (_a = JSON).parse;
                 return [4 /*yield*/, sasjs.fetchLogFileContent(logUrl + "?start=" + start + "&limit=" + loglimit, accessToken)];
             case 2:
-                logChunkJson = _b.apply(_a, [(_d.sent())]);
+                logChunkJson = _b.apply(_a, [(_c.sent())]);
                 if (logChunkJson.items.length === 0)
                     return [3 /*break*/, 4];
                 logJson.items = __spreadArray(__spreadArray([], __read(logJson.items)), __read(logChunkJson.items));
                 start += loglimit;
-                _d.label = 3;
+                _c.label = 3;
             case 3:
                 if (start < logCount) return [3 /*break*/, 1];
-                _d.label = 4;
+                _c.label = 4;
             case 4: return [2 /*return*/, logJson];
         }
     });

package/build/commands/testing/test.js

@@ -205,6 +205,7 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                                             testUrl = testUrl + "&_contextName=" + encodeURIComponent(target.contextName);
                                         }
                                         printTestUrl = function () { return process.logger.info("Test URL: " + testUrl); };
+                                        printTestUrl();
                                         return [4 /*yield*/, sasjs
                                                 .request(sasJobLocation, {}, { username: username, password: password }, function () {
                                                 displayResult_1.displayError(null, 'Login callback called. Request failed.');
@@ -247,7 +248,6 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                                                             }
                                                             if (!((_a = res.result) === null || _a === void 0 ? void 0 : _a.test_results))
                                                                 lineBreak = false;
-                                                            printTestUrl();
                                                             if (!res.log) return [3 /*break*/, 2];
                                                             return [4 /*yield*/, saveOutput_1.saveLog(outDirectory, test, res.log, lineBreak)];
                                                         case 1:

package/build/utils/utils.js

@@ -186,11 +186,7 @@ function createApp(folderPath, repoUrl, installDependencies) {
     if (installDependencies === void 0) { installDependencies = true; }
     var spinner = ora_1.default("Creating SASjs project in " + folderPath + ".");
     spinner.start();
-    var gitBranch = repoUrl.includes('template_sasonly')
-        ? 'master'
-        : repoUrl.includes('template_jobs')
-            ? 'master'
-            : 'main';
+    var gitBranch = repoUrl.includes('template_sasonly') ? 'master' : 'main';
     shelljs_1.default.exec("cd \"" + folderPath + "\" && git clone --depth 1 -b " + gitBranch + " " + repoUrl + " .", { silent: true });
     shelljs_1.default.rm('-rf', path_1.default.join(folderPath, '.git'));
     spinner.stop();

package/package.json

@@ -49,7 +49,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "3.0.0",
+    "@sasjs/adapter": "3.3.0",
     "@sasjs/core": "2.54.1",
     "@sasjs/lint": "1.11.2",
     "@sasjs/utils": "2.34.1",
@@ -97,5 +97,5 @@
     "typescript": "4.3.5",
     "util": "0.12.4"
   },
-  "version": "3.0.4"
+  "version": "3.1.0"
 }