@w5s/conventional-changelog 1.0.10 → 1.0.12

package/lib/gitmoji.d.ts

@@ -1,4 +1,4 @@
-import type { CommitConventionalType } from './data';
+import type { CommitConventionalType } from './data.js';
 export type Emoji = Emoji.Unicode | Emoji.Text;
 export declare namespace Emoji {
     const reEmojiUnicode: RegExp;

package/lib/index.d.ts

@@ -1,9 +1,9 @@
 declare const _default: {
-    parserOpts: import("./parser-opts").ParserOptions;
-    writerOpts: import("./writer-opts").WriterOptions;
+    parserOpts: import("./parser-opts.js").ParserOptions;
+    writerOpts: import("./writer-opts.js").WriterOptions;
     recommendedBumpOpts: {
-        parserOpts: import("./parser-opts").ParserOptions;
-        whatBump: (commits: readonly import("./recommended-bump-opts").Commit[]) => {
+        parserOpts: import("./parser-opts.js").ParserOptions;
+        whatBump: (commits: readonly import("./recommended-bump-opts.js").Commit[]) => {
             level: number;
             reason: string;
         };

package/lib/index.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const git_raw_commit_opts_1 = require("./git-raw-commit-opts");
-const parser_opts_1 = require("./parser-opts");
-const recommended_bump_opts_1 = require("./recommended-bump-opts");
-const writer_opts_1 = require("./writer-opts");
+const parser_opts_js_1 = require("./parser-opts.js");
+const recommended_bump_opts_js_1 = require("./recommended-bump-opts.js");
+const writer_opts_js_1 = require("./writer-opts.js");
 exports.default = {
-    parserOpts: parser_opts_1.parserOpts,
-    writerOpts: writer_opts_1.writerOpts,
-    recommendedBumpOpts: recommended_bump_opts_1.recommendedBumpOpts,
+    parserOpts: parser_opts_js_1.parserOpts,
+    writerOpts: writer_opts_js_1.writerOpts,
+    recommendedBumpOpts: recommended_bump_opts_js_1.recommendedBumpOpts,
     gitRawCommitOpts: git_raw_commit_opts_1.gitRawCommitOpts,
 };

package/lib/recommended-bump-opts.d.ts

@@ -1,7 +1,7 @@
 import type { Commit as CommitBase } from 'conventional-commits-parser';
 export type Commit = CommitBase;
 export declare const recommendedBumpOpts: {
-    parserOpts: import("./parser-opts").ParserOptions;
+    parserOpts: import("./parser-opts.js").ParserOptions;
     whatBump: (commits: ReadonlyArray<Commit>) => {
         level: number;
         reason: string;

package/lib/recommended-bump-opts.js

@@ -1,19 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.recommendedBumpOpts = void 0;
-const parser_opts_1 = require("./parser-opts");
+const parser_opts_js_1 = require("./parser-opts.js");
+const data_js_1 = require("./data.js");
+const gitmoji_js_1 = require("./gitmoji.js");
+function toConventionalCommitType(text) {
+    return gitmoji_js_1.GitmojiCode.isValid(text)
+        ? gitmoji_js_1.GitmojiCode.toConventionalCommitType(text)
+        : data_js_1.CommitConventionalType.hasInstance(text)
+            ? text
+            : undefined;
+}
 exports.recommendedBumpOpts = {
-    parserOpts: parser_opts_1.parserOpts,
+    parserOpts: parser_opts_js_1.parserOpts,
     whatBump: (commits) => {
         let level = 2;
         let breakings = 0;
         let features = 0;
-        for (const commit of commits) {
-            if (commit.notes.length > 0) {
-                breakings += commit.notes.length;
+        for (const { type, notes } of commits) {
+            const conventionalType = type == null ? type : toConventionalCommitType(type);
+            if (notes.length > 0) {
+                breakings += notes.length;
                 level = 0;
             }
-            else if (commit.type === 'feat') {
+            else if (conventionalType === data_js_1.CommitConventionalType.Feat) {
                 features += 1;
                 if (level === 2) {
                     level = 1;

package/lib/transform.js

@@ -54,6 +54,7 @@ function createTransform(config) {
                 if (url != null) {
                     const issueURL = `${url}/issues/`;
                     // Issue URLs.
+                    // eslint-disable-next-line unicorn/prefer-string-replace-all
                     returnValue = returnValue.replace(/#(\d+)/g, (_, issue) => {
                         issues.add(issue);
                         return `[#${issue}](${issueURL}${issue})`;
@@ -61,7 +62,7 @@ function createTransform(config) {
                 }
                 if (host != null) {
                     // User URLs.
-                    // eslint-disable-next-line unicorn/no-unsafe-regex
+                    // eslint-disable-next-line unicorn/no-unsafe-regex, unicorn/prefer-string-replace-all
                     returnValue = returnValue.replace(/\B@([\da-z](?:-?[\d/a-z]){0,38})/g, (_, username) => username.includes('/') ? `@${username}` : `[@${username}](${host}/${username})`);
                 }
                 return returnValue;

package/lib/writer-opts.js

@@ -22,6 +22,7 @@ exports.writerOpts = {
     noteGroupsSort: 'title',
     mainTemplate: template,
     headerPartial: header,
+    // eslint-disable-next-line unicorn/prefer-string-replace-all
     commitPartial: commit.replace(/{{gitUserInfo}}/g, author),
     footerPartial: footer,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@w5s/conventional-changelog",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "Conventional changelog plugin for @w5s",
   "keywords": [],
   "homepage": "https://github.com/w5s/project-config/blob/main/packages/conventional-changelog#readme",
@@ -63,5 +63,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5913801bce7442cfeb53292901eb5ea3479bb878"
+  "gitHead": "96f078864a6f139a2ff4d77060f94b59100e8e80"
 }

package/src/gitmoji.ts

@@ -1,6 +1,6 @@
 import emojiRegexp from 'emoji-regex';
 import { type Gitmoji, gitmojis } from 'gitmojis';
-import type { CommitConventionalType } from './data';
+import type { CommitConventionalType } from './data.js';
 
 export type Emoji = Emoji.Unicode | Emoji.Text;
 export namespace Emoji {

package/src/index.ts

@@ -1,7 +1,7 @@
 import { gitRawCommitOpts } from './git-raw-commit-opts';
-import { parserOpts } from './parser-opts';
-import { recommendedBumpOpts } from './recommended-bump-opts';
-import { writerOpts } from './writer-opts';
+import { parserOpts } from './parser-opts.js';
+import { recommendedBumpOpts } from './recommended-bump-opts.js';
+import { writerOpts } from './writer-opts.js';
 
 export default {
   parserOpts,

package/src/recommended-bump-opts.ts

@@ -1,5 +1,15 @@
 import type { Commit as CommitBase } from 'conventional-commits-parser';
-import { parserOpts } from './parser-opts';
+import { parserOpts } from './parser-opts.js';
+import { CommitConventionalType } from './data.js';
+import { GitmojiCode } from './gitmoji.js';
+
+function toConventionalCommitType(text: string) {
+  return GitmojiCode.isValid(text)
+    ? GitmojiCode.toConventionalCommitType(text)
+    : CommitConventionalType.hasInstance(text)
+    ? text
+    : undefined;
+}
 
 export type Commit = CommitBase;
 
@@ -10,11 +20,12 @@ export const recommendedBumpOpts = {
     let breakings = 0;
     let features = 0;
 
-    for (const commit of commits) {
-      if (commit.notes.length > 0) {
-        breakings += commit.notes.length;
+    for (const { type, notes } of commits) {
+      const conventionalType = type == null ? type : toConventionalCommitType(type);
+      if (notes.length > 0) {
+        breakings += notes.length;
         level = 0;
-      } else if (commit.type === 'feat') {
+      } else if (conventionalType === CommitConventionalType.Feat) {
         features += 1;
         if (level === 2) {
           level = 1;

package/src/transform.ts

@@ -81,6 +81,7 @@ export function createTransform(config: TransformConfig): WriterOptions.Transfor
             if (url != null) {
               const issueURL = `${url}/issues/`;
               // Issue URLs.
+              // eslint-disable-next-line unicorn/prefer-string-replace-all
               returnValue = returnValue.replace(/#(\d+)/g, (_, issue: string) => {
                 issues.add(issue);
 
@@ -89,7 +90,7 @@ export function createTransform(config: TransformConfig): WriterOptions.Transfor
             }
             if (host != null) {
               // User URLs.
-              // eslint-disable-next-line unicorn/no-unsafe-regex
+              // eslint-disable-next-line unicorn/no-unsafe-regex, unicorn/prefer-string-replace-all
               returnValue = returnValue.replace(/\B@([\da-z](?:-?[\d/a-z]){0,38})/g, (_, username: string) =>
                 username.includes('/') ? `@${username}` : `[@${username}](${host}/${username})`
               );

package/src/writer-opts.ts

@@ -26,6 +26,7 @@ export const writerOpts: WriterOptions = {
   noteGroupsSort: 'title',
   mainTemplate: template,
   headerPartial: header,
+  // eslint-disable-next-line unicorn/prefer-string-replace-all
   commitPartial: commit.replace(/{{gitUserInfo}}/g, author),
   footerPartial: footer,
 };