@taiga-ui/auto-changelog-config 0.493.0 → 0.495.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@taiga-ui/auto-changelog-config",
-    "version": "0.493.0",
+    "version": "0.495.0",
     "description": "Taiga UI auto-changelog config",
     "keywords": [
         "auto-changelog"

package/release-template.hbs

@@ -7,15 +7,15 @@
     {{#commit-parser merges commits}}
 
         {{#commit-list this heading='### ⚠️ BREAKING CHANGES' message='^(feat|fix|perf)(\([^)]*\))!:' }}
-            - {{#replaceCommit}}{{subject}}{{/replaceCommit}}{{#if pullRequest}}{{#if pullRequest.href}} ([#{{pullRequest.id}}]({{pullRequest.href}})){{else}} (#{{pullRequest.id}}){{/if}}{{/if}}{{#if shorthash}}{{#if href}} [({{shorthash}})]({{href}}){{else}} ({{shorthash}}){{/if}}{{/if}}
+            - {{changelogEntry}}
         {{/commit-list}}
 
         {{#commit-list this heading='### 🚀 Features' message='^feat:|^feat\(' exclude='^(feat|fix|perf)(\([^)]*\))!:'}}
-            - {{#replaceCommit}}{{subject}}{{/replaceCommit}}{{#if pullRequest}}{{#if pullRequest.href}} ([#{{pullRequest.id}}]({{pullRequest.href}})){{else}} (#{{pullRequest.id}}){{/if}}{{/if}}{{#if shorthash}}{{#if href}} [({{shorthash}})]({{href}}){{else}} ({{shorthash}}){{/if}}{{/if}}
+            - {{changelogEntry}}
         {{/commit-list}}
 
         {{#commit-list this heading='### 🐞 Bug Fixes' message='^fix:|^fix\(' exclude='^(feat|fix|perf)(\([^)]*\))!:'}}
-            - {{#replaceCommit}}{{subject}}{{/replaceCommit}}{{#if pullRequest}}{{#if pullRequest.href}} ([#{{pullRequest.id}}]({{pullRequest.href}})){{else}} (#{{pullRequest.id}}){{/if}}{{/if}}{{#if shorthash}}{{#if href}} [({{shorthash}})]({{href}}){{else}} ({{shorthash}}){{/if}}{{/if}}
+            - {{changelogEntry}}
         {{/commit-list}}
 
     {{/commit-parser}}

package/setup.js

@@ -3,6 +3,15 @@ module.exports = function (Handlebars) {
     const firstNonEmptyString = (...values) =>
         values.map((value) => String(value ?? '').trim()).find(Boolean) ?? '';
 
+    const escape = (value) => Handlebars.escapeExpression(String(value ?? ''));
+
+    const createMarkdownLink = (text, href) => {
+        const safeText = escape(text);
+        const safeHref = escape(href);
+
+        return href ? `[${safeText}](${safeHref})` : safeText;
+    };
+
     const getPullRequestId = (href) => {
         const [, id = ''] =
             String(href ?? '').match(
@@ -12,14 +21,49 @@ module.exports = function (Handlebars) {
         return id;
     };
 
-    const normalizePullRequest = (commit) => {
+    const getPullRequestIdFromText = (text) => {
+        const [, id = ''] = String(text ?? '').match(/\s\(#(\d+)\)\s*$/) ?? [];
+
+        return id;
+    };
+
+    const isPullRequestHref = (href) =>
+        /\/(?:pull|merge_requests|pull-requests)\/\d+(?:$|[/?#])/.test(
+            String(href ?? ''),
+        );
+
+    const isCommitHref = (href) =>
+        /\/commit\/[a-f\d]{7,40}(?:$|[/?#])/.test(String(href ?? ''));
+
+    const getCommitHashFromHref = (href) => {
+        const [, hash = ''] =
+            String(href ?? '').match(/\/commit\/([a-f\d]{7,40})(?:$|[/?#])/) ?? [];
+
+        return hash;
+    };
+
+    const getRepositoryHref = (href) => {
+        const [, repositoryHref = ''] =
+            String(href ?? '').match(/^(https?:\/\/[^/]+\/[^/]+\/[^/]+)(?:\/|$)/) ?? [];
+
+        return repositoryHref;
+    };
+
+    const normalizePullRequest = (commit, subject) => {
         const pullRequest = commit.pullRequest ?? {};
-        const href = firstNonEmptyString(pullRequest.href, commit.href);
+
+        const href =
+            [pullRequest.href, commit.pullRequestHref, commit.href]
+                .map((value) => firstNonEmptyString(value))
+                .find(isPullRequestHref) ?? '';
 
         const id = firstNonEmptyString(
             pullRequest.id,
             pullRequest.number,
             getPullRequestId(href),
+            getPullRequestIdFromText(subject),
+            getPullRequestIdFromText(commit.message),
+            getPullRequestIdFromText(commit.title),
         );
 
         if (!id) {
@@ -34,24 +78,145 @@ module.exports = function (Handlebars) {
         };
     };
 
+    const getCommitHref = (commit, pullRequest) => {
+        const href = firstNonEmptyString(commit.commitHref, commit.href);
+
+        if (isCommitHref(href)) {
+            return href;
+        }
+
+        const hash = firstNonEmptyString(
+            commit.hash,
+            commit.shorthash,
+            getCommitHashFromHref(href),
+        );
+
+        const repositoryHref = getRepositoryHref(
+            firstNonEmptyString(commit.repositoryHref, href, pullRequest?.href),
+        );
+
+        return hash && repositoryHref ? `${repositoryHref}/commit/${hash}` : '';
+    };
+
+    const getCommitHash = (commit, commitHref) =>
+        firstNonEmptyString(
+            commit.commitHash,
+            commit.shorthash,
+            getCommitHashFromHref(commitHref),
+            String(commit.hash ?? '').slice(0, 7),
+        ).slice(0, 7);
+
     const normalizeCommit = (commit) => {
         const subject = firstNonEmptyString(
             commit.subject,
-            commit.message,
-            commit.title,
             commit.pullRequest?.title,
+            commit.title,
+            commit.message,
         );
 
-        const pullRequest = normalizePullRequest(commit);
+        const pullRequest = normalizePullRequest(commit, subject);
+        const commitHref = getCommitHref(commit, pullRequest);
+        const commitHash = getCommitHash(commit, commitHref);
 
         return {
             ...commit,
+            commitHash,
+            commitHref,
             message: firstNonEmptyString(commit.message, subject),
             pullRequest,
             subject,
         };
     };
 
+    const getCommitKey = (commit) =>
+        firstNonEmptyString(
+            commit.pullRequest?.id ? `pr:${commit.pullRequest.id}` : '',
+            commit.hash ? `hash:${commit.hash}` : '',
+            commit.commitHash ? `hash:${commit.commitHash}` : '',
+            commit.subject ? `subject:${commit.subject}` : '',
+        );
+
+    const mergePullRequests = (left, right) => {
+        if (!left && !right) {
+            return;
+        }
+
+        if (!left) {
+            return right;
+        }
+
+        if (!right) {
+            return left;
+        }
+
+        return {
+            ...left,
+            ...right,
+            id: firstNonEmptyString(left.id, right.id),
+            author: left.author ?? right.author,
+            href: firstNonEmptyString(left.href, right.href),
+        };
+    };
+
+    const mergeCommits = (left, right) => ({
+        ...left,
+        ...right,
+        commitHash: firstNonEmptyString(left.commitHash, right.commitHash),
+        commitHref: firstNonEmptyString(left.commitHref, right.commitHref),
+        hash: firstNonEmptyString(left.hash, right.hash),
+        href: firstNonEmptyString(left.href, right.href),
+        message: firstNonEmptyString(left.message, right.message),
+        pullRequest: mergePullRequests(left.pullRequest, right.pullRequest),
+        shorthash: firstNonEmptyString(left.shorthash, right.shorthash),
+        subject: firstNonEmptyString(left.subject, right.subject),
+    });
+
+    const formatCommitTitle = (subject) => {
+        const commit =
+            /^(?:build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)\s?(?:\((?<scope>[^)]*)\))?!?: (?<title>.*)$/;
+
+        const string = String(subject ?? '').trim();
+        const {scope = '', title = ''} = commit.exec(string)?.groups ?? {};
+        const cleanTitle = title.replace(/\s\(#\d+\)\s*$/, '');
+
+        if (!cleanTitle) {
+            return escape(string || 'empty commit name');
+        }
+
+        return scope
+            ? `**${escape(scope.toLowerCase())}**: ${escape(cleanTitle)}`
+            : escape(cleanTitle);
+    };
+
+    const formatPullRequestReference = (commit) => {
+        const pullRequest = commit.pullRequest;
+
+        if (!pullRequest?.id) {
+            return '';
+        }
+
+        const link = createMarkdownLink(`#${pullRequest.id}`, pullRequest.href);
+
+        return `(${link})`;
+    };
+
+    const formatCommitReference = (commit) => {
+        if (!commit.commitHash) {
+            return '';
+        }
+
+        return createMarkdownLink(`(${commit.commitHash})`, commit.commitHref);
+    };
+
+    const formatChangelogEntry = (commit) =>
+        [
+            formatCommitTitle(commit.subject),
+            formatPullRequestReference(commit),
+            formatCommitReference(commit),
+        ]
+            .filter(Boolean)
+            .join(' ');
+
     const getCommitAuthor = (commit) =>
         commit.pullRequest?.author?.login ??
         commit.pullRequest?.user?.login ??
@@ -102,33 +267,37 @@ module.exports = function (Handlebars) {
 
         const commits = args.flat().filter(Boolean).map(normalizeCommit);
 
-        const unique = [
-            ...new Map(
-                commits.map((commit) => [
-                    firstNonEmptyString(
-                        commit.hash,
-                        commit.shorthash,
-                        commit.pullRequest?.href,
-                        commit.href,
-                        commit.subject,
-                    ),
-                    commit,
-                ]),
-            ).values(),
-        ];
+        const unique = commits.reduce((map, commit) => {
+            const key = getCommitKey(commit);
+
+            if (!key) {
+                return map;
+            }
+
+            const previous = map.get(key);
 
-        return options.fn(unique);
+            map.set(key, previous ? mergeCommits(previous, commit) : commit);
+
+            return map;
+        }, new Map());
+
+        return options.fn([...unique.values()]);
     });
 
     Handlebars.registerHelper('replaceCommit', function (context) {
-        const commit =
-            /^(?:build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)\s?(?:\((?<scope>[^)]*)\))?!?: (?<title>.*)$/;
+        return new Handlebars.SafeString(formatCommitTitle(context.fn(this)));
+    });
 
-        const string = String(context.fn(this)).trim();
-        const {scope = '', title = ''} = commit.exec(string)?.groups ?? {};
-        const result = scope ? `**${scope.toLowerCase()}**: ${title}` : title;
+    Handlebars.registerHelper('pullRequestLink', function () {
+        return new Handlebars.SafeString(formatPullRequestReference(this));
+    });
+
+    Handlebars.registerHelper('commitLink', function () {
+        return new Handlebars.SafeString(formatCommitReference(this));
+    });
 
-        return result || string || 'empty commit name';
+    Handlebars.registerHelper('changelogEntry', function () {
+        return new Handlebars.SafeString(formatChangelogEntry(this));
     });
 
     Handlebars.registerHelper('replaceTitle', function (context) {

package/template.hbs

@@ -7,15 +7,15 @@
     {{#commit-parser merges commits}}
 
         {{#commit-list this heading='### ⚠️ BREAKING CHANGES' message='^(feat|fix|perf)(\([^)]*\))!:' }}
-            - {{#replaceCommit}}{{subject}}{{/replaceCommit}}{{#if pullRequest}}{{#if pullRequest.href}} ([#{{pullRequest.id}}]({{pullRequest.href}})){{else}} (#{{pullRequest.id}}){{/if}}{{/if}}{{#if shorthash}}{{#if href}} [({{shorthash}})]({{href}}){{else}} ({{shorthash}}){{/if}}{{/if}}
+            - {{changelogEntry}}
         {{/commit-list}}
 
         {{#commit-list this heading='### 🚀 Features' message='^feat:|^feat\(' exclude='^(feat|fix|perf)(\([^)]*\))!:'}}
-            - {{#replaceCommit}}{{subject}}{{/replaceCommit}}{{#if pullRequest}}{{#if pullRequest.href}} ([#{{pullRequest.id}}]({{pullRequest.href}})){{else}} (#{{pullRequest.id}}){{/if}}{{/if}}{{#if shorthash}}{{#if href}} [({{shorthash}})]({{href}}){{else}} ({{shorthash}}){{/if}}{{/if}}
+            - {{changelogEntry}}
         {{/commit-list}}
 
         {{#commit-list this heading='### 🐞 Bug Fixes' message='^fix:|^fix\(' exclude='^(feat|fix|perf)(\([^)]*\))!:'}}
-            - {{#replaceCommit}}{{subject}}{{/replaceCommit}}{{#if pullRequest}}{{#if pullRequest.href}} ([#{{pullRequest.id}}]({{pullRequest.href}})){{else}} (#{{pullRequest.id}}){{/if}}{{/if}}{{#if shorthash}}{{#if href}} [({{shorthash}})]({{href}}){{else}} ({{shorthash}}){{/if}}{{/if}}
+            - {{changelogEntry}}
         {{/commit-list}}
 
     {{/commit-parser}}