@sasjs/cli 4.12.2 → 4.12.4

package/build/commands/create/spec/reactAppFiles.js

@@ -50,7 +50,7 @@ exports.reactAppFiles = {
                         { fileName: 'data-page.component.tsx' },
                         { fileName: 'home-page.component.tsx' },
                         { fileName: 'login.component.tsx' },
-                        { fileName: 'request-modal.component.jsx' },
+                        { fileName: 'request-modal.component.tsx' },
                         { fileName: 'syntax-highlighting.css' },
                         { fileName: 'user-name.component.tsx' }
                     ],
@@ -73,7 +73,7 @@ exports.reactAppFiles = {
                 },
                 {
                     folderName: 'theme',
-                    files: [{ fileName: 'index.js' }],
+                    files: [{ fileName: 'index.ts' }],
                     subFolders: []
                 }
             ]

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

@@ -1,6 +1,7 @@
 import { JSDOM } from 'jsdom';
 export declare const getSasjsTags: (parsedHtml: JSDOM) => Element[];
 export declare const getScriptTags: (parsedHtml: JSDOM) => HTMLScriptElement[];
+export declare const getModulePreload: (parsedHtml: JSDOM) => HTMLLinkElement[];
 export declare const getStyleInPageTags: (parsedHtml: JSDOM) => HTMLStyleElement[];
 export declare const getStyleTags: (parsedHtml: JSDOM) => HTMLLinkElement[];
 export declare const getFaviconTags: (parsedHtml: JSDOM) => HTMLLinkElement[];

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getManifestTags = exports.getSourceTags = exports.getImgTags = exports.getFaviconTags = exports.getStyleTags = exports.getStyleInPageTags = exports.getScriptTags = exports.getSasjsTags = void 0;
+exports.getManifestTags = exports.getSourceTags = exports.getImgTags = exports.getFaviconTags = exports.getStyleTags = exports.getStyleInPageTags = exports.getModulePreload = exports.getScriptTags = exports.getSasjsTags = void 0;
 var getSasjsTags = function (parsedHtml) {
     return Array.from(parsedHtml.window.document.getElementsByTagName('sasjs'));
 };
@@ -9,6 +9,10 @@ var getScriptTags = function (parsedHtml) {
     return Array.from(parsedHtml.window.document.getElementsByTagName('script'));
 };
 exports.getScriptTags = getScriptTags;
+var getModulePreload = function (parsedHtml) {
+    return Array.from(parsedHtml.window.document.getElementsByTagName('link')).filter(function (s) { return s.getAttribute('rel') === 'modulepreload'; });
+};
+exports.getModulePreload = getModulePreload;
 var getStyleInPageTags = function (parsedHtml) {
     return Array.from(parsedHtml.window.document.getElementsByTagName('style'));
 };

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

@@ -0,0 +1,4 @@
+/**
+ * @jest-environment jsdom
+ */
+export {};

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

@@ -0,0 +1,155 @@
+"use strict";
+/**
+ * @jest-environment jsdom
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+var jsdom_1 = require("jsdom");
+var getTags_1 = require("../getTags");
+describe('getTags', function () {
+    // Helper function to create a JSDOM instance with given HTML
+    var createDOM = function (html) { return new jsdom_1.JSDOM("<!DOCTYPE html>".concat(html)); };
+    describe('getSasjsTags', function () {
+        it('should return all sasjs tags', function () {
+            var html = "\n        <body>\n          <sasjs id=\"sasjs1\"></sasjs>\n          <sasjs id=\"sasjs2\"></sasjs>\n          <div>Not a sasjs tag</div>\n        </body>\n      ";
+            var dom = createDOM(html);
+            var result = (0, getTags_1.getSasjsTags)(dom);
+            expect(result).toHaveLength(2);
+            expect(result[0].id).toBe('sasjs1');
+            expect(result[1].id).toBe('sasjs2');
+        });
+        it('should return empty array when no sasjs tags are present', function () {
+            var html = '<body><div>No sasjs tags here</div></body>';
+            var dom = createDOM(html);
+            var result = (0, getTags_1.getSasjsTags)(dom);
+            expect(result).toHaveLength(0);
+        });
+    });
+    describe('getScriptTags', function () {
+        it('should return all script tags', function () {
+            var html = "\n        <head>\n          <script id=\"script1\" src=\"script1.js\"></script>\n        </head>\n        <body>\n          <script id=\"script2\" src=\"script2.js\"></script>\n          <div>Not a script tag</div>\n        </body>\n      ";
+            var dom = createDOM(html);
+            var result = (0, getTags_1.getScriptTags)(dom);
+            expect(result).toHaveLength(2);
+            expect(result[0].id).toBe('script1');
+            expect(result[1].id).toBe('script2');
+        });
+        it('should return empty array when no script tags are present', function () {
+            var html = '<body><div>No script tags here</div></body>';
+            var dom = createDOM(html);
+            var result = (0, getTags_1.getScriptTags)(dom);
+            expect(result).toHaveLength(0);
+        });
+    });
+    describe('getModulePreload', function () {
+        it('should return all link tags with rel="modulepreload"', function () {
+            var html = "\n        <head>\n          <link id=\"module1\" rel=\"modulepreload\" href=\"module1.js\">\n          <link id=\"module2\" rel=\"modulepreload\" href=\"module2.js\">\n          <link id=\"stylesheet\" rel=\"stylesheet\" href=\"style.css\">\n        </head>\n      ";
+            var dom = createDOM(html);
+            var result = (0, getTags_1.getModulePreload)(dom);
+            expect(result).toHaveLength(2);
+            expect(result[0].id).toBe('module1');
+            expect(result[1].id).toBe('module2');
+        });
+        it('should return empty array when no modulepreload links are present', function () {
+            var html = '<head><link rel="stylesheet" href="style.css"></head>';
+            var dom = createDOM(html);
+            var result = (0, getTags_1.getModulePreload)(dom);
+            expect(result).toHaveLength(0);
+        });
+    });
+    describe('getStyleInPageTags', function () {
+        it('should return all style tags', function () {
+            var html = "\n        <head>\n          <style id=\"style1\">.class1 { color: red; }</style>\n          <style id=\"style2\">.class2 { color: blue; }</style>\n        </head>\n        <body>\n          <div>Not a style tag</div>\n        </body>\n      ";
+            var dom = createDOM(html);
+            var result = (0, getTags_1.getStyleInPageTags)(dom);
+            expect(result).toHaveLength(2);
+            expect(result[0].id).toBe('style1');
+            expect(result[1].id).toBe('style2');
+        });
+        it('should return empty array when no style tags are present', function () {
+            var html = '<body><div>No style tags here</div></body>';
+            var dom = createDOM(html);
+            var result = (0, getTags_1.getStyleInPageTags)(dom);
+            expect(result).toHaveLength(0);
+        });
+    });
+    describe('getStyleTags', function () {
+        it('should return all link tags with rel="stylesheet"', function () {
+            var html = "\n        <head>\n          <link id=\"css1\" rel=\"stylesheet\" href=\"style1.css\">\n          <link id=\"css2\" rel=\"stylesheet\" href=\"style2.css\">\n          <link id=\"icon\" rel=\"icon\" href=\"favicon.ico\">\n        </head>\n      ";
+            var dom = createDOM(html);
+            var result = (0, getTags_1.getStyleTags)(dom);
+            expect(result).toHaveLength(2);
+            expect(result[0].id).toBe('css1');
+            expect(result[1].id).toBe('css2');
+        });
+        it('should return empty array when no stylesheet links are present', function () {
+            var html = '<head><link rel="icon" href="favicon.ico"></head>';
+            var dom = createDOM(html);
+            var result = (0, getTags_1.getStyleTags)(dom);
+            expect(result).toHaveLength(0);
+        });
+    });
+    describe('getFaviconTags', function () {
+        it('should return all link tags with rel containing "icon"', function () {
+            var html = "\n        <head>\n          <link id=\"icon1\" rel=\"icon\" href=\"favicon.ico\">\n          <link id=\"icon2\" rel=\"apple-touch-icon\" href=\"apple-touch-icon.png\">\n          <link id=\"css\" rel=\"stylesheet\" href=\"style.css\">\n        </head>\n      ";
+            var dom = createDOM(html);
+            var result = (0, getTags_1.getFaviconTags)(dom);
+            expect(result).toHaveLength(2);
+            expect(result[0].id).toBe('icon1');
+            expect(result[1].id).toBe('icon2');
+        });
+        it('should return empty array when no icon links are present', function () {
+            var html = '<head><link rel="stylesheet" href="style.css"></head>';
+            var dom = createDOM(html);
+            var result = (0, getTags_1.getFaviconTags)(dom);
+            expect(result).toHaveLength(0);
+        });
+    });
+    describe('getImgTags', function () {
+        it('should return all img tags with src attribute', function () {
+            var html = "\n        <body>\n          <img id=\"img1\" src=\"image1.jpg\">\n          <img id=\"img2\" src=\"image2.jpg\">\n          <img id=\"img3\">\n        </body>\n      ";
+            var dom = createDOM(html);
+            var result = (0, getTags_1.getImgTags)(dom);
+            expect(result).toHaveLength(2);
+            expect(result[0].id).toBe('img1');
+            expect(result[1].id).toBe('img2');
+        });
+        it('should return empty array when no img tags with src are present', function () {
+            var html = '<body><img id="noSrc"></body>';
+            var dom = createDOM(html);
+            var result = (0, getTags_1.getImgTags)(dom);
+            expect(result).toHaveLength(0);
+        });
+    });
+    describe('getSourceTags', function () {
+        it('should return all source tags with src attribute', function () {
+            var html = "\n        <body>\n          <audio>\n            <source id=\"source1\" src=\"audio.mp3\" type=\"audio/mpeg\">\n          </audio>\n          <video>\n            <source id=\"source2\" src=\"video.mp4\" type=\"video/mp4\">\n            <source id=\"source3\">\n          </video>\n        </body>\n      ";
+            var dom = createDOM(html);
+            var result = (0, getTags_1.getSourceTags)(dom);
+            expect(result).toHaveLength(2);
+            expect(result[0].id).toBe('source1');
+            expect(result[1].id).toBe('source2');
+        });
+        it('should return empty array when no source tags with src are present', function () {
+            var html = '<body><source id="noSrc"></body>';
+            var dom = createDOM(html);
+            var result = (0, getTags_1.getSourceTags)(dom);
+            expect(result).toHaveLength(0);
+        });
+    });
+    describe('getManifestTags', function () {
+        it('should return all link tags with rel="manifest"', function () {
+            var html = "\n        <head>\n          <link id=\"manifest1\" rel=\"manifest\" href=\"manifest.json\">\n          <link id=\"manifest2\" rel=\"manifest\" href=\"another-manifest.json\">\n          <link id=\"css\" rel=\"stylesheet\" href=\"style.css\">\n        </head>\n      ";
+            var dom = createDOM(html);
+            var result = (0, getTags_1.getManifestTags)(dom);
+            expect(result).toHaveLength(2);
+            expect(result[0].id).toBe('manifest1');
+            expect(result[1].id).toBe('manifest2');
+        });
+        it('should return empty array when no manifest links are present', function () {
+            var html = '<head><link rel="stylesheet" href="style.css"></head>';
+            var dom = createDOM(html);
+            var result = (0, getTags_1.getManifestTags)(dom);
+            expect(result).toHaveLength(0);
+        });
+    });
+});

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

@@ -76,7 +76,7 @@ var updateSasjsTag_1 = require("./updateSasjsTag");
 var updateAllTags = function (parsedHtml, target, _a) {
     var webSourcePathFull = _a.webSourcePathFull, destinationPath = _a.destinationPath, serverType = _a.serverType, assetPathMap = _a.assetPathMap;
     return __awaiter(void 0, void 0, void 0, function () {
-        var assetsNotFound, sasjsTags, scriptTags, styleExternalTags, styleInPageTags, styleTags, faviconTags, manifestTags, imgTags, sourceTags, srcTags, notFoundErrors;
+        var assetsNotFound, sasjsTags, scriptTags, modulePreloadTags, styleExternalTags, styleInPageTags, styleTags, faviconTags, manifestTags, imgTags, sourceTags, srcTags, notFoundErrors;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -98,6 +98,15 @@ var updateAllTags = function (parsedHtml, target, _a) {
                         }); })];
                 case 1:
                     _b.sent();
+                    modulePreloadTags = (0, getTags_1.getModulePreload)(parsedHtml);
+                    modulePreloadTags.forEach(function (tag) {
+                        try {
+                            (0, updateLinkTag_1.updateLinkTag)(tag, assetPathMap);
+                        }
+                        catch (error) {
+                            assetsNotFound.push(error);
+                        }
+                    });
                     styleExternalTags = (0, getTags_1.getStyleTags)(parsedHtml);
                     styleInPageTags = (0, getTags_1.getStyleInPageTags)(parsedHtml);
                     styleTags = __spreadArray(__spreadArray([], __read(styleExternalTags), false), __read(styleInPageTags), false);

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

@@ -12,7 +12,9 @@ var updateLinkTag = function (linkTag, assetPathMap, tagType) {
     if (isUrl)
         return;
     var assetPath = assetPathMap.find(function (entry) {
-        return entry.source === linkSourcePath || "./".concat(entry.source) === linkSourcePath;
+        return entry.source === linkSourcePath ||
+            "./".concat(entry.source) === linkSourcePath ||
+            "/".concat(entry.source) === linkSourcePath;
     });
     if (!(assetPath === null || assetPath === void 0 ? void 0 : assetPath.target)) {
         throw new Error("Unable to find file: ".concat(linkSourcePath));

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

@@ -80,7 +80,9 @@ var updateScriptTag = function (tag, webSourcePathFull, destinationPath, serverT
             case 7: throw new Error("Server Type: ".concat(serverType, " is not supported for updating script tag."));
             case 8:
                 tag.setAttribute('src', assetPathMap.find(function (entry) {
-                    return entry.source === scriptPath || "./".concat(entry.source) === scriptPath;
+                    return entry.source === scriptPath ||
+                        "./".concat(entry.source) === scriptPath ||
+                        "/".concat(entry.source) === scriptPath;
                 }).target);
                 _b.label = 9;
             case 9: return [3 /*break*/, 11];

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

@@ -80,7 +80,9 @@ var updateStyleTag = function (tag, webSourcePathFull, destinationPath, serverTy
             case 7: throw new Error("Server Type: ".concat(serverType, " is not supported for updating style tag."));
             case 8:
                 tag.setAttribute('href', assetPathMap.find(function (entry) {
-                    return entry.source === scriptPath || "./".concat(entry.source) === scriptPath;
+                    return entry.source === scriptPath ||
+                        "./".concat(entry.source) === scriptPath ||
+                        "/".concat(entry.source) === scriptPath;
                 }).target);
                 _b.label = 9;
             case 9: return [3 /*break*/, 11];

package/build/commands/web/web.js

@@ -44,7 +44,6 @@ var utils_1 = require("@sasjs/utils");
 var config_1 = require("../../utils/config");
 var path_1 = __importDefault(require("path"));
 var jsdom_1 = __importDefault(require("jsdom"));
-var adjustIframeScript_1 = require("./internal/adjustIframeScript");
 var createAssetServices_1 = require("./internal/createAssetServices");
 var updateAllTags_1 = require("./internal/updateAllTags");
 var sas9_1 = require("./internal/sas9");
@@ -112,9 +111,7 @@ function createWebAppServices(target) {
                         case utils_1.ServerType.Sas9: return [3 /*break*/, 12];
                     }
                     return [3 /*break*/, 14];
-                case 10:
-                    indexHtml.window.document.body.innerHTML += adjustIframeScript_1.adjustIframeScript;
-                    return [4 /*yield*/, (0, sasViya_1.createClickMeFile)(indexHtml.serialize(), streamConfig.streamServiceName)];
+                case 10: return [4 /*yield*/, (0, sasViya_1.createClickMeFile)(indexHtml.serialize(), streamConfig.streamServiceName)];
                 case 11:
                     _e.sent();
                     return [3 /*break*/, 15];

package/package.json

@@ -52,7 +52,7 @@
   },
   "dependencies": {
     "@sasjs/adapter": "4.11.3",
-    "@sasjs/core": "4.56.1",
+    "@sasjs/core": "4.57.0",
     "@sasjs/lint": "2.4.3",
     "@sasjs/utils": "3.5.2",
     "adm-zip": "0.5.10",
@@ -101,5 +101,5 @@
     "typescript": "4.9.5",
     "util": "0.12.4"
   },
-  "version": "4.12.2"
+  "version": "4.12.4"
 }

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

@@ -1 +0,0 @@
-export declare const adjustIframeScript = "\n    <!-- \n      To prevent redirects / preserve the URL when streaming \n      HTML from Viya, we recommend using the _debug=2 parameter\n      which will serve the content in an iframe.  The following \n      code will then modify the parent iframe to serve the content\n      in full screen.\n    -->\n    <script>\n    if (window.frameElement){\n      window.frameElement.style=\"height:100%;width:100%;position:absolute\";\n      window.frameElement.setAttribute(\"allowfullscreen\",\"\")\n      window.frameElement.setAttribute(\"frameborder\",\"0\")\n      window.frameElement.setAttribute(\"marginheight\",\"0\")\n      window.frameElement.setAttribute(\"marginwidth\",\"0\")\n      window.frameElement.setAttribute(\"scrolling\",\"auto\")\n      window.focus()\n    }\n    </script>\n";

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

@@ -1,4 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.adjustIframeScript = void 0;
-exports.adjustIframeScript = "\n    <!-- \n      To prevent redirects / preserve the URL when streaming \n      HTML from Viya, we recommend using the _debug=2 parameter\n      which will serve the content in an iframe.  The following \n      code will then modify the parent iframe to serve the content\n      in full screen.\n    -->\n    <script>\n    if (window.frameElement){\n      window.frameElement.style=\"height:100%;width:100%;position:absolute\";\n      window.frameElement.setAttribute(\"allowfullscreen\",\"\")\n      window.frameElement.setAttribute(\"frameborder\",\"0\")\n      window.frameElement.setAttribute(\"marginheight\",\"0\")\n      window.frameElement.setAttribute(\"marginwidth\",\"0\")\n      window.frameElement.setAttribute(\"scrolling\",\"auto\")\n      window.focus()\n    }\n    </script>\n";