fix(CHANGELOG_REG): Improve regular expressions

TDesignOteam · Nov 8, 2024 · a81af11 · a81af11
1 parent 93a7e3b
commit a81af11
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/src/renderer.ts b/src/renderer.ts
@@ -8,7 +8,7 @@ const featureLabel = ['feature', 'feat', 'enhancement']
 const docsLabel = ['docs', 'doc', 'documentation']
 const refactorLabel = ['pref', 'refactor']
 
-export const CHANGELOG_REG = /-\s([A-Z]+)(?:\(([A-Z\s_-]*)\))?\s*:\s(.+)/gi
+export const CHANGELOG_REG = /-\s([A-Z]+)(?:\(([A-Z\s_-]*)\))?\s*:\s*(.+)/gi
 export const PULL_NUMBER_REG = /in\shttps:\/\/github\.com\/.+\/pull\/(\d+)/g
 export const SKIP_CHANGELOG_REG = /\[x\] 本条 PR 不需要纳入 Changelog/i
 export function getPullNumbers(body: string) {

diff --git a/test/__snapshots__/generatorLog.test.ts.snap b/test/__snapshots__/generatorLog.test.ts.snap
@@ -18,6 +18,7 @@ exports[`generatorLog > : generatorLogStart 1`] = `
 - \`A\`: a bug fix label in hotfix @liweijie0812 ([#29](https://github.com/TDesignOteam/tdesign-changelog-action/pull/29))
 - \`A\`: a bug fix label in bug @liweijie0812 ([#29](https://github.com/TDesignOteam/tdesign-changelog-action/pull/29))
 - \`CHANGELOG_REG\`: 修复日志冒号前面有空格正则匹配不到 @liweijie0812 ([#29](https://github.com/TDesignOteam/tdesign-changelog-action/pull/29))
+- \`CHANGELOG_REG\`: 修复日志冒号后面没空格正则匹配不到 @liweijie0812 ([#29](https://github.com/TDesignOteam/tdesign-changelog-action/pull/29))
 - \`test-test\`: test-test @liweijie0812 ([#29](https://github.com/TDesignOteam/tdesign-changelog-action/pull/29))
 ### 📈 Performance
 - \`I\`: a refactor label in refactor @liweijie0812 ([#29](https://github.com/TDesignOteam/tdesign-changelog-action/pull/29))

diff --git a/test/__snapshots__/regexp.test.ts.snap b/test/__snapshots__/regexp.test.ts.snap
@@ -104,6 +104,12 @@ exports[`regexp > : CHANGELOG_REG 1`] = `
     "CHANGELOG_REG",
     "修复日志冒号前面有空格正则匹配不到",
   ],
+  [
+    "- fix(CHANGELOG_REG):修复日志冒号后面没空格正则匹配不到",
+    "fix",
+    "CHANGELOG_REG",
+    "修复日志冒号后面没空格正则匹配不到",
+  ],
   [
     "- fix(test-test): test-test",
     "fix",

diff --git a/test/fixtures/changelog.ts b/test/fixtures/changelog.ts
@@ -16,6 +16,7 @@ export const changelog = `
 - test(J) : test label in test
 - test : test label in test
 - fix(CHANGELOG_REG): 修复日志冒号前面有空格正则匹配不到
+- fix(CHANGELOG_REG):修复日志冒号后面没空格正则匹配不到
 - fix(test-test): test-test
 `
 

diff --git a/test/regexp.test.ts b/test/regexp.test.ts
@@ -6,11 +6,11 @@ import releaseNotes from './fixtures/release-notes'
 describe('regexp', () => {
   it(': CHANGELOG_REG', () => {
     const records = changelog.matchAll(/-\s/g)
-    expect([...records].length).toBe(18)
+    expect([...records].length).toBe(19)
 
     const result = changelog.matchAll(CHANGELOG_REG)
     const arr = [...result]
-    expect(arr.length).toBe(18)
+    expect(arr.length).toBe(19)
     expect(arr).toMatchSnapshot()
   })