docusaurus-plugin-openapi-docs 0.0.0-413 → 0.0.0-416

package/lib/markdown/createSchemaDetails.js

@@ -264,7 +264,7 @@ function createDiscriminator(schema) {
             propertyDescription = schema.properties[propertyName].description;
         }
     }
-    return (0, utils_1.create)("li", {
+    return (0, utils_1.create)("div", {
         className: "discriminatorItem",
         children: (0, utils_1.create)("div", {
             children: [
@@ -372,7 +372,7 @@ function createPropertyDiscriminator(name, schemaName, schema, discriminator, re
     if (discriminator.mapping === undefined) {
         return undefined;
     }
-    return (0, utils_1.create)("li", {
+    return (0, utils_1.create)("div", {
         className: "discriminatorItem",
         children: (0, utils_1.create)("div", {
             children: [
@@ -425,7 +425,7 @@ function createPropertyDiscriminator(name, schemaName, schema, discriminator, re
  * Creates the edges or "leaves" of a schema tree. Edges can branch into sub-nodes with createDetails().
  */
 function createEdges({ name, schema, required, discriminator, }) {
-    var _a;
+    var _a, _b;
     const schemaName = (0, schema_1.getSchemaName)(schema);
     if (discriminator !== undefined && discriminator.propertyName === name) {
         return createPropertyDiscriminator(name, "string", schema, discriminator, required);
@@ -446,6 +446,10 @@ function createEdges({ name, schema, required, discriminator, }) {
         if (mergedSchemas.additionalProperties !== undefined) {
             return createDetailsNode(name, mergedSchemaName, mergedSchemas, required);
         }
+        // array of objects
+        if (((_a = mergedSchemas.items) === null || _a === void 0 ? void 0 : _a.properties) !== undefined) {
+            return createDetailsNode(name, mergedSchemaName, mergedSchemas, required);
+        }
         return (0, utils_1.create)("SchemaItem", {
             collapsible: false,
             name,
@@ -453,6 +457,7 @@ function createEdges({ name, schema, required, discriminator, }) {
             schemaDescription: mergedSchemas.description,
             schemaName: schemaName,
             qualifierMessage: (0, schema_1.getQualifierMessage)(schema),
+            defaultValue: schema.default,
         });
     }
     if (schema.properties !== undefined) {
@@ -462,7 +467,7 @@ function createEdges({ name, schema, required, discriminator, }) {
         return createDetailsNode(name, schemaName, schema, required);
     }
     // array of objects
-    if (((_a = schema.items) === null || _a === void 0 ? void 0 : _a.properties) !== undefined) {
+    if (((_b = schema.items) === null || _b === void 0 ? void 0 : _b.properties) !== undefined) {
         return createDetailsNode(name, schemaName, schema, required);
     }
     // primitives and array of non-objects
@@ -473,6 +478,7 @@ function createEdges({ name, schema, required, discriminator, }) {
         schemaDescription: schema.description,
         schemaName: schemaName,
         qualifierMessage: (0, schema_1.getQualifierMessage)(schema),
+        defaultValue: schema.default,
     });
 }
 /**

package/lib/markdown/schema.js

@@ -54,11 +54,18 @@ function getQualifierMessage(schema) {
     if (!schema) {
         return undefined;
     }
-    if (schema.items) {
+    if (schema.items &&
+        schema.minItems === undefined &&
+        schema.maxItems === undefined) {
         return getQualifierMessage(schema.items);
     }
     let message = "**Possible values:** ";
     let qualifierGroups = [];
+    if (schema.items && schema.items.enum) {
+        if (schema.items.enum) {
+            qualifierGroups.push(`[${schema.items.enum.map((e) => `\`${e}\``).join(", ")}]`);
+        }
+    }
     if (schema.minLength || schema.maxLength) {
         let lengthQualifier = "";
         let minLength;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "docusaurus-plugin-openapi-docs",
   "description": "OpenAPI plugin for Docusaurus.",
-  "version": "0.0.0-413",
+  "version": "0.0.0-416",
   "license": "MIT",
   "keywords": [
     "openapi",
@@ -67,5 +67,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "f2cafe5a93dc9b203fc039174c56dc7e8c8db8c4"
+  "gitHead": "84a35572bf6f740b5b08204fc1947e4da4313a35"
 }

package/src/markdown/createSchemaDetails.ts

@@ -320,7 +320,7 @@ function createDiscriminator(schema: SchemaObject) {
     }
   }
 
-  return create("li", {
+  return create("div", {
     className: "discriminatorItem",
     children: create("div", {
       children: [
@@ -456,7 +456,7 @@ function createPropertyDiscriminator(
     return undefined;
   }
 
-  return create("li", {
+  return create("div", {
     className: "discriminatorItem",
     children: create("div", {
       children: [
@@ -568,6 +568,11 @@ function createEdges({
       return createDetailsNode(name, mergedSchemaName, mergedSchemas, required);
     }
 
+    // array of objects
+    if (mergedSchemas.items?.properties !== undefined) {
+      return createDetailsNode(name, mergedSchemaName, mergedSchemas, required);
+    }
+
     return create("SchemaItem", {
       collapsible: false,
       name,
@@ -575,6 +580,7 @@ function createEdges({
       schemaDescription: mergedSchemas.description,
       schemaName: schemaName,
       qualifierMessage: getQualifierMessage(schema),
+      defaultValue: schema.default,
     });
   }
 
@@ -599,6 +605,7 @@ function createEdges({
     schemaDescription: schema.description,
     schemaName: schemaName,
     qualifierMessage: getQualifierMessage(schema),
+    defaultValue: schema.default,
   });
 }
 

package/src/markdown/schema.ts

@@ -64,7 +64,11 @@ export function getQualifierMessage(schema?: SchemaObject): string | undefined {
     return undefined;
   }
 
-  if (schema.items) {
+  if (
+    schema.items &&
+    schema.minItems === undefined &&
+    schema.maxItems === undefined
+  ) {
     return getQualifierMessage(schema.items);
   }
 
@@ -72,6 +76,14 @@ export function getQualifierMessage(schema?: SchemaObject): string | undefined {
 
   let qualifierGroups = [];
 
+  if (schema.items && schema.items.enum) {
+    if (schema.items.enum) {
+      qualifierGroups.push(
+        `[${schema.items.enum.map((e) => `\`${e}\``).join(", ")}]`
+      );
+    }
+  }
+
   if (schema.minLength || schema.maxLength) {
     let lengthQualifier = "";
     let minLength;