tnp-helpers 18.0.20 → 18.0.21

package/lib/base/commit-data.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommitData = void 0;
-var tslib_1 = require("tslib");
 //#region imports
-var tnp_core_1 = require("tnp-core");
-var index_1 = require("../index");
-var tnp_core_2 = require("tnp-core");
+const tnp_core_1 = require("tnp-core");
+const index_1 = require("../index");
+const tnp_core_2 = require("tnp-core");
 //#endregion
 //#region open source proviers
-var openSourceProvidersIssuePrefix = [
+const openSourceProvidersIssuePrefix = [
     'GH',
     // 'GITHUB',
     // 'BB',
@@ -16,90 +15,81 @@ var openSourceProvidersIssuePrefix = [
     // 'GL',
     // 'GITLAB',
 ];
-var regexTeamsID = /[A-Z0-9]+\#/;
-var regexCommitModuleInArgs = /\[[a-z|\-|\,]+\]/;
-var regexCommitModuleInBranch = /\-\-[a-z|\-|\_]+\-\-/;
-var CommitData = /** @class */ (function () {
-    function CommitData() {
-        //#region static
-        //#endregion
-        this.useFeatureBranchForTestBranch = false;
-        //#endregion
-    }
+const regexTeamsID = /[A-Z0-9]+\#/;
+const regexCommitModuleInArgs = /\[[a-z|\-|\,]+\]/;
+const regexCommitModuleInBranch = /\-\-[a-z|\-|\_]+\-\-/;
+class CommitData {
+    //#region static
     //#region static / methods & getters / clean http(s) from commit message
-    CommitData.cleanHttpFromCommitMessage = function (commitMsg) {
+    static cleanHttpFromCommitMessage(commitMsg) {
         if (!commitMsg) {
             return commitMsg;
         }
         commitMsg = commitMsg.replace('https://', '');
         commitMsg = commitMsg.replace('http://', '');
         return commitMsg;
-    };
+    }
     //#endregion
     //#region static / methods & getters / get temas id from
-    CommitData.getTeamsIdFrom = function (commitMsg) {
-        var teamID = tnp_core_1._.first(commitMsg.match(regexTeamsID));
+    static getTeamsIdFrom(commitMsg) {
+        let teamID = tnp_core_1._.first(commitMsg.match(regexTeamsID));
         if (teamID) {
             commitMsg = commitMsg.replace(teamID, '');
         }
         return {
             commitMsgOrBranchName: commitMsg,
-            teamID: teamID,
+            teamID,
         };
-    };
+    }
     //#endregion
     //#region static / methods & getters / get module name from
-    CommitData.getModuleNameFrom = function (commitMsg) {
-        var commitModuleName = tnp_core_1._.first(commitMsg.match(regexCommitModuleInArgs));
+    static getModuleNameFrom(commitMsg) {
+        let commitModuleName = tnp_core_1._.first(commitMsg.match(regexCommitModuleInArgs));
         if (commitModuleName) {
             commitMsg = commitMsg.replace(commitModuleName, '');
         }
-        commitModuleName = commitModuleName === null || commitModuleName === void 0 ? void 0 : commitModuleName.replace(/\[/g, '').replace(/\]/g, '');
+        commitModuleName = commitModuleName?.replace(/\[/g, '').replace(/\]/g, '');
         return {
-            commitMsg: commitMsg,
-            commitModuleName: commitModuleName,
+            commitMsg,
+            commitModuleName,
         };
-    };
+    }
     //#endregion
     //#region static / methods & getters / extract jira numbers
     /**
      *
      * @returns jiras (from oldest to newset)
      */
-    CommitData.extractAndOrderJiraNumbers = function (commitOrBranchName) {
+    static extractAndOrderJiraNumbers(commitOrBranchName) {
         //#region @backendFunc
         return index_1.Helpers.uniqArray((tnp_core_1._.first(commitOrBranchName.split('\n')).match(/[A-Z0-9]+\-[0-9]+/g) ||
             [])
-            .map(function (originalName) {
+            .map(originalName => {
             return {
-                originalName: originalName,
+                originalName,
                 num: Number(originalName.replace(/[A-Z]+/g, '').replace(/\-+/g, '')),
             };
         })
-            .sort(function (_a, _b) {
-            var a = _a.num;
-            var b = _b.num;
-            return b - a;
-        })
-            .map(function (c) { return c.originalName; })
+            .sort(({ num: a }, { num: b }) => b - a)
+            .map(c => c.originalName)
             .reverse()
-            .filter(function (c) {
+            .filter(c => {
             // is there is not letter in jira number skip it
-            var regexONlyNumbers = /^[0-9]+$/;
+            const regexONlyNumbers = /^[0-9]+$/;
             if (regexONlyNumbers.test(c.replace(/\-/g, ''))) {
                 return false;
             }
             return true;
         }));
         //#endregion
-    };
+    }
     //#endregion
     //#region static / methods & getters / extract jira numbers
     /**
      *
      * @returns jiras (from oldest to newset)
      */
-    CommitData.extractAndOrderIssuesFromOtherProjects = function (
+    static extractAndOrderIssuesFromOtherProjects(
     /**
      * example:
      * commit: proper git commands tnp/GH-9 darekf77/tnp-helpers/GH-10
@@ -111,58 +101,52 @@ var CommitData = /** @class */ (function () {
             // console.trace('commitOrBranchName is empty');
             return [];
         }
-        var isBranch = !commitOrBranchName.trim().includes(' ');
+        const isBranch = !commitOrBranchName.trim().includes(' ');
         // console.log(`is branch: "${isBranch}" "${commitOrBranchName}"`);
         return index_1.Helpers.uniqArray((tnp_core_1._.first(commitOrBranchName.split('\n')).match(isBranch
             ? /\_\_(([a-zA-Z0-9\-])+\_)+[A-Z0-9]+\-[0-9]+\_\_/g
             : /(([a-zA-Z0-9\-])+\/)+[A-Z0-9]+\-[0-9]+/g) || [])
-            .map(function (originalName) {
-            return isBranch
-                ? originalName.replace(/\_\_/g, '').replace(/\_/g, '/')
-                : originalName;
-        })
-            .map(function (originalName) {
+            .map(originalName => isBranch
+            ? originalName.replace(/\_\_/g, '').replace(/\_/g, '/')
+            : originalName)
+            .map(originalName => {
             // replace all non numbers
-            var issueNum = originalName
+            const issueNum = originalName
                 .replace(/\D/g, ' ')
                 .split(' ')
                 .pop();
             // console.log({ originalName, issueNum });
             return {
-                originalName: originalName,
+                originalName,
                 num: Number(issueNum),
             };
         })
-            .sort(function (_a, _b) {
-            var a = _a.num;
-            var b = _b.num;
-            return b - a;
-        })
-            .map(function (c) { return c.originalName; })
+            .sort(({ num: a }, { num: b }) => b - a)
+            .map(c => c.originalName)
             .reverse()
-            .filter(function (c) {
+            .filter(c => {
             // is there is not letter in jira number skip it
-            var regexONlyNumbers = /^[0-9]+$/;
+            const regexONlyNumbers = /^[0-9]+$/;
             if (regexONlyNumbers.test(c.replace(/\-/g, ''))) {
                 return false;
             }
             return true;
         })
-            .map(function (issue) {
+            .map(issue => {
             // console.log('MAPPING', issue);
             // console.log('project', project?.name);
             if (issue.split('/').length === 2 && !!currentOrigin) {
                 // console.log('issue', issue);
-                var origin_1 = index_1.Helpers.git.originSshToHttp(currentOrigin);
-                var provider = tnp_core_1._.first(origin_1.replace('https://', '').split('/'));
-                var cleanUserWithPath = origin_1
+                const origin = index_1.Helpers.git.originSshToHttp(currentOrigin);
+                const provider = tnp_core_1._.first(origin.replace('https://', '').split('/'));
+                const cleanUserWithPath = origin
                     .replace('https://', '')
                     .replace(provider + '/', '')
-                    .replace(tnp_core_2.path.basename(origin_1).replace('.git', ''), '')
+                    .replace(tnp_core_2.path.basename(origin).replace('.git', ''), '')
                     .replace('.git', '');
-                var issueFirstPart = tnp_core_1._.first(issue.split('/'));
-                var issueLastPart = tnp_core_1._.last(issue.split('/'));
-                var newPath = "".concat(cleanUserWithPath, "/").concat(issueFirstPart, "/").concat(issueLastPart).replace(/\/\/+/g, '/');
+                const issueFirstPart = tnp_core_1._.first(issue.split('/'));
+                const issueLastPart = tnp_core_1._.last(issue.split('/'));
+                const newPath = `${cleanUserWithPath}/${issueFirstPart}/${issueLastPart}`.replace(/\/\/+/g, '/');
                 // console.log({
                 //   origin,
                 //   provider,
@@ -176,13 +160,12 @@ var CommitData = /** @class */ (function () {
             return issue;
         }));
         //#endregion
-    };
+    }
     //#endregion
     //#region static / methods & getters / clean message from jira numbers, team id and stuff
-    CommitData.cleanMessageFromJiraNumTeamIdEtc = function (message, optinos) {
-        var e_1, _a, e_2, _b;
+    static cleanMessageFromJiraNumTeamIdEtc(message, optinos) {
         message = message || '';
-        var _c = optinos || {}, teamID = _c.teamID, commitModuleName = _c.commitModuleName, jiraNumbers = _c.jiraNumbers, issuesFromOtherProjects = _c.issuesFromOtherProjects;
+        let { teamID, commitModuleName, jiraNumbers, issuesFromOtherProjects } = optinos || {};
         teamID = teamID || this.getTeamsIdFrom(message).teamID || '';
         commitModuleName =
             commitModuleName ||
@@ -197,53 +180,33 @@ var CommitData = /** @class */ (function () {
             message = message.replace(teamID.toLowerCase().replace('-', ' '), ' ');
             message = message.replace(teamID.toUpperCase().replace('-', ' '), ' ');
         }
-        try {
-            // console.log({ clere: 'CLEAR', issuesFromOtherProjects, message });
-            for (var _d = tslib_1.__values(issuesFromOtherProjects || []), _e = _d.next(); !_e.done; _e = _d.next()) {
-                var issueFromOtherProj = _e.value;
-                // console.log('issueFromOtherProj', issueFromOtherProj);
-                // console.log('message', message);
-                message = message.replace("__".concat(issueFromOtherProj.replace(/\//g, '_').replace(/\-/g, ' '), "__"), ' ');
-                message = message.replace(issueFromOtherProj, ' ');
-                message = message.replace(issueFromOtherProj.toLowerCase().replace('-', ' '), ' ');
-                message = message.replace(issueFromOtherProj.toUpperCase().replace('-', ' '), ' ');
-                message = message.replace(issueFromOtherProj.toLowerCase(), ' ');
-                message = message.replace(regexCommitModuleInArgs, ' ');
-                message = message.replace(regexCommitModuleInBranch, ' ');
-                message = message.replace(/\ \ /g, ' ');
-            }
+        // console.log({ clere: 'CLEAR', issuesFromOtherProjects, message });
+        for (const issueFromOtherProj of issuesFromOtherProjects || []) {
+            // console.log('issueFromOtherProj', issueFromOtherProj);
+            // console.log('message', message);
+            message = message.replace(`__${issueFromOtherProj.replace(/\//g, '_').replace(/\-/g, ' ')}__`, ' ');
+            message = message.replace(issueFromOtherProj, ' ');
+            message = message.replace(issueFromOtherProj.toLowerCase().replace('-', ' '), ' ');
+            message = message.replace(issueFromOtherProj.toUpperCase().replace('-', ' '), ' ');
+            message = message.replace(issueFromOtherProj.toLowerCase(), ' ');
+            message = message.replace(regexCommitModuleInArgs, ' ');
+            message = message.replace(regexCommitModuleInBranch, ' ');
+            message = message.replace(/\ \ /g, ' ');
         }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-        try {
-            for (var _f = tslib_1.__values(jiraNumbers || []), _g = _f.next(); !_g.done; _g = _f.next()) {
-                var jira = _g.value;
-                message = message.replace(jira.toLowerCase().replace('-', ' '), ' ');
-                message = message.replace(jira.toUpperCase().replace('-', ' '), ' ');
-                message = message.replace(jira, ' ');
-                message = message.replace(jira.toLowerCase(), ' ');
-                message = message.replace(regexCommitModuleInArgs, ' ');
-                message = message.replace(regexCommitModuleInBranch, ' ');
-                message = message.replace(/\ \ /g, ' ');
-            }
-        }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-        finally {
-            try {
-                if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
-            }
-            finally { if (e_2) throw e_2.error; }
+        for (const jira of jiraNumbers || []) {
+            message = message.replace(jira.toLowerCase().replace('-', ' '), ' ');
+            message = message.replace(jira.toUpperCase().replace('-', ' '), ' ');
+            message = message.replace(jira, ' ');
+            message = message.replace(jira.toLowerCase(), ' ');
+            message = message.replace(regexCommitModuleInArgs, ' ');
+            message = message.replace(regexCommitModuleInBranch, ' ');
+            message = message.replace(/\ \ /g, ' ');
         }
         if (!!teamID.trim()) {
             message = message.replace(/\_/g, ' ');
         }
         if (!!commitModuleName.trim()) {
-            var cleanedModuleName = commitModuleName
+            const cleanedModuleName = commitModuleName
                 .replace(/\-/g, ' ')
                 .replace(/\,/g, '_');
             message = message.replace(cleanedModuleName, ' ');
@@ -252,408 +215,393 @@ var CommitData = /** @class */ (function () {
             .replace(/\ \ /g, ' ')
             .replace(/\ \ /g, ' ')
             .replace(/\ \ /g, ' ');
-    };
+    }
     //#endregion
     //#region static / methods & getters / get module name from branch
-    CommitData.getModuleNameFromBranch = function (branchName) {
-        var _a, _b;
-        var commitModuleName = tnp_core_1._.first(branchName.match(regexCommitModuleInBranch));
+    static getModuleNameFromBranch(branchName) {
+        let commitModuleName = tnp_core_1._.first(branchName.match(regexCommitModuleInBranch));
         if (commitModuleName) {
             branchName = branchName.replace(commitModuleName, '');
-            commitModuleName = (_a = commitModuleName === null || commitModuleName === void 0 ? void 0 : commitModuleName.replace(/^\-\-/, '')) === null || _a === void 0 ? void 0 : _a.replace(/\-\-$/, '');
+            commitModuleName = commitModuleName
+                ?.replace(/^\-\-/, '')
+                ?.replace(/\-\-$/, '');
             if (commitModuleName.startsWith('-')) {
                 commitModuleName = commitModuleName.replace(/^\-/, '');
             }
         }
-        commitModuleName = (_b = commitModuleName === null || commitModuleName === void 0 ? void 0 : commitModuleName.replace(/^\-\-/, '')) === null || _b === void 0 ? void 0 : _b.replace(/\-\-$/, '').replace(/\_/, ',');
-        return { commitModuleName: commitModuleName };
-    };
+        commitModuleName = commitModuleName
+            ?.replace(/^\-\-/, '')
+            ?.replace(/\-\-$/, '')
+            .replace(/\_/, ',');
+        return { commitModuleName };
+    }
     //#endregion
     //#region static / methods & getters / get from args
-    CommitData.getFromArgs = function (args, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var typeOfCommit, currentOrigin, messageFromArgs, teamIdData, issuesFromOtherProjects, issuesFromOtherProjects_1, issuesFromOtherProjects_1_1, iterator, moduleNameData, jiraNumbers, split, split;
-            var e_3, _a;
-            return tslib_1.__generator(this, function (_b) {
-                //#region @backendFunc
-                options = options || {};
-                typeOfCommit = options.typeOfCommit, currentOrigin = options.currentOrigin;
-                args = args.map(function (arg) {
-                    var e_4, _a;
-                    var githubOtherIssueRegex = /[a-z0-9\-\/]+\#[0-9]+/g;
-                    var matches = arg.match(githubOtherIssueRegex);
-                    if (matches) {
-                        try {
-                            for (var matches_1 = tslib_1.__values(matches), matches_1_1 = matches_1.next(); !matches_1_1.done; matches_1_1 = matches_1.next()) {
-                                var match = matches_1_1.value;
-                                var _b = tslib_1.__read(match.split('#'), 2), repo = _b[0], issue = _b[1];
-                                // TODO last handle other providers than github
-                                arg = arg.replace(match, "".concat(repo, "/GH-").concat(issue));
-                                // console.log('fixing github issue', match, 'to', `${repo}/GH-${issue}`);
-                            }
-                        }
-                        catch (e_4_1) { e_4 = { error: e_4_1 }; }
-                        finally {
-                            try {
-                                if (matches_1_1 && !matches_1_1.done && (_a = matches_1.return)) _a.call(matches_1);
-                            }
-                            finally { if (e_4) throw e_4.error; }
-                        }
-                    }
-                    return arg;
-                });
-                messageFromArgs = args.join(' ');
-                teamIdData = this.getTeamsIdFrom(messageFromArgs);
-                issuesFromOtherProjects = this.extractAndOrderIssuesFromOtherProjects(messageFromArgs, currentOrigin);
-                try {
-                    // console.log({ issuesFromOtherProjects });
-                    for (issuesFromOtherProjects_1 = tslib_1.__values(issuesFromOtherProjects), issuesFromOtherProjects_1_1 = issuesFromOtherProjects_1.next(); !issuesFromOtherProjects_1_1.done; issuesFromOtherProjects_1_1 = issuesFromOtherProjects_1.next()) {
-                        iterator = issuesFromOtherProjects_1_1.value;
-                        messageFromArgs = messageFromArgs.replace(iterator, '');
-                    }
-                }
-                catch (e_3_1) { e_3 = { error: e_3_1 }; }
-                finally {
-                    try {
-                        if (issuesFromOtherProjects_1_1 && !issuesFromOtherProjects_1_1.done && (_a = issuesFromOtherProjects_1.return)) _a.call(issuesFromOtherProjects_1);
-                    }
-                    finally { if (e_3) throw e_3.error; }
-                }
-                // console.log({ teamIdData })
-                messageFromArgs = teamIdData.commitMsgOrBranchName;
-                moduleNameData = this.getModuleNameFrom(messageFromArgs);
-                messageFromArgs = moduleNameData.commitMsg;
-                jiraNumbers = this.extractAndOrderJiraNumbers(messageFromArgs);
-                // console.log(`
-                // msg: '${message}'
-                // jiras: ${jiraNumbers.join(',')}
-                // `)
-                messageFromArgs = this.cleanHttpFromCommitMessage(messageFromArgs);
-                if (messageFromArgs.search(':') !== -1) {
-                    split = messageFromArgs.split(':');
-                    messageFromArgs = split.join(':\n');
-                }
-                if (messageFromArgs.search(' - ') !== -1) {
-                    split = messageFromArgs.split(' - ');
-                    messageFromArgs = split.join('\n- ');
+    static async getFromArgs(args, options) {
+        //#region @backendFunc
+        options = options || {};
+        const { typeOfCommit, currentOrigin } = options;
+        args = args.map(arg => {
+            const githubOtherIssueRegex = /[a-z0-9\-\/]+\#[0-9]+/g;
+            const matches = arg.match(githubOtherIssueRegex);
+            if (matches) {
+                for (const match of matches) {
+                    const [repo, issue] = match.split('#');
+                    // TODO last handle other providers than github
+                    arg = arg.replace(match, `${repo}/GH-${issue}`);
+                    // console.log('fixing github issue', match, 'to', `${repo}/GH-${issue}`);
                 }
-                // console.log({ messageFromArgs })
-                return [2 /*return*/, CommitData.from({
-                        message: messageFromArgs,
-                        typeOfCommit: typeOfCommit,
-                        jiraNumbers: jiraNumbers,
-                        issuesFromOtherProjects: issuesFromOtherProjects,
-                        commitModuleName: moduleNameData.commitModuleName,
-                        teamID: teamIdData.teamID,
-                    })];
-            });
+            }
+            return arg;
         });
-    };
+        let messageFromArgs = args.join(' ');
+        const teamIdData = this.getTeamsIdFrom(messageFromArgs);
+        const issuesFromOtherProjects = this.extractAndOrderIssuesFromOtherProjects(messageFromArgs, currentOrigin);
+        // console.log({ issuesFromOtherProjects });
+        for (const iterator of issuesFromOtherProjects) {
+            messageFromArgs = messageFromArgs.replace(iterator, '');
+        }
+        // console.log({ teamIdData })
+        messageFromArgs = teamIdData.commitMsgOrBranchName;
+        const moduleNameData = this.getModuleNameFrom(messageFromArgs);
+        messageFromArgs = moduleNameData.commitMsg;
+        const jiraNumbers = this.extractAndOrderJiraNumbers(messageFromArgs);
+        // console.log(`
+        // msg: '${message}'
+        // jiras: ${jiraNumbers.join(',')}
+        // `)
+        messageFromArgs = this.cleanHttpFromCommitMessage(messageFromArgs);
+        if (messageFromArgs.search(':') !== -1) {
+            const split = messageFromArgs.split(':');
+            messageFromArgs = split.join(':\n');
+        }
+        if (messageFromArgs.search(' - ') !== -1) {
+            const split = messageFromArgs.split(' - ');
+            messageFromArgs = split.join('\n- ');
+        }
+        // console.log({ messageFromArgs })
+        return CommitData.from({
+            message: messageFromArgs,
+            typeOfCommit,
+            jiraNumbers,
+            issuesFromOtherProjects,
+            commitModuleName: moduleNameData.commitModuleName,
+            teamID: teamIdData.teamID,
+            jiraIssuesAreOutsideBrackets: !!options.jiraIssuesAreOutsideBrackets,
+        });
+        //#endregion
+    }
     //#endregion
     //#region static / methods & getters / get from bramch
-    CommitData.getFromBranch = function (currentBranchName, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var releaseWords, currentOrigin, typeOfCommit, issuesFromOtherProjects, issuesFromOtherProjects_2, issuesFromOtherProjects_2_1, iterator, teamIdData, jiraNumbers, messageFromBranch, versionRegex, secondPartOfCurrentBranchName, resolveReleseVersionPart, resolveReleseVersion, releaseWord, moduleNameData, jiraNumbers_1, jiraNumbers_1_1, jira, toReplaceReleaseVer1, result;
-            var e_5, _a, e_6, _b;
-            return tslib_1.__generator(this, function (_c) {
-                //#region @backendFunc
-                options = options || { releaseWords: [] };
-                options.releaseWords = options.releaseWords || [];
-                releaseWords = options.releaseWords, currentOrigin = options.currentOrigin;
-                typeOfCommit = tnp_core_1._.first(currentBranchName.split('/'));
-                issuesFromOtherProjects = this.extractAndOrderIssuesFromOtherProjects(currentBranchName, currentOrigin);
-                try {
-                    // console.log({
-                    //   BEFORE: 'BEFOER',
-                    //   currentBranchName,
-                    // });
-                    for (issuesFromOtherProjects_2 = tslib_1.__values(issuesFromOtherProjects), issuesFromOtherProjects_2_1 = issuesFromOtherProjects_2.next(); !issuesFromOtherProjects_2_1.done; issuesFromOtherProjects_2_1 = issuesFromOtherProjects_2.next()) {
-                        iterator = issuesFromOtherProjects_2_1.value;
-                        currentBranchName = currentBranchName.replace("__".concat(iterator.replace(/\//g, '_'), "__"), '');
-                    }
-                }
-                catch (e_5_1) { e_5 = { error: e_5_1 }; }
-                finally {
-                    try {
-                        if (issuesFromOtherProjects_2_1 && !issuesFromOtherProjects_2_1.done && (_a = issuesFromOtherProjects_2.return)) _a.call(issuesFromOtherProjects_2);
-                    }
-                    finally { if (e_5) throw e_5.error; }
-                }
-                teamIdData = this.getTeamsIdFrom(currentBranchName);
-                currentBranchName = teamIdData.commitMsgOrBranchName;
-                jiraNumbers = this.extractAndOrderJiraNumbers(currentBranchName);
-                messageFromBranch = tnp_core_1._.last(currentBranchName.split('/')).replace(/\-/g, ' ');
-                versionRegex = new RegExp("(".concat(releaseWords.join('|'), ")\\-\\d+\\-\\d+\\-\\d+\\-"));
-                secondPartOfCurrentBranchName = tnp_core_1._.last(currentBranchName.split('/'));
-                resolveReleseVersionPart = versionRegex.test(secondPartOfCurrentBranchName)
-                    ? (tnp_core_1._.first(secondPartOfCurrentBranchName.match(versionRegex) || []) || '').replace(/^[a-z]+\-/g, '')
-                    : '';
-                resolveReleseVersion = resolveReleseVersionPart
-                    .replace(/\-/g, '.')
-                    .replace(/\.$/g, '');
-                releaseWord = tnp_core_1._.first(secondPartOfCurrentBranchName.split(resolveReleseVersionPart)).replace(/\-/g, '');
-                moduleNameData = this.getModuleNameFromBranch(currentBranchName);
-                if (moduleNameData.commitModuleName) {
-                    messageFromBranch = messageFromBranch.replace(moduleNameData.commitModuleName.replace(/\,/g, '_'), '');
-                }
-                try {
-                    for (jiraNumbers_1 = tslib_1.__values(jiraNumbers), jiraNumbers_1_1 = jiraNumbers_1.next(); !jiraNumbers_1_1.done; jiraNumbers_1_1 = jiraNumbers_1.next()) {
-                        jira = jiraNumbers_1_1.value;
-                        messageFromBranch = messageFromBranch.replace(jira.replace(/\-/g, ' '), '');
-                    }
-                }
-                catch (e_6_1) { e_6 = { error: e_6_1 }; }
-                finally {
-                    try {
-                        if (jiraNumbers_1_1 && !jiraNumbers_1_1.done && (_b = jiraNumbers_1.return)) _b.call(jiraNumbers_1);
-                    }
-                    finally { if (e_6) throw e_6.error; }
-                }
-                messageFromBranch = messageFromBranch.trim();
-                // const orgMessageFromBranch = messageFromBranch;
-                if (versionRegex.test(currentBranchName) && releaseWords.length > 0) {
-                    toReplaceReleaseVer1 = "".concat(releaseWord, "-").concat(resolveReleseVersionPart).replace(/\-/g, ' ');
-                    messageFromBranch = messageFromBranch.replace(toReplaceReleaseVer1.trim(), "".concat(releaseWord, " ").concat(resolveReleseVersion));
-                }
-                result = CommitData.from({
-                    message: messageFromBranch,
-                    typeOfCommit: typeOfCommit,
-                    jiraNumbers: jiraNumbers,
-                    issuesFromOtherProjects: issuesFromOtherProjects,
-                    commitModuleName: moduleNameData.commitModuleName,
-                    teamID: teamIdData.teamID,
-                });
-                return [2 /*return*/, result];
-            });
+    static async getFromBranch(currentBranchName, options) {
+        //#region @backendFunc
+        options = options || { releaseWords: [] };
+        options.releaseWords = options.releaseWords || [];
+        const { releaseWords, currentOrigin } = options;
+        const typeOfCommit = tnp_core_1._.first(currentBranchName.split('/'));
+        const issuesFromOtherProjects = this.extractAndOrderIssuesFromOtherProjects(currentBranchName, currentOrigin);
+        // console.log({
+        //   BEFORE: 'BEFOER',
+        //   currentBranchName,
+        // });
+        for (const iterator of issuesFromOtherProjects) {
+            currentBranchName = currentBranchName.replace(`__${iterator.replace(/\//g, '_')}__`, '');
+        }
+        // console.log({
+        //   BRANCHOTHERISSUE: issuesFromOtherProjects,
+        //   currentBranchName,
+        // });
+        const teamIdData = this.getTeamsIdFrom(currentBranchName);
+        currentBranchName = teamIdData.commitMsgOrBranchName;
+        const jiraNumbers = this.extractAndOrderJiraNumbers(currentBranchName);
+        let messageFromBranch = tnp_core_1._.last(currentBranchName.split('/')).replace(/\-/g, ' ');
+        const versionRegex = new RegExp(`(${releaseWords.join('|')})\\-\\d+\\-\\d+\\-\\d+\\-`);
+        const secondPartOfCurrentBranchName = tnp_core_1._.last(currentBranchName.split('/'));
+        let resolveReleseVersionPart = versionRegex.test(secondPartOfCurrentBranchName)
+            ? (tnp_core_1._.first(secondPartOfCurrentBranchName.match(versionRegex) || []) || '').replace(/^[a-z]+\-/g, '')
+            : '';
+        let resolveReleseVersion = resolveReleseVersionPart
+            .replace(/\-/g, '.')
+            .replace(/\.$/g, '');
+        const releaseWord = tnp_core_1._.first(secondPartOfCurrentBranchName.split(resolveReleseVersionPart)).replace(/\-/g, '');
+        const moduleNameData = this.getModuleNameFromBranch(currentBranchName);
+        if (moduleNameData.commitModuleName) {
+            messageFromBranch = messageFromBranch.replace(moduleNameData.commitModuleName.replace(/\,/g, '_'), '');
+        }
+        for (const jira of jiraNumbers) {
+            messageFromBranch = messageFromBranch.replace(jira.replace(/\-/g, ' '), '');
+        }
+        messageFromBranch = messageFromBranch.trim();
+        // const orgMessageFromBranch = messageFromBranch;
+        if (versionRegex.test(currentBranchName) && releaseWords.length > 0) {
+            var toReplaceReleaseVer1 = `${releaseWord}-${resolveReleseVersionPart}`.replace(/\-/g, ' ');
+            messageFromBranch = messageFromBranch.replace(toReplaceReleaseVer1.trim(), `${releaseWord} ${resolveReleseVersion}`);
+        }
+        // console.log({
+        //   secondPartOfCurrentBranchName,
+        //   resolveReleseVersionPart,
+        //   releaseWord,
+        //   toReplaceReleaseVer1,
+        //   orgMessageFromBranch,
+        //   messageFromBranch,
+        //   resolveReleseVersion,
+        //   versionRegex: versionRegex.source,
+        // });
+        const result = CommitData.from({
+            message: messageFromBranch,
+            typeOfCommit,
+            jiraNumbers,
+            issuesFromOtherProjects,
+            commitModuleName: moduleNameData.commitModuleName,
+            teamID: teamIdData.teamID,
+            jiraIssuesAreOutsideBrackets: !!options.jiraIssuesAreOutsideBrackets,
         });
-    };
+        return result;
+        //#endregion
+    }
     //#endregion
     //#region static / methods & getters / from
-    CommitData.from = function (options) {
+    static from(options) {
         options = (options ? options : {});
         // console.log(options)
-        var opt = tnp_core_1._.merge(new CommitData(), tnp_core_1._.cloneDeep(options));
+        const opt = tnp_core_1._.merge(new CommitData(), tnp_core_1._.cloneDeep(options));
         return opt;
-    };
+    }
+    //#endregion
+    //#endregion
+    //#region fields
+    _message;
+    typeOfCommit;
+    /**
+     * ex. JIRA-2132 or MYJIRAREFIX-234234
+     */
+    jiraNumbers;
+    /**
+     * if true then jira issues are outside brackets
+     * feat: proper git commands JIRA-1234
+     *
+     * by default is false
+     * feat(JIRA-1234): proper git commands
+     */
+    jiraIssuesAreOutsideBrackets;
+    /**
+     * when set -> jiraIssuesAreOutsideBrackets is true
+     */
+    commitModuleName;
+    teamID;
     //#endregion
     //#region methods & getters / clear message
-    CommitData.prototype.clearMessage = function (message) {
+    clearMessage(message) {
         return CommitData.cleanMessageFromJiraNumTeamIdEtc(message, {
             teamID: this.teamID,
             commitModuleName: this.commitModuleName,
             jiraNumbers: this.jiraNumbers,
             issuesFromOtherProjects: this.issuesFromOtherProjects,
         });
-    };
-    Object.defineProperty(CommitData.prototype, "message", {
-        //#endregion
-        //#region methods & getters / message
-        /**
-         * pure message what was done (without jira or prefixes)
-         * => is included in this.commitMessage
-         */
-        get: function () {
-            return this.clearMessage(this._message);
-        },
-        set: function (message) {
-            this._message = this.clearMessage(message);
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(CommitData.prototype, "branchPrefix", {
-        //#region methods & getters / branch prefix
-        get: function () {
-            //#region @backendFunc
-            var typeOfCommit = this.typeOfCommit;
-            if (typeOfCommit === 'feature') {
-                return 'feat';
-            }
-            else if (typeOfCommit === 'bugfix') {
-                return 'fix';
-            }
-            else if (typeOfCommit === 'performance') {
-                return 'perf';
-            }
-            return this.typeOfCommit || 'feat';
-            //#endregion
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(CommitData.prototype, "issuesFromOtherProjects", {
-        //#endregion
-        //#region methods & getters / issues from other projects
-        /**
-         * ex. taon/GH-12  darekf77/tnp-helpers/GH-4
-         */
-        get: function () {
-            return this.__issuesFromOtherProjects;
-        },
-        set: function (value) {
-            this.__issuesFromOtherProjects = value;
-            // this.__issuesFromOtherProjects = value.map(issue => {
-            //   console.log('MAPPING', issue);
-            //   console.log('project', this.project?.name);
-            //   if (issue.split('/').length === 1 && !!this.project) {
-            //     console.log('issue', issue);
-            //     const origin = Helpers.git.originSshToHttp(this.project.git.originURL);
-            //     const provider = _.first(origin.replace('https://', '').split('/'));
-            //     const cleanUserWithPath = origin
-            //       .replace('https://', '')
-            //       .replace(provider + '/', '')
-            //       .replace(path.basename(origin).replace('.git', ''), '');
-            //     const issueLastPart = _.last(issue.split('/'));
-            //     return `tnp/${cleanUserWithPath}/${issueLastPart}`;
-            //   }
-            //   return issue;
-            // });
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(CommitData.prototype, "commitMessage", {
+    }
+    //#endregion
+    //#region methods & getters / message
+    /**
+     * pure message what was done (without jira or prefixes)
+     * => is included in this.commitMessage
+     */
+    get message() {
+        return this.clearMessage(this._message);
+    }
+    set message(message) {
+        this._message = this.clearMessage(message);
+    }
+    //#endregion
+    useFeatureBranchForTestBranch = false;
+    //#region methods & getters / branch prefix
+    get branchPrefix() {
+        //#region @backendFunc
+        const typeOfCommit = this.typeOfCommit;
+        if (typeOfCommit === 'feature') {
+            return 'feat';
+        }
+        else if (typeOfCommit === 'bugfix') {
+            return 'fix';
+        }
+        else if (typeOfCommit === 'performance') {
+            return 'perf';
+        }
+        return this.typeOfCommit || 'feat';
         //#endregion
-        //#region methods & getters / commit message git commit -m
-        get: function () {
-            //#region @backendFunc
-            if (this.message === index_1.Helpers.git.ACTION_MSG_RESET_GIT_HARD_COMMIT) {
-                return this.message;
-            }
-            var otherIssues = this.issuesFromOtherProjects || [];
-            var jiraNumbers = (this.jiraNumbers || []).filter(function (f) { return !otherIssues.some(function (o) { return o.endsWith(f); }); });
-            // console.log({ jiraNumbers, otherIssues });
-            var jirasExists = jiraNumbers.length > 0 || otherIssues.length > 0;
-            var issuesFromOtherProjectsConnected = (jiraNumbers.length > 0 ? ',' : '') +
-                otherIssues
-                    .map(function (otherIssue) {
-                    var num = tnp_core_1._.last(otherIssue.split('-'));
-                    var providerPrefix = tnp_core_1._.last(otherIssue.split('/')).replace("-".concat(num), '');
-                    // console.log({ jira, num, providerPrefix });
-                    return "".concat(otherIssue.replace("/".concat(providerPrefix, "-"), '#'));
-                })
-                    .join(',');
-            if (issuesFromOtherProjectsConnected === ',') {
-                // QUICK_FIX
-                issuesFromOtherProjectsConnected = '';
+    }
+    //#endregion
+    //#region methods & getters / issues from other projects
+    /**
+     * ex. taon/GH-12  darekf77/tnp-helpers/GH-4
+     */
+    get issuesFromOtherProjects() {
+        return this.__issuesFromOtherProjects;
+    }
+    set issuesFromOtherProjects(value) {
+        this.__issuesFromOtherProjects = value;
+        // this.__issuesFromOtherProjects = value.map(issue => {
+        //   console.log('MAPPING', issue);
+        //   console.log('project', this.project?.name);
+        //   if (issue.split('/').length === 1 && !!this.project) {
+        //     console.log('issue', issue);
+        //     const origin = Helpers.git.originSshToHttp(this.project.git.originURL);
+        //     const provider = _.first(origin.replace('https://', '').split('/'));
+        //     const cleanUserWithPath = origin
+        //       .replace('https://', '')
+        //       .replace(provider + '/', '')
+        //       .replace(path.basename(origin).replace('.git', ''), '');
+        //     const issueLastPart = _.last(issue.split('/'));
+        //     return `tnp/${cleanUserWithPath}/${issueLastPart}`;
+        //   }
+        //   return issue;
+        // });
+    }
+    __issuesFromOtherProjects;
+    //#endregion
+    //#region methods & getters / commit message git commit -m
+    get commitMessage() {
+        //#region @backendFunc
+        if (this.message === index_1.Helpers.git.ACTION_MSG_RESET_GIT_HARD_COMMIT) {
+            return this.message;
+        }
+        const otherIssues = this.issuesFromOtherProjects || [];
+        const jiraNumbers = (this.jiraNumbers || []).filter(f => !otherIssues.some(o => o.endsWith(f)));
+        // console.log({ jiraNumbers, otherIssues });
+        const jirasExists = jiraNumbers.length > 0 || otherIssues.length > 0;
+        let issuesFromOtherProjectsConnected = (jiraNumbers.length > 0 ? ',' : '') +
+            otherIssues
+                .map(otherIssue => {
+                const num = tnp_core_1._.last(otherIssue.split('-'));
+                let providerPrefix = tnp_core_1._.last(otherIssue.split('/')).replace(`-${num}`, '');
+                // console.log({ jira, num, providerPrefix });
+                return `${otherIssue.replace(`/${providerPrefix}-`, '#')}`;
+            })
+                .join(',');
+        if (issuesFromOtherProjectsConnected === ',') {
+            // QUICK_FIX
+            issuesFromOtherProjectsConnected = '';
+        }
+        const jiras = (jiraNumbers || []).map(d => {
+            if (
+            // open source providers
+            openSourceProvidersIssuePrefix
+                .map(c => `${c}-`)
+                .some(gh => d.startsWith(gh))) {
+                const [jira, num] = d.split('-');
+                return `#${num}`;
             }
-            var jiras = (jiraNumbers || []).map(function (d) {
-                if (
-                // open source providers
-                openSourceProvidersIssuePrefix
-                    .map(function (c) { return "".concat(c, "-"); })
-                    .some(function (gh) { return d.startsWith(gh); })) {
-                    var _a = tslib_1.__read(d.split('-'), 2), jira = _a[0], num = _a[1];
-                    return "#".concat(num);
-                }
-                return d;
-            });
-            var commitMsg = '';
-            if (this.typeOfCommit === 'release') {
-                commitMsg = "".concat((this.message || '')
+            return d;
+        });
+        let commitMsg = '';
+        if (this.typeOfCommit === 'release') {
+            commitMsg = `${(this.message || '')
+                .split('\n')
+                .map(c => c.replace(/\-/g, ' '))
+                .join('\n-')
+                .trim()}`;
+        }
+        else {
+            if (this.teamID) {
+                commitMsg = `${jiras.join(' - ') + issuesFromOtherProjectsConnected} - ${(this.message || '')
                     .split('\n')
-                    .map(function (c) { return c.replace(/\-/g, ' '); })
+                    .map(c => c.replace(/\-/g, ' '))
                     .join('\n-')
-                    .trim());
+                    .trim()}`;
             }
             else {
-                if (this.teamID) {
-                    commitMsg = "".concat(jiras.join(' - ') + issuesFromOtherProjectsConnected, " - ").concat((this.message || '')
-                        .split('\n')
-                        .map(function (c) { return c.replace(/\-/g, ' '); })
-                        .join('\n-')
-                        .trim());
+                if (this.commitModuleName) {
+                    commitMsg =
+                        `${this.branchPrefix}${'(' + this.commitModuleName + ')'}:` +
+                            ` ${(this.message || '')
+                                .split('\n')
+                                .map(c => c.replace(/\-/g, ' '))
+                                .join('\n-')
+                                .trim()} ` +
+                            `${jirasExists
+                                ? [tnp_core_1._.first(jiras)].join(',') + issuesFromOtherProjectsConnected
+                                : ''}`;
                 }
                 else {
-                    if (this.commitModuleName) {
+                    if (this.jiraIssuesAreOutsideBrackets) {
                         commitMsg =
-                            "".concat(this.branchPrefix).concat('(' + this.commitModuleName + ')', ":") +
-                                " ".concat((this.message || '')
+                            `${this.branchPrefix}:` +
+                                ` ${(this.message || '')
                                     .split('\n')
-                                    .map(function (c) { return c.replace(/\-/g, ' '); })
+                                    .map(c => c.replace(/\-/g, ' '))
                                     .join('\n-')
-                                    .trim(), " ") +
-                                "".concat(jirasExists
-                                    ? [tnp_core_1._.first(jiras)].join(',') + issuesFromOtherProjectsConnected
-                                    : '');
+                                    .trim()} ` +
+                                `${jirasExists
+                                    ? [tnp_core_1._.first(jiras)].join(',') +
+                                        issuesFromOtherProjectsConnected
+                                    : ''}`;
                     }
                     else {
                         commitMsg =
-                            "".concat(this.branchPrefix).concat(jirasExists
+                            `${this.branchPrefix}${jirasExists
                                 ? '(' +
                                     [tnp_core_1._.first(jiras)].join(',') +
                                     issuesFromOtherProjectsConnected +
                                     ')'
-                                : '', ":") +
-                                " ".concat((this.message || '')
+                                : ''}:` +
+                                ` ${(this.message || '')
                                     .split('\n')
-                                    .map(function (c) { return c.replace(/\-/g, ' '); })
+                                    .map(c => c.replace(/\-/g, ' '))
                                     .join('\n-')
-                                    .trim());
+                                    .trim()}`;
                     }
                 }
             }
-            return commitMsg.replace(': :', ': ');
-            //#endregion
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(CommitData.prototype, "branchName", {
+        }
+        return commitMsg.replace(': :', ': ');
         //#endregion
-        //#region methods & getters / branch name
-        get: function () {
-            //#region @backendFunc
-            var typeOfCommit = this.typeOfCommit;
-            if (typeOfCommit === 'test' && this.useFeatureBranchForTestBranch) {
-                typeOfCommit = 'feature';
-            }
-            var teamId = this.teamID ? "".concat(this.teamID) : '';
-            var otherIssues = (typeOfCommit === 'release' ? [] : this.issuesFromOtherProjects) || [];
-            var jiraNumbers = ((typeOfCommit === 'release' ? [] : this.jiraNumbers) || []).filter(function (jiraNum) { return !otherIssues.some(function (otherIssue) { return otherIssue.endsWith(jiraNum); }); });
-            var jirasExists = jiraNumbers.length > 0;
-            var jiraNumbsConneted = tslib_1.__spreadArray(tslib_1.__spreadArray(tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(jiraNumbers.map(function (c) { return c.toUpperCase(); }).join('-')), false), [
-                jirasExists ? '-' : ''
-            ], false), tslib_1.__read(otherIssues.map(function (c) { return "__".concat(c.replace(/\//g, '_'), "__"); }).join('')), false), [
-                otherIssues ? '-' : '',
-            ], false).join('');
-            var branchName = '';
-            if (teamId) {
-                branchName =
-                    "".concat(typeOfCommit || 'feature', "/").concat(teamId).concat(jiraNumbsConneted) +
-                        "".concat(tnp_core_1._.snakeCase(this.message));
-            }
-            else if (this.commitModuleName) {
-                branchName =
-                    "".concat(typeOfCommit || 'feature', "/").concat(jiraNumbsConneted) +
-                        "--".concat(this.commitModuleName.replace(/\,/g, '_'), "--").concat(tnp_core_1._.kebabCase(this.message));
-            }
-            else {
-                branchName =
-                    "".concat(typeOfCommit || 'feature', "/").concat(jiraNumbsConneted) +
-                        "".concat(tnp_core_1._.kebabCase(this.message));
-            }
-            return branchName
-                .replace(/\/\-/g, '/') // QUICK_FIX
-                .replace(/\_\_\-/g, '__') // QUICK_FIX
-                .replace(/\-\-\-\-/g, '--'); // QUICK_FIX
-            //#endregion
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(CommitData.prototype, "isActionCommit", {
+    }
+    //#endregion
+    //#region methods & getters / branch name
+    get branchName() {
+        //#region @backendFunc
+        let typeOfCommit = this.typeOfCommit;
+        if (typeOfCommit === 'test' && this.useFeatureBranchForTestBranch) {
+            typeOfCommit = 'feature';
+        }
+        const teamId = this.teamID ? `${this.teamID}` : '';
+        const otherIssues = (typeOfCommit === 'release' ? [] : this.issuesFromOtherProjects) || [];
+        const jiraNumbers = ((typeOfCommit === 'release' ? [] : this.jiraNumbers) || []).filter(jiraNum => !otherIssues.some(otherIssue => otherIssue.endsWith(jiraNum)));
+        const jirasExists = jiraNumbers.length > 0;
+        const jiraNumbsConneted = [
+            ...jiraNumbers.map(c => c.toUpperCase()).join('-'),
+            jirasExists ? '-' : '',
+            ...otherIssues.map(c => `__${c.replace(/\//g, '_')}__`).join(''),
+            otherIssues ? '-' : '',
+        ].join('');
+        let branchName = '';
+        if (teamId) {
+            branchName =
+                `${typeOfCommit || 'feature'}/${teamId}${jiraNumbsConneted}` +
+                    `${tnp_core_1._.snakeCase(this.message)}`;
+        }
+        else if (this.commitModuleName) {
+            branchName =
+                `${typeOfCommit || 'feature'}/${jiraNumbsConneted}` +
+                    `--${this.commitModuleName.replace(/\,/g, '_')}--${tnp_core_1._.kebabCase(this.message)}`;
+        }
+        else {
+            branchName =
+                `${typeOfCommit || 'feature'}/${jiraNumbsConneted}` +
+                    `${tnp_core_1._.kebabCase(this.message)}`;
+        }
+        return branchName
+            .replace(/\/\-/g, '/') // QUICK_FIX
+            .replace(/\_\_\-/g, '__') // QUICK_FIX
+            .replace(/\-\-\-\-/g, '--'); // QUICK_FIX
+        //#endregion
+    }
+    //#endregion
+    //#region methods & getters / is action commit
+    get isActionCommit() {
+        //#region @backendFunc
+        return this.message === index_1.Helpers.git.ACTION_MSG_RESET_GIT_HARD_COMMIT;
         //#endregion
-        //#region methods & getters / is action commit
-        get: function () {
-            //#region @backendFunc
-            return this.message === index_1.Helpers.git.ACTION_MSG_RESET_GIT_HARD_COMMIT;
-            //#endregion
-        },
-        enumerable: false,
-        configurable: true
-    });
-    return CommitData;
-}());
+    }
+}
 exports.CommitData = CommitData;
 //# sourceMappingURL=commit-data.js.map