Make label expansion greedily match multiple values

Author: halter73

src/ModelContextProtocol.Core/UriTemplate.cs

@@ -85,14 +85,14 @@ public static Regex CreateParser(string uriTemplate)
             switch (m.Groups["operator"].Value)
             {
                 case "+": AppendExpression(ref pattern, paramNames, null, "[^?&#]*"); break;
-                case "#": AppendExpression(ref pattern, paramNames, '#', "[^,]*"); break;
-                case ".": AppendExpression(ref pattern, paramNames, '.', "[^./?#]*"); break;
+                case "#": AppendExpression(ref pattern, paramNames, '#', ".*"); break;
+                case ".": AppendExpression(ref pattern, paramNames, '.', "[^/?#]*"); break;
                 case "/": AppendExpression(ref pattern, paramNames, '/', "[^/?#]*"); break;
-                case ";": AppendPathParameterExpression(ref pattern, paramNames); break;
                 default:  AppendExpression(ref pattern, paramNames, null, "[^/?&#]*"); break;
 
                 case "?": AppendQueryExpression(ref pattern, paramNames, '?'); break;
                 case "&": AppendQueryExpression(ref pattern, paramNames, '&'); break;
+                case ";": AppendPathParameterExpression(ref pattern, paramNames); break;
             }
         }
 

tests/ModelContextProtocol.Tests/Configuration/McpServerResourceRoutingTests.cs

@@ -3,7 +3,7 @@
 using ModelContextProtocol.Protocol;
 using ModelContextProtocol.Server;
 
-namespace ModelContextProtocol.Tests;
+namespace ModelContextProtocol.Tests.Configuration;
 
 /// <summary>
 /// Test suite for UriTemplate.CreateParser method.
@@ -383,14 +383,14 @@ await AssertMatchAsync(
     /// FIXED BUG: Label expansion with multiple variables should use dot as separator.
     /// </summary>
     [Fact]
-    public async Task LabelExpansion_MatchesMultipleValues()
+    public async Task LabelExpansion_GreedilyMatchesMultipleValues()
     {
         // FIXED: {.x,y} should match .1024.768 (dot separated)
         await AssertMatchAsync(
             uriTemplate: "test://www{.x,y}",
             method: (string x, string y) => $"x:{x},y:{y}",
             uri: "test://www.example.com",
-            expectedResult: "x:example,y:com");
+            expectedResult: "x:example.com,y:");
     }
 
     [Fact]