fastmcp 4.22.0 → 4.22.2

package/dist/openapi/index.js

@@ -2,7 +2,7 @@ import {
   FastMCP,
   UserError,
   jsonSchemaAdapter
-} from "../chunk-43N2Q6ZI.js";
+} from "../chunk-TFX7BV4K.js";
 import "../chunk-XPKMA7DH.js";
 import "../chunk-UMDUIBFW.js";
 
@@ -231,123 +231,6 @@ async function resolveHeaders(headers) {
   return typeof headers === "function" ? await headers() : { ...headers };
 }
 
-// src/openapi/resourceMapping.ts
-function buildResourceMapping(route, name, parameterMap, requiredKeys) {
-  const entries = Object.entries(parameterMap);
-  if (entries.length === 0) {
-    return { kind: "resource", uri: `openapi://${name}${route.path}` };
-  }
-  const required = new Set(requiredKeys ?? []);
-  const args = [];
-  const queryKeys = [];
-  let path = route.path;
-  for (const [flatKey, mapping] of entries) {
-    if (mapping.in === "path") {
-      if (flatKey !== mapping.name) {
-        path = path.replaceAll(`{${mapping.name}}`, `{${flatKey}}`);
-      }
-    } else {
-      queryKeys.push(flatKey);
-    }
-    args.push({ name: flatKey, required: required.has(flatKey) });
-  }
-  const uriTemplate = `openapi://${name}${path}` + (queryKeys.length > 0 ? `{?${queryKeys.join(",")}}` : "");
-  return { args, kind: "template", uriTemplate };
-}
-function isEligibleForResource(route) {
-  return route.parameters.every((param) => {
-    if (param.in === "header" || param.in === "cookie") {
-      return false;
-    }
-    return param.schema?.type !== "array";
-  });
-}
-
-// src/openapi/routes.ts
-var HTTP_METHODS = ["get", "put", "post", "delete", "patch"];
-function extractRoutes(document) {
-  const routes = [];
-  for (const [path, rawPathItem] of Object.entries(document.paths ?? {})) {
-    const pathItem = resolvePathItem(document, rawPathItem);
-    const pathLevelParams = (pathItem.parameters ?? []).map(
-      (param) => resolveRef(document, param)
-    );
-    for (const method of HTTP_METHODS) {
-      const operation = pathItem[method];
-      if (!operation) {
-        continue;
-      }
-      const operationParams = (operation.parameters ?? []).map(
-        (param) => resolveRef(document, param)
-      );
-      routes.push({
-        deprecated: operation.deprecated ?? false,
-        method,
-        operationId: operation.operationId,
-        parameters: mergeParameters(pathLevelParams, operationParams),
-        path,
-        requestBody: operation.requestBody ? resolveRef(document, operation.requestBody) : void 0,
-        responses: resolveResponses(document, operation.responses),
-        servers: [operation.servers, pathItem.servers, document.servers].find(
-          (servers) => servers?.length
-        ),
-        summary: operation.summary,
-        tags: operation.tags ?? []
-      });
-    }
-  }
-  return routes;
-}
-function mergeParameters(pathLevel, operationLevel) {
-  const overridden = new Set(
-    operationLevel.map((param) => `${param.in}:${param.name}`)
-  );
-  return [
-    ...pathLevel.filter(
-      (param) => !overridden.has(`${param.in}:${param.name}`)
-    ),
-    ...operationLevel
-  ];
-}
-function resolvePathItem(document, pathItem) {
-  const visited = /* @__PURE__ */ new Set();
-  let resolved = pathItem;
-  while (resolved.$ref && !visited.has(resolved.$ref)) {
-    visited.add(resolved.$ref);
-    const { $ref, ...siblings } = resolved;
-    resolved = { ...resolveRef(document, { $ref }), ...siblings };
-  }
-  return resolved;
-}
-function resolveRef(document, value) {
-  if (!value || typeof value !== "object" || !("$ref" in value)) {
-    return value;
-  }
-  const pointer = value.$ref;
-  if (!pointer.startsWith("#/")) {
-    throw new Error(`Unexpected external $ref after bundling: ${pointer}`);
-  }
-  const segments = pointer.slice(2).split("/").map(
-    (segment) => decodeURIComponent(segment.replaceAll("~1", "/").replaceAll("~0", "~"))
-  );
-  let node = document;
-  for (const segment of segments) {
-    node = node?.[segment];
-  }
-  return node;
-}
-function resolveResponses(document, rawResponses) {
-  if (!rawResponses) {
-    return void 0;
-  }
-  return Object.fromEntries(
-    Object.entries(rawResponses).map(([code, response]) => [
-      code,
-      resolveRef(document, response)
-    ])
-  );
-}
-
 // src/openapi/schemas.ts
 var SCHEMA_MAP_KEYS = /* @__PURE__ */ new Set([
   "$defs",
@@ -377,10 +260,23 @@ function buildFlatSchema(route, sharedDefs) {
   const properties = {};
   const required = [];
   const parameterMap = {};
+  const used = new Set(bodyProperties.keys());
+  for (const [name, occurrences] of byName) {
+    if (occurrences.length === 1 && !bodyProperties.has(name)) {
+      used.add(name);
+    }
+  }
   for (const [name, occurrences] of byName) {
     const collides = occurrences.length > 1 || bodyProperties.has(name);
     for (const param of occurrences) {
-      const key = collides ? `${name}__${param.in}` : name;
+      const base = collides ? `${name}__${param.in}` : name;
+      let key = base;
+      let suffix = 1;
+      while (collides && used.has(key)) {
+        suffix += 1;
+        key = `${base}_${suffix}`;
+      }
+      used.add(key);
       properties[key] = rewriteComponentRefs(
         param.schema ?? { type: "string" }
       );
@@ -456,6 +352,22 @@ function buildOutputSchema(route, sharedDefs) {
     } : {}
   };
 }
+function resolveComponentRef(schema, sharedDefs) {
+  const seen = /* @__PURE__ */ new Set();
+  let current = schema;
+  let ref = current.$ref;
+  while (typeof ref === "string") {
+    const name = componentSchemaName(ref);
+    const target = name === void 0 ? void 0 : sharedDefs?.[name];
+    if (name === void 0 || target === void 0 || seen.has(name)) {
+      break;
+    }
+    seen.add(name);
+    current = target;
+    ref = current.$ref;
+  }
+  return current;
+}
 function rewriteComponentRefs(value, stripExamples = false) {
   return rewriteNode(value, "schema", stripExamples);
 }
@@ -584,22 +496,6 @@ function normalizeNullable(schema) {
   }
   return rest;
 }
-function resolveComponentRef(schema, sharedDefs) {
-  const seen = /* @__PURE__ */ new Set();
-  let current = schema;
-  let ref = current.$ref;
-  while (typeof ref === "string") {
-    const name = componentSchemaName(ref);
-    const target = name === void 0 ? void 0 : sharedDefs?.[name];
-    if (name === void 0 || target === void 0 || seen.has(name)) {
-      break;
-    }
-    seen.add(name);
-    current = target;
-    ref = current.$ref;
-  }
-  return current;
-}
 function rewriteNode(value, mode, stripExamples = false) {
   if (mode === "data") {
     return value;
@@ -625,6 +521,124 @@ function rewriteNode(value, mode, stripExamples = false) {
   return mode === "schemaMap" ? rewritten : normalizeExclusiveBounds(normalizeNullable(rewritten));
 }
 
+// src/openapi/resourceMapping.ts
+function buildResourceMapping(route, name, parameterMap, requiredKeys) {
+  const entries = Object.entries(parameterMap);
+  if (entries.length === 0) {
+    return { kind: "resource", uri: `openapi://${name}${route.path}` };
+  }
+  const required = new Set(requiredKeys ?? []);
+  const args = [];
+  const queryKeys = [];
+  let path = route.path;
+  for (const [flatKey, mapping] of entries) {
+    if (mapping.in === "path") {
+      if (flatKey !== mapping.name) {
+        path = path.replaceAll(`{${mapping.name}}`, `{${flatKey}}`);
+      }
+    } else {
+      queryKeys.push(flatKey);
+    }
+    args.push({ name: flatKey, required: required.has(flatKey) });
+  }
+  const uriTemplate = `openapi://${name}${path}` + (queryKeys.length > 0 ? `{?${queryKeys.join(",")}}` : "");
+  return { args, kind: "template", uriTemplate };
+}
+function isEligibleForResource(route, sharedDefs) {
+  return route.parameters.every((param) => {
+    if (param.in === "header" || param.in === "cookie") {
+      return false;
+    }
+    const type = resolveComponentRef(param.schema ?? {}, sharedDefs).type;
+    return type !== "array" && (!Array.isArray(type) || !type.includes("array"));
+  });
+}
+
+// src/openapi/routes.ts
+var HTTP_METHODS = ["get", "put", "post", "delete", "patch"];
+function extractRoutes(document) {
+  const routes = [];
+  for (const [path, rawPathItem] of Object.entries(document.paths ?? {})) {
+    const pathItem = resolvePathItem(document, rawPathItem);
+    const pathLevelParams = (pathItem.parameters ?? []).map(
+      (param) => resolveRef(document, param)
+    );
+    for (const method of HTTP_METHODS) {
+      const operation = pathItem[method];
+      if (!operation) {
+        continue;
+      }
+      const operationParams = (operation.parameters ?? []).map(
+        (param) => resolveRef(document, param)
+      );
+      routes.push({
+        deprecated: operation.deprecated ?? false,
+        method,
+        operationId: operation.operationId,
+        parameters: mergeParameters(pathLevelParams, operationParams),
+        path,
+        requestBody: operation.requestBody ? resolveRef(document, operation.requestBody) : void 0,
+        responses: resolveResponses(document, operation.responses),
+        servers: [operation.servers, pathItem.servers, document.servers].find(
+          (servers) => servers?.length
+        ),
+        summary: operation.summary,
+        tags: operation.tags ?? []
+      });
+    }
+  }
+  return routes;
+}
+function mergeParameters(pathLevel, operationLevel) {
+  const overridden = new Set(
+    operationLevel.map((param) => `${param.in}:${param.name}`)
+  );
+  return [
+    ...pathLevel.filter(
+      (param) => !overridden.has(`${param.in}:${param.name}`)
+    ),
+    ...operationLevel
+  ];
+}
+function resolvePathItem(document, pathItem) {
+  const visited = /* @__PURE__ */ new Set();
+  let resolved = pathItem;
+  while (resolved.$ref && !visited.has(resolved.$ref)) {
+    visited.add(resolved.$ref);
+    const { $ref, ...siblings } = resolved;
+    resolved = { ...resolveRef(document, { $ref }), ...siblings };
+  }
+  return resolved;
+}
+function resolveRef(document, value) {
+  if (!value || typeof value !== "object" || !("$ref" in value)) {
+    return value;
+  }
+  const pointer = value.$ref;
+  if (!pointer.startsWith("#/")) {
+    throw new Error(`Unexpected external $ref after bundling: ${pointer}`);
+  }
+  const segments = pointer.slice(2).split("/").map(
+    (segment) => decodeURIComponent(segment.replaceAll("~1", "/").replaceAll("~0", "~"))
+  );
+  let node = document;
+  for (const segment of segments) {
+    node = node?.[segment];
+  }
+  return node;
+}
+function resolveResponses(document, rawResponses) {
+  if (!rawResponses) {
+    return void 0;
+  }
+  return Object.fromEntries(
+    Object.entries(rawResponses).map(([code, response]) => [
+      code,
+      resolveRef(document, response)
+    ])
+  );
+}
+
 // src/openapi/selection.ts
 var DEFAULT_MAX_OPERATIONS = 40;
 var METHOD_PRIORITY = {
@@ -704,7 +718,7 @@ async function fromOpenAPI(options) {
       route,
       servers: route.servers
     };
-    if (options.resources && route.method === "get" && isEligibleForResource(route)) {
+    if (options.resources && route.method === "get" && isEligibleForResource(route, sharedDefs)) {
       registerResource(
         server,
         route,