docusaurus-theme-openapi-docs 0.0.0-1333 → 0.0.0-1337

package/lib/theme/Schema/index.js

@@ -267,6 +267,9 @@ const AnyOneOf = ({ schema, schemaType, schemaPath }) => {
               }),
             (anyOneSchema.type === "object" || !anyOneSchema.type) &&
               anyOneSchema.properties &&
+              !anyOneSchema.oneOf &&
+              !anyOneSchema.anyOf &&
+              !anyOneSchema.allOf &&
               react_1.default.createElement(Properties, {
                 schema: anyOneSchema,
                 schemaType: schemaType,

package/lib/theme/Schema/normalize.test.js

@@ -140,6 +140,74 @@ describe("foldSiblingsIntoBranches", () => {
     expect(result.items).toBeUndefined();
     expect(result.oneOf).toHaveLength(1);
   });
+  // Regression for #1548 (property duplication in nested anyOf-of-oneOf):
+  // when the outer schema is `{ properties, anyOf: [{oneOf:[...]}, ...] }`,
+  // fold merges the outer properties into each anyOf branch, giving each
+  // branch its own inner `oneOf` alongside merged properties. The AnyOneOf
+  // render layer then delegates the branch to SchemaNode, which folds again
+  // into each inner variant. If AnyOneOf were to *also* render the branch's
+  // properties directly at that outer level, the same fields would appear
+  // twice per selected inner variant tab — hence the check in Schema/index.tsx
+  // that skips <Properties> when the branch has a nested oneOf/anyOf/allOf.
+  it("folds outer properties into each anyOf branch when branches contain nested oneOf", () => {
+    const schema = {
+      type: "object",
+      properties: {
+        name: { type: "string" },
+        default_value: { type: "string" },
+      },
+      anyOf: [
+        {
+          oneOf: [
+            {
+              title: "aggregate_group",
+              properties: {
+                aggregate_group: { type: "string" },
+              },
+            },
+            {
+              title: "tap",
+              properties: {
+                tap: { type: "object" },
+              },
+            },
+          ],
+        },
+        {
+          oneOf: [
+            {
+              title: "folder",
+              properties: { folder: { type: "string" } },
+            },
+            {
+              title: "snippet",
+              properties: { snippet: { type: "string" } },
+            },
+          ],
+        },
+      ],
+    };
+    const outer = (0, normalize_1.foldSiblingsIntoBranches)(schema);
+    expect(outer.properties).toBeUndefined();
+    expect(outer.anyOf).toHaveLength(2);
+    for (const branch of outer.anyOf) {
+      // Each anyOf branch retains its own inner oneOf and picks up the
+      // merged outer properties as siblings — this is the shape that
+      // AnyOneOf must NOT render <Properties> for directly, because
+      // SchemaNode will fold them into the inner variants below.
+      expect(branch.oneOf).toBeDefined();
+      expect(branch.properties.name).toBeDefined();
+      expect(branch.properties.default_value).toBeDefined();
+      const inner = (0, normalize_1.foldSiblingsIntoBranches)(branch);
+      expect(inner.properties).toBeUndefined();
+      expect(inner.oneOf).toBeDefined();
+      for (const variant of inner.oneOf) {
+        // Merged outer properties appear exactly once — inside each variant.
+        expect(variant.properties.name).toBeDefined();
+        expect(variant.properties.default_value).toBeDefined();
+      }
+    }
+  });
 });
 describe("getDiscriminator", () => {
   it("returns direct discriminator", () => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "docusaurus-theme-openapi-docs",
   "description": "OpenAPI theme for Docusaurus.",
-  "version": "0.0.0-1333",
+  "version": "0.0.0-1337",
   "license": "MIT",
   "keywords": [
     "openapi",
@@ -38,7 +38,7 @@
     "@types/postman-collection": "^3.5.11",
     "@types/react-modal": "^3.16.3",
     "concurrently": "^10.0.3",
-    "docusaurus-plugin-openapi-docs": "0.0.0-1333",
+    "docusaurus-plugin-openapi-docs": "0.0.0-1337",
     "docusaurus-plugin-sass": "^0.2.6",
     "eslint-plugin-prettier": "^5.5.1"
   },
@@ -82,5 +82,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "06c3566f89cfec4317b6e3043ef0d931cef441c4"
+  "gitHead": "eb25a87f1b874a78582eadb3dc389d967dc221f4"
 }

package/src/theme/Schema/index.tsx

@@ -251,8 +251,16 @@ const AnyOneOf: React.FC<SchemaProps> = ({
 
               {/* Handle actual object types with properties or nested schemas */}
               {/* Note: In OpenAPI, properties implies type: object even if not explicitly set */}
+              {/* When the branch also has a nested oneOf/anyOf/allOf, skip
+                  Properties here and delegate to SchemaNode below —
+                  foldSiblingsIntoBranches will merge these properties into
+                  each inner variant, so rendering them inline as well would
+                  duplicate them per variant tab. See #1548. */}
               {(anyOneSchema.type === "object" || !anyOneSchema.type) &&
-                anyOneSchema.properties && (
+                anyOneSchema.properties &&
+                !anyOneSchema.oneOf &&
+                !anyOneSchema.anyOf &&
+                !anyOneSchema.allOf && (
                   <Properties
                     schema={anyOneSchema}
                     schemaType={schemaType}

package/src/theme/Schema/normalize.test.ts

@@ -158,6 +158,78 @@ describe("foldSiblingsIntoBranches", () => {
     expect(result.items).toBeUndefined();
     expect(result.oneOf).toHaveLength(1);
   });
+
+  // Regression for #1548 (property duplication in nested anyOf-of-oneOf):
+  // when the outer schema is `{ properties, anyOf: [{oneOf:[...]}, ...] }`,
+  // fold merges the outer properties into each anyOf branch, giving each
+  // branch its own inner `oneOf` alongside merged properties. The AnyOneOf
+  // render layer then delegates the branch to SchemaNode, which folds again
+  // into each inner variant. If AnyOneOf were to *also* render the branch's
+  // properties directly at that outer level, the same fields would appear
+  // twice per selected inner variant tab — hence the check in Schema/index.tsx
+  // that skips <Properties> when the branch has a nested oneOf/anyOf/allOf.
+  it("folds outer properties into each anyOf branch when branches contain nested oneOf", () => {
+    const schema = {
+      type: "object",
+      properties: {
+        name: { type: "string" },
+        default_value: { type: "string" },
+      },
+      anyOf: [
+        {
+          oneOf: [
+            {
+              title: "aggregate_group",
+              properties: {
+                aggregate_group: { type: "string" },
+              },
+            },
+            {
+              title: "tap",
+              properties: {
+                tap: { type: "object" },
+              },
+            },
+          ],
+        },
+        {
+          oneOf: [
+            {
+              title: "folder",
+              properties: { folder: { type: "string" } },
+            },
+            {
+              title: "snippet",
+              properties: { snippet: { type: "string" } },
+            },
+          ],
+        },
+      ],
+    };
+
+    const outer = foldSiblingsIntoBranches(schema);
+    expect(outer.properties).toBeUndefined();
+    expect(outer.anyOf).toHaveLength(2);
+
+    for (const branch of outer.anyOf) {
+      // Each anyOf branch retains its own inner oneOf and picks up the
+      // merged outer properties as siblings — this is the shape that
+      // AnyOneOf must NOT render <Properties> for directly, because
+      // SchemaNode will fold them into the inner variants below.
+      expect(branch.oneOf).toBeDefined();
+      expect(branch.properties.name).toBeDefined();
+      expect(branch.properties.default_value).toBeDefined();
+
+      const inner = foldSiblingsIntoBranches(branch);
+      expect(inner.properties).toBeUndefined();
+      expect(inner.oneOf).toBeDefined();
+      for (const variant of inner.oneOf) {
+        // Merged outer properties appear exactly once — inside each variant.
+        expect(variant.properties.name).toBeDefined();
+        expect(variant.properties.default_value).toBeDefined();
+      }
+    }
+  });
 });
 
 describe("getDiscriminator", () => {