@taiga-ui/auto-changelog-config 0.494.0 → 0.496.0

package/package.json

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

package/setup.js

@@ -3,6 +3,13 @@ module.exports = function (Handlebars) {
     const firstNonEmptyString = (...values) =>
         values.map((value) => String(value ?? '').trim()).find(Boolean) ?? '';
 
+    const toArray = (value) => (Array.isArray(value) ? value : []);
+
+    const escape = (value) => Handlebars.escapeExpression(String(value ?? ''));
+
+    const commitPattern =
+        /^(?:build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)\s?(?:\((?<scope>[^)]*)\))?!?: (?<title>.*)$/;
+
     const getPullRequestId = (href) => {
         const [, id = ''] =
             String(href ?? '').match(
@@ -18,66 +25,17 @@ module.exports = function (Handlebars) {
         return id;
     };
 
-    const isPullRequestHref = (href) =>
-        /\/(?:pull|merge_requests|pull-requests)\/\d+(?:$|[/?#])/.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 getCommitHref = (commit, pullRequest) => {
-        const href = firstNonEmptyString(commit.commitHref, commit.href);
-
-        if (href.includes('/commit/')) {
-            return href;
-        }
-
-        const hash = firstNonEmptyString(
-            commit.hash,
-            commit.shorthash,
-            getCommitHashFromHref(href),
-        );
-
-        const repositoryHref = getRepositoryHref(
-            firstNonEmptyString(pullRequest?.href, 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 normalizePullRequest = (commit, subject) => {
-        const pullRequest = commit.pullRequest ?? {};
-        const href = [pullRequest.href, commit.pullRequestHref, commit.href]
-            .map(firstNonEmptyString)
-            .find(isPullRequestHref);
+    const getPullRequest = (merge, subject) => {
+        const href = firstNonEmptyString(merge.href, merge.pullRequest?.href);
 
         const id = firstNonEmptyString(
-            pullRequest.id,
-            pullRequest.number,
+            merge.id,
+            merge.number,
+            merge.pullRequest?.id,
+            merge.pullRequest?.number,
             getPullRequestId(href),
+            getPullRequestIdFromText(merge.message),
             getPullRequestIdFromText(subject),
-            getPullRequestIdFromText(commit.message),
-            getPullRequestIdFromText(commit.title),
         );
 
         if (!id) {
@@ -85,155 +43,127 @@ module.exports = function (Handlebars) {
         }
 
         return {
-            ...pullRequest,
             id,
-            author: pullRequest.author ?? commit.author,
-            href: href ?? '',
+            href,
         };
     };
 
-    const normalizeCommit = (commit) => {
-        const subject = firstNonEmptyString(
-            commit.subject,
-            commit.pullRequest?.title,
-            commit.title,
-            commit.message,
-        );
+    const getPullRequestFromCommit = (commit) => {
+        const subject = firstNonEmptyString(commit.subject, commit.message);
+        const id = getPullRequestIdFromText(subject);
+
+        if (!id) {
+            return;
+        }
+
+        return {id};
+    };
 
-        const pullRequest = normalizePullRequest(commit, subject);
-        const commitHref = getCommitHref(commit, pullRequest);
-        const commitHash = getCommitHash(commit, commitHref);
+    const normalizeMerge = (merge) => {
+        const commit = merge.commit ?? {};
+        const subject = firstNonEmptyString(commit.subject, merge.message);
 
         return {
             ...commit,
-            commitHash,
-            commitHref,
-            message: firstNonEmptyString(commit.message, subject),
-            pullRequest,
+            href: firstNonEmptyString(commit.href),
+            pullRequest: getPullRequest(merge, subject),
+            shorthash: firstNonEmptyString(commit.shorthash, merge.shorthash),
             subject,
         };
     };
 
+    const normalizeCommit = (commit) => ({
+        ...commit,
+        href: firstNonEmptyString(commit.href),
+        pullRequest: commit.pullRequest ?? getPullRequestFromCommit(commit),
+        shorthash: firstNonEmptyString(commit.shorthash),
+        subject: firstNonEmptyString(commit.subject, commit.message),
+    });
+
     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}`,
+            commit.pullRequest?.id ? `pr:${commit.pullRequest.id}` : '',
+            commit.hash ? `hash:${commit.hash}` : '',
+            commit.shorthash ? `hash:${commit.shorthash}` : '',
+            commit.href,
+            commit.subject,
         );
 
-    const mergePullRequests = (left, right) => {
-        if (!left && !right) {
-            return;
-        }
+    const uniqueCommits = (commits) => [
+        ...commits
+            .reduce((map, commit) => {
+                const key = getCommitKey(commit);
 
-        if (!left) {
-            return right;
-        }
+                if (key && !map.has(key)) {
+                    map.set(key, commit);
+                }
+
+                return map;
+            }, new Map())
+            .values(),
+    ];
 
-        if (!right) {
-            return left;
+    const formatCommitTitle = (subject) => {
+        const string = String(subject ?? '').trim();
+        const {scope = '', title = ''} = commitPattern.exec(string)?.groups ?? {};
+        const cleanTitle = title.replace(/\s\(#\d+\)\s*$/, '');
+
+        if (!cleanTitle) {
+            return escape(string || 'empty commit name');
         }
 
-        return {
-            ...left,
-            ...right,
-            id: firstNonEmptyString(left.id, right.id),
-            author: left.author ?? right.author,
-            href: firstNonEmptyString(left.href, right.href),
-        };
+        return scope
+            ? `**${escape(scope.toLowerCase())}**: ${escape(cleanTitle)}`
+            : escape(cleanTitle);
     };
 
-    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 formatPullRequestReference = (commit) => {
+        const pullRequest = commit.pullRequest;
 
-    const getCommitAuthor = (commit) =>
-        commit.pullRequest?.author?.login ??
-        commit.pullRequest?.user?.login ??
-        commit.author?.login ??
-        commit.user?.login ??
-        commit.pullRequest?.author ??
-        commit.author ??
-        '';
-
-    const isGithubLogin = (name) => /^[a-z\d](?:[a-z\d-]{0,37}[a-z\d])?$/i.test(name);
-
-    const normalizeContributor = (author) => {
-        const name = String(author).trim().replace(/^@/, '');
-        const lowerName = name.toLowerCase();
-
-        const isBot =
-            lowerName.endsWith('[bot]') ||
-            lowerName.endsWith('-bot') ||
-            lowerName === 'dependabot' ||
-            lowerName === 'renovatebot' ||
-            lowerName === 'github-actions' ||
-            lowerName === 'renovate' ||
-            lowerName === 'gemini-code-assist';
-
-        if (!name || isBot || !isGithubLogin(name)) {
+        if (!pullRequest?.id) {
             return '';
         }
 
-        return `@${name}`;
+        const text = `#${escape(pullRequest.id)}`;
+
+        return pullRequest.href
+            ? `([${text}](${escape(pullRequest.href)}))`
+            : `(${text})`;
     };
 
-    const formatContributors = (contributors) => {
-        if (contributors.length === 1) {
-            return contributors[0];
+    const formatCommitReference = (commit) => {
+        if (!commit.shorthash) {
+            return '';
         }
 
-        if (contributors.length === 2) {
-            return `${contributors[0]} and ${contributors[1]}`;
-        }
+        const text = `(${escape(commit.shorthash)})`;
 
-        return `${contributors.slice(0, -1).join(', ')} and ${
-            contributors[contributors.length - 1]
-        }`;
+        return commit.href ? `[${text}](${escape(commit.href)})` : text;
     };
 
-    Handlebars.registerHelper('commit-parser', function (...args) {
-        const options = args.pop();
-
-        const commits = args.flat().filter(Boolean).map(normalizeCommit);
-
-        const unique = commits.reduce((map, commit) => {
-            const key = getCommitKey(commit);
-
-            if (!key) {
-                return map;
-            }
-
-            const previous = map.get(key);
-
-            map.set(key, previous ? mergeCommits(previous, commit) : commit);
-
-            return map;
-        }, new Map());
-
-        return options.fn([...unique.values()]);
+    const formatChangelogEntry = (commit) =>
+        [
+            formatCommitTitle(commit.subject),
+            formatPullRequestReference(commit),
+            formatCommitReference(commit),
+        ]
+            .filter(Boolean)
+            .join(' ');
+
+    Handlebars.registerHelper('commit-parser', function (merges, commits, options) {
+        const commitsFromMerges = toArray(merges).map(normalizeMerge);
+        const directCommits = toArray(commits).map(normalizeCommit);
+        const result = uniqueCommits(commitsFromMerges.concat(directCommits));
+
+        return options.fn(result);
     });
 
     Handlebars.registerHelper('replaceCommit', function (context) {
-        const commit =
-            /^(?:build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)\s?(?:\((?<scope>[^)]*)\))?!?: (?<title>.*)$/;
-
-        const string = String(context.fn(this)).trim();
-        const {scope = '', title = ''} = commit.exec(string)?.groups ?? {};
-        const cleanTitle = title.replace(/\s\(#\d+\)\s*$/, '');
-        const result = scope ? `**${scope.toLowerCase()}**: ${cleanTitle}` : cleanTitle;
+        return new Handlebars.SafeString(formatCommitTitle(context.fn(this)));
+    });
 
-        return result || string || 'empty commit name';
+    Handlebars.registerHelper('changelogEntry', function () {
+        return new Handlebars.SafeString(formatChangelogEntry(this));
     });
 
     Handlebars.registerHelper('replaceTitle', function (context) {
@@ -241,25 +171,4 @@ module.exports = function (Handlebars) {
 
         return string.replace(/^v/, '');
     });
-
-    Handlebars.registerHelper('contributors', function (...args) {
-        const options = args.pop();
-
-        const commits = args.flat().filter(Boolean).map(normalizeCommit);
-
-        const contributors = [
-            ...new Set(
-                commits.map(getCommitAuthor).map(normalizeContributor).filter(Boolean),
-            ),
-        ];
-
-        if (!contributors.length) {
-            return '';
-        }
-
-        return options.fn({
-            contributors,
-            text: `Thanks ${formatContributors(contributors)}!`,
-        });
-    });
 };

package/template.hbs

@@ -7,15 +7,19 @@
     {{#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 commitHash}}{{#if commitHref}} [({{commitHash}})]({{commitHref}}){{else}} ({{commitHash}}){{/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 commitHash}}{{#if commitHref}} [({{commitHash}})]({{commitHref}}){{else}} ({{commitHash}}){{/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 commitHash}}{{#if commitHref}} [({{commitHash}})]({{commitHref}}){{else}} ({{commitHash}}){{/if}}{{/if}}
+            - {{changelogEntry}}
+        {{/commit-list}}
+
+        {{#commit-list this heading='### ⚡ Performance Improvements' message='^perf:|^perf\(' exclude='^(feat|fix|perf)(\([^)]*\))!:'}}
+            - {{changelogEntry}}
         {{/commit-list}}
 
     {{/commit-parser}}

package/release-template.hbs

@@ -1,29 +0,0 @@
-{{! prettier-ignore }}
-{{#each releases}}
-    {{#if tag}}
-        ##{{#unless major}}#{{/unless}} [{{#replaceTitle}}{{title}}{{/replaceTitle}}]({{href}}) ({{isoDate}})
-    {{/if}}
-
-    {{#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 commitHash}}{{#if commitHref}} [({{commitHash}})]({{commitHref}}){{else}} ({{commitHash}}){{/if}}{{/if}}
-        {{/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 commitHash}}{{#if commitHref}} [({{commitHash}})]({{commitHref}}){{else}} ({{commitHash}}){{/if}}{{/if}}
-        {{/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 commitHash}}{{#if commitHref}} [({{commitHash}})]({{commitHref}}){{else}} ({{commitHash}}){{/if}}{{/if}}
-        {{/commit-list}}
-
-    {{/commit-parser}}
-
-    {{#contributors commits merges}}
-        ### Contributors
-
-        {{text}}
-    {{/contributors}}
-
-{{/each}}