@sasjs/cli 3.16.2 → 3.18.0

package/build/commands/job/spec/{job.spec.server.js → job.spec.server.viya.js}

@@ -72,23 +72,62 @@ var deploy_1 = require("../../deploy/deploy");
 var target;
 var sasjs;
 var authConfig;
-describe('sasjs job execute', function () {
+describe('sasjs job execute with Viya', function () {
     beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
+        var timestamp, targetName;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    target = generateTarget();
+                    dotenv_1.default.config();
+                    timestamp = (0, utils_1.generateTimestamp)();
+                    targetName = "cli-tests-job-".concat(timestamp);
+                    target = new utils_1.Target({
+                        name: targetName,
+                        serverType: utils_1.ServerType.SasViya,
+                        serverUrl: process.env.VIYA_SERVER_URL,
+                        appLoc: "/Public/app/cli-tests/".concat(targetName),
+                        contextName: utils_2.contextName,
+                        serviceConfig: {
+                            serviceFolders: [
+                                'sasjs/testServices',
+                                'sasjs/testJob',
+                                'sasjs/services'
+                            ],
+                            initProgram: 'sasjs/testServices/serviceinit.sas',
+                            termProgram: 'sasjs/testServices/serviceterm.sas',
+                            macroVars: {}
+                        },
+                        jobConfig: {
+                            jobFolders: ['sasjs/testJob'],
+                            initProgram: 'sasjs/testServices/serviceinit.sas',
+                            termProgram: 'sasjs/testServices/serviceterm.sas',
+                            macroVars: {}
+                        },
+                        authConfig: {
+                            client: process.env.CLIENT,
+                            secret: process.env.SECRET,
+                            access_token: process.env.ACCESS_TOKEN,
+                            refresh_token: process.env.REFRESH_TOKEN
+                        },
+                        deployConfig: {
+                            deployServicePack: true,
+                            deployScripts: []
+                        }
+                    });
                     return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, target.name)];
                 case 1:
                     _a.sent();
-                    return [4 /*yield*/, copyJobsAndServices(target.name)];
+                    return [4 /*yield*/, (0, utils_1.copy)(path_1.default.join(__dirname, 'testJob'), path_1.default.join(__dirname, target.name, 'sasjs', 'testJob'))];
                 case 2:
                     _a.sent();
-                    return [4 /*yield*/, (0, build_1.build)(target)];
+                    return [4 /*yield*/, (0, utils_1.copy)(path_1.default.join(__dirname, 'testServices'), path_1.default.join(__dirname, target.name, 'sasjs', 'testServices'))];
                 case 3:
                     _a.sent();
-                    return [4 /*yield*/, (0, deploy_1.deploy)(target, false)];
+                    return [4 /*yield*/, (0, build_1.build)(target)];
                 case 4:
+                    _a.sent();
+                    return [4 /*yield*/, (0, deploy_1.deploy)(target, false)];
+                case 5:
                     _a.sent();
                     sasjs = new node_1.default({
                         serverUrl: target.serverUrl,
@@ -98,7 +137,7 @@ describe('sasjs job execute', function () {
                         debug: true
                     });
                     return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
-                case 5:
+                case 6:
                     authConfig = _a.sent();
                     process.logger = new utils_1.Logger(utils_1.LogLevel.Off);
                     return [2 /*return*/];
@@ -557,56 +596,6 @@ describe('sasjs job execute', function () {
         });
     }); });
 });
-var generateTarget = function (serverType) {
-    if (serverType === void 0) { serverType = utils_1.ServerType.SasViya; }
-    dotenv_1.default.config();
-    var timestamp = (0, utils_1.generateTimestamp)();
-    var targetName = "cli-tests-job-".concat(timestamp);
-    return new utils_1.Target({
-        name: targetName,
-        serverType: serverType,
-        serverUrl: (serverType === utils_1.ServerType.SasViya
-            ? process.env.VIYA_SERVER_URL
-            : process.env.SAS9_SERVER_URL),
-        appLoc: "/Public/app/cli-tests/".concat(targetName),
-        contextName: utils_2.contextName,
-        serviceConfig: {
-            serviceFolders: ['sasjs/testServices', 'sasjs/testJob', 'sasjs/services'],
-            initProgram: 'sasjs/testServices/serviceinit.sas',
-            termProgram: 'sasjs/testServices/serviceterm.sas',
-            macroVars: {}
-        },
-        jobConfig: {
-            jobFolders: ['sasjs/testJob'],
-            initProgram: 'sasjs/testServices/serviceinit.sas',
-            termProgram: 'sasjs/testServices/serviceterm.sas',
-            macroVars: {}
-        },
-        authConfig: {
-            client: process.env.CLIENT,
-            secret: process.env.SECRET,
-            access_token: process.env.ACCESS_TOKEN,
-            refresh_token: process.env.REFRESH_TOKEN
-        },
-        deployConfig: {
-            deployServicePack: true,
-            deployScripts: []
-        }
-    });
-};
-var copyJobsAndServices = function (appName) { return __awaiter(void 0, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, utils_1.copy)(path_1.default.join(__dirname, 'testJob'), path_1.default.join(__dirname, appName, 'sasjs', 'testJob'))];
-            case 1:
-                _a.sent();
-                return [4 /*yield*/, (0, utils_1.copy)(path_1.default.join(__dirname, 'testServices'), path_1.default.join(__dirname, appName, 'sasjs', 'testServices'))];
-            case 2:
-                _a.sent();
-                return [2 /*return*/];
-        }
-    });
-}); };
 var executeWrapper = function (_a) {
     var _b = _a.adapter, adapter = _b === void 0 ? sasjs : _b, jobPath = _a.jobPath, _c = _a.waitForJob, waitForJob = _c === void 0 ? false : _c, _d = _a.output, output = _d === void 0 ? false : _d, _e = _a.logFile, logFile = _e === void 0 ? undefined : _e, _f = _a.statusFile, statusFile = _f === void 0 ? undefined : _f, _g = _a.returnStatusOnly, returnStatusOnly = _g === void 0 ? false : _g, _h = _a.ignoreWarnings, ignoreWarnings = _h === void 0 ? false : _h, _j = _a.source, source = _j === void 0 ? undefined : _j, _k = _a.streamLog, streamLog = _k === void 0 ? false : _k;
     return __awaiter(void 0, void 0, void 0, function () {

package/build/commands/request/request.js

@@ -206,7 +206,8 @@ var saveLogFile = function (sasjs, sasJobLocation, logFile, jobPath) { return __
                     ? path_1.default.join(process.sasjsConstants.buildDestinationResultsFolder, 'requests')
                     : process.projectDir;
                 timestamp = (0, utils_1.generateTimestamp)();
-                filename = sasJobLocation.split(path_1.default.sep).pop();
+                filename = sasJobLocation.split('/').pop() // always use forward slash in SAS Drive
+                ;
                 logFile = path_1.default.join(logPath, "".concat(filename, "-").concat(timestamp, ".log"));
                 _a.label = 2;
             case 2: return [4 /*yield*/, (0, saveLog_1.saveLog)(currentRequestLog.logFile, logFile, jobPath || '', false)];
@@ -252,7 +253,7 @@ var writeOutput = function (outputPathParam, output, sasJobLocation) { return __
                 }
                 else {
                     timestamp = (0, utils_1.generateTimestamp)();
-                    filename = sasJobLocation.split(path_1.default.sep).pop();
+                    filename = sasJobLocation.split('/').pop();
                     outputPath += "".concat(path_1.default.sep).concat(filename, "-").concat(timestamp, ".json");
                 }
                 outputString = '';

package/build/commands/request/spec/request.spec.server.sas9.js

@@ -0,0 +1,283 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 (_) 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 utils_1 = require("@sasjs/utils");
+var utils_2 = require("@sasjs/utils");
+var test_1 = require("../../../utils/test");
+var timeStampUtils = __importStar(require("@sasjs/utils/time"));
+var request_1 = require("../request");
+var build_1 = require("../../build/build");
+var deploy_1 = require("../../deploy/deploy");
+var utils_3 = require("../../../utils");
+var getLogFilePath_1 = require("../../../utils/getLogFilePath");
+var fs_1 = require("fs");
+var utils_4 = require("./utils");
+describe('sasjs request with SAS9', function () {
+    var appName = 'cli-tests-request-sas9-' + (0, utils_2.generateTimestamp)();
+    var locationPrefix = "/User Folders/cli-tests/".concat(process.env.SAS_USERNAME, "/");
+    var target = (0, test_1.generateTestTarget)(appName, "".concat(locationPrefix).concat(appName), {
+        serviceFolders: ['sasjs/runRequest'],
+        initProgram: '',
+        termProgram: '',
+        macroVars: {}
+    }, utils_1.ServerType.Sas9);
+    var dataPathRel = 'data.json';
+    var configPathRel = 'sasjsconfig-temp.json';
+    beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
+        var sasjsBuildDirPath;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, (0, utils_1.copy)(path_1.default.join(__dirname, 'runRequest'), path_1.default.join(process.projectDir, 'sasjs', 'runRequest'))];
+                case 2:
+                    _a.sent();
+                    return [4 /*yield*/, (0, build_1.build)(target)];
+                case 3:
+                    _a.sent();
+                    return [4 /*yield*/, (0, deploy_1.deploy)(target, false)];
+                case 4:
+                    _a.sent();
+                    sasjsBuildDirPath = path_1.default.join(process.projectDir, 'sasjsbuild');
+                    return [4 /*yield*/, (0, utils_1.deleteFolder)(sasjsBuildDirPath)];
+                case 5:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    afterAll(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.removeTestServerFolder)(target.appLoc, target)];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, target.name)];
+                case 2:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    beforeEach(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_1.createFile)(path_1.default.join(process.projectDir, configPathRel), JSON.stringify(target.toJson(), null, 2))];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(process.projectDir, dataPathRel), JSON.stringify(utils_4.sampleDataJson, null, 2))];
+                case 2:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it("should execute service 'sendArr' with absolute path", function () { return __awaiter(void 0, void 0, void 0, function () {
+        var timestamp, outputFilename, _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendArr-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "".concat(locationPrefix).concat(target.name, "/services/runRequest/sendArr"), dataPathRel)).toResolve()];
+                case 1:
+                    _c.sent();
+                    _a = expect;
+                    return [4 /*yield*/, (0, utils_4.getOutputJson)(outputFilename)];
+                case 2:
+                    _a.apply(void 0, [(_c.sent()).table1]).toEqual(utils_4.expectedDataArr.table1);
+                    _b = expect;
+                    return [4 /*yield*/, (0, utils_4.getOutputJson)(outputFilename)];
+                case 3:
+                    _b.apply(void 0, [(_c.sent()).table2]).toEqual(utils_4.expectedDataArr.table2);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it("should execute service 'sendObj' with absolute path", function () { return __awaiter(void 0, void 0, void 0, function () {
+        var timestamp, outputFilename, _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendObj-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "".concat(locationPrefix).concat(target.name, "/services/runRequest/sendObj"), dataPathRel)).toResolve()];
+                case 1:
+                    _c.sent();
+                    _a = expect;
+                    return [4 /*yield*/, (0, utils_4.getOutputJson)(outputFilename)];
+                case 2:
+                    _a.apply(void 0, [(_c.sent()).table1]).toEqual(utils_4.expectedDataObj.table1);
+                    _b = expect;
+                    return [4 /*yield*/, (0, utils_4.getOutputJson)(outputFilename)];
+                case 3:
+                    _b.apply(void 0, [(_c.sent()).table2]).toEqual(utils_4.expectedDataObj.table2);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it("should execute service 'sendArr' with relative path", function () { return __awaiter(void 0, void 0, void 0, function () {
+        var timestamp, outputFilename, _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendArr-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendArr', dataPathRel)).toResolve()];
+                case 1:
+                    _c.sent();
+                    _a = expect;
+                    return [4 /*yield*/, (0, utils_4.getOutputJson)(outputFilename)];
+                case 2:
+                    _a.apply(void 0, [(_c.sent()).table1]).toEqual(utils_4.expectedDataArr.table1);
+                    _b = expect;
+                    return [4 /*yield*/, (0, utils_4.getOutputJson)(outputFilename)];
+                case 3:
+                    _b.apply(void 0, [(_c.sent()).table2]).toEqual(utils_4.expectedDataArr.table2);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it("should execute service 'sendObj' with relative path", function () { return __awaiter(void 0, void 0, void 0, function () {
+        var timestamp, outputFilename, _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendObj-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendObj', dataPathRel)).toResolve()];
+                case 1:
+                    _c.sent();
+                    _a = expect;
+                    return [4 /*yield*/, (0, utils_4.getOutputJson)(outputFilename)];
+                case 2:
+                    _a.apply(void 0, [(_c.sent()).table1]).toEqual(utils_4.expectedDataObj.table1);
+                    _b = expect;
+                    return [4 /*yield*/, (0, utils_4.getOutputJson)(outputFilename)];
+                case 3:
+                    _b.apply(void 0, [(_c.sent()).table2]).toEqual(utils_4.expectedDataObj.table2);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it("should execute service 'sendArr' with absolute path with output path", function () { return __awaiter(void 0, void 0, void 0, function () {
+        var rawData, output;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "".concat(locationPrefix).concat(target.name, "/services/runRequest/sendArr"), dataPathRel, undefined, undefined, undefined, undefined, './myoutput.json')).toResolve()];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, (0, utils_1.readFile)(path_1.default.join(process.projectDir, 'myoutput.json'))];
+                case 2:
+                    rawData = _a.sent();
+                    output = JSON.parse(rawData);
+                    expect(output.table1).toEqual(utils_4.expectedDataArr.table1);
+                    expect(output.table2).toEqual(utils_4.expectedDataArr.table2);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it("should execute service 'err' with absolute path with log path", function () { return __awaiter(void 0, void 0, void 0, function () {
+        var jobPath, log, rawLogDataStats;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    jobPath = (0, utils_3.prefixAppLoc)(target.appLoc, 'services/runRequest/err');
+                    log = (0, getLogFilePath_1.getLogFilePath)('./mylog.txt', jobPath || '');
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, jobPath, dataPathRel, undefined, undefined, log, jobPath)).toResolve()];
+                case 1:
+                    _a.sent();
+                    rawLogDataStats = (0, fs_1.statSync)(log);
+                    expect(rawLogDataStats.size).toBeGreaterThan(10);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it("should execute service 'err' with absolute path with default log path", function () { return __awaiter(void 0, void 0, void 0, function () {
+        var jobPath, log, rawLogDataStats;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    jobPath = (0, utils_3.prefixAppLoc)(target.appLoc, 'services/runRequest/err');
+                    log = (0, getLogFilePath_1.getLogFilePath)('', jobPath || '');
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, jobPath, dataPathRel, undefined, undefined, log, jobPath)).toResolve()];
+                case 1:
+                    _a.sent();
+                    rawLogDataStats = (0, fs_1.statSync)(log);
+                    expect(rawLogDataStats.size).toBeGreaterThan(10);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});