Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(raw-commits): allow hidding by subject pattern #1063

Merged
merged 12 commits into from
Aug 13, 2023
Merged

feat(raw-commits): allow hidding by subject pattern #1063

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6acd18f
feat(writer-opts): allow hidding by subject
roggervalf Jul 15, 2023
2ec5ed1
chore: fix merge conflicts
roggervalf Jul 21, 2023
7baa9e9
Merge branch 'master' into feat-allow-hidding-by-subject
roggervalf Aug 3, 2023
af2dca7
Merge branch 'master' into feat-allow-hidding-by-subject
roggervalf Aug 6, 2023
b318c23
refactor: address comments
roggervalf Aug 6, 2023
889be92
chore: restore some variables
roggervalf Aug 6, 2023
a52f461
refactor(raw-commits): use regex expression instead of micromatch
roggervalf Aug 6, 2023
dc9125d
Merge branch 'master' into feat-allow-hidding-by-subject
roggervalf Aug 6, 2023
82e0a8b
Merge branch 'master' into feat-allow-hidding-by-subject
roggervalf Aug 6, 2023
995436c
Merge branch 'master' into feat-allow-hidding-by-subject
roggervalf Aug 6, 2023
dc6d2bd
Merge branch 'master' into feat-allow-hidding-by-subject
roggervalf Aug 7, 2023
c55c5e4
Merge branch 'master' into feat-allow-hidding-by-subject
dangreen Aug 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/conventional-changelog-conventionalcommits/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ async function createPreset (config) {

return {
gitRawCommitsOpts: {
ignore: config?.ignoreCommits,
noMerges: null
},
parserOpts,
Expand Down
8 changes: 5 additions & 3 deletions packages/git-raw-commits/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict'

const dargs = require('dargs')
const execFile = require('child_process').execFile
const split = require('split2')
const { isMatch } = require('micromatch')
const { Readable, Transform } = require('stream')

const DELIMITER = '------------------------ >8 ------------------------'
Expand All @@ -27,7 +27,7 @@ function getGitArgs (gitOpts) {

const gitArgs = ['log', gitFormat, gitFromTo]
.concat(dargs(gitOpts, {
excludes: ['debug', 'from', 'to', 'format', 'path']
excludes: ['debug', 'from', 'to', 'format', 'path', 'ignore']
}))

// allow commits to focus on a single directory
Expand Down Expand Up @@ -65,7 +65,9 @@ function gitRawCommits (rawGitOpts, rawExecOpts) {
transform (chunk, enc, cb) {
isError = false
setImmediate(() => {
readable.push(chunk)
if ( !(gitOpts?.ignore && isMatch(chunk.toString(), gitOpts?.ignore))) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's use regex instead of glob

const ignoreRegex = typeof gitOpts.ignore === 'string'
  ? new RegExp(gitOpts.ignore)
  : gitOpts.ignore
const shouldNotIgnore = ignoreRegex
  ? chunk => !ignoreRegex.test(chunk.toString())
  : () => true
...
if (shouldNotIgnore(chunk)) {
  readable.push(chunk)
}

readable.push(chunk)
}
cb()
})
},
Expand Down
1 change: 1 addition & 0 deletions packages/git-raw-commits/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"dependencies": {
"dargs": "^7.0.0",
"meow": "^12.0.1",
"micromatch": "^4.0.5",
"split2": "^4.0.0"
},
"scripts": {
Expand Down
22 changes: 22 additions & 0 deletions packages/git-raw-commits/test/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,28 @@ describe('git-raw-commits', () => {
expect(i).toBe(2)
})

it('should honour `options.ignore`', async () => {
let i = 0

for await (let chunk of gitRawCommits({
ignore: 'Second*'
}, {
cwd: testTools.cwd
})) {
chunk = chunk.toString()

if (i === 0) {
expect(chunk).toBe('Third commit\n\n')
} else {
expect(chunk).toBe('First commit\n\n')
}

i++
}

expect(i).toBe(2)
})

it('should honour `options.format`', async () => {
let i = 0

Expand Down