Conversation
A trailing ? on a template variable was kept as part of its name, so
expand() dropped the value, match() returned the key 'name?', and a URI
without the optional segment did not match at all. Strip the marker,
omit the segment and its leading / when the value is absent, and let
match() accept the URI either way.
{/name} and {.name} had the same gap in match(): the URI expand()
produces for an undefined variable returned null.
v1.x backport of the main-branch fix. Fixes modelcontextprotocol#677
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
🦋 Changeset detectedLatest commit: 1e16063 The changes in this PR will be included in the next version bump. 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 |
This was referenced Sep 17, 2026
commit: |
This branch has not been deployed
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.
Fixes #677 on v1.x. Backport of #2823.
Problem
A trailing
?on a template variable (scheme://path/{required}/{optional?}) is kept as part of the variable's name.variableNamesreportsoptional?,expand({ required: 'foo', optional: 'bar' })givesscheme://path/foo/,match('scheme://path/foo/bar')returns the key'optional?', andmatch('scheme://path/foo')returnsnull. So aResourceTemplatewith an optional segment can't be read with or without that segment.{/name}and{.name}have the same gap inmatch(): the URIexpand()produces for an undefined variable returnsnull.Change
Same change as #2823, in
src/shared/uriTemplate.ts:?as optional and strips the?from the name.expand()drops the/before an absent{name?}.match()wraps optional parts, and{/name}and{.name}parts, in a non-capturing optional group together with the/an optional part owns. Unmatched groups add no key.The only conflict with the
mainpatch was the result loop, which keeps v1.x's indexedforloop.Tests
Eight cases in a new
optional variablesblock intest/shared/uriTemplate.test.ts, identical to #2823.npm test: 1655 passednpm run typecheck: passeslintandprettier --checkon the changed files: clean🤖 Generated with Claude Code