@sasjs/cli 3.15.2 → 3.16.2

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;
-};

package/build/commands/web/web.js

@@ -44,10 +44,11 @@ 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 sasjsout_1 = require("./internal/sasjsout");
 var adjustIframeScript_1 = require("./internal/adjustIframeScript");
 var createAssetServices_1 = require("./internal/createAssetServices");
 var updateAllTags_1 = require("./internal/updateAllTags");
+var sas9_1 = require("./internal/sas9");
+var sasViya_1 = require("./internal/sasViya");
 var exampleStreamConfig = {
     streamWeb: true,
     streamWebFolder: '/example/folder/path',
@@ -58,32 +59,32 @@ var exampleStreamConfig = {
 function createWebAppServices(target) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
-        var buildDestinationServicesFolder, streamConfig, _c, webSourcePathFull, indexHtmlPath, destinationPath, assetPathMap, indexHtml;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var buildDestinationServicesFolder, streamConfig, _c, webSourcePathFull, indexHtmlPath, destinationPath, assetPathMap, indexHtml, _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
                 case 0:
                     buildDestinationServicesFolder = process.sasjsConstants.buildDestinationServicesFolder;
                     return [4 /*yield*/, (0, config_1.getStreamConfig)(target)];
                 case 1:
-                    streamConfig = _d.sent();
+                    streamConfig = _e.sent();
                     return [4 /*yield*/, validateStreamConfig(streamConfig)];
                 case 2:
-                    _c = _d.sent(), webSourcePathFull = _c.webSourcePathFull, indexHtmlPath = _c.indexHtmlPath;
+                    _c = _e.sent(), webSourcePathFull = _c.webSourcePathFull, indexHtmlPath = _c.indexHtmlPath;
                     return [4 /*yield*/, createBuildDestinationFolder()];
                 case 3:
-                    _d.sent();
+                    _e.sent();
                     destinationPath = path_1.default.join(buildDestinationServicesFolder, streamConfig.streamWebFolder);
                     return [4 /*yield*/, createTargetDestinationFolder(destinationPath)
                         // For server type SASjs, just need to copy webSourcePath
                         // to streamWebFolder, no need to create service files.
                     ];
                 case 4:
-                    _d.sent();
+                    _e.sent();
                     if (!(target.serverType === utils_1.ServerType.Sasjs)) return [3 /*break*/, 6];
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Copying web app files for target ".concat(target.name, "..."));
                     return [4 /*yield*/, (0, utils_1.copy)(webSourcePathFull, destinationPath)];
                 case 5:
-                    _d.sent();
+                    _e.sent();
                     return [2 /*return*/];
                 case 6:
                     (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Compiling web app services for target ".concat(target.name, "..."));
@@ -93,10 +94,10 @@ function createWebAppServices(target) {
                             return map;
                         })];
                 case 7:
-                    assetPathMap = _d.sent();
+                    assetPathMap = _e.sent();
                     return [4 /*yield*/, (0, utils_1.readFile)(indexHtmlPath).then(function (content) { return new jsdom_1.default.JSDOM(content); })];
                 case 8:
-                    indexHtml = _d.sent();
+                    indexHtml = _e.sent();
                     return [4 /*yield*/, (0, updateAllTags_1.updateAllTags)(indexHtml, {
                             webSourcePathFull: webSourcePathFull,
                             destinationPath: destinationPath,
@@ -104,18 +105,25 @@ function createWebAppServices(target) {
                             assetPathMap: assetPathMap
                         })];
                 case 9:
-                    _d.sent();
-                    if (!(target.serverType === utils_1.ServerType.SasViya)) return [3 /*break*/, 11];
-                    indexHtml.window.document.body.innerHTML += adjustIframeScript_1.adjustIframeScript;
-                    return [4 /*yield*/, createClickMeFile(indexHtml.serialize(), streamConfig.streamServiceName)];
+                    _e.sent();
+                    _d = target.serverType;
+                    switch (_d) {
+                        case utils_1.ServerType.SasViya: return [3 /*break*/, 10];
+                        case utils_1.ServerType.Sas9: return [3 /*break*/, 12];
+                    }
+                    return [3 /*break*/, 14];
                 case 10:
-                    _d.sent();
-                    return [3 /*break*/, 13];
-                case 11: return [4 /*yield*/, createClickMeService(indexHtml.serialize(), streamConfig.streamServiceName)];
-                case 12:
-                    _d.sent();
-                    _d.label = 13;
-                case 13: return [2 /*return*/];
+                    indexHtml.window.document.body.innerHTML += adjustIframeScript_1.adjustIframeScript;
+                    return [4 /*yield*/, (0, sasViya_1.createClickMeFile)(indexHtml.serialize(), streamConfig.streamServiceName)];
+                case 11:
+                    _e.sent();
+                    return [3 /*break*/, 15];
+                case 12: return [4 /*yield*/, (0, sas9_1.createClickMeService)(indexHtml.serialize(), streamConfig.streamServiceName)];
+                case 13:
+                    _e.sent();
+                    return [3 /*break*/, 15];
+                case 14: throw new Error("Server Type: ".concat(target.serverType, " is not supported for processing streaming index file."));
+                case 15: return [2 /*return*/];
             }
         });
     });
@@ -193,60 +201,3 @@ function createTargetDestinationFolder(destinationPath) {
         });
     });
 }
-function createClickMeService(indexHtmlContent, fileName) {
-    return __awaiter(this, void 0, void 0, function () {
-        var lines, clickMeServiceContent, buildDestinationServicesFolder;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    lines = indexHtmlContent.replace(/\r\n/g, '\n').split('\n');
-                    clickMeServiceContent = "".concat(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) {
-                            if (chunkedLines[0].length == 0)
-                                chunkedLines[0] = ' ';
-                            clickMeServiceContent += "put '".concat(chunkedLines[0]
-                                .split("'")
-                                .join("''"), "';\n");
-                        }
-                        else {
-                            var combinedLines_1 = '';
-                            chunkedLines.forEach(function (chunkedLine, index) {
-                                var text = "put '".concat(chunkedLine.split("'").join("''"), "'");
-                                if (index !== chunkedLines.length - 1) {
-                                    text += '@;\n';
-                                }
-                                else {
-                                    text += ';\n';
-                                }
-                                combinedLines_1 += text;
-                            });
-                            clickMeServiceContent += combinedLines_1;
-                        }
-                    });
-                    clickMeServiceContent += 'run;\n%sasjsout(HTML)';
-                    buildDestinationServicesFolder = process.sasjsConstants.buildDestinationServicesFolder;
-                    return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(buildDestinationServicesFolder, "".concat(fileName, ".sas")), clickMeServiceContent)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/];
-            }
-        });
-    });
-}
-function createClickMeFile(indexHtmlContent, fileName) {
-    return __awaiter(this, 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*/];
-            }
-        });
-    });
-}

package/build/constants.d.ts

@@ -13,4 +13,5 @@ export interface Constants {
     contextName: string;
     sas9CredentialsError: string;
     invalidSasError: string;
+    sas9GUID: string;
 }

package/build/utils/setConstants.js

@@ -46,7 +46,7 @@ var utils_1 = require("./utils");
 var utils_2 = require("@sasjs/utils");
 exports.contextName = 'sasjs cli compute context';
 var setConstants = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, configuration, isLocal, buildOutputFolder, buildResultsFolder, homeDir, buildSourceFolder, buildSourceDbFolder, buildDestinationFolder, buildDestinationServicesFolder, buildDestinationTestFolder, buildDestinationJobsFolder, buildDestinationDbFolder, buildDestinationDocsFolder, macroCorePath, buildDestinationResultsFolder, buildDestinationResultsLogsFolder, sas9CredentialsError, invalidSasError;
+    var _a, configuration, isLocal, buildOutputFolder, buildResultsFolder, homeDir, buildSourceFolder, buildSourceDbFolder, buildDestinationFolder, buildDestinationServicesFolder, buildDestinationTestFolder, buildDestinationJobsFolder, buildDestinationDbFolder, buildDestinationDocsFolder, macroCorePath, buildDestinationResultsFolder, buildDestinationResultsLogsFolder, sas9CredentialsError, invalidSasError, sas9GUID;
     var _b, _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -79,6 +79,7 @@ var setConstants = function () { return __awaiter(void 0, void 0, void 0, functi
                     '\n* SAS_PASSWORD' +
                     '\nPlease run "sasjs auth" for your specified target to apply the correct credentials.';
                 invalidSasError = 'Url specified does not contain a valid sas program. Please provide valid url.';
+                sas9GUID = 'pZKd6F95jECvRQlN0LCfdA==';
                 process.sasjsConstants = {
                     buildSourceFolder: buildSourceFolder,
                     buildSourceDbFolder: buildSourceDbFolder,
@@ -93,7 +94,8 @@ var setConstants = function () { return __awaiter(void 0, void 0, void 0, functi
                     macroCorePath: macroCorePath,
                     contextName: exports.contextName,
                     sas9CredentialsError: sas9CredentialsError,
-                    invalidSasError: invalidSasError
+                    invalidSasError: invalidSasError,
+                    sas9GUID: sas9GUID
                 };
                 return [2 /*return*/];
         }

package/build/utils/utils.d.ts

@@ -44,3 +44,4 @@ export declare const terminateProcess: (status: number) => never;
  */
 export declare const isSASjsProject: () => Promise<boolean>;
 export declare const getNodeModulePath: (module: string) => Promise<string>;
+export declare const isSasJsServerInServerMode: (target: Target) => Promise<boolean>;

package/build/utils/utils.js

@@ -86,10 +86,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNodeModulePath = exports.isSASjsProject = exports.terminateProcess = exports.prefixAppLoc = exports.loadEnvVariables = exports.displaySasjsRunnerError = exports.getAdapterInstance = exports.checkNodeVersion = exports.millisecondsToDdHhMmSs = exports.arrToObj = exports.parseLogLines = exports.executeShellScript = exports.getUniqServicesObj = exports.removeComments = exports.setupDoxygen = exports.setupGhooks = exports.setupGitIgnore = exports.setupNpmProject = exports.createTemplateApp = exports.createMinimalApp = exports.createAngularApp = exports.createReactApp = exports.diff = exports.inExistingProject = void 0;
+exports.isSasJsServerInServerMode = exports.getNodeModulePath = exports.isSASjsProject = exports.terminateProcess = exports.prefixAppLoc = exports.loadEnvVariables = exports.displaySasjsRunnerError = exports.getAdapterInstance = exports.checkNodeVersion = exports.millisecondsToDdHhMmSs = exports.arrToObj = exports.parseLogLines = exports.executeShellScript = exports.getUniqServicesObj = exports.removeComments = exports.setupDoxygen = exports.setupGhooks = exports.setupGitIgnore = exports.setupNpmProject = exports.createTemplateApp = exports.createMinimalApp = exports.createAngularApp = exports.createReactApp = exports.diff = exports.inExistingProject = void 0;
 var shelljs_1 = __importDefault(require("shelljs"));
 var path_1 = __importDefault(require("path"));
 var ora_1 = __importDefault(require("ora"));
+var axios_1 = __importDefault(require("axios"));
 var utils_1 = require("@sasjs/utils");
 var node_1 = __importDefault(require("@sasjs/adapter/node"));
 var displayResult_1 = require("./displayResult");
@@ -638,3 +639,23 @@ var getNodeModulePath = function (module) { return __awaiter(void 0, void 0, voi
     });
 }); };
 exports.getNodeModulePath = getNodeModulePath;
+var isSasJsServerInServerMode = function (target) { return __awaiter(void 0, void 0, void 0, function () {
+    var res, error_1, message;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                _a.trys.push([0, 2, , 3]);
+                return [4 /*yield*/, axios_1.default.get("".concat(target.serverUrl, "/SASjsApi/info"))];
+            case 1:
+                res = _a.sent();
+                return [2 /*return*/, res.data.mode === 'server'];
+            case 2:
+                error_1 = _a.sent();
+                message = "An error occurred while fetching server info from ".concat(target.serverUrl, "/SASjsApi/info");
+                (0, displayResult_1.displayError)(error_1, message);
+                throw new Error(message);
+            case 3: return [2 /*return*/];
+        }
+    });
+}); };
+exports.isSasJsServerInServerMode = isSasJsServerInServerMode;

package/package.json

@@ -96,5 +96,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.15.2"
+  "version": "3.16.2"
 }

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

@@ -1,2 +0,0 @@
-import { ServerType } from '@sasjs/utils';
-export declare const getWebServiceContent: (contentBase64: string, type: string | undefined, serverType: ServerType) => Promise<string>;