@sasjs/cli 3.21.6 → 3.23.0

package/build/commands/build/compileBuildCommand.js

@@ -97,7 +97,7 @@ var CompileBuildCommand = /** @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 ".concat(buildDestinationFolder, " directory."));
+                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("The project was successfully compiled using the '".concat(target.name, "' target (serverType '").concat(target.serverType, "')!\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) {

package/build/commands/build/spec/compileBuildCommand.spec.js

@@ -162,7 +162,7 @@ describe('CompileBuildCommand', function () {
         });
     }); });
     it('should log success and return the success code when execution is successful', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var args, command, returnCode;
+        var args, command, returnCode, buildDestinationFolder, expectedLoggedMessage;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -171,8 +171,10 @@ describe('CompileBuildCommand', function () {
                     return [4 /*yield*/, command.execute()];
                 case 1:
                     returnCode = _a.sent();
+                    buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
+                    expectedLoggedMessage = "The project was successfully compiled using the '".concat(target.name, "' target (serverType '").concat(target.serverType, "')!\nThe compile output is located in the ").concat(buildDestinationFolder, " directory.");
                     expect(returnCode).toEqual(command_1.ReturnCode.Success);
-                    expect(process.logger.success).toHaveBeenCalled();
+                    expect(process.logger.success).toHaveBeenNthCalledWith(1, expectedLoggedMessage);
                     return [2 /*return*/];
             }
         });

package/build/commands/compile/compileCommand.js

@@ -167,7 +167,7 @@ var CompileCommand = /** @class */ (function (_super) {
                         return [4 /*yield*/, (0, compile_1.compile)(target, true)
                                 .then(function () {
                                 var _a;
-                                (_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."));
+                                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("The project was successfully compiled using the '".concat(target.name, "' target (serverType '").concat(target.serverType, "')!\nThe compile output is located in the ").concat(buildDestinationFolder, " directory."));
                                 return command_1.ReturnCode.Success;
                             })
                                 .catch(function (err) {

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

@@ -177,7 +177,7 @@ describe('CompileCommand', function () {
         });
     }); });
     it('should log success and return the success code when execution is successful', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var args, command, returnCode;
+        var args, command, returnCode, buildDestinationFolder, expectedLoggedMessage;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -186,8 +186,10 @@ describe('CompileCommand', function () {
                     return [4 /*yield*/, command.execute()];
                 case 1:
                     returnCode = _a.sent();
+                    buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
+                    expectedLoggedMessage = "The project was successfully compiled using the '".concat(target.name, "' target (serverType '").concat(target.serverType, "')!\nThe compile output is located in the ").concat(buildDestinationFolder, " directory.");
                     expect(returnCode).toEqual(command_1.ReturnCode.Success);
-                    expect(process.logger.success).toHaveBeenCalled();
+                    expect(process.logger.success).toHaveBeenNthCalledWith(1, expectedLoggedMessage);
                     return [2 /*return*/];
             }
         });

package/build/commands/deploy/compileBuildDeployCommand.js

@@ -98,7 +98,7 @@ 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 ".concat(buildDestinationFolder, " directory."));
+                        (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("The project was successfully compiled using the '".concat(target.name, "' target (serverType '").concat(target.serverType, "')!\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) {

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

@@ -49,34 +49,50 @@ var utils_2 = require("@sasjs/utils");
 function deployToSasjsWithServicePack(jsonFilePath, target, streamConfig) {
     var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function () {
-        var jsonContent, payload, authConfig, _d, sasjsApiClient, result, webAppStreamUrl;
+        var sasjsApiClient, authConfig, _d, result, zipFilePath, jsonContent, payload, webAppStreamUrl;
         return __generator(this, function (_e) {
             switch (_e.label) {
-                case 0: return [4 /*yield*/, (0, utils_2.readFile)(jsonFilePath)];
-                case 1:
-                    jsonContent = _e.sent();
-                    payload = JSON.parse(jsonContent);
+                case 0:
+                    sasjsApiClient = new node_1.SASjsApiClient(new node_1.SasjsRequestClient(target.serverUrl, target.httpsAgentOptions));
                     return [4 /*yield*/, (0, utils_1.isSasJsServerInServerMode)(target)];
-                case 2:
-                    if (!(_e.sent())) return [3 /*break*/, 4];
+                case 1:
+                    if (!(_e.sent())) return [3 /*break*/, 3];
                     return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
-                case 3:
+                case 2:
                     _d = _e.sent();
-                    return [3 /*break*/, 5];
-                case 4:
+                    return [3 /*break*/, 4];
+                case 3:
                     _d = undefined;
-                    _e.label = 5;
-                case 5:
+                    _e.label = 4;
+                case 4:
                     authConfig = _d;
-                    sasjsApiClient = new node_1.SASjsApiClient(new node_1.SasjsRequestClient(target.serverUrl, target.httpsAgentOptions));
+                    zipFilePath = jsonFilePath + '.zip';
+                    return [4 /*yield*/, (0, utils_2.fileExists)(zipFilePath)];
+                case 5:
+                    if (!_e.sent()) return [3 /*break*/, 7];
                     return [4 /*yield*/, sasjsApiClient
-                            .deploy(payload, target.appLoc, authConfig)
+                            .deployZipFile(zipFilePath, authConfig)
                             .catch(function (err) {
                             var _a;
                             (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('deployToSASjs Error', err);
                         })];
                 case 6:
                     result = _e.sent();
+                    return [3 /*break*/, 10];
+                case 7: return [4 /*yield*/, (0, utils_2.readFile)(jsonFilePath)];
+                case 8:
+                    jsonContent = _e.sent();
+                    payload = JSON.parse(jsonContent);
+                    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 9:
+                    result = _e.sent();
+                    _e.label = 10;
+                case 10:
                     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

@@ -62,6 +62,7 @@ var path_1 = __importDefault(require("path"));
 var node_1 = require("@sasjs/adapter/node");
 var js_base64_1 = require("js-base64");
 var utils_1 = require("@sasjs/utils");
+var fileModule = __importStar(require("@sasjs/utils/file"));
 var test_1 = require("../../../utils/test");
 var utilsModule = __importStar(require("../../../utils/utils"));
 var types_1 = require("../../../types");
@@ -103,6 +104,11 @@ describe('sasjs cbd with server type SASJS', function () {
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
+                    jest.spyOn(fileModule, 'fileExists').mockImplementation(function (filePath) {
+                        if (filePath.endsWith('.zip'))
+                            return Promise.resolve(false);
+                        return Promise.resolve(true);
+                    });
                     deployMock = jest
                         .spyOn(node_1.SASjsApiClient.prototype, 'deploy')
                         .mockImplementation(function () {

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

@@ -168,7 +168,7 @@ describe('CompileBuildDeployCommand', function () {
         });
     }); });
     it('should log success and return the success code when execution is successful', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var args, command, returnCode;
+        var args, command, returnCode, buildDestinationFolder, expectedLoggedMessage;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -177,8 +177,10 @@ describe('CompileBuildDeployCommand', function () {
                     return [4 /*yield*/, command.execute()];
                 case 1:
                     returnCode = _a.sent();
+                    buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
+                    expectedLoggedMessage = "The project was successfully compiled using the '".concat(target.name, "' target (serverType '").concat(target.serverType, "')!\nThe compile output is located in the ").concat(buildDestinationFolder, " directory.");
                     expect(returnCode).toEqual(command_1.ReturnCode.Success);
-                    expect(process.logger.success).toHaveBeenCalled();
+                    expect(process.logger.success).toHaveBeenNthCalledWith(1, expectedLoggedMessage);
                     return [2 /*return*/];
             }
         });

package/package.json

@@ -50,7 +50,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sasjs/adapter": "4.0.1",
+    "@sasjs/adapter": "4.1.0",
     "@sasjs/core": "4.45.2",
     "@sasjs/lint": "1.15.0",
     "@sasjs/utils": "2.51.1",
@@ -101,5 +101,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.21.6"
+  "version": "3.23.0"
 }