fastmcp 4.24.5 → 4.25.0

package/dist/openapi/index.cjs

@@ -2,8 +2,8 @@
 
 
 
-var _chunkP56ABHAKcjs = require('../chunk-P56ABHAK.cjs');
-require('../chunk-BV4PWTT6.cjs');
+var _chunkAJE7ERFMcjs = require('../chunk-AJE7ERFM.cjs');
+require('../chunk-B7IXBMHV.cjs');
 require('../chunk-6TDYSPLC.cjs');
 
 // src/openapi/loadSpec.ts
@@ -80,20 +80,30 @@ function buildFlatSchema(route, sharedDefs) {
       }
     }
   }
+  const bodyKeys = [];
+  const requiredBodyKeys = [];
   for (const [name, { required: isRequired, schema }] of bodyProperties) {
     const key = name === "__proto__" ? allocateAlias(`${name}__body`) : name;
     properties[key] = rewriteComponentRefs(schema);
     parameterMap[key] = { in: "body", name };
+    bodyKeys.push(key);
     if (isRequired) {
-      required.push(key);
+      requiredBodyKeys.push(key);
     }
   }
+  if (_optionalChain([route, 'access', _ => _.requestBody, 'optionalAccess', _2 => _2.required])) {
+    required.push(...requiredBodyKeys);
+  }
   const flatSchema = {
     additionalProperties: false,
     properties,
     type: "object",
     ...required.length > 0 ? { required } : {}
   };
+  if (!_optionalChain([route, 'access', _3 => _3.requestBody, 'optionalAccess', _4 => _4.required]) && requiredBodyKeys.length > 0) {
+    flatSchema.if = { anyOf: bodyKeys.map((key) => ({ required: [key] })) };
+    flatSchema.then = { required: requiredBodyKeys };
+  }
   const usedDefs = sharedDefs && filterReferencedDefs(properties, sharedDefs);
   if (usedDefs) {
     flatSchema.$defs = usedDefs;
@@ -107,7 +117,7 @@ function buildFlatSchema(route, sharedDefs) {
   };
 }
 function buildSharedDefs(document) {
-  const schemas = _optionalChain([document, 'access', _ => _.components, 'optionalAccess', _2 => _2.schemas]);
+  const schemas = _optionalChain([document, 'access', _5 => _5.components, 'optionalAccess', _6 => _6.schemas]);
   if (!schemas || Object.keys(schemas).length === 0) {
     return void 0;
   }
@@ -119,10 +129,10 @@ function buildOutputSchema(route, sharedDefs) {
   const successEntry = Object.entries(_nullishCoalesce(route.responses, () => ( {}))).find(
     ([code]) => SUCCESS_STATUS_PATTERN.test(code)
   );
-  const declaredSchema = _optionalChain([findMediaType, 'call', _3 => _3(
-    _optionalChain([successEntry, 'optionalAccess', _4 => _4[1], 'access', _5 => _5.content]),
+  const declaredSchema = _optionalChain([findMediaType, 'call', _7 => _7(
+    _optionalChain([successEntry, 'optionalAccess', _8 => _8[1], 'access', _9 => _9.content]),
     "application/json"
-  ), 'optionalAccess', _6 => _6.schema]);
+  ), 'optionalAccess', _10 => _10.schema]);
   if (!declaredSchema) {
     return void 0;
   }
@@ -151,7 +161,7 @@ function resolveComponentRef(schema, sharedDefs) {
   let ref = current.$ref;
   while (typeof ref === "string") {
     const name = componentSchemaName(ref);
-    const target = name === void 0 ? void 0 : _optionalChain([sharedDefs, 'optionalAccess', _7 => _7[name]]);
+    const target = name === void 0 ? void 0 : _optionalChain([sharedDefs, 'optionalAccess', _11 => _11[name]]);
     if (name === void 0 || target === void 0 || seen.has(name)) {
       break;
     }
@@ -180,7 +190,7 @@ function componentSchemaName(ref) {
 }
 function extractBodyProperties(requestBody, sharedDefs) {
   const properties = /* @__PURE__ */ new Map();
-  const content = _optionalChain([requestBody, 'optionalAccess', _8 => _8.content]);
+  const content = _optionalChain([requestBody, 'optionalAccess', _12 => _12.content]);
   if (!content) {
     return { properties };
   }
@@ -191,7 +201,7 @@ function extractBodyProperties(requestBody, sharedDefs) {
     return contentTypes.length > 0 ? { properties, unsupportedBodyContentType: contentTypes[0] } : { properties };
   }
   const bodyEncoding = json === void 0 ? "form" : "json";
-  const declaredSchema = bodyEncoding === "json" ? _optionalChain([json, 'optionalAccess', _9 => _9.schema]) : _optionalChain([form, 'optionalAccess', _10 => _10.schema]);
+  const declaredSchema = bodyEncoding === "json" ? _optionalChain([json, 'optionalAccess', _13 => _13.schema]) : _optionalChain([form, 'optionalAccess', _14 => _14.schema]);
   if (!declaredSchema) {
     return { bodyEncoding, properties };
   }
@@ -216,7 +226,7 @@ function extractBodyProperties(requestBody, sharedDefs) {
     };
   }
   properties.set("body", {
-    required: _nullishCoalesce(_optionalChain([requestBody, 'optionalAccess', _11 => _11.required]), () => ( false)),
+    required: _nullishCoalesce(_optionalChain([requestBody, 'optionalAccess', _15 => _15.required]), () => ( false)),
     schema
   });
   return { bodyEncoding, properties, wholeBodyKey: "body" };
@@ -329,7 +339,7 @@ async function loadSpec(spec) {
   const document = await _swaggerparser2.default.bundle(
     spec
   );
-  if (!_optionalChain([document, 'access', _12 => _12.openapi, 'optionalAccess', _13 => _13.startsWith, 'call', _14 => _14("3.")])) {
+  if (!_optionalChain([document, 'access', _16 => _16.openapi, 'optionalAccess', _17 => _17.startsWith, 'call', _18 => _18("3.")])) {
     throw new Error(
       `fromOpenAPI only supports OpenAPI 3.x documents (found ${_nullishCoalesce(_nullishCoalesce(document.openapi, () => ( document.swagger)), () => ( "an unrecognized version"))}). Swagger 2.0 is not supported.`
     );
@@ -472,7 +482,9 @@ async function executeRequest(options) {
   );
   const pathParams = /* @__PURE__ */ Object.create(null);
   const queryParts = [];
-  const headers = new Headers(await resolveHeaders(options.headers));
+  const headers = new Headers(
+    await resolveHeaders(options.headers, options.context)
+  );
   const bodyProps = /* @__PURE__ */ Object.create(null);
   for (const [key, value] of Object.entries(options.args)) {
     const mapping = options.parameterMap[key];
@@ -523,7 +535,7 @@ async function executeRequest(options) {
   const url = new URL(baseUrl.replace(/\/$/, "") + path);
   url.search = queryParts.join("&");
   let body;
-  const requiredJsonBody = options.bodyEncoding === "json" && _optionalChain([options, 'access', _15 => _15.route, 'access', _16 => _16.requestBody, 'optionalAccess', _17 => _17.required]) === true && !options.wholeBodyKey;
+  const requiredJsonBody = options.bodyEncoding === "json" && _optionalChain([options, 'access', _19 => _19.route, 'access', _20 => _20.requestBody, 'optionalAccess', _21 => _21.required]) === true && !options.wholeBodyKey;
   if (Object.keys(bodyProps).length > 0 || requiredJsonBody) {
     const payload = options.wholeBodyKey ? bodyProps[options.wholeBodyKey] : bodyProps;
     if (options.bodyEncoding === "form") {
@@ -546,12 +558,12 @@ async function executeRequest(options) {
   });
   const text = await response.text();
   if (!response.ok) {
-    throw new (0, _chunkP56ABHAKcjs.UserError)(
+    throw new (0, _chunkAJE7ERFMcjs.UserError)(
       `${options.route.method.toUpperCase()} ${path} failed with ${response.status}: ${text.slice(0, 2e3)}`
     );
   }
-  const mediaType = _optionalChain([response, 'access', _18 => _18.headers, 'access', _19 => _19.get, 'call', _20 => _20("content-type"), 'optionalAccess', _21 => _21.split, 'call', _22 => _22(";"), 'access', _23 => _23[0]]);
-  if (_optionalChain([mediaType, 'optionalAccess', _24 => _24.toLowerCase, 'call', _25 => _25(), 'access', _26 => _26.includes, 'call', _27 => _27("json")])) {
+  const mediaType = _optionalChain([response, 'access', _22 => _22.headers, 'access', _23 => _23.get, 'call', _24 => _24("content-type"), 'optionalAccess', _25 => _25.split, 'call', _26 => _26(";"), 'access', _27 => _27[0]]);
+  if (_optionalChain([mediaType, 'optionalAccess', _28 => _28.toLowerCase, 'call', _29 => _29(), 'access', _30 => _30.includes, 'call', _31 => _31("json")])) {
     try {
       const json = JSON.parse(text);
       return { json, text: JSON.stringify(json, null, 2) };
@@ -565,7 +577,7 @@ function resolveBaseUrl(servers, origin, overrideUrl) {
   if (overrideUrl) {
     return overrideUrl.replace(/\/$/, "");
   }
-  const server = _optionalChain([servers, 'optionalAccess', _28 => _28[0]]);
+  const server = _optionalChain([servers, 'optionalAccess', _32 => _32[0]]);
   if (!server) {
     throw new Error(
       "The OpenAPI document has no `servers` entry. Pass `baseUrl` to fromOpenAPI() explicitly."
@@ -648,7 +660,7 @@ function assertNoSubstitutedDotSegments(route, resolvedPath) {
   const templateSegments = new Set(route.path.split("/"));
   for (const segment of resolvedPath.split("/")) {
     if ((segment === "." || segment === "..") && !templateSegments.has(segment)) {
-      throw new (0, _chunkP56ABHAKcjs.UserError)(
+      throw new (0, _chunkAJE7ERFMcjs.UserError)(
         `${route.method.toUpperCase()} ${route.path}: path parameter values must not produce a "${segment}" path segment.`
       );
     }
@@ -661,7 +673,7 @@ function encodeCookieValue(mapping, value) {
       return encodePathComponent(text);
     }
     if (/[;,]/.test(text)) {
-      throw new (0, _chunkP56ABHAKcjs.UserError)(
+      throw new (0, _chunkAJE7ERFMcjs.UserError)(
         `Cookie parameter "${mapping.name}" uses style "cookie" and its value contains ";" or ","`
       );
     }
@@ -704,11 +716,11 @@ function encodePathValue(value, style, explode) {
   }
   return encodeURIComponent(String(value));
 }
-async function resolveHeaders(headers) {
+async function resolveHeaders(headers, context) {
   if (!headers) {
     return {};
   }
-  return typeof headers === "function" ? await headers() : { ...headers };
+  return typeof headers === "function" ? await headers(context) : { ...headers };
 }
 function serializeQuery(query, allowReserved) {
   const encoded = query.toString();
@@ -785,7 +797,7 @@ function extractRoutes(document) {
         requestBody: operation.requestBody ? resolveRef(document, operation.requestBody) : void 0,
         responses: resolveResponses(document, operation.responses),
         servers: [operation.servers, pathItem.servers, document.servers].find(
-          (servers) => _optionalChain([servers, 'optionalAccess', _29 => _29.length])
+          (servers) => _optionalChain([servers, 'optionalAccess', _33 => _33.length])
         ),
         summary: operation.summary,
         tags: _nullishCoalesce(operation.tags, () => ( []))
@@ -836,7 +848,7 @@ function resolveRef(document, value) {
   );
   let node = document;
   for (const segment of segments) {
-    node = _optionalChain([node, 'optionalAccess', _30 => _30[segment]]);
+    node = _optionalChain([node, 'optionalAccess', _34 => _34[segment]]);
   }
   return node;
 }
@@ -905,8 +917,8 @@ async function fromOpenAPI(options) {
   const selected = selectRoutes(routes, options);
   const names = generateNames(selected, options.mcpNames);
   const sharedDefs = buildSharedDefs(document);
-  const server = _nullishCoalesce(options.server, () => ( new (0, _chunkP56ABHAKcjs.FastMCP)({
-    name: _nullishCoalesce(_nullishCoalesce(options.name, () => ( _optionalChain([document, 'access', _31 => _31.info, 'optionalAccess', _32 => _32.title]))), () => ( "OpenAPI Server")),
+  const server = _nullishCoalesce(options.server, () => ( new (0, _chunkAJE7ERFMcjs.FastMCP)({
+    name: _nullishCoalesce(_nullishCoalesce(options.name, () => ( _optionalChain([document, 'access', _35 => _35.info, 'optionalAccess', _36 => _36.title]))), () => ( "OpenAPI Server")),
     version: _nullishCoalesce(options.version, () => ( "1.0.0"))
   })));
   const skippedOperations = [];
@@ -951,21 +963,22 @@ async function fromOpenAPI(options) {
       continue;
     }
     const outputSchemaJson = buildOutputSchema(route, sharedDefs);
-    const outputSchema = outputSchemaJson ? _chunkP56ABHAKcjs.jsonSchemaAdapter.call(void 0, outputSchemaJson) : void 0;
+    const outputSchema = outputSchemaJson ? _chunkAJE7ERFMcjs.jsonSchemaAdapter.call(void 0, outputSchemaJson) : void 0;
     server.addTool({
       description: _nullishCoalesce(route.summary, () => ( `${route.method.toUpperCase()} ${route.path}`)),
-      execute: async (args, { signal }) => {
+      execute: async (args, context) => {
         const result = await executeRequest({
           ...execOptions,
           args,
           bodyEncoding,
-          signal,
+          context,
+          signal: context.signal,
           wholeBodyKey
         });
         return resolveToolResult(result, outputSchema);
       },
       name,
-      parameters: _chunkP56ABHAKcjs.jsonSchemaAdapter.call(void 0, flatSchema),
+      parameters: _chunkAJE7ERFMcjs.jsonSchemaAdapter.call(void 0, flatSchema),
       ...outputSchema ? { outputSchema } : {}
     });
   }
@@ -984,8 +997,8 @@ function registerResource(server, route, name, parameterMap, requiredKeys, execO
   if (mapping.kind === "resource") {
     server.addResource({
       description,
-      load: async () => wrapAsResourceResult(
-        await executeRequest({ ...execOptions, args: {} })
+      load: async (_auth, context) => wrapAsResourceResult(
+        await executeRequest({ ...execOptions, args: {}, context })
       ),
       name,
       uri: mapping.uri
@@ -995,10 +1008,11 @@ function registerResource(server, route, name, parameterMap, requiredKeys, execO
   server.addResourceTemplate({
     arguments: mapping.args,
     description,
-    load: async (args) => wrapAsResourceResult(
+    load: async (args, _auth, context) => wrapAsResourceResult(
       await executeRequest({
         ...execOptions,
-        args
+        args,
+        context
       })
     ),
     name,