docusaurus-theme-openapi-docs 0.0.0-1293 → 0.0.0-1295

package/lib/theme/Schema/index.js

@@ -81,7 +81,6 @@ const SchemaExpansion_1 = require("@theme/SchemaExpansion");
 const SchemaItem_1 = __importDefault(require("@theme/SchemaItem"));
 const SchemaTabs_1 = __importDefault(require("@theme/SchemaTabs"));
 const TabItem_1 = __importDefault(require("@theme/TabItem"));
-const translationIds_1 = require("@theme/translationIds");
 // eslint-disable-next-line import/no-extraneous-dependencies
 const allof_merge_1 = require("allof-merge");
 const clsx_1 = __importDefault(require("clsx"));
@@ -286,7 +285,7 @@ const Summary = ({ name, schemaName, schema, required }) => {
           "span",
           { className: "openapi-schema__nullable" },
           (0, Translate_1.translate)({
-            id: translationIds_1.OPENAPI_SCHEMA_ITEM.NULLABLE,
+            id: "theme.openapi.schemaItem.nullable",
             message: "nullable",
           })
         ),
@@ -295,7 +294,7 @@ const Summary = ({ name, schemaName, schema, required }) => {
           "span",
           { className: "openapi-schema__required" },
           (0, Translate_1.translate)({
-            id: translationIds_1.OPENAPI_SCHEMA_ITEM.REQUIRED,
+            id: "theme.openapi.schemaItem.required",
             message: "required",
           })
         ),
@@ -304,7 +303,7 @@ const Summary = ({ name, schemaName, schema, required }) => {
           "span",
           { className: "openapi-schema__deprecated" },
           (0, Translate_1.translate)({
-            id: translationIds_1.OPENAPI_SCHEMA_ITEM.DEPRECATED,
+            id: "theme.openapi.schemaItem.deprecated",
             message: "deprecated",
           })
         )
@@ -321,11 +320,11 @@ const AnyOneOf = ({ schema, schemaType, schemaPath }) => {
   }
   const type = schema.oneOf
     ? (0, Translate_1.translate)({
-        id: translationIds_1.OPENAPI_SCHEMA_ITEM.ONE_OF,
+        id: "theme.openapi.schemaItem.oneOf",
         message: "oneOf",
       })
     : (0, Translate_1.translate)({
-        id: translationIds_1.OPENAPI_SCHEMA_ITEM.ANY_OF,
+        id: "theme.openapi.schemaItem.anyOf",
         message: "anyOf",
       });
   // Generate a unique ID for this anyOf/oneOf to prevent tab value collisions
@@ -372,12 +371,12 @@ const AnyOneOf = ({ schema, schemaType, schemaPath }) => {
         if (!label) {
           if (anyOneSchema.oneOf) {
             label = (0, Translate_1.translate)({
-              id: translationIds_1.OPENAPI_SCHEMA_ITEM.ONE_OF,
+              id: "theme.openapi.schemaItem.oneOf",
               message: "oneOf",
             });
           } else if (anyOneSchema.anyOf) {
             label = (0, Translate_1.translate)({
-              id: translationIds_1.OPENAPI_SCHEMA_ITEM.ANY_OF,
+              id: "theme.openapi.schemaItem.anyOf",
               message: "anyOf",
             });
           } else {
@@ -546,7 +545,7 @@ const PropertyDiscriminator = ({
               "span",
               { className: "openapi-schema__required" },
               (0, Translate_1.translate)({
-                id: translationIds_1.OPENAPI_SCHEMA_ITEM.REQUIRED,
+                id: "theme.openapi.schemaItem.required",
                 message: "required",
               })
             )

package/lib/theme/SchemaExpansion/index.js

@@ -76,7 +76,6 @@ exports.SCHEMA_EXPANSION_STORAGE_KEY =
     void 0;
 const react_1 = __importStar(require("react"));
 const Translate_1 = require("@docusaurus/Translate");
-const translationIds_1 = require("@theme/translationIds");
 const clsx_1 = __importDefault(require("clsx"));
 const context_1 = require("./context");
 var context_2 = require("./context");
@@ -219,17 +218,17 @@ const SchemaExpansionControl = () => {
   };
   if (!config.enabled) return null;
   const buttonLabel = (0, Translate_1.translate)({
-    id: translationIds_1.OPENAPI_SCHEMA_EXPANSION.BUTTON_LABEL,
+    id: "theme.openapi.schema.expansion.button",
     message: "Schema expansion depth",
     description: "Aria/title tooltip for the schema expansion icon button",
   });
   const menuLabel = (0, Translate_1.translate)({
-    id: translationIds_1.OPENAPI_SCHEMA_EXPANSION.MENU_LABEL,
+    id: "theme.openapi.schema.expansion.menu",
     message: "Schema expansion depth options",
     description: "Accessible label for the expansion options menu",
   });
   const allLabel = (0, Translate_1.translate)({
-    id: translationIds_1.OPENAPI_SCHEMA_EXPANSION.ALL,
+    id: "theme.openapi.schema.expansion.all",
     message: "All",
     description: "Label for the expand-all option",
   });
@@ -279,7 +278,7 @@ const SchemaExpansionControl = () => {
             ? allLabel
             : (0, Translate_1.translate)(
                 {
-                  id: translationIds_1.OPENAPI_SCHEMA_EXPANSION.DEPTH_OPTION,
+                  id: "theme.openapi.schema.expansion.depthOption",
                   message: "Expand to depth {depth}",
                   description: "Accessible label for a depth option",
                 },

package/lib/theme/SchemaItem/index.js

@@ -16,7 +16,6 @@ const react_1 = __importDefault(require("react"));
 const Translate_1 = require("@docusaurus/Translate");
 const Example_1 = require("@theme/Example");
 const Markdown_1 = __importDefault(require("@theme/Markdown"));
-const translationIds_1 = require("@theme/translationIds");
 const clsx_1 = __importDefault(require("clsx"));
 const schema_1 = require("../../markdown/schema");
 const utils_1 = require("../../markdown/utils");
@@ -29,11 +28,11 @@ const transformEnumDescriptions = (enumDescriptions) => {
 const getEnumDescriptionMarkdown = (enumDescriptions) => {
   if (enumDescriptions?.length) {
     const enumValue = (0, Translate_1.translate)({
-      id: translationIds_1.OPENAPI_SCHEMA_ITEM.ENUM_VALUE,
+      id: "theme.openapi.schemaItem.enumValue",
       message: "Enum Value",
     });
     const description = (0, Translate_1.translate)({
-      id: translationIds_1.OPENAPI_SCHEMA_ITEM.ENUM_DESCRIPTION,
+      id: "theme.openapi.schemaItem.enumDescription",
       message: "Description",
     });
     return `| ${enumValue} | ${description} |
@@ -84,7 +83,7 @@ function SchemaItem(props) {
         "span",
         { className: "openapi-schema__required" },
         (0, Translate_1.translate)({
-          id: translationIds_1.OPENAPI_SCHEMA_ITEM.REQUIRED,
+          id: "theme.openapi.schemaItem.required",
           message: "required",
         })
       )
@@ -94,7 +93,7 @@ function SchemaItem(props) {
       "span",
       { className: "openapi-schema__deprecated" },
       (0, Translate_1.translate)({
-        id: translationIds_1.OPENAPI_SCHEMA_ITEM.DEPRECATED,
+        id: "theme.openapi.schemaItem.deprecated",
         message: "deprecated",
       })
     )
@@ -104,7 +103,7 @@ function SchemaItem(props) {
       "span",
       { className: "openapi-schema__nullable" },
       (0, Translate_1.translate)({
-        id: translationIds_1.OPENAPI_SCHEMA_ITEM.NULLABLE,
+        id: "theme.openapi.schemaItem.nullable",
         message: "nullable",
       })
     )
@@ -151,7 +150,7 @@ function SchemaItem(props) {
             "strong",
             null,
             (0, Translate_1.translate)({
-              id: translationIds_1.OPENAPI_SCHEMA_ITEM.DEFAULT_VALUE,
+              id: "theme.openapi.schemaItem.defaultValue",
               message: "Default value:",
             }),
             " "
@@ -170,7 +169,7 @@ function SchemaItem(props) {
           "strong",
           null,
           (0, Translate_1.translate)({
-            id: translationIds_1.OPENAPI_SCHEMA_ITEM.DEFAULT_VALUE,
+            id: "theme.openapi.schemaItem.defaultValue",
             message: "Default value:",
           }),
           " "
@@ -198,7 +197,7 @@ function SchemaItem(props) {
             "strong",
             null,
             (0, Translate_1.translate)({
-              id: translationIds_1.OPENAPI_SCHEMA_ITEM.CONSTANT_VALUE,
+              id: "theme.openapi.schemaItem.constantValue",
               message: "Constant value:",
             }),
             " "
@@ -217,7 +216,7 @@ function SchemaItem(props) {
           "strong",
           null,
           (0, Translate_1.translate)({
-            id: translationIds_1.OPENAPI_SCHEMA_ITEM.CONSTANT_VALUE,
+            id: "theme.openapi.schemaItem.constantValue",
             message: "Constant value:",
           }),
           " "

package/lib/theme/StatusCodes/index.js

@@ -19,7 +19,6 @@ const Markdown_1 = __importDefault(require("@theme/Markdown"));
 const ResponseHeaders_1 = __importDefault(require("@theme/ResponseHeaders"));
 const ResponseSchema_1 = __importDefault(require("@theme/ResponseSchema"));
 const TabItem_1 = __importDefault(require("@theme/TabItem"));
-const translationIds_1 = require("@theme/translationIds");
 const StatusCodes = ({ label, id, responses }) => {
   if (!responses) return null;
   const codes = Object.keys(responses);
@@ -64,8 +63,7 @@ const StatusCodes = ({ label, id, responses }) => {
                     "strong",
                     null,
                     (0, Translate_1.translate)({
-                      id: translationIds_1.OPENAPI_STATUS_CODES
-                        .RESPONSE_HEADERS,
+                      id: "theme.openapi.statusCodes.responseHeaders",
                       message: "Response Headers",
                     })
                   )
@@ -77,7 +75,7 @@ const StatusCodes = ({ label, id, responses }) => {
             ),
           react_1.default.createElement(ResponseSchema_1.default, {
             title: (0, Translate_1.translate)({
-              id: translationIds_1.OPENAPI_STATUS_CODES.SCHEMA_TITLE,
+              id: "theme.openapi.statusCodes.schemaTitle",
               message: "Schema",
             }),
             body: { content: response.content },

package/lib/theme/translationIds.d.ts

@@ -1,99 +1 @@
-export declare const OPENAPI_RESPONSE: {
-    TITLE: string;
-    CLEAR: string;
-    PLACEHOLDER: string;
-    HEADERS_TAB: string;
-};
-export declare const OPENAPI_TABS: {
-    RESPONSES_LABEL: string;
-};
-export declare const OPENAPI_REQUEST: {
-    BODY_TITLE: string;
-    ACCEPT_TITLE: string;
-    SEND_BUTTON: string;
-    REQUIRED_LABEL: string;
-    REQUEST_TITLE: string;
-    COLLAPSE_ALL: string;
-    EXPAND_ALL: string;
-    BASE_URL_TITLE: string;
-    AUTH_TITLE: string;
-    PARAMETERS_TITLE: string;
-    FETCHING_MESSAGE: string;
-    CONNECTION_FAILED: string;
-    ERROR_TIMEOUT: string;
-    ERROR_NETWORK: string;
-    ERROR_CORS: string;
-    ERROR_UNKNOWN: string;
-};
-export declare const OPENAPI_SERVER: {
-    EDIT_BUTTON: string;
-    HIDE_BUTTON: string;
-};
-export declare const OPENAPI_PARAM_OPTIONS: {
-    SHOW_OPTIONAL: string;
-    HIDE_OPTIONAL: string;
-};
-export declare const OPENAPI_FORM_FILE_UPLOAD: {
-    CLEAR_BUTTON: string;
-};
-export declare const OPENAPI_FORM: {
-    FIELD_REQUIRED: string;
-};
-export declare const OPENAPI_AUTH: {
-    BEARER_TOKEN: string;
-    USERNAME: string;
-    PASSWORD: string;
-    SECURITY_SCHEME: string;
-};
-export declare const OPENAPI_RESPONSE_EXAMPLES: {
-    EXAMPLE: string;
-    AUTO_EXAMPLE: string;
-};
-export declare const OPENAPI_BODY: {
-    EXAMPLE_FROM_SCHEMA: string;
-};
-export declare const OPENAPI_STATUS_CODES: {
-    RESPONSE_HEADERS: string;
-    SCHEMA_TITLE: string;
-};
-export declare const OPENAPI_SCHEMA: {
-    NO_SCHEMA: string;
-};
-export declare const OPENAPI_SCHEMA_EXPANSION: {
-    BUTTON_LABEL: string;
-    MENU_LABEL: string;
-    ALL: string;
-    DEPTH_OPTION: string;
-};
-export declare const OPENAPI_SCHEMA_ITEM: {
-    CHARACTERS: string;
-    NON_EMPTY: string;
-    REQUIRED: string;
-    DEPRECATED: string;
-    NULLABLE: string;
-    DEFAULT_VALUE: string;
-    EXAMPLE: string;
-    EXAMPLES: string;
-    DESCRIPTION: string;
-    CONSTANT_VALUE: string;
-    ENUM_VALUE: string;
-    ENUM_DESCRIPTION: string;
-    POSSIBLE_VALUES: string;
-    EXPRESSION: string;
-    ONE_OF: string;
-    ANY_OF: string;
-};
-export declare const OPENAPI_PARAMS_DETAILS: {
-    PARAMETERS_TITLE: string;
-};
-export declare const OPENAPI_SECURITY_SCHEMES: {
-    NAME: string;
-    TYPE: string;
-    SCOPES: string;
-    IN: string;
-    FLOWS: string;
-    DESCRIPTION: string;
-    SCHEME: string;
-    BEARER_FORMAT: string;
-    OPEN_ID_CONNECT_URL: string;
-};
+export {};

package/lib/theme/translationIds.js

@@ -6,119 +6,3 @@
  * LICENSE file in the root directory of this source tree.
  * ========================================================================== */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OPENAPI_SECURITY_SCHEMES =
-  exports.OPENAPI_PARAMS_DETAILS =
-  exports.OPENAPI_SCHEMA_ITEM =
-  exports.OPENAPI_SCHEMA_EXPANSION =
-  exports.OPENAPI_SCHEMA =
-  exports.OPENAPI_STATUS_CODES =
-  exports.OPENAPI_BODY =
-  exports.OPENAPI_RESPONSE_EXAMPLES =
-  exports.OPENAPI_AUTH =
-  exports.OPENAPI_FORM =
-  exports.OPENAPI_FORM_FILE_UPLOAD =
-  exports.OPENAPI_PARAM_OPTIONS =
-  exports.OPENAPI_SERVER =
-  exports.OPENAPI_REQUEST =
-  exports.OPENAPI_TABS =
-  exports.OPENAPI_RESPONSE =
-    void 0;
-exports.OPENAPI_RESPONSE = {
-  TITLE: "theme.openapi.response.title",
-  CLEAR: "theme.openapi.response.clear",
-  PLACEHOLDER: "theme.openapi.response.placeholder",
-  HEADERS_TAB: "theme.openapi.response.headersTab",
-};
-exports.OPENAPI_TABS = {
-  RESPONSES_LABEL: "theme.openapi.tabs.responses.label",
-};
-exports.OPENAPI_REQUEST = {
-  BODY_TITLE: "theme.openapi.request.body.title",
-  ACCEPT_TITLE: "theme.openapi.request.accept.title",
-  SEND_BUTTON: "theme.openapi.request.sendButton",
-  REQUIRED_LABEL: "theme.openapi.request.requiredLabel",
-  REQUEST_TITLE: "theme.openapi.request.title",
-  COLLAPSE_ALL: "theme.openapi.request.collapseAll",
-  EXPAND_ALL: "theme.openapi.request.expandAll",
-  BASE_URL_TITLE: "theme.openapi.request.baseUrl.title",
-  AUTH_TITLE: "theme.openapi.request.auth.title",
-  PARAMETERS_TITLE: "theme.openapi.request.parameters.title",
-  FETCHING_MESSAGE: "theme.openapi.request.fetchingMessage",
-  CONNECTION_FAILED: "theme.openapi.request.connectionFailed",
-  ERROR_TIMEOUT: "theme.openapi.request.error.timeout",
-  ERROR_NETWORK: "theme.openapi.request.error.network",
-  ERROR_CORS: "theme.openapi.request.error.cors",
-  ERROR_UNKNOWN: "theme.openapi.request.error.unknown",
-};
-exports.OPENAPI_SERVER = {
-  EDIT_BUTTON: "theme.openapi.server.editButton",
-  HIDE_BUTTON: "theme.openapi.server.hideButton",
-};
-exports.OPENAPI_PARAM_OPTIONS = {
-  SHOW_OPTIONAL: "theme.openapi.paramOptions.showOptional",
-  HIDE_OPTIONAL: "theme.openapi.paramOptions.hideOptional",
-};
-exports.OPENAPI_FORM_FILE_UPLOAD = {
-  CLEAR_BUTTON: "theme.openapi.formFileUpload.clearButton",
-};
-exports.OPENAPI_FORM = {
-  FIELD_REQUIRED: "theme.openapi.form.fieldRequired",
-};
-exports.OPENAPI_AUTH = {
-  BEARER_TOKEN: "theme.openapi.auth.bearerToken",
-  USERNAME: "theme.openapi.auth.username",
-  PASSWORD: "theme.openapi.auth.password",
-  SECURITY_SCHEME: "theme.openapi.auth.securityScheme",
-};
-exports.OPENAPI_RESPONSE_EXAMPLES = {
-  EXAMPLE: "theme.openapi.responseExamples.example",
-  AUTO_EXAMPLE: "theme.openapi.responseExamples.autoExample",
-};
-exports.OPENAPI_BODY = {
-  EXAMPLE_FROM_SCHEMA: "theme.openapi.body.exampleFromSchema",
-};
-exports.OPENAPI_STATUS_CODES = {
-  RESPONSE_HEADERS: "theme.openapi.statusCodes.responseHeaders",
-  SCHEMA_TITLE: "theme.openapi.statusCodes.schemaTitle",
-};
-exports.OPENAPI_SCHEMA = {
-  NO_SCHEMA: "theme.openapi.schema.noSchema",
-};
-exports.OPENAPI_SCHEMA_EXPANSION = {
-  BUTTON_LABEL: "theme.openapi.schema.expansion.button",
-  MENU_LABEL: "theme.openapi.schema.expansion.menu",
-  ALL: "theme.openapi.schema.expansion.all",
-  DEPTH_OPTION: "theme.openapi.schema.expansion.depthOption",
-};
-exports.OPENAPI_SCHEMA_ITEM = {
-  CHARACTERS: "theme.openapi.schemaItem.characters",
-  NON_EMPTY: "theme.openapi.schemaItem.nonEmpty",
-  REQUIRED: "theme.openapi.schemaItem.required",
-  DEPRECATED: "theme.openapi.schemaItem.deprecated",
-  NULLABLE: "theme.openapi.schemaItem.nullable",
-  DEFAULT_VALUE: "theme.openapi.schemaItem.defaultValue",
-  EXAMPLE: "theme.openapi.schemaItem.example",
-  EXAMPLES: "theme.openapi.schemaItem.examples",
-  DESCRIPTION: "theme.openapi.schemaItem.description",
-  CONSTANT_VALUE: "theme.openapi.schemaItem.constantValue",
-  ENUM_VALUE: "theme.openapi.schemaItem.enumValue",
-  ENUM_DESCRIPTION: "theme.openapi.schemaItem.enumDescription",
-  POSSIBLE_VALUES: "theme.openapi.schemaItem.possibleValues",
-  EXPRESSION: "theme.openapi.schemaItem.expression",
-  ONE_OF: "theme.openapi.schemaItem.oneOf",
-  ANY_OF: "theme.openapi.schemaItem.anyOf",
-};
-exports.OPENAPI_PARAMS_DETAILS = {
-  PARAMETERS_TITLE: "theme.openapi.paramsDetails.parametersTitle",
-};
-exports.OPENAPI_SECURITY_SCHEMES = {
-  NAME: "theme.openapi.securitySchemes.name",
-  TYPE: "theme.openapi.securitySchemes.type",
-  SCOPES: "theme.openapi.securitySchemes.scopes",
-  IN: "theme.openapi.securitySchemes.in",
-  FLOWS: "theme.openapi.securitySchemes.flows",
-  DESCRIPTION: "theme.openapi.securitySchemes.description",
-  SCHEME: "theme.openapi.securitySchemes.scheme",
-  BEARER_FORMAT: "theme.openapi.securitySchemes.bearerFormat",
-  OPEN_ID_CONNECT_URL: "theme.openapi.securitySchemes.openIdConnectUrl",
-};

package/package.json

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

package/src/markdown/schema.test.ts

@@ -58,4 +58,45 @@ describe("getSchemaName", () => {
     } as SchemaObject;
     expect(getSchemaName(schema)).toBe("integer[][][]");
   });
+
+  it("joins OpenAPI 3.1 type arrays with ` | ` (issue #950)", () => {
+    const schema = { type: ["string", "null"] } as unknown as SchemaObject;
+    expect(getSchemaName(schema)).toBe("string | null");
+  });
+
+  it("unwraps a single-element type array", () => {
+    const schema = { type: ["integer"] } as unknown as SchemaObject;
+    expect(getSchemaName(schema)).toBe("integer");
+  });
+
+  it("renders single type with format as `type<format>`", () => {
+    const schema = {
+      type: "string",
+      format: "uuid",
+    } as SchemaObject;
+    expect(getSchemaName(schema)).toBe("string<uuid>");
+  });
+
+  it("renders type union with format", () => {
+    const schema = {
+      type: ["string", "null"],
+      format: "uuid",
+    } as unknown as SchemaObject;
+    expect(getSchemaName(schema)).toBe("(string | null)<uuid>");
+  });
+
+  it("resolves type from an allOf wrapper that contains an enum", () => {
+    const schema = {
+      allOf: [{ type: "string", enum: ["a", "b"] }],
+    } as unknown as SchemaObject;
+    expect(getSchemaName(schema)).toBe("string");
+  });
+
+  it("renders array of items whose type is a union", () => {
+    const schema: SchemaObject = {
+      type: "array",
+      items: { type: ["string", "null"] } as any,
+    } as SchemaObject;
+    expect(getSchemaName(schema)).toBe("(string | null)[]");
+  });
 });

package/src/markdown/schema.ts

@@ -7,7 +7,6 @@
 
 import { translate } from "@docusaurus/Translate";
 
-import { OPENAPI_SCHEMA_ITEM } from "../theme/translationIds";
 import { SchemaObject } from "../types";
 
 /**
@@ -48,6 +47,24 @@ function getTypeFromSchema(schema: SchemaObject): string | undefined {
   return undefined;
 }
 
+// OpenAPI 3.1 / JSON Schema 2020-12 allows `type` to be an array of type names
+// (e.g. `["string", "null"]`). Normalize to a single name and a pretty-printed
+// union form joined with ` | `.
+function normalizeType(type: unknown): {
+  single?: string;
+  pretty?: string;
+  isUnion: boolean;
+} {
+  if (Array.isArray(type)) {
+    const filtered = type.filter((t): t is string => typeof t === "string");
+    if (filtered.length === 0) return { isUnion: false };
+    if (filtered.length === 1) return { single: filtered[0], isUnion: false };
+    return { pretty: filtered.join(" | "), isUnion: true };
+  }
+  if (typeof type === "string") return { single: type, isUnion: false };
+  return { isUnion: false };
+}
+
 function prettyName(schema: SchemaObject, circular?: boolean) {
   // Handle enum-only schemas (valid in JSON Schema)
   // When enum is present without explicit type, treat as string
@@ -55,7 +72,15 @@ function prettyName(schema: SchemaObject, circular?: boolean) {
     return "string";
   }
 
+  const t = normalizeType(schema.type);
+
   if (schema.format) {
+    if (t.single) {
+      return `${t.single}<${schema.format}>`;
+    }
+    if (t.isUnion) {
+      return `(${t.pretty})<${schema.format}>`;
+    }
     return schema.format;
   }
 
@@ -83,21 +108,19 @@ function prettyName(schema: SchemaObject, circular?: boolean) {
     return "object";
   }
 
-  if (schema.type === "object") {
-    return schema.xml?.name ?? schema.type;
-    // return schema.type;
+  if (t.single === "object") {
+    return schema.xml?.name ?? t.single;
   }
 
-  if (schema.type === "array") {
-    return schema.xml?.name ?? schema.type;
-    // return schema.type;
+  if (t.single === "array") {
+    return schema.xml?.name ?? t.single;
   }
 
-  if (Array.isArray(schema.type)) {
-    return schema.type.join(" | ");
+  if (t.isUnion) {
+    return t.pretty;
   }
 
-  return schema.title ?? schema.type;
+  return schema.title ?? t.single;
 }
 
 export function getSchemaName(
@@ -105,7 +128,11 @@ export function getSchemaName(
   circular?: boolean
 ): string {
   if (schema.items) {
-    return getSchemaName(schema.items as SchemaObject, circular) + "[]";
+    const items = schema.items as SchemaObject;
+    const inner = getSchemaName(items, circular);
+    const needsParens =
+      Array.isArray((items as any).type) && (items as any).type.length > 1;
+    return needsParens ? `(${inner})[]` : `${inner}[]`;
   }
 
   return prettyName(schema, circular) ?? "";
@@ -130,7 +157,7 @@ export function getQualifierMessage(schema?: SchemaObject): string | undefined {
   }
 
   let message = `**${translate({
-    id: OPENAPI_SCHEMA_ITEM.POSSIBLE_VALUES,
+    id: "theme.openapi.schemaItem.possibleValues",
     message: "Possible values:",
   })}** `;
 
@@ -149,11 +176,11 @@ export function getQualifierMessage(schema?: SchemaObject): string | undefined {
     let minLength;
     let maxLength;
     const charactersMessage = translate({
-      id: OPENAPI_SCHEMA_ITEM.CHARACTERS,
+      id: "theme.openapi.schemaItem.characters",
       message: "characters",
     });
     const nonEmptyMessage = translate({
-      id: OPENAPI_SCHEMA_ITEM.NON_EMPTY,
+      id: "theme.openapi.schemaItem.nonEmpty",
       message: "non-empty",
     });
     if (schema.minLength && schema.minLength > 1) {
@@ -218,7 +245,7 @@ export function getQualifierMessage(schema?: SchemaObject): string | undefined {
 
   if (schema.pattern) {
     const expressionMessage = translate({
-      id: OPENAPI_SCHEMA_ITEM.EXPRESSION,
+      id: "theme.openapi.schemaItem.expression",
       message: "Value must match regular expression",
     });
     qualifierGroups.push(`${expressionMessage} \`${schema.pattern}\``);