@sasjs/cli 2.38.6 → 3.0.0

package/build/commands/web/web.js

@@ -35,32 +35,11 @@ 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;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateTagSource = exports.createWebAppServices = void 0;
+exports.createWebAppServices = void 0;
 var utils_1 = require("../../utils/utils");
 var utils_2 = require("@sasjs/utils");
 var config_1 = require("../../utils/config");
@@ -68,12 +47,8 @@ var path_1 = __importDefault(require("path"));
 var jsdom_1 = __importDefault(require("jsdom"));
 var sasjsout_1 = require("./internal/sasjsout");
 var adjustIframeScript_1 = require("./internal/adjustIframeScript");
-var js_base64_1 = require("js-base64");
-var lodash_uniqby_1 = __importDefault(require("lodash.uniqby"));
-var permittedServerTypes = {
-    SAS9: 'SAS9',
-    SASVIYA: 'SASVIYA'
-};
+var createAssetServices_1 = require("./internal/createAssetServices");
+var updateAllTags_1 = require("./internal/updateAllTags");
 var exampleStreamConfig = {
     streamWeb: true,
     streamWebFolder: '/example/folder/path',
@@ -82,10 +57,9 @@ var exampleStreamConfig = {
     streamServiceName: 'clickme'
 };
 function createWebAppServices(target) {
-    var _a, _b;
+    var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var buildDestinationServicesFolder, streamConfig, webSourcePath, streamWebFolder, destinationPath, webSourcePathFull, assetPathMap, indexHtmlPath, indexHtmlIndex, indexHtml, scriptTags, linkTags, faviconTags;
-        var _this = this;
+        var buildDestinationServicesFolder, streamConfig, _b, webSourcePathFull, indexHtmlPath, destinationPath, assetPathMap, indexHtml;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -93,328 +67,82 @@ function createWebAppServices(target) {
                     return [4 /*yield*/, config_1.getStreamConfig(target)];
                 case 1:
                     streamConfig = _c.sent();
-                    if (!streamConfig) {
-                        throw new Error("Invalid stream config: Please specify the `streamConfig` in your target in the following format: \n " + JSON.stringify(exampleStreamConfig, null, 2));
-                    }
-                    webSourcePath = streamConfig.webSourcePath, streamWebFolder = streamConfig.streamWebFolder;
-                    if (!webSourcePath) {
-                        throw new Error("Invalid web sourcePath: Please specify the `streamConfig` in your target in the following format: \n " + JSON.stringify(exampleStreamConfig, null, 2));
-                    }
-                    if (!streamWebFolder) {
-                        throw new Error("Invalid stream web folder: Please specify the `streamConfig` in your target in the following format: \n " + JSON.stringify(exampleStreamConfig, null, 2));
-                    }
+                    return [4 /*yield*/, validateStreamConfig(streamConfig)];
+                case 2:
+                    _b = _c.sent(), webSourcePathFull = _b.webSourcePathFull, indexHtmlPath = _b.indexHtmlPath;
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Compiling web app services for target " + target.name + "...");
                     return [4 /*yield*/, createBuildDestinationFolder()];
-                case 2:
-                    _c.sent();
-                    destinationPath = path_1.default.join(buildDestinationServicesFolder, streamWebFolder);
-                    return [4 /*yield*/, createTargetDestinationFolder(destinationPath)];
                 case 3:
                     _c.sent();
-                    webSourcePathFull = utils_1.getAbsolutePath(webSourcePath, process.projectDir);
-                    return [4 /*yield*/, utils_2.folderExists(webSourcePathFull)];
+                    destinationPath = path_1.default.join(buildDestinationServicesFolder, streamConfig.streamWebFolder);
+                    return [4 /*yield*/, createTargetDestinationFolder(destinationPath)];
                 case 4:
-                    if (!(_c.sent()))
-                        (_b = process.logger) === null || _b === void 0 ? void 0 : _b.warn("webSourcePath: '" + webSourcePathFull + "' present in 'streamConfig' doesn't exist.");
-                    return [4 /*yield*/, createAssetServices(target, destinationPath, streamConfig)];
+                    _c.sent();
+                    return [4 /*yield*/, createAssetServices_1.createAssetServices(target, destinationPath, streamConfig).then(function (map) {
+                            var indexHtmlIndex = map.findIndex(function (assetPath) { return assetPath.source === 'index.html'; });
+                            map.splice(indexHtmlIndex, 1);
+                            return map;
+                        })];
                 case 5:
                     assetPathMap = _c.sent();
-                    indexHtmlPath = path_1.default.join(webSourcePathFull, 'index.html');
-                    return [4 /*yield*/, utils_2.fileExists(indexHtmlPath)];
-                case 6:
-                    if (!_c.sent()) return [3 /*break*/, 14];
-                    indexHtmlIndex = assetPathMap.findIndex(function (assetPath) { return assetPath.source === 'index.html'; });
-                    assetPathMap.splice(indexHtmlIndex, 1);
                     return [4 /*yield*/, utils_2.readFile(indexHtmlPath).then(function (content) { return new jsdom_1.default.JSDOM(content); })];
-                case 7:
+                case 6:
                     indexHtml = _c.sent();
-                    scriptTags = getScriptTags(indexHtml);
-                    return [4 /*yield*/, utils_2.asyncForEach(scriptTags, function (tag) { return __awaiter(_this, void 0, void 0, function () {
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, updateTagSource(tag, webSourcePath, destinationPath, target, assetPathMap)];
-                                    case 1:
-                                        _a.sent();
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); })];
-                case 8:
-                    _c.sent();
-                    linkTags = getLinkTags(indexHtml);
-                    return [4 /*yield*/, utils_2.asyncForEach(linkTags, function (linkTag) { return __awaiter(_this, void 0, void 0, function () {
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, updateLinkHref(linkTag, assetPathMap)];
-                                    case 1:
-                                        _a.sent();
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); })];
-                case 9:
-                    _c.sent();
-                    faviconTags = getFaviconTags(indexHtml);
-                    return [4 /*yield*/, utils_2.asyncForEach(faviconTags, function (faviconTag) { return __awaiter(_this, void 0, void 0, function () {
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, updateLinkHref(faviconTag, assetPathMap)];
-                                    case 1:
-                                        _a.sent();
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); })];
-                case 10:
+                    return [4 /*yield*/, updateAllTags_1.updateAllTags(indexHtml, {
+                            webSourcePathFull: webSourcePathFull,
+                            destinationPath: destinationPath,
+                            serverType: target.serverType,
+                            assetPathMap: assetPathMap
+                        })];
+                case 7:
                     _c.sent();
-                    if (!(target.serverType === utils_2.ServerType.SasViya)) return [3 /*break*/, 12];
+                    if (!(target.serverType === utils_2.ServerType.SasViya)) return [3 /*break*/, 9];
                     indexHtml.window.document.body.innerHTML += adjustIframeScript_1.adjustIframeScript;
                     return [4 /*yield*/, createClickMeFile(indexHtml.serialize(), streamConfig.streamServiceName)];
-                case 11:
+                case 8:
                     _c.sent();
-                    return [3 /*break*/, 14];
-                case 12: return [4 /*yield*/, createClickMeService(indexHtml.serialize(), streamConfig.streamServiceName)];
-                case 13:
+                    return [3 /*break*/, 11];
+                case 9: return [4 /*yield*/, createClickMeService(indexHtml.serialize(), streamConfig.streamServiceName)];
+                case 10:
                     _c.sent();
-                    _c.label = 14;
-                case 14: return [2 /*return*/];
+                    _c.label = 11;
+                case 11: return [2 /*return*/];
             }
         });
     });
 }
 exports.createWebAppServices = createWebAppServices;
-function createAssetServices(target, destinationPath, streamConfig) {
-    return __awaiter(this, void 0, void 0, function () {
-        var webSourcePath, streamWebFolder, assetPaths, assetPathMap;
-        var _this = this;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    webSourcePath = streamConfig.webSourcePath, streamWebFolder = streamConfig.streamWebFolder, assetPaths = streamConfig.assetPaths;
-                    assetPathMap = [];
-                    return [4 /*yield*/, utils_2.asyncForEach(__spreadArray([path_1.default.join(process.projectDir, webSourcePath)], __read((assetPaths !== null && assetPaths !== void 0 ? assetPaths : []))), function (assetPath) { return __awaiter(_this, void 0, void 0, function () {
-                            var fullAssetPath, assetPathExists, assetPathMapNested;
-                            var _a;
-                            return __generator(this, function (_b) {
-                                switch (_b.label) {
-                                    case 0:
-                                        fullAssetPath = path_1.default.isAbsolute(assetPath)
-                                            ? assetPath
-                                            : path_1.default.isAbsolute(webSourcePath)
-                                                ? path_1.default.join(webSourcePath, assetPath)
-                                                : path_1.default.join(process.projectDir, webSourcePath, assetPath);
-                                        return [4 /*yield*/, utils_2.folderExists(fullAssetPath)];
-                                    case 1:
-                                        assetPathExists = _b.sent();
-                                        if (!assetPathExists) {
-                                            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.warn("Assets path '" + fullAssetPath + "' present in 'streamConfig' doesn't exist.");
-                                            return [2 /*return*/];
-                                        }
-                                        return [4 /*yield*/, createAssetsServicesNested(target, streamWebFolder, fullAssetPath, destinationPath)];
-                                    case 2:
-                                        assetPathMapNested = _b.sent();
-                                        assetPathMap.push.apply(assetPathMap, __spreadArray([], __read(assetPathMapNested)));
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); })];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, lodash_uniqby_1.default(assetPathMap, 'source')];
-            }
-        });
-    });
-}
-function createAssetsServicesNested(target, streamWebFolder, fullAssetPath, destinationPath) {
-    return __awaiter(this, void 0, void 0, function () {
-        var assetPathMap, filePaths, folderNames;
-        var _this = this;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    assetPathMap = [];
-                    return [4 /*yield*/, utils_2.listFilesInFolder(fullAssetPath)];
-                case 1:
-                    filePaths = _a.sent();
-                    return [4 /*yield*/, utils_2.asyncForEach(filePaths, function (filePath) { return __awaiter(_this, void 0, void 0, function () {
-                            var fullFileName, fileName, fileExtension, sourcePath, assetServiceUrl, fileName_1, assetServiceUrl;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0:
-                                        fullFileName = path_1.default.basename(filePath);
-                                        fileName = fullFileName.substring(0, fullFileName.lastIndexOf('.'));
-                                        fileExtension = path_1.default
-                                            .basename(filePath)
-                                            .substring(fullFileName.lastIndexOf('.') + 1, fullFileName.length);
-                                        if (!(fileName && fileExtension)) return [3 /*break*/, 4];
-                                        sourcePath = path_1.default.join(fullAssetPath, filePath);
-                                        if (!(target.serverType === utils_2.ServerType.SasViya)) return [3 /*break*/, 2];
-                                        return [4 /*yield*/, utils_2.copy(sourcePath, path_1.default.join(destinationPath, fullFileName))];
-                                    case 1:
-                                        _a.sent();
-                                        assetServiceUrl = getAssetPath(target.appLoc, target.serverType, streamWebFolder, fullFileName);
-                                        assetPathMap.push({
-                                            source: fullFileName,
-                                            target: assetServiceUrl
-                                        });
-                                        return [3 /*break*/, 4];
-                                    case 2: return [4 /*yield*/, generateAssetService(sourcePath, filePath, destinationPath, target.serverType)];
-                                    case 3:
-                                        fileName_1 = _a.sent();
-                                        assetServiceUrl = getAssetPath(target.appLoc, target.serverType, streamWebFolder, fileName_1.replace('.sas', ''));
-                                        assetPathMap.push({
-                                            source: fullFileName,
-                                            target: assetServiceUrl
-                                        });
-                                        _a.label = 4;
-                                    case 4: return [2 /*return*/];
-                                }
-                            });
-                        }); })];
-                case 2:
-                    _a.sent();
-                    return [4 /*yield*/, utils_2.listSubFoldersInFolder(fullAssetPath)];
-                case 3:
-                    folderNames = _a.sent();
-                    return [4 /*yield*/, utils_2.asyncForEach(folderNames, function (folderName) { return __awaiter(_this, void 0, void 0, function () {
-                            var destinationPathNested, fullAssetPathNested, assetFolderMap;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0:
-                                        destinationPathNested = path_1.default.join(destinationPath, folderName);
-                                        fullAssetPathNested = path_1.default.join(fullAssetPath, folderName);
-                                        return [4 /*yield*/, utils_2.createFolder(destinationPathNested)];
-                                    case 1:
-                                        _a.sent();
-                                        return [4 /*yield*/, createAssetsServicesNested(target, streamWebFolder + "/" + folderName, fullAssetPathNested, destinationPathNested)];
-                                    case 2:
-                                        assetFolderMap = _a.sent();
-                                        assetFolderMap.forEach(function (entry) {
-                                            assetPathMap.push({
-                                                source: folderName + "/" + entry.source,
-                                                target: entry.target
-                                            });
-                                        });
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); })];
-                case 4:
-                    _a.sent();
-                    return [2 /*return*/, assetPathMap];
-            }
-        });
-    });
-}
-function generateAssetService(sourcePath, filePath, destinationPath, serverType) {
-    return __awaiter(this, void 0, void 0, function () {
-        var fileExtension, fileType, fileName, base64string, serviceContent;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    fileExtension = path_1.default.extname(filePath);
-                    fileType = fileExtension.replace('.', '').toUpperCase();
-                    fileName = path_1.default
-                        .basename(filePath)
-                        .replace(new RegExp(fileExtension + '$'), fileExtension.replace('.', '-'));
-                    return [4 /*yield*/, utils_2.base64EncodeFile(sourcePath)];
-                case 1:
-                    base64string = _a.sent();
-                    return [4 /*yield*/, getWebServiceContentSAS9(base64string, fileType, serverType)];
-                case 2:
-                    serviceContent = _a.sent();
-                    return [4 /*yield*/, utils_2.createFile(path_1.default.join(destinationPath, fileName + ".sas"), serviceContent)];
-                case 3:
-                    _a.sent();
-                    return [2 /*return*/, fileName + ".sas"];
-            }
-        });
-    });
-}
-function updateTagSource(tag, webAppSourcePath, destinationPath, target, assetPathMap) {
-    return __awaiter(this, void 0, void 0, function () {
-        var scriptPath, isUrl, content_1, serviceContent;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    scriptPath = tag.getAttribute('src');
-                    isUrl = scriptPath && (scriptPath.startsWith('http') || scriptPath.startsWith('//'));
-                    if (!scriptPath) return [3 /*break*/, 7];
-                    if (!!isUrl) return [3 /*break*/, 7];
-                    return [4 /*yield*/, utils_2.readFile(path_1.default.join(process.projectDir, webAppSourcePath, scriptPath))];
-                case 1:
-                    content_1 = _a.sent();
-                    assetPathMap.forEach(function (pathEntry) {
-                        content_1 = content_1.replace(new RegExp(pathEntry.source, 'g'), pathEntry.target);
-                    });
-                    if (!(target.serverType === utils_2.ServerType.SasViya)) return [3 /*break*/, 3];
-                    return [4 /*yield*/, utils_2.createFile(path_1.default.join(destinationPath, scriptPath), content_1)];
-                case 2:
-                    _a.sent();
-                    return [3 /*break*/, 6];
-                case 3: return [4 /*yield*/, getWebServiceContentSAS9(js_base64_1.encode(content_1), 'JS', target.serverType)];
-                case 4:
-                    serviceContent = _a.sent();
-                    return [4 /*yield*/, utils_2.createFile(path_1.default.join(destinationPath, scriptPath.replace(/\.js$/, '-js') + ".sas"), serviceContent)];
-                case 5:
-                    _a.sent();
-                    _a.label = 6;
-                case 6:
-                    tag.setAttribute('src', assetPathMap.find(function (entry) {
-                        return entry.source === scriptPath || "./" + entry.source === scriptPath;
-                    }).target);
-                    _a.label = 7;
-                case 7: return [2 /*return*/];
-            }
-        });
-    });
-}
-exports.updateTagSource = updateTagSource;
-function updateLinkHref(linkTag, assetPathMap) {
-    return __awaiter(this, void 0, void 0, function () {
-        var linkSourcePath, isUrl;
-        return __generator(this, function (_a) {
-            linkSourcePath = linkTag.getAttribute('href') || '';
-            isUrl = linkSourcePath.startsWith('http') || linkSourcePath.startsWith('//');
-            if (!isUrl) {
-                linkTag.setAttribute('href', assetPathMap.find(function (entry) {
-                    return entry.source === linkSourcePath ||
-                        "./" + entry.source === linkSourcePath;
-                }).target);
-            }
-            return [2 /*return*/];
-        });
-    });
-}
-function getAssetPath(appLoc, serverType, streamWebFolder, fileName) {
-    if (!permittedServerTypes.hasOwnProperty(serverType.toUpperCase())) {
-        throw new Error('Unsupported server type. Supported types are SAS9 and SASVIYA');
-    }
-    var storedProcessPath = 
-    // the appLoc is inserted dynamically by SAS
-    // using three forward slashes as a marker
-    // for SAS 9 fileName is a program, with replacement in sasjsout.ts
-    // for Viya, fileName is a FILE, with replacement in build.sas only
-    serverType === utils_2.ServerType.SasViya
-        ? "/SASJobExecution?_FILE=" + appLoc + "/services/" + streamWebFolder
-        : "/SASStoredProcess/?_PROGRAM=///" + streamWebFolder;
-    return storedProcessPath + "/" + fileName;
-}
-function getScriptTags(parsedHtml) {
-    return Array.from(parsedHtml.window.document.querySelectorAll('script'));
-}
-function getLinkTags(parsedHtml) {
-    var linkTags = Array.from(parsedHtml.window.document.querySelectorAll('link')).filter(function (s) { return s.getAttribute('rel') === 'stylesheet'; });
-    return linkTags;
-}
-function getFaviconTags(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');
+var validateStreamConfig = function (streamConfig) { return __awaiter(void 0, void 0, void 0, function () {
+    var webSourcePath, streamWebFolder, webSourcePathFull, indexHtmlPath;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                if (!streamConfig) {
+                    throw new Error("Invalid stream config: Please specify the `streamConfig` in your target in the following format: \n " + JSON.stringify(exampleStreamConfig, null, 2));
+                }
+                webSourcePath = streamConfig.webSourcePath, streamWebFolder = streamConfig.streamWebFolder;
+                if (!webSourcePath) {
+                    throw new Error("Invalid web sourcePath: Please specify the `streamConfig` in your target in the following format: \n " + JSON.stringify(exampleStreamConfig, null, 2));
+                }
+                if (!streamWebFolder) {
+                    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)];
+            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)];
+            case 2:
+                if (!(_a.sent())) {
+                    throw new Error("'index.html' doesn't exist at webSourcePath: '" + webSourcePathFull + "' present in 'streamConfig'");
+                }
+                return [2 /*return*/, { webSourcePathFull: webSourcePathFull, indexHtmlPath: indexHtmlPath }];
+        }
     });
-    return linkTags;
-}
+}); };
 function createBuildDestinationFolder() {
     return __awaiter(this, void 0, void 0, function () {
         var buildDestinationFolder, pathExists;
@@ -456,48 +184,6 @@ function createTargetDestinationFolder(destinationPath) {
         });
     });
 }
-function getWebServiceContentSAS9(contentBase64, type, serverType) {
-    if (type === void 0) { type = 'JS'; }
-    return __awaiter(this, void 0, void 0, function () {
-        var lines, typesToEncode, serviceContent;
-        return __generator(this, function (_a) {
-            lines = [contentBase64];
-            typesToEncode = {
-                JS: 'JS64',
-                CSS: 'CSS64'
-            };
-            serviceContent = sasjsout_1.sasjsout + "\nfilename sasjs temp lrecl=99999999;\ndata _null_;\nfile sasjs;\n";
-            lines.forEach(function (line) {
-                var chunkedLines = utils_1.chunk(line);
-                if (chunkedLines.length === 1) {
-                    serviceContent += "put '" + chunkedLines[0].split("'").join("''") + "';\n";
-                }
-                else {
-                    var combinedLines_1 = '';
-                    chunkedLines.forEach(function (chunkedLine, index) {
-                        var text = "put '" + chunkedLine.split("'").join("''") + "'";
-                        if (index !== chunkedLines.length - 1) {
-                            text += '@;\n';
-                        }
-                        else {
-                            text += ';\n';
-                        }
-                        combinedLines_1 += text;
-                    });
-                    serviceContent += combinedLines_1;
-                }
-            });
-            if (serverType === permittedServerTypes.SAS9 &&
-                typesToEncode.hasOwnProperty(type)) {
-                serviceContent += "\nrun;\n%sasjsout(" + typesToEncode[type] + ")";
-            }
-            else {
-                serviceContent += "\nrun;\n%sasjsout(" + type + ")";
-            }
-            return [2 /*return*/, serviceContent];
-        });
-    });
-}
 function createClickMeService(indexHtmlContent, fileName) {
     return __awaiter(this, void 0, void 0, function () {
         var lines, clickMeServiceContent, buildDestinationServicesFolder;
@@ -516,7 +202,7 @@ function createClickMeService(indexHtmlContent, fileName) {
                                 .join("''") + "';\n";
                         }
                         else {
-                            var combinedLines_2 = '';
+                            var combinedLines_1 = '';
                             chunkedLines.forEach(function (chunkedLine, index) {
                                 var text = "put '" + chunkedLine.split("'").join("''") + "'";
                                 if (index !== chunkedLines.length - 1) {
@@ -525,9 +211,9 @@ function createClickMeService(indexHtmlContent, fileName) {
                                 else {
                                     text += ';\n';
                                 }
-                                combinedLines_2 += text;
+                                combinedLines_1 += text;
                             });
-                            clickMeServiceContent += combinedLines_2;
+                            clickMeServiceContent += combinedLines_1;
                         }
                     });
                     clickMeServiceContent += 'run;\n%sasjsout(HTML)';

package/build/config.json

@@ -241,7 +241,9 @@
         "name": "viya",
         "serverType": "SASVIYA",
         "serverUrl": "https://sas.analytium.co.uk",
-        "allowInsecureRequests": false,
+        "httpsAgentOptions": {
+          "allowInsecureRequests": false
+        },
         "appLoc": "/Public/app",
         "contextName": "SAS Job Execution compute context",
         "buildConfig": {

package/build/utils/config.d.ts

@@ -52,7 +52,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(): Promise<string>;
+export declare function getMacroCorePath(): string;
 /**
  * Sanitizes app location string.
  * @param {string} appLoc - app location