@sasjs/cli 3.6.2 → 3.6.6

package/build/commands/db/dbCommand.js

@@ -80,7 +80,7 @@ var DbCommand = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, db_1.buildDB()
+                    case 0: return [4 /*yield*/, (0, db_1.buildDB)()
                             .then(function () {
                             var _a;
                             (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success('DB build completed!');

package/build/commands/db/spec/db.spec.js

@@ -44,12 +44,12 @@ var test_1 = require("../../../utils/test");
 var utils_1 = require("@sasjs/utils");
 var db_1 = require("../db");
 describe("sasjs db", function () {
-    var timestamp = utils_1.generateTimestamp();
-    var appName = "test-app-DB-" + timestamp;
+    var timestamp = (0, utils_1.generateTimestamp)();
+    var appName = "test-app-DB-".concat(timestamp);
     beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, test_1.createTestApp(__dirname, appName)];
+                case 0: return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
                 case 1:
                     _a.sent();
                     return [2 /*return*/];
@@ -59,7 +59,7 @@ describe("sasjs db", function () {
     afterAll(function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, test_1.removeTestApp(__dirname, appName)];
+                case 0: return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, appName)];
                 case 1:
                     _a.sent();
                     return [2 /*return*/];
@@ -69,10 +69,10 @@ describe("sasjs db", function () {
     it("should create db folder", function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, expect(db_1.buildDB()).toResolve()];
+                case 0: return [4 /*yield*/, expect((0, db_1.buildDB)()).toResolve()];
                 case 1:
                     _a.sent();
-                    return [4 /*yield*/, test_1.verifyStep('db')];
+                    return [4 /*yield*/, (0, test_1.verifyStep)('db')];
                 case 2:
                     _a.sent();
                     return [2 /*return*/];
@@ -82,10 +82,10 @@ describe("sasjs db", function () {
     it("should throw an error when the db folder does not exist", function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, utils_1.deleteFolder(path_1.default.join(__dirname, appName, 'sasjs', 'db'))];
+                case 0: return [4 /*yield*/, (0, utils_1.deleteFolder)(path_1.default.join(__dirname, appName, 'sasjs', 'db'))];
                 case 1:
                     _a.sent();
-                    return [4 /*yield*/, expect(db_1.buildDB()).rejects.toThrow('no such file or directory')];
+                    return [4 /*yield*/, expect((0, db_1.buildDB)()).rejects.toThrow('no such file or directory')];
                 case 2:
                     _a.sent();
                     return [2 /*return*/];

package/build/commands/db/spec/dbCommand.spec.js

@@ -70,10 +70,14 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var logger_1 = require("@sasjs/utils/logger");
@@ -86,7 +90,7 @@ describe('DbCommand', function () {
         setupMocks();
     });
     it('should parse a sasjs db command', function () {
-        var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['db']);
+        var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['db'], false);
         var command = new dbCommand_1.DbCommand(args);
         expect(command.name).toEqual('db');
     });
@@ -95,7 +99,7 @@ describe('DbCommand', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['db']);
+                    args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['db'], false);
                     command = new dbCommand_1.DbCommand(args);
                     return [4 /*yield*/, command.execute()];
                 case 1:
@@ -112,7 +116,7 @@ describe('DbCommand', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['db']);
+                    args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['db'], false);
                     jest
                         .spyOn(dbModule, 'buildDB')
                         .mockImplementation(function () { return Promise.reject(new Error('Test Error')); });

package/build/commands/deploy/compileBuildDeployCommand.js

@@ -85,7 +85,7 @@ var CompileBuildDeployCommand = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.getTargetInfo()];
                     case 1:
                         _d = _e.sent(), target = _d.target, isLocal = _d.isLocal;
-                        return [4 /*yield*/, compile_1.compile(target, true)
+                        return [4 /*yield*/, (0, compile_1.compile)(target, true)
                                 .then(function () { return command_1.ReturnCode.Success; })
                                 .catch(function (err) {
                                 var _a;
@@ -98,8 +98,8 @@ var CompileBuildDeployCommand = /** @class */ (function (_super) {
                             return [2 /*return*/, returnCode];
                         }
                         buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
-                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Services have been successfully compiled!\nThe compile output is located in the " + buildDestinationFolder + " directory.");
-                        return [4 /*yield*/, build_1.build(target)
+                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Services have been successfully compiled!\nThe compile output is located in the ".concat(buildDestinationFolder, " directory."));
+                        return [4 /*yield*/, (0, build_1.build)(target)
                                 .then(function () { return command_1.ReturnCode.Success; })
                                 .catch(function (err) {
                                 var _a;
@@ -111,8 +111,8 @@ var CompileBuildDeployCommand = /** @class */ (function (_super) {
                         if (returnCode === command_1.ReturnCode.InternalError) {
                             return [2 /*return*/, returnCode];
                         }
-                        (_b = process.logger) === null || _b === void 0 ? void 0 : _b.success("Services have been successfully built!\nThe build output is located in the " + buildDestinationFolder + " directory.");
-                        return [4 /*yield*/, deploy_1.deploy(target, isLocal)
+                        (_b = process.logger) === null || _b === void 0 ? void 0 : _b.success("Services have been successfully built!\nThe build output is located in the ".concat(buildDestinationFolder, " directory."));
+                        return [4 /*yield*/, (0, deploy_1.deploy)(target, isLocal)
                                 .then(function () { return command_1.ReturnCode.Success; })
                                 .catch(function (err) {
                                 var _a;
@@ -124,7 +124,7 @@ var CompileBuildDeployCommand = /** @class */ (function (_super) {
                         if (returnCode === command_1.ReturnCode.InternalError) {
                             return [2 /*return*/, returnCode];
                         }
-                        (_c = process.logger) === null || _c === void 0 ? void 0 : _c.success("Services have been successfully deployed to " + target.serverUrl);
+                        (_c = process.logger) === null || _c === void 0 ? void 0 : _c.success("Services have been successfully deployed to ".concat(target.serverUrl));
                         return [2 /*return*/, returnCode];
                 }
             });

package/build/commands/deploy/deploy.d.ts

@@ -1,3 +1,10 @@
 import SASjs from '@sasjs/adapter/node';
 import { Target } from '@sasjs/utils';
+/**
+ * Deploys app to serverUrl/appLoc mentioned in specified target.
+ * @param {Target} target- the target having deploy configuration.
+ * @param {boolean} isLocal- flag indicating if specified target is
+ * from local sasjsconfig or global sasjsconfig file.
+ * @param {object} sasjs - optional configuration object of SAS adapter.
+ */
 export declare function deploy(target: Target, isLocal: boolean, sasjs?: SASjs): Promise<void>;

package/build/commands/deploy/deploy.js

@@ -49,6 +49,13 @@ var utils_2 = require("@sasjs/utils");
 var file_1 = require("../../utils/file");
 var getDeployScripts_1 = require("./internal/getDeployScripts");
 var deployToSasViyaWithServicePack_1 = require("../shared/deployToSasViyaWithServicePack");
+/**
+ * Deploys app to serverUrl/appLoc mentioned in specified target.
+ * @param {Target} target- the target having deploy configuration.
+ * @param {boolean} isLocal- flag indicating if specified target is
+ * from local sasjsconfig or global sasjsconfig file.
+ * @param {object} sasjs - optional configuration object of SAS adapter.
+ */
 function deploy(target, isLocal, sasjs) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     return __awaiter(this, void 0, void 0, function () {
@@ -60,10 +67,10 @@ function deploy(target, isLocal, sasjs) {
                     if (!(target.serverType === utils_2.ServerType.SasViya &&
                         ((_a = target.deployConfig) === null || _a === void 0 ? void 0 : _a.deployServicePack))) return [3 /*break*/, 2];
                     appLoc = target.appLoc.replace(/\ /g, '%20');
-                    (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Deploying service pack to " + target.serverUrl + " at location " + appLoc + " .");
+                    (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Deploying service pack to ".concat(target.serverUrl, " at location ").concat(appLoc, " ."));
                     buildDestinationFolder_1 = process.sasjsConstants.buildDestinationFolder;
-                    finalFilePathJSON = path_1.default.join(buildDestinationFolder_1, target.name + ".json");
-                    return [4 /*yield*/, deployToSasViyaWithServicePack_1.deployToSasViyaWithServicePack(finalFilePathJSON, target, isLocal, true)];
+                    finalFilePathJSON = path_1.default.join(buildDestinationFolder_1, "".concat(target.name, ".json"));
+                    return [4 /*yield*/, (0, deployToSasViyaWithServicePack_1.deployToSasViyaWithServicePack)(finalFilePathJSON, target, isLocal, true)];
                 case 1:
                     jsonObject = _k.sent();
                     webIndexFileName = (_f = (_e = (_d = (_c = jsonObject === null || jsonObject === void 0 ? void 0 : jsonObject.members.find(function (member) {
@@ -71,10 +78,10 @@ function deploy(target, isLocal, sasjs) {
                     })) === null || _c === void 0 ? void 0 : _c.members) === null || _d === void 0 ? void 0 : _d.find(function (member) { return (member === null || member === void 0 ? void 0 : member.type) === 'file'; })) === null || _e === void 0 ? void 0 : _e.name) !== null && _f !== void 0 ? _f : '';
                     (_g = process.logger) === null || _g === void 0 ? void 0 : _g.success('Build pack has been successfully deployed.');
                     (_h = process.logger) === null || _h === void 0 ? void 0 : _h.success(target.serverType === utils_2.ServerType.SasViya && webIndexFileName
-                        ? target.serverUrl + "/SASJobExecution?_file=" + appLoc + "/services/" + webIndexFileName + "&_debug=2"
-                        : target.serverUrl + "/SASJobExecution?_folder=" + appLoc);
+                        ? "".concat(target.serverUrl, "/SASJobExecution?_file=").concat(appLoc, "/services/").concat(webIndexFileName, "&_debug=2")
+                        : "".concat(target.serverUrl, "/SASJobExecution?_folder=").concat(appLoc));
                     _k.label = 2;
-                case 2: return [4 /*yield*/, getDeployScripts_1.getDeployScripts(target)];
+                case 2: return [4 /*yield*/, (0, getDeployScripts_1.getDeployScripts)(target)];
                 case 3:
                     deployScripts = _k.sent();
                     if (deployScripts.length === 0 && !((_j = target.deployConfig) === null || _j === void 0 ? void 0 : _j.deployServicePack)) {
@@ -83,48 +90,49 @@ function deploy(target, isLocal, sasjs) {
                     buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
                     logFilePath = buildDestinationFolder;
                     if (!(target.serverType === utils_2.ServerType.Sasjs)) return [3 /*break*/, 5];
-                    return [4 /*yield*/, deployToSasjs(target, sasjs)];
+                    return [4 /*yield*/, deployToSasjs(target, isLocal, sasjs)];
                 case 4:
                     _k.sent();
                     return [3 /*break*/, 7];
-                case 5: return [4 /*yield*/, utils_2.asyncForEach(deployScripts, function (deployScript) { return __awaiter(_this, void 0, void 0, function () {
-                        var deployScriptPath, deployScriptFile, linesToExecute, streamConfig, logPath;
+                case 5: return [4 /*yield*/, (0, utils_2.asyncForEach)(deployScripts, function (deployScript) { return __awaiter(_this, void 0, void 0, function () {
+                        var deployScriptPath, deployScriptContent, linesToExecute, streamConfig, deployScriptName, logPath;
                         var _a, _b, _c;
                         return __generator(this, function (_d) {
                             switch (_d.label) {
                                 case 0:
-                                    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)
+                                    deployScriptPath = (0, utils_2.getAbsolutePath)(deployScript, process.projectDir);
+                                    if (!(0, file_1.isSasFile)(deployScript)) return [3 /*break*/, 7];
+                                    (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Processing SAS file ".concat(path_1.default.basename(deployScript), " ..."));
+                                    return [4 /*yield*/, (0, utils_2.readFile)(deployScriptPath)
                                         // split into lines
                                     ];
                                 case 1:
-                                    deployScriptFile = _d.sent();
-                                    linesToExecute = deployScriptFile
+                                    deployScriptContent = _d.sent();
+                                    linesToExecute = deployScriptContent
                                         .replace(/\r\n/g, '\n')
                                         .split('\n');
-                                    return [4 /*yield*/, config_1.getStreamConfig(target)];
+                                    return [4 /*yield*/, (0, config_1.getStreamConfig)(target)];
                                 case 2:
                                     streamConfig = _d.sent();
+                                    deployScriptName = path_1.default.basename(deployScript);
                                     if (!(target.serverType === utils_2.ServerType.SasViya)) return [3 /*break*/, 4];
-                                    return [4 /*yield*/, deployToSasViya(deployScript, target, isLocal, linesToExecute, logFilePath, streamConfig)];
+                                    return [4 /*yield*/, deployToSasViya(deployScriptName, target, isLocal, linesToExecute, logFilePath, streamConfig)];
                                 case 3:
                                     _d.sent();
                                     return [3 /*break*/, 6];
-                                case 4: return [4 /*yield*/, deployToSas9(deployScript, target, linesToExecute, logFilePath, streamConfig)];
+                                case 4: return [4 /*yield*/, deployToSas9(deployScriptName, target, linesToExecute, logFilePath, streamConfig)];
                                 case 5:
                                     _d.sent();
                                     _d.label = 6;
                                 case 6: return [3 /*break*/, 9];
                                 case 7:
-                                    if (!file_1.isShellScript(deployScript)) return [3 /*break*/, 9];
-                                    (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Executing shell script " + deployScript + " ...");
-                                    logPath = path_1.default.join(process.projectDir, 'sasjsbuild', path_1.default.basename(deployScript).replace('.sh', '') + ".log");
-                                    return [4 /*yield*/, utils_1.executeShellScript(deployScriptPath, logPath)];
+                                    if (!(0, file_1.isShellScript)(deployScript)) return [3 /*break*/, 9];
+                                    (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Executing shell script ".concat(deployScript, " ..."));
+                                    logPath = path_1.default.join(process.projectDir, 'sasjsbuild', "".concat(path_1.default.basename(deployScript).replace('.sh', ''), ".log"));
+                                    return [4 /*yield*/, (0, utils_1.executeShellScript)(deployScriptPath, logPath)];
                                 case 8:
                                     _d.sent();
-                                    (_c = process.logger) === null || _c === void 0 ? void 0 : _c.success("Shell script execution completed! Log is here: " + logPath);
+                                    (_c = process.logger) === null || _c === void 0 ? void 0 : _c.success("Shell script execution completed! Log is here: ".concat(logPath));
                                     _d.label = 9;
                                 case 9: return [2 /*return*/];
                             }
@@ -139,6 +147,14 @@ function deploy(target, isLocal, sasjs) {
     });
 }
 exports.deploy = deploy;
+/**
+ * Returns configuration object of SAS Adapter and authentication configuration
+ * @param {Target} target- the target to get auth configuration from.
+ * @param {boolean} isLocal- flag indicating if specified target is
+ * from local sasjsconfig or global sasjsconfig file.
+ * @returns an object containing a SAS Adapter configuration object `sasjs`
+ * and auth configuration `authConfig`.
+ */
 function getSASjsAndAuthConfig(target, isLocal) {
     return __awaiter(this, void 0, void 0, function () {
         var sasjs, authConfig, e_1;
@@ -156,13 +172,13 @@ function getSASjsAndAuthConfig(target, isLocal) {
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, config_1.getAuthConfig(target)];
+                    return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
                 case 2:
                     authConfig = _a.sent();
                     return [3 /*break*/, 4];
                 case 3:
                     e_1 = _a.sent();
-                    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");
+                    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"));
                 case 4: return [2 /*return*/, {
                         sasjs: sasjs,
                         authConfig: authConfig
@@ -171,14 +187,26 @@ function getSASjsAndAuthConfig(target, isLocal) {
         });
     });
 }
-function deployToSasViya(deployScript, target, isLocal, linesToExecute, logFilePath, streamConfig) {
+/**
+ * Deploys app to `SASVIYA` server through deployScript.
+ * @param {string} deployScriptName- name of deploy script.
+ * @param {Target} target- the target having deploy configuration.
+ * @param {boolean} isLocal- flag indicating if specified target is
+ * from local sasjsconfig or global sasjsconfig file.
+ * @param {string[]} linesToExecute - array of SAS code lines of deploy script to execute.
+ * @param {string} logFolder - optional path to log folder,
+ * log file name will be <deploy-script-name>.log
+ * @param {object} streamConfig - optional configuration object of StreamConfig
+ * for printing web app url on console.
+ */
+function deployToSasViya(deployScriptName, target, isLocal, linesToExecute, logFolder, streamConfig) {
     var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function () {
         var contextName, _f, sasjs, authConfig, executionResult, log, appLoc, webAppStreamUrl;
         return __generator(this, function (_g) {
             switch (_g.label) {
                 case 0:
-                    (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Sending " + path_1.default.basename(deployScript) + " to SAS server for execution.");
+                    (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Sending ".concat(deployScriptName, " to SAS server for execution."));
                     contextName = target.contextName;
                     if (!contextName) {
                         throw new Error('Compute Context Name is required for SAS Viya deployments.\n Please ensure that `contextName` is present in your build target configuration or in your .env file, and try again.\n');
@@ -186,7 +214,7 @@ function deployToSasViya(deployScript, target, isLocal, linesToExecute, logFileP
                     return [4 /*yield*/, getSASjsAndAuthConfig(target, isLocal)];
                 case 1:
                     _f = _g.sent(), sasjs = _f.sasjs, authConfig = _f.authConfig;
-                    return [4 /*yield*/, sasjs.executeScriptSASViya(path_1.default.basename(deployScript), linesToExecute, contextName, authConfig)];
+                    return [4 /*yield*/, sasjs.executeScriptSASViya(deployScriptName, linesToExecute, contextName, authConfig)];
                 case 2:
                     executionResult = _g.sent();
                     try {
@@ -197,29 +225,40 @@ function deployToSasViya(deployScript, target, isLocal, linesToExecute, logFileP
                             : JSON.stringify(executionResult.log).replace(/\\n/g, os_1.default.EOL);
                     }
                     catch (e) {
-                        (_b = process.logger) === null || _b === void 0 ? void 0 : _b.error("An error occurred when parsing the execution response: " + e.message);
+                        (_b = process.logger) === null || _b === void 0 ? void 0 : _b.error("An error occurred when parsing the execution response: ".concat(e.message));
                         log = executionResult;
                     }
-                    if (!logFilePath) return [3 /*break*/, 4];
-                    return [4 /*yield*/, utils_2.createFile(path_1.default.join(logFilePath, path_1.default.basename(deployScript).replace('.sas', '') + ".log"), log)];
+                    if (!logFolder) return [3 /*break*/, 4];
+                    return [4 /*yield*/, (0, utils_2.createFile)(path_1.default.join(logFolder, "".concat(deployScriptName.replace('.sas', ''), ".log")), log)];
                 case 3:
                     _g.sent();
-                    (_c = process.logger) === null || _c === void 0 ? void 0 : _c.success("Deployment completed! Log is available at " + path_1.default.join(logFilePath, path_1.default.basename(deployScript).replace('.sas', '') + ".log"));
-                    if (streamConfig === null || streamConfig === void 0 ? void 0 : streamConfig.streamWeb) {
-                        appLoc = target.appLoc.replace(/\ /g, '%20');
-                        webAppStreamUrl = target.serverUrl + "/SASJobExecution?_FILE=" + appLoc + "/services/" + streamConfig.streamServiceName + ".html&_debug=2";
-                        (_d = process.logger) === null || _d === void 0 ? void 0 : _d.info("Web app is available at " + webAppStreamUrl);
-                    }
+                    (_c = process.logger) === null || _c === void 0 ? void 0 : _c.success("Deployment completed! Log is available at ".concat(path_1.default.join(logFolder, "".concat(deployScriptName.replace('.sas', ''), ".log"))));
                     return [3 /*break*/, 5];
                 case 4:
-                    (_e = process.logger) === null || _e === void 0 ? void 0 : _e.error('Unable to create log file.');
+                    (_d = process.logger) === null || _d === void 0 ? void 0 : _d.error('Unable to create log file.');
                     _g.label = 5;
-                case 5: return [2 /*return*/];
+                case 5:
+                    if (streamConfig === null || streamConfig === void 0 ? void 0 : streamConfig.streamWeb) {
+                        appLoc = target.appLoc.replace(/\ /g, '%20');
+                        webAppStreamUrl = "".concat(target.serverUrl, "/SASJobExecution?_FILE=").concat(appLoc, "/services/").concat(streamConfig.streamServiceName, ".html&_debug=2");
+                        (_e = process.logger) === null || _e === void 0 ? void 0 : _e.info("Web app is available at ".concat(webAppStreamUrl));
+                    }
+                    return [2 /*return*/];
             }
         });
     });
 }
-function deployToSas9(deployScript, target, linesToExecute, logFilePath, streamConfig) {
+/**
+ * Deploys app to `SAS9` server through deployScript.
+ * @param {string} deployScriptName- name of deploy script.
+ * @param {Target} target- the target having deploy configuration.
+ * @param {string[]} linesToExecute - array of SAS code lines of deploy script to execute.
+ * @param {string} logFolder - optional path to log folder,
+ * log file name will be <deploy-script-name>.log
+ * @param {object} streamConfig - optional configuration object of StreamConfig
+ * for printing web app url on console.
+ */
+function deployToSas9(deployScriptName, target, linesToExecute, logFolder, streamConfig) {
     var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function () {
         var username, password, sas9CredentialsError, sasjs, executionResult, appLoc, webAppStreamUrl;
@@ -238,7 +277,7 @@ function deployToSas9(deployScript, target, linesToExecute, logFilePath, streamC
                         sas9CredentialsError = process.sasjsConstants.sas9CredentialsError;
                         throw new Error(sas9CredentialsError);
                     }
-                    password = utils_2.decodeFromBase64(password);
+                    password = (0, utils_2.decodeFromBase64)(password);
                     sasjs = new node_1.default({
                         serverUrl: target.serverUrl,
                         httpsAgentOptions: target.httpsAgentOptions,
@@ -251,64 +290,75 @@ function deployToSas9(deployScript, target, linesToExecute, logFilePath, streamC
                             var _a;
                             (_a = process.logger) === null || _a === void 0 ? void 0 : _a.log(formatErrorString(err));
                             if (err && err.errorCode === 404) {
-                                utils_1.displaySasjsRunnerError(username);
+                                (0, utils_1.displaySasjsRunnerError)(username);
                             }
                         })];
                 case 1:
                     executionResult = _e.sent();
-                    if (!!executionResult) return [3 /*break*/, 2];
-                    (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error getting execution log');
-                    return [3 /*break*/, 5];
+                    if (!executionResult) return [3 /*break*/, 5];
+                    if (!logFolder) return [3 /*break*/, 3];
+                    return [4 /*yield*/, (0, utils_2.createFile)(path_1.default.join(logFolder, "".concat(deployScriptName.replace('.sas', ''), ".log")), executionResult !== null && executionResult !== void 0 ? executionResult : '')];
                 case 2:
-                    if (!logFilePath) return [3 /*break*/, 4];
-                    return [4 /*yield*/, utils_2.createFile(path_1.default.join(logFilePath, path_1.default.basename(deployScript).replace('.sas', '') + ".log"), executionResult !== null && executionResult !== void 0 ? executionResult : '')];
-                case 3:
                     _e.sent();
-                    (_b = process.logger) === null || _b === void 0 ? void 0 : _b.success("Deployment completed! Log is available at " + path_1.default.join(logFilePath, path_1.default.basename(deployScript).replace('.sas', '') + ".log"));
+                    (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Deployment completed! Log is available at ".concat(path_1.default.join(logFolder, "".concat(deployScriptName.replace('.sas', ''), ".log"))));
+                    return [3 /*break*/, 4];
+                case 3:
+                    (_b = process.logger) === null || _b === void 0 ? void 0 : _b.error('Unable to create log file.');
+                    _e.label = 4;
+                case 4:
                     if (streamConfig === null || streamConfig === void 0 ? void 0 : streamConfig.streamWeb) {
                         appLoc = target.appLoc.replace(/\ /g, '%20');
-                        webAppStreamUrl = target.serverUrl + "/SASStoredProcess/?_PROGRAM=" + appLoc + "/services/" + streamConfig.streamServiceName;
-                        (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info("Web app is available at " + webAppStreamUrl);
+                        webAppStreamUrl = "".concat(target.serverUrl, "/SASStoredProcess/?_PROGRAM=").concat(appLoc, "/services/").concat(streamConfig.streamServiceName);
+                        (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info("Web app is available at ".concat(webAppStreamUrl));
                     }
-                    return [3 /*break*/, 5];
-                case 4:
-                    (_d = process.logger) === null || _d === void 0 ? void 0 : _d.error('Unable to create log file.');
-                    _e.label = 5;
-                case 5: return [2 /*return*/];
+                    return [3 /*break*/, 6];
+                case 5:
+                    (_d = process.logger) === null || _d === void 0 ? void 0 : _d.error('Error getting execution log');
+                    _e.label = 6;
+                case 6: return [2 /*return*/];
             }
         });
     });
 }
-function deployToSasjs(target, sasjs) {
+/**
+ * Deploys app to `SASJS` server.
+ * @param {Target} target- the target having deploy configuration.
+ * @param {boolean} isLocal- flag indicating if specified target is
+ * from local sasjsconfig or global sasjsconfig file.
+ * @param {object} sasjs - optional configuration object of SAS adapter.
+ */
+function deployToSasjs(target, isLocal, sasjs) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
-        var buildDestinationFolder, finalFilePathJSON, jsonContent, payload, result;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var buildDestinationFolder, finalFilePathJSON, jsonContent, payload, authConfig, result;
+        var _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
                     buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
-                    finalFilePathJSON = path_1.default.join(buildDestinationFolder, target.name + ".json");
-                    return [4 /*yield*/, utils_2.readFile(finalFilePathJSON)];
+                    finalFilePathJSON = path_1.default.join(buildDestinationFolder, "".concat(target.name, ".json"));
+                    return [4 /*yield*/, (0, utils_2.readFile)(finalFilePathJSON)];
                 case 1:
-                    jsonContent = _c.sent();
+                    jsonContent = _d.sent();
                     payload = JSON.parse(jsonContent);
-                    sasjs = sasjs
-                        ? sasjs
-                        : new node_1.default({
-                            serverType: target.serverType,
-                            serverUrl: target.serverUrl,
-                            appLoc: target.appLoc
-                        });
-                    return [4 /*yield*/, sasjs.deployToSASjs(payload).catch(function (err) {
-                            var _a;
-                            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error(err);
-                        })];
+                    if (!!sasjs) return [3 /*break*/, 3];
+                    ;
+                    return [4 /*yield*/, getSASjsAndAuthConfig(target, isLocal)];
                 case 2:
-                    result = _c.sent();
+                    (_c = _d.sent(), sasjs = _c.sasjs, authConfig = _c.authConfig);
+                    _d.label = 3;
+                case 3: return [4 /*yield*/, sasjs
+                        .deployToSASjs(payload, undefined, authConfig)
+                        .catch(function (err) {
+                        var _a;
+                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error(err);
+                    })];
+                case 4:
+                    result = _d.sent();
                     if ((result === null || result === void 0 ? void 0 : result.status) === 'failure') {
                         (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error(result.message);
                         if (result.example) {
-                            (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Payload example:\n" + JSON.stringify(result.example, null, 2));
+                            (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Payload example:\n".concat(JSON.stringify(result.example, null, 2)));
                         }
                     }
                     return [2 /*return*/];
@@ -324,11 +374,11 @@ function deployToSasjs(target, sasjs) {
 function formatErrorString(error) {
     var _a, _b, _c, _d;
     var err = '';
-    err += error.stack + "\n";
-    err += "url: " + (((_a = error.config) === null || _a === void 0 ? void 0 : _a.url) ? removePasswordFromUrl(error.config.url) : '') + "\n";
-    err += "method: " + (((_b = error.config) === null || _b === void 0 ? void 0 : _b.method) ? error.config.method : '') + "\n";
-    err += "headers: " + (((_c = error.config) === null || _c === void 0 ? void 0 : _c.headers) ? error.config.headers : '') + "\n";
-    err += "data: " + (((_d = error.response) === null || _d === void 0 ? void 0 : _d.data) ? error.response.data : '');
+    err += "".concat(error.stack, "\n");
+    err += "url: ".concat(((_a = error.config) === null || _a === void 0 ? void 0 : _a.url) ? removePasswordFromUrl(error.config.url) : '', "\n");
+    err += "method: ".concat(((_b = error.config) === null || _b === void 0 ? void 0 : _b.method) ? error.config.method : '', "\n");
+    err += "headers: ".concat(((_c = error.config) === null || _c === void 0 ? void 0 : _c.headers) ? error.config.headers : '', "\n");
+    err += "data: ".concat(((_d = error.response) === null || _d === void 0 ? void 0 : _d.data) ? error.response.data : '');
     return err;
 }
 /**

package/build/commands/deploy/deployCommand.js

@@ -82,10 +82,10 @@ var DeployCommand = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.getTargetInfo()];
                     case 1:
                         _a = _b.sent(), target = _a.target, isLocal = _a.isLocal;
-                        return [4 /*yield*/, deploy_1.deploy(target, isLocal)
+                        return [4 /*yield*/, (0, deploy_1.deploy)(target, isLocal)
                                 .then(function () {
                                 var _a;
-                                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Services have been successfully deployed to " + target.serverUrl + ".");
+                                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Services have been successfully deployed to ".concat(target.serverUrl, "."));
                                 return command_1.ReturnCode.Success;
                             })
                                 .catch(function (err) {

package/build/commands/deploy/internal/getDeployScripts.js

@@ -51,10 +51,14 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -72,19 +76,19 @@ function getDeployScripts(target) {
             switch (_f.label) {
                 case 0:
                     _e = process.sasjsConstants, buildSourceFolder = _e.buildSourceFolder, buildDestinationFolder = _e.buildDestinationFolder;
-                    return [4 /*yield*/, config_1.getConfiguration(path_1.default.join(buildSourceFolder, 'sasjs', 'sasjsconfig.json'))];
+                    return [4 /*yield*/, (0, config_1.getConfiguration)(path_1.default.join(buildSourceFolder, 'sasjs', 'sasjsconfig.json'))];
                 case 1:
                     configuration = _f.sent();
-                    allDeployScripts = __spreadArray([], __read((((_a = configuration === null || configuration === void 0 ? void 0 : configuration.deployConfig) === null || _a === void 0 ? void 0 : _a.deployScripts) || [])));
-                    allDeployScripts = __spreadArray(__spreadArray([], __read(allDeployScripts)), __read((((_b = target.deployConfig) === null || _b === void 0 ? void 0 : _b.deployScripts) || [])));
+                    allDeployScripts = __spreadArray([], __read((((_a = configuration === null || configuration === void 0 ? void 0 : configuration.deployConfig) === null || _a === void 0 ? void 0 : _a.deployScripts) || [])), false);
+                    allDeployScripts = __spreadArray(__spreadArray([], __read(allDeployScripts), false), __read((((_b = target.deployConfig) === null || _b === void 0 ? void 0 : _b.deployScripts) || [])), false);
                     if (!!((_c = target.deployConfig) === null || _c === void 0 ? void 0 : _c.deployServicePack) &&
                         target.serverType === utils_1.ServerType.Sas9) {
-                        buildOutputFileName = ((_d = target.buildConfig) === null || _d === void 0 ? void 0 : _d.buildOutputFileName) || target.name + ".sas";
+                        buildOutputFileName = ((_d = target.buildConfig) === null || _d === void 0 ? void 0 : _d.buildOutputFileName) || "".concat(target.name, ".sas");
                         deployScriptPath = path_1.default.join(buildDestinationFolder, buildOutputFileName);
-                        allDeployScripts = __spreadArray(__spreadArray([], __read(allDeployScripts)), [deployScriptPath]);
+                        allDeployScripts = __spreadArray(__spreadArray([], __read(allDeployScripts), false), [deployScriptPath], false);
                     }
                     allDeployScripts = allDeployScripts.filter(function (d) { return !!d; });
-                    return [2 /*return*/, __spreadArray([], __read(new Set(allDeployScripts)))];
+                    return [2 /*return*/, __spreadArray([], __read(new Set(allDeployScripts)), false)];
             }
         });
     });