@sasjs/cli 4.4.0 → 4.4.2

package/build/commands/run/run.js

@@ -86,18 +86,18 @@ function runSasCode(target, filePath, compile, logFile, source) {
     var _a;
     if (compile === void 0) { compile = false; }
     return __awaiter(this, void 0, void 0, function () {
-        var isTempFile, sourcefilePathParts, sourceFolderPath, sasFilePath, sasFileContent, linesToExecute, macroVars, macroVarStatements;
-        var _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var isTempFile, sourcefilePathParts, sourceFolderPath, sasFilePath, sasFileContent, linesToExecute, macroVars, macroVarStatements, _b;
+        var _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
                     isTempFile = false;
                     if (!isUrl(filePath)) return [3 /*break*/, 2];
                     ;
                     return [4 /*yield*/, createFileFromUrl(filePath)];
                 case 1:
-                    (_b = _c.sent(), isTempFile = _b.isTempFile, filePath = _b.tempFilePath);
-                    _c.label = 2;
+                    (_c = _d.sent(), isTempFile = _c.isTempFile, filePath = _c.tempFilePath);
+                    _d.label = 2;
                 case 2:
                     if (!compile) return [3 /*break*/, 5];
                     if (!/\.sas$/i.test(filePath)) return [3 /*break*/, 4];
@@ -106,41 +106,46 @@ function runSasCode(target, filePath, compile, logFile, source) {
                     sourceFolderPath = sourcefilePathParts.join(path_1.default.sep);
                     return [4 /*yield*/, (0, __1.compileSingleFile)(target, 'identify', filePath, (0, internal_1.getDestinationServicePath)(sourceFolderPath), true)];
                 case 3:
-                    (filePath = (_c.sent()).destinationPath);
+                    (filePath = (_d.sent()).destinationPath);
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("File Compiled and placed at: ".concat(filePath, " ."));
                     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;
+                    _d.label = 5;
                 case 5:
                     sasFilePath = (0, utils_1.getAbsolutePath)(filePath, process.currentDir);
                     return [4 /*yield*/, (0, utils_1.readFile)(sasFilePath)];
                 case 6:
-                    sasFileContent = _c.sent();
+                    sasFileContent = _d.sent();
                     linesToExecute = sasFileContent.replace(/\r\n/g, '\n').split('\n');
                     if (!source) return [3 /*break*/, 8];
                     return [4 /*yield*/, (0, parseSourceFile_1.parseSourceFile)(source)];
                 case 7:
-                    macroVars = _c.sent();
+                    macroVars = _d.sent();
                     macroVarStatements = (0, utils_2.convertToSASStatements)(macroVars).split('\n');
                     linesToExecute = __spreadArray(__spreadArray([], __read(macroVarStatements), false), __read(linesToExecute), false);
-                    _c.label = 8;
+                    _d.label = 8;
                 case 8:
                     if (!isTempFile) return [3 /*break*/, 10];
                     return [4 /*yield*/, (0, utils_1.deleteFile)(filePath)];
                 case 9:
-                    _c.sent();
-                    _c.label = 10;
+                    _d.sent();
+                    _d.label = 10;
                 case 10:
-                    if (!(target.serverType === utils_1.ServerType.SasViya)) return [3 /*break*/, 12];
-                    return [4 /*yield*/, executeOnSasViya(filePath, target, linesToExecute, logFile)];
-                case 11: return [2 /*return*/, _c.sent()];
-                case 12:
-                    if (!(target.serverType === utils_1.ServerType.Sas9)) return [3 /*break*/, 14];
-                    return [4 /*yield*/, executeOnSas9(target, linesToExecute, logFile)];
-                case 13: return [2 /*return*/, _c.sent()];
-                case 14: return [4 /*yield*/, executeOnSasJS(filePath, target, linesToExecute, logFile)];
-                case 15: return [2 /*return*/, _c.sent()];
+                    _b = target.serverType;
+                    switch (_b) {
+                        case utils_1.ServerType.SasViya: return [3 /*break*/, 11];
+                        case utils_1.ServerType.Sas9: return [3 /*break*/, 13];
+                        case utils_1.ServerType.Sasjs: return [3 /*break*/, 15];
+                    }
+                    return [3 /*break*/, 17];
+                case 11: return [4 /*yield*/, executeOnSasViya(filePath, target, linesToExecute, logFile)];
+                case 12: return [2 /*return*/, _d.sent()];
+                case 13: return [4 /*yield*/, executeOnSas9(target, linesToExecute, logFile)];
+                case 14: return [2 /*return*/, _d.sent()];
+                case 15: return [4 /*yield*/, executeOnSasJS(filePath, target, linesToExecute, logFile)];
+                case 16: return [2 /*return*/, _d.sent()];
+                case 17: return [2 /*return*/];
             }
         });
     });
@@ -245,10 +250,12 @@ function executeOnSas9(target, linesToExecute, logFile) {
 function executeOnSasJS(filePath, target, linesToExecute, logFile) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var authConfig, _b, sasjs, fileExtension, executionResult;
+        var sasjs, authConfig, _b, fileExtension, log;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, (0, utils_2.isSasJsServerInServerMode)(target)];
+                case 0:
+                    sasjs = (0, config_1.getSASjs)(target);
+                    return [4 /*yield*/, (0, utils_2.isSasJsServerInServerMode)(target)];
                 case 1:
                     if (!(_c.sent())) return [3 /*break*/, 3];
                     return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
@@ -260,7 +267,6 @@ function executeOnSasJS(filePath, target, linesToExecute, logFile) {
                     _c.label = 4;
                 case 4:
                     authConfig = _b;
-                    sasjs = (0, config_1.getSASjs)(target);
                     fileExtension = path_1.default.extname(filePath).slice(1);
                     return [4 /*yield*/, sasjs.executeScript({
                             linesOfCode: linesToExecute,
@@ -268,12 +274,15 @@ function executeOnSasJS(filePath, target, linesToExecute, logFile) {
                             authConfig: authConfig
                         })];
                 case 5:
-                    executionResult = _c.sent();
+                    log = (_c.sent()).log;
+                    if (!log) {
+                        throw new node_1.ErrorResponse('We were not able to fetch the log this time.');
+                    }
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success('Job execution completed!');
-                    return [4 /*yield*/, createOutputFile(executionResult || '', logFile)];
+                    return [4 /*yield*/, createOutputFile(log, logFile)];
                 case 6:
                     _c.sent();
-                    return [2 /*return*/, { log: executionResult }];
+                    return [2 /*return*/, { log: log }];
             }
         });
     });

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

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

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

@@ -0,0 +1,149 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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 (g && (g = 0, op[0] && (_ = 0)), _) 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 };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var utils_1 = require("@sasjs/utils");
+var run_1 = require("../run");
+var utilsModule = __importStar(require("../../../utils/utils"));
+var configModule = __importStar(require("../../../utils/config"));
+var saveLogModule = __importStar(require("../../../utils/saveLog"));
+var fileModule = __importStar(require("@sasjs/utils/file"));
+var getAbsolutePathModule = __importStar(require("@sasjs/utils/file/getAbsolutePath"));
+var node_1 = __importStar(require("@sasjs/adapter/node"));
+var utils_2 = require("../../../utils");
+var sasjs = new node_1.default();
+describe('sasjs run', function () {
+    describe('SASJS', function () {
+        var target = new utils_1.Target({
+            name: 'test',
+            appLoc: '/Public/test/',
+            serverType: utils_1.ServerType.Sasjs,
+            contextName: 'test context'
+        });
+        var logData = 'SAS log';
+        var filePath = 'test.sas';
+        beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, (0, utils_2.setConstants)(false)];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        beforeEach(function () {
+            setupMocks(filePath, logData);
+        });
+        it('should saveLog function with correct log data', function () { return __awaiter(void 0, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        jest
+                            .spyOn(sasjs, 'executeScript')
+                            .mockImplementation(function () { return Promise.resolve({ log: logData }); });
+                        jest.spyOn(saveLogModule, 'saveLog').mockImplementation();
+                        process.sasjsConstants.buildDestinationResultsFolder = __dirname;
+                        return [4 /*yield*/, (0, run_1.runSasCode)(target, filePath, false, '')];
+                    case 1:
+                        _a.sent();
+                        expect(utils_2.saveLog).toHaveBeenCalledWith(logData, expect.stringMatching(/sasjs-run-\d{14}\.log$/), '', false, undefined);
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should throw an error if log is not returned by @sasjs/adapter', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var expectedError;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        jest
+                            .spyOn(sasjs, 'executeScript')
+                            .mockImplementation(function () { return Promise.resolve({}); });
+                        expectedError = new node_1.ErrorResponse('We were not able to fetch the log this time.');
+                        return [4 /*yield*/, expect((0, run_1.runSasCode)(target, filePath, false, '')).rejects.toEqual(expectedError)];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+    });
+});
+var setupMocks = function (filePath, logData) {
+    jest
+        .spyOn(getAbsolutePathModule, 'getAbsolutePath')
+        .mockImplementation(function () { return filePath; });
+    jest
+        .spyOn(fileModule, 'readFile')
+        .mockImplementation(function () { return Promise.resolve('test SAS code;'); });
+    jest
+        .spyOn(utilsModule, 'isSasJsServerInServerMode')
+        .mockImplementation(function () { return Promise.resolve(true); });
+    jest.spyOn(configModule, 'getAuthConfig').mockImplementation(function () {
+        return Promise.resolve({
+            access_token: 'test_access_token',
+            refresh_token: 'test_refresh_token',
+            client: 'test_client',
+            secret: ''
+        });
+    });
+    jest.spyOn(configModule, 'getSASjs').mockImplementation(function (target) { return sasjs; });
+};

package/package.json

@@ -22,7 +22,7 @@
     "preinstall": "npm run nodeVersionMessage",
     "prepare": "git rev-parse --git-dir && git config core.hooksPath ./.git-hooks || true"
   },
-  "testServerTypes": "sasjs,sas9",
+  "testServerTypes": "sasjs",
   "release": {
     "branches": [
       "main"
@@ -50,13 +50,13 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "4.5.0",
-    "@sasjs/core": "4.45.4",
-    "@sasjs/lint": "2.3.0",
+    "@sasjs/adapter": "4.5.1",
+    "@sasjs/core": "4.46.3",
+    "@sasjs/lint": "2.3.1",
     "@sasjs/utils": "3.3.0",
     "adm-zip": "0.5.9",
     "chalk": "4.1.2",
-    "dotenv": "10.0.0",
+    "dotenv": "16.0.3",
     "esm": "3.2.25",
     "find": "0.3.0",
     "js-base64": "3.7.2",
@@ -102,5 +102,5 @@
     "typescript": "4.9.5",
     "util": "0.12.4"
   },
-  "version": "4.4.0"
+  "version": "4.4.2"
 }