fix: handle optional/out-of-order query params in UriTemplate.match()#1920
Open
Christian-Sidak wants to merge 1 commit intomodelcontextprotocol:mainfrom
Open
Conversation
…ms per RFC 6570
Query parameter templates ({?param1,param2}) now correctly match URIs
where some or all query params are missing, and where params appear in
any order. Previously, all declared params had to be present in the
exact template-declared order.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
🦋 Changeset detectedLatest commit: 4202930 The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
@modelcontextprotocol/client
@modelcontextprotocol/server
@modelcontextprotocol/express
@modelcontextprotocol/fastify
@modelcontextprotocol/hono
@modelcontextprotocol/node
commit: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #1079
UriTemplate.match()now treats{?param1,param2}query parameters as truly optional per RFC 6570 -- URIs match with no query params, a subset of params, or params in any order{var}) no longer consume?or#delimiters, so templates like{id}{?fields}correctly split at the query boundaryRoot cause
partToRegExp()was generating a rigid regex for?/&operators that required every declared query param in exact declaration order (e.g.\?q=([^&]+)&page=([^&]+)). This made all query params mandatory and order-dependent.Fix
partToRegExp()-- skip?/&operators entirely (return empty patterns)?and#from the character class so path variables stop before the query stringmatch()-- collect query param names from?/&parts, append an optional(?:[?&][^#]*)?pattern to the regex, then parse actual query params from the URI in an order-independent pass after the regex matchTest plan