@sasjs/cli 3.17.0 → 3.18.1

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

@@ -0,0 +1,115 @@
+"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 SAS9', 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-sas9-' + (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.Sas9);
+                    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.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*/];
+            }
+        });
+    }); });
+    it('should run a file when a relative path is provided', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var logParts, result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    logParts = ['data;', 'do x=1 to 100;', 'output;', 'end;', 'run;'];
+                    return [4 /*yield*/, (0, __1.runSasCode)(target, 'sasjs/testServices/logJob.sas')];
+                case 1:
+                    result = _a.sent();
+                    logParts.forEach(function (logPart) {
+                        expect(result.log.includes(logPart)).toBeTruthy();
+                    });
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should run a file when an absolute path is provided', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var logParts, result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    logParts = ['data;', 'do x=1 to 100;', 'output;', 'end;', 'run;'];
+                    return [4 /*yield*/, (0, __1.runSasCode)(target, "".concat(process.projectDir, "/sasjs/testServices/logJob.sas"))];
+                case 1:
+                    result = _a.sent();
+                    logParts.forEach(function (logPart) {
+                        expect(result.log.includes(logPart)).toBeTruthy();
+                    });
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});

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

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

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

@@ -46,7 +46,7 @@ var utils_1 = require("@sasjs/utils");
 var test_1 = require("../../../utils/test");
 var build_1 = require("../../build/build");
 var utils_2 = require("../../../utils");
-describe('sasjs run', function () {
+describe('sasjs run with Viya', function () {
     var target;
     describe('runSasCode within project', function () {
         beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -198,70 +198,6 @@ describe('sasjs run', function () {
             });
         }); });
     });
-    describe('runSasCode within vanilla js project', function () {
-        var appName;
-        beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        dotenv_1.default.config();
-                        appName = 'cli-tests-run-' + (0, utils_1.generateTimestamp)();
-                        return [4 /*yield*/, (0, test_1.createTestMinimalApp)(__dirname, appName)];
-                    case 1:
-                        _a.sent();
-                        return [4 /*yield*/, (0, test_1.updateTarget)({
-                                appLoc: "/Public/app/cli-tests/".concat(appName),
-                                streamConfig: {
-                                    assetPaths: [],
-                                    streamWeb: true,
-                                    streamWebFolder: 'webv',
-                                    webSourcePath: 'src',
-                                    streamServiceName: 'clickme'
-                                },
-                                authConfig: {
-                                    client: process.env.CLIENT,
-                                    secret: process.env.SECRET,
-                                    access_token: process.env.ACCESS_TOKEN,
-                                    refresh_token: process.env.REFRESH_TOKEN
-                                }
-                            }, 'viya')];
-                    case 2:
-                        target = _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.removeTestServerFolder)(target.appLoc, target)];
-                    case 1:
-                        _a.sent();
-                        return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, appName)];
-                    case 2:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        }); });
-        it('should get the log having launch code message', function () { return __awaiter(void 0, void 0, void 0, function () {
-            var logPart, result;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        logPart = "SASjs Streaming App Created! Check it out here:\n      \n      \n      \n      \n      sas.analytium.co.uk/SASJobExecution?_FILE=".concat(target.appLoc, "/services/clickme.html&_debug=2\n");
-                        return [4 /*yield*/, (0, build_1.build)(target)];
-                    case 1:
-                        _a.sent();
-                        return [4 /*yield*/, (0, __1.runSasCode)(target, 'sasjsbuild/myviyadeploy.sas')];
-                    case 2:
-                        result = _a.sent();
-                        expect(result.log.includes(logPart)).toBeTruthy();
-                        return [2 /*return*/];
-                }
-            });
-        }); });
-    });
     describe('runSasCode outside project', function () {
         var sharedAppName;
         var homedir = require('os').homedir();
@@ -395,25 +331,35 @@ describe('sasjs run', function () {
             });
         }); });
     });
-    describe('sasjs run with SAS9', function () {
+    describe('runSasCode within vanilla js project', function () {
+        var appName;
         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-sas9-' + (0, utils_1.generateTimestamp)();
-                        return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
+                        dotenv_1.default.config();
+                        appName = 'cli-tests-run-' + (0, utils_1.generateTimestamp)();
+                        return [4 /*yield*/, (0, test_1.createTestMinimalApp)(__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.Sas9);
-                        return [4 /*yield*/, (0, utils_1.copy)(path_1.default.join(__dirname, 'testServices'), path_1.default.join(process.projectDir, 'sasjs', 'testServices'))];
+                        return [4 /*yield*/, (0, test_1.updateTarget)({
+                                appLoc: "/Public/app/cli-tests/".concat(appName),
+                                streamConfig: {
+                                    assetPaths: [],
+                                    streamWeb: true,
+                                    streamWebFolder: 'webv',
+                                    webSourcePath: 'src',
+                                    streamServiceName: 'clickme'
+                                },
+                                authConfig: {
+                                    client: process.env.CLIENT,
+                                    secret: process.env.SECRET,
+                                    access_token: process.env.ACCESS_TOKEN,
+                                    refresh_token: process.env.REFRESH_TOKEN
+                                }
+                            }, 'viya')];
                     case 2:
-                        _a.sent();
+                        target = _a.sent();
                         return [2 /*return*/];
                 }
             });
@@ -424,41 +370,26 @@ describe('sasjs run', function () {
                     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)];
+                        return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, appName)];
                     case 2:
                         _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 () {
-            var logParts, result;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        logParts = ['data;', 'do x=1 to 100;', 'output;', 'end;', 'run;'];
-                        return [4 /*yield*/, (0, __1.runSasCode)(target, 'sasjs/testServices/logJob.sas')];
-                    case 1:
-                        result = _a.sent();
-                        logParts.forEach(function (logPart) {
-                            expect(result.log.includes(logPart)).toBeTruthy();
-                        });
-                        return [2 /*return*/];
-                }
-            });
-        }); });
-        it('should run a file when an absolute path is provided', function () { return __awaiter(void 0, void 0, void 0, function () {
-            var logParts, result;
+        it('should get the log having launch code message', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var logPart, result;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        logParts = ['data;', 'do x=1 to 100;', 'output;', 'end;', 'run;'];
-                        return [4 /*yield*/, (0, __1.runSasCode)(target, "".concat(process.projectDir, "/sasjs/testServices/logJob.sas"))];
+                        logPart = "SASjs Streaming App Created! Check it out here:\n      \n      \n      \n      \n      sas.analytium.co.uk/SASJobExecution?_FILE=".concat(target.appLoc, "/services/clickme.html&_debug=2\n");
+                        return [4 /*yield*/, (0, build_1.build)(target)];
                     case 1:
+                        _a.sent();
+                        return [4 /*yield*/, (0, __1.runSasCode)(target, 'sasjsbuild/myviyadeploy.sas')];
+                    case 2:
                         result = _a.sent();
-                        logParts.forEach(function (logPart) {
-                            expect(result.log.includes(logPart)).toBeTruthy();
-                        });
+                        expect(result.log.includes(logPart)).toBeTruthy();
                         return [2 /*return*/];
                 }
             });

package/build/commands/servicepack/spec/servicepack.spec.server.viya.d.ts

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

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

@@ -45,7 +45,7 @@ var utils_1 = require("@sasjs/utils");
 var utils_2 = require("../../../utils");
 var deploy_1 = require("../deploy");
 var test_1 = require("../../../utils/test");
-describe('sasjs servicepack', function () {
+describe('sasjs servicepack with Viya', function () {
     var target;
     beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
         var targetName;

package/build/utils/test.js

@@ -151,9 +151,11 @@ var removeTestServerFolder = function (folderPath, target) { return __awaiter(vo
                     appLoc: target.appLoc,
                     serverType: target.serverType
                 });
-                accessToken = process.env.ACCESS_TOKEN;
-                return [4 /*yield*/, (0, delete_1.deleteFolder)(folderPath, sasjs, accessToken)];
+                return [4 /*yield*/, (0, config_1.getAccessToken)(target)];
             case 1:
+                accessToken = _a.sent();
+                return [4 /*yield*/, (0, delete_1.deleteFolder)(folderPath, sasjs, accessToken)];
+            case 2:
                 _a.sent();
                 return [2 /*return*/];
         }

package/build/utils/utils.d.ts

@@ -9,12 +9,6 @@ export declare function createTemplateApp(folderPath: string, template: string):
 export declare function setupNpmProject(folderName: string): Promise<void>;
 export declare function setupGitIgnore(folderName: string): Promise<void>;
 export declare function setupDoxygen(folderPath: string): Promise<void>;
-/**
- * Removes comments from a given block of text.
- * Preserves single line block comments and inline comments.
- * @param {string} text - the text to remove comments from.
- */
-export declare function removeComments(text: string): string;
 export declare function getUniqServicesObj(services: string[]): any;
 export declare function executeShellScript(filePath: string, logFilePath: string): Promise<unknown>;
 /**

package/build/utils/utils.js

@@ -86,7 +86,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSasJsServerInServerMode = exports.getNodeModulePath = exports.isSASjsProject = exports.terminateProcess = exports.prefixAppLoc = exports.loadEnvVariables = exports.displaySasjsRunnerError = exports.getAdapterInstance = exports.checkNodeVersion = exports.millisecondsToDdHhMmSs = exports.arrToObj = exports.parseLogLines = exports.executeShellScript = exports.getUniqServicesObj = exports.removeComments = exports.setupDoxygen = exports.setupGitIgnore = exports.setupNpmProject = exports.createTemplateApp = exports.createMinimalApp = exports.createAngularApp = exports.createReactApp = exports.diff = exports.inExistingProject = void 0;
+exports.isSasJsServerInServerMode = exports.getNodeModulePath = exports.isSASjsProject = exports.terminateProcess = exports.prefixAppLoc = exports.loadEnvVariables = exports.displaySasjsRunnerError = exports.getAdapterInstance = exports.checkNodeVersion = exports.millisecondsToDdHhMmSs = exports.arrToObj = exports.parseLogLines = exports.executeShellScript = exports.getUniqServicesObj = exports.setupDoxygen = exports.setupGitIgnore = exports.setupNpmProject = exports.createTemplateApp = exports.createMinimalApp = exports.createAngularApp = exports.createReactApp = exports.diff = exports.inExistingProject = void 0;
 var shelljs_1 = __importDefault(require("shelljs"));
 var path_1 = __importDefault(require("path"));
 var ora_1 = __importDefault(require("ora"));
@@ -374,39 +374,6 @@ function setupDoxygen(folderPath) {
     });
 }
 exports.setupDoxygen = setupDoxygen;
-/**
- * Removes comments from a given block of text.
- * Preserves single line block comments and inline comments.
- * @param {string} text - the text to remove comments from.
- */
-function removeComments(text) {
-    if (!text)
-        return '';
-    var lines = text
-        .replace(/\r\n/g, '\n')
-        .split('\n')
-        .map(function (l) { return l.trimEnd(); });
-    var linesWithoutComment = [];
-    var inCommentBlock = false;
-    lines.forEach(function (line) {
-        if (line.includes('/*') && line.includes('*/')) {
-            linesWithoutComment.push(line);
-        }
-        else {
-            if (line.startsWith('/*') && !line.endsWith('*/')) {
-                inCommentBlock = true;
-            }
-            if (!inCommentBlock) {
-                linesWithoutComment.push(line);
-            }
-            if (line.endsWith('*/') && !line.includes('/*') && inCommentBlock) {
-                inCommentBlock = false;
-            }
-        }
-    });
-    return linesWithoutComment.filter(function (l) { return !!l.trim(); }).join('\n');
-}
-exports.removeComments = removeComments;
 function getUniqServicesObj(services) {
     var returnObj = {};
     if (!services)
@@ -430,7 +397,7 @@ function executeShellScript(filePath, logFilePath) {
                     return __generator(this, function (_b) {
                         switch (_b.label) {
                             case 0:
-                                shellCommand = (0, utils_1.isWindows)() ? "sh ".concat(filePath) : "bash ".concat(filePath);
+                                shellCommand = (0, utils_1.isWindows)() ? "".concat(filePath) : "bash ".concat(filePath);
                                 result = shelljs_1.default.exec(shellCommand, { silent: true });
                                 if (!result.code) return [3 /*break*/, 1];
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("Error: ".concat(result.stderr));

package/package.json

@@ -20,6 +20,7 @@
     "preinstall": "npm run checkNodeVersion -s",
     "prepare": "git rev-parse --git-dir && git config core.hooksPath ./.git-hooks || true"
   },
+  "testServerTypes": "viya,sas9,sasjs",
   "release": {
     "branches": [
       "main"
@@ -47,9 +48,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "3.10.8",
-    "@sasjs/core": "4.32.2",
-    "@sasjs/lint": "1.11.2",
+    "@sasjs/adapter": "3.10.11",
+    "@sasjs/core": "4.35.3",
+    "@sasjs/lint": "1.12.0",
     "@sasjs/utils": "2.47.0",
     "adm-zip": "0.5.9",
     "chalk": "4.1.2",
@@ -88,7 +89,7 @@
     "jest": "27.4.7",
     "jest-cli": "27.4.7",
     "jest-extended": "1.1.0",
-    "nodemon": "2.0.15",
+    "nodemon": "2.0.19",
     "prettier": "2.6.2",
     "ts-jest": "27.1.2",
     "ts-node": "10.4.0",
@@ -96,5 +97,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.17.0"
+  "version": "3.18.1"
 }