docusaurus-theme-openapi-docs 0.0.0-1005 → 0.0.0-1007

package/lib/theme/Schema/index.js

@@ -114,10 +114,7 @@ const AnyOneOf = ({ schema, schemaType }) => {
           react_1.default.createElement(
             TabItem_1.default,
             { key: index, label: label, value: `${index}-item-properties` },
-            (["string", "number", "integer", "boolean"].includes(
-              anyOneSchema.type
-            ) ||
-              anyOneSchema.const) &&
+            (isPrimitive(anyOneSchema) || anyOneSchema.const) &&
               react_1.default.createElement(SchemaItem_1.default, {
                 collapsible: false,
                 name: undefined,
@@ -484,111 +481,45 @@ const SchemaNodeDetails = ({
   );
 };
 const Items = ({ schema, schemaType }) => {
-  // Handles case when schema.items has properties
-  if (schema.items?.properties) {
-    return react_1.default.createElement(
-      react_1.default.Fragment,
-      null,
-      react_1.default.createElement(ArrayBrackets_1.OpeningArrayBracket, null),
-      react_1.default.createElement(Properties, {
-        schema: schema.items,
-        schemaType: schemaType,
-      }),
-      react_1.default.createElement(ArrayBrackets_1.ClosingArrayBracket, null)
-    );
-  }
-  // Handles case when schema.items has additionalProperties
-  if (schema.items?.additionalProperties) {
-    return react_1.default.createElement(
-      react_1.default.Fragment,
-      null,
-      react_1.default.createElement(ArrayBrackets_1.OpeningArrayBracket, null),
-      react_1.default.createElement(AdditionalProperties, {
-        schema: schema.items,
-        schemaType: schemaType,
-      }),
-      react_1.default.createElement(ArrayBrackets_1.ClosingArrayBracket, null)
-    );
+  // Process schema.items to handle allOf merging
+  let itemsSchema = schema.items;
+  if (schema.items?.allOf) {
+    itemsSchema = mergeAllOf(schema.items);
   }
-  // Handles case when schema.items has oneOf or anyOf
-  if (schema.items?.oneOf || schema.items?.anyOf) {
+  // Handle complex schemas with multiple schema types
+  const hasOneOfAnyOf = itemsSchema?.oneOf || itemsSchema?.anyOf;
+  const hasProperties = itemsSchema?.properties;
+  const hasAdditionalProperties = itemsSchema?.additionalProperties;
+  if (hasOneOfAnyOf || hasProperties || hasAdditionalProperties) {
     return react_1.default.createElement(
       react_1.default.Fragment,
       null,
       react_1.default.createElement(ArrayBrackets_1.OpeningArrayBracket, null),
-      react_1.default.createElement(AnyOneOf, {
-        schema: schema.items,
-        schemaType: schemaType,
-      }),
-      react_1.default.createElement(ArrayBrackets_1.ClosingArrayBracket, null)
-    );
-  }
-  // Handles case when schema.items has allOf
-  if (schema.items?.allOf) {
-    const mergedSchemas = mergeAllOf(schema.items);
-    // Handles combo anyOf/oneOf + properties
-    if (
-      (mergedSchemas.oneOf || mergedSchemas.anyOf) &&
-      mergedSchemas.properties
-    ) {
-      return react_1.default.createElement(
-        react_1.default.Fragment,
-        null,
-        react_1.default.createElement(
-          ArrayBrackets_1.OpeningArrayBracket,
-          null
-        ),
+      hasOneOfAnyOf &&
         react_1.default.createElement(AnyOneOf, {
-          schema: mergedSchemas,
+          schema: itemsSchema,
           schemaType: schemaType,
         }),
+      hasProperties &&
         react_1.default.createElement(Properties, {
-          schema: mergedSchemas,
+          schema: itemsSchema,
           schemaType: schemaType,
         }),
-        react_1.default.createElement(ArrayBrackets_1.ClosingArrayBracket, null)
-      );
-    }
-    // Handles only anyOf/oneOf
-    if (mergedSchemas.oneOf || mergedSchemas.anyOf) {
-      return react_1.default.createElement(
-        react_1.default.Fragment,
-        null,
-        react_1.default.createElement(
-          ArrayBrackets_1.OpeningArrayBracket,
-          null
-        ),
-        react_1.default.createElement(AnyOneOf, {
-          schema: mergedSchemas,
+      hasAdditionalProperties &&
+        react_1.default.createElement(AdditionalProperties, {
+          schema: itemsSchema,
           schemaType: schemaType,
         }),
-        react_1.default.createElement(ArrayBrackets_1.ClosingArrayBracket, null)
-      );
-    }
-    // Handles properties
-    if (mergedSchemas.properties) {
-      return react_1.default.createElement(
-        react_1.default.Fragment,
-        null,
-        react_1.default.createElement(
-          ArrayBrackets_1.OpeningArrayBracket,
-          null
-        ),
-        react_1.default.createElement(Properties, {
-          schema: mergedSchemas,
-          schemaType: schemaType,
-        }),
-        react_1.default.createElement(ArrayBrackets_1.ClosingArrayBracket, null)
-      );
-    }
+      react_1.default.createElement(ArrayBrackets_1.ClosingArrayBracket, null)
+    );
   }
   // Handles basic types (string, number, integer, boolean, object)
   if (
-    schema.items?.type === "string" ||
-    schema.items?.type === "number" ||
-    schema.items?.type === "integer" ||
-    schema.items?.type === "boolean" ||
-    schema.items?.type === "object"
+    itemsSchema?.type === "string" ||
+    itemsSchema?.type === "number" ||
+    itemsSchema?.type === "integer" ||
+    itemsSchema?.type === "boolean" ||
+    itemsSchema?.type === "object"
   ) {
     return react_1.default.createElement(
       "div",
@@ -597,9 +528,9 @@ const Items = ({ schema, schemaType }) => {
       react_1.default.createElement(SchemaItem_1.default, {
         collapsible: false,
         name: "", // No name for array items
-        schemaName: (0, schema_1.getSchemaName)(schema.items),
-        qualifierMessage: (0, schema_1.getQualifierMessage)(schema.items),
-        schema: schema.items,
+        schemaName: (0, schema_1.getSchemaName)(itemsSchema),
+        qualifierMessage: (0, schema_1.getQualifierMessage)(itemsSchema),
+        schema: itemsSchema,
         discriminator: false,
         children: null,
       }),
@@ -611,7 +542,7 @@ const Items = ({ schema, schemaType }) => {
     react_1.default.Fragment,
     null,
     react_1.default.createElement(ArrayBrackets_1.OpeningArrayBracket, null),
-    Object.entries(schema.items || {}).map(([key, val]) =>
+    Object.entries(itemsSchema || {}).map(([key, val]) =>
       react_1.default.createElement(SchemaEdge, {
         key: key,
         name: key,
@@ -884,3 +815,13 @@ const SchemaNode = ({ schema, schemaType }) => {
   return renderChildren(schema, schemaType);
 };
 exports.default = SchemaNode;
+const PRIMITIVE_TYPES = {
+  string: true,
+  number: true,
+  integer: true,
+  boolean: true,
+  null: true,
+};
+const isPrimitive = (schema) => {
+  return PRIMITIVE_TYPES[schema.type];
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "docusaurus-theme-openapi-docs",
   "description": "OpenAPI theme for Docusaurus.",
-  "version": "0.0.0-1005",
+  "version": "0.0.0-1007",
   "license": "MIT",
   "keywords": [
     "openapi",
@@ -36,7 +36,7 @@
     "@types/lodash": "^4.14.176",
     "@types/pako": "^2.0.3",
     "concurrently": "^5.2.0",
-    "docusaurus-plugin-openapi-docs": "0.0.0-1005",
+    "docusaurus-plugin-openapi-docs": "0.0.0-1007",
     "docusaurus-plugin-sass": "^0.2.3",
     "eslint-plugin-prettier": "^5.0.1"
   },
@@ -79,5 +79,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "4263fa2f5bae006b1d7328a0f16af378786fed47"
+  "gitHead": "864d5355b98d552679472455f533ef15313a0bee"
 }

package/src/theme/Schema/index.tsx

@@ -21,7 +21,10 @@ import {
   getQualifierMessage,
   getSchemaName,
 } from "docusaurus-plugin-openapi-docs/lib/markdown/schema";
-import { SchemaObject } from "docusaurus-plugin-openapi-docs/lib/openapi/types";
+import {
+  SchemaObject,
+  SchemaType,
+} from "docusaurus-plugin-openapi-docs/lib/openapi/types";
 import isEmpty from "lodash/isEmpty";
 
 // eslint-disable-next-line import/no-extraneous-dependencies
@@ -122,10 +125,7 @@ const AnyOneOf: React.FC<SchemaProps> = ({ schema, schemaType }) => {
               value={`${index}-item-properties`}
             >
               {/* Handle primitive types directly */}
-              {(["string", "number", "integer", "boolean"].includes(
-                anyOneSchema.type
-              ) ||
-                anyOneSchema.const) && (
+              {(isPrimitive(anyOneSchema) || anyOneSchema.const) && (
                 <SchemaItem
                   collapsible={false}
                   name={undefined}
@@ -504,88 +504,42 @@ const Items: React.FC<{
   schema: any;
   schemaType: "request" | "response";
 }> = ({ schema, schemaType }) => {
-  // Handles case when schema.items has properties
-  if (schema.items?.properties) {
-    return (
-      <>
-        <OpeningArrayBracket />
-        <Properties schema={schema.items} schemaType={schemaType} />
-        <ClosingArrayBracket />
-      </>
-    );
+  // Process schema.items to handle allOf merging
+  let itemsSchema = schema.items;
+  if (schema.items?.allOf) {
+    itemsSchema = mergeAllOf(schema.items) as SchemaObject;
   }
 
-  // Handles case when schema.items has additionalProperties
-  if (schema.items?.additionalProperties) {
-    return (
-      <>
-        <OpeningArrayBracket />
-        <AdditionalProperties schema={schema.items} schemaType={schemaType} />
-        <ClosingArrayBracket />
-      </>
-    );
-  }
+  // Handle complex schemas with multiple schema types
+  const hasOneOfAnyOf = itemsSchema?.oneOf || itemsSchema?.anyOf;
+  const hasProperties = itemsSchema?.properties;
+  const hasAdditionalProperties = itemsSchema?.additionalProperties;
 
-  // Handles case when schema.items has oneOf or anyOf
-  if (schema.items?.oneOf || schema.items?.anyOf) {
+  if (hasOneOfAnyOf || hasProperties || hasAdditionalProperties) {
     return (
       <>
         <OpeningArrayBracket />
-        <AnyOneOf schema={schema.items} schemaType={schemaType} />
+        {hasOneOfAnyOf && (
+          <AnyOneOf schema={itemsSchema} schemaType={schemaType} />
+        )}
+        {hasProperties && (
+          <Properties schema={itemsSchema} schemaType={schemaType} />
+        )}
+        {hasAdditionalProperties && (
+          <AdditionalProperties schema={itemsSchema} schemaType={schemaType} />
+        )}
         <ClosingArrayBracket />
       </>
     );
   }
 
-  // Handles case when schema.items has allOf
-  if (schema.items?.allOf) {
-    const mergedSchemas = mergeAllOf(schema.items) as SchemaObject;
-
-    // Handles combo anyOf/oneOf + properties
-    if (
-      (mergedSchemas.oneOf || mergedSchemas.anyOf) &&
-      mergedSchemas.properties
-    ) {
-      return (
-        <>
-          <OpeningArrayBracket />
-          <AnyOneOf schema={mergedSchemas} schemaType={schemaType} />
-          <Properties schema={mergedSchemas} schemaType={schemaType} />
-          <ClosingArrayBracket />
-        </>
-      );
-    }
-
-    // Handles only anyOf/oneOf
-    if (mergedSchemas.oneOf || mergedSchemas.anyOf) {
-      return (
-        <>
-          <OpeningArrayBracket />
-          <AnyOneOf schema={mergedSchemas} schemaType={schemaType} />
-          <ClosingArrayBracket />
-        </>
-      );
-    }
-
-    // Handles properties
-    if (mergedSchemas.properties) {
-      return (
-        <>
-          <OpeningArrayBracket />
-          <Properties schema={mergedSchemas} schemaType={schemaType} />
-          <ClosingArrayBracket />
-        </>
-      );
-    }
-  }
-
   // Handles basic types (string, number, integer, boolean, object)
   if (
-    schema.items?.type === "string" ||
-    schema.items?.type === "number" ||
-    schema.items?.type === "integer" ||
-    schema.items?.type === "boolean" ||
-    schema.items?.type === "object"
+    itemsSchema?.type === "string" ||
+    itemsSchema?.type === "number" ||
+    itemsSchema?.type === "integer" ||
+    itemsSchema?.type === "boolean" ||
+    itemsSchema?.type === "object"
   ) {
     return (
       <div style={{ marginLeft: ".5rem" }}>
@@ -593,9 +547,9 @@ const Items: React.FC<{
         <SchemaItem
           collapsible={false}
           name="" // No name for array items
-          schemaName={getSchemaName(schema.items)}
-          qualifierMessage={getQualifierMessage(schema.items)}
-          schema={schema.items}
+          schemaName={getSchemaName(itemsSchema)}
+          qualifierMessage={getQualifierMessage(itemsSchema)}
+          schema={itemsSchema}
           discriminator={false}
           children={null}
         />
@@ -608,7 +562,7 @@ const Items: React.FC<{
   return (
     <>
       <OpeningArrayBracket />
-      {Object.entries(schema.items || {}).map(([key, val]: [string, any]) => (
+      {Object.entries(itemsSchema || {}).map(([key, val]: [string, any]) => (
         <SchemaEdge
           key={key}
           name={key}
@@ -938,3 +892,17 @@ const SchemaNode: React.FC<SchemaProps> = ({ schema, schemaType }) => {
 };
 
 export default SchemaNode;
+
+type PrimitiveSchemaType = Exclude<SchemaType, "object" | "array">;
+
+const PRIMITIVE_TYPES: Record<PrimitiveSchemaType, true> = {
+  string: true,
+  number: true,
+  integer: true,
+  boolean: true,
+  null: true,
+} as const;
+
+const isPrimitive = (schema: SchemaObject) => {
+  return PRIMITIVE_TYPES[schema.type as PrimitiveSchemaType];
+};