docusaurus-plugin-openapi-docs 2.1.2 → 2.1.3

package/lib/markdown/createSchema.d.ts

@@ -4,7 +4,7 @@ import { SchemaObject } from "../openapi/types";
  */
 export declare function mergeAllOf(allOf: SchemaObject[]): {
     mergedSchemas: any;
-    required: any;
+    mergedRequired: any;
 };
 /**
  * Creates a hierarchical level of a schema tree. Nodes produce edges that can branch into sub-nodes with edges, recursively.

package/lib/markdown/createSchema.js

@@ -40,14 +40,14 @@ function mergeAllOf(allOf) {
         },
         ignoreAdditionalProperties: true,
     });
-    const required = allOf.reduce((acc, cur) => {
+    const mergedRequired = allOf.reduce((acc, cur) => {
         if (Array.isArray(cur.required)) {
             const next = [...acc, ...cur.required];
             return next;
         }
         return acc;
     }, []);
-    return { mergedSchemas, required };
+    return { mergedSchemas, mergedRequired };
 }
 exports.mergeAllOf = mergeAllOf;
 /**
@@ -491,7 +491,7 @@ function createEdges({ name, schema, required, discriminator, }) {
         return createAnyOneOfProperty(name, schemaName, schema, required, schema.nullable);
     }
     if (schema.allOf !== undefined) {
-        const { mergedSchemas, required, } = mergeAllOf(schema.allOf);
+        const { mergedSchemas } = mergeAllOf(schema.allOf);
         const mergedSchemaName = (0, schema_1.getSchemaName)(mergedSchemas);
         if (mergedSchemas.oneOf !== undefined ||
             mergedSchemas.anyOf !== undefined) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "docusaurus-plugin-openapi-docs",
   "description": "OpenAPI plugin for Docusaurus.",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "license": "MIT",
   "keywords": [
     "openapi",
@@ -60,5 +60,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "4bb7040ce39ebe38b2a2837ab0c6a8c477a9a546"
+  "gitHead": "3bca23ffd3bc51c3d7f4ebb3916e2ece8c823961"
 }

package/src/markdown/createSchema.ts

@@ -44,7 +44,7 @@ export function mergeAllOf(allOf: SchemaObject[]) {
     ignoreAdditionalProperties: true,
   });
 
-  const required = allOf.reduce((acc, cur) => {
+  const mergedRequired = allOf.reduce((acc, cur) => {
     if (Array.isArray(cur.required)) {
       const next = [...acc, ...cur.required];
       return next;
@@ -52,7 +52,7 @@ export function mergeAllOf(allOf: SchemaObject[]) {
     return acc;
   }, [] as any);
 
-  return { mergedSchemas, required };
+  return { mergedSchemas, mergedRequired };
 }
 
 /**
@@ -260,9 +260,8 @@ function createItems(schema: SchemaObject) {
     // TODO: figure out if and how we should pass merged required array
     const {
       mergedSchemas,
-    }: { mergedSchemas: SchemaObject; required: string[] } = mergeAllOf(
-      schema.items?.allOf
-    );
+    }: { mergedSchemas: SchemaObject; mergedRequired: string[] | boolean } =
+      mergeAllOf(schema.items?.allOf);
 
     // Handles combo anyOf/oneOf + properties
     if (
@@ -596,7 +595,6 @@ function createEdges({
   discriminator,
 }: EdgeProps): any {
   const schemaName = getSchemaName(schema);
-
   if (discriminator !== undefined && discriminator.propertyName === name) {
     return createPropertyDiscriminator(
       name,
@@ -618,11 +616,9 @@ function createEdges({
   }
 
   if (schema.allOf !== undefined) {
-    const {
-      mergedSchemas,
-      required,
-    }: { mergedSchemas: SchemaObject; required: string[] | boolean } =
-      mergeAllOf(schema.allOf);
+    const { mergedSchemas }: { mergedSchemas: SchemaObject } = mergeAllOf(
+      schema.allOf
+    );
     const mergedSchemaName = getSchemaName(mergedSchemas);
     if (
       mergedSchemas.oneOf !== undefined ||