@sasjs/cli 3.6.6 → 3.7.5

package/build/commands/testing/test.d.ts

@@ -1,2 +1,3 @@
 import { Target } from '@sasjs/utils';
 export declare function runTest(target: Target, testRegExps?: string[], outDirectory?: string, flowSourcePath?: string): Promise<undefined>;
+export declare const getTestUrl: (target: Target, jobLocation: string) => string;

package/build/commands/testing/test.js

@@ -75,7 +75,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runTest = void 0;
+exports.getTestUrl = exports.runTest = void 0;
 var saveOutput_1 = require("./internal/saveOutput");
 var types_1 = require("../../types");
 var file_1 = require("../../utils/file");
@@ -90,10 +90,10 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
     var _a, _b;
     if (testRegExps === void 0) { testRegExps = []; }
     return __awaiter(this, void 0, void 0, function () {
-        var testFlowData, testFlow, flow, sasjs, authConfig, username, password, sas9CredentialsError, result, isCodeExamplePrinted, printCodeExample, jsonPath, xmlPath, _c, csvData, csvPath, coverageReportPath, resultTable, testsCount, passedTestsCount, testsWithResultsCount;
+        var testFlowData, testFlow, flow, sasjs, authConfig, username, password, _c, sas9CredentialsError, e_1, result, isCodeExamplePrinted, printCodeExample, jsonPath, xmlPath, _d, csvData, csvPath, coverageReportPath, resultTable, testsCount, passedTestsCount, testsWithResultsCount;
         var _this = this;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        return __generator(this, function (_e) {
+            switch (_e.label) {
                 case 0:
                     if (outDirectory)
                         outDirectory = path_1.default.join(process.currentDir, outDirectory);
@@ -109,7 +109,7 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                             return Promise.reject("Test flow file was not found at ".concat(flowSourcePath));
                         })];
                 case 1:
-                    testFlowData = _d.sent();
+                    testFlowData = _e.sent();
                     if (!testFlowData)
                         return [2 /*return*/];
                     testFlow = { tests: [] };
@@ -124,7 +124,7 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                         flow.push(testFlow.testSetUp);
                     if (testFlow.tests)
                         flow = __spreadArray(__spreadArray([], __read(flow), false), __read(testFlow.tests.filter(function (test) {
-                            var e_1, _a;
+                            var e_2, _a;
                             if (!testRegExps.length)
                                 return true;
                             var match = false;
@@ -135,12 +135,12 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                                         match = true;
                                 }
                             }
-                            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                            catch (e_2_1) { e_2 = { error: e_2_1 }; }
                             finally {
                                 try {
                                     if (testRegExps_1_1 && !testRegExps_1_1.done && (_a = testRegExps_1.return)) _a.call(testRegExps_1);
                                 }
-                                finally { if (e_1) throw e_1.error; }
+                                finally { if (e_2) throw e_2.error; }
                             }
                             return match;
                         })), false);
@@ -155,27 +155,43 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                         contextName: target.contextName,
                         useComputeApi: false
                     });
-                    if (!(target.serverType === utils_1.ServerType.SasViya)) return [3 /*break*/, 3];
-                    return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
-                case 2:
-                    authConfig = _d.sent();
-                    _d.label = 3;
+                    _c = target.serverType;
+                    switch (_c) {
+                        case utils_1.ServerType.SasViya: return [3 /*break*/, 2];
+                        case utils_1.ServerType.Sas9: return [3 /*break*/, 4];
+                        case utils_1.ServerType.Sasjs: return [3 /*break*/, 5];
+                    }
+                    return [3 /*break*/, 9];
+                case 2: return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
                 case 3:
-                    if (target.serverType === utils_1.ServerType.Sas9) {
-                        if (target.authConfigSas9) {
-                            username = target.authConfigSas9.userName;
-                            password = target.authConfigSas9.password;
-                        }
-                        else {
-                            username = process.env.SAS_USERNAME;
-                            password = process.env.SAS_PASSWORD;
-                        }
-                        if (!username || !password) {
-                            sas9CredentialsError = process.sasjsConstants.sas9CredentialsError;
-                            throw new Error(sas9CredentialsError);
-                        }
-                        password = (0, utils_1.decodeFromBase64)(password);
+                    authConfig = _e.sent();
+                    return [3 /*break*/, 9];
+                case 4:
+                    if (target.authConfigSas9) {
+                        username = target.authConfigSas9.userName;
+                        password = target.authConfigSas9.password;
+                    }
+                    else {
+                        username = process.env.SAS_USERNAME;
+                        password = process.env.SAS_PASSWORD;
+                    }
+                    if (!username || !password) {
+                        sas9CredentialsError = process.sasjsConstants.sas9CredentialsError;
+                        throw new Error(sas9CredentialsError);
                     }
+                    password = (0, utils_1.decodeFromBase64)(password);
+                    return [3 /*break*/, 9];
+                case 5:
+                    _e.trys.push([5, 7, , 8]);
+                    return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
+                case 6:
+                    authConfig = _e.sent();
+                    return [3 /*break*/, 8];
+                case 7:
+                    e_1 = _e.sent();
+                    return [3 /*break*/, 8];
+                case 8: return [3 /*break*/, 9];
+                case 9:
                     result = {
                         sasjs_test_meta: []
                     };
@@ -188,7 +204,7 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                         }
                     };
                     return [4 /*yield*/, (0, utils_1.asyncForEach)(flow, function (test) { return __awaiter(_this, void 0, void 0, function () {
-                            var sasJobLocation, testTarget, testId, testUrl, printTestUrl;
+                            var sasJobLocation, testTarget, testId, testUrl, printTestUrl, handleRes;
                             var _this = this;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
@@ -202,101 +218,102 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                                             .pop()
                                             .replace(/(.test)?(.\d+)?(.sas)?$/i, '');
                                         testId = (0, utils_1.uuidv4)();
-                                        testUrl = "".concat(target.serverUrl, "/").concat(target.serverType === utils_1.ServerType.SasViya
-                                            ? 'SASJobExecution'
-                                            : 'SASStoredProcess', "/?_program=").concat(sasJobLocation, "&_debug=2477");
+                                        testUrl = (0, exports.getTestUrl)(target, sasJobLocation);
                                         if (target.contextName) {
                                             testUrl = "".concat(testUrl, "&_contextName=").concat(encodeURIComponent(target.contextName));
                                         }
                                         printTestUrl = function () { return process.logger.info("Test URL: ".concat(testUrl)); };
                                         printTestUrl();
-                                        return [4 /*yield*/, sasjs
-                                                .request(sasJobLocation, {}, { username: username, password: password }, function () {
-                                                (0, displayResult_1.displayError)(null, 'Login callback called. Request failed.');
-                                            }, authConfig, ['log'])
-                                                .then(function (res) { return __awaiter(_this, void 0, void 0, function () {
-                                                var lineBreak, existingTestTarget, existingTestTarget;
-                                                var _a, _b;
-                                                return __generator(this, function (_c) {
-                                                    switch (_c.label) {
-                                                        case 0:
-                                                            lineBreak = true;
-                                                            if (!res.result) {
-                                                                (0, displayResult_1.displayError)({}, "Job did not return a response, to debug click ".concat(testUrl));
-                                                                printCodeExample();
-                                                                lineBreak = false;
-                                                                existingTestTarget = result.sasjs_test_meta.find(function (testResult) {
-                                                                    return testResult.test_target === testTarget;
+                                        handleRes = function (res) { return __awaiter(_this, void 0, void 0, function () {
+                                            var lineBreak, existingTestTarget, existingTestTarget;
+                                            var _a, _b;
+                                            return __generator(this, function (_c) {
+                                                switch (_c.label) {
+                                                    case 0:
+                                                        lineBreak = true;
+                                                        if (!res.result) {
+                                                            (0, displayResult_1.displayError)({}, "Job did not return a response, to debug click ".concat(testUrl));
+                                                            printCodeExample();
+                                                            lineBreak = false;
+                                                            existingTestTarget = result.sasjs_test_meta.find(function (testResult) { return testResult.test_target === testTarget; });
+                                                            if (existingTestTarget) {
+                                                                existingTestTarget.results.push({
+                                                                    test_loc: test,
+                                                                    sasjs_test_id: testId,
+                                                                    result: types_1.TestResultStatus.notProvided,
+                                                                    test_url: testUrl
                                                                 });
-                                                                if (existingTestTarget) {
-                                                                    existingTestTarget.results.push({
-                                                                        test_loc: test,
-                                                                        sasjs_test_id: testId,
-                                                                        result: types_1.TestResultStatus.notProvided,
-                                                                        test_url: testUrl
-                                                                    });
-                                                                }
-                                                                else {
-                                                                    result.sasjs_test_meta.push({
-                                                                        test_target: testTarget,
-                                                                        results: [
-                                                                            {
-                                                                                test_loc: test,
-                                                                                sasjs_test_id: testId,
-                                                                                result: types_1.TestResultStatus.notProvided,
-                                                                                test_url: testUrl
-                                                                            }
-                                                                        ]
-                                                                    });
-                                                                }
                                                             }
-                                                            if (!((_a = res.result) === null || _a === void 0 ? void 0 : _a.test_results))
-                                                                lineBreak = false;
-                                                            if (!res.log) return [3 /*break*/, 2];
-                                                            return [4 /*yield*/, (0, saveOutput_1.saveLog)(outDirectory, test, res.log, lineBreak)];
-                                                        case 1:
-                                                            _c.sent();
-                                                            _c.label = 2;
-                                                        case 2:
-                                                            if ((_b = res.result) === null || _b === void 0 ? void 0 : _b.test_results) {
-                                                                existingTestTarget = result.sasjs_test_meta.find(function (testResult) {
-                                                                    return testResult.test_target === testTarget;
+                                                            else {
+                                                                result.sasjs_test_meta.push({
+                                                                    test_target: testTarget,
+                                                                    results: [
+                                                                        {
+                                                                            test_loc: test,
+                                                                            sasjs_test_id: testId,
+                                                                            result: types_1.TestResultStatus.notProvided,
+                                                                            test_url: testUrl
+                                                                        }
+                                                                    ]
+                                                                });
+                                                            }
+                                                        }
+                                                        if (!((_a = res.result) === null || _a === void 0 ? void 0 : _a.test_results))
+                                                            lineBreak = false;
+                                                        if (!res.log) return [3 /*break*/, 2];
+                                                        return [4 /*yield*/, (0, saveOutput_1.saveLog)(outDirectory, test, res.log, lineBreak)];
+                                                    case 1:
+                                                        _c.sent();
+                                                        _c.label = 2;
+                                                    case 2:
+                                                        if ((_b = res.result) === null || _b === void 0 ? void 0 : _b.test_results) {
+                                                            existingTestTarget = result.sasjs_test_meta.find(function (testResult) { return testResult.test_target === testTarget; });
+                                                            if (existingTestTarget) {
+                                                                existingTestTarget.results.push({
+                                                                    test_loc: test,
+                                                                    sasjs_test_id: testId,
+                                                                    result: res.result.test_results,
+                                                                    test_url: testUrl
                                                                 });
-                                                                if (existingTestTarget) {
-                                                                    existingTestTarget.results.push({
-                                                                        test_loc: test,
-                                                                        sasjs_test_id: testId,
-                                                                        result: res.result.test_results,
-                                                                        test_url: testUrl
-                                                                    });
-                                                                }
-                                                                else {
-                                                                    result.sasjs_test_meta.push({
-                                                                        test_target: testTarget,
-                                                                        results: [
-                                                                            {
-                                                                                test_loc: test,
-                                                                                sasjs_test_id: testId,
-                                                                                result: res.result.test_results,
-                                                                                test_url: testUrl
-                                                                            }
-                                                                        ]
-                                                                    });
-                                                                }
                                                             }
                                                             else {
-                                                                (0, displayResult_1.displayError)({}, "'test_results' not found in server response, to debug click ".concat(testUrl));
-                                                                printCodeExample();
+                                                                result.sasjs_test_meta.push({
+                                                                    test_target: testTarget,
+                                                                    results: [
+                                                                        {
+                                                                            test_loc: test,
+                                                                            sasjs_test_id: testId,
+                                                                            result: res.result.test_results,
+                                                                            test_url: testUrl
+                                                                        }
+                                                                    ]
+                                                                });
                                                             }
-                                                            return [2 /*return*/];
-                                                    }
-                                                });
-                                            }); })
+                                                        }
+                                                        else if (target.serverType !== utils_1.ServerType.Sasjs) {
+                                                            (0, displayResult_1.displayError)({}, "'test_results' not found in server response, to debug click ".concat(testUrl));
+                                                            printCodeExample();
+                                                        }
+                                                        return [2 /*return*/];
+                                                }
+                                            });
+                                        }); };
+                                        return [4 /*yield*/, sasjs
+                                                .request(sasJobLocation, {}, { username: username, password: password }, function () {
+                                                (0, displayResult_1.displayError)(null, 'Login callback called. Request failed.');
+                                            }, authConfig, ['log'])
+                                                .then(handleRes)
                                                 .catch(function (err) { return __awaiter(_this, void 0, void 0, function () {
-                                                var _a, _b;
-                                                return __generator(this, function (_c) {
-                                                    switch (_c.label) {
+                                                var _a, _b, _c;
+                                                return __generator(this, function (_d) {
+                                                    switch (_d.label) {
                                                         case 0:
+                                                            if (!(((_a = err.error) === null || _a === void 0 ? void 0 : _a.message) === 'Error: invalid Json string')) return [3 /*break*/, 2];
+                                                            return [4 /*yield*/, handleRes({})];
+                                                        case 1:
+                                                            _d.sent();
+                                                            return [2 /*return*/];
+                                                        case 2:
                                                             printTestUrl();
                                                             if (err && err.errorCode === 404) {
                                                                 (0, utils_2.displaySasjsRunnerError)(username);
@@ -304,12 +321,12 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                                                             else {
                                                                 (0, displayResult_1.displayError)({}, "An error occurred while executing the request. Job location: ".concat(sasJobLocation));
                                                             }
-                                                            if (!((_b = (_a = err === null || err === void 0 ? void 0 : err.error) === null || _a === void 0 ? void 0 : _a.details) === null || _b === void 0 ? void 0 : _b.result)) return [3 /*break*/, 2];
+                                                            if (!((_c = (_b = err === null || err === void 0 ? void 0 : err.error) === null || _b === void 0 ? void 0 : _b.details) === null || _c === void 0 ? void 0 : _c.result)) return [3 /*break*/, 4];
                                                             return [4 /*yield*/, (0, saveOutput_1.saveLog)(outDirectory, test, err.error.details.result)];
-                                                        case 1:
-                                                            _c.sent();
-                                                            _c.label = 2;
-                                                        case 2: return [2 /*return*/];
+                                                        case 3:
+                                                            _d.sent();
+                                                            _d.label = 4;
+                                                        case 4: return [2 /*return*/];
                                                     }
                                                 });
                                             }); })];
@@ -319,22 +336,22 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                                 }
                             });
                         }); })];
-                case 4:
-                    _d.sent();
+                case 10:
+                    _e.sent();
                     return [4 /*yield*/, (0, saveOutput_1.saveResultJson)(outDirectory, result)];
-                case 5:
-                    jsonPath = _d.sent();
+                case 11:
+                    jsonPath = _e.sent();
                     if (!jsonPath)
                         return [2 /*return*/];
                     return [4 /*yield*/, (0, saveOutput_1.saveResultXml)(outDirectory, result)];
-                case 6:
-                    xmlPath = _d.sent();
+                case 12:
+                    xmlPath = _e.sent();
                     return [4 /*yield*/, (0, saveOutput_1.saveResultCsv)(outDirectory, result)];
-                case 7:
-                    _c = _d.sent(), csvData = _c.csvData, csvPath = _c.csvPath;
+                case 13:
+                    _d = _e.sent(), csvData = _d.csvData, csvPath = _d.csvPath;
                     return [4 /*yield*/, (0, saveOutput_1.saveCoverageLcov)(outDirectory, flow)];
-                case 8:
-                    coverageReportPath = _d.sent();
+                case 14:
+                    coverageReportPath = _e.sent();
                     resultTable = {};
                     if (Array.isArray(csvData)) {
                         csvData.forEach(function (item) {
@@ -367,3 +384,11 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
     });
 }
 exports.runTest = runTest;
+var getTestUrl = function (target, jobLocation) {
+    return "".concat(target.serverUrl, "/").concat(target.serverType === utils_1.ServerType.SasViya
+        ? 'SASJobExecution'
+        : target.serverType === utils_1.ServerType.Sas9
+            ? 'SASStoredProcess'
+            : 'SASjsApi/stp/execute', "/?_program=").concat(jobLocation, "&_debug=2477");
+};
+exports.getTestUrl = getTestUrl;

package/build/commands/web/internal/getTags.d.ts

@@ -1,5 +1,7 @@
 import { JSDOM } from 'jsdom';
 export declare const getScriptTags: (parsedHtml: JSDOM) => HTMLScriptElement[];
+export declare const getStyleInPageTags: (parsedHtml: JSDOM) => HTMLStyleElement[];
 export declare const getStyleTags: (parsedHtml: JSDOM) => HTMLLinkElement[];
 export declare const getFaviconTags: (parsedHtml: JSDOM) => HTMLLinkElement[];
 export declare const getImgTags: (parsedHtml: JSDOM) => HTMLImageElement[];
+export declare const getSourceTags: (parsedHtml: JSDOM) => HTMLSourceElement[];

package/build/commands/web/internal/getTags.js

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getImgTags = exports.getFaviconTags = exports.getStyleTags = exports.getScriptTags = void 0;
+exports.getSourceTags = exports.getImgTags = exports.getFaviconTags = exports.getStyleTags = exports.getStyleInPageTags = exports.getScriptTags = void 0;
 var getScriptTags = function (parsedHtml) {
     return Array.from(parsedHtml.window.document.getElementsByTagName('script'));
 };
 exports.getScriptTags = getScriptTags;
+var getStyleInPageTags = function (parsedHtml) {
+    return Array.from(parsedHtml.window.document.getElementsByTagName('style'));
+};
+exports.getStyleInPageTags = getStyleInPageTags;
 var getStyleTags = function (parsedHtml) {
     return Array.from(parsedHtml.window.document.getElementsByTagName('link')).filter(function (s) { return s.getAttribute('rel') === 'stylesheet'; });
 };
@@ -17,3 +21,7 @@ var getImgTags = function (parsedHtml) {
     return Array.from(parsedHtml.window.document.getElementsByTagName('img')).filter(function (s) { return s.getAttribute('src'); });
 };
 exports.getImgTags = getImgTags;
+var getSourceTags = function (parsedHtml) {
+    return Array.from(parsedHtml.window.document.getElementsByTagName('source')).filter(function (s) { return s.getAttribute('src'); });
+};
+exports.getSourceTags = getSourceTags;

package/build/commands/web/internal/spec/testFiles/script3.d.ts

@@ -0,0 +1,23 @@
+declare function init(): void;
+declare function main(): void;
+declare function update(dt: any): void;
+declare function handleInput(dt: any): void;
+declare function updateEntities(dt: any, gameTime: any): void;
+declare function checkCollisions(): void;
+declare function render(): void;
+declare function renderEntity(entity: any): void;
+declare var requestAnimFrame: ((callback: FrameRequestCallback) => number) & typeof requestAnimationFrame;
+declare var canvas: HTMLCanvasElement;
+declare var ctx: CanvasRenderingContext2D | null;
+declare var updateables: any[];
+declare var fireballs: any[];
+declare var player: any;
+declare var vX: number;
+declare var vY: number;
+declare var vWidth: number;
+declare var vHeight: number;
+declare var level: any;
+declare var sounds: any;
+declare var music: any;
+declare var lastTime: any;
+declare var gameTime: number;