@ttoss/http-server-mcp-openapi 0.2.14 → 0.2.15

package/README.md

@@ -61,7 +61,11 @@ Each OpenAPI operation with an `operationId` and a supported HTTP method
 | operation `description`   | tool description (quotes/newlines sanitised) |
 
 Path params are always required strings. Query and body params carry their
-declared type and `required` flag. Array params keep their `items` schema.
+declared type and `required` flag. Array params keep their `items` schema. A
+body property declared as a single-entry `allOf` (usually `allOf: [{ $ref }]`
+beside its own `description`) takes `type`, `nullable` and `items` from the
+referenced schema; a multi-entry `allOf` is forwarded verbatim, and a property
+with no declared type is advertised untyped so it accepts any value.
 Parameters declared at the **path-item level** (shared by every operation on a
 path) are merged into each operation; an operation-level parameter overrides a
 path-item one with the same `name`+`in`.

package/dist/index.cjs

@@ -272,11 +272,13 @@ var sanitizeDescription = description => {
   return (description || "").replace(/'/g, "\\'").replace(/\n/g, " ").trim();
 };
 /**
-* Builds a single body/query property's `JsonSchemaProperty`. Split out of
-* {@link buildInputSchema} to keep that function's size and branching down.
+* Forwards a property's `oneOf` / `anyOf` / multi-entry `allOf` verbatim, or
+* returns `undefined` when it declares none.
 */
-var buildTypedProperty = param => {
-  const description = sanitizeDescription(param.description);
+var buildComposedProperty = param => {
+  const {
+    description
+  } = param;
   if (param.oneOf && param.oneOf.length > 0) return {
     oneOf: param.oneOf,
     description
@@ -285,6 +287,25 @@ var buildTypedProperty = param => {
     anyOf: param.anyOf,
     description
   };
+  if (param.allOf && param.allOf.length > 0) return {
+    allOf: param.allOf,
+    description
+  };
+};
+/**
+* Builds a single body/query property's `JsonSchemaProperty`. Split out of
+* {@link buildInputSchema} to keep that function's size and branching down.
+*/
+var buildTypedProperty = param => {
+  const description = sanitizeDescription(param.description);
+  const composed = buildComposedProperty({
+    ...param,
+    description
+  });
+  if (composed) return composed;
+  if (param.type === void 0) return {
+    description
+  };
   const jsonType = getJsonSchemaType(param.type);
   const finalType = param.nullable === true ? [jsonType, "null"] : jsonType;
   if (param.type === "array") return {
@@ -316,7 +337,7 @@ var buildInputSchema = (pathParams, queryParams, bodyProps) => {
     return p.camelName;
   })];
   const properties = {};
-  for (const param of allParams) properties[param.camelName] = "type" in param ? buildTypedProperty(param) : {
+  for (const param of allParams) properties[param.camelName] = "description" in param ? buildTypedProperty(param) : {
     type: "string",
     description: ""
   };
@@ -379,23 +400,47 @@ var extractAcceptedBodyFields = args => {
   const bodySchema = resolveBodySchema(args);
   return Object.keys(bodySchema?.properties ?? {});
 };
+var isPlainObject = value => {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+};
+/**
+* Folds a single-entry `allOf` into the property that wraps it. OpenAPI
+* declares `allOf: [{ $ref }]` so a property can carry its own `description`
+* next to a referenced schema; without folding, the referenced `type`,
+* `nullable` and `items` would be lost. Keys on the wrapper win over the
+* referenced schema's. Multi-entry `allOf` is left intact.
+*/
+var flattenSingleAllOf = schema => {
+  const {
+    allOf,
+    ...rest
+  } = schema;
+  if (!Array.isArray(allOf) || allOf.length !== 1) return schema;
+  const [entry] = allOf;
+  if (!isPlainObject(entry)) return rest;
+  return {
+    ...flattenSingleAllOf(entry),
+    ...rest
+  };
+};
 var extractBodyProps = args => {
   const bodySchema = resolveBodySchema(args);
   if (!bodySchema?.properties) return [];
   return Object.entries(bodySchema.properties).filter(([, value]) => {
     return !value[args.serverManagedExtension];
   }).map(([key, value]) => {
-    const val = value;
+    const val = flattenSingleAllOf(value);
     return {
       snakeName: key,
       camelName: snakeToCamel(key),
       description: typeof val.description === "string" ? val.description : "",
       required: (bodySchema.required || []).includes(key),
-      type: typeof val.type === "string" ? val.type : "string",
+      type: typeof val.type === "string" ? val.type : void 0,
       items: val.items,
       nullable: val.nullable === true,
       oneOf: Array.isArray(val.oneOf) ? val.oneOf : void 0,
-      anyOf: Array.isArray(val.anyOf) ? val.anyOf : void 0
+      anyOf: Array.isArray(val.anyOf) ? val.anyOf : void 0,
+      allOf: Array.isArray(val.allOf) ? val.allOf : void 0
     };
   });
 };

package/dist/index.d.cts

@@ -13,7 +13,9 @@ type JsonSchemaPrimitiveType = 'string' | 'number' | 'boolean' | 'array' | 'inte
  * client-side validator enforces the same alternatives the REST API does,
  * rather than collapsing to a single guessed primitive. `type` may be an
  * array of two entries (e.g. `['string', 'null']`) to represent an OpenAPI
- * `nullable: true` property without losing its declared type.
+ * `nullable: true` property without losing its declared type. A property with
+ * no declared type is emitted untyped (only `description`), so it accepts any
+ * value instead of a guessed `string`.
  */
 type JsonSchemaProperty = {
   type: JsonSchemaPrimitiveType | JsonSchemaPrimitiveType[];
@@ -22,6 +24,7 @@ type JsonSchemaProperty = {
 } | {
   oneOf?: unknown[];
   anyOf?: unknown[];
+  allOf?: unknown[];
   description?: string;
 };
 /**
@@ -274,11 +277,12 @@ declare const buildInputSchema: (pathParams: Array<{
   camelName: string;
   description: string;
   required: boolean;
-  type: string;
+  type?: string;
   items?: unknown;
   nullable?: boolean;
   oneOf?: unknown[];
   anyOf?: unknown[];
+  allOf?: unknown[];
 }>) => JsonObjectSchema;
 declare const extractPathParams: (args: {
   parameters?: Array<{
@@ -324,11 +328,12 @@ declare const extractBodyProps: (args: {
   camelName: string;
   description: string;
   required: boolean;
-  type: string;
+  type?: string;
   items?: unknown;
   nullable: boolean;
   oneOf?: unknown[];
   anyOf?: unknown[];
+  allOf?: unknown[];
 }>;
 declare const processOperation: (args: {
   pathTemplate: string;

package/dist/index.d.mts

@@ -13,7 +13,9 @@ type JsonSchemaPrimitiveType = 'string' | 'number' | 'boolean' | 'array' | 'inte
  * client-side validator enforces the same alternatives the REST API does,
  * rather than collapsing to a single guessed primitive. `type` may be an
  * array of two entries (e.g. `['string', 'null']`) to represent an OpenAPI
- * `nullable: true` property without losing its declared type.
+ * `nullable: true` property without losing its declared type. A property with
+ * no declared type is emitted untyped (only `description`), so it accepts any
+ * value instead of a guessed `string`.
  */
 type JsonSchemaProperty = {
   type: JsonSchemaPrimitiveType | JsonSchemaPrimitiveType[];
@@ -22,6 +24,7 @@ type JsonSchemaProperty = {
 } | {
   oneOf?: unknown[];
   anyOf?: unknown[];
+  allOf?: unknown[];
   description?: string;
 };
 /**
@@ -274,11 +277,12 @@ declare const buildInputSchema: (pathParams: Array<{
   camelName: string;
   description: string;
   required: boolean;
-  type: string;
+  type?: string;
   items?: unknown;
   nullable?: boolean;
   oneOf?: unknown[];
   anyOf?: unknown[];
+  allOf?: unknown[];
 }>) => JsonObjectSchema;
 declare const extractPathParams: (args: {
   parameters?: Array<{
@@ -324,11 +328,12 @@ declare const extractBodyProps: (args: {
   camelName: string;
   description: string;
   required: boolean;
-  type: string;
+  type?: string;
   items?: unknown;
   nullable: boolean;
   oneOf?: unknown[];
   anyOf?: unknown[];
+  allOf?: unknown[];
 }>;
 declare const processOperation: (args: {
   pathTemplate: string;

package/dist/index.mjs

@@ -269,11 +269,13 @@ var sanitizeDescription = description => {
   return (description || "").replace(/'/g, "\\'").replace(/\n/g, " ").trim();
 };
 /**
-* Builds a single body/query property's `JsonSchemaProperty`. Split out of
-* {@link buildInputSchema} to keep that function's size and branching down.
+* Forwards a property's `oneOf` / `anyOf` / multi-entry `allOf` verbatim, or
+* returns `undefined` when it declares none.
 */
-var buildTypedProperty = param => {
-  const description = sanitizeDescription(param.description);
+var buildComposedProperty = param => {
+  const {
+    description
+  } = param;
   if (param.oneOf && param.oneOf.length > 0) return {
     oneOf: param.oneOf,
     description
@@ -282,6 +284,25 @@ var buildTypedProperty = param => {
     anyOf: param.anyOf,
     description
   };
+  if (param.allOf && param.allOf.length > 0) return {
+    allOf: param.allOf,
+    description
+  };
+};
+/**
+* Builds a single body/query property's `JsonSchemaProperty`. Split out of
+* {@link buildInputSchema} to keep that function's size and branching down.
+*/
+var buildTypedProperty = param => {
+  const description = sanitizeDescription(param.description);
+  const composed = buildComposedProperty({
+    ...param,
+    description
+  });
+  if (composed) return composed;
+  if (param.type === void 0) return {
+    description
+  };
   const jsonType = getJsonSchemaType(param.type);
   const finalType = param.nullable === true ? [jsonType, "null"] : jsonType;
   if (param.type === "array") return {
@@ -313,7 +334,7 @@ var buildInputSchema = (pathParams, queryParams, bodyProps) => {
     return p.camelName;
   })];
   const properties = {};
-  for (const param of allParams) properties[param.camelName] = "type" in param ? buildTypedProperty(param) : {
+  for (const param of allParams) properties[param.camelName] = "description" in param ? buildTypedProperty(param) : {
     type: "string",
     description: ""
   };
@@ -376,23 +397,47 @@ var extractAcceptedBodyFields = args => {
   const bodySchema = resolveBodySchema(args);
   return Object.keys(bodySchema?.properties ?? {});
 };
+var isPlainObject = value => {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+};
+/**
+* Folds a single-entry `allOf` into the property that wraps it. OpenAPI
+* declares `allOf: [{ $ref }]` so a property can carry its own `description`
+* next to a referenced schema; without folding, the referenced `type`,
+* `nullable` and `items` would be lost. Keys on the wrapper win over the
+* referenced schema's. Multi-entry `allOf` is left intact.
+*/
+var flattenSingleAllOf = schema => {
+  const {
+    allOf,
+    ...rest
+  } = schema;
+  if (!Array.isArray(allOf) || allOf.length !== 1) return schema;
+  const [entry] = allOf;
+  if (!isPlainObject(entry)) return rest;
+  return {
+    ...flattenSingleAllOf(entry),
+    ...rest
+  };
+};
 var extractBodyProps = args => {
   const bodySchema = resolveBodySchema(args);
   if (!bodySchema?.properties) return [];
   return Object.entries(bodySchema.properties).filter(([, value]) => {
     return !value[args.serverManagedExtension];
   }).map(([key, value]) => {
-    const val = value;
+    const val = flattenSingleAllOf(value);
     return {
       snakeName: key,
       camelName: snakeToCamel(key),
       description: typeof val.description === "string" ? val.description : "",
       required: (bodySchema.required || []).includes(key),
-      type: typeof val.type === "string" ? val.type : "string",
+      type: typeof val.type === "string" ? val.type : void 0,
       items: val.items,
       nullable: val.nullable === true,
       oneOf: Array.isArray(val.oneOf) ? val.oneOf : void 0,
-      anyOf: Array.isArray(val.anyOf) ? val.anyOf : void 0
+      anyOf: Array.isArray(val.anyOf) ? val.anyOf : void 0,
+      allOf: Array.isArray(val.allOf) ? val.allOf : void 0
     };
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ttoss/http-server-mcp-openapi",
-  "version": "0.2.14",
+  "version": "0.2.15",
   "description": "Generate Model Context Protocol (MCP) tools from an OpenAPI specification for @ttoss/http-server-mcp",
   "keywords": [
     "ai",