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

Improve matchPathFilter to handle mixed arrays of string and glob paths #1050

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve matchPathFilter to handle mixed arrays of string and glob paths #1050

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/path-filter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,22 @@ export function matchPathFilter<TReq = http.IncomingMessage>(

// multi path
if (Array.isArray(pathFilter)) {
if (pathFilter.every(isStringPath)) {
const stringPaths = pathFilter.filter(isStringPath);
const globPaths = pathFilter.filter(isGlobPath);

// Handle mixed arrays
if (stringPaths.length && globPaths.length) {
return (
matchMultiPath(stringPaths, uri) ||
matchMultiGlobPath(globPaths, uri)
);
}
if (stringPaths.length) {
return matchMultiPath(pathFilter, uri);
}
if (pathFilter.every(isGlobPath)) {
return matchMultiGlobPath(pathFilter as string[], uri);
if (globPaths.length) {
return matchMultiGlobPath(pathFilter, uri);
}

throw new Error(ERRORS.ERR_CONTEXT_MATCHER_INVALID_ARRAY);
}

Expand Down