@sasjs/cli 4.11.0 → 4.11.2

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

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

package/build/commands/add/addCredential.js

@@ -52,10 +52,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createEnvFileForSasjs = exports.createEnvFileForSas9 = exports.createEnvFileForViya = exports.getTokens = exports.validateTargetName = exports.addCredential = void 0;
 var path_1 = __importDefault(require("path"));
-var logger_1 = require("@sasjs/utils/logger");
 var types_1 = require("@sasjs/utils/types");
-var node_1 = __importDefault(require("@sasjs/adapter/node"));
-var auth_1 = require("../../utils/auth");
 var utils_1 = require("../../utils");
 var utils_2 = require("@sasjs/utils");
 var input_1 = require("./internal/input");
@@ -100,7 +97,7 @@ var addCredential = function (target, insecure, targetScope) { return __awaiter(
             case 4: return [4 /*yield*/, (0, input_1.getCredentialsInputForViya)(target.name)];
             case 5:
                 _b = _j.sent(), client = _b.client, secret = _b.secret;
-                return [4 /*yield*/, (0, exports.getTokens)(target, client, secret, httpsAgentOptions).catch(function (err) {
+                return [4 /*yield*/, (0, exports.getTokens)(target, client, secret).catch(function (err) {
                         throw err;
                     })];
             case 6:
@@ -135,7 +132,7 @@ var addCredential = function (target, insecure, targetScope) { return __awaiter(
                 return [4 /*yield*/, (0, input_1.getCredentialsInputSasjs)(target)];
             case 17:
                 client = (_j.sent()).client;
-                return [4 /*yield*/, (0, exports.getTokens)(target, client, '', httpsAgentOptions)];
+                return [4 /*yield*/, (0, exports.getTokens)(target, client, '')];
             case 18:
                 _e = _j.sent(), access_token = _e.access_token, refresh_token = _e.refresh_token;
                 if (!(targetScope === targetScope_1.TargetScope.Local)) return [3 /*break*/, 20];
@@ -169,23 +166,17 @@ var validateTargetName = function (targetName) {
     return targetName;
 };
 exports.validateTargetName = validateTargetName;
-var getTokens = function (target, client, secret, httpsAgentOptions) { return __awaiter(void 0, void 0, void 0, function () {
+var getTokens = function (target, client, secret) { return __awaiter(void 0, void 0, void 0, function () {
     var adapter, _a, access_token, refresh_token;
-    var _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
-                adapter = new node_1.default({
-                    serverUrl: target.serverUrl,
-                    serverType: target.serverType,
-                    httpsAgentOptions: httpsAgentOptions,
-                    debug: ((_b = process.logger) === null || _b === void 0 ? void 0 : _b.logLevel) === logger_1.LogLevel.Debug
-                });
-                return [4 /*yield*/, (0, auth_1.getNewAccessToken)(adapter, client, secret, target).catch(function (err) {
+                adapter = (0, utils_1.getSASjs)(target);
+                return [4 /*yield*/, (0, utils_1.getNewAccessToken)(adapter, client, secret, target).catch(function (err) {
                         throw err;
                     })];
             case 1:
-                _a = _c.sent(), access_token = _a.access_token, refresh_token = _a.refresh_token;
+                _a = _b.sent(), access_token = _a.access_token, refresh_token = _a.refresh_token;
                 return [2 /*return*/, { access_token: access_token, refresh_token: refresh_token }];
         }
     });

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

@@ -53,13 +53,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getIsDefault = exports.getDefaultValues = exports.getCredentialsInputSas9 = exports.getCredentialsInputSasjs = exports.getCredentialsInputForViya = exports.getAndValidateSasjsFields = exports.getAndValidateSasViyaFields = exports.shouldAuthenticate = exports.getAndValidateSas9Fields = exports.getAndValidateServerUrl = exports.getCommonFields = void 0;
 var input_1 = require("@sasjs/utils/input");
 var types_1 = require("@sasjs/utils/types");
-var logger_1 = require("@sasjs/utils/logger");
 var utils_1 = require("@sasjs/utils");
 var path_1 = __importDefault(require("path"));
 var dotenv_1 = __importDefault(require("dotenv"));
-var node_1 = __importDefault(require("@sasjs/adapter/node"));
 var targetScope_1 = require("../../../types/targetScope");
-var config_1 = require("../../../utils/config");
+var utils_2 = require("../../../utils");
 function getCommonFields() {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
@@ -205,7 +203,7 @@ function getAndValidateUpdateExisting(targetScope, targetName) {
         var targetJson, errorMessage_1, choice;
         return __generator(this, function (_b) {
             switch (_b.label) {
-                case 0: return [4 /*yield*/, (0, config_1.findTargetInConfiguration)(targetName, targetScope)
+                case 0: return [4 /*yield*/, (0, utils_2.findTargetInConfiguration)(targetName, targetScope)
                         .then(function (res) { return res.target.toJson(false); })
                         .catch(function (_) { return undefined; })];
                 case 1:
@@ -255,27 +253,21 @@ var shouldAuthenticate = function () { return __awaiter(void 0, void 0, void 0,
 }); }); };
 exports.shouldAuthenticate = shouldAuthenticate;
 function getAndValidateSasViyaFields(target, scope, serverUrl, insecure, authenticateCallback) {
-    var _a;
     return __awaiter(this, void 0, void 0, function () {
         var contextName, httpsAgentOptions, sasjs, contexts, contextNumberErrorMessage, contextNumber;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
                     contextName = 'SAS Job Execution compute context';
                     return [4 /*yield*/, (0, exports.shouldAuthenticate)()];
                 case 1:
-                    if (!_b.sent()) return [3 /*break*/, 8];
+                    if (!_a.sent()) return [3 /*break*/, 8];
                     return [4 /*yield*/, authenticateCallback(target, insecure, scope)];
                 case 2:
-                    target = _b.sent();
+                    target = _a.sent();
                     httpsAgentOptions = insecure
                         ? __assign(__assign({}, target.httpsAgentOptions), { allowInsecureRequests: true, rejectUnauthorized: false }) : target.httpsAgentOptions;
-                    sasjs = new node_1.default({
-                        serverUrl: serverUrl,
-                        serverType: types_1.ServerType.SasViya,
-                        httpsAgentOptions: httpsAgentOptions,
-                        debug: ((_a = process.logger) === null || _a === void 0 ? void 0 : _a.logLevel) === logger_1.LogLevel.Debug
-                    });
+                    sasjs = (0, utils_2.getSASjs)(target);
                     contexts = [];
                     if (!(scope === targetScope_1.TargetScope.Local)) return [3 /*break*/, 4];
                     dotenv_1.default.config({
@@ -283,7 +275,7 @@ function getAndValidateSasViyaFields(target, scope, serverUrl, insecure, authent
                     });
                     return [4 /*yield*/, sasjs.getComputeContexts(process.env.ACCESS_TOKEN)];
                 case 3:
-                    contexts = _b.sent();
+                    contexts = _a.sent();
                     return [3 /*break*/, 6];
                 case 4:
                     if (!target.authConfig || !target.authConfig.access_token) {
@@ -291,13 +283,13 @@ function getAndValidateSasViyaFields(target, scope, serverUrl, insecure, authent
                     }
                     return [4 /*yield*/, sasjs.getComputeContexts(target.authConfig.access_token)];
                 case 5:
-                    contexts = _b.sent();
-                    _b.label = 6;
+                    contexts = _a.sent();
+                    _a.label = 6;
                 case 6:
                     contextNumberErrorMessage = "Context number must be between 1 and ".concat(contexts.length);
                     return [4 /*yield*/, (0, input_1.getChoice)('Please pick your SAS Viya execution context: ', contextNumberErrorMessage, contexts.map(function (c, i) { return ({ title: c.name, value: i }); }))];
                 case 7:
-                    contextNumber = _b.sent();
+                    contextNumber = _a.sent();
                     contextName = contexts[contextNumber].name;
                     return [2 /*return*/, { contextName: contextName, target: target }];
                 case 8: return [2 /*return*/, {

package/build/commands/context/contextCommand.js

@@ -50,13 +50,9 @@ 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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContextCommand = void 0;
-var node_1 = __importDefault(require("@sasjs/adapter/node"));
 var utils_1 = require("@sasjs/utils");
 var command_1 = require("../../types/command");
 var targetCommand_1 = require("../../types/command/targetCommand");
@@ -217,12 +213,7 @@ var ContextCommand = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.getTargetInfo()];
                     case 1:
                         target = (_a.sent()).target;
-                        sasjs = new node_1.default({
-                            serverUrl: target.serverUrl,
-                            httpsAgentOptions: target.httpsAgentOptions,
-                            appLoc: target.appLoc,
-                            serverType: target.serverType
-                        });
+                        sasjs = (0, utils_2.getSASjs)(target);
                         return [4 /*yield*/, this.getConfig().catch(function (err) {
                                 var _a;
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("Unable to create context. Error fetching context configuration from ".concat(_this.parsed.source, ": "), err);
@@ -265,12 +256,7 @@ var ContextCommand = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.getTargetInfo()];
                     case 1:
                         target = (_a.sent()).target;
-                        sasjs = new node_1.default({
-                            serverUrl: target.serverUrl,
-                            httpsAgentOptions: target.httpsAgentOptions,
-                            appLoc: target.appLoc,
-                            serverType: target.serverType
-                        });
+                        sasjs = (0, utils_2.getSASjs)(target);
                         return [4 /*yield*/, (0, utils_2.getAuthConfig)(target).catch(function (err) {
                                 var _a;
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Unable to create context. Error fetching auth config: ', err);
@@ -304,12 +290,7 @@ var ContextCommand = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.getTargetInfo()];
                     case 1:
                         target = (_a.sent()).target;
-                        sasjs = new node_1.default({
-                            serverUrl: target.serverUrl,
-                            httpsAgentOptions: target.httpsAgentOptions,
-                            appLoc: target.appLoc,
-                            serverType: target.serverType
-                        });
+                        sasjs = (0, utils_2.getSASjs)(target);
                         return [4 /*yield*/, this.getConfig().catch(function (err) {
                                 var _a;
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("Unable to edit context. Error fetching context configuration from ".concat(_this.parsed.source, ": "), err);
@@ -317,9 +298,8 @@ var ContextCommand = /** @class */ (function (_super) {
                             })];
                     case 2:
                         config = _a.sent();
-                        if (!config) {
+                        if (!config)
                             return [2 /*return*/, command_1.ReturnCode.InternalError];
-                        }
                         return [4 /*yield*/, (0, utils_2.getAuthConfig)(target).catch(function (err) {
                                 var _a;
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Unable to edit context. Error fetching auth config: ', err);
@@ -327,16 +307,11 @@ var ContextCommand = /** @class */ (function (_super) {
                             })];
                     case 3:
                         authConfig = _a.sent();
-                        if (!authConfig) {
+                        if (!authConfig)
                             return [2 /*return*/, command_1.ReturnCode.InternalError];
-                        }
                         return [4 /*yield*/, (0, edit_1.edit)(this.parsed.contextName, config, sasjs, authConfig.access_token)
-                                .then(function () {
-                                return command_1.ReturnCode.Success;
-                            })
-                                .catch(function () {
-                                return command_1.ReturnCode.InternalError;
-                            })];
+                                .then(function () { return command_1.ReturnCode.Success; })
+                                .catch(function () { return command_1.ReturnCode.InternalError; })];
                     case 4:
                         returnCode = _a.sent();
                         return [2 /*return*/, returnCode];
@@ -352,12 +327,7 @@ var ContextCommand = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.getTargetInfo()];
                     case 1:
                         target = (_a.sent()).target;
-                        sasjs = new node_1.default({
-                            serverUrl: target.serverUrl,
-                            httpsAgentOptions: target.httpsAgentOptions,
-                            appLoc: target.appLoc,
-                            serverType: target.serverType
-                        });
+                        sasjs = (0, utils_2.getSASjs)(target);
                         return [4 /*yield*/, (0, utils_2.getAuthConfig)(target).catch(function (err) {
                                 var _a;
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Unable to create context. Error fetching auth config: ', err);
@@ -365,16 +335,11 @@ var ContextCommand = /** @class */ (function (_super) {
                             })];
                     case 2:
                         authConfig = _a.sent();
-                        if (!authConfig) {
+                        if (!authConfig)
                             return [2 /*return*/, command_1.ReturnCode.InternalError];
-                        }
                         return [4 /*yield*/, (0, export_1.exportContext)(this.parsed.contextName, sasjs, authConfig.access_token)
-                                .then(function () {
-                                return command_1.ReturnCode.Success;
-                            })
-                                .catch(function () {
-                                return command_1.ReturnCode.InternalError;
-                            })];
+                                .then(function () { return command_1.ReturnCode.Success; })
+                                .catch(function () { return command_1.ReturnCode.InternalError; })];
                     case 3:
                         returnCode = _a.sent();
                         return [2 /*return*/, returnCode];
@@ -395,12 +360,7 @@ var ContextCommand = /** @class */ (function (_super) {
                             (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("'context list' command is only supported for SAS Viya build targets.\nPlease try again with a different target.");
                             return [2 /*return*/, command_1.ReturnCode.InternalError];
                         }
-                        sasjs = new node_1.default({
-                            serverUrl: target.serverUrl,
-                            httpsAgentOptions: target.httpsAgentOptions,
-                            appLoc: target.appLoc,
-                            serverType: target.serverType
-                        });
+                        sasjs = (0, utils_2.getSASjs)(target);
                         return [4 /*yield*/, (0, utils_2.getAuthConfig)(target).catch(function (err) {
                                 var _a;
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Unable to create context. Error fetching auth config: ', err);
@@ -408,16 +368,11 @@ var ContextCommand = /** @class */ (function (_super) {
                             })];
                     case 2:
                         authConfig = _b.sent();
-                        if (!authConfig) {
+                        if (!authConfig)
                             return [2 /*return*/, command_1.ReturnCode.InternalError];
-                        }
                         return [4 /*yield*/, (0, list_1.list)(target, sasjs, authConfig)
-                                .then(function () {
-                                return command_1.ReturnCode.Success;
-                            })
-                                .catch(function () {
-                                return command_1.ReturnCode.InternalError;
-                            })];
+                                .then(function () { return command_1.ReturnCode.Success; })
+                                .catch(function () { return command_1.ReturnCode.InternalError; })];
                     case 3:
                         returnCode = _b.sent();
                         return [2 /*return*/, returnCode];

package/build/commands/flow/flowCommand.js

@@ -56,7 +56,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlowCommand = void 0;
 var path_1 = __importDefault(require("path"));
-var node_1 = __importDefault(require("@sasjs/adapter/node"));
 var command_1 = require("../../types/command");
 var targetCommand_1 = require("../../types/command/targetCommand");
 var utils_1 = require("../../utils");
@@ -121,12 +120,7 @@ var FlowCommand = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.getTargetInfo()];
                     case 1:
                         target = (_b.sent()).target;
-                        sasjs = new node_1.default({
-                            serverUrl: target.serverUrl,
-                            httpsAgentOptions: target.httpsAgentOptions,
-                            appLoc: target.appLoc,
-                            serverType: target.serverType
-                        });
+                        sasjs = (0, utils_1.getSASjs)(target);
                         return [4 /*yield*/, (0, utils_1.getAuthConfig)(target).catch(function (err) {
                                 (0, utils_1.displayError)(err, 'Error while getting access token.');
                                 return null;

package/build/commands/folder/folderCommand.js

@@ -50,12 +50,8 @@ 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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FolderCommand = void 0;
-var node_1 = __importDefault(require("@sasjs/adapter/node"));
 var utils_1 = require("@sasjs/utils");
 var command_1 = require("../../types/command");
 var targetCommand_1 = require("../../types/command/targetCommand");
@@ -128,12 +124,7 @@ var FolderCommand = /** @class */ (function (_super) {
                             (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("This command is only supported for SAS Viya targets.\nPlease try again with a different target.");
                             return [2 /*return*/, command_1.ReturnCode.InternalError];
                         }
-                        sasjs = new node_1.default({
-                            serverUrl: target.serverUrl,
-                            httpsAgentOptions: target.httpsAgentOptions,
-                            appLoc: target.appLoc,
-                            serverType: target.serverType
-                        });
+                        sasjs = (0, utils_2.getSASjs)(target);
                         return [4 /*yield*/, (0, utils_2.getAuthConfig)(target).catch(function (err) {
                                 var _a;
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Unable to execute folder command. Error fetching auth config: ', err);
@@ -255,12 +246,7 @@ var FolderCommand = /** @class */ (function (_super) {
                             (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("'folder move' command is only supported for SAS Viya build targets.\nPlease try again with a different target.");
                             return [2 /*return*/, command_1.ReturnCode.InternalError];
                         }
-                        sasjs = new node_1.default({
-                            serverUrl: target.serverUrl,
-                            httpsAgentOptions: target.httpsAgentOptions,
-                            appLoc: target.appLoc,
-                            serverType: target.serverType
-                        });
+                        sasjs = (0, utils_2.getSASjs)(target);
                         return [4 /*yield*/, (0, utils_2.getAuthConfig)(target).catch(function (err) {
                                 var _a;
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Unable to list folder. Error fetching auth config: ', err);

package/build/commands/job/jobCommand.d.ts

@@ -3,7 +3,7 @@ import { ReturnCode } from '../../types/command';
 import { TargetCommand } from '../../types/command/targetCommand';
 export declare class JobCommand extends TargetCommand {
     private jobSubCommands;
-    private verbose;
+    private verbose?;
     private sasjs;
     private authConfig?;
     constructor(args: string[]);

package/build/commands/job/jobCommand.js

@@ -144,7 +144,6 @@ var JobCommand = /** @class */ (function (_super) {
             examples: examples,
             syntax: syntax
         }) || this;
-        _this.verbose = false;
         _this.sasjs = new node_1.default();
         _this.jobSubCommands = jobSubCommands;
         _this.verbose = getVerbose(args, _this.parsed.verbose);
@@ -187,8 +186,9 @@ var JobCommand = /** @class */ (function (_super) {
                             return [2 /*return*/, command_1.ReturnCode.InternalError];
                         }
                         this.sasjs = sasjs;
-                        this.sasjs.setVerboseMode(this.verbose);
                         this.authConfig = authConfig || authConfigSas9;
+                        if (this.verbose)
+                            this.sasjs.setVerboseMode(this.verbose);
                         _b = target.serverType;
                         switch (_b) {
                             case utils_1.ServerType.SasViya: return [3 /*break*/, 3];
@@ -376,5 +376,5 @@ var getVerbose = function (args, verboseArg) {
             return verboseArg;
         return true;
     }
-    return false;
+    return undefined;
 };

package/build/commands/job/spec/jobCommand.spec.js

@@ -368,7 +368,7 @@ describe('JobCommand', function () {
                 }
             });
         }); });
-        it('should set verbose to false if verbose flag is not present', function () { return __awaiter(void 0, void 0, void 0, function () {
+        it('should not call @sasjs/adapter/setVerboseMode method if verbose flag is not present', function () { return __awaiter(void 0, void 0, void 0, function () {
             var sasjs;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -387,7 +387,7 @@ describe('JobCommand', function () {
                         return [4 /*yield*/, executeCommandWrapper([jobPath])];
                     case 1:
                         _a.sent();
-                        expect(sasjs.setVerboseMode).toHaveBeenCalledWith(false);
+                        expect(sasjs.setVerboseMode).not.toHaveBeenCalled();
                         return [2 /*return*/];
                 }
             });

package/build/commands/request/request.js

@@ -41,12 +41,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runSasJob = void 0;
 var path_1 = __importDefault(require("path"));
-var node_1 = __importDefault(require("@sasjs/adapter/node"));
 var utils_1 = require("@sasjs/utils");
-var displayResult_1 = require("../../utils/displayResult");
 var types_1 = require("@sasjs/utils/types");
-var utils_2 = require("../../utils/utils");
-var saveLog_1 = require("../../utils/saveLog");
+var utils_2 = require("../../utils");
 function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath, authConfig, logFile, jobPath, outputPathParam) {
     return __awaiter(this, void 0, void 0, function () {
         var dataJson, configJson, dataFile, configFile, sas9CredentialsError, sasjs, result;
@@ -102,15 +99,7 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
                         }
                         configJson.password = (0, utils_1.decodeFromBase64)(configJson.password);
                     }
-                    sasjs = new node_1.default({
-                        serverUrl: target.serverUrl,
-                        httpsAgentOptions: target.httpsAgentOptions,
-                        appLoc: target.appLoc,
-                        serverType: target.serverType,
-                        contextName: target.contextName,
-                        useComputeApi: false,
-                        debug: true
-                    });
+                    sasjs = (0, utils_2.getSASjs)(target);
                     return [4 /*yield*/, sasjs
                             .request(sasJobLocation, dataJson, configJson, undefined, authConfig)
                             .then(function (res) { return __awaiter(_this, void 0, void 0, function () {
@@ -119,7 +108,7 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
                                 switch (_a.label) {
                                     case 0:
                                         if (!((res && res.errorCode) || (res && res.error))) return [3 /*break*/, 2];
-                                        (0, displayResult_1.displayError)('Request finished with errors.');
+                                        (0, utils_2.displayError)('Request finished with errors.');
                                         return [4 /*yield*/, saveLogFile(sasjs, sasJobLocation, logFile, jobPath)];
                                     case 1:
                                         _a.sent();
@@ -145,7 +134,7 @@ function runSasJob(target, isLocal, sasJobLocation, dataFilePath, configFilePath
                                                 output = JSON.parse(res);
                                             }
                                             catch (error) {
-                                                (0, displayResult_1.displayError)('Error parsing response. JSON is expected.');
+                                                (0, utils_2.displayError)('Error parsing response. JSON is expected.');
                                             }
                                         }
                                         else {
@@ -201,7 +190,7 @@ var saveLogFile = function (sasjs, sasJobLocation, logFile, jobPath) { return __
                 ;
                 logFile = path_1.default.join(logPath, "".concat(filename, "-").concat(timestamp, ".log"));
                 _a.label = 2;
-            case 2: return [4 /*yield*/, (0, saveLog_1.saveLog)(currentRequestLog.logFile, logFile, jobPath || '', false)];
+            case 2: return [4 /*yield*/, (0, utils_2.saveLog)(currentRequestLog.logFile, logFile, jobPath || '', false)];
             case 3:
                 _a.sent();
                 _a.label = 4;
@@ -253,7 +242,7 @@ var writeOutput = function (outputPathParam, output, sasJobLocation) { return __
                         outputString = JSON.stringify(output, null, 2);
                     }
                     catch (error) {
-                        (0, displayResult_1.displayError)(error, 'Result parsing failed.');
+                        (0, utils_2.displayError)(error, 'Result parsing failed.');
                         return [2 /*return*/];
                     }
                 }
@@ -264,10 +253,10 @@ var writeOutput = function (outputPathParam, output, sasJobLocation) { return __
                 return [4 /*yield*/, (0, utils_1.createFile)(outputPath, outputString)];
             case 5:
                 _a.sent();
-                (0, displayResult_1.displaySuccess)("Request finished. Output is stored at '".concat(outputPath, "'"));
+                (0, utils_2.displaySuccess)("Request finished. Output is stored at '".concat(outputPath, "'"));
                 return [3 /*break*/, 7];
             case 6:
-                (0, displayResult_1.displayError)("There was a problem with writing output file. Data not present.");
+                (0, utils_2.displayError)("There was a problem with writing output file. Data not present.");
                 _a.label = 7;
             case 7: return [2 /*return*/];
         }

package/build/commands/shared/deployToSasViyaWithServicePack.js

@@ -35,12 +35,8 @@ 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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployToSasViyaWithServicePack = void 0;
-var node_1 = __importDefault(require("@sasjs/adapter/node"));
 var utils_1 = require("@sasjs/utils");
 var utils_2 = require("../../utils");
 function deployToSasViyaWithServicePack(jsonFilePath, target, isLocal, isForced) {
@@ -65,13 +61,7 @@ function deployToSasViyaWithServicePack(jsonFilePath, target, isLocal, isForced)
                     if (!access_token) {
                         throw new Error("Deployment failed. Request is not authenticated.\nPlease add the following variables to your .env".concat(isLocal ? ".".concat(target.name) : '', " file:\nCLIENT, SECRET, ACCESS_TOKEN, REFRESH_TOKEN"));
                     }
-                    sasjs = new node_1.default({
-                        httpsAgentOptions: target.httpsAgentOptions,
-                        appLoc: target.appLoc,
-                        serverType: target.serverType,
-                        serverUrl: target.serverUrl,
-                        useComputeApi: true
-                    });
+                    sasjs = (0, utils_2.getSASjs)(target);
                     return [4 /*yield*/, sasjs
                             .deployServicePack(jsonObject, undefined, undefined, access_token, isForced)
                             .catch(function (err) {

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

@@ -6,3 +6,4 @@ export declare const getStyleTags: (parsedHtml: JSDOM) => HTMLLinkElement[];
 export declare const getFaviconTags: (parsedHtml: JSDOM) => HTMLLinkElement[];
 export declare const getImgTags: (parsedHtml: JSDOM) => HTMLImageElement[];
 export declare const getSourceTags: (parsedHtml: JSDOM) => HTMLSourceElement[];
+export declare const getManifestTags: (parsedHtml: JSDOM) => HTMLLinkElement[];

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSourceTags = exports.getImgTags = exports.getFaviconTags = exports.getStyleTags = exports.getStyleInPageTags = exports.getScriptTags = exports.getSasjsTags = void 0;
+exports.getManifestTags = exports.getSourceTags = exports.getImgTags = exports.getFaviconTags = exports.getStyleTags = exports.getStyleInPageTags = exports.getScriptTags = exports.getSasjsTags = void 0;
 var getSasjsTags = function (parsedHtml) {
     return Array.from(parsedHtml.window.document.getElementsByTagName('sasjs'));
 };
@@ -29,3 +29,7 @@ var getSourceTags = function (parsedHtml) {
     return Array.from(parsedHtml.window.document.getElementsByTagName('source')).filter(function (s) { return s.getAttribute('src'); });
 };
 exports.getSourceTags = getSourceTags;
+var getManifestTags = function (parsedHtml) {
+    return Array.from(parsedHtml.window.document.getElementsByTagName('link')).filter(function (s) { return s.getAttribute('rel') === 'manifest'; });
+};
+exports.getManifestTags = getManifestTags;

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

@@ -76,7 +76,7 @@ var updateSasjsTag_1 = require("./updateSasjsTag");
 var updateAllTags = function (parsedHtml, target, _a) {
     var webSourcePathFull = _a.webSourcePathFull, destinationPath = _a.destinationPath, serverType = _a.serverType, assetPathMap = _a.assetPathMap;
     return __awaiter(void 0, void 0, void 0, function () {
-        var assetsNotFound, sasjsTags, scriptTags, styleExternalTags, styleInPageTags, styleTags, faviconTags, imgTags, sourceTags, srcTags, notFoundErrors;
+        var assetsNotFound, sasjsTags, scriptTags, styleExternalTags, styleInPageTags, styleTags, faviconTags, manifestTags, imgTags, sourceTags, srcTags, notFoundErrors;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -122,6 +122,15 @@ var updateAllTags = function (parsedHtml, target, _a) {
                             assetsNotFound.push(error);
                         }
                     });
+                    manifestTags = (0, getTags_1.getManifestTags)(parsedHtml);
+                    manifestTags.forEach(function (tag) {
+                        try {
+                            (0, updateLinkTag_1.updateLinkTag)(tag, assetPathMap);
+                        }
+                        catch (error) {
+                            assetsNotFound.push(error);
+                        }
+                    });
                     imgTags = (0, getTags_1.getImgTags)(parsedHtml);
                     sourceTags = (0, getTags_1.getSourceTags)(parsedHtml);
                     srcTags = __spreadArray(__spreadArray([], __read(imgTags), false), __read(sourceTags), false);

package/build/index.js

@@ -1,4 +1,3 @@
 #!/usr/bin/env node
 "use strict";
-require = require('esm')(module /*, options*/);
 require('./cli').cli(process.argv);

package/build/utils/config.js

@@ -845,11 +845,7 @@ function getAuthConfig(target) {
                             throw new Error("Client secret was not found.\n        Please make sure that the 'secret' property is set in your local .env file or in the correct target authConfig in your global ~".concat(path_1.default.sep, ".sasjsrc file."));
                     }
                     if (!(0, auth_1.isAccessTokenExpiring)(access_token)) return [3 /*break*/, 8];
-                    sasjs = new node_1.default({
-                        serverUrl: target.serverUrl,
-                        httpsAgentOptions: target.httpsAgentOptions,
-                        serverType: target.serverType
-                    });
+                    sasjs = getSASjs(target);
                     tokens = void 0;
                     if (!(0, auth_1.isRefreshTokenExpiring)(refresh_token)) return [3 /*break*/, 4];
                     return [4 /*yield*/, (0, auth_1.getNewAccessToken)(sasjs, client, secret, target)];
@@ -879,7 +875,7 @@ function getAuthConfig(target) {
 }
 exports.getAuthConfig = getAuthConfig;
 var saveTokens = function (targetName, client, secret, access_token, refresh_token) { return __awaiter(void 0, void 0, void 0, function () {
-    var isLocalTarget, envFileContent, envFilePath, globalConfig, target, targetJson;
+    var isLocalTarget, VERBOSE, envFileContent, envFilePath, globalConfig, target, targetJson;
     var _a, _b, _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -893,7 +889,8 @@ var saveTokens = function (targetName, client, secret, access_token, refresh_tok
             case 1:
                 isLocalTarget = _d.sent();
                 if (!isLocalTarget) return [3 /*break*/, 3];
-                envFileContent = "CLIENT=".concat(client, "\nSECRET=").concat(secret, "\nACCESS_TOKEN=").concat(access_token, "\nREFRESH_TOKEN=").concat(refresh_token, "\n");
+                VERBOSE = process.env.VERBOSE;
+                envFileContent = "CLIENT=".concat(client, "\nSECRET=").concat(secret, "\nACCESS_TOKEN=").concat(access_token, "\nREFRESH_TOKEN=").concat(refresh_token, "\n").concat(VERBOSE ? 'VERBOSE=' + VERBOSE + '\n' : '');
                 envFilePath = path_1.default.join(process.projectDir, ".env.".concat(targetName));
                 return [4 /*yield*/, (0, utils_1.createFile)(envFilePath, envFileContent)];
             case 2:
@@ -983,11 +980,7 @@ function getAccessToken(target, checkIfExpiring) {
                         throw new Error("A valid access token was not found.\nPlease provide an access token in the access_token property in your .env file or as part of the authInfo in your target configuration (sasjsconfig.json).");
                     }
                     if (!(checkIfExpiring && (0, auth_1.isAccessTokenExpiring)(accessToken))) return [3 /*break*/, 7];
-                    sasjs = new node_1.default({
-                        serverUrl: target.serverUrl,
-                        httpsAgentOptions: target.httpsAgentOptions,
-                        serverType: target.serverType
-                    });
+                    sasjs = getSASjs(target);
                     client = target.authConfig && target.authConfig.client
                         ? target.authConfig.client
                         : process.env.CLIENT;

package/build/utils/test.js

@@ -64,7 +64,6 @@ var builtFiles_1 = require("./fileStructures/builtFiles");
 var builtFilesCustom1_1 = require("./fileStructures/builtFilesCustom1");
 var create_1 = require("../commands/create/create");
 var setConstants_1 = require("./setConstants");
-var node_1 = __importDefault(require("@sasjs/adapter/node"));
 var createTestApp = function (parentFolder, appName) { return __awaiter(void 0, void 0, void 0, function () {
     var _a;
     return __generator(this, function (_b) {
@@ -160,12 +159,7 @@ var removeTestServerFolder = function (folderPath, target) { return __awaiter(vo
                 if (target.serverType === types_1.ServerType.Sas9) {
                     return [2 /*return*/];
                 }
-                sasjs = new node_1.default({
-                    serverUrl: target.serverUrl,
-                    httpsAgentOptions: target.httpsAgentOptions,
-                    appLoc: target.appLoc,
-                    serverType: target.serverType
-                });
+                sasjs = (0, config_1.getSASjs)(target);
                 return [4 /*yield*/, (0, config_1.getAccessToken)(target)];
             case 1:
                 accessToken = _a.sent();

package/build/utils/utils.js

@@ -97,10 +97,10 @@ var path_1 = __importDefault(require("path"));
 var ora_1 = __importDefault(require("ora"));
 var axios_1 = __importDefault(require("axios"));
 var utils_1 = require("@sasjs/utils");
-var node_1 = __importDefault(require("@sasjs/adapter/node"));
 var displayResult_1 = require("./displayResult");
 var dotenv_1 = __importDefault(require("dotenv"));
 var adm_zip_1 = __importDefault(require("adm-zip"));
+var config_1 = require("./config");
 function inExistingProject(folderPath) {
     return __awaiter(this, void 0, void 0, function () {
         var packageJsonExists;
@@ -587,14 +587,7 @@ function getAdapterInstance(target) {
     if (!target.serverType) {
         throw new Error("Unable to create SASjs adapter instance: Target ".concat(target.name, " is missing a `serverType`."));
     }
-    var sasjs = new node_1.default({
-        serverUrl: target.serverUrl,
-        serverType: target.serverType,
-        httpsAgentOptions: target.httpsAgentOptions,
-        contextName: target.contextName,
-        useComputeApi: true,
-        debug: process.env.LOG_LEVEL === utils_1.LogLevel.Debug
-    });
+    var sasjs = (0, config_1.getSASjs)(target);
     return sasjs;
 }
 exports.getAdapterInstance = getAdapterInstance;

package/package.json

@@ -11,7 +11,7 @@
     "start:ci": "npm run build && npm run set:permissions",
     "start": "nodemon --watch \"src/**/*\" --exec \"npm run build && npm run set:permissions\"",
     "set:permissions": "node -e \"require('fs').chmodSync('build/index.js', '755')\"",
-    "build": "rimraf build && tsc -p . && npm run copy:files",
+    "build": "npx rimraf build && tsc -p . && npm run copy:files",
     "copy:files": "copyfiles -u 1 ./src/config.json ./build/ && npm run copy:doxy",
     "copy:doxy": "copyfiles -u 2 src/doxy/* build/doxy/",
     "test": "npm run test:mocked && npm run test:server",
@@ -51,14 +51,13 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "4.10.0",
-    "@sasjs/core": "4.46.3",
-    "@sasjs/lint": "2.3.1",
-    "@sasjs/utils": "3.4.0",
+    "@sasjs/adapter": "4.11.3",
+    "@sasjs/core": "4.54.0",
+    "@sasjs/lint": "2.4.3",
+    "@sasjs/utils": "3.5.2",
     "adm-zip": "0.5.10",
     "chalk": "4.1.2",
     "dotenv": "16.0.3",
-    "esm": "3.2.25",
     "find": "0.3.0",
     "js-base64": "3.7.5",
     "jsdom": "22.1.0",
@@ -68,17 +67,15 @@
     "node-graphviz": "0.1.1",
     "node-powershell": "5.0.1",
     "ora": "5.4.1",
-    "rimraf": "3.0.2",
     "shelljs": "0.8.5",
     "ssl-root-cas": "1.3.1",
     "xml": "1.0.1",
     "yargs": "17.6.2"
   },
   "devDependencies": {
-    "@babel/core": "7.21.0",
-    "@babel/preset-env": "7.20.2",
-    "@babel/preset-typescript": "7.21.0",
-    "@compodoc/compodoc": "1.1.21",
+    "@babel/core": "7.22.0",
+    "@babel/preset-env": "7.22.0",
+    "@babel/preset-typescript": "7.22.5",
     "@types/adm-zip": "0.5.0",
     "@types/debug": "4.1.7",
     "@types/find": "0.2.1",
@@ -90,7 +87,7 @@
     "@types/shelljs": "0.8.9",
     "@types/url-parse": "1.4.4",
     "@types/xml": "1.0.6",
-    "babel-jest": "29.4.3",
+    "babel-jest": "29.7.0",
     "copyfiles": "2.4.1",
     "jest": "29.4.3",
     "jest-cli": "29.4.3",
@@ -104,5 +101,5 @@
     "typescript": "4.9.5",
     "util": "0.12.4"
   },
-  "version": "4.11.0"
+  "version": "4.11.2"
 }