tnp-helpers 16.444.19 → 16.444.21

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

@@ -53,6 +53,8 @@ export declare class BaseGit<PROJCET extends BaseProject = any> extends BaseFeat
     lastCommitDate(): any;
     lastCommitHash(): any;
     lastCommitMessage(): any;
+    getCommitMessageByIndex(index: number): Promise<any>;
+    getCommitHashByIndex(index: number): Promise<any>;
     penultimateCommitHash(): any;
     checkTagExists(tag: string): any;
     checkout(branchName: string, options?: {
@@ -96,6 +98,16 @@ export declare class BaseGit<PROJCET extends BaseProject = any> extends BaseFeat
      */
     useGitBranchesAsMetadataForCommits(): boolean;
     cloneTo(cwd: string, newProjectName?: string): Promise<any>;
+    /**
+     * This is only for push/pull process
+     *
+     * There are 2 types of projects:
+     * - with linked-projects.json
+     * - with children from external folder
+     *
+     * projects that are children of this project (with its own git repo)
+     */
+    get gitChildren(): PROJCET[];
     pullProcess(cloneChildren?: boolean): Promise<any>;
     pushProcess(options?: {
         force?: boolean;
@@ -112,4 +124,9 @@ export declare class BaseGit<PROJCET extends BaseProject = any> extends BaseFeat
     protected _beforePushProcessAction(): Promise<any>;
     protected _beforePullProcessAction(cloneChildren?: boolean): Promise<any>;
     protected _getCommitMessage(typeofCommit: TypeOfCommit, args: string[], commitMessageRequired?: boolean): Promise<CommitData>;
+    /**
+     * This will prevent accidental branch change for firedev projects
+     * @returns branch name
+     */
+    duringPushWarnIfProjectNotOnSpecyficDevBranch(): string;
 }

package/client/lib/base/base-library-build.d.ts

@@ -38,9 +38,10 @@ export declare abstract class BaseLibraryBuild<PROJCET extends BaseProject = any
     /**
      * Angular library build
      */
-    buildLibraries({ watch, strategy, buildType, }?: LibrariesBuildOptions & {
+    buildLibraries({ watch, strategy, buildType, copylink_to_node_modules, }?: LibrariesBuildOptions & {
         watch: boolean;
     }): Promise<void>;
     getLibraryBuildComamnd(options?: LibraryBuildCommandOptions): string | undefined;
     get getLibraryBuildSuccessComamnd(): string;
+    selectCopytoProjects(): Promise<string[]>;
 }

package/client/lib/base/base-npm-helpers.d.ts

@@ -12,6 +12,9 @@ export declare class BaseNpmHelpers<PROJCET extends BaseProject = any> extends B
      * version from package.json -> property version
      */
     get version(): string;
+    get versionWithPatchPlusOne(): string;
+    get versionWithMinorPlusOneAndPatchZero(): string;
+    get versionWithMajorPlusOneAndMinorZeroAndPatchZero(): string;
     /**
      * Major Version from package.json
      */

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

@@ -2,7 +2,7 @@
 import type { BaseProject } from './base-project';
 import { ConfigDatabase } from './config-database';
 import { ProjectDatabase } from './project-database';
-export declare class BaseProjectResolver<T extends Partial<BaseProject> = any> {
+export declare class BaseProjectResolver<PROJECT extends Partial<BaseProject> = any> {
     protected classFn: any;
     /**
      * general name for project company
@@ -11,7 +11,7 @@ export declare class BaseProjectResolver<T extends Partial<BaseProject> = any> {
     configDb: ConfigDatabase;
     projectsDb: ProjectDatabase;
     protected readonly NPM_PROJECT_KEY = "npm";
-    protected projects: T[];
+    protected projects: PROJECT[];
     /**
      * To speed up checking folder I am keeping pathes for alterdy checked folder
      * This may break things that are creating new projects
@@ -22,20 +22,21 @@ export declare class BaseProjectResolver<T extends Partial<BaseProject> = any> {
     /**
      * project from process.cwd()
      */
-    get Current(): T;
+    get Current(): PROJECT;
     /**
      * override this
      */
     typeFrom(location: string, recrusiveCall?: boolean): string;
-    From(locationOfProject: string | string[], options?: any): T;
+    From(locationOfProject: string | string[], options?: any): PROJECT;
     nearestTo(absoluteLocation: string, options?: {
         type?: string | string[];
         findGitRoot?: boolean;
         onlyOutSideNodeModules?: boolean;
-    }): T;
-    unload(project: T): void;
-    remove(project: T): void;
-    add(project: T): void;
+    }): PROJECT;
+    unload(project: PROJECT): void;
+    remove(project: PROJECT): void;
+    add(project: PROJECT): void;
     allProjectFrom(absoluteLocation: string, stopOnCwd?: string): any;
+    allProjectsFromFolder(folderLocation: string): PROJECT[];
     sortGroupOfProject<T extends BaseProject = BaseProject>(projects: T[], resoveDepsArray: (proj: T) => string[], projNameToCompare: (proj: T) => string): T[];
 }

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

@@ -8,11 +8,9 @@ import type { BaseLibraryBuild } from './base-library-build';
 import { BaseNpmHelpers } from './base-npm-helpers';
 import { BaseLinkedProjects } from './base-linked-projects';
 import { BaseGit } from './base-git';
+import { BaseVscodeHelpers } from './base-vscode';
+import { BaseReleaseProcess } from './base-release-process';
 export declare abstract class BaseProject<PROJCET extends BaseProject = any, TYPE = BaseProjectType> {
-    /**
-     * doesn't need to be real path -> can be link
-     */
-    readonly location: string;
     static ins: BaseProjectResolver<BaseProject<any, CoreModels.BaseProjectType>>;
     cache: any;
     static cache: any;
@@ -30,7 +28,12 @@ export declare abstract class BaseProject<PROJCET extends BaseProject = any, TYP
     libraryBuild: BaseLibraryBuild;
     npmHelpers: BaseNpmHelpers;
     linkedProjects: BaseLinkedProjects;
+    vsCodeHelpers: BaseVscodeHelpers;
+    releaseProcess: BaseReleaseProcess;
     git: BaseGit;
+    private __location;
+    get location(): string;
+    set location(v: string);
     constructor(
     /**
      * doesn't need to be real path -> can be link
@@ -62,6 +65,7 @@ export declare abstract class BaseProject<PROJCET extends BaseProject = any, TYP
     get parent(): PROJCET;
     get grandpa(): PROJCET;
     get genericName(): any;
+    private checkAndBoldenPath;
     /**
      * same has project.hasFile();
      */
@@ -87,9 +91,6 @@ export declare abstract class BaseProject<PROJCET extends BaseProject = any, TYP
      * use output from or more preciese crafted api
      */
     run(command: string, options?: Omit<CoreModels.RunOptions, 'cwd'>): {
-        /**
-         * name from package.json
-         */
         sync(): any;
         async(detach?: boolean, mockFun?: (stdoutCallback: (dataForStdout: any) => any, stdErrcCallback: (dataForStder: any) => any, shouldProcesBeDead?: () => boolean) => number | Promise<number>): import("child_process").ChildProcess;
         asyncAsPromise(): Promise<void>;
@@ -142,6 +143,9 @@ export declare abstract class BaseProject<PROJCET extends BaseProject = any, TYP
     isUnsingActionCommit(): boolean;
     resetProcess(overrideBranch?: string, recrusive?: boolean): Promise<void>;
     linkTo(destPackageLocation: string): void;
+    setValueToJSON(relativePath: string, lodashGetPath: string, value: any): void;
+    getValueFromJSON(relativePath: string, lodashGetPath: string, defaultValue?: any): any;
+    getValueFromJSONC(relativePath: string, lodashGetPath: string, defaultValue?: any): any;
     writeFile(relativePath: string, content: string): void;
     runCommandGetString(this: BaseProject, command: string): any;
     toString: () => string;
@@ -165,6 +169,7 @@ export declare abstract class BaseProject<PROJCET extends BaseProject = any, TYP
      * init and build() project
      */
     build(buildOptions?: any): Promise<void>;
+    release(releaseOptions?: any): Promise<void>;
     /**
      * lint porject
      */

package/client/lib/base/base-release-process.d.ts

@@ -0,0 +1,40 @@
+// @ts-nocheck
+import { BaseFeatureForProject } from './base-feature-for-project';
+import type { BaseProject } from './base-project';
+import { CoreModels } from 'tnp-core/browser';
+import type { ChangelogData } from '.././models';
+export declare class BaseReleaseProcess<PROJCET extends BaseProject = any> extends BaseFeatureForProject {
+    project: PROJCET;
+    /**
+     * Automatic release process of patch plus one version
+     */
+    automaticRelease: boolean;
+    type: CoreModels.ReleaseType;
+    lastChangesSummary: string;
+    startRelease(options?: Partial<Pick<BaseReleaseProcess<PROJCET>, 'automaticRelease' | 'type'>>): Promise<void>;
+    private selectReleaseType;
+    generateChangesForChangelog(): void;
+    generateLastChangesSummary(): Promise<string>;
+    getLastChangesFromCommits({ maxMessagesToCheck, stopOnCommitMessage, }?: {
+        /**
+         * default 3
+         */
+        maxMessagesToCheck?: number;
+        /**
+         * stop serching on commit message
+         */
+        stopOnCommitMessage?: string;
+    }): Promise<string>;
+    getLastReleaseCommitData(): Promise<{
+        lastRelaseCommitMsg: string;
+        /**
+         * -1 if not found
+         */
+        index: number;
+    }>;
+    getLastPackageVersionChangesFromChnagelog(): Promise<string>;
+    private get changeLogPath();
+    get changelogContent(): any;
+    changeLogKeyWord(): string;
+    getChnagelogData(): ChangelogData[];
+}

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

@@ -0,0 +1,6 @@
+// @ts-nocheck
+import type { BaseProject } from './base-project';
+import { BaseFeatureForProject } from './base-feature-for-project';
+export declare class BaseVscodeHelpers<PROJCET extends BaseProject = any> extends BaseFeatureForProject {
+    get extensions(): string[];
+}

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

@@ -20,10 +20,18 @@ export type CoreCommandArgOptions<PROJECT extends BaseProject> = {
      * first arg from command line
      */
     firstArg: string;
+    /**
+     * Not question for user ex.
+     * - automatic process of patch release
+     * - automatic deployment for default server
+     */
+    automaticProcess?: boolean;
     /**
      * orignal args with params
      */
     argsWithParams: string;
+    copyto?: string[];
+    copytoall?: boolean;
     /**
      * args from command line (clearn from params)
      */

package/client/lib/models.d.ts

@@ -24,4 +24,10 @@ export type LibraryBuildCommandOptions = {
 export type LibrariesBuildOptions = {
     strategy?: 'link' | 'copy';
     buildType: core.CoreModels.LibraryType;
-};
+    copylink_to_node_modules?: string[];
+};
+export interface ChangelogData {
+    changes: string[];
+    version: string;
+    date: string;
+}

package/client/package.json

@@ -43,12 +43,12 @@
       "firedev-helpers"
     ]
   },
-  "version": "16.444.19",
+  "version": "16.444.21",
   "dependencies": {
-    "json10-writer": "~16.444.12",
+    "json10-writer": "~16.444.14",
     "lowdb": "7.0.1",
     "task.js": "0.1.5",
-    "tnp-models": "~16.444.12",
+    "tnp-models": "~16.444.14",
     "typescript": "~5.0.2"
   },
   "scripts": {
@@ -89,6 +89,7 @@
     "@compodoc/compodoc": "1.1.23",
     "@iconify/icons-fa-solid": "1.2.2",
     "@iconify/icons-mdi": "1.2.1",
+    "@inquirer/prompts": "5.3.2",
     "@mdi/js": "7.2.96",
     "@ng-matero/extensions": "16.0.0",
     "@ngneat/falso": "6.4.0",
@@ -146,7 +147,7 @@
     "angular-material-css-vars": "5.0.2",
     "angular-resize-event": "3.2.0",
     "animate.css": "4.1.1 ",
-    "any-project-cli": "~16.444.11",
+    "any-project-cli": "16.444.12",
     "app-root-path": "3.0.0",
     "axios": "1.3.5",
     "background-worker-process": "~16.100.10",
@@ -202,13 +203,13 @@
     "file-saver": "2.0.5",
     "file-type": "18.5.0",
     "firedev": "^16",
-    "firedev-crud": "~16.444.11",
-    "firedev-crud-deamon": "~16.444.11",
-    "firedev-ports": "~16.444.11",
-    "firedev-storage": "~16.444.5",
-    "firedev-type-sql": "~16.444.11",
-    "firedev-typeorm": "~16.444.5",
-    "firedev-ui": "~16.444.1",
+    "firedev-crud": "~16.444.13",
+    "firedev-crud-deamon": "~16.444.13",
+    "firedev-ports": "~16.444.13",
+    "firedev-storage": "~16.444.9",
+    "firedev-type-sql": "~16.444.13",
+    "firedev-typeorm": "~16.444.9",
+    "firedev-ui": "16.444.1",
     "fkill": "6.1.0",
     "font-awesome": "4.7.0",
     "form-data": "4.0.0",
@@ -226,11 +227,11 @@
     "image-focus": "1.2.1",
     "immer": "10.0.2",
     "immutable": "4.3.0",
-    "incremental-compiler": "~16.444.12",
+    "incremental-compiler": "~16.444.14",
     "inquirer": "7.3.3",
     "inquirer-autocomplete-prompt": "1.3.0",
     "is-elevated": "3.0.0",
-    "isomorphic-region-loader": "~16.444.11",
+    "isomorphic-region-loader": "~16.444.13",
     "istanbul-instrumenter-loader": "2.0.0",
     "jest": "29.5.0",
     "jest-date-mock": "1.0.8",
@@ -241,7 +242,7 @@
     "joi": "17.9.2",
     "jscodeshift": "0.6.3",
     "json-stringify-safe": "5.0.1",
-    "json10": "~16.444.11",
+    "json10": "~16.444.13",
     "json5": "2.2.1",
     "json5-writer": "0.2.0",
     "jszip": "3.10.1",
@@ -250,8 +251,8 @@
     "localforage": "1.10.0",
     "lockfile": "1.0.4",
     "lodash": "4.17.20",
-    "lodash-walk-object": "~16.444.10",
-    "magic-renamer": "~16.444.10",
+    "lodash-walk-object": "~16.444.12",
+    "magic-renamer": "~16.444.12",
     "material-design-icons": "3.0.1",
     "method-override": "2.3.10",
     "minimist": "1.2.0",
@@ -262,10 +263,10 @@
     "ng-in-viewport": "15.0.2",
     "ng-lock": "16.0.1",
     "ng-packagr": "16.0.1",
-    "ng-talkback": "~16.444.1",
-    "ng2-logger": "~16.444.12",
+    "ng-talkback": "~16.444.5",
+    "ng2-logger": "~16.444.14",
     "ng2-pdfjs-viewer": "16.0.4",
-    "ng2-rest": "~16.444.10",
+    "ng2-rest": "~16.444.12",
     "ngx-ace-wrapper": "14.0.0",
     "ngx-editor": "15.3.0",
     "ngx-highlightjs": "9.0.0",
@@ -278,7 +279,7 @@
     "ngx-scrolltop": "6.0.0",
     "ngx-store": "3.1.1",
     "ngx-typed-js": "2.1.1",
-    "node-cli-tester": "~16.444.1",
+    "node-cli-tester": "~16.444.5",
     "node-localstorage": "2.1.6",
     "node-notifier": "6.0.0",
     "node-polyfill-webpack-plugin": "2.0.1",
@@ -307,30 +308,30 @@
     "q": "1.5.1",
     "rallax.js": "2.0.4",
     "randomcolor": "0.5.3",
-    "record-replay-req-res-scenario": "~16.444.1",
+    "record-replay-req-res-scenario": "~16.444.5",
     "reflect-metadata": "0.1.10",
     "rimraf": "2.6.2",
     "rxjs": "~7.8.0",
     "semver": "6.3.0",
-    "simple-git": "1.96.0",
+    "simple-git": "3.25.0",
     "sinon": "15.2.0",
     "sloc": "0.2.0",
     "socket.io": "4.7.5",
     "socket.io-client": "4.7.5",
     "sort-package-json": "1.11.0",
     "sql.js": "1.8.0",
-    "static-columns": "~16.444.3",
+    "static-columns": "~16.444.8",
     "string-similarity": "4.0.2",
     "sudo-block": "3.0.0",
     "supertest": "6.3.3",
     "sweetalert2": "11.7.12",
     "systeminformation": "3.45.7",
     "threads": "1.7.0",
-    "tnp-cli": "~16.444.1",
-    "tnp-config": "~16.444.12",
-    "tnp-core": "~16.444.14",
-    "tnp-db": "~16.444.10",
-    "tnp-helpers": "~16.444.18",
+    "tnp-cli": "~16.444.5",
+    "tnp-config": "~16.444.14",
+    "tnp-core": "~16.444.16",
+    "tnp-db": "~16.444.12",
+    "tnp-helpers": "~16.444.20",
     "ts-debug": "1.3.0",
     "ts-json-schema-generator": "2.1.1",
     "ts-loader": "2.3.1",
@@ -340,13 +341,13 @@
     "turndown": "7.1.2",
     "typedoc": "0.25.13",
     "typedoc-plugin-markdown": "4.0.3",
-    "typescript-class-helpers": "~16.444.12",
+    "typescript-class-helpers": "~16.444.14",
     "typescript-formatter": "~7.2.2",
     "underscore": "1.9.1",
     "uuid": "8.3.2",
     "validator": "9.2.0",
     "video.js": "8.3.0",
-    "vpn-split": "~16.444.1",
+    "vpn-split": "~16.444.5",
     "vscode": "1.1.37",
     "wait-on": "7.0.1",
     "watch": "1.0.2",
@@ -356,6 +357,6 @@
     "yup": "1.1.1",
     "zone.js": "~0.13.0"
   },
-  "lastBuildTagHash": "e1beda838f1d0b49add452d3fb1f1d83f2739e10",
+  "lastBuildTagHash": "798f9b3a244baf724b6566eade5e1cf8d4934dab",
   "main": "dist/app.electron.js"
 }

package/lib/base/base-command-line.backend.d.ts

@@ -4,6 +4,8 @@ import { TypeOfCommit } from './commit-data';
 export declare class BaseCommandLine<PARAMS = any, PROJECT extends BaseProject<any, any> = BaseProject> extends CommandLineFeature<PARAMS, PROJECT> {
     _(): void;
     preventCwdIsNotProject(): void;
+    hosts(): void;
+    countCommits(): void;
     removeSubmodules(): void;
     setEditor(): Promise<void>;
     /**
@@ -16,6 +18,7 @@ export declare class BaseCommandLine<PARAMS = any, PROJECT extends BaseProject<a
     develop(): Promise<void>;
     dev(): Promise<void>;
     pull(): Promise<void>;
+    pullAll(): Promise<void>;
     private __resetInfo;
     reset(): Promise<void>;
     soft(): void;
@@ -51,6 +54,7 @@ export declare class BaseCommandLine<PARAMS = any, PROJECT extends BaseProject<a
         commitMessageRequired?: boolean;
         noExit?: boolean;
     }): Promise<void>;
+    _preventPushPullFromNotCorrectBranch(): Promise<void>;
     push(options?: {
         force?: boolean;
         typeofCommit?: TypeOfCommit;
@@ -113,7 +117,6 @@ export declare class BaseCommandLine<PARAMS = any, PROJECT extends BaseProject<a
     REMOTE_https(): Promise<void>;
     origin(): void;
     origins(): void;
-    countCommits(): void;
     isTerminalSupported(): void;
     PROJ_EXT(): void;
     projdb(): void;

package/lib/base/base-command-line.backend.js

@@ -6,6 +6,7 @@ var index_1 = require("../index");
 var command_line_feature_backend_1 = require("./command-line-feature.backend");
 var tnp_core_1 = require("tnp-core");
 var tnp_config_1 = require("tnp-config");
+var tnp_config_2 = require("tnp-config");
 var tnp_core_2 = require("tnp-core");
 var BaseCommandLine = /** @class */ (function (_super) {
     tslib_1.__extends(BaseCommandLine, _super);
@@ -20,6 +21,19 @@ var BaseCommandLine = /** @class */ (function (_super) {
             index_1.Helpers.error('This is not a project folder', false, true);
         }
     };
+    //#region commands / hosts
+    BaseCommandLine.prototype.hosts = function () {
+        index_1.Helpers.run("code ".concat((0, tnp_core_2.crossPlatformPath)(tnp_config_1.HOST_FILE_PATH))).sync();
+        process.exit(0);
+    };
+    //#endregion
+    //#region commands / count commits
+    BaseCommandLine.prototype.countCommits = function () {
+        console.log(index_1.Helpers.git.countCommits(this.cwd));
+        this._exit();
+    };
+    //#endregion
+    //#region commands / remove submodules
     BaseCommandLine.prototype.removeSubmodules = function () {
         var e_1, _a;
         index_1.Helpers.taskStarted('Removing submodules...');
@@ -46,6 +60,7 @@ var BaseCommandLine = /** @class */ (function (_super) {
         index_1.Helpers.taskDone('Done');
         this._exit();
     };
+    //#endregion
     //#region commands / set editor
     BaseCommandLine.prototype.setEditor = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -317,6 +332,23 @@ var BaseCommandLine = /** @class */ (function (_super) {
         });
     };
     //#endregion
+    //#region commands / pull all
+    BaseCommandLine.prototype.pullAll = function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        this.preventCwdIsNotProject();
+                        return [4 /*yield*/, this.project.git.pullProcess(true)];
+                    case 1:
+                        _a.sent();
+                        this._exit();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    //#endregion
     //#region commands / reset
     BaseCommandLine.prototype.__resetInfo = function (branchToReset) {
         index_1.Helpers.info("\n\n    YOU ARE RESETING EVERYTHING TO BRANCH: ".concat(tnp_core_1.chalk.bold(branchToReset), "\n\n- curret project (").concat(this.project.name, ")\n").concat(tnp_core_1._.isArray(this.project.children) && this.project.children.length > 0
@@ -618,6 +650,64 @@ var BaseCommandLine = /** @class */ (function (_super) {
     };
     //#endregion
     //#region commands / push
+    BaseCommandLine.prototype._preventPushPullFromNotCorrectBranch = function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _loop_1, this_1, state_1;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _loop_1 = function () {
+                            var devBranch, options_1, res;
+                            return tslib_1.__generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0:
+                                        devBranch = this_1.project.git.duringPushWarnIfProjectNotOnSpecyficDevBranch();
+                                        if (!(!!devBranch && devBranch !== this_1.project.git.currentBranchName)) return [3 /*break*/, 2];
+                                        index_1.Helpers.warn("\n\n        ".concat(this_1.project.genericName, "\n\n        You are not on ").concat(devBranch, " branch. Please switch to this branch and try again\n\n\n\n        "), false);
+                                        options_1 = {
+                                            open: { name: 'Open in vscode' },
+                                            continue: { name: 'Continue (check again)' },
+                                            continueForce: { name: 'Continue (without checking)' },
+                                            exit: { name: 'Exit process' },
+                                        };
+                                        return [4 /*yield*/, index_1.Helpers.selectChoicesAsk('What you want to do ?', Object.keys(options_1).map(function (k) {
+                                                return { name: options_1[k].name, value: k };
+                                            }))];
+                                    case 1:
+                                        res = _b.sent();
+                                        if (res === 'continue') {
+                                            return [2 /*return*/, "continue"];
+                                        }
+                                        if (res === 'exit') {
+                                            this_1._exit();
+                                        }
+                                        if (res === 'open') {
+                                            this_1.project.run('code . ').sync();
+                                            return [2 /*return*/, "continue"];
+                                        }
+                                        if (res === 'continueForce') {
+                                            return [2 /*return*/, { value: void 0 }];
+                                        }
+                                        _b.label = 2;
+                                    case 2: return [2 /*return*/, { value: void 0 }];
+                                }
+                            });
+                        };
+                        this_1 = this;
+                        _a.label = 1;
+                    case 1:
+                        if (!true) return [3 /*break*/, 3];
+                        return [5 /*yield**/, _loop_1()];
+                    case 2:
+                        state_1 = _a.sent();
+                        if (typeof state_1 === "object")
+                            return [2 /*return*/, state_1.value];
+                        return [3 /*break*/, 1];
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
     BaseCommandLine.prototype.push = function (options) {
         if (options === void 0) { options = {}; }
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -626,10 +716,13 @@ var BaseCommandLine = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         this.preventCwdIsNotProject();
+                        return [4 /*yield*/, this._preventPushPullFromNotCorrectBranch()];
+                    case 1:
+                        _a.sent();
                         return [4 /*yield*/, this.project.git.pushProcess(tslib_1.__assign(tslib_1.__assign({}, options), { forcePushNoQuestion: options.force, args: this.args, exitCallBack: function () {
                                     _this._exit();
                                 }, setOrigin: this.params['setOrigin'] }))];
-                    case 1:
+                    case 2:
                         _a.sent();
                         if (options.noExit) {
                             return [2 /*return*/];
@@ -1108,7 +1201,7 @@ var BaseCommandLine = /** @class */ (function (_super) {
         var libs = proj.children.filter(function (child) {
             process.stdout.write('.');
             return child.git.thereAreSomeUncommitedChangeExcept([
-                tnp_config_1.config.file.package_json,
+                tnp_config_2.config.file.package_json,
             ]);
         });
         console.log('\n' + index_1.Helpers.terminalLine());
@@ -1209,14 +1302,13 @@ var BaseCommandLine = /** @class */ (function (_super) {
         this.REMOTES();
     };
     //#endregion
-    BaseCommandLine.prototype.countCommits = function () {
-        console.log(index_1.Helpers.git.countCommits(this.cwd));
-        this._exit();
-    };
+    //#region is terminal supported
     BaseCommandLine.prototype.isTerminalSupported = function () {
         console.log("Terminal is supported: ".concat(index_1.Helpers.isSupportedFiredevTerminal));
         this._exit();
     };
+    //#endregion
+    //#region prox ext
     BaseCommandLine.prototype.PROJ_EXT = function () {
         this.preventCwdIsNotProject();
         var p = this.project.pathFor('.vscode/extensions.json');
@@ -1234,12 +1326,15 @@ var BaseCommandLine = /** @class */ (function (_super) {
         }
         this._exit();
     };
+    //#endregion
+    //#region proj db
     BaseCommandLine.prototype.projdb = function () {
         this.preventCwdIsNotProject();
         index_1.Helpers.info("Projects db location:\n    ".concat(this.project.linkedProjects.projectsDbLocation, "\n\n    opening in vscode...\n\n    "));
         index_1.Helpers.run("code ".concat(this.project.linkedProjects.projectsDbLocation)).sync();
         this._exit();
     };
+    //#endregion
     //#region filter all project branches by pattern
     BaseCommandLine.prototype.__filterBranchesByPattern = function (branchPatternOrBranchName) {
         return index_1.Helpers.arrays.uniqArray(this.project.git.getBranchesNamesBy(branchPatternOrBranchName).map(function (a) {