docusaurus-plugin-openapi-docs 0.0.0-1006 → 0.0.0-1007

package/lib/openapi/createRequestExample.js

@@ -147,10 +147,10 @@ const sampleRequestFromSchema = (schema = {}) => {
         }
         if (type === "array") {
             if (Array.isArray(items === null || items === void 0 ? void 0 : items.anyOf)) {
-                return items === null || items === void 0 ? void 0 : items.anyOf.map((item) => (0, exports.sampleRequestFromSchema)(item));
+                return processArrayItems(items, "anyOf");
             }
             if (Array.isArray(items === null || items === void 0 ? void 0 : items.oneOf)) {
-                return items === null || items === void 0 ? void 0 : items.oneOf.map((item) => (0, exports.sampleRequestFromSchema)(item));
+                return processArrayItems(items, "oneOf");
             }
             return normalizeArray((0, exports.sampleRequestFromSchema)(items));
         }
@@ -192,3 +192,22 @@ function normalizeArray(arr) {
     }
     return [arr];
 }
+function processArrayItems(items, schemaType) {
+    const itemsArray = items[schemaType];
+    return itemsArray.map((item) => {
+        // If items has properties, merge them with each item
+        if (items.properties) {
+            const combinedSchema = {
+                ...item,
+                properties: {
+                    ...items.properties, // Common properties from parent
+                    ...item.properties, // Specific properties from this anyOf/oneOf item
+                },
+            };
+            // Remove anyOf/oneOf to prevent infinite recursion when calling sampleRequestFromSchema
+            delete combinedSchema[schemaType];
+            return (0, exports.sampleRequestFromSchema)(combinedSchema);
+        }
+        return (0, exports.sampleRequestFromSchema)(item);
+    });
+}

package/lib/openapi/createResponseExample.js

@@ -148,10 +148,10 @@ const sampleResponseFromSchema = (schema = {}) => {
         }
         if (type === "array") {
             if (Array.isArray(items === null || items === void 0 ? void 0 : items.anyOf)) {
-                return items === null || items === void 0 ? void 0 : items.anyOf.map((item) => (0, exports.sampleResponseFromSchema)(item));
+                return processArrayItems(items, "anyOf");
             }
             if (Array.isArray(items === null || items === void 0 ? void 0 : items.oneOf)) {
-                return items === null || items === void 0 ? void 0 : items.oneOf.map((item) => (0, exports.sampleResponseFromSchema)(item));
+                return processArrayItems(items, "oneOf");
             }
             return [(0, exports.sampleResponseFromSchema)(items)];
         }
@@ -193,3 +193,22 @@ function normalizeArray(arr) {
     }
     return [arr];
 }
+function processArrayItems(items, schemaType) {
+    const itemsArray = items[schemaType];
+    return itemsArray.map((item) => {
+        // If items has properties, merge them with each item
+        if (items.properties) {
+            const combinedSchema = {
+                ...item,
+                properties: {
+                    ...items.properties, // Common properties from parent
+                    ...item.properties, // Specific properties from this anyOf/oneOf item
+                },
+            };
+            // Remove anyOf/oneOf to prevent infinite recursion when calling sampleResponseFromSchema
+            delete combinedSchema[schemaType];
+            return (0, exports.sampleResponseFromSchema)(combinedSchema);
+        }
+        return (0, exports.sampleResponseFromSchema)(item);
+    });
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "docusaurus-plugin-openapi-docs",
   "description": "OpenAPI plugin for Docusaurus.",
-  "version": "0.0.0-1006",
+  "version": "0.0.0-1007",
   "license": "MIT",
   "keywords": [
     "openapi",
@@ -65,5 +65,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "e73c0b0cead279cb3771b546adc1caebabf336ae"
+  "gitHead": "864d5355b98d552679472455f533ef15313a0bee"
 }

package/src/openapi/createRequestExample.ts

@@ -178,11 +178,11 @@ export const sampleRequestFromSchema = (schema: SchemaObject = {}): any => {
 
     if (type === "array") {
       if (Array.isArray(items?.anyOf)) {
-        return items?.anyOf.map((item: any) => sampleRequestFromSchema(item));
+        return processArrayItems(items, "anyOf");
       }
 
       if (Array.isArray(items?.oneOf)) {
-        return items?.oneOf.map((item: any) => sampleRequestFromSchema(item));
+        return processArrayItems(items, "oneOf");
       }
 
       return normalizeArray(sampleRequestFromSchema(items));
@@ -237,3 +237,26 @@ function normalizeArray(arr: any) {
   }
   return [arr];
 }
+
+function processArrayItems(
+  items: SchemaObject,
+  schemaType: "anyOf" | "oneOf"
+): any[] {
+  const itemsArray = items[schemaType] as SchemaObject[];
+  return itemsArray.map((item: SchemaObject) => {
+    // If items has properties, merge them with each item
+    if (items.properties) {
+      const combinedSchema = {
+        ...item,
+        properties: {
+          ...items.properties, // Common properties from parent
+          ...item.properties, // Specific properties from this anyOf/oneOf item
+        },
+      };
+      // Remove anyOf/oneOf to prevent infinite recursion when calling sampleRequestFromSchema
+      delete combinedSchema[schemaType];
+      return sampleRequestFromSchema(combinedSchema);
+    }
+    return sampleRequestFromSchema(item);
+  });
+}

package/src/openapi/createResponseExample.ts

@@ -181,11 +181,11 @@ export const sampleResponseFromSchema = (schema: SchemaObject = {}): any => {
 
     if (type === "array") {
       if (Array.isArray(items?.anyOf)) {
-        return items?.anyOf.map((item: any) => sampleResponseFromSchema(item));
+        return processArrayItems(items, "anyOf");
       }
 
       if (Array.isArray(items?.oneOf)) {
-        return items?.oneOf.map((item: any) => sampleResponseFromSchema(item));
+        return processArrayItems(items, "oneOf");
       }
 
       return [sampleResponseFromSchema(items)];
@@ -240,3 +240,26 @@ function normalizeArray(arr: any) {
   }
   return [arr];
 }
+
+function processArrayItems(
+  items: SchemaObject,
+  schemaType: "anyOf" | "oneOf"
+): any[] {
+  const itemsArray = items[schemaType] as SchemaObject[];
+  return itemsArray.map((item: SchemaObject) => {
+    // If items has properties, merge them with each item
+    if (items.properties) {
+      const combinedSchema = {
+        ...item,
+        properties: {
+          ...items.properties, // Common properties from parent
+          ...item.properties, // Specific properties from this anyOf/oneOf item
+        },
+      };
+      // Remove anyOf/oneOf to prevent infinite recursion when calling sampleResponseFromSchema
+      delete combinedSchema[schemaType];
+      return sampleResponseFromSchema(combinedSchema);
+    }
+    return sampleResponseFromSchema(item);
+  });
+}