tnp-helpers 16.444.7 → 16.444.9

package/client/lib/base/base-project.d.ts

@@ -119,7 +119,7 @@ export declare abstract class BaseProject<PROJCET extends BaseProject = any, TYP
         checkPackages?: boolean;
         useYarn?: boolean;
         force?: boolean;
-    }): void;
+    }): Promise<void>;
     preferYarnOverNpm(): boolean;
     /**
      *

package/client/package.json

@@ -43,12 +43,12 @@
       "firedev-helpers"
     ]
   },
-  "version": "16.444.7",
+  "version": "16.444.9",
   "dependencies": {
-    "json10-writer": "16.444.6",
+    "json10-writer": "16.444.7",
     "lowdb": "7.0.1",
     "task.js": "0.1.5",
-    "tnp-models": "16.444.6",
+    "tnp-models": "16.444.7",
     "typescript": "~5.0.2"
   },
   "scripts": {
@@ -146,7 +146,7 @@
     "angular-material-css-vars": "5.0.2",
     "angular-resize-event": "3.2.0",
     "animate.css": "4.1.1 ",
-    "any-project-cli": "16.444.5",
+    "any-project-cli": "16.444.7",
     "app-root-path": "3.0.0",
     "axios": "1.3.5",
     "background-worker-process": "16.100.10",
@@ -202,11 +202,11 @@
     "file-saver": "2.0.5",
     "file-type": "18.5.0",
     "firedev": "^16",
-    "firedev-crud": "16.444.5",
-    "firedev-crud-deamon": "16.444.5",
-    "firedev-ports": "16.444.5",
+    "firedev-crud": "16.444.7",
+    "firedev-crud-deamon": "16.444.7",
+    "firedev-ports": "16.444.7",
     "firedev-storage": "16.444.5",
-    "firedev-type-sql": "16.444.5",
+    "firedev-type-sql": "16.444.7",
     "firedev-typeorm": "16.444.5",
     "firedev-ui": "16.444.1",
     "fkill": "6.1.0",
@@ -226,11 +226,11 @@
     "image-focus": "1.2.1",
     "immer": "10.0.2",
     "immutable": "4.3.0",
-    "incremental-compiler": "16.444.6",
+    "incremental-compiler": "16.444.8",
     "inquirer": "7.3.3",
     "inquirer-autocomplete-prompt": "1.3.0",
     "is-elevated": "3.0.0",
-    "isomorphic-region-loader": "16.444.5",
+    "isomorphic-region-loader": "16.444.7",
     "istanbul-instrumenter-loader": "2.0.0",
     "jest": "29.5.0",
     "jest-date-mock": "1.0.8",
@@ -241,7 +241,7 @@
     "joi": "17.9.2",
     "jscodeshift": "0.6.3",
     "json-stringify-safe": "5.0.1",
-    "json10": "16.444.5",
+    "json10": "16.444.7",
     "json5": "2.2.1",
     "json5-writer": "0.2.0",
     "jszip": "3.10.1",
@@ -250,8 +250,8 @@
     "localforage": "1.10.0",
     "lockfile": "1.0.4",
     "lodash": "4.17.20",
-    "lodash-walk-object": "16.444.4",
-    "magic-renamer": "16.444.4",
+    "lodash-walk-object": "16.444.6",
+    "magic-renamer": "16.444.6",
     "material-design-icons": "3.0.1",
     "method-override": "2.3.10",
     "minimist": "1.2.0",
@@ -263,9 +263,9 @@
     "ng-lock": "16.0.1",
     "ng-packagr": "16.0.1",
     "ng-talkback": "16.444.1",
-    "ng2-logger": "16.444.6",
+    "ng2-logger": "16.444.7",
     "ng2-pdfjs-viewer": "16.0.4",
-    "ng2-rest": "16.444.4",
+    "ng2-rest": "16.444.6",
     "ngx-ace-wrapper": "14.0.0",
     "ngx-editor": "15.3.0",
     "ngx-highlightjs": "9.0.0",
@@ -327,10 +327,10 @@
     "systeminformation": "3.45.7",
     "threads": "1.7.0",
     "tnp-cli": "16.444.1",
-    "tnp-config": "16.444.6",
-    "tnp-core": "16.444.7",
-    "tnp-db": "16.444.4",
-    "tnp-helpers": "16.444.6",
+    "tnp-config": "16.444.7",
+    "tnp-core": "16.444.8",
+    "tnp-db": "16.444.6",
+    "tnp-helpers": "16.444.8",
     "ts-debug": "1.3.0",
     "ts-json-schema-generator": "2.1.1",
     "ts-loader": "2.3.1",
@@ -340,7 +340,7 @@
     "turndown": "7.1.2",
     "typedoc": "0.25.13",
     "typedoc-plugin-markdown": "4.0.3",
-    "typescript-class-helpers": "~16.444.6",
+    "typescript-class-helpers": "~16.444.7",
     "typescript-formatter": "~7.2.2",
     "underscore": "1.9.1",
     "uuid": "8.3.2",
@@ -356,6 +356,6 @@
     "yup": "1.1.1",
     "zone.js": "~0.13.0"
   },
-  "lastBuildTagHash": "bbb5cdee498bfbc641d20dfd0c7af2592260458b",
+  "lastBuildTagHash": "80bb0e703a94cd665537f0a2e167a1b81c3d3e82",
   "main": "dist/app.electron.js"
 }

package/lib/base/base-project.d.ts

@@ -120,7 +120,7 @@ export declare abstract class BaseProject<PROJCET extends BaseProject = any, TYP
         checkPackages?: boolean;
         useYarn?: boolean;
         force?: boolean;
-    }): void;
+    }): Promise<void>;
     preferYarnOverNpm(): boolean;
     /**
      *

package/lib/base/base-project.js

@@ -902,16 +902,23 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
     //#region methods & getters  /reinstall node modules
     BaseProject.prototype.reinstalNodeModules = function (options) {
         //#region @backendFunc
+        index_1.Helpers.taskStarted("Reinstalling node modules for ".concat(this.genericName));
         this.deleteNodeModules();
         index_1.Helpers.run("".concat((options === null || options === void 0 ? void 0 : options.useYarn) ? 'yarn' : 'npm', "  install ").concat((options === null || options === void 0 ? void 0 : options.force) ? '--force' : ''), { cwd: this.location }).sync();
+        index_1.Helpers.taskDone("Reinstalled node modules for ".concat(this.genericName));
         //#endregion
     };
     //#endregion
     //#region methods & getters  / make sure node modules installed
     BaseProject.prototype.makeSureNodeModulesInstalled = function (options) {
-        if (this.nodeModulesEmpty()) {
-            this.reinstalNodeModules(options);
-        }
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                if (this.nodeModulesEmpty()) {
+                    this.reinstalNodeModules(options);
+                }
+                return [2 /*return*/];
+            });
+        });
     };
     //#endregion
     //#region methods & getters  / prefer yarn over npm
@@ -1419,40 +1426,47 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
     //#endregion
     //#region methods & getters  / push process
     BaseProject.prototype.pushProcess = function (options) {
-        var _a;
+        var _a, _b;
         if (options === void 0) { options = {}; }
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var force, typeofCommit, forcePushNoQuestion, origin, exitCallBack, args, commitMessageRequired, skipChildren, commitData, error_2, childrenRepos, childrenRepos_2, childrenRepos_2_1, child, e_10_1;
-            var _b, _c, _d, e_10, _e;
-            return tslib_1.__generator(this, function (_f) {
-                switch (_f.label) {
+            var _c, _d, _e, e_10, _f;
+            var _this = this;
+            return tslib_1.__generator(this, function (_g) {
+                switch (_g.label) {
                     case 0:
-                        force = (_b = options.force, _b === void 0 ? false : _b), typeofCommit = options.typeofCommit, forcePushNoQuestion = options.forcePushNoQuestion, origin = (_c = options.origin, _c === void 0 ? 'origin' : _c), exitCallBack = options.exitCallBack, args = (_d = options.args, _d === void 0 ? [] : _d), commitMessageRequired = options.commitMessageRequired, skipChildren = options.skipChildren;
+                        force = (_c = options.force, _c === void 0 ? false : _c), typeofCommit = options.typeofCommit, forcePushNoQuestion = options.forcePushNoQuestion, origin = (_d = options.origin, _d === void 0 ? 'origin' : _d), exitCallBack = options.exitCallBack, args = (_e = options.args, _e === void 0 ? [] : _e), commitMessageRequired = options.commitMessageRequired, skipChildren = options.skipChildren;
                         return [4 /*yield*/, this._beforePushProcessAction()];
                     case 1:
-                        _f.sent();
+                        _g.sent();
                         return [4 /*yield*/, this.saveLocationToDB()];
                     case 2:
-                        _f.sent();
+                        _g.sent();
                         return [4 /*yield*/, this._getCommitMessage(typeofCommit, args, commitMessageRequired)];
                     case 3:
-                        commitData = _f.sent();
-                        _f.label = 4;
+                        commitData = _g.sent();
+                        if (!this.automaticallyAddAllChnagesWhenPushingToGit()) {
+                            if ((_a = commitData.commitMessage) === null || _a === void 0 ? void 0 : _a.split(':').map(function (p) { return p.trim(); }).every(function (p) { return p === _this.git.currentBranchName; })) {
+                                // QUICK_FIX
+                                index_1.Helpers.error("\n\n        Please provide more specific commit message than branch name\n\n\n        ", false, true);
+                            }
+                        }
+                        _g.label = 4;
                     case 4:
                         if (!true) return [3 /*break*/, 10];
-                        _f.label = 5;
+                        _g.label = 5;
                     case 5:
-                        _f.trys.push([5, 7, , 9]);
+                        _g.trys.push([5, 7, , 9]);
                         return [4 /*yield*/, this.lint()];
                     case 6:
-                        _f.sent();
+                        _g.sent();
                         return [3 /*break*/, 10];
                     case 7:
-                        error_2 = _f.sent();
+                        error_2 = _g.sent();
                         index_1.Helpers.warn('Fix your code...');
                         return [4 /*yield*/, index_1.Helpers.consoleGui.question.yesNo('Try again lint before commit ?')];
                     case 8:
-                        if (!(_f.sent())) {
+                        if (!(_g.sent())) {
                             return [3 /*break*/, 10];
                         }
                         return [3 /*break*/, 9];
@@ -1463,16 +1477,16 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
                         if (!(this.git.lastCommitMessage() === commitData.commitMessage)) return [3 /*break*/, 12];
                         return [4 /*yield*/, index_1.Helpers.questionYesNo('Soft reset last commit with same message ?')];
                     case 11:
-                        if (_f.sent()) {
+                        if (_g.sent()) {
                             this.git.resetSoftHEAD(1);
                         }
-                        _f.label = 12;
+                        _g.label = 12;
                     case 12: return [4 /*yield*/, index_1.Helpers.questionYesNo('Commit and push this ?')];
                     case 13:
-                        if (!(_f.sent())) {
+                        if (!(_g.sent())) {
                             exitCallBack();
                         }
-                        _f.label = 14;
+                        _g.label = 14;
                     case 14:
                         if (this.automaticallyAddAllChnagesWhenPushingToGit()) {
                             // my project
@@ -1480,7 +1494,7 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
                         }
                         if (this.useGitBranchesAsMetadataForCommits()) {
                             index_1.Helpers.info('Checkingout branches (if needed)...');
-                            if (((_a = this.git.currentBranchName) === null || _a === void 0 ? void 0 : _a.trim()) !== commitData.branchName) {
+                            if (((_b = this.git.currentBranchName) === null || _b === void 0 ? void 0 : _b.trim()) !== commitData.branchName) {
                                 try {
                                     this.git.checkout(commitData.branchName, {
                                         createBranchIfNotExists: true,
@@ -1504,42 +1518,42 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
                                 askToRetry: true,
                             })];
                     case 15:
-                        _f.sent();
+                        _g.sent();
                         if (!(this.automaticallyAddAllChnagesWhenPushingToGit() && !skipChildren)) return [3 /*break*/, 23];
                         if (this.getLinkedProjectsConfig().skipRecrusivePush) {
                             index_1.Helpers.warn("Skipping recrusive (children) push for ".concat(this.genericName));
                             return [2 /*return*/];
                         }
                         childrenRepos = this.children.filter(function (f) { return f.git.isInsideGitRepo && f.git.isGitRoot; });
-                        _f.label = 16;
+                        _g.label = 16;
                     case 16:
-                        _f.trys.push([16, 21, 22, 23]);
+                        _g.trys.push([16, 21, 22, 23]);
                         childrenRepos_2 = tslib_1.__values(childrenRepos), childrenRepos_2_1 = childrenRepos_2.next();
-                        _f.label = 17;
+                        _g.label = 17;
                     case 17:
                         if (!!childrenRepos_2_1.done) return [3 /*break*/, 20];
                         child = childrenRepos_2_1.value;
                         return [4 /*yield*/, child.pushProcess(options)];
                     case 18:
-                        _f.sent();
-                        _f.label = 19;
+                        _g.sent();
+                        _g.label = 19;
                     case 19:
                         childrenRepos_2_1 = childrenRepos_2.next();
                         return [3 /*break*/, 17];
                     case 20: return [3 /*break*/, 23];
                     case 21:
-                        e_10_1 = _f.sent();
+                        e_10_1 = _g.sent();
                         e_10 = { error: e_10_1 };
                         return [3 /*break*/, 23];
                     case 22:
                         try {
-                            if (childrenRepos_2_1 && !childrenRepos_2_1.done && (_e = childrenRepos_2.return)) _e.call(childrenRepos_2);
+                            if (childrenRepos_2_1 && !childrenRepos_2_1.done && (_f = childrenRepos_2.return)) _f.call(childrenRepos_2);
                         }
                         finally { if (e_10) throw e_10.error; }
                         return [7 /*endfinally*/];
                     case 23: return [4 /*yield*/, this.saveAllLinkedProjectsToDB()];
                     case 24:
-                        _f.sent();
+                        _g.sent();
                         return [2 /*return*/];
                 }
             });
@@ -2346,7 +2360,9 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
                             // this.parent.location,
                             // ...this.parent.children.map(c => c.location),
                         ].map(function (l) { return (0, tnp_core_1.crossPlatformPath)([l, tnp_config_1.config.folder.node_modules]); });
-                        this.makeSureNodeModulesInstalled();
+                        return [4 /*yield*/, this.makeSureNodeModulesInstalled()];
+                    case 5:
+                        _p.sent();
                         _loop_1 = function (index, lib) {
                             index_1.Helpers.info("Building (".concat(index + 1, "/").concat(allLibs.length, ") ").concat(lib.basename, " (").concat(tnp_core_3.chalk.bold(lib.name), ")"));
                             if (strategy === 'link') {
@@ -2422,7 +2438,7 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
                             }
                             finally { if (e_12) throw e_12.error; }
                         }
-                        if (!watch) return [3 /*break*/, 13];
+                        if (!watch) return [3 /*break*/, 14];
                         _loop_2 = function (index, lib) {
                             return tslib_1.__generator(this, function (_q) {
                                 switch (_q.label) {
@@ -2455,41 +2471,41 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
                                 }
                             });
                         };
-                        _p.label = 5;
-                    case 5:
-                        _p.trys.push([5, 10, 11, 12]);
-                        _j = tslib_1.__values(libsToWatch.entries()), _k = _j.next();
                         _p.label = 6;
                     case 6:
-                        if (!!_k.done) return [3 /*break*/, 9];
+                        _p.trys.push([6, 11, 12, 13]);
+                        _j = tslib_1.__values(libsToWatch.entries()), _k = _j.next();
+                        _p.label = 7;
+                    case 7:
+                        if (!!_k.done) return [3 /*break*/, 10];
                         _l = tslib_1.__read(_k.value, 2), index = _l[0], lib = _l[1];
                         return [5 /*yield**/, _loop_2(index, lib)];
-                    case 7:
-                        _p.sent();
-                        _p.label = 8;
                     case 8:
+                        _p.sent();
+                        _p.label = 9;
+                    case 9:
                         _k = _j.next();
-                        return [3 /*break*/, 6];
-                    case 9: return [3 /*break*/, 12];
-                    case 10:
+                        return [3 /*break*/, 7];
+                    case 10: return [3 /*break*/, 13];
+                    case 11:
                         e_11_1 = _p.sent();
                         e_11 = { error: e_11_1 };
-                        return [3 /*break*/, 12];
-                    case 11:
+                        return [3 /*break*/, 13];
+                    case 12:
                         try {
                             if (_k && !_k.done && (_o = _j.return)) _o.call(_j);
                         }
                         finally { if (e_11) throw e_11.error; }
                         return [7 /*endfinally*/];
-                    case 12:
+                    case 13:
                         // await this.__indexRebuilder.startAndWatch({ taskName: 'index rebuild watch' });
                         index_1.Helpers.success('BUILD DONE.. watching..');
-                        return [3 /*break*/, 14];
-                    case 13:
+                        return [3 /*break*/, 15];
+                    case 14:
                         // await this.__indexRebuilder.start({ taskName: 'index rebuild watch' });
                         index_1.Helpers.success('BUILD DONE');
-                        _p.label = 14;
-                    case 14: return [2 /*return*/];
+                        _p.label = 15;
+                    case 15: return [2 /*return*/];
                 }
             });
         });