@sasjs/cli 3.0.2 → 3.2.0

package/build/commands/request/request.js

@@ -59,7 +59,7 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
                     if (dataFilePath.split('.').slice(-1)[0] !== 'json') {
                         throw new Error('Provided data file must be valid json.');
                     }
-                    return [4 /*yield*/, utils_1.readFile(utils_2.getAbsolutePath(dataFilePath, process.projectDir))];
+                    return [4 /*yield*/, utils_1.readFile(utils_1.getAbsolutePath(dataFilePath, process.projectDir))];
                 case 1:
                     dataFile = _a.sent();
                     try {
@@ -74,7 +74,7 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
                     if (configFilePath.split('.').slice(-1)[0] !== 'json') {
                         throw new Error('Provided config file must be valid json.');
                     }
-                    return [4 /*yield*/, utils_1.readFile(utils_2.getAbsolutePath(configFilePath, process.projectDir))];
+                    return [4 /*yield*/, utils_1.readFile(utils_1.getAbsolutePath(configFilePath, process.projectDir))];
                 case 3:
                     configFile = _a.sent();
                     try {

package/build/commands/run/run.js

@@ -113,7 +113,7 @@ function runSasCode(target, filePath, compile) {
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("File Compiled and placed at: " + filePath + " .");
                     _b.label = 4;
                 case 4:
-                    sasFilePath = utils_2.getAbsolutePath(filePath, process.currentDir);
+                    sasFilePath = utils_1.getAbsolutePath(filePath, process.currentDir);
                     return [4 /*yield*/, utils_1.readFile(sasFilePath)];
                 case 5:
                     sasFileContent = _b.sent();

package/build/commands/servicepack/deploy.js

@@ -42,7 +42,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.servicePackDeploy = void 0;
 var path_1 = __importDefault(require("path"));
 var displayResult_1 = require("../../utils/displayResult");
-var utils_1 = require("../../utils/utils");
+var utils_1 = require("@sasjs/utils");
 var deployToSasViyaWithServicePack_1 = require("../shared/deployToSasViyaWithServicePack");
 function servicePackDeploy(target, isLocal, jsonFilePath, isForced) {
     var _a;

package/build/commands/shared/fetchLogFileContent.js

@@ -68,28 +68,26 @@ exports.fetchLogFileContent = void 0;
  */
 var fetchLogFileContent = function (sasjs, accessToken, logUrl, logCount) { return __awaiter(void 0, void 0, void 0, function () {
     var logJson, loglimit, start, logChunkJson, _a, _b;
-    var _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 logJson = { items: [] };
                 loglimit = logCount < 10000 ? logCount : 10000;
                 start = 0;
-                _d.label = 1;
+                _c.label = 1;
             case 1:
-                (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info("Fetching logs from line no: " + (start + 1) + " to " + (start + loglimit) + " of " + logCount + ".");
                 _b = (_a = JSON).parse;
                 return [4 /*yield*/, sasjs.fetchLogFileContent(logUrl + "?start=" + start + "&limit=" + loglimit, accessToken)];
             case 2:
-                logChunkJson = _b.apply(_a, [(_d.sent())]);
+                logChunkJson = _b.apply(_a, [(_c.sent())]);
                 if (logChunkJson.items.length === 0)
                     return [3 /*break*/, 4];
                 logJson.items = __spreadArray(__spreadArray([], __read(logJson.items)), __read(logChunkJson.items));
                 start += loglimit;
-                _d.label = 3;
+                _c.label = 3;
             case 3:
                 if (start < logCount) return [3 /*break*/, 1];
-                _d.label = 4;
+                _c.label = 4;
             case 4: return [2 /*return*/, logJson];
         }
     });

package/build/commands/testing/test.js

@@ -205,6 +205,7 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                                             testUrl = testUrl + "&_contextName=" + encodeURIComponent(target.contextName);
                                         }
                                         printTestUrl = function () { return process.logger.info("Test URL: " + testUrl); };
+                                        printTestUrl();
                                         return [4 /*yield*/, sasjs
                                                 .request(sasJobLocation, {}, { username: username, password: password }, function () {
                                                 displayResult_1.displayError(null, 'Login callback called. Request failed.');
@@ -247,7 +248,6 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                                                             }
                                                             if (!((_a = res.result) === null || _a === void 0 ? void 0 : _a.test_results))
                                                                 lineBreak = false;
-                                                            printTestUrl();
                                                             if (!res.log) return [3 /*break*/, 2];
                                                             return [4 /*yield*/, saveOutput_1.saveLog(outDirectory, test, res.log, lineBreak)];
                                                         case 1:

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

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

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

@@ -1,21 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFaviconTags = exports.getLinkTags = exports.getScriptTags = void 0;
+exports.getImgTags = exports.getFaviconTags = exports.getStyleTags = exports.getScriptTags = void 0;
 var getScriptTags = function (parsedHtml) {
-    return Array.from(parsedHtml.window.document.querySelectorAll('script'));
+    return Array.from(parsedHtml.window.document.getElementsByTagName('script'));
 };
 exports.getScriptTags = getScriptTags;
-var getLinkTags = function (parsedHtml) {
-    var linkTags = Array.from(parsedHtml.window.document.querySelectorAll('link')).filter(function (s) { return s.getAttribute('rel') === 'stylesheet'; });
-    return linkTags;
+var getStyleTags = function (parsedHtml) {
+    return Array.from(parsedHtml.window.document.getElementsByTagName('link')).filter(function (s) { return s.getAttribute('rel') === 'stylesheet'; });
 };
-exports.getLinkTags = getLinkTags;
+exports.getStyleTags = getStyleTags;
 var getFaviconTags = function (parsedHtml) {
-    var linkTags = Array.from(parsedHtml.window.document.querySelectorAll('link')).filter(function (s) {
-        return s.getAttribute('rel') &&
-            s.getAttribute('rel') &&
-            s.getAttribute('rel').includes('icon');
-    });
-    return linkTags;
+    return Array.from(parsedHtml.window.document.getElementsByTagName('link')).filter(function (s) { var _a; return (_a = s.getAttribute('rel')) === null || _a === void 0 ? void 0 : _a.includes('icon'); });
 };
 exports.getFaviconTags = getFaviconTags;
+var getImgTags = function (parsedHtml) {
+    return Array.from(parsedHtml.window.document.getElementsByTagName('img')).filter(function (s) { return s.getAttribute('src'); });
+};
+exports.getImgTags = getImgTags;

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

@@ -38,7 +38,6 @@ 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 utils_2 = require("../../../utils");
 var sasjsout_1 = require("./sasjsout");
 var getWebServiceContent = function (contentBase64, type, serverType) {
     if (type === void 0) { type = 'JS'; }
@@ -52,7 +51,7 @@ var getWebServiceContent = function (contentBase64, type, serverType) {
             };
             serviceContent = sasjsout_1.sasjsout + "\nfilename sasjs temp lrecl=99999999;\ndata _null_;\nfile sasjs;\n";
             lines.forEach(function (line) {
-                var chunkedLines = utils_2.chunk(line);
+                var chunkedLines = utils_1.chunk(line);
                 if (chunkedLines.length === 1) {
                     serviceContent += "put '" + chunkedLines[0].split("'").join("''") + "';\n";
                 }

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 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.png'\n      contenttype='image/png' 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%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 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/png));\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%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_,' hostUrl: ') then do;\n      /* nothing - we are streaming, so remove to default as hostname */\n    end;\n    else do;\n      length newline $32767;\n      /* during SAS9 compilation, dependencies are assigned three slashes /// */\n      newline=tranwrd(_infile_,'?_PROGRAM=///',cats(expanded_path));\n      put newline;\n    end;\n  run;\n  %let fref=_sjs;\n%end;\n\n/* stream byte by byte */\n/* in SAS9, JS & CSS files are base64 encoded to avoid UTF8 issues in WLATIN1 metadata */\n%if &type=PNG or &type=ICO or &type=MP3 or &type=JS64 or &type=CSS64 or &type=WAV or &type=OGG\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 = "\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 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.png'\n      contenttype='image/png' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=JPG %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.jpg'\n      contenttype='image/jpg' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=JPEG %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.jpeg'\n      contenttype='image/jpeg' 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%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 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/png));\n  %end;\n  %else %if &type=JPG %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/jpg));\n  %end;\n  %else %if &type=JPEG %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/jpeg));\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%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_,' hostUrl: ') then do;\n      /* nothing - we are streaming, so remove to default as hostname */\n    end;\n    else do;\n      length newline $32767;\n      /* during SAS9 compilation, dependencies are assigned three slashes /// */\n      newline=tranwrd(_infile_,'?_PROGRAM=///',cats(expanded_path));\n      put newline;\n    end;\n  run;\n  %let fref=_sjs;\n%end;\n\n/* stream byte by byte */\n/* in SAS9, JS & CSS files are base64 encoded to avoid UTF8 issues in WLATIN1 metadata */\n%if &type=PNG or &type=JPG or &type=JPEG or &type=ICO or &type=MP3 or &type=JS64 or &type=CSS64 or &type=WAV or &type=OGG\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;";

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

@@ -1,4 +1,4 @@
 "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 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.png'\n      contenttype='image/png' 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%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 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/png));\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%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_,' hostUrl: ') then do;\n      /* nothing - we are streaming, so remove to default as hostname */\n    end;\n    else do;\n      length newline $32767;\n      /* during SAS9 compilation, dependencies are assigned three slashes /// */\n      newline=tranwrd(_infile_,'?_PROGRAM=///',cats(expanded_path));\n      put newline;\n    end;\n  run;\n  %let fref=_sjs;\n%end;\n\n/* stream byte by byte */\n/* in SAS9, JS & CSS files are base64 encoded to avoid UTF8 issues in WLATIN1 metadata */\n%if &type=PNG or &type=ICO or &type=MP3 or &type=JS64 or &type=CSS64 or &type=WAV or &type=OGG\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;";
+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 %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.png'\n      contenttype='image/png' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=JPG %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.jpg'\n      contenttype='image/jpg' lrecl=2000000 recfm=n;\n  %end;\n  %else %if &type=JPEG %then %do;\n    filename _webout filesrvc parenturi=\"&SYS_JES_JOB_URI\" name='_webout.jpeg'\n      contenttype='image/jpeg' 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%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 %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/png));\n  %end;\n  %else %if &type=JPG %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/jpg));\n  %end;\n  %else %if &type=JPEG %then %do;\n    %let rc=%sysfunc(stpsrv_header(Content-type,image/jpeg));\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%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_,' hostUrl: ') then do;\n      /* nothing - we are streaming, so remove to default as hostname */\n    end;\n    else do;\n      length newline $32767;\n      /* during SAS9 compilation, dependencies are assigned three slashes /// */\n      newline=tranwrd(_infile_,'?_PROGRAM=///',cats(expanded_path));\n      put newline;\n    end;\n  run;\n  %let fref=_sjs;\n%end;\n\n/* stream byte by byte */\n/* in SAS9, JS & CSS files are base64 encoded to avoid UTF8 issues in WLATIN1 metadata */\n%if &type=PNG or &type=JPG or &type=JPEG or &type=ICO or &type=MP3 or &type=JS64 or &type=CSS64 or &type=WAV or &type=OGG\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;";

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

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

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

@@ -0,0 +1,32 @@
+"use strict";
+/**
+ * @jest-environment jsdom
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+var updateLinkTag_1 = require("../updateLinkTag");
+describe('updateLinkTag', function () {
+    it("should update href of link tag", function () {
+        var linkTag = document.createElement('link');
+        linkTag.setAttribute('href', './style.css');
+        var assetPathMap = [];
+        var sasProgramPath = '/SASJobExecution?_FILE=appLoc/services/streamWebFolder/style.css';
+        assetPathMap.push({
+            source: 'style.css',
+            target: sasProgramPath
+        });
+        updateLinkTag_1.updateLinkTag(linkTag, assetPathMap);
+        expect(linkTag.getAttribute('href')).toEqual(sasProgramPath);
+    });
+    it("should update src of image tag", function () {
+        var imgTag = document.createElement('img');
+        imgTag.setAttribute('src', './image.jpeg');
+        var assetPathMap = [];
+        var sasProgramPath = '/SASJobExecution?_FILE=appLoc/services/streamWebFolder/image.jpeg';
+        assetPathMap.push({
+            source: 'image.jpeg',
+            target: sasProgramPath
+        });
+        updateLinkTag_1.updateLinkTag(imgTag, assetPathMap, 'image');
+        expect(imgTag.getAttribute('src')).toEqual(sasProgramPath);
+    });
+});

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

@@ -35,16 +35,37 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateAllTags = void 0;
 var utils_1 = require("@sasjs/utils");
 var getTags_1 = require("./getTags");
 var updateScriptTag_1 = require("./updateScriptTag");
-var updateLinkHref_1 = require("./updateLinkHref");
+var updateLinkTag_1 = require("./updateLinkTag");
 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 () {
-        var assetsNotFound, scriptTags, linkTags, faviconTags, notFoundErrors;
+        var assetsNotFound, scriptTags, styleTags, faviconTags, linkTags, imgTags, notFoundErrors;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -62,21 +83,25 @@ var updateAllTags = function (parsedHtml, _a) {
                         }); })];
                 case 1:
                     _b.sent();
-                    linkTags = getTags_1.getLinkTags(parsedHtml);
-                    linkTags.forEach(function (linkTag) {
+                    styleTags = getTags_1.getStyleTags(parsedHtml);
+                    faviconTags = getTags_1.getFaviconTags(parsedHtml);
+                    linkTags = __spreadArray(__spreadArray([], __read(styleTags)), __read(faviconTags));
+                    linkTags.forEach(function (tag) {
                         try {
-                            updateLinkHref_1.updateLinkHref(linkTag, assetPathMap);
+                            updateLinkTag_1.updateLinkTag(tag, assetPathMap);
                         }
                         catch (error) {
+                            console.log(tag, error);
                             assetsNotFound.push(error);
                         }
                     });
-                    faviconTags = getTags_1.getFaviconTags(parsedHtml);
-                    faviconTags.forEach(function (faviconTag) {
+                    imgTags = getTags_1.getImgTags(parsedHtml);
+                    imgTags.forEach(function (tag) {
                         try {
-                            updateLinkHref_1.updateLinkHref(faviconTag, assetPathMap);
+                            updateLinkTag_1.updateLinkTag(tag, assetPathMap, 'image');
                         }
                         catch (error) {
+                            console.log(tag, error);
                             assetsNotFound.push(error);
                         }
                     });

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

@@ -0,0 +1,4 @@
+export declare const updateLinkTag: (linkTag: HTMLLinkElement | HTMLImageElement, assetPathMap: {
+    source: string;
+    target: string;
+}[], tagType?: 'link' | 'image') => void;

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

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateLinkTag = void 0;
+var updateLinkTag = function (linkTag, assetPathMap, tagType) {
+    if (tagType === void 0) { tagType = 'link'; }
+    var linkSourcePath = tagType === 'link'
+        ? linkTag.getAttribute('href')
+        : linkTag.getAttribute('src');
+    if (!linkSourcePath)
+        return;
+    var isUrl = linkSourcePath.startsWith('http') || linkSourcePath.startsWith('//');
+    if (isUrl)
+        return;
+    var assetPath = assetPathMap.find(function (entry) {
+        return entry.source === linkSourcePath || "./" + entry.source === linkSourcePath;
+    });
+    if (!(assetPath === null || assetPath === void 0 ? void 0 : assetPath.target)) {
+        throw new Error("Unable to find file: " + linkSourcePath);
+    }
+    tagType === 'link'
+        ? linkTag.setAttribute('href', assetPath.target)
+        : linkTag.setAttribute('src', assetPath.target);
+};
+exports.updateLinkTag = updateLinkTag;

package/build/commands/web/web.js

@@ -40,8 +40,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createWebAppServices = void 0;
-var utils_1 = require("../../utils/utils");
-var utils_2 = require("@sasjs/utils");
+var utils_1 = require("@sasjs/utils");
 var config_1 = require("../../utils/config");
 var path_1 = __importDefault(require("path"));
 var jsdom_1 = __importDefault(require("jsdom"));
@@ -85,7 +84,7 @@ function createWebAppServices(target) {
                         })];
                 case 5:
                     assetPathMap = _c.sent();
-                    return [4 /*yield*/, utils_2.readFile(indexHtmlPath).then(function (content) { return new jsdom_1.default.JSDOM(content); })];
+                    return [4 /*yield*/, utils_1.readFile(indexHtmlPath).then(function (content) { return new jsdom_1.default.JSDOM(content); })];
                 case 6:
                     indexHtml = _c.sent();
                     return [4 /*yield*/, updateAllTags_1.updateAllTags(indexHtml, {
@@ -96,7 +95,7 @@ function createWebAppServices(target) {
                         })];
                 case 7:
                     _c.sent();
-                    if (!(target.serverType === utils_2.ServerType.SasViya)) return [3 /*break*/, 9];
+                    if (!(target.serverType === utils_1.ServerType.SasViya)) return [3 /*break*/, 9];
                     indexHtml.window.document.body.innerHTML += adjustIframeScript_1.adjustIframeScript;
                     return [4 /*yield*/, createClickMeFile(indexHtml.serialize(), streamConfig.streamServiceName)];
                 case 8:
@@ -128,13 +127,13 @@ var validateStreamConfig = function (streamConfig) { return __awaiter(void 0, vo
                     throw new Error("Invalid stream web folder: Please specify the `streamConfig` in your target in the following format: \n " + JSON.stringify(exampleStreamConfig, null, 2));
                 }
                 webSourcePathFull = utils_1.getAbsolutePath(streamConfig.webSourcePath, process.projectDir);
-                return [4 /*yield*/, utils_2.folderExists(webSourcePathFull)];
+                return [4 /*yield*/, utils_1.folderExists(webSourcePathFull)];
             case 1:
                 if (!(_a.sent())) {
                     throw new Error("webSourcePath: '" + webSourcePathFull + "' present in 'streamConfig' doesn't exist.");
                 }
                 indexHtmlPath = path_1.default.join(webSourcePathFull, 'index.html');
-                return [4 /*yield*/, utils_2.fileExists(indexHtmlPath)];
+                return [4 /*yield*/, utils_1.fileExists(indexHtmlPath)];
             case 2:
                 if (!(_a.sent())) {
                     throw new Error("'index.html' doesn't exist at webSourcePath: '" + webSourcePathFull + "' present in 'streamConfig'");
@@ -150,11 +149,11 @@ function createBuildDestinationFolder() {
             switch (_a.label) {
                 case 0:
                     buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
-                    return [4 /*yield*/, utils_2.fileExists(buildDestinationFolder)];
+                    return [4 /*yield*/, utils_1.fileExists(buildDestinationFolder)];
                 case 1:
                     pathExists = _a.sent();
                     if (!!pathExists) return [3 /*break*/, 3];
-                    return [4 /*yield*/, utils_2.createFolder(buildDestinationFolder)];
+                    return [4 /*yield*/, utils_1.createFolder(buildDestinationFolder)];
                 case 2:
                     _a.sent();
                     _a.label = 3;
@@ -168,15 +167,15 @@ function createTargetDestinationFolder(destinationPath) {
         var pathExists;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, utils_2.fileExists(destinationPath)];
+                case 0: return [4 /*yield*/, utils_1.fileExists(destinationPath)];
                 case 1:
                     pathExists = _a.sent();
                     if (!pathExists) return [3 /*break*/, 3];
-                    return [4 /*yield*/, utils_2.deleteFolder(destinationPath)];
+                    return [4 /*yield*/, utils_1.deleteFolder(destinationPath)];
                 case 2:
                     _a.sent();
                     _a.label = 3;
-                case 3: return [4 /*yield*/, utils_2.createFolder(destinationPath)];
+                case 3: return [4 /*yield*/, utils_1.createFolder(destinationPath)];
                 case 4:
                     _a.sent();
                     return [2 /*return*/];
@@ -218,7 +217,7 @@ function createClickMeService(indexHtmlContent, fileName) {
                     });
                     clickMeServiceContent += 'run;\n%sasjsout(HTML)';
                     buildDestinationServicesFolder = process.sasjsConstants.buildDestinationServicesFolder;
-                    return [4 /*yield*/, utils_2.createFile(path_1.default.join(buildDestinationServicesFolder, fileName + ".sas"), clickMeServiceContent)];
+                    return [4 /*yield*/, utils_1.createFile(path_1.default.join(buildDestinationServicesFolder, fileName + ".sas"), clickMeServiceContent)];
                 case 1:
                     _a.sent();
                     return [2 /*return*/];
@@ -233,7 +232,7 @@ function createClickMeFile(indexHtmlContent, fileName) {
             switch (_a.label) {
                 case 0:
                     buildDestinationServicesFolder = process.sasjsConstants.buildDestinationServicesFolder;
-                    return [4 /*yield*/, utils_2.createFile(path_1.default.join(buildDestinationServicesFolder, fileName + ".html"), indexHtmlContent)];
+                    return [4 /*yield*/, utils_1.createFile(path_1.default.join(buildDestinationServicesFolder, fileName + ".html"), indexHtmlContent)];
                 case 1:
                     _a.sent();
                     return [2 /*return*/];

package/build/utils/auth.d.ts

@@ -1,6 +1,6 @@
-import { SasAuthResponse, Target } from '@sasjs/utils';
+import { ServerType, Target } from '@sasjs/utils';
 import SASjs from '@sasjs/adapter/node';
-export declare function getAuthUrl(serverUrl: string, clientId: string): string;
+export declare const getAuthUrl: (serverType: ServerType, serverUrl: string, clientId: string) => string;
 export declare function getAuthCode(authUrl: string): Promise<string>;
 /**
  * Checks if the Access Token is expired or is expiring in 1 hour.  A default Access Token
@@ -18,5 +18,11 @@ export declare function isAccessTokenExpiring(token: string): boolean;
  * @param {string} token- token string that will be evaluated
  */
 export declare function isRefreshTokenExpiring(token?: string): boolean;
-export declare function refreshTokens(sasjsInstance: SASjs, clientId: string, clientSecret: string, refreshToken: string): Promise<SasAuthResponse>;
-export declare function getNewAccessToken(sasjsInstance: SASjs, clientId: string, clientSecret: string, target: Target): Promise<SasAuthResponse>;
+export declare function refreshTokens(sasjsInstance: SASjs, clientId: string, clientSecret: string, refreshToken: string): Promise<{
+    access_token: string;
+    refresh_token: string;
+}>;
+export declare function getNewAccessToken(sasjsInstance: SASjs, clientId: string, clientSecret: string, target: Target): Promise<{
+    access_token: string;
+    refresh_token: string;
+}>;

package/build/utils/auth.js

@@ -42,9 +42,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNewAccessToken = exports.refreshTokens = exports.isRefreshTokenExpiring = exports.isAccessTokenExpiring = exports.getAuthCode = exports.getAuthUrl = void 0;
 var utils_1 = require("@sasjs/utils");
 var jwt_decode_1 = __importDefault(require("jwt-decode"));
-function getAuthUrl(serverUrl, clientId) {
-    return serverUrl + "/SASLogon/oauth/authorize?client_id=" + clientId + "&response_type=code";
-}
+var getAuthUrl = function (serverType, serverUrl, clientId) {
+    return serverType === utils_1.ServerType.Sasjs
+        ? serverUrl + "/#/SASjsLogon?client_id=" + clientId + "&response_type=code"
+        : serverUrl + "/SASLogon/oauth/authorize?client_id=" + clientId + "&response_type=code";
+};
 exports.getAuthUrl = getAuthUrl;
 function getAuthCode(authUrl) {
     return __awaiter(this, void 0, void 0, function () {
@@ -100,13 +102,13 @@ function isRefreshTokenExpiring(token) {
 exports.isRefreshTokenExpiring = isRefreshTokenExpiring;
 function refreshTokens(sasjsInstance, clientId, clientSecret, refreshToken) {
     return __awaiter(this, void 0, void 0, function () {
-        var authResponse;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var _a, access_token, refresh_token;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0: return [4 /*yield*/, sasjsInstance.refreshTokens(clientId, clientSecret, refreshToken)];
                 case 1:
-                    authResponse = _a.sent();
-                    return [2 /*return*/, authResponse];
+                    _a = _b.sent(), access_token = _a.access_token, refresh_token = _a.refresh_token;
+                    return [2 /*return*/, { access_token: access_token, refresh_token: refresh_token }];
             }
         });
     });
@@ -114,18 +116,18 @@ function refreshTokens(sasjsInstance, clientId, clientSecret, refreshToken) {
 exports.refreshTokens = refreshTokens;
 function getNewAccessToken(sasjsInstance, clientId, clientSecret, target) {
     return __awaiter(this, void 0, void 0, function () {
-        var authUrl, authCode, authResponse;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var authUrl, authCode, _a, access_token, refresh_token;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
-                    authUrl = getAuthUrl(target.serverUrl, clientId);
+                    authUrl = exports.getAuthUrl(target.serverType, target.serverUrl, clientId);
                     return [4 /*yield*/, getAuthCode(authUrl)];
                 case 1:
-                    authCode = _a.sent();
+                    authCode = _b.sent();
                     return [4 /*yield*/, sasjsInstance.getAccessToken(clientId, clientSecret, authCode)];
                 case 2:
-                    authResponse = _a.sent();
-                    return [2 /*return*/, authResponse];
+                    _a = _b.sent(), access_token = _a.access_token, refresh_token = _a.refresh_token;
+                    return [2 /*return*/, { access_token: access_token, refresh_token: refresh_token }];
             }
         });
     });

package/build/utils/config.d.ts

@@ -1,5 +1,4 @@
-import { Configuration, Target, AuthConfig } from '@sasjs/utils';
-import { StreamConfig } from '@sasjs/utils/types/config';
+import { Configuration, Target, AuthConfig, StreamConfig } from '@sasjs/utils';
 import { TargetScope } from '../types/targetScope';
 /**
  * Returns an object that represents the SASjs CLI configuration in a given file.
@@ -52,7 +51,7 @@ export declare function getMacroFolders(target?: Target): Promise<string[]>;
  * @param {Target} target- the target to check stream configuration for.
  */
 export declare function getStreamConfig(target?: Target): Promise<StreamConfig>;
-export declare function getMacroCorePath(): string;
+export declare const getMacroCorePath: () => string;
 /**
  * Sanitizes app location string.
  * @param {string} appLoc - app location