Fix allOf schema qualifier and type (#766)

* ensure merged schema is used to generate schema name and qualifier * combine schema title and type when both are present * cleanup formatting
PaloAltoNetworks · Mar 21, 2024 · 850b5d0 · 850b5d0
1 parent d7bbe20
commit 850b5d0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/packages/docusaurus-plugin-openapi-docs/src/markdown/createSchema.ts b/packages/docusaurus-plugin-openapi-docs/src/markdown/createSchema.ts
@@ -624,7 +624,6 @@ function createEdges({
     }: { mergedSchemas: SchemaObject; required: string[] | boolean } =
       mergeAllOf(schema.allOf);
     const mergedSchemaName = getSchemaName(mergedSchemas);
-
     if (
       mergedSchemas.oneOf !== undefined ||
       mergedSchemas.anyOf !== undefined
@@ -685,8 +684,8 @@ function createEdges({
       collapsible: false,
       name,
       required: Array.isArray(required) ? required.includes(name) : required,
-      schemaName: schemaName,
-      qualifierMessage: getQualifierMessage(schema),
+      schemaName: mergedSchemaName,
+      qualifierMessage: getQualifierMessage(mergedSchemas),
       schema: mergedSchemas,
     });
   }

diff --git a/packages/docusaurus-plugin-openapi-docs/src/markdown/schema.ts b/packages/docusaurus-plugin-openapi-docs/src/markdown/schema.ts
@@ -40,6 +40,10 @@ function prettyName(schema: SchemaObject, circular?: boolean) {
     // return schema.type;
   }
 
+  if (schema.title && schema.type) {
+    return `${schema.title} (${schema.type})`;
+  }
+
   return schema.title ?? schema.type;
 }