@sasjs/cli 3.26.0 → 3.27.0

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

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

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

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

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

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

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

@@ -0,0 +1,61 @@
+"use strict";
+/**
+ * @jest-environment jsdom
+ */
+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 };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var utils_1 = require("@sasjs/utils");
+var updateSasjsTag_1 = require("../updateSasjsTag");
+describe('updateSasjsTag', function () {
+    it("should update links in js script", function () { return __awaiter(void 0, void 0, void 0, function () {
+        var target, tag;
+        return __generator(this, function (_a) {
+            target = {
+                serverType: utils_1.ServerType.Sasjs,
+                appLoc: '/public/app/test'
+            };
+            tag = document.createElement('sasjs');
+            tag.setAttribute('appLoc', 'need/to/update');
+            tag.setAttribute('serverType', 'sas');
+            (0, updateSasjsTag_1.updateSasjsTag)(tag, target);
+            expect(tag.getAttribute('appLoc')).toEqual('/public/app/test');
+            expect(tag.getAttribute('serverType')).toEqual(utils_1.ServerType.Sasjs);
+            return [2 /*return*/];
+        });
+    }); });
+});

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

@@ -1,5 +1,5 @@
 import { JSDOM } from 'jsdom';
-import { ServerType } from '@sasjs/utils';
+import { ServerType, Target } from '@sasjs/utils';
 import { AssetPathMap } from './createAssetServices';
 interface paramsType {
     webSourcePathFull: string;
@@ -12,5 +12,5 @@ interface paramsType {
  * Also updates contents to update included asset references
  * @param {JSDOM} parsedHtml- DOMWindow for index.html
  */
-export declare const updateAllTags: (parsedHtml: JSDOM, { webSourcePathFull, destinationPath, serverType, assetPathMap }: paramsType) => Promise<void>;
+export declare const updateAllTags: (parsedHtml: JSDOM, target: Target, { webSourcePathFull, destinationPath, serverType, assetPathMap }: paramsType) => Promise<void>;
 export {};

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

@@ -67,19 +67,24 @@ var getTags_1 = require("./getTags");
 var updateScriptTag_1 = require("./updateScriptTag");
 var updateLinkTag_1 = require("./updateLinkTag");
 var updateStyleTag_1 = require("./updateStyleTag");
+var updateSasjsTag_1 = require("./updateSasjsTag");
 /**
  * Updates HTML Tags with correct link.
  * Also updates contents to update included asset references
  * @param {JSDOM} parsedHtml- DOMWindow for index.html
  */
-var updateAllTags = function (parsedHtml, _a) {
+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, scriptTags, styleExternalTags, styleInPageTags, styleTags, faviconTags, imgTags, sourceTags, srcTags, notFoundErrors;
+        var assetsNotFound, sasjsTags, scriptTags, styleExternalTags, styleInPageTags, styleTags, faviconTags, imgTags, sourceTags, srcTags, notFoundErrors;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     assetsNotFound = [];
+                    sasjsTags = (0, getTags_1.getSasjsTags)(parsedHtml);
+                    if (sasjsTags.length) {
+                        (0, updateSasjsTag_1.updateSasjsTag)(sasjsTags[0], target);
+                    }
                     scriptTags = (0, getTags_1.getScriptTags)(parsedHtml);
                     return [4 /*yield*/, (0, utils_1.asyncForEach)(scriptTags, function (tag) { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {

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

@@ -0,0 +1,5 @@
+import { Target } from '@sasjs/utils';
+/**
+ * Updates sasjs adapter's config in index.html if present.
+ */
+export declare const updateSasjsTag: (tag: Element, target: Target) => void;

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

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateSasjsTag = void 0;
+/**
+ * Updates sasjs adapter's config in index.html if present.
+ */
+var updateSasjsTag = function (tag, target) {
+    tag.setAttribute('appLoc', target.appLoc);
+    tag.setAttribute('serverType', target.serverType);
+};
+exports.updateSasjsTag = updateSasjsTag;

package/build/commands/web/web.js

@@ -98,7 +98,7 @@ function createWebAppServices(target) {
                     return [4 /*yield*/, (0, utils_1.readFile)(indexHtmlPath).then(function (content) { return new jsdom_1.default.JSDOM(content); })];
                 case 8:
                     indexHtml = _e.sent();
-                    return [4 /*yield*/, (0, updateAllTags_1.updateAllTags)(indexHtml, {
+                    return [4 /*yield*/, (0, updateAllTags_1.updateAllTags)(indexHtml, target, {
                             webSourcePathFull: webSourcePathFull,
                             destinationPath: destinationPath,
                             serverType: target.serverType,

package/package.json

@@ -101,5 +101,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.26.0"
+  "version": "3.27.0"
 }