docusaurus-theme-openapi-docs 5.1.1 → 5.1.3

package/lib/theme/Schema/index.js

@@ -254,6 +254,7 @@ const AnyOneOf = ({ schema, schemaType, schemaPath }) => {
               }),
             anyOneSchema.type === "object" &&
               !anyOneSchema.properties &&
+              !anyOneSchema.additionalProperties &&
               !anyOneSchema.allOf &&
               !anyOneSchema.oneOf &&
               !anyOneSchema.anyOf &&
@@ -267,11 +268,23 @@ 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,
                 schemaPath: childSchemaPath,
               }),
+            (anyOneSchema.type === "object" || !anyOneSchema.type) &&
+              anyOneSchema.additionalProperties &&
+              !anyOneSchema.oneOf &&
+              !anyOneSchema.anyOf &&
+              !anyOneSchema.allOf &&
+              react_1.default.createElement(AdditionalProperties, {
+                schema: anyOneSchema,
+                schemaType: schemaType,
+              }),
             anyOneSchema.allOf &&
               react_1.default.createElement(SchemaNode, {
                 schema: anyOneSchema,
@@ -996,7 +1009,11 @@ const SchemaNode = ({ schema: rawSchema, schemaType, schemaPath }) => {
     workingSchema = (0, normalize_1.mergeAllOf)(schema);
   }
   if (!workingSchema.discriminator && resolvedDiscriminator) {
-    workingSchema.discriminator = resolvedDiscriminator;
+    // Clone: getDiscriminator returns a nested branch's discriminator by
+    // reference, and DiscriminatorNode mutates `.mapping` when inferring
+    // variants. Without cloning, a branch that declares its own discriminator
+    // gets a mapping pointing back to itself and recurses forever.
+    workingSchema.discriminator = { ...resolvedDiscriminator };
   }
   if (workingSchema.discriminator) {
     const { discriminator } = workingSchema;

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/lib/theme/utils/codeBlockUtils.js

@@ -164,7 +164,7 @@ function parseCodeLinesFromContent(code, params) {
       .filter((d) => d.block)
       .map(({ className, block }) => [block.end, className])
   );
-  for (let lineNumber = 0; lineNumber < lines.length; ) {
+  for (let lineNumber = 0; lineNumber < lines.length;) {
     const line = lines[lineNumber];
     const match = line.match(directiveRegex);
     if (!match) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "docusaurus-theme-openapi-docs",
   "description": "OpenAPI theme for Docusaurus.",
-  "version": "5.1.1",
+  "version": "5.1.3",
   "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": "^5.1.1",
+    "docusaurus-plugin-openapi-docs": "^5.1.3",
     "docusaurus-plugin-sass": "^0.2.6",
     "eslint-plugin-prettier": "^5.5.1"
   },
@@ -52,7 +52,7 @@
     "crypto-js": "^4.2.0",
     "file-saver": "^2.0.5",
     "lodash": "^4.17.21",
-    "pako": "^2.1.0",
+    "pako": "^3.0.1",
     "path-browserify": "^1.0.1",
     "postman-code-generators": "^2.0.0",
     "postman-collection": "^5.0.2",
@@ -67,7 +67,7 @@
     "rehype-raw": "^7.0.0",
     "remark-gfm": "4.0.1",
     "sass": "^1.89.2",
-    "sass-loader": "^16.0.5",
+    "sass-loader": "^17.0.0",
     "unist-util-visit": "^5.0.0",
     "url": "^0.11.4",
     "xml-formatter": "^3.6.6"
@@ -82,5 +82,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "c2bc86da54f585f71d294c9f35decf133cb5e589"
+  "gitHead": "d5af4f22e951712e084df8b7c513a1708e56d372"
 }

package/src/theme/Schema/index.tsx

@@ -236,6 +236,7 @@ const AnyOneOf: React.FC<SchemaProps> = ({
               {/* Handle empty object as a primitive type */}
               {anyOneSchema.type === "object" &&
                 !anyOneSchema.properties &&
+                !anyOneSchema.additionalProperties &&
                 !anyOneSchema.allOf &&
                 !anyOneSchema.oneOf &&
                 !anyOneSchema.anyOf && (
@@ -251,14 +252,33 @@ 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}
                     schemaPath={childSchemaPath}
                   />
                 )}
+              {/* Render a map variant's `additionalProperties` */}
+              {(anyOneSchema.type === "object" || !anyOneSchema.type) &&
+                anyOneSchema.additionalProperties &&
+                !anyOneSchema.oneOf &&
+                !anyOneSchema.anyOf &&
+                !anyOneSchema.allOf && (
+                  <AdditionalProperties
+                    schema={anyOneSchema}
+                    schemaType={schemaType}
+                  />
+                )}
               {anyOneSchema.allOf && (
                 <SchemaNode
                   schema={anyOneSchema}
@@ -1100,7 +1120,11 @@ const SchemaNode: React.FC<SchemaProps> = ({
     workingSchema = mergeAllOf(schema) as SchemaObject;
   }
   if (!workingSchema.discriminator && resolvedDiscriminator) {
-    workingSchema.discriminator = resolvedDiscriminator;
+    // Clone: getDiscriminator returns a nested branch's discriminator by
+    // reference, and DiscriminatorNode mutates `.mapping` when inferring
+    // variants. Without cloning, a branch that declares its own discriminator
+    // gets a mapping pointing back to itself and recurses forever.
+    workingSchema.discriminator = { ...resolvedDiscriminator };
   }
 
   if (workingSchema.discriminator) {
@@ -1257,8 +1281,7 @@ const SchemaNode: React.FC<SchemaProps> = ({
 export default SchemaNode;
 
 type PrimitiveSchemaType =
-  | Exclude<NonNullable<SchemaObject["type"]>, "object" | "array">
-  | "null";
+  Exclude<NonNullable<SchemaObject["type"]>, "object" | "array"> | "null";
 
 const PRIMITIVE_TYPES: Record<PrimitiveSchemaType, true> = {
   string: true,

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", () => {