@sasjs/cli 3.0.3 → 3.0.4

package/build/commands/add/addCredential.d.ts

@@ -1,4 +1,4 @@
-import { SasAuthResponse, Target, HttpsAgentOptions } from '@sasjs/utils/types';
+import { Target, HttpsAgentOptions } from '@sasjs/utils/types';
 import { TargetScope } from '../../types/targetScope';
 /**
  * Creates a .env file for the specified target.
@@ -10,6 +10,10 @@ import { TargetScope } from '../../types/targetScope';
  */
 export declare const addCredential: (target: Target, insecure: boolean, targetScope: TargetScope) => Promise<Target>;
 export declare const validateTargetName: (targetName: string) => string;
-export declare const getTokens: (target: Target, client: string, secret: string, httpsAgentOptions?: HttpsAgentOptions | undefined) => Promise<SasAuthResponse>;
+export declare const getTokens: (target: Target, client: string, secret: string, httpsAgentOptions?: HttpsAgentOptions | undefined) => Promise<{
+    access_token: string;
+    refresh_token: string;
+}>;
 export declare const createEnvFileForViya: (targetName: string, client: string, secret: string, accessToken: string, refreshToken: string) => Promise<void>;
 export declare const createEnvFileForSas9: (targetName: string, userName: string, password: string) => Promise<void>;
+export declare const createEnvFileForSasjs: (targetName: string, client: string, accessToken: string, refreshToken: string) => Promise<void>;

package/build/commands/add/addCredential.js

@@ -50,7 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createEnvFileForSas9 = exports.createEnvFileForViya = exports.getTokens = exports.validateTargetName = exports.addCredential = void 0;
+exports.createEnvFileForSasjs = exports.createEnvFileForSas9 = exports.createEnvFileForViya = exports.getTokens = exports.validateTargetName = exports.addCredential = void 0;
 var path_1 = __importDefault(require("path"));
 var logger_1 = require("@sasjs/utils/logger");
 var types_1 = require("@sasjs/utils/types");
@@ -69,66 +69,81 @@ var saveConfig_1 = require("./internal/saveConfig");
  * @param {boolean} insecure- boolean to use insecure connection, default is false. lf true the server will not reject any connection which is not authorized with the list of supplied CAs
  */
 var addCredential = function (target, insecure, targetScope) { return __awaiter(void 0, void 0, void 0, function () {
-    var httpsAgentOptions, serverUrl, filePath, _a, client, secret, _b, access_token, refresh_token, filePath, _c, userName, password, filePath;
-    var _d, _e, _f, _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var httpsAgentOptions, serverUrl, filePath_1, _a, _b, client, secret, _c, access_token, refresh_token, _d, userName, password, client, _e, access_token, refresh_token, filePath;
+    var _f, _g, _h;
+    return __generator(this, function (_j) {
+        switch (_j.label) {
             case 0:
                 httpsAgentOptions = insecure
                     ? __assign(__assign({}, target.httpsAgentOptions), { allowInsecureRequests: true, rejectUnauthorized: false }) : target.httpsAgentOptions;
                 if (insecure)
-                    (_d = process.logger) === null || _d === void 0 ? void 0 : _d.warn('Executing with insecure connection.');
+                    (_f = process.logger) === null || _f === void 0 ? void 0 : _f.warn('Executing with insecure connection.');
                 if (!!target.serverUrl) return [3 /*break*/, 3];
                 return [4 /*yield*/, input_1.getAndValidateServerUrl(target)];
             case 1:
-                serverUrl = _h.sent();
+                serverUrl = _j.sent();
                 target = new types_1.Target(__assign(__assign({}, target.toJson(false)), { serverUrl: serverUrl }));
                 return [4 /*yield*/, saveConfig_1.saveConfig(targetScope, target, false, false)];
             case 2:
-                filePath = _h.sent();
-                (_e = process.logger) === null || _e === void 0 ? void 0 : _e.info("Target configuration has been saved to " + filePath + " .");
-                _h.label = 3;
+                filePath_1 = _j.sent();
+                (_g = process.logger) === null || _g === void 0 ? void 0 : _g.info("Target configuration has been saved to " + filePath_1 + " .");
+                _j.label = 3;
             case 3:
-                if (!(target.serverType === types_1.ServerType.SasViya)) return [3 /*break*/, 10];
-                return [4 /*yield*/, input_1.getCredentialsInputForViya(target.name)];
-            case 4:
-                _a = _h.sent(), client = _a.client, secret = _a.secret;
-                return [4 /*yield*/, exports.getTokens(target, client, secret, httpsAgentOptions)];
+                _a = target.serverType;
+                switch (_a) {
+                    case types_1.ServerType.SasViya: return [3 /*break*/, 4];
+                    case types_1.ServerType.Sas9: return [3 /*break*/, 10];
+                    case types_1.ServerType.Sasjs: return [3 /*break*/, 15];
+                }
+                return [3 /*break*/, 21];
+            case 4: return [4 /*yield*/, input_1.getCredentialsInputForViya(target.name)];
             case 5:
-                _b = _h.sent(), access_token = _b.access_token, refresh_token = _b.refresh_token;
-                if (!(targetScope === targetScope_1.TargetScope.Local)) return [3 /*break*/, 7];
-                return [4 /*yield*/, exports.createEnvFileForViya(target.name, client, secret, access_token, refresh_token)];
+                _b = _j.sent(), client = _b.client, secret = _b.secret;
+                return [4 /*yield*/, exports.getTokens(target, client, secret, httpsAgentOptions)];
             case 6:
-                _h.sent();
-                return [3 /*break*/, 8];
+                _c = _j.sent(), access_token = _c.access_token, refresh_token = _c.refresh_token;
+                if (!(targetScope === targetScope_1.TargetScope.Local)) return [3 /*break*/, 8];
+                return [4 /*yield*/, exports.createEnvFileForViya(target.name, client, secret, access_token, refresh_token)];
             case 7:
+                _j.sent();
+                return [3 /*break*/, 9];
+            case 8:
                 target = new types_1.Target(__assign(__assign({}, target.toJson(false)), { authConfig: { client: client, secret: secret, access_token: access_token, refresh_token: refresh_token } }));
-                _h.label = 8;
-            case 8: return [4 /*yield*/, saveConfig_1.saveConfig(targetScope, target, false, false)];
-            case 9:
-                filePath = _h.sent();
-                (_f = process.logger) === null || _f === void 0 ? void 0 : _f.info("Target configuration has been saved to " + filePath + " .");
-                return [3 /*break*/, 17];
-            case 10:
-                if (!(target.serverType === types_1.ServerType.Sas9)) return [3 /*break*/, 16];
-                return [4 /*yield*/, input_1.getCredentialsInputSas9(target, targetScope)];
+                _j.label = 9;
+            case 9: return [3 /*break*/, 22];
+            case 10: return [4 /*yield*/, input_1.getCredentialsInputSas9(target, targetScope)];
             case 11:
-                _c = _h.sent(), userName = _c.userName, password = _c.password;
+                _d = _j.sent(), userName = _d.userName, password = _d.password;
                 if (!(targetScope === targetScope_1.TargetScope.Local)) return [3 /*break*/, 13];
                 return [4 /*yield*/, exports.createEnvFileForSas9(target.name, userName, password)];
             case 12:
-                _h.sent();
+                _j.sent();
                 return [3 /*break*/, 14];
             case 13:
                 target = new types_1.Target(__assign(__assign({}, target.toJson(false)), { authConfigSas9: { userName: userName, password: password } }));
-                _h.label = 14;
-            case 14: return [4 /*yield*/, saveConfig_1.saveConfig(targetScope, target, false, false)];
-            case 15:
-                filePath = _h.sent();
-                (_g = process.logger) === null || _g === void 0 ? void 0 : _g.info("Target configuration has been saved to " + filePath + " .");
-                return [3 /*break*/, 17];
-            case 16: throw new Error('Target contains invalid serverType. Possible types could be SASVIYA and SAS9.');
-            case 17: return [2 /*return*/, target];
+                _j.label = 14;
+            case 14: return [3 /*break*/, 22];
+            case 15: return [4 /*yield*/, input_1.getCredentialsInputSasjs(target)];
+            case 16:
+                client = (_j.sent()).client;
+                return [4 /*yield*/, exports.getTokens(target, client, '', httpsAgentOptions)];
+            case 17:
+                _e = _j.sent(), access_token = _e.access_token, refresh_token = _e.refresh_token;
+                if (!(targetScope === targetScope_1.TargetScope.Local)) return [3 /*break*/, 19];
+                return [4 /*yield*/, exports.createEnvFileForSasjs(target.name, client, access_token, refresh_token)];
+            case 18:
+                _j.sent();
+                return [3 /*break*/, 20];
+            case 19:
+                target = new types_1.Target(__assign(__assign({}, target.toJson(false)), { authConfig: { client: client, secret: '', access_token: access_token, refresh_token: refresh_token } }));
+                _j.label = 20;
+            case 20: return [3 /*break*/, 22];
+            case 21: throw new Error('Target contains invalid serverType. Possible types could be SASVIYA, SAS9 and SASJS');
+            case 22: return [4 /*yield*/, saveConfig_1.saveConfig(targetScope, target, false, false)];
+            case 23:
+                filePath = _j.sent();
+                (_h = process.logger) === null || _h === void 0 ? void 0 : _h.info("Target configuration has been saved to " + filePath + " .");
+                return [2 /*return*/, target];
         }
     });
 }); };
@@ -146,25 +161,25 @@ var validateTargetName = function (targetName) {
 };
 exports.validateTargetName = validateTargetName;
 var getTokens = function (target, client, secret, httpsAgentOptions) { return __awaiter(void 0, void 0, void 0, function () {
-    var adapter, authResponse;
-    var _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var adapter, _a, access_token, refresh_token;
+    var _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 adapter = new node_1.default({
                     serverUrl: target.serverUrl,
                     serverType: target.serverType,
                     httpsAgentOptions: httpsAgentOptions,
-                    debug: ((_a = process.logger) === null || _a === void 0 ? void 0 : _a.logLevel) === logger_1.LogLevel.Debug
+                    debug: ((_b = process.logger) === null || _b === void 0 ? void 0 : _b.logLevel) === logger_1.LogLevel.Debug
                 });
                 return [4 /*yield*/, auth_1.getNewAccessToken(adapter, client, secret, target).catch(function (e) {
                         var _a;
-                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("An error has occurred while validating your credentials: " + e + "\nPlease check your Client ID and Client Secret and try again.\n");
+                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("An error has occurred while validating your credentials: " + e + "\nPlease check your Client ID " + (target.serverType === types_1.ServerType.Sasjs ? '' : 'and Client Secret ') + "and try again.\n");
                         throw e;
                     })];
             case 1:
-                authResponse = _b.sent();
-                return [2 /*return*/, authResponse];
+                _a = _c.sent(), access_token = _a.access_token, refresh_token = _a.refresh_token;
+                return [2 /*return*/, { access_token: access_token, refresh_token: refresh_token }];
         }
     });
 }); };
@@ -203,3 +218,20 @@ var createEnvFileForSas9 = function (targetName, userName, password) { return __
     });
 }); };
 exports.createEnvFileForSas9 = createEnvFileForSas9;
+var createEnvFileForSasjs = function (targetName, client, accessToken, refreshToken) { return __awaiter(void 0, void 0, void 0, function () {
+    var envFileContent, envFilePath;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                envFileContent = "CLIENT=" + client + "\nACCESS_TOKEN=" + accessToken + "\nREFRESH_TOKEN=" + refreshToken + "\n";
+                envFilePath = path_1.default.join(process.projectDir, ".env." + targetName);
+                return [4 /*yield*/, utils_1.createFile(envFilePath, envFileContent)];
+            case 1:
+                _b.sent();
+                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Environment file saved at " + envFilePath);
+                return [2 /*return*/];
+        }
+    });
+}); };
+exports.createEnvFileForSasjs = createEnvFileForSasjs;

package/build/commands/add/addTarget.js

@@ -60,26 +60,32 @@ var addCredential_1 = require("./addCredential");
 function addTarget(insecure) {
     var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function () {
-        var _d, scope, serverType, name, appLoc, serverUrl, existingTarget, saveWithDefaultValues, targetJson, target, filePath, _e, serverName, repositoryName, userName, password, _f, contextName, updatedTarget, isDefault;
-        return __generator(this, function (_g) {
-            switch (_g.label) {
+        var _d, scope, serverType, name, appLoc, serverUrl, existingTarget, saveWithDefaultValues, targetJson, target, filePath, _e, _f, serverName, repositoryName, userName, password, _g, contextName, updatedViyaTarget, updatedSasjsTarget, isDefault;
+        return __generator(this, function (_h) {
+            switch (_h.label) {
                 case 0:
                     if (insecure)
                         (_a = process.logger) === null || _a === void 0 ? void 0 : _a.warn('Executing with insecure connection.');
                     return [4 /*yield*/, input_1.getCommonFields()];
                 case 1:
-                    _d = _g.sent(), scope = _d.scope, serverType = _d.serverType, name = _d.name, appLoc = _d.appLoc, serverUrl = _d.serverUrl, existingTarget = _d.existingTarget;
+                    _d = _h.sent(), scope = _d.scope, serverType = _d.serverType, name = _d.name, appLoc = _d.appLoc, serverUrl = _d.serverUrl, existingTarget = _d.existingTarget;
                     saveWithDefaultValues = !existingTarget;
                     targetJson = __assign(__assign({}, existingTarget), { name: name, serverType: serverType, serverUrl: serverUrl, appLoc: appLoc });
                     target = new types_1.Target(targetJson);
                     return [4 /*yield*/, saveConfig_1.saveConfig(scope, target, false, saveWithDefaultValues)];
                 case 2:
-                    filePath = _g.sent();
+                    filePath = _h.sent();
                     (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Target configuration has been saved to " + filePath + " .");
-                    if (!(serverType === types_1.ServerType.Sas9)) return [3 /*break*/, 4];
-                    return [4 /*yield*/, input_1.getAndValidateSas9Fields(target, scope)];
-                case 3:
-                    _e = _g.sent(), serverName = _e.serverName, repositoryName = _e.repositoryName, userName = _e.userName, password = _e.password;
+                    _e = serverType;
+                    switch (_e) {
+                        case types_1.ServerType.Sas9: return [3 /*break*/, 3];
+                        case types_1.ServerType.SasViya: return [3 /*break*/, 5];
+                        case types_1.ServerType.Sasjs: return [3 /*break*/, 7];
+                    }
+                    return [3 /*break*/, 9];
+                case 3: return [4 /*yield*/, input_1.getAndValidateSas9Fields(target, scope)];
+                case 4:
+                    _f = _h.sent(), serverName = _f.serverName, repositoryName = _f.repositoryName, userName = _f.userName, password = _f.password;
                     targetJson = __assign(__assign({}, targetJson), { serverName: serverName, repositoryName: repositoryName });
                     if (scope === targetScope_1.TargetScope.Local) {
                         addCredential_1.createEnvFileForSas9(name, userName, password);
@@ -87,10 +93,10 @@ function addTarget(insecure) {
                     else {
                         targetJson = __assign(__assign({}, targetJson), { authConfigSas9: { userName: userName, password: password } });
                     }
-                    return [3 /*break*/, 6];
-                case 4: return [4 /*yield*/, input_1.getAndValidateSasViyaFields(target, scope, serverUrl, insecure, addCredential_1.addCredential)];
-                case 5:
-                    _f = _g.sent(), contextName = _f.contextName, updatedTarget = _f.target;
+                    return [3 /*break*/, 10];
+                case 5: return [4 /*yield*/, input_1.getAndValidateSasViyaFields(target, scope, serverUrl, insecure, addCredential_1.addCredential)];
+                case 6:
+                    _g = _h.sent(), contextName = _g.contextName, updatedViyaTarget = _g.target;
                     targetJson = {
                         contextName: contextName,
                         deployConfig: {
@@ -98,14 +104,20 @@ function addTarget(insecure) {
                             deployScripts: []
                         }
                     };
-                    targetJson = __assign(__assign({}, updatedTarget.toJson(false)), targetJson);
-                    _g.label = 6;
-                case 6: return [4 /*yield*/, input_1.getIsDefault()];
-                case 7:
-                    isDefault = _g.sent();
-                    return [4 /*yield*/, saveConfig_1.saveConfig(scope, new types_1.Target(targetJson), isDefault, saveWithDefaultValues)];
+                    targetJson = __assign(__assign({}, updatedViyaTarget.toJson(false)), targetJson);
+                    return [3 /*break*/, 10];
+                case 7: return [4 /*yield*/, input_1.getAndValidateSasjsFields(target, scope, insecure, addCredential_1.addCredential)];
                 case 8:
-                    filePath = _g.sent();
+                    updatedSasjsTarget = (_h.sent()).target;
+                    targetJson = updatedSasjsTarget.toJson(false);
+                    return [3 /*break*/, 10];
+                case 9: throw new Error('Target contains invalid serverType. Possible types could be SASVIYA, SAS9 and SASJS');
+                case 10: return [4 /*yield*/, input_1.getIsDefault()];
+                case 11:
+                    isDefault = _h.sent();
+                    return [4 /*yield*/, saveConfig_1.saveConfig(scope, new types_1.Target(targetJson), isDefault, saveWithDefaultValues)];
+                case 12:
+                    filePath = _h.sent();
                     (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info("Target configuration has been saved to " + filePath);
                     return [2 /*return*/, true];
             }

package/build/commands/add/internal/input.d.ts

@@ -9,14 +9,21 @@ export declare function getAndValidateSas9Fields(target: Target, scope: TargetSc
     userName: string;
     password: string;
 }>;
+export declare const shouldAuthenticate: () => Promise<boolean>;
 export declare function getAndValidateSasViyaFields(target: Target, scope: TargetScope, serverUrl: string, insecure: boolean, authenticateCallback: (target: Target, insecure: boolean, targetScope: TargetScope) => Promise<Target>): Promise<{
     contextName: string;
     target: Target;
 }>;
+export declare function getAndValidateSasjsFields(target: Target, scope: TargetScope, insecure: boolean, authenticateCallback: (target: Target, insecure: boolean, targetScope: TargetScope) => Promise<Target>): Promise<{
+    target: Target;
+}>;
 export declare const getCredentialsInputForViya: (targetName: string) => Promise<{
     client: string;
     secret: string;
 }>;
+export declare const getCredentialsInputSasjs: (target: Target) => Promise<{
+    client: string;
+}>;
 export declare const getCredentialsInputSas9: (target: Target, scope: TargetScope) => Promise<{
     userName: string;
     password: string;

package/build/commands/add/internal/input.js

@@ -50,7 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getIsDefault = exports.getDefaultValues = exports.getCredentialsInputSas9 = exports.getCredentialsInputForViya = exports.getAndValidateSasViyaFields = exports.getAndValidateSas9Fields = exports.getAndValidateServerUrl = exports.getCommonFields = void 0;
+exports.getIsDefault = exports.getDefaultValues = exports.getCredentialsInputSas9 = exports.getCredentialsInputSasjs = exports.getCredentialsInputForViya = exports.getAndValidateSasjsFields = exports.getAndValidateSasViyaFields = exports.shouldAuthenticate = exports.getAndValidateSas9Fields = exports.getAndValidateServerUrl = exports.getCommonFields = void 0;
 var input_1 = require("@sasjs/utils/input");
 var types_1 = require("@sasjs/utils/types");
 var logger_1 = require("@sasjs/utils/logger");
@@ -134,11 +134,20 @@ function getAndValidateServerType() {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, input_1.getChoice('Please pick a server type: ', 'Please choose either option 1 or 2.', [
                         { title: '1. SAS Viya', value: 1 },
-                        { title: '2. SAS 9', value: 2 }
+                        { title: '2. SAS 9', value: 2 },
+                        { title: '3. SAS JS', value: 3 }
                     ])];
                 case 1:
                     serverType = _a.sent();
-                    return [2 /*return*/, serverType === 1 ? types_1.ServerType.SasViya : types_1.ServerType.Sas9];
+                    switch (serverType) {
+                        case 1:
+                            return [2 /*return*/, types_1.ServerType.SasViya];
+                        case 2:
+                            return [2 /*return*/, types_1.ServerType.Sas9];
+                        default:
+                            return [2 /*return*/, types_1.ServerType.Sasjs];
+                    }
+                    return [2 /*return*/];
             }
         });
     });
@@ -177,7 +186,11 @@ function getAndValidateTargetName(serverType) {
                             return [2 /*return*/, true];
                         });
                     }); };
-                    defaultName = serverType === types_1.ServerType.SasViya ? 'viya' : 'sas9';
+                    defaultName = serverType === types_1.ServerType.SasViya
+                        ? 'viya'
+                        : serverType === types_1.ServerType.Sas9
+                            ? 'sas9'
+                            : 'server';
                     return [4 /*yield*/, input_1.getString('Please enter a target name: ', validator, defaultName)];
                 case 1:
                     targetName = _a.sent();
@@ -237,18 +250,21 @@ function getAndValidateSas9Fields(target, scope) {
     });
 }
 exports.getAndValidateSas9Fields = getAndValidateSas9Fields;
+var shouldAuthenticate = function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+    return [2 /*return*/, input_1.getConfirmation('Would you like to authenticate against this target?', true)];
+}); }); };
+exports.shouldAuthenticate = shouldAuthenticate;
 function getAndValidateSasViyaFields(target, scope, serverUrl, insecure, authenticateCallback) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var contextName, shouldAuthenticate, httpsAgentOptions, sasjs, contexts, contextNumberErrorMessage, contextNumber;
+        var contextName, httpsAgentOptions, sasjs, contexts, contextNumberErrorMessage, contextNumber;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     contextName = 'SAS Job Execution compute context';
-                    return [4 /*yield*/, input_1.getConfirmation('Would you like to authenticate against this target?', true)];
+                    return [4 /*yield*/, exports.shouldAuthenticate()];
                 case 1:
-                    shouldAuthenticate = _b.sent();
-                    if (!shouldAuthenticate) return [3 /*break*/, 8];
+                    if (!_b.sent()) return [3 /*break*/, 8];
                     return [4 /*yield*/, authenticateCallback(target, insecure, scope)];
                 case 2:
                     target = _b.sent();
@@ -293,6 +309,23 @@ function getAndValidateSasViyaFields(target, scope, serverUrl, insecure, authent
     });
 }
 exports.getAndValidateSasViyaFields = getAndValidateSasViyaFields;
+function getAndValidateSasjsFields(target, scope, insecure, authenticateCallback) {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, exports.shouldAuthenticate()];
+                case 1:
+                    if (!_a.sent()) return [3 /*break*/, 3];
+                    return [4 /*yield*/, authenticateCallback(target, insecure, scope)];
+                case 2:
+                    target = _a.sent();
+                    _a.label = 3;
+                case 3: return [2 /*return*/, { target: target }];
+            }
+        });
+    });
+}
+exports.getAndValidateSasjsFields = getAndValidateSasjsFields;
 function getAndValidateAppLoc(targetName, target) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
@@ -326,6 +359,18 @@ var getCredentialsInputForViya = function (targetName) { return __awaiter(void 0
     });
 }); };
 exports.getCredentialsInputForViya = getCredentialsInputForViya;
+var getCredentialsInputSasjs = function (target) { return __awaiter(void 0, void 0, void 0, function () {
+    var client;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, input_1.getString('Please enter your Client ID: ', function (v) { return !!v || 'Client ID is required.'; }, exports.getDefaultValues(target.name).client)];
+            case 1:
+                client = _a.sent();
+                return [2 /*return*/, { client: client }];
+        }
+    });
+}); };
+exports.getCredentialsInputSasjs = getCredentialsInputSasjs;
 var getCredentialsInputSas9 = function (target, scope) { return __awaiter(void 0, void 0, void 0, function () {
     var targetName, name, result, userName, password;
     var _a, _b, _c, _d;

package/build/commands/add/spec/addTarget.spec.js

@@ -81,6 +81,7 @@ describe('addTarget', function () {
     var appName = "cli-tests-add-" + utils_1.generateTimestamp();
     var viyaTargetName = "test-viya-" + utils_1.generateTimestamp();
     var sas9TargetName = "test-sas9-" + utils_1.generateTimestamp();
+    var sasjsTargetName = "test-server-" + utils_1.generateTimestamp();
     var globalTestTarget;
     beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
@@ -164,6 +165,42 @@ describe('addTarget', function () {
             }
         });
     }); });
+    it('should create a SASJS target in the local sasjsconfig.json file', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var commonFields;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    commonFields = {
+                        scope: targetScope_1.TargetScope.Local,
+                        serverType: utils_1.ServerType.Sasjs,
+                        name: sasjsTargetName,
+                        appLoc: '/Public/app',
+                        serverUrl: process.env.SASJS_SERVER_URL,
+                        existingTarget: {}
+                    };
+                    jest
+                        .spyOn(inputModule, 'getCommonFields')
+                        .mockImplementation(function () { return Promise.resolve(commonFields); });
+                    jest
+                        .spyOn(inputModule, 'getIsDefault')
+                        .mockImplementation(function () { return Promise.resolve(false); });
+                    jest
+                        .spyOn(inputModule, 'getAndValidateSasjsFields')
+                        .mockImplementation(function () {
+                        return Promise.resolve({
+                            target: new utils_1.Target(commonFields)
+                        });
+                    });
+                    return [4 /*yield*/, expect(addTarget_1.addTarget(false)).resolves.toEqual(true)];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, verifyTarget(commonFields, true)];
+                case 2:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     it('should create a SAS9 target in the local sasjsconfig.json file', function () { return __awaiter(void 0, void 0, void 0, function () {
         var commonFields;
         return __generator(this, function (_a) {
@@ -322,6 +359,47 @@ describe('addTarget', function () {
             }
         });
     }); });
+    it('should update a SASJS target in the local sasjsconfig.json file', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var buildSourceFolder, config, targetJson, commonFields;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    buildSourceFolder = process.sasjsConstants.buildSourceFolder;
+                    return [4 /*yield*/, config_1.getConfiguration(path_1.default.join(buildSourceFolder, 'sasjs', 'sasjsconfig.json'))];
+                case 1:
+                    config = _a.sent();
+                    targetJson = (config.targets || []).find(function (t) { return t.name === 'server'; });
+                    commonFields = {
+                        scope: targetScope_1.TargetScope.Local,
+                        serverType: utils_1.ServerType.Sasjs,
+                        name: 'server',
+                        appLoc: '/Public/app/new/location/2',
+                        serverUrl: process.env.SASJS_SERVER_URL,
+                        existingTarget: targetJson
+                    };
+                    jest
+                        .spyOn(inputModule, 'getCommonFields')
+                        .mockImplementation(function () { return Promise.resolve(commonFields); });
+                    jest
+                        .spyOn(inputModule, 'getIsDefault')
+                        .mockImplementation(function () { return Promise.resolve(false); });
+                    jest
+                        .spyOn(inputModule, 'getAndValidateSasjsFields')
+                        .mockImplementation(function () {
+                        return Promise.resolve({
+                            target: new utils_1.Target(__assign(__assign({}, targetJson), commonFields))
+                        });
+                    });
+                    return [4 /*yield*/, expect(addTarget_1.addTarget(false)).resolves.toEqual(true)];
+                case 2:
+                    _a.sent();
+                    return [4 /*yield*/, verifyTarget(commonFields, true)];
+                case 3:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     it('should update a target in the global .sasjsrc file', function () { return __awaiter(void 0, void 0, void 0, function () {
         var commonFields;
         return __generator(this, function (_a) {

package/build/commands/compile/internal/compileServiceFile.js

@@ -70,9 +70,9 @@ function compileServiceFile(target, filePath, macroFolders, programFolders, prog
 exports.compileServiceFile = compileServiceFile;
 function getPreCodeForServicePack(serverType) {
     return __awaiter(this, void 0, void 0, function () {
-        var content, macroCorePath, _a, _b, _c, _d, _e, _f, _g;
-        return __generator(this, function (_h) {
-            switch (_h.label) {
+        var content, macroCorePath, _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        return __generator(this, function (_l) {
+            switch (_l.label) {
                 case 0:
                     content = '';
                     macroCorePath = config_1.getMacroCorePath();
@@ -82,20 +82,20 @@ function getPreCodeForServicePack(serverType) {
                         case types_1.ServerType.Sas9: return [3 /*break*/, 5];
                         case types_1.ServerType.Sasjs: return [3 /*break*/, 9];
                     }
-                    return [3 /*break*/, 10];
+                    return [3 /*break*/, 13];
                 case 1:
                     _b = content;
                     return [4 /*yield*/, utils_1.readFile(macroCorePath + "/base/mf_getuser.sas")];
                 case 2:
-                    content = _b + _h.sent();
+                    content = _b + _l.sent();
                     _c = content;
                     return [4 /*yield*/, utils_1.readFile(macroCorePath + "/base/mp_jsonout.sas")];
                 case 3:
-                    content = _c + _h.sent();
+                    content = _c + _l.sent();
                     _d = content;
                     return [4 /*yield*/, utils_1.readFile(macroCorePath + "/viya/mv_webout.sas")];
                 case 4:
-                    content = _d + _h.sent();
+                    content = _d + _l.sent();
                     content +=
                         '/* if calling viya service with _job param, _program will conflict */\n' +
                             '/* so we provide instead as __program */\n' +
@@ -104,28 +104,45 @@ function getPreCodeForServicePack(serverType) {
                             '%macro webout(action,ds,dslabel=,fmt=);\n' +
                             '%mv_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt)\n' +
                             '%mend;\n';
-                    return [3 /*break*/, 11];
+                    return [3 /*break*/, 14];
                 case 5:
                     _e = content;
                     return [4 /*yield*/, utils_1.readFile(macroCorePath + "/base/mf_getuser.sas")];
                 case 6:
-                    content = _e + _h.sent();
+                    content = _e + _l.sent();
                     _f = content;
                     return [4 /*yield*/, utils_1.readFile(macroCorePath + "/base/mp_jsonout.sas")];
                 case 7:
-                    content = _f + _h.sent();
+                    content = _f + _l.sent();
                     _g = content;
                     return [4 /*yield*/, utils_1.readFile(macroCorePath + "/meta/mm_webout.sas")];
                 case 8:
-                    content = _g + _h.sent();
+                    content = _g + _l.sent();
                     content +=
                         '  %macro webout(action,ds,dslabel=,fmt=);\n' +
                             '    %mm_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt)\n' +
                             '  %mend;\n';
-                    return [3 /*break*/, 11];
-                case 9: return [3 /*break*/, 11];
-                case 10: throw new error_1.ServerTypeError();
+                    return [3 /*break*/, 14];
+                case 9:
+                    _h = content;
+                    return [4 /*yield*/, utils_1.readFile(macroCorePath + "/base/mf_getuser.sas")];
+                case 10:
+                    content = _h + _l.sent();
+                    _j = content;
+                    return [4 /*yield*/, utils_1.readFile(macroCorePath + "/base/mp_jsonout.sas")];
                 case 11:
+                    content = _j + _l.sent();
+                    _k = content;
+                    return [4 /*yield*/, utils_1.readFile(macroCorePath + "/server/ms_webout.sas")];
+                case 12:
+                    content = _k + _l.sent();
+                    content +=
+                        '  %macro webout(action,ds,dslabel=,fmt=);\n' +
+                            '    %ms_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt)\n' +
+                            '  %mend;\n';
+                    return [3 /*break*/, 14];
+                case 13: throw new error_1.ServerTypeError();
+                case 14:
                     content +=
                         '/* provide additional debug info */\n' +
                             '%global _program;\n' +

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

@@ -7,7 +7,10 @@ exports.reactAppFiles = {
         { fileName: 'package.json' },
         { fileName: 'package-lock.json' },
         { fileName: 'tsconfig.json' },
-        { fileName: 'README.md' }
+        { fileName: 'README.md' },
+        { fileName: 'webpack.common.js' },
+        { fileName: 'webpack.dev.js' },
+        { fileName: 'webpack.prod.js' }
     ],
     subFolders: [
         {
@@ -36,12 +39,9 @@ exports.reactAppFiles = {
             folderName: 'src',
             files: [
                 { fileName: 'App.scss' },
-                { fileName: 'cached_data.ts' },
                 { fileName: 'index.scss' },
                 { fileName: 'index.tsx' },
-                { fileName: 'logo.svg' },
-                { fileName: 'react-app-env.d.ts' },
-                { fileName: 'serviceWorker.ts' }
+                { fileName: 'logo.svg' }
             ],
             subFolders: [
                 {

package/build/commands/deploy/spec/cbd.spec.js

@@ -47,6 +47,7 @@ var build_1 = require("../../build/build");
 var deploy_1 = require("../deploy");
 var utils_2 = require("./utils");
 var config_1 = require("../../../utils/config");
+var utils_3 = require("../../../utils");
 describe('sasjs cbd with server type SASJS', function () {
     var target;
     var appName;
@@ -77,7 +78,7 @@ describe('sasjs cbd with server type SASJS', function () {
         });
     }); });
     it("should deploy compile and build to sasjs/server", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var sasjs, customTarget;
+        var sasjs, customTarget, macroCorePath, mf_getuser, mp_jsonout, ms_webout, webout;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -108,6 +109,19 @@ describe('sasjs cbd with server type SASJS', function () {
                     return [4 /*yield*/, deploy_1.deploy(customTarget, true, sasjs)];
                 case 4:
                     _a.sent();
+                    macroCorePath = process.sasjsConstants.macroCorePath;
+                    return [4 /*yield*/, utils_1.readFile(macroCorePath + "/base/mf_getuser.sas")];
+                case 5:
+                    mf_getuser = _a.sent();
+                    return [4 /*yield*/, utils_1.readFile(macroCorePath + "/base/mp_jsonout.sas")];
+                case 6:
+                    mp_jsonout = _a.sent();
+                    return [4 /*yield*/, utils_1.readFile(macroCorePath + "/server/ms_webout.sas")];
+                case 7:
+                    ms_webout = _a.sent();
+                    webout = '  %macro webout(action,ds,dslabel=,fmt=);\n' +
+                        '    %ms_webout(&action,ds=&ds,dslabel=&dslabel,fmt=&fmt)\n' +
+                        '  %mend;\n';
                     expect(sasjs.deployToSASjs).toHaveBeenCalledWith({
                         members: [
                             {
@@ -121,12 +135,14 @@ describe('sasjs cbd with server type SASJS', function () {
                                             {
                                                 name: 'appinit',
                                                 type: 'service',
-                                                code: '/* provide additional debug info */\n%global _program;\n%put &=syscc;\n%put user=%mf_getuser();\n%put pgm=&_program;\n%put timestamp=%sysfunc(datetime(),datetime19.);\n* Service Variables start;\n*Service Variables end;\n* Dependencies start;\n* Dependencies end;\n* Programs start;\n*Programs end;\n* Service start;\nproc sql;\ncreate table areas as select distinct area\n  from sashelp.springs;\n%webout(OPEN)\n%webout(OBJ,areas)\n%webout(CLOSE)\n* Service end;'
+                                                code: utils_3.removeComments("" + mf_getuser + mp_jsonout + ms_webout + webout +
+                                                    '/* provide additional debug info */\n%global _program;\n%put &=syscc;\n%put user=%mf_getuser();\n%put pgm=&_program;\n%put timestamp=%sysfunc(datetime(),datetime19.);\n* Service Variables start;\n*Service Variables end;\n* Dependencies start;\n* Dependencies end;\n* Programs start;\n*Programs end;\n* Service start;\nproc sql;\ncreate table areas as select distinct area\n  from sashelp.springs;\n%webout(OPEN)\n%webout(OBJ,areas)\n%webout(CLOSE)\n* Service end;')
                                             },
                                             {
                                                 name: 'getdata',
                                                 type: 'service',
-                                                code: '/* provide additional debug info */\n%global _program;\n%put &=syscc;\n%put user=%mf_getuser();\n%put pgm=&_program;\n%put timestamp=%sysfunc(datetime(),datetime19.);\n* Service Variables start;\n*Service Variables end;\n* Dependencies start;\n* Dependencies end;\n* Programs start;\n*Programs end;\n* Service start;\n%webout(FETCH)\nproc sql;\ncreate table springs as select * from sashelp.springs\n  where area in (select area from work.areas);\n%webout(OPEN)\n%webout(OBJ,springs)\n%webout(CLOSE)\n* Service end;'
+                                                code: utils_3.removeComments("" + mf_getuser + mp_jsonout + ms_webout + webout +
+                                                    '/* provide additional debug info */\n%global _program;\n%put &=syscc;\n%put user=%mf_getuser();\n%put pgm=&_program;\n%put timestamp=%sysfunc(datetime(),datetime19.);\n* Service Variables start;\n*Service Variables end;\n* Dependencies start;\n* Dependencies end;\n* Programs start;\n*Programs end;\n* Service start;\n%webout(FETCH)\nproc sql;\ncreate table springs as select * from sashelp.springs\n  where area in (select area from work.areas);\n%webout(OPEN)\n%webout(OBJ,springs)\n%webout(CLOSE)\n* Service end;')
                                             }
                                         ]
                                     }

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/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/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

@@ -51,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

package/build/utils/config.js

@@ -691,10 +691,7 @@ function getStreamConfig(target) {
     });
 }
 exports.getStreamConfig = getStreamConfig;
-function getMacroCorePath() {
-    var macroCorePath = process.sasjsConstants.macroCorePath;
-    return macroCorePath;
-}
+var getMacroCorePath = function () { return process.sasjsConstants.macroCorePath; };
 exports.getMacroCorePath = getMacroCorePath;
 /**
  * Sanitizes app location string.
@@ -761,7 +758,7 @@ exports.getProjectRoot = getProjectRoot;
 function getAuthConfig(target) {
     var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function () {
-        var access_token, refresh_token, client, secret, authConfig, sasjs;
+        var access_token, refresh_token, client, secret, sasjs, tokens;
         return __generator(this, function (_e) {
             switch (_e.label) {
                 case 0:
@@ -811,18 +808,19 @@ function getAuthConfig(target) {
                         httpsAgentOptions: target.httpsAgentOptions,
                         serverType: target.serverType
                     });
+                    tokens = void 0;
                     if (!auth_1.isRefreshTokenExpiring(refresh_token)) return [3 /*break*/, 4];
                     return [4 /*yield*/, auth_1.getNewAccessToken(sasjs, client, secret, target)];
                 case 3:
-                    authConfig = _e.sent();
+                    tokens = _e.sent();
                     return [3 /*break*/, 6];
                 case 4: return [4 /*yield*/, auth_1.refreshTokens(sasjs, client, secret, refresh_token)];
                 case 5:
-                    authConfig = _e.sent();
+                    tokens = _e.sent();
                     _e.label = 6;
                 case 6:
-                    access_token = (authConfig === null || authConfig === void 0 ? void 0 : authConfig.access_token) || access_token;
-                    refresh_token = (authConfig === null || authConfig === void 0 ? void 0 : authConfig.refresh_token) || refresh_token;
+                    access_token = (tokens === null || tokens === void 0 ? void 0 : tokens.access_token) || access_token;
+                    refresh_token = (tokens === null || tokens === void 0 ? void 0 : tokens.refresh_token) || refresh_token;
                     _e.label = 7;
                 case 7: return [2 /*return*/, {
                         access_token: access_token,
@@ -852,7 +850,7 @@ exports.getAuthConfig = getAuthConfig;
 function getAccessToken(target, checkIfExpiring) {
     if (checkIfExpiring === void 0) { checkIfExpiring = true; }
     return __awaiter(this, void 0, void 0, function () {
-        var accessToken, sasjs, client, secret, refreshToken, authConfig;
+        var accessToken, sasjs, client, secret, refreshToken, tokens;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -907,18 +905,18 @@ function getAccessToken(target, checkIfExpiring) {
                             (refreshToken.trim() === 'null' || refreshToken.trim() === 'undefined')
                             ? undefined
                             : refreshToken;
-                    authConfig = void 0;
+                    tokens = void 0;
                     if (!auth_1.isRefreshTokenExpiring(refreshToken)) return [3 /*break*/, 4];
                     return [4 /*yield*/, auth_1.getNewAccessToken(sasjs, client, secret, target)];
                 case 3:
-                    authConfig = _a.sent();
+                    tokens = _a.sent();
                     return [3 /*break*/, 6];
                 case 4: return [4 /*yield*/, auth_1.refreshTokens(sasjs, client, secret, refreshToken)];
                 case 5:
-                    authConfig = _a.sent();
+                    tokens = _a.sent();
                     _a.label = 6;
                 case 6:
-                    accessToken = authConfig === null || authConfig === void 0 ? void 0 : authConfig.access_token;
+                    accessToken = tokens === null || tokens === void 0 ? void 0 : tokens.access_token;
                     _a.label = 7;
                 case 7: return [2 /*return*/, accessToken];
             }

package/package.json

@@ -19,7 +19,8 @@
     "test:mocked": "jest --silent --runInBand --config=jest.config.js --coverage",
     "semantic-release": "semantic-release -d",
     "lint:fix": "npx prettier --write \"{src,test}/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"",
-    "lint": "npx prettier --check \"{src,test}/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\""
+    "lint": "npx prettier --check \"{src,test}/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"",
+    "prepare": "git rev-parse --git-dir && git config core.hooksPath ./.git-hooks || true"
   },
   "release": {
     "branches": [
@@ -47,14 +48,9 @@
   "publishConfig": {
     "access": "public"
   },
-  "config": {
-    "ghooks": {
-      "commit-msg": "validate-commit-msg"
-    }
-  },
   "dependencies": {
     "@sasjs/adapter": "3.0.0",
-    "@sasjs/core": "2.45.2",
+    "@sasjs/core": "2.54.1",
     "@sasjs/lint": "1.11.2",
     "@sasjs/utils": "2.34.1",
     "chalk": "4.1.2",
@@ -90,9 +86,8 @@
     "@types/xml": "1.0.6",
     "babel-jest": "27.2.4",
     "copyfiles": "2.4.1",
-    "ghooks": "2.0.4",
     "jest": "27.2.4",
-    "jest-cli": "27.2.4",
+    "jest-cli": "27.3.1",
     "jest-extended": "1.1.0",
     "nodemon": "2.0.13",
     "semantic-release": "17.4.7",
@@ -100,8 +95,7 @@
     "ts-node": "10.2.1",
     "tslib": "2.3.1",
     "typescript": "4.3.5",
-    "util": "0.12.4",
-    "validate-commit-msg": "1.1.3"
+    "util": "0.12.4"
   },
-  "version": "3.0.3"
+  "version": "3.0.4"
 }

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

@@ -1,4 +0,0 @@
-export declare const updateLinkHref: (linkTag: HTMLLinkElement, assetPathMap: {
-    source: string;
-    target: string;
-}[]) => void;

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

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateLinkHref = void 0;
-var updateLinkHref = function (linkTag, assetPathMap) {
-    var linkSourcePath = linkTag.getAttribute('href') || '';
-    var isUrl = linkSourcePath.startsWith('http') || linkSourcePath.startsWith('//');
-    if (!isUrl) {
-        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);
-        }
-        linkTag.setAttribute('href', assetPath.target);
-    }
-};
-exports.updateLinkHref = updateLinkHref;