@sasjs/cli 2.39.0 → 3.0.3

package/build/commands/compile/spec/loadDependencies.spec.js

@@ -71,7 +71,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
-var internalModule = __importStar(require("../internal/config"));
+var internalModule = __importStar(require("@sasjs/utils/sasjsCli/getInitTerm"));
 var test_1 = require("../../../utils/test");
 var loadDependencies_1 = require("../internal/loadDependencies");
 var fakeInit = "/**\n  @file serviceinit.sas\n  @brief this file is called with every service\n  @details  This file is included in *every* service, *after* the macros and *before* the service code.\n\n  <h4> SAS Macros </h4>\n  @li mf_abort.sas\n\n**/\n\noptions\n  DATASTMTCHK=ALLKEYWORDS /* some sites have this enabled */\n  PS=MAX /* reduce log size slightly */\n;\n%put service is starting!!;";
@@ -162,19 +162,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getServiceInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceInit start;\n" + fakeInit + "\n* ServiceInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getServiceTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceTerm start;\n" + fakeTerm + "\n* ServiceTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [], [], 'service')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.service)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));
@@ -193,19 +193,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getJobInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobInit start;\n" + fakeInit + "\n* JobInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getJobTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobTerm start;\n" + fakeTerm + "\n* JobTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [], [], 'job')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.job)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -224,19 +224,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getServiceInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceInit start;\n" + fakeInit2 + "\n* ServiceInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getServiceTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceTerm start;\n" + fakeTerm2 + "\n* ServiceTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [], [], 'service')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.service)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));
@@ -255,19 +255,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getJobInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobInit start;\n" + fakeInit2 + "\n* JobInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getJobTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobTerm start;\n" + fakeTerm2 + "\n* JobTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [], [], 'job')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [], [], utils_1.SASJsFileType.job)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -286,19 +286,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getServiceInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceInit start;\n" + fakeJobInit + "\n* ServiceInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getServiceTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceTerm start;\n" + fakeTerm + "\n* ServiceTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], 'service')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));
@@ -317,19 +317,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getJobInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobInit start;\n" + fakeJobInit + "\n* JobInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getJobTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobTerm start;\n" + fakeTerm + "\n* JobTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], 'job')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -348,19 +348,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getServiceInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceInit start;\n" + fakeJobInit2 + "\n* ServiceInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getServiceTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceTerm start;\n" + fakeTerm2 + "\n* ServiceTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], 'service')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));
@@ -379,19 +379,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getJobInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobInit start;\n" + fakeJobInit2 + "\n* JobInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getJobTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobTerm start;\n" + fakeTerm2 + "\n* JobTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], 'job')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -410,19 +410,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getJobInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobInit start;\n" + fakeJobInit + "\n* JobInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getJobTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobTerm start;\n" + fakeTerm2 + "\n* JobTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], 'job')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -444,19 +444,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getJobInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobInit start;\n" + fakeInit2 + "\n* JobInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getJobTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* JobTerm start;\n" + fakeJobInit + "\n* JobTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], 'job')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.job)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Job'));
@@ -477,19 +477,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getServiceInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceInit start;\n" + fakeJobInit + "\n* ServiceInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getServiceTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceTerm start;\n" + fakeTerm2 + "\n* ServiceTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], 'service')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));
@@ -511,19 +511,19 @@ describe('loadDependencies', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest.spyOn(internalModule, 'getServiceInit').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getInit').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceInit start;\n" + fakeInit2 + "\n* ServiceInit end;",
                             filePath: ''
                         });
                     });
-                    jest.spyOn(internalModule, 'getServiceTerm').mockImplementation(function () {
+                    jest.spyOn(internalModule, 'getTerm').mockImplementation(function () {
                         return Promise.resolve({
                             content: "\n* ServiceTerm start;\n" + fakeJobInit + "\n* ServiceTerm end;",
                             filePath: ''
                         });
                     });
-                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], 'service')];
+                    return [4 /*yield*/, loadDependencies_1.loadDependencies(target, path_1.default.join(__dirname, './service.sas'), [path_1.default.join(__dirname, './macros')], [path_1.default.join(__dirname, './'), path_1.default.join(__dirname, './services')], utils_1.SASJsFileType.service)];
                 case 1:
                     dependencies = _a.sent();
                     expect(dependencies).toStartWith(compiledVars('Service'));

package/build/commands/context/contextCommand.js

@@ -221,7 +221,7 @@ var ContextCommand = /** @class */ (function (_super) {
                         target = (_a.sent()).target;
                         sasjs = new node_1.default({
                             serverUrl: target.serverUrl,
-                            allowInsecureRequests: target.allowInsecureRequests,
+                            httpsAgentOptions: target.httpsAgentOptions,
                             appLoc: target.appLoc,
                             serverType: target.serverType
                         });
@@ -269,7 +269,7 @@ var ContextCommand = /** @class */ (function (_super) {
                         target = (_a.sent()).target;
                         sasjs = new node_1.default({
                             serverUrl: target.serverUrl,
-                            allowInsecureRequests: target.allowInsecureRequests,
+                            httpsAgentOptions: target.httpsAgentOptions,
                             appLoc: target.appLoc,
                             serverType: target.serverType
                         });
@@ -308,7 +308,7 @@ var ContextCommand = /** @class */ (function (_super) {
                         target = (_a.sent()).target;
                         sasjs = new node_1.default({
                             serverUrl: target.serverUrl,
-                            allowInsecureRequests: target.allowInsecureRequests,
+                            httpsAgentOptions: target.httpsAgentOptions,
                             appLoc: target.appLoc,
                             serverType: target.serverType
                         });
@@ -356,7 +356,7 @@ var ContextCommand = /** @class */ (function (_super) {
                         target = (_a.sent()).target;
                         sasjs = new node_1.default({
                             serverUrl: target.serverUrl,
-                            allowInsecureRequests: target.allowInsecureRequests,
+                            httpsAgentOptions: target.httpsAgentOptions,
                             appLoc: target.appLoc,
                             serverType: target.serverType
                         });
@@ -399,7 +399,7 @@ var ContextCommand = /** @class */ (function (_super) {
                         }
                         sasjs = new node_1.default({
                             serverUrl: target.serverUrl,
-                            allowInsecureRequests: target.allowInsecureRequests,
+                            httpsAgentOptions: target.httpsAgentOptions,
                             appLoc: target.appLoc,
                             serverType: target.serverType
                         });

package/build/commands/deploy/deploy.js

@@ -93,7 +93,7 @@ function deploy(target, isLocal, sasjs) {
                         return __generator(this, function (_d) {
                             switch (_d.label) {
                                 case 0:
-                                    deployScriptPath = utils_1.getAbsolutePath(deployScript, process.projectDir);
+                                    deployScriptPath = utils_2.getAbsolutePath(deployScript, process.projectDir);
                                     if (!file_1.isSasFile(deployScript)) return [3 /*break*/, 7];
                                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Processing SAS file " + path_1.default.basename(deployScript) + " ...");
                                     return [4 /*yield*/, utils_2.readFile(deployScriptPath)
@@ -149,7 +149,7 @@ function getSASjsAndAuthConfig(target, isLocal) {
                         serverUrl: target.serverUrl,
                         appLoc: target.appLoc,
                         serverType: target.serverType,
-                        allowInsecureRequests: target.allowInsecureRequests,
+                        httpsAgentOptions: target.httpsAgentOptions,
                         debug: true,
                         useComputeApi: true
                     });
@@ -241,7 +241,7 @@ function deployToSas9(deployScript, target, linesToExecute, logFilePath, streamC
                     password = utils_2.decodeFromBase64(password);
                     sasjs = new node_1.default({
                         serverUrl: target.serverUrl,
-                        allowInsecureRequests: target.allowInsecureRequests,
+                        httpsAgentOptions: target.httpsAgentOptions,
                         appLoc: target.appLoc,
                         serverType: target.serverType
                     });

package/build/commands/docs/generateDocs.js

@@ -80,7 +80,6 @@ var utils_1 = require("@sasjs/utils");
 var getFoldersForDocs_1 = require("./internal/getFoldersForDocs");
 var createDotFiles_1 = require("./internal/createDotFiles");
 var getDocConfig_1 = require("./internal/getDocConfig");
-var logger_1 = require("@sasjs/utils/logger");
 var utils_2 = require("../../utils");
 /**
  * Generates documentation(Doxygen)
@@ -129,7 +128,7 @@ function generateDocs(target, config, outDirectory) {
                 case 4:
                     doxyContent = __assign({ favIcon: 'favicon.ico', footer: 'new_footer.html', header: 'new_header.html', layout: 'DoxygenLayout.xml', logo: 'logo.png', readMe: '../../README.md', stylesheet: 'new_stylesheet.css', path: path_1.default.join(process.projectDir, 'sasjs', 'doxy') }, doxyContentFromConfig);
                     if (doxyContentFromConfig === null || doxyContentFromConfig === void 0 ? void 0 : doxyContentFromConfig.path)
-                        doxyContent.path = utils_2.getAbsolutePath(doxyContentFromConfig.path, process.projectDir);
+                        doxyContent.path = utils_1.getAbsolutePath(doxyContentFromConfig.path, process.projectDir);
                     doxyParams = setVariableCmd({
                         DOXY_HTML_OUTPUT: newOutDirectory,
                         DOXY_INPUT: "\"" + path_1.default.join(doxyContent.path, doxyContent.readMe) + "\" " + combinedFolders,
@@ -147,7 +146,7 @@ function generateDocs(target, config, outDirectory) {
                     doxyConfigPath = _f.sent();
                     (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Using " + doxyConfigPath + " as Doxygen Configuration.");
                     spinner = ora_1.default(chalk_1.default.greenBright('Generating docs', chalk_1.default.cyanBright(newOutDirectory)));
-                    if (process.env.LOG_LEVEL !== logger_1.LogLevel.Debug)
+                    if (process.env.LOG_LEVEL !== utils_1.LogLevel.Debug)
                         spinner.start();
                     return [4 /*yield*/, utils_1.fileExists(newOutDirectory)];
                 case 6:
@@ -161,9 +160,9 @@ function generateDocs(target, config, outDirectory) {
                 case 9:
                     _f.sent();
                     _e = shelljs_1.default.exec(doxyParams + " doxygen \"" + doxyConfigPath + "\"", {
-                        silent: process.env.LOG_LEVEL !== logger_1.LogLevel.Debug
+                        silent: process.env.LOG_LEVEL !== utils_1.LogLevel.Debug
                     }), stderr = _e.stderr, code = _e.code;
-                    if (process.env.LOG_LEVEL !== logger_1.LogLevel.Debug)
+                    if (process.env.LOG_LEVEL !== utils_1.LogLevel.Debug)
                         spinner.stop();
                     if (code !== 0) {
                         if (stderr.startsWith('error: ')) {

package/build/commands/docs/internal/getFileInputs.d.ts

@@ -7,4 +7,4 @@
 export declare function getFileInputs(fileName: string, fileContent: string, paramNodes: Map<string, {
     edges: string[];
     label: string;
-}>): any[];
+}>): string[];

package/build/commands/docs/internal/getFileInputs.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFileInputs = void 0;
-var file_1 = require("../../../utils/file");
+var utils_1 = require("@sasjs/utils");
 /**
  * Returns list of Inputs and populates Map of Nodes
  * @param {string} fileName- Name of the file from which Inputs need to extract
@@ -9,7 +9,7 @@ var file_1 = require("../../../utils/file");
  * @param {Map} paramNodes- Map for params(Inputs/Outputs)
  */
 function getFileInputs(fileName, fileContent, paramNodes) {
-    var fileInputs = file_1.getList('<h4> Data Inputs </h4>', fileContent)
+    var fileInputs = utils_1.getList('<h4> Data Inputs </h4>', fileContent)
         .map(function (input) { return input.toUpperCase(); })
         .filter(function (input) { return !input.endsWith('.DLL'); });
     fileInputs.forEach(function (inputParam) {

package/build/commands/docs/internal/getFileOutputs.d.ts

@@ -6,4 +6,4 @@
 export declare function getFileOutputs(fileContent: string, paramNodes: Map<string, {
     edges: string[];
     label: string;
-}>): any[];
+}>): string[];

package/build/commands/docs/internal/getFileOutputs.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFileOutputs = void 0;
-var file_1 = require("../../../utils/file");
+var utils_1 = require("@sasjs/utils");
 /**
  * Returns list of Outputs and populates Map of Nodes
  * @param {string} fileContent- Contents of the file from which Outputs need to extract
  * @param {Map} paramNodes- Map for params(Inputs/Outputs)
  */
 function getFileOutputs(fileContent, paramNodes) {
-    var fileOutputs = file_1.getList('<h4> Data Outputs </h4>', fileContent)
+    var fileOutputs = utils_1.getList('<h4> Data Outputs </h4>', fileContent)
         .map(function (output) { return output.toUpperCase(); })
         .filter(function (output) { return !output.endsWith('.DLL'); });
     fileOutputs.forEach(function (outputParam) {

package/build/commands/docs/internal/getFoldersForDocs.d.ts

@@ -1,4 +1,4 @@
-import { Target, Configuration } from '@sasjs/utils/types';
+import { Target, Configuration } from '@sasjs/utils';
 /**
  * Returns list of folders for documentation( macroCore / macros / SAS programs/ services / jobs )
  * @param {Target} target- target for docs.

package/build/commands/docs/internal/getFoldersForDocs.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFoldersForDocs = void 0;
-var utils_1 = require("../../../utils/utils");
+var utils_1 = require("@sasjs/utils");
 /**
  * Returns list of folders for documentation( macroCore / macros / SAS programs/ services / jobs )
  * @param {Target} target- target for docs.

package/build/commands/flow/flowCommand.js

@@ -125,7 +125,7 @@ var FlowCommand = /** @class */ (function (_super) {
                         target = (_b.sent()).target;
                         sasjs = new node_1.default({
                             serverUrl: target.serverUrl,
-                            allowInsecureRequests: target.allowInsecureRequests,
+                            httpsAgentOptions: target.httpsAgentOptions,
                             appLoc: target.appLoc,
                             serverType: target.serverType
                         });

package/build/commands/flow/spec/flow.spec.server.js

@@ -54,7 +54,7 @@ describe('sasjs flow', function () {
     var target = generateTarget();
     var sasjs = new node_1.default({
         serverUrl: target.serverUrl,
-        allowInsecureRequests: target.allowInsecureRequests,
+        httpsAgentOptions: target.httpsAgentOptions,
         appLoc: target.appLoc,
         serverType: target.serverType
     });

package/build/commands/folder/folderCommand.js

@@ -132,7 +132,7 @@ var FolderCommand = /** @class */ (function (_super) {
                         }
                         sasjs = new node_1.default({
                             serverUrl: target.serverUrl,
-                            allowInsecureRequests: target.allowInsecureRequests,
+                            httpsAgentOptions: target.httpsAgentOptions,
                             appLoc: target.appLoc,
                             serverType: target.serverType
                         });
@@ -259,7 +259,7 @@ var FolderCommand = /** @class */ (function (_super) {
                         }
                         sasjs = new node_1.default({
                             serverUrl: target.serverUrl,
-                            allowInsecureRequests: target.allowInsecureRequests,
+                            httpsAgentOptions: target.httpsAgentOptions,
                             appLoc: target.appLoc,
                             serverType: target.serverType
                         });

package/build/commands/folder/spec/folder.spec.server.js

@@ -52,7 +52,7 @@ describe('sasjs folder operations', function () {
     var target = generateTarget();
     var sasjs = new node_1.default({
         serverUrl: target.serverUrl,
-        allowInsecureRequests: target.allowInsecureRequests,
+        httpsAgentOptions: target.httpsAgentOptions,
         appLoc: target.appLoc,
         serverType: target.serverType
     });

package/build/commands/job/jobCommand.js

@@ -152,7 +152,7 @@ var JobCommand = /** @class */ (function (_super) {
                     case 2:
                         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/job/spec/job.spec.server.js

@@ -92,7 +92,7 @@ describe('sasjs job execute', function () {
                     _a.sent();
                     sasjs = new node_1.default({
                         serverUrl: target.serverUrl,
-                        allowInsecureRequests: target.allowInsecureRequests,
+                        httpsAgentOptions: target.httpsAgentOptions,
                         appLoc: target.appLoc,
                         serverType: target.serverType,
                         debug: true
@@ -530,7 +530,7 @@ describe('sasjs job execute', function () {
                 case 0:
                     adapter = new node_1.default({
                         serverUrl: target.serverUrl,
-                        allowInsecureRequests: target.allowInsecureRequests,
+                        httpsAgentOptions: target.httpsAgentOptions,
                         appLoc: target.appLoc,
                         serverType: target.serverType
                     });

package/build/commands/request/request.js

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

package/build/commands/run/run.js

@@ -113,7 +113,7 @@ function runSasCode(target, filePath, compile) {
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("File Compiled and placed at: " + filePath + " .");
                     _b.label = 4;
                 case 4:
-                    sasFilePath = utils_2.getAbsolutePath(filePath, process.currentDir);
+                    sasFilePath = utils_1.getAbsolutePath(filePath, process.currentDir);
                     return [4 /*yield*/, utils_1.readFile(sasFilePath)];
                 case 5:
                     sasFileContent = _b.sent();
@@ -139,7 +139,7 @@ function executeOnSasViya(filePath, isTempFile, target, linesToExecute) {
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Sending " + path_1.default.basename(filePath) + " to SAS server for execution.");
                     sasjs = new node_1.default({
                         serverUrl: target.serverUrl,
-                        allowInsecureRequests: target.allowInsecureRequests,
+                        httpsAgentOptions: target.httpsAgentOptions,
                         appLoc: target.appLoc,
                         serverType: target.serverType,
                         debug: true,
@@ -225,7 +225,7 @@ function executeOnSas9(filePath, isTempFile, target, linesToExecute) {
                     password = utils_1.decodeFromBase64(password);
                     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/servicepack/deploy.js

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

package/build/commands/servicepack/spec/servicepack.spec.server.js

@@ -61,7 +61,6 @@ describe('sasjs servicepack', function () {
                         name: targetName,
                         serverType: utils_1.ServerType.SasViya,
                         serverUrl: process.env.VIYA_SERVER_URL,
-                        allowInsecureRequests: false,
                         appLoc: "/Public/app/cli-tests/" + targetName,
                         contextName: utils_2.contextName,
                         authConfig: {