fumadocs-openapi 5.3.0 → 5.3.2

package/dist/server/index.js

@@ -468,6 +468,38 @@ function heading(depth, child, ctx) {
     }, id);
 }
 
+/**
+ * Combine multiple object schemas into one
+ */ function combineSchema(schema) {
+    const result = {
+        type: 'object'
+    };
+    function add(s) {
+        if (s.properties) {
+            var _result;
+            (_result = result).properties ?? (_result.properties = {});
+            Object.assign(result.properties, s.properties);
+        }
+        if (s.additionalProperties === true) {
+            result.additionalProperties = true;
+        } else if (s.additionalProperties && typeof result.additionalProperties !== 'boolean') {
+            var _result1;
+            (_result1 = result).additionalProperties ?? (_result1.additionalProperties = {});
+            Object.assign(result.additionalProperties, s.additionalProperties);
+        }
+        if (s.required) {
+            var _result2;
+            (_result2 = result).required ?? (_result2.required = []);
+            result.required.push(...s.required);
+        }
+        if (s.allOf) {
+            noRef(s.allOf).forEach(add);
+        }
+    }
+    schema.forEach(add);
+    return result;
+}
+
 const keys = {
     default: 'Default',
     minimum: 'Minimum',
@@ -521,6 +553,13 @@ function Schema({ name, schema, ctx }) {
         }
         return child;
     }
+    if (schema.allOf && parseObject) {
+        return /*#__PURE__*/ jsx(Schema, {
+            name: name,
+            schema: combineSchema(noRef(schema.allOf)),
+            ctx: ctx
+        });
+    }
     if (schema.description) child.push(/*#__PURE__*/ jsx(Markdown, {
         text: schema.description
     }, "description"));
@@ -540,17 +579,22 @@ function Schema({ name, schema, ctx }) {
         });
     }
     if (fields.length > 0) child.push(/*#__PURE__*/ jsx("p", {
-        children: fields.map((field)=>/*#__PURE__*/ jsxs("span", {
+        children: fields.map((field, i)=>/*#__PURE__*/ jsxs(Fragment, {
                 children: [
-                    field.key,
-                    ": ",
-                    /*#__PURE__*/ jsx("code", {
-                        children: field.value
-                    })
+                    /*#__PURE__*/ jsxs("span", {
+                        children: [
+                            field.key,
+                            ": ",
+                            /*#__PURE__*/ jsx("code", {
+                                children: field.value
+                            })
+                        ]
+                    }),
+                    i !== fields.length - 1 ? /*#__PURE__*/ jsx("br", {}) : null
                 ]
             }, field.key))
     }, "fields"));
-    if (isObject(schema) && !parseObject) {
+    if ((isObject(schema) || schema.allOf) && !parseObject) {
         child.push(/*#__PURE__*/ jsx(renderer.ObjectCollapsible, {
             name: "Attributes",
             children: /*#__PURE__*/ jsx(Schema, {
@@ -563,19 +607,6 @@ function Schema({ name, schema, ctx }) {
                 }
             })
         }, "attributes"));
-    } else if (schema.allOf) {
-        child.push(/*#__PURE__*/ jsx(renderer.ObjectCollapsible, {
-            name: name,
-            children: /*#__PURE__*/ jsx(Schema, {
-                name: name,
-                schema: combineSchema(noRef(schema.allOf)),
-                ctx: {
-                    ...ctx,
-                    parseObject: true,
-                    required: false
-                }
-            })
-        }, "attributes"));
     } else {
         const mentionedObjectTypes = [
             ...schema.anyOf ?? schema.oneOf ?? [],
@@ -614,31 +645,6 @@ function Schema({ name, schema, ctx }) {
         children: child
     });
 }
-/**
- * Combine multiple object schemas into one
- */ function combineSchema(schema) {
-    const result = {
-        type: 'object'
-    };
-    function add(s) {
-        var _result, _result1;
-        (_result = result).properties ?? (_result.properties = {});
-        if (s.properties) {
-            Object.assign(result.properties, s.properties);
-        }
-        (_result1 = result).additionalProperties ?? (_result1.additionalProperties = {});
-        if (s.additionalProperties === true) {
-            result.additionalProperties = true;
-        } else if (s.additionalProperties && typeof result.additionalProperties !== 'boolean') {
-            Object.assign(result.additionalProperties, s.additionalProperties);
-        }
-        if (s.allOf) {
-            add(combineSchema(noRef(s.allOf)));
-        }
-    }
-    schema.forEach(add);
-    return result;
-}
 /**
  * Check if the schema needs another collapsible to explain
  */ function isComplexType(schema) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fumadocs-openapi",
-  "version": "5.3.0",
+  "version": "5.3.2",
   "description": "Generate MDX docs for your OpenAPI spec",
   "keywords": [
     "NextJs",