diff --git a/dist/main/index.js b/dist/main/index.js index 2373005..e936948 100644 --- a/dist/main/index.js +++ b/dist/main/index.js @@ -453,8 +453,8 @@ const isValidCommitMessage = (message, availableTypes = DEFAULT_COMMIT_TYPES) => let [possiblyValidCommitType] = message.split(":"); possiblyValidCommitType = possiblyValidCommitType.toLowerCase(); // Let's remove scope if present. - if (possiblyValidCommitType.match(/\([a-z]*?\)/)) { - possiblyValidCommitType = possiblyValidCommitType.replace(/\([a-z]*?\)/, ""); + if (possiblyValidCommitType.match(/\(\S*?\)/)) { + possiblyValidCommitType = possiblyValidCommitType.replace(/\(\S*?\)/, ""); } possiblyValidCommitType = possiblyValidCommitType .replace(/\s/g, "") // Remove all whitespace diff --git a/src/__tests__/isValidCommitMessage.test.ts b/src/__tests__/isValidCommitMessage.test.ts index 5f33e4d..343e425 100644 --- a/src/__tests__/isValidCommitMessage.test.ts +++ b/src/__tests__/isValidCommitMessage.test.ts @@ -1,6 +1,7 @@ import isValidCommitMessage from "../isValidCommitMesage"; test("should be able to correctly validate the commit message", () => { + expect(isValidCommitMessage("chore(nice-one): doing this right")).toBe(true); expect(isValidCommitMessage("fix: menu must open on shortcut press")).toBe(true); expect(isValidCommitMessage("something: should not work")).toBe(false); expect(isValidCommitMessage("fixes something")).toBe(false); @@ -9,4 +10,5 @@ test("should be able to correctly validate the commit message", () => { expect(isValidCommitMessage("🚧 fix(menus): menu must open on shortcut press")).toBe(true); expect(isValidCommitMessage("🚧 fixing something")).toBe(false); expect(isValidCommitMessage("🚧 something: should not work")).toBe(false); + expect(isValidCommitMessage("chorz: 123")).toBe(false); }); diff --git a/src/isValidCommitMesage.ts b/src/isValidCommitMesage.ts index e3eaac3..b9b11f9 100644 --- a/src/isValidCommitMesage.ts +++ b/src/isValidCommitMesage.ts @@ -18,8 +18,8 @@ const isValidCommitMessage = (message, availableTypes = DEFAULT_COMMIT_TYPES): b possiblyValidCommitType = possiblyValidCommitType.toLowerCase(); // Let's remove scope if present. - if (possiblyValidCommitType.match(/\([a-z]*?\)/)) { - possiblyValidCommitType = possiblyValidCommitType.replace(/\([a-z]*?\)/, ""); + if (possiblyValidCommitType.match(/\(\S*?\)/)) { + possiblyValidCommitType = possiblyValidCommitType.replace(/\(\S*?\)/, ""); } possiblyValidCommitType = possiblyValidCommitType