@sasjs/cli 3.22.0 → 3.23.1

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/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/build/commands/fs/fsCommand.d.ts

@@ -7,5 +7,5 @@ export declare class FSCommand extends TargetCommand {
     getOutputPath(): Promise<string>;
     execute(): Promise<ReturnCode>;
     compile(): Promise<ReturnCode>;
-    sync(): Promise<ReturnCode>;
+    sync(): Promise<ReturnCode.Success | ReturnCode.InternalError>;
 }

package/build/commands/fs/fsCommand.js

@@ -266,15 +266,15 @@ var FSCommand = /** @class */ (function (_super) {
         });
     };
     FSCommand.prototype.sync = function () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         return __awaiter(this, void 0, void 0, function () {
-            var _m, target, isLocal, remoteFolderPath, localFolderPath, syncDirectories, _o, _p, _q, _r, _loop_1, this_1, syncDirectories_1, syncDirectories_1_1, obj, state_1, e_1_1;
-            var e_1, _s;
-            return __generator(this, function (_t) {
-                switch (_t.label) {
+            var _o, target, isLocal, remoteFolderPath, localFolderPath, syncDirectories, _p, _q, _r, _s, _loop_1, this_1, syncDirectories_1, syncDirectories_1_1, obj, state_1, e_1_1;
+            var e_1, _t;
+            return __generator(this, function (_u) {
+                switch (_u.label) {
                     case 0: return [4 /*yield*/, this.getTargetInfo()];
                     case 1:
-                        _m = _t.sent(), target = _m.target, isLocal = _m.isLocal;
+                        _o = _u.sent(), target = _o.target, isLocal = _o.isLocal;
                         remoteFolderPath = this.remoteFolder;
                         localFolderPath = this.localFolder;
                         syncDirectories = [];
@@ -282,88 +282,97 @@ var FSCommand = /** @class */ (function (_super) {
                         syncDirectories.push({ remote: remoteFolderPath, local: localFolderPath });
                         return [3 /*break*/, 4];
                     case 2:
-                        _p = (_o = syncDirectories.push).apply;
-                        _q = [syncDirectories];
-                        _r = [[]];
+                        _q = (_p = syncDirectories.push).apply;
+                        _r = [syncDirectories];
+                        _s = [[]];
                         return [4 /*yield*/, (0, utils_1.getSyncDirectories)(target, isLocal)];
                     case 3:
-                        _p.apply(_o, _q.concat([__spreadArray.apply(void 0, _r.concat([__read.apply(void 0, [(_t.sent())]), false]))]));
-                        _t.label = 4;
+                        _q.apply(_p, _r.concat([__spreadArray.apply(void 0, _s.concat([__read.apply(void 0, [(_u.sent())]), false]))]));
+                        _u.label = 4;
                     case 4:
                         if (!syncDirectories.length) {
                             (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info('There are no directories to sync.');
                             return [2 /*return*/, command_1.ReturnCode.Success];
                         }
                         _loop_1 = function (obj) {
-                            var outputFolder, program, log, remoteHashes, localHash, remoteHashMap, hashedDiff, syncProgram, syncLog, syncedHash, syncedHashMap, syncedResources, resourcesNotPresentLocally;
-                            return __generator(this, function (_u) {
-                                switch (_u.label) {
+                            var outputFolder, program, log, remoteHashes, localHash, remoteHashMap_1, hashedDiff, syncProgram, syncLog, syncedHash, syncedHashMap, syncedResources_1, resourcesNotPresentLocally, error_1, logPath;
+                            return __generator(this, function (_v) {
+                                switch (_v.label) {
                                     case 0: return [4 /*yield*/, this_1.getOutputPath()];
                                     case 1:
-                                        outputFolder = _u.sent();
+                                        outputFolder = _v.sent();
+                                        _v.label = 2;
+                                    case 2:
+                                        _v.trys.push([2, 15, , 17]);
                                         (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info('generating program to get remote hash');
                                         return [4 /*yield*/, (0, utils_2.generateProgramToGetRemoteHash)(obj.remote)];
-                                    case 2:
-                                        program = _u.sent();
+                                    case 3:
+                                        program = _v.sent();
+                                        return [4 /*yield*/, createProgramFile(program, path_1.default.join(outputFolder, 'getRemoteHash.sas'))];
+                                    case 4:
+                                        _v.sent();
                                         (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info('executing program to get remote hash');
                                         return [4 /*yield*/, (0, executeCode_1.executeCode)(target, program)];
-                                    case 3:
-                                        log = (_u.sent()).log;
+                                    case 5:
+                                        log = (_v.sent()).log;
                                         return [4 /*yield*/, (0, utils_1.saveLog)(log, path_1.default.join(outputFolder, 'getRemoteHash.log'), '', false)];
-                                    case 4:
-                                        _u.sent();
+                                    case 6:
+                                        _v.sent();
                                         (_d = process.logger) === null || _d === void 0 ? void 0 : _d.info('extracting hashes from log');
                                         remoteHashes = (0, extractHashArray_1.extractHashArray)(log);
                                         return [4 /*yield*/, createHashFile(JSON.stringify(remoteHashes, null, 2), path_1.default.join(outputFolder, 'hashesBeforeSync.json'))];
-                                    case 5:
-                                        _u.sent();
+                                    case 7:
+                                        _v.sent();
                                         (_e = process.logger) === null || _e === void 0 ? void 0 : _e.info('creating the hash of local folder');
                                         return [4 /*yield*/, (0, utils_2.getHash)(obj.local)];
-                                    case 6:
-                                        localHash = _u.sent();
-                                        remoteHashMap = remoteHashes.reduce(function (map, item) {
+                                    case 8:
+                                        localHash = _v.sent();
+                                        remoteHashMap_1 = remoteHashes.reduce(function (map, item) {
                                             var relativePath = (0, utils_2.getRelativePath)(obj.remote, item.FILE_PATH);
                                             map[relativePath] = item.FILE_HASH;
                                             return map;
                                         }, {});
-                                        if (remoteHashMap[localHash.relativePath] === localHash.hash) {
+                                        if (remoteHashMap_1[localHash.relativePath] === localHash.hash) {
                                             (_f = process.logger) === null || _f === void 0 ? void 0 : _f.info('There are no differences between Remote and Local directory. Already synced.');
                                             return [2 /*return*/, { value: command_1.ReturnCode.Success }];
                                         }
                                         (_g = process.logger) === null || _g === void 0 ? void 0 : _g.info('Extract differences from local and remote hash');
-                                        hashedDiff = (0, utils_2.compareHashes)(localHash, remoteHashMap);
+                                        hashedDiff = (0, utils_2.compareHashes)(localHash, remoteHashMap_1);
                                         return [4 /*yield*/, createHashFile(JSON.stringify(hashedDiff, null, 2), path_1.default.join(outputFolder, 'hashesDiff.json'))];
-                                    case 7:
-                                        _u.sent();
+                                    case 9:
+                                        _v.sent();
                                         (_h = process.logger) === null || _h === void 0 ? void 0 : _h.info('generating program to sync differences');
                                         return [4 /*yield*/, (0, utils_2.generateProgramToSyncHashDiff)(hashedDiff, obj.remote)];
-                                    case 8:
-                                        syncProgram = _u.sent();
+                                    case 10:
+                                        syncProgram = _v.sent();
+                                        return [4 /*yield*/, createProgramFile(syncProgram, path_1.default.join(outputFolder, 'syncProgram.sas'))];
+                                    case 11:
+                                        _v.sent();
                                         (_j = process.logger) === null || _j === void 0 ? void 0 : _j.info('executing program to sync differences');
                                         return [4 /*yield*/, (0, executeCode_1.executeCode)(target, syncProgram)];
-                                    case 9:
-                                        syncLog = (_u.sent()).log;
+                                    case 12:
+                                        syncLog = (_v.sent()).log;
                                         return [4 /*yield*/, (0, utils_1.saveLog)(syncLog, path_1.default.join(outputFolder, 'sync.log'), '', false)];
-                                    case 10:
-                                        _u.sent();
+                                    case 13:
+                                        _v.sent();
                                         syncedHash = (0, extractHashArray_1.extractHashArray)(syncLog);
                                         return [4 /*yield*/, createHashFile(JSON.stringify(syncedHash, null, 2), path_1.default.join(outputFolder, 'hashesAfterSync.json'))];
-                                    case 11:
-                                        _u.sent();
+                                    case 14:
+                                        _v.sent();
                                         syncedHashMap = syncedHash.reduce(function (map, item) {
                                             var relativePath = (0, utils_2.getRelativePath)(obj.remote, item.FILE_PATH);
                                             map[relativePath] = item.FILE_HASH;
                                             return map;
                                         }, {});
-                                        syncedResources = [];
+                                        syncedResources_1 = [];
                                         Object.entries(syncedHashMap).forEach(function (_a) {
                                             var _b = __read(_a, 2), key = _b[0], value = _b[1];
-                                            if (remoteHashMap[key] !== value)
-                                                syncedResources.push(key);
+                                            if (remoteHashMap_1[key] !== value)
+                                                syncedResources_1.push(key);
                                         });
-                                        if (syncedResources.length) {
-                                            (_k = process.logger) === null || _k === void 0 ? void 0 : _k.log('The following resources were synced:');
-                                            syncedResources.forEach(function (item) {
+                                        if (syncedResources_1.length) {
+                                            (_k = process.logger) === null || _k === void 0 ? void 0 : _k.log("The following resources were synced to: ".concat(obj.remote));
+                                            syncedResources_1.forEach(function (item) {
                                                 var _a;
                                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.log("* ".concat(item));
                                             });
@@ -376,36 +385,45 @@ var FSCommand = /** @class */ (function (_super) {
                                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.log("* ".concat(item));
                                             });
                                         }
-                                        return [2 /*return*/];
+                                        return [3 /*break*/, 17];
+                                    case 15:
+                                        error_1 = _v.sent();
+                                        logPath = path_1.default.join(outputFolder, 'error.log');
+                                        return [4 /*yield*/, createErrorLogFile(error_1, logPath)];
+                                    case 16:
+                                        _v.sent();
+                                        (_m = process.logger) === null || _m === void 0 ? void 0 : _m.error("An error has occurred. For more info see ".concat(logPath));
+                                        return [2 /*return*/, { value: command_1.ReturnCode.InternalError }];
+                                    case 17: return [2 /*return*/];
                                 }
                             });
                         };
                         this_1 = this;
-                        _t.label = 5;
+                        _u.label = 5;
                     case 5:
-                        _t.trys.push([5, 10, 11, 12]);
+                        _u.trys.push([5, 10, 11, 12]);
                         syncDirectories_1 = __values(syncDirectories), syncDirectories_1_1 = syncDirectories_1.next();
-                        _t.label = 6;
+                        _u.label = 6;
                     case 6:
                         if (!!syncDirectories_1_1.done) return [3 /*break*/, 9];
                         obj = syncDirectories_1_1.value;
                         return [5 /*yield**/, _loop_1(obj)];
                     case 7:
-                        state_1 = _t.sent();
+                        state_1 = _u.sent();
                         if (typeof state_1 === "object")
                             return [2 /*return*/, state_1.value];
-                        _t.label = 8;
+                        _u.label = 8;
                     case 8:
                         syncDirectories_1_1 = syncDirectories_1.next();
                         return [3 /*break*/, 6];
                     case 9: return [3 /*break*/, 12];
                     case 10:
-                        e_1_1 = _t.sent();
+                        e_1_1 = _u.sent();
                         e_1 = { error: e_1_1 };
                         return [3 /*break*/, 12];
                     case 11:
                         try {
-                            if (syncDirectories_1_1 && !syncDirectories_1_1.done && (_s = syncDirectories_1.return)) _s.call(syncDirectories_1);
+                            if (syncDirectories_1_1 && !syncDirectories_1_1.done && (_t = syncDirectories_1.return)) _t.call(syncDirectories_1);
                         }
                         finally { if (e_1) throw e_1.error; }
                         return [7 /*endfinally*/];
@@ -431,3 +449,39 @@ var createHashFile = function (content, fileName) { return __awaiter(void 0, voi
         }
     });
 }); };
+var createProgramFile = function (program, fileName) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0:
+                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Creating program file at ".concat(fileName, " ."));
+                return [4 /*yield*/, (0, utils_2.createFile)(fileName, program)];
+            case 1:
+                _c.sent();
+                (_b = process.logger) === null || _b === void 0 ? void 0 : _b.success("Program saved to  ".concat(fileName, " ."));
+                return [2 /*return*/];
+        }
+    });
+}); };
+var createErrorLogFile = function (error, logPath) { return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                if (!error.log) return [3 /*break*/, 2];
+                return [4 /*yield*/, (0, utils_2.createFile)(logPath, error.log)];
+            case 1: return [2 /*return*/, _a.sent()];
+            case 2:
+                if (!(error instanceof Error)) return [3 /*break*/, 4];
+                return [4 /*yield*/, (0, utils_2.createFile)(logPath, error.toString())];
+            case 3: return [2 /*return*/, _a.sent()];
+            case 4:
+                if (!(typeof error === 'object')) return [3 /*break*/, 6];
+                return [4 /*yield*/, (0, utils_2.createFile)(logPath, JSON.stringify(error, null, 2))];
+            case 5: return [2 /*return*/, _a.sent()];
+            case 6: return [4 /*yield*/, (0, utils_2.createFile)(logPath, error)];
+            case 7:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    });
+}); };

package/package.json

@@ -53,7 +53,7 @@
     "@sasjs/adapter": "4.1.0",
     "@sasjs/core": "4.45.2",
     "@sasjs/lint": "1.15.0",
-    "@sasjs/utils": "2.51.1",
+    "@sasjs/utils": "2.51.2",
     "adm-zip": "0.5.9",
     "chalk": "4.1.2",
     "csv-stringify": "5.6.5",
@@ -72,7 +72,7 @@
     "shelljs": "0.8.5",
     "ssl-root-cas": "1.3.1",
     "xml": "1.0.1",
-    "yargs": "17.2.1"
+    "yargs": "17.6.2"
   },
   "devDependencies": {
     "@babel/preset-env": "7.15.6",
@@ -101,5 +101,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.22.0"
+  "version": "3.23.1"
 }