Skip to content

refactor: switch from micromatch to picomatch #1284

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

Closed
hyperz111 wants to merge 3 commits into from
+42 −59
Closed

refactor: switch from micromatch to picomatch #1284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ee2856
refactor: use picomatch
hyperz111 Aug 8, 2026
d2eb6ad
chore: some changes
hyperz111 Aug 8, 2026
e4a33a9
chore: remove micromatch dependencies
hyperz111 Aug 8, 2026
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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"httpxy": "^0.5.4",
"is-glob": "^4.0.3",
"is-plain-obj": "^4.1.0",
"micromatch": "^4.0.8"
"picomatch": "^4.0.5"
},
"devDependencies": {
"@commitlint/cli": "21.2.1",
Expand All @@ -85,8 +85,8 @@
"@types/eslint": "9.6.1",
"@types/express": "5.0.6",
"@types/is-glob": "4.0.4",
"@types/micromatch": "4.0.10",
"@types/node": "26.1.1",
"@types/picomatch": "^4.0.3",
"@types/supertest": "7.2.1",
"@types/ws": "8.18.1",
"@vitest/coverage-v8": "4.1.10",
Expand Down
41 changes: 35 additions & 6 deletions src/path-filter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type * as http from 'node:http';

import isGlob from 'is-glob';
import micromatch from 'micromatch';
import picomatch from 'picomatch';

import { HttpProxyMiddlewareError } from './errors.js';
import type { Filter } from './types.js';
Expand Down Expand Up @@ -58,14 +58,43 @@ function matchSingleStringPath(pathFilter: string, uri?: string) {
return pathname?.indexOf(pathFilter) === 0;
}

function matchSingleGlobPath(pattern: string | string[], uri?: string) {
const matchers: Record<string, picomatch.Matcher> = Object.create(null);

function matchSingleGlobPath(pattern: string, uri?: string) {
const pathname = getUrlPathName(uri) as string;
const matches = micromatch([pathname], pattern);
return matches && matches.length > 0;
const matcher = (matchers[pattern] ??= picomatch(pattern));
return matcher(pathname);
}

function matchMultiGlobPath(patternList: string | string[], uri?: string) {
return matchSingleGlobPath(patternList, uri);
// Borrowed from https://github.com/micromatch/micromatch/blob/8bd704ec0d9894693d35da425d827819916be920/index.js#L32

@chimurai chimurai Aug 11, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Cannot not be fully replaced with just picomatch.

// Optimized for single path + multi patterns
function matchMultiGlobPath(patternList: string[], uri?: string) {
const pathname = getUrlPathName(uri) as string;

let omited = false;
let kept = false;
let hasPositive = false;

for (const pattern of patternList) {
const matcher = (matchers[pattern] ??= picomatch(pattern));
const matched = matcher(pathname, true);

const negated = matched.state.negated || matched.state.negatedExtglob;

if (!negated) hasPositive = true;

const match = negated ? !matched.isMatch : matched.isMatch;
if (!match) continue;

if (negated) {
omited = true;
} else {
omited = false;
kept = true;
}
}

return (!hasPositive || kept) && !omited;
}

/**
Expand Down
56 changes: 5 additions & 51 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,11 +994,6 @@
"@types/connect" "*"
"@types/node" "*"

"@types/braces@*":
version "3.0.2"
resolved "https://registry.yarnpkg.com/@types/braces/-/braces-3.0.2.tgz#70009e5d385bc0d804f40f0a3f92285022536730"
integrity sha512-U5tlMYa0U/2eFTmJgKcPWQOEICP173sJDa6OjHbj5Tv+NVaYcrq2xmdWpNXOwWYGwJu+jER/pfTLdoQ31q8PzA==

"@types/chai@^5.2.2":
version "5.2.3"
resolved "https://registry.yarnpkg.com/@types/chai/-/chai-5.2.3.tgz#8e9cd9e1c3581fa6b341a5aed5588eb285be0b4a"
Expand Down Expand Up @@ -1105,13 +1100,6 @@
resolved "https://registry.yarnpkg.com/@types/methods/-/methods-1.1.4.tgz#d3b7ac30ac47c91054ea951ce9eed07b1051e547"
integrity sha512-ymXWVrDiCxTBE3+RIrrP533E70eA+9qu7zdWoHuOmGujkYtzf4HQF96b8nwHLqhuf4ykX61IGRIB38CC6/sImQ==

"@types/micromatch@4.0.10":
version "4.0.10"
resolved "https://registry.yarnpkg.com/@types/micromatch/-/micromatch-4.0.10.tgz#f83b8b05cea1face2a7cf3b7e866ff97d204b632"
integrity sha512-5jOhFDElqr4DKTrTEbnW8DZ4Hz5LRUEmyrGpCMrD/NphYv3nUnaF08xmSLx1rGGnyEs/kFnhiw6dCgcDqMr5PQ==
dependencies:
"@types/braces" "*"

"@types/mime@^1":
version "1.3.2"
resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
Expand All @@ -1136,6 +1124,11 @@
dependencies:
undici-types "~8.3.0"

"@types/picomatch@^4.0.3":
version "4.0.3"
resolved "https://registry.yarnpkg.com/@types/picomatch/-/picomatch-4.0.3.tgz#d92bbf24166478c5457c8bb9ba41a7f49d55e094"
integrity sha512-iG0T6+nYJ9FAPmx9SsUlnwcq1ZVRuCXcVEvWnntoPlrOpwtSTKNDC9uVAxTsC3PUvJ+99n4RpAcNgBbHX3JSnQ==

"@types/qs@*":
version "6.9.8"
resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.8.tgz#f2a7de3c107b89b441e071d5472e6b726b4adf45"
Expand Down Expand Up @@ -1550,13 +1543,6 @@ brace-expansion@^5.0.5:
dependencies:
balanced-match "^4.0.2"

braces@^3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
dependencies:
fill-range "^7.1.1"

brotli-wasm@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/brotli-wasm/-/brotli-wasm-3.0.1.tgz#eefe20f7368fef20d53314cffeaa44733dc2b259"
Expand Down Expand Up @@ -2200,13 +2186,6 @@ file-entry-cache@^8.0.0:
dependencies:
flat-cache "^4.0.0"

fill-range@^7.1.1:
version "7.1.1"
resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
dependencies:
to-regex-range "^5.0.1"

finalhandler@1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
Expand Down Expand Up @@ -2609,11 +2588,6 @@ is-node-process@^1.2.0:
resolved "https://registry.yarnpkg.com/is-node-process/-/is-node-process-1.2.0.tgz#ea02a1b90ddb3934a19aea414e88edef7e11d134"
integrity sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==

is-number@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==

is-plain-obj@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.1.0.tgz#d65025edec3657ce032fd7db63c97883eaed71f0"
Expand Down Expand Up @@ -2885,14 +2859,6 @@ methods@^1.1.2:
resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==

micromatch@^4.0.8:
version "4.0.8"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
dependencies:
braces "^3.0.3"
picomatch "^2.3.1"

milliparsec@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/milliparsec/-/milliparsec-5.1.1.tgz#0a8c50bec6b7deb38e7e482cb8c55dd442d7a2ec"
Expand Down Expand Up @@ -3252,11 +3218,6 @@ picocolors@^1.1.1:
resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==

picomatch@^2.3.1:
version "2.3.2"
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.2.tgz#5a942915e26b372dc0f0e6753149a16e6b1c5601"
integrity sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==

picomatch@^4.0.3, picomatch@^4.0.4:
version "4.0.4"
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.4.tgz#fd6f5e00a143086e074dffe4c924b8fb293b0589"
Expand Down Expand Up @@ -3808,13 +3769,6 @@ tls-impersonate@^0.1.0:
dependencies:
node-gyp-build "^4.8.4"

to-regex-range@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
dependencies:
is-number "^7.0.0"

toidentifier@1.0.1, toidentifier@~1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
Expand Down