feat(conventionalcommits): enable glob patterns "scope" and "type" in types

packages/conventional-changelog-conventionalcommits/package.json

@@ -34,6 +34,7 @@
   },
   "homepage": "https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-conventionalcommits#readme",
   "dependencies": {
-    "compare-func": "^2.0.0"
+    "compare-func": "^2.0.0",
+    "minimatch": "^9.0.0"
   }
 }

packages/conventional-changelog-conventionalcommits/test/test.js

@@ -90,6 +90,9 @@ betterThanBefore.setups([
       'chore: release at different version',
       'Release-As: v3.0.2'
     ])
+  },
+  function () {
+    gitDummyCommit('fix(awesome): fix the awesome thing')
   }
 ])
 
@@ -187,6 +190,28 @@ describe('conventionalcommits.org preset', function () {
       }))
   })
 
+  it('should allow matching "type" to configuration using glob patterns', function (done) {
+    preparing(1)
+    conventionalChangelogCore({
+      config: require('../')({
+        types: [
+          { type: '{chore,ci}', section: 'Chores and CI' }
+        ]
+      })
+    })
+      .on('error', function (err) {
+        done(err)
+      })
+      .pipe(through(function (chunk) {
+        chunk = chunk.toString()
+
+        expect(chunk).to.include('### Chores and CI')
+        expect(chunk).to.include('add TravisCI pipeline')
+        expect(chunk).to.include('upgrade example from 1 to 2')
+        done()
+      }))
+  })
+
   it('should allow matching "scope" to configuration', function (done) {
     preparing(1)
     conventionalChangelogCore({
@@ -210,6 +235,36 @@ describe('conventionalcommits.org preset', function () {
       }))
   })
 
+  it('should allow matching "scope" to configuration using glob patterns', function (done) {
+    preparing(1)
+    conventionalChangelogCore({
+      config: require('../')({
+        types: [
+          { type: 'feat', scope: '!changelog', section: 'Features' },
+          { type: 'fix', scope: '!{changelog,awesome}', section: 'Bug Fixes' }
+        ]
+      })
+    })
+      .on('error', function (err) {
+        done(err)
+      })
+      .pipe(through(function (chunk) {
+        chunk = chunk.toString()
+
+        expect(chunk).to.include('### Features')
+        expect(chunk).to.include('**awesome:** adress EXAMPLE-1')
+
+        expect(chunk).to.not.include('proper issue links')
+
+        expect(chunk).to.include('### Bug Fixes')
+        expect(chunk).to.include('oops')
+
+        expect(chunk).to.not.include('**awesome:** fix the awesome thing')
+        expect(chunk).to.not.include('proper issue links')
+        done()
+      }))
+  })
+
   it('should properly format external repository issues', function (done) {
     preparing(1)
     conventionalChangelogCore({

packages/conventional-changelog-conventionalcommits/writer-opts.js

@@ -4,6 +4,7 @@ const addBangNotes = require('./add-bang-notes')
 const compareFunc = require('compare-func')
 const { readFile } = require('fs').promises
 const { resolve } = require('path')
+const { minimatch } = require('minimatch')
 const releaseAsRe = /release-as:\s*\w*@?([0-9]+\.[0-9]+\.[0-9a-z]+(-[0-9a-z.]+)?)\s*/i
 
 /**
@@ -60,10 +61,13 @@ module.exports = async (config) => {
 function findTypeEntry (types, commit) {
   const typeKey = (commit.revert ? 'revert' : (commit.type || '')).toLowerCase()
   return types.find((entry) => {
-    if (entry.type !== typeKey) {
+    if (!minimatch(typeKey, entry.type)) {
       return false
     }
-    if (entry.scope && entry.scope !== commit.scope) {
+    if (
+      entry.scope &&
+      (!commit.scope || !minimatch(commit.scope, entry.scope))
+    ) {
       return false
     }
     return true