actions/paths-filter
1
0
Fork 0
mirror of https://github.com/dorny/paths-filter.git synced 2025-06-08 10:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use picomatch + impl followups from #48

Browse source
This commit is contained in:
Michal Dorner 2020-11-09 00:36:08 +01:00
parent 550eb4925d
commit b4eabb6049
7 changed files with 48 additions and 2072 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/filter.ts
View file

@ -1,5 +1,5 @@
import * as jsyaml from 'js-yaml'
import * as micromatch from 'micromatch'
import picomatch from 'picomatch'
import {File, ChangeStatus} from './file'
// Type definition of object we expect to load from YAML
@ -8,11 +8,11 @@ interface FilterYaml {
}
type FilterItemYaml =
| string // Filename pattern, e.g. "path/to/*.js"
| {[changeTypes: string]: string} // Change status and filename, e.g. added|modified: "path/to/*.js"
| {[changeTypes: string]: string | string[]} // Change status and filename, e.g. added|modified: "path/to/*.js"
| FilterItemYaml[] // Supports referencing another rule via YAML anchor
// Minimatch options used in all matchers
const MatchOptions: micromatch.Options = {
const MatchOptions = {
dot: true
}
@ -73,14 +73,14 @@ export class Filter {
}
if (typeof item === 'string') {
return [{status: undefined, isMatch: micromatch.matcher(item, MatchOptions)}]
return [{status: undefined, isMatch: picomatch(item, MatchOptions)}]
}
if (typeof item === 'object') {
return Object.entries(item).map(([key, pattern]) => {
if (typeof key !== 'string' || (typeof pattern !== 'string' && !Array.isArray(pattern))) {
this.throwInvalidFormatError(
`Expected [key:string]= pattern:string, but [${key}:${typeof key}]= ${pattern}:${typeof pattern} found`
`Expected [key:string]= pattern:string | string[], but [${key}:${typeof key}]= ${pattern}:${typeof pattern} found`
)
}
return {
@ -89,7 +89,7 @@ export class Filter {
.map(x => x.trim())
.filter(x => x.length > 0)
.map(x => x.toLowerCase()) as ChangeStatus[],
isMatch: micromatch.matcher(pattern, MatchOptions)
isMatch: picomatch(pattern, MatchOptions)
}
})
}