@sasjs/cli 3.18.2 → 3.19.0

package/build/commands/run/run.js

@@ -59,76 +59,66 @@ function runSasCode(target, filePath, compile) {
     var _a;
     if (compile === void 0) { compile = false; }
     return __awaiter(this, void 0, void 0, function () {
-        var isFileCreated, tempFilePath, sourcefilePathParts, sourceFolderPath, sasFilePath, sasFileContent, linesToExecute;
-        var _this = this;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var isTempFile, sourcefilePathParts, sourceFolderPath, sasFilePath, sasFileContent, linesToExecute, result;
+        var _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
-                    isFileCreated = false;
-                    tempFilePath = path_1.default.join(process.projectDir, 'temp-' + Date.now() + '.sas');
-                    if (!(filePath.startsWith('https://') || filePath.startsWith('http://'))) return [3 /*break*/, 2];
-                    return [4 /*yield*/, axios_1.default
-                            .get(filePath)
-                            .then(function (res) { return __awaiter(_this, void 0, void 0, function () {
-                            var invalidSasError, content;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0:
-                                        invalidSasError = process.sasjsConstants.invalidSasError;
-                                        if (typeof res.data !== 'string') {
-                                            throw new Error(invalidSasError);
-                                        }
-                                        content = res.data.trim();
-                                        if (content && content.startsWith('<')) {
-                                            throw new Error(invalidSasError);
-                                        }
-                                        return [4 /*yield*/, (0, utils_1.createFile)(tempFilePath, content)];
-                                    case 1:
-                                        _a.sent();
-                                        isFileCreated = true;
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); })
-                            .catch(function (err) {
-                            throw new Error("".concat(err.message, "\nUrl: ").concat(filePath));
-                        })];
+                    isTempFile = false;
+                    if (!isUrl(filePath)) return [3 /*break*/, 2];
+                    ;
+                    return [4 /*yield*/, createFileFromUrl(filePath)];
                 case 1:
-                    _b.sent();
-                    _b.label = 2;
+                    (_b = _c.sent(), isTempFile = _b.isTempFile, filePath = _b.tempFilePath);
+                    _c.label = 2;
                 case 2:
-                    if (isFileCreated) {
-                        filePath = tempFilePath;
-                    }
-                    if (!/\.sas$/i.test(filePath)) {
-                        throw new Error("'sasjs run' command supports only *.sas files.");
-                    }
-                    if (!compile) return [3 /*break*/, 4];
+                    if (!compile) return [3 /*break*/, 5];
+                    if (!/\.sas$/i.test(filePath)) return [3 /*break*/, 4];
                     sourcefilePathParts = path_1.default.normalize(filePath).split(path_1.default.sep);
                     sourcefilePathParts.splice(-1, 1);
                     sourceFolderPath = sourcefilePathParts.join(path_1.default.sep);
                     return [4 /*yield*/, (0, __1.compileSingleFile)(target, 'identify', filePath, (0, getDestinationPath_1.getDestinationServicePath)(sourceFolderPath), true)];
                 case 3:
-                    (filePath = (_b.sent()).destinationPath);
+                    (filePath = (_c.sent()).destinationPath);
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("File Compiled and placed at: ".concat(filePath, " ."));
-                    _b.label = 4;
+                    return [3 /*break*/, 5];
                 case 4:
+                    process.logger.info('Compile flag has no effect on files with extension type other than sas');
+                    _c.label = 5;
+                case 5:
                     sasFilePath = (0, utils_1.getAbsolutePath)(filePath, process.currentDir);
                     return [4 /*yield*/, (0, utils_1.readFile)(sasFilePath)];
-                case 5:
-                    sasFileContent = _b.sent();
+                case 6:
+                    sasFileContent = _c.sent();
                     linesToExecute = sasFileContent.replace(/\r\n/g, '\n').split('\n');
-                    if (!(target.serverType === utils_1.ServerType.SasViya)) return [3 /*break*/, 7];
-                    return [4 /*yield*/, executeOnSasViya(filePath, isFileCreated, target, linesToExecute)];
-                case 6: return [2 /*return*/, _b.sent()];
-                case 7: return [4 /*yield*/, executeOnSas9(filePath, isFileCreated, target, linesToExecute)];
-                case 8: return [2 /*return*/, _b.sent()];
+                    if (!(target.serverType === utils_1.ServerType.SasViya)) return [3 /*break*/, 8];
+                    return [4 /*yield*/, executeOnSasViya(filePath, target, linesToExecute)];
+                case 7:
+                    result = _c.sent();
+                    return [3 /*break*/, 12];
+                case 8:
+                    if (!(target.serverType === utils_1.ServerType.Sas9)) return [3 /*break*/, 10];
+                    return [4 /*yield*/, executeOnSas9(target, linesToExecute)];
+                case 9:
+                    result = _c.sent();
+                    return [3 /*break*/, 12];
+                case 10: return [4 /*yield*/, executeOnSasJS(filePath, target, linesToExecute)];
+                case 11:
+                    result = _c.sent();
+                    _c.label = 12;
+                case 12:
+                    if (!isTempFile) return [3 /*break*/, 14];
+                    return [4 /*yield*/, (0, utils_1.deleteFile)(filePath)];
+                case 13:
+                    _c.sent();
+                    _c.label = 14;
+                case 14: return [2 /*return*/, result];
             }
         });
     });
 }
 exports.runSasCode = runSasCode;
-function executeOnSasViya(filePath, isTempFile, target, linesToExecute) {
+function executeOnSasViya(filePath, target, linesToExecute) {
     var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function () {
         var sasjs, contextName, authConfig, executionResult, log, isOutput, buildDestinationResultsFolder, createdFilePath;
@@ -192,17 +182,12 @@ function executeOnSasViya(filePath, isTempFile, target, linesToExecute) {
                 case 3:
                     createdFilePath = _f.sent();
                     (_e = process.logger) === null || _e === void 0 ? void 0 : _e.success("".concat(isOutput ? 'Output' : 'Log', " file has been created at ").concat(createdFilePath, " ."));
-                    if (!isTempFile) return [3 /*break*/, 5];
-                    return [4 /*yield*/, (0, utils_1.deleteFile)(filePath)];
-                case 4:
-                    _f.sent();
-                    _f.label = 5;
-                case 5: return [2 /*return*/, { log: log }];
+                    return [2 /*return*/, { log: log }];
             }
         });
     });
 }
-function executeOnSas9(filePath, isTempFile, target, linesToExecute) {
+function executeOnSas9(target, linesToExecute) {
     var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function () {
         var username, password, sas9CredentialsError, sasjs, buildDestinationResultsFolder, executionResult, createdFilePath;
@@ -263,12 +248,44 @@ function executeOnSas9(filePath, isTempFile, target, linesToExecute) {
                 case 2:
                     createdFilePath = _d.sent();
                     (_c = process.logger) === null || _c === void 0 ? void 0 : _c.success("Log file has been created at ".concat(createdFilePath, " ."));
-                    if (!isTempFile) return [3 /*break*/, 4];
-                    return [4 /*yield*/, (0, utils_1.deleteFile)(filePath)];
+                    return [2 /*return*/, { log: executionResult }];
+            }
+        });
+    });
+}
+function executeOnSasJS(filePath, target, linesToExecute) {
+    var _a, _b, _c;
+    return __awaiter(this, void 0, void 0, function () {
+        var authConfig, buildDestinationResultsFolder, sasjs, fileExtension, executionResult, createdFilePath;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0: return [4 /*yield*/, (0, utils_2.isSasJsServerInServerMode)(target)];
+                case 1:
+                    if (!_d.sent()) return [3 /*break*/, 3];
+                    return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
+                case 2:
+                    authConfig = _d.sent();
+                    _d.label = 3;
                 case 3:
-                    _d.sent();
-                    _d.label = 4;
-                case 4: return [2 /*return*/, { log: executionResult }];
+                    buildDestinationResultsFolder = process.sasjsConstants.buildDestinationResultsFolder;
+                    sasjs = new node_1.default({
+                        serverUrl: target.serverUrl,
+                        httpsAgentOptions: target.httpsAgentOptions,
+                        appLoc: target.appLoc,
+                        serverType: target.serverType,
+                        debug: true
+                    });
+                    fileExtension = path_1.default.extname(filePath).slice(1);
+                    return [4 /*yield*/, sasjs.executeScriptSASjs(linesToExecute.join('\n'), fileExtension, authConfig)];
+                case 4:
+                    executionResult = _d.sent();
+                    (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success('Job execution completed!');
+                    (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Creating log file in ".concat(buildDestinationResultsFolder, " ."));
+                    return [4 /*yield*/, createOutputFile(executionResult || '')];
+                case 5:
+                    createdFilePath = _d.sent();
+                    (_c = process.logger) === null || _c === void 0 ? void 0 : _c.success("Log file has been created at ".concat(createdFilePath, " ."));
+                    return [2 /*return*/, { log: executionResult }];
             }
         });
     });
@@ -290,3 +307,44 @@ function createOutputFile(log) {
         });
     });
 }
+function isUrl(filePath) {
+    return filePath.startsWith('https://') || filePath.startsWith('http://');
+}
+function createFileFromUrl(url) {
+    return __awaiter(this, void 0, void 0, function () {
+        var _this = this;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, axios_1.default
+                        .get(url)
+                        .then(function (res) { return __awaiter(_this, void 0, void 0, function () {
+                        var invalidSasError, content, urlWithoutQueryParams, fileExtension, tempFilePath;
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0:
+                                    invalidSasError = process.sasjsConstants.invalidSasError;
+                                    if (typeof res.data !== 'string') {
+                                        throw new Error(invalidSasError);
+                                    }
+                                    content = res.data.trim();
+                                    if (content && content.startsWith('<')) {
+                                        throw new Error(invalidSasError);
+                                    }
+                                    urlWithoutQueryParams = url.split('?')[0];
+                                    fileExtension = path_1.default.extname(urlWithoutQueryParams);
+                                    tempFilePath = path_1.default.join(process.projectDir, "temp-".concat(Date.now()).concat(fileExtension));
+                                    return [4 /*yield*/, (0, utils_1.createFile)(tempFilePath, content)];
+                                case 1:
+                                    _a.sent();
+                                    return [2 /*return*/, { isTempFile: true, tempFilePath: tempFilePath }];
+                            }
+                        });
+                    }); })
+                        .catch(function (err) {
+                        throw new Error("".concat(err.message, "\nUrl: ").concat(url));
+                    })];
+                case 1: return [2 /*return*/, _a.sent()];
+            }
+        });
+    });
+}

package/build/commands/run/runCommand.js

@@ -83,7 +83,7 @@ var RunCommand = /** @class */ (function (_super) {
                     type: 'boolean',
                     alias: 'c',
                     default: false,
-                    description: 'Used to force a deploy, eg even if the folders / services already exist (they will then be overwritten)'
+                    description: 'Used to compile the program prior to execution. Useful for including dependent macros and includes. More info here: https://cli.sasjs.io/compile'
                 }
             },
             syntax: syntax,

package/build/commands/run/spec/run.spec.server.sasjs.d.ts

@@ -0,0 +1 @@
+export {};

package/build/commands/run/spec/run.spec.server.sasjs.js

@@ -0,0 +1,100 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        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 });
+var path_1 = __importDefault(require("path"));
+var __1 = require("../..");
+var utils_1 = require("@sasjs/utils");
+var test_1 = require("../../../utils/test");
+describe('sasjs run with server type sasjs', function () {
+    var target;
+    beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
+        var appName;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    appName = 'cli-tests-run-sasjs' + (0, utils_1.generateTimestamp)();
+                    return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
+                case 1:
+                    _a.sent();
+                    target = (0, test_1.generateTestTarget)(appName, "/Public/app/cli-tests/".concat(appName), {
+                        serviceFolders: ['sasjs/testServices'],
+                        initProgram: '',
+                        termProgram: '',
+                        macroVars: {}
+                    }, utils_1.ServerType.Sasjs);
+                    return [4 /*yield*/, (0, utils_1.copy)(path_1.default.join(__dirname, 'testServices'), path_1.default.join(process.projectDir, 'sasjs', 'testServices'))];
+                case 2:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    afterEach(function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, target.name)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should run a file when a relative path is provided', function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, expect((0, __1.runSasCode)(target, 'sasjs/testServices/logJob.js')).toResolve()];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should run a file when an absolute path is provided', function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, expect((0, __1.runSasCode)(target, "".concat(process.projectDir, "/sasjs/testServices/logJob.js"))).toResolve()];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});

package/build/commands/run/spec/testServices/logJob.js

@@ -0,0 +1,4 @@
+"use strict";
+Array(100)
+    .fill()
+    .forEach(function (_, i) { return console.log(i); });

package/build/commands/testing/test.js

@@ -163,11 +163,11 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath, force) {
                         case utils_1.ServerType.Sas9: return [3 /*break*/, 4];
                         case utils_1.ServerType.Sasjs: return [3 /*break*/, 5];
                     }
-                    return [3 /*break*/, 9];
+                    return [3 /*break*/, 11];
                 case 2: return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
                 case 3:
                     authConfig = _e.sent();
-                    return [3 /*break*/, 9];
+                    return [3 /*break*/, 11];
                 case 4:
                     if (target.authConfigSas9) {
                         username = target.authConfigSas9.userName;
@@ -182,19 +182,23 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath, force) {
                         throw new Error(sas9CredentialsError);
                     }
                     password = (0, utils_1.decodeFromBase64)(password);
-                    return [3 /*break*/, 9];
+                    return [3 /*break*/, 11];
                 case 5:
-                    _e.trys.push([5, 7, , 8]);
-                    return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
+                    _e.trys.push([5, 9, , 10]);
+                    return [4 /*yield*/, (0, utils_2.isSasJsServerInServerMode)(target)];
                 case 6:
-                    authConfig = _e.sent();
-                    return [3 /*break*/, 8];
+                    if (!_e.sent()) return [3 /*break*/, 8];
+                    return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
                 case 7:
-                    e_1 = _e.sent();
-                    return [3 /*break*/, 8];
-                case 8: // FIXME: handle error properly
-                return [3 /*break*/, 9];
+                    authConfig = _e.sent();
+                    _e.label = 8;
+                case 8: return [3 /*break*/, 10];
                 case 9:
+                    e_1 = _e.sent();
+                    return [3 /*break*/, 10];
+                case 10: // FIXME: handle error properly
+                return [3 /*break*/, 11];
+                case 11:
                     result = {
                         sasjs_test_meta: []
                     };
@@ -337,21 +341,21 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath, force) {
                                 }
                             });
                         }); })];
-                case 10:
+                case 12:
                     _e.sent();
                     return [4 /*yield*/, (0, saveOutput_1.saveResultJson)(outDirectory, result)];
-                case 11:
+                case 13:
                     jsonPath = _e.sent();
                     if (!jsonPath)
                         return [2 /*return*/];
                     return [4 /*yield*/, (0, saveOutput_1.saveResultXml)(outDirectory, result)];
-                case 12:
+                case 14:
                     xmlPath = _e.sent();
                     return [4 /*yield*/, (0, saveOutput_1.saveResultCsv)(outDirectory, result)];
-                case 13:
+                case 15:
                     _d = _e.sent(), csvData = _d.csvData, csvPath = _d.csvPath;
                     return [4 /*yield*/, (0, saveOutput_1.saveCoverageLcov)(outDirectory, flow)];
-                case 14:
+                case 16:
                     coverageReportPath = _e.sent();
                     resultTable = {};
                     if (Array.isArray(csvData)) {

package/build/utils/test.js

@@ -177,12 +177,15 @@ var generateTestTarget = function (targetName, appLoc, serviceConfig, serverType
         macroVars: {}
     }; }
     dotenv_1.default.config();
+    var serverUrl = process.env.SASJS_SERVER_URL;
+    if (serverType === types_1.ServerType.SasViya)
+        serverUrl = process.env.VIYA_SERVER_URL;
+    if (serverType === types_1.ServerType.Sas9)
+        serverUrl = process.env.SAS9_SERVER_URL;
     var target = new types_1.Target({
         name: targetName,
         serverType: serverType,
-        serverUrl: (serverType === types_1.ServerType.SasViya
-            ? process.env.VIYA_SERVER_URL
-            : process.env.SAS9_SERVER_URL),
+        serverUrl: serverUrl,
         contextName: setConstants_1.contextName,
         appLoc: appLoc,
         authConfig: {

package/package.json

@@ -48,7 +48,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "3.10.11",
+    "@sasjs/adapter": "3.10.15",
     "@sasjs/core": "4.35.3",
     "@sasjs/lint": "1.12.0",
     "@sasjs/utils": "2.47.0",
@@ -97,5 +97,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.18.2"
+  "version": "3.19.0"
 }