@sasjs/cli 3.19.6 → 3.20.0

package/build/commands/deploy/deploy.js

@@ -42,7 +42,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deploy = void 0;
 var path_1 = __importDefault(require("path"));
 var os_1 = __importDefault(require("os"));
-var node_1 = __importDefault(require("@sasjs/adapter/node"));
+var node_1 = require("@sasjs/adapter/node");
 var config_1 = require("../../utils/config");
 var utils_1 = require("../../utils/utils");
 var utils_2 = require("@sasjs/utils");
@@ -94,7 +94,7 @@ function deploy(target, isLocal, sasjs) {
                 case 4:
                     streamConfig = _j.sent();
                     if (!(target.serverType === utils_2.ServerType.Sasjs)) return [3 /*break*/, 6];
-                    return [4 /*yield*/, deployToSasjs(target, sasjs, streamConfig)];
+                    return [4 /*yield*/, deployToSasjs(target, streamConfig)];
                 case 5:
                     _j.sent();
                     return [3 /*break*/, 8];
@@ -117,7 +117,7 @@ function deploy(target, isLocal, sasjs) {
                                         .split('\n');
                                     deployScriptName = path_1.default.basename(deployScript);
                                     if (!(target.serverType === utils_2.ServerType.SasViya)) return [3 /*break*/, 3];
-                                    return [4 /*yield*/, deployToSasViya(deployScriptName, target, isLocal, linesToExecute, logFilePath, streamConfig)];
+                                    return [4 /*yield*/, deployToSasViya(deployScriptName, target, linesToExecute, logFilePath, streamConfig)];
                                 case 2:
                                     _e.sent();
                                     return [3 /*break*/, 5];
@@ -151,59 +151,17 @@ 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;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    sasjs = new node_1.default({
-                        serverUrl: target.serverUrl,
-                        appLoc: target.appLoc,
-                        serverType: target.serverType,
-                        httpsAgentOptions: target.httpsAgentOptions,
-                        debug: true,
-                        useComputeApi: true
-                    });
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, 3, , 4]);
-                    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".concat(isLocal ? ".".concat(target.name) : '', " file:\nCLIENT, SECRET, ACCESS_TOKEN, REFRESH_TOKEN"));
-                case 4: return [2 /*return*/, {
-                        sasjs: sasjs,
-                        authConfig: authConfig
-                    }];
-            }
-        });
-    });
-}
 /**
  * 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} 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 deployToSasViya(deployScriptName, target, isLocal, linesToExecute, logFolder, streamConfig) {
+function deployToSasViya(deployScriptName, target, 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;
@@ -215,11 +173,16 @@ function deployToSasViya(deployScriptName, target, isLocal, linesToExecute, logF
                     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');
                     }
-                    return [4 /*yield*/, getSASjsAndAuthConfig(target, isLocal)];
+                    return [4 /*yield*/, (0, config_1.getSASjsAndAuthConfig)(target)];
                 case 1:
                     _f = _g.sent(), sasjs = _f.sasjs, authConfig = _f.authConfig;
                     return [4 /*yield*/, sasjs
-                            .executeScriptSASViya(deployScriptName, linesToExecute, contextName, authConfig)
+                            .executeScript({
+                            fileName: deployScriptName,
+                            linesOfCode: linesToExecute,
+                            contextName: contextName,
+                            authConfig: authConfig
+                        })
                             .catch(function (err) {
                             process.logger.error('executeScriptSASViya Error', err);
                         })];
@@ -258,8 +221,8 @@ function deployToSasViya(deployScriptName, target, isLocal, linesToExecute, logF
 }
 /**
  * Deploys app to `SAS9` server through deployScript.
- * @param {string} deployScriptName- name of deploy script.
- * @param {Target} target- the target having deploy configuration.
+ * @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
@@ -269,43 +232,31 @@ function deployToSasViya(deployScriptName, target, isLocal, linesToExecute, logF
 function deployToSas9(deployScriptName, target, linesToExecute, logFolder, streamConfig) {
     var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function () {
-        var username, password, sas9CredentialsError, sasjs, completedWithError, executionResult, logContent, logFilePath, appLoc, webAppStreamUrl;
-        return __generator(this, function (_f) {
-            switch (_f.label) {
-                case 0:
-                    if (target.authConfigSas9) {
-                        username = target.authConfigSas9.userName;
-                        password = target.authConfigSas9.password;
-                    }
-                    else {
-                        username = process.env.SAS_USERNAME;
-                        password = process.env.SAS_PASSWORD;
-                    }
-                    if (!username || !password) {
-                        sas9CredentialsError = process.sasjsConstants.sas9CredentialsError;
-                        throw new Error(sas9CredentialsError);
-                    }
-                    password = (0, utils_2.decodeFromBase64)(password);
-                    sasjs = new node_1.default({
-                        serverUrl: target.serverUrl,
-                        httpsAgentOptions: target.httpsAgentOptions,
-                        appLoc: target.appLoc,
-                        serverType: target.serverType
-                    });
+        var _f, sasjs, authConfigSas9, userName, password, completedWithError, executionResult, logContent, logFilePath, appLoc, webAppStreamUrl;
+        return __generator(this, function (_g) {
+            switch (_g.label) {
+                case 0: return [4 /*yield*/, (0, config_1.getSASjsAndAuthConfig)(target)];
+                case 1:
+                    _f = _g.sent(), sasjs = _f.sasjs, authConfigSas9 = _f.authConfigSas9;
+                    userName = authConfigSas9.userName;
+                    password = (0, utils_2.decodeFromBase64)(authConfigSas9.userName);
                     completedWithError = false;
                     return [4 /*yield*/, sasjs
-                            .executeScriptSAS9(linesToExecute, username, password)
+                            .executeScript({
+                            linesOfCode: linesToExecute,
+                            authConfigSas9: { userName: userName, password: password }
+                        })
                             .catch(function (err) {
                             var _a;
                             (_a = process.logger) === null || _a === void 0 ? void 0 : _a.log(formatErrorString(err));
                             if (err && err.errorCode === 404) {
-                                (0, utils_1.displaySasjsRunnerError)(username);
+                                (0, utils_1.displaySasjsRunnerError)(userName);
                             }
                             completedWithError = true;
                             return err;
                         })];
-                case 1:
-                    executionResult = _f.sent();
+                case 2:
+                    executionResult = _g.sent();
                     if (!executionResult) {
                         return [2 /*return*/, (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error getting execution log')];
                     }
@@ -317,8 +268,8 @@ function deployToSas9(deployScriptName, target, linesToExecute, logFolder, strea
                         : executionResult;
                     logFilePath = path_1.default.join(logFolder, "".concat(deployScriptName.replace('.sas', ''), ".log"));
                     return [4 /*yield*/, (0, utils_2.createFile)(logFilePath, logContent !== null && logContent !== void 0 ? logContent : '')];
-                case 2:
-                    _f.sent();
+                case 3:
+                    _g.sent();
                     if (completedWithError) {
                         (_c = process.logger) === null || _c === void 0 ? void 0 : _c.error("Deployment failed with errors! Log is available at ".concat(logFilePath));
                         throw new Error("Deployment failed.");
@@ -336,49 +287,44 @@ function deployToSas9(deployScriptName, target, linesToExecute, logFolder, strea
 }
 /**
  * Deploys app to `SASJS` server.
- * @param {Target} target- the target having deploy configuration.
- * @param {object} sasjs - optional configuration object of SAS adapter.
+ * @param {Target} target - the target having deploy configuration.
  * @param {object} streamConfig - optional config for deploying streaming app.
  */
-function deployToSasjs(target, sasjs, streamConfig) {
+function deployToSasjs(target, streamConfig) {
     var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function () {
-        var buildDestinationFolder, finalFilePathJSON, jsonContent, payload, authConfig, e_2, result, webAppStreamUrl;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var buildDestinationFolder, finalFilePathJSON, jsonContent, payload, authConfig, _d, sasjsApiClient, result, webAppStreamUrl;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
                 case 0:
                     buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
                     finalFilePathJSON = path_1.default.join(buildDestinationFolder, "".concat(target.name, ".json"));
                     return [4 /*yield*/, (0, utils_2.readFile)(finalFilePathJSON)];
                 case 1:
-                    jsonContent = _d.sent();
+                    jsonContent = _e.sent();
                     payload = JSON.parse(jsonContent);
-                    if (!!sasjs) return [3 /*break*/, 5];
-                    sasjs = new node_1.default({
-                        serverUrl: target.serverUrl,
-                        appLoc: target.appLoc,
-                        serverType: target.serverType,
-                        httpsAgentOptions: target.httpsAgentOptions,
-                        debug: true
-                    });
-                    _d.label = 2;
+                    return [4 /*yield*/, (0, utils_1.isSasJsServerInServerMode)(target)];
                 case 2:
-                    _d.trys.push([2, 4, , 5]);
+                    if (!(_e.sent())) return [3 /*break*/, 4];
                     return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
                 case 3:
-                    authConfig = _d.sent();
+                    _d = _e.sent();
                     return [3 /*break*/, 5];
                 case 4:
-                    e_2 = _d.sent();
-                    return [3 /*break*/, 5];
-                case 5: return [4 /*yield*/, sasjs
-                        .deployToSASjs(payload, undefined, authConfig)
-                        .catch(function (err) {
-                        var _a;
-                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('deployToSASjs Error', err);
-                    })];
+                    _d = undefined;
+                    _e.label = 5;
+                case 5:
+                    authConfig = _d;
+                    console.log(326);
+                    sasjsApiClient = new node_1.SASjsApiClient(new node_1.SasjsRequestClient(target.serverUrl, target.httpsAgentOptions));
+                    return [4 /*yield*/, sasjsApiClient
+                            .deploy(payload, target.appLoc, authConfig)
+                            .catch(function (err) {
+                            var _a;
+                            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('deployToSASjs Error', err);
+                        })];
                 case 6:
-                    result = _d.sent();
+                    result = _e.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) {

package/build/commands/deploy/spec/cbd.spec.js

@@ -1,4 +1,23 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -40,10 +59,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var path_1 = __importDefault(require("path"));
-var node_1 = __importDefault(require("@sasjs/adapter/node"));
+var node_1 = require("@sasjs/adapter/node");
 var js_base64_1 = require("js-base64");
 var utils_1 = require("@sasjs/utils");
 var test_1 = require("../../../utils/test");
+var utilsModule = __importStar(require("../../../utils/utils"));
 var types_1 = require("../../../types");
 var build_1 = require("../../build/build");
 var deploy_1 = require("../deploy");
@@ -79,18 +99,21 @@ describe('sasjs cbd with server type SASJS', function () {
         });
     }); });
     it("should deploy compile and build to sasjs/server", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var sasjs, customTarget, macroCorePath, mf_getuser, _a, mp_jsonout, ms_webout, webout, mocksPath, appinitJSPath, getdataJSPath, appinitJSContents, getdataJSContents, depsInserts, appinit, getdata, getCode;
+        var deployMock, customTarget, macroCorePath, mf_getuser, _a, mp_jsonout, ms_webout, webout, mocksPath, appinitJSPath, getdataJSPath, appinitJSContents, getdataJSContents, depsInserts, appinit, getdata, getCode;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    sasjs = new node_1.default();
-                    jest.mock('@sasjs/adapter');
-                    jest.spyOn(sasjs, 'deployToSASjs').mockImplementation(function () {
+                    deployMock = jest
+                        .spyOn(node_1.SASjsApiClient.prototype, 'deploy')
+                        .mockImplementation(function () {
                         return Promise.resolve({
                             status: 'success',
                             message: 'message'
                         });
                     });
+                    jest
+                        .spyOn(utilsModule, 'isSasJsServerInServerMode')
+                        .mockImplementation(function () { return Promise.resolve(false); });
                     return [4 /*yield*/, (0, test_1.updateConfig)({
                             serviceConfig: {
                                 serviceFolders: ['sasjs/services/common']
@@ -114,7 +137,7 @@ describe('sasjs cbd with server type SASJS', function () {
                     return [4 /*yield*/, expect((0, build_1.build)(customTarget)).toResolve()];
                 case 4:
                     _b.sent();
-                    return [4 /*yield*/, (0, deploy_1.deploy)(customTarget, true, sasjs)];
+                    return [4 /*yield*/, (0, deploy_1.deploy)(customTarget, true)];
                 case 5:
                     _b.sent();
                     macroCorePath = process.sasjsConstants.macroCorePath;
@@ -150,7 +173,7 @@ describe('sasjs cbd with server type SASJS', function () {
                     getCode = function (file) {
                         return "".concat(mf_getuser).concat(mp_jsonout).concat(ms_webout).concat(webout, "/* provide additional debug info */\n%global _program;\n%put &=syscc;\n%put user=%mf_getuser();\n%put pgm=&_program;\n%put timestamp=%sysfunc(datetime(),datetime19.);").concat(depsInserts).concat(file, "* Service end;");
                     };
-                    expect(sasjs.deployToSASjs).toHaveBeenCalledWith({
+                    expect(deployMock).toHaveBeenCalledWith({
                         appLoc: target.appLoc,
                         fileTree: {
                             members: [
@@ -188,7 +211,7 @@ describe('sasjs cbd with server type SASJS', function () {
                                 }
                             ]
                         }
-                    }, undefined, undefined);
+                    }, target.appLoc, undefined);
                     return [2 /*return*/];
             }
         });

package/build/commands/fs/fsCommand.d.ts

@@ -0,0 +1,11 @@
+import { ReturnCode } from '../../types/command';
+import { TargetCommand } from '../../types/command/targetCommand';
+export declare class FSCommand extends TargetCommand {
+    constructor(args: string[]);
+    get localFolder(): string;
+    get remoteFolder(): string;
+    getOutputPath(): Promise<string>;
+    execute(): Promise<ReturnCode>;
+    compile(): Promise<ReturnCode>;
+    sync(): Promise<ReturnCode>;
+}