fastmcp 4.23.10 → 4.23.11

package/dist/FastMCP.cjs

@@ -11,7 +11,7 @@
 
 
 
-var _chunkB77E3EDNcjs = require('./chunk-B77E3EDN.cjs');
+var _chunkX5ITW7FVcjs = require('./chunk-X5ITW7FV.cjs');
 
 
 
@@ -50,5 +50,5 @@ require('./chunk-6TDYSPLC.cjs');
 
 
 
-exports.AuthProvider = _chunk4OWHPJELcjs.AuthProvider; exports.AzureProvider = _chunk4OWHPJELcjs.AzureProvider; exports.DiscoveryDocumentCache = _chunkB77E3EDNcjs.DiscoveryDocumentCache; exports.FastMCP = _chunkB77E3EDNcjs.FastMCP; exports.FastMCPError = _chunkB77E3EDNcjs.FastMCPError; exports.FastMCPSession = _chunkB77E3EDNcjs.FastMCPSession; exports.GitHubProvider = _chunk4OWHPJELcjs.GitHubProvider; exports.GoogleProvider = _chunk4OWHPJELcjs.GoogleProvider; exports.MEDIA_FETCH_TIMEOUT_MS = _chunkB77E3EDNcjs.MEDIA_FETCH_TIMEOUT_MS; exports.OAuthProvider = _chunk4OWHPJELcjs.OAuthProvider; exports.ServerState = _chunkB77E3EDNcjs.ServerState; exports.SessionError = _chunkB77E3EDNcjs.SessionError; exports.UnexpectedStateError = _chunkB77E3EDNcjs.UnexpectedStateError; exports.UserError = _chunkB77E3EDNcjs.UserError; exports.audioContent = _chunkB77E3EDNcjs.audioContent; exports.getAuthSession = _chunk4OWHPJELcjs.getAuthSession; exports.imageContent = _chunkB77E3EDNcjs.imageContent; exports.jsonSchemaAdapter = _chunkB77E3EDNcjs.jsonSchemaAdapter; exports.requireAll = _chunk4OWHPJELcjs.requireAll; exports.requireAny = _chunk4OWHPJELcjs.requireAny; exports.requireAuth = _chunk4OWHPJELcjs.requireAuth; exports.requireRole = _chunk4OWHPJELcjs.requireRole; exports.requireScopes = _chunk4OWHPJELcjs.requireScopes;
+exports.AuthProvider = _chunk4OWHPJELcjs.AuthProvider; exports.AzureProvider = _chunk4OWHPJELcjs.AzureProvider; exports.DiscoveryDocumentCache = _chunkX5ITW7FVcjs.DiscoveryDocumentCache; exports.FastMCP = _chunkX5ITW7FVcjs.FastMCP; exports.FastMCPError = _chunkX5ITW7FVcjs.FastMCPError; exports.FastMCPSession = _chunkX5ITW7FVcjs.FastMCPSession; exports.GitHubProvider = _chunk4OWHPJELcjs.GitHubProvider; exports.GoogleProvider = _chunk4OWHPJELcjs.GoogleProvider; exports.MEDIA_FETCH_TIMEOUT_MS = _chunkX5ITW7FVcjs.MEDIA_FETCH_TIMEOUT_MS; exports.OAuthProvider = _chunk4OWHPJELcjs.OAuthProvider; exports.ServerState = _chunkX5ITW7FVcjs.ServerState; exports.SessionError = _chunkX5ITW7FVcjs.SessionError; exports.UnexpectedStateError = _chunkX5ITW7FVcjs.UnexpectedStateError; exports.UserError = _chunkX5ITW7FVcjs.UserError; exports.audioContent = _chunkX5ITW7FVcjs.audioContent; exports.getAuthSession = _chunk4OWHPJELcjs.getAuthSession; exports.imageContent = _chunkX5ITW7FVcjs.imageContent; exports.jsonSchemaAdapter = _chunkX5ITW7FVcjs.jsonSchemaAdapter; exports.requireAll = _chunk4OWHPJELcjs.requireAll; exports.requireAny = _chunk4OWHPJELcjs.requireAny; exports.requireAuth = _chunk4OWHPJELcjs.requireAuth; exports.requireRole = _chunk4OWHPJELcjs.requireRole; exports.requireScopes = _chunk4OWHPJELcjs.requireScopes;
 //# sourceMappingURL=FastMCP.cjs.map

package/dist/FastMCP.js

@@ -11,7 +11,7 @@ import {
   audioContent,
   imageContent,
   jsonSchemaAdapter
-} from "./chunk-EHTAPWBU.js";
+} from "./chunk-XUUJOVC7.js";
 import {
   AuthProvider,
   AzureProvider,

package/dist/{chunk-B77E3EDN.cjs → chunk-X5ITW7FV.cjs}

@@ -1451,7 +1451,6 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
               if (!match) {
                 continue;
               }
-              const uri = uriTemplate.fill(match);
               const result = await resourceTemplate.load(
                 match,
                 this.#auth,
@@ -1468,7 +1467,9 @@ ${error instanceof Error ? error.stack : JSON.stringify(error)}`
                   description: resourceTemplate.description,
                   mimeType: _nullishCoalesce(resource2.mimeType, () => ( resourceTemplate.mimeType)),
                   name: resourceTemplate.name,
-                  uri: _nullishCoalesce(resource2.uri, () => ( uri))
+                  // The URI asked for. Refilling the template from `match` can
+                  // spell it differently: `{path}` refills `a,b` as `a%2Cb`.
+                  uri: _nullishCoalesce(resource2.uri, () => ( request.params.uri))
                 }))
               };
             }
@@ -1879,6 +1880,19 @@ function matchUriTemplate(template, uri) {
   if (!match) {
     return void 0;
   }
+  const scalarNames = new Set(template.varNames);
+  for (const [expression] of template.template.matchAll(/\{[^}]*\}/g)) {
+    if (/^\{[?&]/.test(expression) || expression.includes("*")) {
+      for (const name of _uritemplates2.default.call(void 0, expression).varNames) {
+        scalarNames.delete(name);
+      }
+    }
+  }
+  for (const [name, value] of Object.entries(match)) {
+    if (scalarNames.has(name) && Array.isArray(value)) {
+      match[name] = value.join(",");
+    }
+  }
   const checksQuery = !/\{[?&]/.test(template.template);
   const checksFragment = !template.template.includes("{#");
   const shape = (value) => [
@@ -3341,4 +3355,4 @@ var FastMCP = class extends FastMCPEventEmitter {
 
 
 exports.DiscoveryDocumentCache = DiscoveryDocumentCache; exports.jsonSchemaAdapter = jsonSchemaAdapter; exports.MEDIA_FETCH_TIMEOUT_MS = MEDIA_FETCH_TIMEOUT_MS; exports.imageContent = imageContent; exports.audioContent = audioContent; exports.FastMCPError = FastMCPError; exports.SessionError = SessionError; exports.UnexpectedStateError = UnexpectedStateError; exports.UserError = UserError; exports.ServerState = ServerState; exports.FastMCPSession = FastMCPSession; exports.FastMCP = FastMCP;
-//# sourceMappingURL=chunk-B77E3EDN.cjs.map
+//# sourceMappingURL=chunk-X5ITW7FV.cjs.map