@sasjs/cli 3.15.1 → 3.16.1

package/build/commands/web/internal/sas9/generateAssetService.js

@@ -0,0 +1,75 @@
+"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 });
+exports.generateAssetService = void 0;
+var path_1 = __importDefault(require("path"));
+var utils_1 = require("@sasjs/utils");
+var _1 = require("./");
+/**
+ * Creates service file for SAS9 server only.
+ * @param {string} sourcePath path of source file.
+ * @param {string} destinationPath path of destination service file.
+ * @returns {string} name of created service file.
+ */
+var generateAssetService = function (sourcePath, destinationPath) { return __awaiter(void 0, void 0, void 0, function () {
+    var fileExtension, fileType, fileName, base64string, serviceContent;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                fileExtension = path_1.default.extname(sourcePath);
+                fileType = fileExtension.replace('.', '').toUpperCase();
+                fileName = path_1.default
+                    .basename(sourcePath)
+                    .replace(new RegExp(fileExtension + '$'), fileExtension.replace('.', '-'));
+                return [4 /*yield*/, (0, utils_1.base64EncodeFile)(sourcePath)];
+            case 1:
+                base64string = _a.sent();
+                return [4 /*yield*/, (0, _1.getWebServiceContent)(base64string, fileType)];
+            case 2:
+                serviceContent = _a.sent();
+                return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(destinationPath, "".concat(fileName, ".sas")), serviceContent)];
+            case 3:
+                _a.sent();
+                return [2 /*return*/, "".concat(fileName, ".sas")];
+        }
+    });
+}); };
+exports.generateAssetService = generateAssetService;

package/build/commands/web/internal/sas9/getWebServiceContent.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Prepares service code for SAS9 server only.
+ * @param {string} contentBase64 source code in base64.
+ * @param {string} type extension of source code's file in uppercase.
+ * @returns {string} service contents of provided source code.
+ */
+export declare const getWebServiceContent: (contentBase64: string, type?: string) => Promise<string>;

package/build/commands/web/internal/{getWebServiceContent.js → sas9/getWebServiceContent.js}

@@ -38,8 +38,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWebServiceContent = void 0;
 var utils_1 = require("@sasjs/utils");
-var sasjsout_1 = require("./sasjsout");
-var getWebServiceContent = function (contentBase64, type, serverType) {
+var sasjsout_1 = require("../sasjsout");
+/**
+ * Prepares service code for SAS9 server only.
+ * @param {string} contentBase64 source code in base64.
+ * @param {string} type extension of source code's file in uppercase.
+ * @returns {string} service contents of provided source code.
+ */
+var getWebServiceContent = function (contentBase64, type) {
     if (type === void 0) { type = 'JS'; }
     return __awaiter(void 0, void 0, void 0, function () {
         var lines, typesToEncode, serviceContent;
@@ -47,9 +53,10 @@ var getWebServiceContent = function (contentBase64, type, serverType) {
             lines = [contentBase64];
             typesToEncode = {
                 JS: 'JS64',
-                CSS: 'CSS64'
+                CSS: 'CSS64',
+                SVG: 'SVG64'
             };
-            serviceContent = "".concat(sasjsout_1.sasjsout, "\nfilename sasjs temp lrecl=99999999;\ndata _null_;\nfile sasjs;\n");
+            serviceContent = "".concat((0, sasjsout_1.sasjsout)(), "\nfilename sasjs temp lrecl=99999999;\ndata _null_;\nfile sasjs;\n");
             lines.forEach(function (line) {
                 var chunkedLines = (0, utils_1.chunk)(line);
                 if (chunkedLines.length === 1) {
@@ -70,12 +77,9 @@ var getWebServiceContent = function (contentBase64, type, serverType) {
                     serviceContent += combinedLines_1;
                 }
             });
-            if (serverType === utils_1.ServerType.Sas9 && typesToEncode.hasOwnProperty(type)) {
+            if (typesToEncode.hasOwnProperty(type)) {
                 serviceContent += "\nrun;\n%sasjsout(".concat(typesToEncode[type], ")");
             }
-            else {
-                serviceContent += "\nrun;\n%sasjsout(".concat(type, ")");
-            }
             return [2 /*return*/, serviceContent];
         });
     });

package/build/commands/web/internal/sas9/index.d.ts

@@ -0,0 +1,3 @@
+export * from './createClickMeService';
+export * from './generateAssetService';
+export * from './getWebServiceContent';

package/build/commands/web/internal/sas9/index.js

@@ -0,0 +1,15 @@
+"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 __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./createClickMeService"), exports);
+__exportStar(require("./generateAssetService"), exports);
+__exportStar(require("./getWebServiceContent"), exports);

package/build/commands/web/internal/sasViya/createClickMeFile.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Creates index file for SASVIYA server only.
+ * @param {string} indexHtmlContent contents of index file.
+ * @param {string} fileName name of index file.
+ */
+export declare const createClickMeFile: (indexHtmlContent: string, fileName: string) => Promise<void>;

package/build/commands/web/internal/sasViya/createClickMeFile.js

@@ -0,0 +1,63 @@
+"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 });
+exports.createClickMeFile = void 0;
+var utils_1 = require("@sasjs/utils");
+var path_1 = __importDefault(require("path"));
+/**
+ * Creates index file for SASVIYA server only.
+ * @param {string} indexHtmlContent contents of index file.
+ * @param {string} fileName name of index file.
+ */
+var createClickMeFile = function (indexHtmlContent, fileName) { return __awaiter(void 0, void 0, void 0, function () {
+    var buildDestinationServicesFolder;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                buildDestinationServicesFolder = process.sasjsConstants.buildDestinationServicesFolder;
+                return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(buildDestinationServicesFolder, "".concat(fileName, ".html")), indexHtmlContent)];
+            case 1:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    });
+}); };
+exports.createClickMeFile = createClickMeFile;

package/build/commands/web/internal/sasViya/index.d.ts

@@ -0,0 +1 @@
+export * from './createClickMeFile';

package/build/commands/web/internal/sasViya/index.js

@@ -0,0 +1,13 @@
+"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 __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./createClickMeFile"), exports);

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

@@ -1 +1 @@
-export declare const sasjsout = "\n%macro sasjsout(type,fref=sasjs);\n%global sysprocessmode SYS_JES_JOB_URI;\n%if \"&sysprocessmode\"=\"SAS Compute Server\" %then %do;\n  %if &type=HTML %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name=\"_webout.json\"\n      contenttype=\"text/html\";\n  %end;\n  %else %if &type=JS or &type=JS64 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.js'\n      contenttype='application/javascript';\n  %end;\n  %else %if &type=CSS or &type=CSS64 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.css'\n      contenttype='text/css';\n  %end;\n  %else %if &type=PNG or &type=GIF or &type=JPEG or &type=JPG %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\"\n      name=\"_webout.%lowcase(&type)\"\n      contenttype=\"image/%lowcase(&type)\" lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=ICO %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.ico'\n      contenttype='image/vnd.microsoft.icon' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=JSON %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.json'\n      contenttype='application/json' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=MP3 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.mp3'\n      contenttype='audio/mpeg' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=WAV %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.wav'\n      contenttype='audio/x-wav' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=OGG %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.ogg'\n      contenttype='audio/ogg' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=WOFF or &type=WOFF2 or &type=TTF %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\"\n      contenttype=\"font/%lowcase(&type)\";\n  %end;\n  %else %if &type=MP4 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\"\n      contenttype=\"video/mp4\";\n  %end;\n%end;\n%else %do;\n  %if &type=JS or &type=JS64 %then %do;\n    %let rc=%sysfunc(stpsrv_header(\n      Content-type,application/javascript%str(;)charset=UTF-8\n    ));\n  %end;\n  %else %if &type=CSS or &type=CSS64 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,text/css));\n  %end;\n  %else %if &type=PNG or &type=GIF or &type=JPEG or &type=JPG %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/%lowcase(&type)));\n  %end;\n  %else %if &type=ICO %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/vnd.microsoft.icon));\n  %end;\n  %else %if &type=JSON %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,application/json));\n  %end;\n  %else %if &type=MP3 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,audio/mpeg));\n  %end;\n  %else %if &type=WAV %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,audio/x-wav));\n  %end;\n  %else %if &type=OGG %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,audio/ogg));\n  %end;\n  %else %if &type=WOFF or &type=WOFF2 or &type=TTF %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,font/%lowcase(&type)));\n  %end;\n  %else %if &type=MP4 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,video/mp4));\n  %end;\n%end;\n%if &type=HTML %then %do;\n  /*\n  We need to perform some substitutions -eg to get the APPLOC and SERVERTYPE.\n  Therefore the developer should avoid writing lines that exceed 32k\n  characters (eg base64 encoded images) as they will get truncated when passing\n  through the datastep.  This could of course be re-written using LUA, removing\n  the length restriction.  Pull requests are welcome!\n  */\n  filename _sjs temp;\n  data _null_;\n    file _sjs lrecl=32767 encoding='utf-8';\n    infile &fref lrecl=32767;\n    input;\n    length appLoc expanded_path $1048;\n    if _n_=1 then do;\n      retain pgm \"&_program\" appLoc expanded_path;\n      /* index is deployed in the /services/ folder under the appLoc */\n      appLoc=substr(pgm,1,find(pgm,'/services/')-1);\n      expanded_path=cats('?_PROGRAM=',appLoc,'/services/');\n    end;\n    if find(_infile_,' appLoc: ') then put '    appLoc: ' apploc:$quote1048. ',';\n    else if find(_infile_,' serverType: ') then do;\n      if symexist('_metaperson') then put '    serverType: \"SAS9\" ,';\n      else put '    serverType: \"SASVIYA\" ,';\n    end;\n    else if find(_infile_,' serverUrl: ') then do;\n      /* nothing - we are streaming, so remove to default as hostname */\n    end;\n    else do;\n      /* More recently, SASjs apps avoid inline JS to allow strict CSP */\n      length infile in1 in2 $32767;\n      infile=cats(_infile_);\n      spos1=index(upcase(infile),'APPLOC=\"');\n      if spos1>0 then do;\n        in1=substr(infile,1,spos1+7);\n        in2=subpad(infile,spos1+8);\n        in2=substr(in2,index(in2,'\"'));\n        infile=cats(in1,appLoc,in2);\n        putlog \"new apploc:  \" infile=;\n      end;\n      /* find & replace serverType in HTML attributes */\n      spos2=index(upcase(infile),'SERVERTYPE=\"');\n      if spos2>0 then do;\n        in1=substr(infile,1,spos2+11);\n        in2=subpad(infile,spos2+12);\n        in2=substr(in2,index(in2,'\"'));\n        if symexist('sasjsprocessmode') then infile=cats(in1,\"SASJS\",in2);\n        else if \"&sysprocessmode\"=\"SAS Object Server\"\n        or \"&sysprocessmode\"= \"SAS Compute Server\"\n        then infile=cats(in1,\"SASVIYA\",in2);\n        else infile=cats(in1,\"SAS9\",in2);\n        putlog \"new servertype:  \" infile=;\n      end;\n      /* find & replace serverUrl in HTML attributes */\n      spos3=index(upcase(infile),'SERVERURL=\"');\n      if spos3>0 then do;\n        in1=substr(infile,1,spos3+10);\n        in2=subpad(infile,spos3+11);\n        in2=substr(in2,index(in2,'\"'));\n        infile=cats(in1,in2);\n        putlog \"new serverUrl:  \" infile=;\n      end;\n      if sum(spos1,spos2,spos3)>0 then put infile;\n      else do;\n        /* during SAS9 sasjs compile, dependencies get three slashes /// */\n        infile=tranwrd(_infile_,'?_PROGRAM=///',cats(expanded_path));\n        put infile;\n      end;\n    end;\n  run;\n  %let fref=_sjs;\n%end;\n\n/**\n  * In SAS9, JS & CSS files are base64 encoded to avoid UTF8 issues in WLATIN1\n  * metadata - so in this case, decode and stream byte by byte.\n  * */\n%if &type=GIF or &type=PNG or &type=JPG or &type=JPEG or &type=ICO or &type=MP3\nor &type=JS64 or &type=CSS64 or &type=WAV or &type=OGG or &type=WOFF\nor &type=WOFF2 or &type=TTF or &type=MP4\n%then %do;\n  data _null_;\n    length filein 8 fileout 8;\n    filein = fopen(\"&fref\",'I',4,'B');\n    fileout = fopen(\"_webout\",'A',1,'B');\n    char= '20'x;\n    do while(fread(filein)=0);\n      length raw $4 ;\n      do i=1 to 4;\n        rc=fget(filein,char,1);\n        substr(raw,i,1)=char;\n      end;\n      rc = fput(fileout, input(raw,$base64X4.));\n      rc =fwrite(fileout);\n    end;\n    rc = fclose(filein);\n    rc = fclose(fileout);\n  run;\n%end;\n%else %do;\n  data _null_;\n    length filein 8 fileid 8;\n    filein = fopen(\"&fref\",'I',1,'B');\n    fileid = fopen(\"_webout\",'A',1,'B');\n    rec = '20'x;\n    do while(fread(filein)=0);\n      rc = fget(filein,rec,1);\n      rc = fput(fileid, rec);\n      rc =fwrite(fileid);\n    end;\n    rc = fclose(filein);\n    rc = fclose(fileid);\n  run;\n%end;\n%mend;";
+export declare const sasjsout: () => string;

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

@@ -1,4 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sasjsout = void 0;
-exports.sasjsout = "\n%macro sasjsout(type,fref=sasjs);\n%global sysprocessmode SYS_JES_JOB_URI;\n%if \"&sysprocessmode\"=\"SAS Compute Server\" %then %do;\n  %if &type=HTML %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name=\"_webout.json\"\n      contenttype=\"text/html\";\n  %end;\n  %else %if &type=JS or &type=JS64 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.js'\n      contenttype='application/javascript';\n  %end;\n  %else %if &type=CSS or &type=CSS64 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.css'\n      contenttype='text/css';\n  %end;\n  %else %if &type=PNG or &type=GIF or &type=JPEG or &type=JPG %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\"\n      name=\"_webout.%lowcase(&type)\"\n      contenttype=\"image/%lowcase(&type)\" lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=ICO %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.ico'\n      contenttype='image/vnd.microsoft.icon' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=JSON %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.json'\n      contenttype='application/json' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=MP3 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.mp3'\n      contenttype='audio/mpeg' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=WAV %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.wav'\n      contenttype='audio/x-wav' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=OGG %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.ogg'\n      contenttype='audio/ogg' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=WOFF or &type=WOFF2 or &type=TTF %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\"\n      contenttype=\"font/%lowcase(&type)\";\n  %end;\n  %else %if &type=MP4 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\"\n      contenttype=\"video/mp4\";\n  %end;\n%end;\n%else %do;\n  %if &type=JS or &type=JS64 %then %do;\n    %let rc=%sysfunc(stpsrv_header(\n      Content-type,application/javascript%str(;)charset=UTF-8\n    ));\n  %end;\n  %else %if &type=CSS or &type=CSS64 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,text/css));\n  %end;\n  %else %if &type=PNG or &type=GIF or &type=JPEG or &type=JPG %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/%lowcase(&type)));\n  %end;\n  %else %if &type=ICO %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/vnd.microsoft.icon));\n  %end;\n  %else %if &type=JSON %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,application/json));\n  %end;\n  %else %if &type=MP3 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,audio/mpeg));\n  %end;\n  %else %if &type=WAV %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,audio/x-wav));\n  %end;\n  %else %if &type=OGG %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,audio/ogg));\n  %end;\n  %else %if &type=WOFF or &type=WOFF2 or &type=TTF %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,font/%lowcase(&type)));\n  %end;\n  %else %if &type=MP4 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,video/mp4));\n  %end;\n%end;\n%if &type=HTML %then %do;\n  /*\n  We need to perform some substitutions -eg to get the APPLOC and SERVERTYPE.\n  Therefore the developer should avoid writing lines that exceed 32k\n  characters (eg base64 encoded images) as they will get truncated when passing\n  through the datastep.  This could of course be re-written using LUA, removing\n  the length restriction.  Pull requests are welcome!\n  */\n  filename _sjs temp;\n  data _null_;\n    file _sjs lrecl=32767 encoding='utf-8';\n    infile &fref lrecl=32767;\n    input;\n    length appLoc expanded_path $1048;\n    if _n_=1 then do;\n      retain pgm \"&_program\" appLoc expanded_path;\n      /* index is deployed in the /services/ folder under the appLoc */\n      appLoc=substr(pgm,1,find(pgm,'/services/')-1);\n      expanded_path=cats('?_PROGRAM=',appLoc,'/services/');\n    end;\n    if find(_infile_,' appLoc: ') then put '    appLoc: ' apploc:$quote1048. ',';\n    else if find(_infile_,' serverType: ') then do;\n      if symexist('_metaperson') then put '    serverType: \"SAS9\" ,';\n      else put '    serverType: \"SASVIYA\" ,';\n    end;\n    else if find(_infile_,' serverUrl: ') then do;\n      /* nothing - we are streaming, so remove to default as hostname */\n    end;\n    else do;\n      /* More recently, SASjs apps avoid inline JS to allow strict CSP */\n      length infile in1 in2 $32767;\n      infile=cats(_infile_);\n      spos1=index(upcase(infile),'APPLOC=\"');\n      if spos1>0 then do;\n        in1=substr(infile,1,spos1+7);\n        in2=subpad(infile,spos1+8);\n        in2=substr(in2,index(in2,'\"'));\n        infile=cats(in1,appLoc,in2);\n        putlog \"new apploc:  \" infile=;\n      end;\n      /* find & replace serverType in HTML attributes */\n      spos2=index(upcase(infile),'SERVERTYPE=\"');\n      if spos2>0 then do;\n        in1=substr(infile,1,spos2+11);\n        in2=subpad(infile,spos2+12);\n        in2=substr(in2,index(in2,'\"'));\n        if symexist('sasjsprocessmode') then infile=cats(in1,\"SASJS\",in2);\n        else if \"&sysprocessmode\"=\"SAS Object Server\"\n        or \"&sysprocessmode\"= \"SAS Compute Server\"\n        then infile=cats(in1,\"SASVIYA\",in2);\n        else infile=cats(in1,\"SAS9\",in2);\n        putlog \"new servertype:  \" infile=;\n      end;\n      /* find & replace serverUrl in HTML attributes */\n      spos3=index(upcase(infile),'SERVERURL=\"');\n      if spos3>0 then do;\n        in1=substr(infile,1,spos3+10);\n        in2=subpad(infile,spos3+11);\n        in2=substr(in2,index(in2,'\"'));\n        infile=cats(in1,in2);\n        putlog \"new serverUrl:  \" infile=;\n      end;\n      if sum(spos1,spos2,spos3)>0 then put infile;\n      else do;\n        /* during SAS9 sasjs compile, dependencies get three slashes /// */\n        infile=tranwrd(_infile_,'?_PROGRAM=///',cats(expanded_path));\n        put infile;\n      end;\n    end;\n  run;\n  %let fref=_sjs;\n%end;\n\n/**\n  * In SAS9, JS & CSS files are base64 encoded to avoid UTF8 issues in WLATIN1\n  * metadata - so in this case, decode and stream byte by byte.\n  * */\n%if &type=GIF or &type=PNG or &type=JPG or &type=JPEG or &type=ICO or &type=MP3\nor &type=JS64 or &type=CSS64 or &type=WAV or &type=OGG or &type=WOFF\nor &type=WOFF2 or &type=TTF or &type=MP4\n%then %do;\n  data _null_;\n    length filein 8 fileout 8;\n    filein = fopen(\"&fref\",'I',4,'B');\n    fileout = fopen(\"_webout\",'A',1,'B');\n    char= '20'x;\n    do while(fread(filein)=0);\n      length raw $4 ;\n      do i=1 to 4;\n        rc=fget(filein,char,1);\n        substr(raw,i,1)=char;\n      end;\n      rc = fput(fileout, input(raw,$base64X4.));\n      rc =fwrite(fileout);\n    end;\n    rc = fclose(filein);\n    rc = fclose(fileout);\n  run;\n%end;\n%else %do;\n  data _null_;\n    length filein 8 fileid 8;\n    filein = fopen(\"&fref\",'I',1,'B');\n    fileid = fopen(\"_webout\",'A',1,'B');\n    rec = '20'x;\n    do while(fread(filein)=0);\n      rc = fget(filein,rec,1);\n      rc = fput(fileid, rec);\n      rc =fwrite(fileid);\n    end;\n    rc = fclose(filein);\n    rc = fclose(fileid);\n  run;\n%end;\n%mend;";
+var sasjsout = function () { return "\n/* this macro is derived from: https://core.sasjs.io/mp__replace_8sas.html */\noptions mprint;\n%macro mp_replace(infile,\n  findvar=,\n  replacevar=,\n  outfile=0\n)/*/STORE SOURCE*/;\n\n%local inref outref dttm ds1 rc;\n/* create filerefs */\n%let rc=%sysfunc(filename(inref,,temp,lrecl=200));\n%let rc=%sysfunc(filename(outref,,temp,lrecl=200));\n\n%if &outfile=0 %then %let outfile=&infile;\n\n/* uniquely named 32 char datasets */\n%let ds1=all%substr(%sysfunc(compress(%sysfunc(uuidgen()),-)),1,29);\n%let ds2=start%substr(%sysfunc(compress(%sysfunc(uuidgen()),-)),1,27);\n\n/* START */\n%let dttm=%sysfunc(datetime());\n\nfilename &inref &infile lrecl=1 recfm=n;\n\ndata &ds1;\n  infile &inref;\n  input sourcechar $char1. @@;\n  format sourcechar hex2.;\nrun;\n\ndata &ds2;\n  /* set find string to length in bytes to cover trailing spaces */\n  length string $ %length(%superq(&findvar));\n  string =symget(\"&findvar\");\n  drop string;\n\n  firstchar=char(string,1);\n  findlen=lengthm(string); /* <- for trailing bytes */\n\n  do _N_=1 to nobs;\n    set &ds1 nobs=nobs point=_N_;\n    if sourcechar=firstchar then do;\n      pos=1;\n      s=0;\n      do point=_N_ to min(_N_ + findlen -1,nobs);\n        set &ds1 point=point;\n        if sourcechar=char(string, pos) then s + 1;\n        else goto _leave_;\n        pos+1;\n      end;\n      _leave_:\n      if s=findlen then do;\n        START =_N_;\n        _N_ =_N_+ s - 1;\n        STOP =_N_;\n        output;\n      end;\n    end;\n  end;\n  stop;\n  keep START STOP;\nrun;\n\ndata &ds1;\n  declare hash HS(dataset:\"&ds2(keep=start)\");\n  HS.defineKey(\"start\");\n  HS.defineDone();\n  declare hash HE(dataset:\"&ds2(keep=stop)\");\n  HE.defineKey(\"stop\");\n  HE.defineDone();\n  do until(eof);\n    set &ds1 end=eof curobs =n;\n    start = ^HS.check(key:n);\n    stop  = ^HE.check(key:n);\n    length strt $ 1;\n    strt =put(start,best. -L);\n    retain out 1;\n    if out   then output;\n    if start then out=0;\n    if stop  then out=1;\n  end;\n  stop;\n  keep sourcechar strt;\nrun;\n\nfilename &outref &outfile recfm=n;\n\ndata _null_;\n  length replace $ %length(%superq(&replacevar));\n  replace=symget(\"&replacevar\");\n  file &outref;\n  do until(eof);\n    set &ds1 end=eof;\n    if strt =\"1\" then put replace char.;\n    else put sourcechar char1.;\n  end;\n  stop;\nrun;\n\n/* END */\n%put &sysmacroname took %sysevalf(%sysfunc(datetime())-&dttm) seconds to run;\n\n%mend mp_replace;\n\n%macro sasjsout(type,fref=sasjs);\n%global sysprocessmode SYS_JES_JOB_URI;\n\n%if &type=JS or &type=JS64 %then %do;\n  %let rc=%sysfunc(stpsrv_header(\n    Content-type,application/javascript%str(;)charset=UTF-8\n  ));\n%end;\n%else %if &type=CSS or &type=CSS64 %then %do;\n  %let rc=%sysfunc(stpsrv_header(Content-type,text/css));\n%end;\n%else %if &type=PNG or &type=GIF or &type=JPEG or &type=JPG %then %do;\n  %let rc=%sysfunc(stpsrv_header(Content-type,image/%lowcase(&type)));\n%end;\n%else %if &type=SVG or &type=SVG64 %then %do;\n  %let rc=%sysfunc(stpsrv_header(Content-type,image/svg+xml));\n%end;\n%else %if &type=ICO %then %do;\n  %let rc=%sysfunc(stpsrv_header(Content-type,image/vnd.microsoft.icon));\n%end;\n%else %if &type=JSON %then %do;\n  %let rc=%sysfunc(stpsrv_header(Content-type,application/json));\n%end;\n%else %if &type=MP3 %then %do;\n  %let rc=%sysfunc(stpsrv_header(Content-type,audio/mpeg));\n%end;\n%else %if &type=WAV %then %do;\n  %let rc=%sysfunc(stpsrv_header(Content-type,audio/x-wav));\n%end;\n%else %if &type=OGG %then %do;\n  %let rc=%sysfunc(stpsrv_header(Content-type,audio/ogg));\n%end;\n%else %if &type=WOFF or &type=WOFF2 or &type=TTF %then %do;\n  %let rc=%sysfunc(stpsrv_header(Content-type,font/%lowcase(&type)));\n%end;\n%else %if &type=MP4 %then %do;\n  %let rc=%sysfunc(stpsrv_header(Content-type,video/mp4));\n%end;\n\n%if &type=HTML %then %do;\n  /*\n  We need to perform some substitutions -eg to get the APPLOC and SERVERTYPE.\n  Therefore the developer should avoid writing lines that exceed 32k\n  characters (eg base64 encoded images) as they will get truncated when passing\n  through the datastep.  This could of course be re-written using LUA, removing\n  the length restriction.  Pull requests are welcome!\n  */\n  filename _sjsout temp;\n  data _null_;\n    file _sjsout lrecl=32767 encoding='utf-8';\n    infile &fref lrecl=32767;\n    input;\n    length appLoc expanded_path $1048;\n    if _n_=1 then do;\n      retain pgm \"&_program\" appLoc expanded_path;\n      /* index is deployed in the /services/ folder under the appLoc */\n      appLoc=substr(pgm,1,find(pgm,'/services/')-1);\n      expanded_path=cats('?_PROGRAM=',appLoc,'/services/');\n    end;\n    if find(_infile_,' appLoc: ') then put '    appLoc: ' apploc:$quote1048. ',';\n    else if find(_infile_,' serverType: ') then do;\n      put '    serverType: \"SAS9\" ,';\n    end;\n    else if find(_infile_,' serverUrl: ') then do;\n      /* nothing - we are streaming, so remove to default as hostname */\n    end;\n    else do;\n      /* More recently, SASjs apps avoid inline JS to allow strict CSP */\n      length infile in1 in2 $32767;\n      infile=cats(_infile_);\n      spos1=index(upcase(infile),'APPLOC=\"');\n      if spos1>0 then do;\n        in1=substr(infile,1,spos1+7);\n        in2=subpad(infile,spos1+8);\n        in2=substr(in2,index(in2,'\"'));\n        infile=cats(in1,appLoc,in2);\n        putlog \"new apploc:  \" infile=;\n      end;\n      /* find & replace serverType in HTML attributes */\n      spos2=index(upcase(infile),'SERVERTYPE=\"');\n      if spos2>0 then do;\n        in1=substr(infile,1,spos2+11);\n        in2=subpad(infile,spos2+12);\n        in2=substr(in2,index(in2,'\"'));\n        infile=cats(in1,\"SAS9\",in2);\n        putlog \"new servertype:  \" infile=;\n      end;\n      /* find & replace serverUrl in HTML attributes */\n      spos3=index(upcase(infile),'SERVERURL=\"');\n      if spos3>0 then do;\n        in1=substr(infile,1,spos3+10);\n        in2=subpad(infile,spos3+11);\n        in2=substr(in2,index(in2,'\"'));\n        infile=cats(in1,in2);\n        putlog \"new serverUrl:  \" infile=;\n      end;\n      if sum(spos1,spos2,spos3)>0 then put infile;\n      else do;\n        /* during SAS9 sasjs compile, dependencies get static GUID */\n        infile=tranwrd(_infile_,'?_PROGRAM=".concat(process.sasjsConstants.sas9GUID, "',cats(expanded_path));\n        put infile;\n      end;\n    end;\n  run;\n  %let fref=_sjsout;\n%end;\n%else %if &type=JS64 or &type=CSS64 %then %do;\n  options nobomfile;\n  %let fvar=").concat(process.sasjsConstants.sas9GUID, ";\n  %let stgfile=\"%sysfunc(pathname(work))/stgfile.txt\";\n  %let newfile=\"%sysfunc(pathname(work))/newfile.txt\";\n\n  /* convert from base64 */\n  filename _out64 &stgfile encoding='utf-8';\n  data _null_;\n    length filein 8 fileout 8;\n    filein = fopen(\"&fref\",'I',4,'B');\n    fileout = fopen(\"_out64\",'A',1,'B');\n    char= '20'x;\n    do while(fread(filein)=0);\n      length raw $4 ;\n      do i=1 to 4;\n        rc=fget(filein,char,1);\n        substr(raw,i,1)=char;\n      end;\n      rc = fput(fileout, input(raw,$base64X4.));\n      rc =fwrite(fileout);\n    end;\n    rc = fclose(filein);\n    rc = fclose(fileout);\n  run;\n\n  /* get appLoc from _program */\n  data _null_;\n    pgm=\"&_program\";\n    appLoc=substr(pgm,1,find(pgm,'/services/')-1);\n    call symputx('apploc',cats(appLoc,'/services/'));\n  run;\n  %put &=fvar;\n  %put &=apploc;\n  /* replace the GUID with appLoc */\n  %mp_replace(&stgfile,\n    findvar=fvar,\n    replacevar=apploc,\n    outfile=&newfile\n  )\n  filename &fref &newfile encoding='utf-8';\n%end;\n\n\n/**\n  * In SAS9, JS & CSS files are base64 encoded to avoid UTF8 issues in WLATIN1\n  * metadata - so in this case, decode and stream byte by byte.\n  * */\n%if &type=GIF or &type=PNG or &type=JPG or &type=JPEG or &type=ICO or &type=MP3\nor &type=WAV or &type=OGG or &type=WOFF or &type=WOFF2 or &type=TTF or &type=MP4\nor &type=SVG64\n%then %do;\n  data _null_;\n    length filein 8 fileout 8;\n    filein = fopen(\"&fref\",'I',4,'B');\n    fileout = fopen(\"_webout\",'A',1,'B');\n    char = '20'x;\n    do while(fread(filein)=0);\n      length raw $4 ;\n      do i=1 to 4;\n        rc=fget(filein,char,1);\n        substr(raw,i,1)=char;\n      end;\n      rc = fput(fileout, input(raw,$base64X4.));\n      rc = fwrite(fileout);\n    end;\n    rc = fclose(filein);\n    rc = fclose(fileout);\n  run;\n%end;\n%else %do;\n  %put streaming to _webout;\n  data _null_;\n    infile &fref lrecl=1 recfm=n;\n    file _webout mod lrecl=1 recfm=n;\n    input sourcechar $char1. @@;\n    format sourcechar hex2.;\n    put sourcechar char1. @@;\n  run;\n%end;\n%mend sasjsout;"); };
+exports.sasjsout = sasjsout;

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

@@ -1,13 +1,16 @@
 import { JSDOM } from 'jsdom';
 import { ServerType } from '@sasjs/utils';
+import { AssetPathMap } from './createAssetServices';
 interface paramsType {
     webSourcePathFull: string;
     destinationPath: string;
     serverType: ServerType;
-    assetPathMap: {
-        source: string;
-        target: string;
-    }[];
+    assetPathMap: AssetPathMap[];
 }
+/**
+ * Updates HTML Tags with correct link.
+ * 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 {};

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

@@ -67,6 +67,11 @@ var getTags_1 = require("./getTags");
 var updateScriptTag_1 = require("./updateScriptTag");
 var updateLinkTag_1 = require("./updateLinkTag");
 var updateStyleTag_1 = require("./updateStyleTag");
+/**
+ * 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 webSourcePathFull = _a.webSourcePathFull, destinationPath = _a.destinationPath, serverType = _a.serverType, assetPathMap = _a.assetPathMap;
     return __awaiter(void 0, void 0, void 0, function () {

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

@@ -1,4 +1,2 @@
-export declare const updateLinkTag: (linkTag: HTMLLinkElement | HTMLSourceElement | HTMLImageElement, assetPathMap: {
-    source: string;
-    target: string;
-}[], tagType?: 'link' | 'src') => void;
+import { AssetPathMap } from './createAssetServices';
+export declare const updateLinkTag: (linkTag: HTMLLinkElement | HTMLSourceElement | HTMLImageElement, assetPathMap: AssetPathMap[], tagType?: 'link' | 'src') => void;

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

@@ -1,5 +1,3 @@
 import { ServerType } from '@sasjs/utils';
-export declare const updateScriptTag: (tag: HTMLScriptElement, webSourcePathFull: string, destinationPath: string, serverType: ServerType, assetPathMap: {
-    source: string;
-    target: string;
-}[]) => Promise<void>;
+import { AssetPathMap } from './createAssetServices';
+export declare const updateScriptTag: (tag: HTMLScriptElement, webSourcePathFull: string, destinationPath: string, serverType: ServerType, assetPathMap: AssetPathMap[]) => Promise<void>;

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

@@ -43,54 +43,54 @@ exports.updateScriptTag = void 0;
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
 var js_base64_1 = require("js-base64");
-var getWebServiceContent_1 = require("./getWebServiceContent");
+var sas9_1 = require("./sas9");
+var modifyLinksInContent_1 = require("./modifyLinksInContent");
 var updateScriptTag = function (tag, webSourcePathFull, destinationPath, serverType, assetPathMap) { return __awaiter(void 0, void 0, void 0, function () {
-    var scriptPath, isUrl, _content, content, serviceContent, _content, content;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var scriptPath, isUrl, _content, content, _a, serviceContent, _content, content;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 scriptPath = tag.getAttribute('src');
-                if (!scriptPath) return [3 /*break*/, 8];
+                if (!scriptPath) return [3 /*break*/, 10];
                 isUrl = scriptPath.startsWith('http') || scriptPath.startsWith('//');
-                if (!!isUrl) return [3 /*break*/, 7];
+                if (!!isUrl) return [3 /*break*/, 9];
                 return [4 /*yield*/, (0, utils_1.readFile)(path_1.default.join(webSourcePathFull, scriptPath)).catch(function (_) {
                         throw new Error("Unable to find file: ".concat(scriptPath));
                     })];
             case 1:
-                _content = _a.sent();
-                content = modifyLinksInContent(_content, assetPathMap);
-                if (!(serverType === utils_1.ServerType.SasViya)) return [3 /*break*/, 3];
-                return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(destinationPath, scriptPath), content)];
-            case 2:
-                _a.sent();
-                return [3 /*break*/, 6];
-            case 3: return [4 /*yield*/, (0, getWebServiceContent_1.getWebServiceContent)((0, js_base64_1.encode)(content), 'JS', serverType)];
-            case 4:
-                serviceContent = _a.sent();
-                return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(destinationPath, "".concat(scriptPath.replace(/\.js$/, '-js'), ".sas")), serviceContent)];
+                _content = _b.sent();
+                content = (0, modifyLinksInContent_1.modifyLinksInContent)(_content, assetPathMap);
+                _a = serverType;
+                switch (_a) {
+                    case utils_1.ServerType.SasViya: return [3 /*break*/, 2];
+                    case utils_1.ServerType.Sas9: return [3 /*break*/, 4];
+                }
+                return [3 /*break*/, 7];
+            case 2: return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(destinationPath, scriptPath), content)];
+            case 3:
+                _b.sent();
+                return [3 /*break*/, 8];
+            case 4: return [4 /*yield*/, (0, sas9_1.getWebServiceContent)((0, js_base64_1.encode)(content), 'JS')];
             case 5:
-                _a.sent();
-                _a.label = 6;
+                serviceContent = _b.sent();
+                return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(destinationPath, "".concat(scriptPath.replace(/\.js$/, '-js'), ".sas")), serviceContent)];
             case 6:
+                _b.sent();
+                return [3 /*break*/, 8];
+            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;
                 }).target);
-                _a.label = 7;
-            case 7: return [3 /*break*/, 9];
-            case 8:
+                _b.label = 9;
+            case 9: return [3 /*break*/, 11];
+            case 10:
                 _content = tag.innerHTML;
-                content = modifyLinksInContent(_content, assetPathMap);
+                content = (0, modifyLinksInContent_1.modifyLinksInContent)(_content, assetPathMap);
                 tag.innerHTML = content;
-                _a.label = 9;
-            case 9: return [2 /*return*/];
+                _b.label = 11;
+            case 11: return [2 /*return*/];
         }
     });
 }); };
 exports.updateScriptTag = updateScriptTag;
-var modifyLinksInContent = function (_content, assetPathMap) {
-    var content = _content;
-    assetPathMap.forEach(function (pathEntry) {
-        content = content.replace(new RegExp(pathEntry.source, 'g'), pathEntry.target);
-    });
-    return content;
-};

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

@@ -1,5 +1,3 @@
 import { ServerType } from '@sasjs/utils';
-export declare const updateStyleTag: (tag: HTMLStyleElement | HTMLLinkElement, webSourcePathFull: string, destinationPath: string, serverType: ServerType, assetPathMap: {
-    source: string;
-    target: string;
-}[]) => Promise<void>;
+import { AssetPathMap } from './createAssetServices';
+export declare const updateStyleTag: (tag: HTMLStyleElement | HTMLLinkElement, webSourcePathFull: string, destinationPath: string, serverType: ServerType, assetPathMap: AssetPathMap[]) => Promise<void>;

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

@@ -43,54 +43,54 @@ exports.updateStyleTag = void 0;
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
 var js_base64_1 = require("js-base64");
-var getWebServiceContent_1 = require("./getWebServiceContent");
+var sas9_1 = require("./sas9");
+var modifyLinksInContent_1 = require("./modifyLinksInContent");
 var updateStyleTag = function (tag, webSourcePathFull, destinationPath, serverType, assetPathMap) { return __awaiter(void 0, void 0, void 0, function () {
-    var scriptPath, isUrl, _content, content, serviceContent, _content, content;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var scriptPath, isUrl, _content, content, _a, serviceContent, _content, content;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 scriptPath = tag.getAttribute('href');
-                if (!scriptPath) return [3 /*break*/, 8];
+                if (!scriptPath) return [3 /*break*/, 10];
                 isUrl = scriptPath.startsWith('http') || scriptPath.startsWith('//');
-                if (!!isUrl) return [3 /*break*/, 7];
+                if (!!isUrl) return [3 /*break*/, 9];
                 return [4 /*yield*/, (0, utils_1.readFile)(path_1.default.join(webSourcePathFull, scriptPath)).catch(function (_) {
                         throw new Error("Unable to find file: ".concat(scriptPath));
                     })];
             case 1:
-                _content = _a.sent();
-                content = modifyLinksInContent(_content, assetPathMap);
-                if (!(serverType === utils_1.ServerType.SasViya)) return [3 /*break*/, 3];
-                return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(destinationPath, scriptPath), content)];
-            case 2:
-                _a.sent();
-                return [3 /*break*/, 6];
-            case 3: return [4 /*yield*/, (0, getWebServiceContent_1.getWebServiceContent)((0, js_base64_1.encode)(content), 'CSS', serverType)];
-            case 4:
-                serviceContent = _a.sent();
-                return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(destinationPath, "".concat(scriptPath.replace(/\.js$/, '-js'), ".sas")), serviceContent)];
+                _content = _b.sent();
+                content = (0, modifyLinksInContent_1.modifyLinksInContent)(_content, assetPathMap);
+                _a = serverType;
+                switch (_a) {
+                    case utils_1.ServerType.SasViya: return [3 /*break*/, 2];
+                    case utils_1.ServerType.Sas9: return [3 /*break*/, 4];
+                }
+                return [3 /*break*/, 7];
+            case 2: return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(destinationPath, scriptPath), content)];
+            case 3:
+                _b.sent();
+                return [3 /*break*/, 8];
+            case 4: return [4 /*yield*/, (0, sas9_1.getWebServiceContent)((0, js_base64_1.encode)(content), 'CSS')];
             case 5:
-                _a.sent();
-                _a.label = 6;
+                serviceContent = _b.sent();
+                return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(destinationPath, "".concat(scriptPath.replace(/\.css$/, '-css'), ".sas")), serviceContent)];
             case 6:
+                _b.sent();
+                return [3 /*break*/, 8];
+            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;
                 }).target);
-                _a.label = 7;
-            case 7: return [3 /*break*/, 9];
-            case 8:
+                _b.label = 9;
+            case 9: return [3 /*break*/, 11];
+            case 10:
                 _content = tag.innerHTML;
-                content = modifyLinksInContent(_content, assetPathMap);
+                content = (0, modifyLinksInContent_1.modifyLinksInContent)(_content, assetPathMap);
                 tag.innerHTML = content;
-                _a.label = 9;
-            case 9: return [2 /*return*/];
+                _b.label = 11;
+            case 11: return [2 /*return*/];
         }
     });
 }); };
 exports.updateStyleTag = updateStyleTag;
-var modifyLinksInContent = function (_content, assetPathMap) {
-    var content = _content;
-    assetPathMap.forEach(function (pathEntry) {
-        content = content.replace(new RegExp(pathEntry.source, 'g'), pathEntry.target);
-    });
-    return content;
-};