Handle multiple circular refs in allOf

Author: sserrata

packages/docusaurus-plugin-openapi-docs/src/markdown/__snapshots__/createSchema.test.ts.snap

@@ -364,24 +364,6 @@ Array [
   qualifierMessage={undefined}
   schema={{ type: \\"string\\" }}
 ></SchemaItem>;
-",
-  "<SchemaItem
-  collapsible={false}
-  name={\\"parentProp1\\"}
-  required={false}
-  schemaName={\\"string\\"}
-  qualifierMessage={undefined}
-  schema={{ type: \\"string\\" }}
-></SchemaItem>;
-",
-  "<SchemaItem
-  collapsible={false}
-  name={\\"parentProp2\\"}
-  required={false}
-  schemaName={\\"string\\"}
-  qualifierMessage={undefined}
-  schema={{ type: \\"string\\" }}
-></SchemaItem>;
 ",
 ]
 `;
@@ -729,15 +711,6 @@ Array [
   qualifierMessage={undefined}
   schema={{ type: \\"string\\" }}
 ></SchemaItem>;
-",
-  "<SchemaItem
-  collapsible={false}
-  name={\\"type\\"}
-  required={false}
-  schemaName={\\"string\\"}
-  qualifierMessage={undefined}
-  schema={{ type: \\"string\\" }}
-></SchemaItem>;
 ",
 ]
 `;
@@ -824,34 +797,6 @@ Array [
   qualifierMessage={undefined}
   schema={{ type: \\"string\\" }}
 ></SchemaItem>;
-",
-  "<div className={\\"openapi-discriminator__item openapi-schema__list-item\\"}>
-  <div>
-    <span className={\\"openapi-schema__container\\"}>
-      <strong
-        className={\\"openapi-discriminator__name openapi-schema__property\\"}
-      >
-        type
-      </strong>
-      <span className={\\"openapi-schema__name\\"}>string</span>
-    </span>
-    <div style={{ paddingLeft: \\"1rem\\" }}>
-      **Possible values:** [\`typeA\`, \`typeB\`]
-    </div>
-    <DiscriminatorTabs className={\\"openapi-tabs__discriminator\\"}>
-      <TabItem label={\\"typeA\\"} value={\\"0-item-discriminator\\"}>
-        <div style={{ marginTop: \\".5rem\\", marginBottom: \\".5rem\\" }}>
-          #/definitions/TypeA
-        </div>
-      </TabItem>
-      <TabItem label={\\"typeB\\"} value={\\"1-item-discriminator\\"}>
-        <div style={{ marginTop: \\".5rem\\", marginBottom: \\".5rem\\" }}>
-          #/definitions/TypeB
-        </div>
-      </TabItem>
-    </DiscriminatorTabs>
-  </div>
-</div>;
 ",
 ]
 `;

packages/docusaurus-plugin-openapi-docs/src/markdown/createSchema.ts

@@ -783,41 +783,29 @@ export function createNodes(
   }
 
   if (schema.allOf !== undefined) {
-    const circularIndex = schema.allOf.findIndex((item: any) => {
+    const circularItems = schema.allOf.filter((item: any) => {
       return typeof item === "string" && item.includes("circular");
     });
 
-    if (circularIndex !== -1) {
+    for (const label of circularItems) {
       nodes.push(
         create("div", {
           style: {
             marginTop: ".5rem",
             marginBottom: ".5rem",
             marginLeft: "1rem",
           },
-          children: createDescription(schema.allOf[circularIndex] as string),
+          children: createDescription(label as string),
         })
       );
+    }
 
-      const rest = schema.allOf
-        .slice(0, circularIndex)
-        .concat(schema.allOf.slice(circularIndex + 1));
-
-      if (rest.length) {
-        const mergedSchemas = mergeAllOf({ allOf: rest } as SchemaObject);
-        if (
-          mergedSchemas.oneOf !== undefined ||
-          mergedSchemas.anyOf !== undefined
-        ) {
-          nodes.push(createAnyOneOf(mergedSchemas));
-        }
-
-        if (mergedSchemas.properties !== undefined) {
-          nodes.push(createProperties(mergedSchemas));
-        }
-      }
-    } else {
-      const mergedSchemas = mergeAllOf(schema) as SchemaObject;
+    const rest = schema.allOf.filter((item: any) => {
+      return !(typeof item === "string" && item.includes("circular"));
+    });
+
+    if (rest.length) {
+      const mergedSchemas = mergeAllOf({ allOf: rest } as SchemaObject);
 
       if (
         mergedSchemas.oneOf !== undefined ||