docusaurus-plugin-openapi-docs 0.0.0-849 → 0.0.0-852

package/lib/markdown/createSchema.js

@@ -543,38 +543,43 @@ function createEdges({ name, schema, required, discriminator, }) {
     }
     if (schema.allOf !== undefined) {
         const { mergedSchemas } = mergeAllOf(schema.allOf);
+        delete schema.allOf;
+        const combinedSchemas = { ...schema, ...mergedSchemas };
         if (SCHEMA_TYPE === "request") {
-            if (mergedSchemas.readOnly && mergedSchemas.readOnly === true) {
+            if (combinedSchemas.readOnly && combinedSchemas.readOnly === true) {
                 return undefined;
             }
         }
         if (SCHEMA_TYPE === "response") {
-            if (mergedSchemas.writeOnly && mergedSchemas.writeOnly === true) {
+            if (combinedSchemas.writeOnly && combinedSchemas.writeOnly === true) {
                 return undefined;
             }
         }
-        const mergedSchemaName = (0, schema_1.getSchemaName)(mergedSchemas);
-        if (mergedSchemas.oneOf !== undefined ||
-            mergedSchemas.anyOf !== undefined) {
-            return createDetailsNode(name, mergedSchemaName, mergedSchemas, required, schema.nullable);
+        const mergedSchemaName = (0, schema_1.getSchemaName)(combinedSchemas);
+        if (name === "eventName") {
+            console.log(mergedSchemaName, combinedSchemas);
         }
-        if (mergedSchemas.properties !== undefined) {
-            return createDetailsNode(name, mergedSchemaName, mergedSchemas, required, schema.nullable);
+        if (combinedSchemas.oneOf !== undefined ||
+            combinedSchemas.anyOf !== undefined) {
+            return createDetailsNode(name, mergedSchemaName, combinedSchemas, required, combinedSchemas.nullable);
+        }
+        if (combinedSchemas.properties !== undefined) {
+            return createDetailsNode(name, mergedSchemaName, combinedSchemas, required, combinedSchemas.nullable);
         }
-        if (mergedSchemas.additionalProperties !== undefined) {
-            return createDetailsNode(name, mergedSchemaName, mergedSchemas, required, schema.nullable);
+        if (combinedSchemas.additionalProperties !== undefined) {
+            return createDetailsNode(name, mergedSchemaName, combinedSchemas, required, combinedSchemas.nullable);
         }
         // array of objects
         if (((_d = mergedSchemas.items) === null || _d === void 0 ? void 0 : _d.properties) !== undefined) {
-            return createDetailsNode(name, mergedSchemaName, mergedSchemas, required, schema.nullable);
+            return createDetailsNode(name, mergedSchemaName, combinedSchemas, required, combinedSchemas.nullable);
         }
         return (0, utils_1.create)("SchemaItem", {
             collapsible: false,
             name,
             required: Array.isArray(required) ? required.includes(name) : required,
             schemaName: mergedSchemaName,
-            qualifierMessage: (0, schema_1.getQualifierMessage)(mergedSchemas),
-            schema: mergedSchemas,
+            qualifierMessage: (0, schema_1.getQualifierMessage)(combinedSchemas),
+            schema: combinedSchemas,
         });
     }
     // primitives and array of non-objects

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "docusaurus-plugin-openapi-docs",
   "description": "OpenAPI plugin for Docusaurus.",
-  "version": "0.0.0-849",
+  "version": "0.0.0-852",
   "license": "MIT",
   "keywords": [
     "openapi",
@@ -62,5 +62,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "cb92722ebee6fe516b1ba535821567bd75bc5281"
+  "gitHead": "a352f9c4ce4e9fb46044d7cba30c132aaa81518f"
 }

package/src/markdown/createSchema.ts

@@ -687,50 +687,57 @@ function createEdges({
     const { mergedSchemas }: { mergedSchemas: SchemaObject } = mergeAllOf(
       schema.allOf
     );
+    delete schema.allOf;
+    const combinedSchemas = { ...schema, ...mergedSchemas };
 
     if (SCHEMA_TYPE === "request") {
-      if (mergedSchemas.readOnly && mergedSchemas.readOnly === true) {
+      if (combinedSchemas.readOnly && combinedSchemas.readOnly === true) {
         return undefined;
       }
     }
 
     if (SCHEMA_TYPE === "response") {
-      if (mergedSchemas.writeOnly && mergedSchemas.writeOnly === true) {
+      if (combinedSchemas.writeOnly && combinedSchemas.writeOnly === true) {
         return undefined;
       }
     }
 
-    const mergedSchemaName = getSchemaName(mergedSchemas);
+    const mergedSchemaName = getSchemaName(combinedSchemas);
+
+    if (name === "eventName") {
+      console.log(mergedSchemaName, combinedSchemas);
+    }
+
     if (
-      mergedSchemas.oneOf !== undefined ||
-      mergedSchemas.anyOf !== undefined
+      combinedSchemas.oneOf !== undefined ||
+      combinedSchemas.anyOf !== undefined
     ) {
       return createDetailsNode(
         name,
         mergedSchemaName,
-        mergedSchemas,
+        combinedSchemas,
         required,
-        schema.nullable
+        combinedSchemas.nullable
       );
     }
 
-    if (mergedSchemas.properties !== undefined) {
+    if (combinedSchemas.properties !== undefined) {
       return createDetailsNode(
         name,
         mergedSchemaName,
-        mergedSchemas,
+        combinedSchemas,
         required,
-        schema.nullable
+        combinedSchemas.nullable
       );
     }
 
-    if (mergedSchemas.additionalProperties !== undefined) {
+    if (combinedSchemas.additionalProperties !== undefined) {
       return createDetailsNode(
         name,
         mergedSchemaName,
-        mergedSchemas,
+        combinedSchemas,
         required,
-        schema.nullable
+        combinedSchemas.nullable
       );
     }
 
@@ -739,9 +746,9 @@ function createEdges({
       return createDetailsNode(
         name,
         mergedSchemaName,
-        mergedSchemas,
+        combinedSchemas,
         required,
-        schema.nullable
+        combinedSchemas.nullable
       );
     }
 
@@ -750,8 +757,8 @@ function createEdges({
       name,
       required: Array.isArray(required) ? required.includes(name) : required,
       schemaName: mergedSchemaName,
-      qualifierMessage: getQualifierMessage(mergedSchemas),
-      schema: mergedSchemas,
+      qualifierMessage: getQualifierMessage(combinedSchemas),
+      schema: combinedSchemas,
     });
   }