@sasjs/cli 2.39.0 → 3.0.3

package/build/commands/shared/deployToSasViyaWithServicePack.js

@@ -67,7 +67,7 @@ function deployToSasViyaWithServicePack(jsonFilePath, target, isLocal, isForced)
                         throw new Error("Deployment failed. Request is not authenticated.\nPlease add the following variables to your .env" + (isLocal ? "." + target.name : '') + " file:\nCLIENT, SECRET, ACCESS_TOKEN, REFRESH_TOKEN");
                     }
                     sasjs = new node_1.default({
-                        allowInsecureRequests: target.allowInsecureRequests,
+                        httpsAgentOptions: target.httpsAgentOptions,
                         appLoc: target.appLoc,
                         serverType: target.serverType,
                         serverUrl: target.serverUrl,

package/build/commands/testing/test.js

@@ -144,7 +144,7 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                         flow.push(testFlow.testTearDown);
                     sasjs = new node_1.default({
                         serverUrl: target.serverUrl,
-                        allowInsecureRequests: target.allowInsecureRequests,
+                        httpsAgentOptions: target.httpsAgentOptions,
                         appLoc: target.appLoc,
                         serverType: target.serverType,
                         debug: true,

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

@@ -38,7 +38,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWebServiceContent = void 0;
 var utils_1 = require("@sasjs/utils");
-var utils_2 = require("../../../utils");
 var sasjsout_1 = require("./sasjsout");
 var getWebServiceContent = function (contentBase64, type, serverType) {
     if (type === void 0) { type = 'JS'; }
@@ -52,7 +51,7 @@ var getWebServiceContent = function (contentBase64, type, serverType) {
             };
             serviceContent = sasjsout_1.sasjsout + "\nfilename sasjs temp lrecl=99999999;\ndata _null_;\nfile sasjs;\n";
             lines.forEach(function (line) {
-                var chunkedLines = utils_2.chunk(line);
+                var chunkedLines = utils_1.chunk(line);
                 if (chunkedLines.length === 1) {
                     serviceContent += "put '" + chunkedLines[0].split("'").join("''") + "';\n";
                 }

package/build/commands/web/web.js

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

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

@@ -1,5 +1,4 @@
-import { Configuration, Target, AuthConfig } from '@sasjs/utils';
-import { StreamConfig } from '@sasjs/utils/types/config';
+import { Configuration, Target, AuthConfig, StreamConfig } from '@sasjs/utils';
 import { TargetScope } from '../types/targetScope';
 /**
  * Returns an object that represents the SASjs CLI configuration in a given file.

package/build/utils/config.js

@@ -234,26 +234,28 @@ exports.findTargetInConfiguration = findTargetInConfiguration;
 function getLocalTarget(targetName) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var localConfig, targetJson;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var localConfig, targetJson, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0: return [4 /*yield*/, getConfiguration(path_1.default.join(process.projectDir, 'sasjs', 'sasjsconfig.json')).catch(function () { return null; })];
                 case 1:
-                    localConfig = _b.sent();
-                    if (localConfig === null || localConfig === void 0 ? void 0 : localConfig.targets) {
-                        targetJson = localConfig.targets.find(function (t) { return t.name === targetName; });
-                        if (targetJson) {
-                            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Target " + targetName + " was found in your local sasjsconfig.json file.");
-                            targetJson.appLoc = sanitizeAppLoc(targetJson.appLoc);
-                            if (!targetJson.hasOwnProperty('serverUrl')) {
-                                targetJson.serverUrl = '';
-                            }
-                            targetJson.serverUrl = utils_1.urlOrigin(targetJson.serverUrl);
-                            targetJson.allowInsecureRequests = getPrecedenceOfInsecureRequests(localConfig, targetJson);
-                            return [2 /*return*/, new utils_1.Target(targetJson)];
-                        }
+                    localConfig = _c.sent();
+                    if (!(localConfig === null || localConfig === void 0 ? void 0 : localConfig.targets)) return [3 /*break*/, 3];
+                    targetJson = localConfig.targets.find(function (t) { return t.name === targetName; });
+                    if (!targetJson) return [3 /*break*/, 3];
+                    (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Target " + targetName + " was found in your local sasjsconfig.json file.");
+                    targetJson.appLoc = sanitizeAppLoc(targetJson.appLoc);
+                    if (!targetJson.hasOwnProperty('serverUrl')) {
+                        targetJson.serverUrl = '';
                     }
-                    throw new Error(ERROR_MESSAGE(targetName).NOT_FOUND_TARGET_NAME);
+                    targetJson.serverUrl = utils_1.urlOrigin(targetJson.serverUrl);
+                    _b = targetJson;
+                    return [4 /*yield*/, getPrecedenceOfHttpsAgentOptionsAndContent(localConfig, targetJson)];
+                case 2:
+                    _b.httpsAgentOptions =
+                        _c.sent();
+                    return [2 /*return*/, new utils_1.Target(targetJson)];
+                case 3: throw new Error(ERROR_MESSAGE(targetName).NOT_FOUND_TARGET_NAME);
             }
         });
     });
@@ -261,31 +263,34 @@ function getLocalTarget(targetName) {
 function getLocalFallbackTarget() {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
-        var localConfig, fallBackTargetJson, defaultTargetName_1;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var localConfig, fallBackTargetJson, defaultTargetName_1, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0: return [4 /*yield*/, getConfiguration(path_1.default.join(process.projectDir, 'sasjs', 'sasjsconfig.json')).catch(function () { return null; })];
                 case 1:
-                    localConfig = _c.sent();
-                    if (!(localConfig === null || localConfig === void 0 ? void 0 : localConfig.targets)) return [3 /*break*/, 3];
+                    localConfig = _d.sent();
+                    if (!(localConfig === null || localConfig === void 0 ? void 0 : localConfig.targets)) return [3 /*break*/, 4];
                     defaultTargetName_1 = localConfig === null || localConfig === void 0 ? void 0 : localConfig.defaultTarget;
                     if (defaultTargetName_1) {
                         fallBackTargetJson = (_a = localConfig === null || localConfig === void 0 ? void 0 : localConfig.targets) === null || _a === void 0 ? void 0 : _a.find(function (t) { return t.name === defaultTargetName_1; });
                     }
-                    if (!fallBackTargetJson) return [3 /*break*/, 3];
+                    if (!fallBackTargetJson) return [3 /*break*/, 4];
                     (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("No target was specified. Falling back to default target '" + fallBackTargetJson.name + "' from your local sasjsconfig.json file.");
                     fallBackTargetJson.appLoc = sanitizeAppLoc(fallBackTargetJson.appLoc);
                     if (!fallBackTargetJson.hasOwnProperty('serverUrl')) {
                         fallBackTargetJson.serverUrl = '';
                     }
                     fallBackTargetJson.serverUrl = utils_1.urlOrigin(fallBackTargetJson.serverUrl);
-                    fallBackTargetJson.allowInsecureRequests =
-                        getPrecedenceOfInsecureRequests(localConfig, fallBackTargetJson);
-                    return [4 /*yield*/, utils_2.loadEnvVariables(".env." + fallBackTargetJson.name)];
+                    _c = fallBackTargetJson;
+                    return [4 /*yield*/, getPrecedenceOfHttpsAgentOptionsAndContent(localConfig, fallBackTargetJson)];
                 case 2:
-                    _c.sent();
+                    _c.httpsAgentOptions =
+                        _d.sent();
+                    return [4 /*yield*/, utils_2.loadEnvVariables(".env." + fallBackTargetJson.name)];
+                case 3:
+                    _d.sent();
                     return [2 /*return*/, new utils_1.Target(fallBackTargetJson)];
-                case 3: throw new Error(ERROR_MESSAGE().NOT_FOUND_FALLBACK);
+                case 4: throw new Error(ERROR_MESSAGE().NOT_FOUND_FALLBACK);
             }
         });
     });
@@ -293,26 +298,28 @@ function getLocalFallbackTarget() {
 function getGlobalTarget(targetName) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var globalConfig, targetJson;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var globalConfig, targetJson, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0: return [4 /*yield*/, getGlobalRcFile()];
                 case 1:
-                    globalConfig = _b.sent();
-                    if (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.targets) {
-                        targetJson = globalConfig.targets.find(function (t) { return t.name === targetName; });
-                        if (targetJson) {
-                            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Target " + targetName + " was found in your global .sasjsrc file.");
-                            targetJson.appLoc = sanitizeAppLoc(targetJson.appLoc);
-                            if (!targetJson.hasOwnProperty('serverUrl')) {
-                                targetJson.serverUrl = '';
-                            }
-                            targetJson.serverUrl = utils_1.urlOrigin(targetJson.serverUrl);
-                            targetJson.allowInsecureRequests = getPrecedenceOfInsecureRequests(globalConfig, targetJson);
-                            return [2 /*return*/, new utils_1.Target(targetJson)];
-                        }
+                    globalConfig = _c.sent();
+                    if (!(globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.targets)) return [3 /*break*/, 3];
+                    targetJson = globalConfig.targets.find(function (t) { return t.name === targetName; });
+                    if (!targetJson) return [3 /*break*/, 3];
+                    (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Target " + targetName + " was found in your global .sasjsrc file.");
+                    targetJson.appLoc = sanitizeAppLoc(targetJson.appLoc);
+                    if (!targetJson.hasOwnProperty('serverUrl')) {
+                        targetJson.serverUrl = '';
                     }
-                    throw new Error(ERROR_MESSAGE(targetName).NOT_FOUND_TARGET_NAME);
+                    targetJson.serverUrl = utils_1.urlOrigin(targetJson.serverUrl);
+                    _b = targetJson;
+                    return [4 /*yield*/, getPrecedenceOfHttpsAgentOptionsAndContent(globalConfig, targetJson)];
+                case 2:
+                    _b.httpsAgentOptions =
+                        _c.sent();
+                    return [2 /*return*/, new utils_1.Target(targetJson)];
+                case 3: throw new Error(ERROR_MESSAGE(targetName).NOT_FOUND_TARGET_NAME);
             }
         });
     });
@@ -320,27 +327,30 @@ function getGlobalTarget(targetName) {
 function getGlobalFallbackTarget() {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
-        var globalConfig, fallBackTargetJson, defaultTargetName;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var globalConfig, fallBackTargetJson, defaultTargetName, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0: return [4 /*yield*/, getGlobalRcFile()];
                 case 1:
-                    globalConfig = (_c.sent());
+                    globalConfig = (_d.sent());
                     defaultTargetName = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.defaultTarget;
                     if (defaultTargetName) {
                         fallBackTargetJson = (_a = globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.targets) === null || _a === void 0 ? void 0 : _a.find(function (t) { return t.name === defaultTargetName; });
                     }
-                    if (fallBackTargetJson) {
-                        (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("No target was specified. Falling back to default target '" + fallBackTargetJson.name + "' from your global .sasjsrc file.");
-                        fallBackTargetJson.appLoc = sanitizeAppLoc(fallBackTargetJson.appLoc);
-                        if (!fallBackTargetJson.hasOwnProperty('serverUrl')) {
-                            fallBackTargetJson.serverUrl = '';
-                        }
-                        fallBackTargetJson.serverUrl = utils_1.urlOrigin(fallBackTargetJson.serverUrl);
-                        fallBackTargetJson.allowInsecureRequests = getPrecedenceOfInsecureRequests(globalConfig, fallBackTargetJson);
-                        return [2 /*return*/, new utils_1.Target(fallBackTargetJson)];
+                    if (!fallBackTargetJson) return [3 /*break*/, 3];
+                    (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("No target was specified. Falling back to default target '" + fallBackTargetJson.name + "' from your global .sasjsrc file.");
+                    fallBackTargetJson.appLoc = sanitizeAppLoc(fallBackTargetJson.appLoc);
+                    if (!fallBackTargetJson.hasOwnProperty('serverUrl')) {
+                        fallBackTargetJson.serverUrl = '';
                     }
-                    throw new Error(ERROR_MESSAGE().NOT_FOUND_FALLBACK);
+                    fallBackTargetJson.serverUrl = utils_1.urlOrigin(fallBackTargetJson.serverUrl);
+                    _c = fallBackTargetJson;
+                    return [4 /*yield*/, getPrecedenceOfHttpsAgentOptionsAndContent(globalConfig, fallBackTargetJson)];
+                case 2:
+                    _c.httpsAgentOptions =
+                        _d.sent();
+                    return [2 /*return*/, new utils_1.Target(fallBackTargetJson)];
+                case 3: throw new Error(ERROR_MESSAGE().NOT_FOUND_FALLBACK);
             }
         });
     });
@@ -623,7 +633,7 @@ function getProgramFolders(target) {
                     }
                     buildSourceFolder = process.sasjsConstants.buildSourceFolder;
                     programFolders = programFolders.map(function (programFolder) {
-                        return utils_2.getAbsolutePath(programFolder, buildSourceFolder);
+                        return utils_1.getAbsolutePath(programFolder, buildSourceFolder);
                     });
                     return [2 /*return*/, __spreadArray([], __read(new Set(programFolders)))];
             }
@@ -654,7 +664,7 @@ function getMacroFolders(target) {
                     }
                     buildSourceFolder = process.sasjsConstants.buildSourceFolder;
                     macroFolders = macroFolders.map(function (macroFolder) {
-                        return utils_2.getAbsolutePath(macroFolder, buildSourceFolder);
+                        return utils_1.getAbsolutePath(macroFolder, buildSourceFolder);
                     });
                     return [2 /*return*/, __spreadArray([], __read(new Set(macroFolders)))];
             }
@@ -798,7 +808,7 @@ function getAuthConfig(target) {
                     if (!auth_1.isAccessTokenExpiring(access_token)) return [3 /*break*/, 7];
                     sasjs = new node_1.default({
                         serverUrl: target.serverUrl,
-                        allowInsecureRequests: target.allowInsecureRequests,
+                        httpsAgentOptions: target.httpsAgentOptions,
                         serverType: target.serverType
                     });
                     if (!auth_1.isRefreshTokenExpiring(refresh_token)) return [3 /*break*/, 4];
@@ -866,7 +876,7 @@ function getAccessToken(target, checkIfExpiring) {
                     if (!(checkIfExpiring && auth_1.isAccessTokenExpiring(accessToken))) return [3 /*break*/, 7];
                     sasjs = new node_1.default({
                         serverUrl: target.serverUrl,
-                        allowInsecureRequests: target.allowInsecureRequests,
+                        httpsAgentOptions: target.httpsAgentOptions,
                         serverType: target.serverType
                     });
                     client = target.authConfig && target.authConfig.client
@@ -947,9 +957,39 @@ var overrideEnvVariables = function (targetName) { return __awaiter(void 0, void
     });
 }); };
 exports.overrideEnvVariables = overrideEnvVariables;
-var getPrecedenceOfInsecureRequests = function (config, target) {
-    var _a;
-    return (_a = target.allowInsecureRequests) !== null && _a !== void 0 ? _a : !!config.allowInsecureRequests;
+var getPrecedenceOfHttpsAgentOptionsAndContent = function (config, target) { return __awaiter(void 0, void 0, void 0, function () {
+    var httpsAgentOptions, _a, _b, _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
+            case 0:
+                httpsAgentOptions = getHttpsAgentOptionsForInsecure(__assign(__assign({ allowInsecureRequests: false }, config.httpsAgentOptions), target.httpsAgentOptions));
+                if (!httpsAgentOptions.caPath) return [3 /*break*/, 2];
+                _a = httpsAgentOptions;
+                return [4 /*yield*/, utils_1.readFile(httpsAgentOptions.caPath)];
+            case 1:
+                _a.ca = _d.sent();
+                _d.label = 2;
+            case 2:
+                if (!httpsAgentOptions.keyPath) return [3 /*break*/, 4];
+                _b = httpsAgentOptions;
+                return [4 /*yield*/, utils_1.readFile(httpsAgentOptions.keyPath)];
+            case 3:
+                _b.key = _d.sent();
+                _d.label = 4;
+            case 4:
+                if (!httpsAgentOptions.certPath) return [3 /*break*/, 6];
+                _c = httpsAgentOptions;
+                return [4 /*yield*/, utils_1.readFile(httpsAgentOptions.certPath)];
+            case 5:
+                _c.cert = _d.sent();
+                _d.label = 6;
+            case 6: return [2 /*return*/, httpsAgentOptions];
+        }
+    });
+}); };
+var getHttpsAgentOptionsForInsecure = function (options) {
+    return options.allowInsecureRequests
+        ? __assign({ rejectUnauthorized: false }, options) : options;
 };
 var getTestSetUp = function (target) { return __awaiter(void 0, void 0, void 0, function () {
     var projectRoot, localConfig;

package/build/utils/file.d.ts

@@ -4,12 +4,6 @@ export function isSasFile(filePath: any): boolean;
 export function isJsonFile(filePath: any): boolean;
 export function isCsvFile(filePath: any): boolean;
 export function isShellScript(filePath: any): boolean;
-/**
- * Gets a list of @li items from the supplied file content with the specified header.
- * @param {string} listHeader - the header of the section to look for - e.g. <h4> SAS Macros </h4>.
- * @param {string} fileContent - the text content of the file.
- */
-export function getList(listHeader: string, fileContent: string): any[];
 export function getBrief(fileContent: any): any;
 export function getRelativePath(from: any, to: any): any[];
 export function saveToDefaultLocation(filePath: any, data: any): Promise<{

package/build/utils/file.js

@@ -39,7 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sasFileRegExp = exports.saveToDefaultLocation = exports.getRelativePath = exports.getBrief = exports.getList = exports.sanitizeFileName = exports.isShellScript = exports.isCsvFile = exports.isJsonFile = exports.isSasFile = exports.unifyFilePath = exports.createFolderStructure = void 0;
+exports.sasFileRegExp = exports.saveToDefaultLocation = exports.getRelativePath = exports.getBrief = exports.sanitizeFileName = exports.isShellScript = exports.isCsvFile = exports.isJsonFile = exports.isSasFile = exports.unifyFilePath = exports.createFolderStructure = void 0;
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
 var config_1 = require("./config");
@@ -129,48 +129,6 @@ var sanitizeFileName = function (fileName) {
     return fileName.replace(/[^a-z0-9]/gi, '_');
 };
 exports.sanitizeFileName = sanitizeFileName;
-/**
- * Gets a list of @li items from the supplied file content with the specified header.
- * @param {string} listHeader - the header of the section to look for - e.g. <h4> SAS Macros </h4>.
- * @param {string} fileContent - the text content of the file.
- */
-function getList(listHeader, fileContent) {
-    var _a;
-    var fileHeader;
-    try {
-        var hasFileHeader = fileContent.split('/**')[0] !== fileContent;
-        if (!hasFileHeader)
-            return [];
-        fileHeader = fileContent.split('/**')[1].split('**/')[0];
-    }
-    catch (e) {
-        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('File header parse error.\nPlease make sure your file header is in the correct format.');
-    }
-    var list = [];
-    var lines = fileHeader.split('\n').map(function (s) { return (s ? s.trim() : s); });
-    var startIndex = null;
-    var endIndex = null;
-    for (var i = 0; i < lines.length; i++) {
-        if (new RegExp(listHeader, 'i').test(lines[i])) {
-            startIndex = i + 1;
-            break;
-        }
-    }
-    for (var i = startIndex; i < lines.length; i++) {
-        if (!lines[i]) {
-            endIndex = i;
-            break;
-        }
-    }
-    for (var i = startIndex; i < endIndex; i++) {
-        list.push(lines[i]);
-    }
-    return list
-        .filter(function (l) { return l.startsWith('@li'); })
-        .map(function (d) { return d.replace(/\@li/g, ''); })
-        .map(function (d) { return d.trim(); });
-}
-exports.getList = getList;
 function getBrief(fileContent) {
     var fileHeader;
     try {

package/build/utils/setConstants.js

@@ -43,7 +43,7 @@ exports.setConstants = exports.contextName = void 0;
 var path_1 = __importDefault(require("path"));
 var get_installed_path_1 = require("get-installed-path");
 var config_1 = require("./config");
-var utils_1 = require("./utils");
+var utils_1 = require("@sasjs/utils");
 exports.contextName = 'sasjs cli compute context';
 var setConstants = function () { return __awaiter(void 0, void 0, void 0, function () {
     var _a, configuration, isLocal, buildOutputFolder, buildResultsFolder, homeDir, getMacroCoreGlobalPath, buildSourceFolder, buildSourceDbFolder, buildDestinationFolder, buildDestinationServicesFolder, buildDestinationTestFolder, buildDestinationJobsFolder, buildDestinationDbFolder, buildDestinationDocsFolder, macroCorePath, _b, buildDestinationResultsFolder, buildDestinationResultsLogsFolder, sas9CredentialsError, invalidSasError;

package/build/utils/spec/utils.spec.js

@@ -235,11 +235,11 @@ describe('utils', function () {
     describe('chunk', function () {
         it('should return an array with only one element that is equal to text itself if text size is less than max length', function () {
             var txt = '0B0pFTOzHXyRuikRydwnd8uQdwvITllwNOX20vQLsT0JgkXa1W';
-            expect(utils_1.chunk(txt)[0]).toBe(txt);
+            expect(utils_2.chunk(txt)[0]).toBe(txt);
         });
         it('should return an array with 3 elements', function () {
             var txt = 'SGmqg3pnHCJn0iPQC4Rd9AnFS3k5V7dDc81GlF6lCCurmsEJq7VS\nig42yjxerV7OAjE1HIOgJZXqID30\nkaVJsCwWrtFEIL8mQepjp4zLGeCaWk7ymu9BqolSnqA3udaiWuHcm6m80E36mWYWU0lITAgdp1QzVwIczpopXRaUWtJamiPnHyflksdNEXkboKlAT5RuR795ShUOc6KajQZ1qH2ZGJPV2DxjEqtXA9uvNbpisOVY6MpRdEzWNgdDsXlfuXkrBk5RqA7PkdtjBtNHA7JtEklTnYKrOdge03qFXKjh';
-            expect(utils_1.chunk(txt)).toBeArrayOfSize(3);
+            expect(utils_2.chunk(txt)).toBeArrayOfSize(3);
         });
     });
     describe('arrToObj', function () {
@@ -307,18 +307,18 @@ describe('utils', function () {
             var relativePath = './my-path/xyz';
             var pathRelativeTo = '/home/abc';
             var expectedAbsolutePath = ['', 'home', 'abc', 'my-path', 'xyz'].join(path_1.default.sep);
-            expect(utils_1.getAbsolutePath(relativePath, pathRelativeTo)).toEqual(expectedAbsolutePath);
+            expect(utils_2.getAbsolutePath(relativePath, pathRelativeTo)).toEqual(expectedAbsolutePath);
         });
         it('should convert tilde from absolute path', function () {
             var relativePath = '~/my-path/xyz';
             var expectedAbsolutePath = homedir + ['', 'my-path', 'xyz'].join(path_1.default.sep);
-            expect(utils_1.getAbsolutePath(relativePath, '')).toEqual(expectedAbsolutePath);
+            expect(utils_2.getAbsolutePath(relativePath, '')).toEqual(expectedAbsolutePath);
         });
         it('should return same path if path is absolute', function () {
             var absolutePath = '/my-path/xyz';
             var pathRelativeTo = '/home/abc';
             var expectedAbsolutePath = ['', 'my-path', 'xyz'].join(path_1.default.sep);
-            expect(utils_1.getAbsolutePath(absolutePath, pathRelativeTo)).toEqual(expectedAbsolutePath);
+            expect(utils_2.getAbsolutePath(absolutePath, pathRelativeTo)).toEqual(expectedAbsolutePath);
         });
     });
     describe('loadEnvVariables', function () {
@@ -359,4 +359,30 @@ describe('utils', function () {
             });
         }); });
     });
+    describe('createReactApp', function () {
+        it('should create React app', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var reactFolder, reactFolderPath, sasjsFolderPath;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        reactFolder = 'react-seed-app';
+                        reactFolderPath = path_1.default.join(__dirname, reactFolder);
+                        sasjsFolderPath = path_1.default.join(reactFolderPath, 'sasjs');
+                        return [4 /*yield*/, utils_2.createFolder(reactFolderPath)];
+                    case 1:
+                        _a.sent();
+                        return [4 /*yield*/, expect(utils_1.createReactApp(reactFolderPath)).toResolve()];
+                    case 2:
+                        _a.sent();
+                        return [4 /*yield*/, expect(utils_2.folderExists(sasjsFolderPath)).resolves.toEqual(true)];
+                    case 3:
+                        _a.sent();
+                        return [4 /*yield*/, utils_2.deleteFolder(reactFolderPath)];
+                    case 4:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        }); }, 600000);
+    });
 });

package/build/utils/test.js

@@ -147,7 +147,7 @@ var removeTestServerFolder = function (folderPath, target) { return __awaiter(vo
                 }
                 sasjs = new node_1.default({
                     serverUrl: target.serverUrl,
-                    allowInsecureRequests: target.allowInsecureRequests,
+                    httpsAgentOptions: target.httpsAgentOptions,
                     appLoc: target.appLoc,
                     serverType: target.serverType
                 });

package/build/utils/utils.d.ts

@@ -18,7 +18,6 @@ export declare function setupDoxygen(folderPath: string): Promise<void>;
 export declare function removeComments(text: string): string;
 export declare function getUniqServicesObj(services: string[]): any;
 export declare function executeShellScript(filePath: string, logFilePath: string): Promise<unknown>;
-export declare function chunk(text: string, maxLength?: number): string[];
 /**
  * Extracts plain text job log from fetched json log
  * @param {object} logJson
@@ -33,7 +32,6 @@ export declare const millisecondsToDdHhMmSs: (milliseconds: number) => string;
 export declare function checkNodeVersion(): void;
 export declare function getAdapterInstance(target: Target): SASjs;
 export declare function displaySasjsRunnerError(username: string): void;
-export declare const getAbsolutePath: (providedPath: string, relativePath: string) => string;
 export declare const loadEnvVariables: (fileName: string) => Promise<void>;
 export declare function prefixAppLoc(appLoc?: string, path?: string): string | null;
 export declare const isWindows: () => boolean;