@sasjs/cli 4.4.1 → 4.5.0

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$/), '', 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/build/utils/config.d.ts

@@ -97,8 +97,9 @@ export declare const overrideEnvVariables: (targetName: string) => Promise<void>
 export declare const getTestSetUp: (target: Target) => Promise<string | undefined>;
 export declare const getTestTearDown: (target: Target) => Promise<string | undefined>;
 /**
- * Returns configuration object of SAS Adapter and authentication configuration
- * @param {Target} target - the target to get auth configuration from.
+ * Provides instance of @sasjs/adapter.
+ * @param target - server server.
+ * @returns - instance of @sasjs/adapter.
  */
 export declare function getSASjs(target: Target): SASjs;
 /**

package/build/utils/config.js

@@ -1143,8 +1143,9 @@ var getTestTearDown = function (target) { return __awaiter(void 0, void 0, void
 }); };
 exports.getTestTearDown = getTestTearDown;
 /**
- * Returns configuration object of SAS Adapter and authentication configuration
- * @param {Target} target - the target to get auth configuration from.
+ * Provides instance of @sasjs/adapter.
+ * @param target - server server.
+ * @returns - instance of @sasjs/adapter.
  */
 function getSASjs(target) {
     return new node_1.default({
@@ -1154,7 +1155,8 @@ function getSASjs(target) {
         contextName: target.contextName,
         httpsAgentOptions: target.httpsAgentOptions,
         debug: true,
-        useComputeApi: target.serverType === utils_1.ServerType.SasViya
+        useComputeApi: target.serverType === utils_1.ServerType.SasViya,
+        verbose: !!process.env.VERBOSE // any not empty string should be considered as true
     });
 }
 exports.getSASjs = getSASjs;

package/build/utils/saveLog.d.ts

@@ -1,2 +1,9 @@
 import { LogJson } from '../types';
-export declare const saveLog: (logData: LogJson | string, logFile: string | undefined, jobPath: string, returnStatusOnly: boolean, silent?: boolean) => Promise<void>;
+/**
+ * Saves log to the log file.
+ * @param logData - log content.
+ * @param logFile - file path to log file.
+ * @param jobPath - file path to job, job name will be used as a fallback name for log file.
+ * @param silent - boolean indicating if additional info should be logged.
+ */
+export declare const saveLog: (logData: LogJson | string, logFile: string | undefined, jobPath: string, silent?: boolean) => Promise<void>;

package/build/utils/saveLog.js

@@ -43,7 +43,14 @@ exports.saveLog = void 0;
 var utils_1 = require("@sasjs/utils");
 var path_1 = __importDefault(require("path"));
 var _1 = require(".");
-var saveLog = function (logData, logFile, jobPath, returnStatusOnly, silent) {
+/**
+ * Saves log to the log file.
+ * @param logData - log content.
+ * @param logFile - file path to log file.
+ * @param jobPath - file path to job, job name will be used as a fallback name for log file.
+ * @param silent - boolean indicating if additional info should be logged.
+ */
+var saveLog = function (logData, logFile, jobPath, silent) {
     if (silent === void 0) { silent = false; }
     return __awaiter(void 0, void 0, void 0, function () {
         var error, logPath, folderPath, parentFolderPath, logLines;
@@ -51,6 +58,7 @@ var saveLog = function (logData, logFile, jobPath, returnStatusOnly, silent) {
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
+                    // throw an error if log is an object containing error property
                     if (typeof logData !== 'string') {
                         error = logData.error;
                         if (error)
@@ -75,7 +83,7 @@ var saveLog = function (logData, logFile, jobPath, returnStatusOnly, silent) {
                     return [4 /*yield*/, (0, utils_1.createFile)(logPath, logLines)];
                 case 4:
                     _b.sent();
-                    if (!returnStatusOnly && !silent)
+                    if (!silent)
                         (0, _1.displaySuccess)("Log saved to ".concat(logPath));
                     return [2 /*return*/];
             }

package/build/utils/spec/config.spec.js

@@ -70,7 +70,6 @@ var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
 var test_1 = require("../test");
 var setConstants_1 = require("../setConstants");
-jest.mock('@sasjs/adapter/node');
 describe('getAccessToken', function () {
     beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
@@ -726,3 +725,63 @@ describe('removeFromLocalConfig', function () {
         });
     }); });
 });
+describe('getSASjs', function () {
+    it('should set sasjsConfig according to target', function () {
+        var target = {
+            serverUrl: 'test_serverUrl',
+            appLoc: 'test_appLoc',
+            serverType: utils_1.ServerType.SasViya,
+            contextName: 'test_contextName',
+            httpsAgentOptions: {
+                caPath: 'test_caPath',
+                keyPath: 'test_keyPath',
+                certPath: 'test_certPath',
+                allowInsecureRequests: false
+            }
+        };
+        var sasjs = (0, config_1.getSASjs)(target);
+        var sasjsConfig = sasjs.getSasjsConfig();
+        var serverUrl = sasjsConfig.serverUrl, appLoc = sasjsConfig.appLoc, serverType = sasjsConfig.serverType, contextName = sasjsConfig.contextName, httpsAgentOptions = sasjsConfig.httpsAgentOptions;
+        expect(serverUrl).toEqual(target.serverUrl);
+        expect(appLoc).toEqual(target.appLoc);
+        expect(serverType).toEqual(target.serverType);
+        expect(contextName).toEqual(target.contextName);
+        expect(httpsAgentOptions).toEqual(target.httpsAgentOptions);
+    });
+    it('should set debug to true by default', function () {
+        var sasjs = (0, config_1.getSASjs)({});
+        var sasjsConfig = sasjs.getSasjsConfig();
+        var debug = sasjsConfig.debug;
+        expect(debug).toEqual(true);
+    });
+    it('should set useComputeApi to true if server type is Viya', function () {
+        var sasjs = (0, config_1.getSASjs)({ serverType: utils_1.ServerType.SasViya });
+        var sasjsConfig = sasjs.getSasjsConfig();
+        var useComputeApi = sasjsConfig.useComputeApi;
+        expect(useComputeApi).toEqual(true);
+    });
+    it('should set useComputeApi to false if server type is not Viya', function () {
+        var sasjs = (0, config_1.getSASjs)({ serverType: utils_1.ServerType.Sas9 });
+        var sasjsConfig = sasjs.getSasjsConfig();
+        var useComputeApi = sasjsConfig.useComputeApi;
+        expect(useComputeApi).toEqual(false);
+        sasjs = (0, config_1.getSASjs)({ serverType: utils_1.ServerType.Sasjs });
+        sasjsConfig = sasjs.getSasjsConfig();
+        useComputeApi = sasjsConfig.useComputeApi;
+        expect(useComputeApi).toEqual(false);
+    });
+    it('should enable verbose mode if VERBOSE env is present', function () {
+        process.env.VERBOSE = 'on';
+        var sasjs = (0, config_1.getSASjs)({});
+        var sasjsConfig = sasjs.getSasjsConfig();
+        var verbose = sasjsConfig.verbose;
+        expect(verbose).toEqual(true);
+    });
+    it('should disable verbose mode if VERBOSE env is not present', function () {
+        process.env.VERBOSE = '';
+        var sasjs = (0, config_1.getSASjs)({});
+        var sasjsConfig = sasjs.getSasjsConfig();
+        var verbose = sasjsConfig.verbose;
+        expect(verbose).toEqual(false);
+    });
+});

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.1",
-    "@sasjs/core": "4.45.4",
-    "@sasjs/lint": "2.3.0",
+    "@sasjs/adapter": "4.8.0",
+    "@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.1"
+  "version": "4.5.0"
 }