docusaurus-plugin-openapi-docs 1.1.0 → 1.1.3

package/lib/markdown/schema.test.js

@@ -16,17 +16,17 @@ describe("getQualifierMessage", () => {
     // minLength + maxLength
     //
     it("should render minLength", () => {
-        const expected = "**Possible values:** 1 ≤ length";
+        const expected = "**Possible values:** `non-empty`";
         const actual = (0, schema_1.getQualifierMessage)({ minLength: 1 });
         expect(actual).toBe(expected);
     });
     it("should render maxLength", () => {
-        const expected = "**Possible values:** length ≤ 40";
+        const expected = "**Possible values:** `<= 40 characters`";
         const actual = (0, schema_1.getQualifierMessage)({ maxLength: 40 });
         expect(actual).toBe(expected);
     });
     it("should render minLength and maxLength", () => {
-        const expected = "**Possible values:** 1 ≤ length ≤ 40";
+        const expected = "**Possible values:** `non-empty` and `<= 40 characters`";
         const actual = (0, schema_1.getQualifierMessage)({ minLength: 1, maxLength: 40 });
         expect(actual).toBe(expected);
     });
@@ -39,7 +39,7 @@ describe("getQualifierMessage", () => {
         expect(actual).toBe(expected);
     });
     it("should render multiple string qualifiers", () => {
-        const expected = "**Possible values:** 1 ≤ length ≤ 40, Value must match regular expression `^[a-zA-Z0-9_-]*$`";
+        const expected = "**Possible values:** `non-empty` and `<= 40 characters`, Value must match regular expression `^[a-zA-Z0-9_-]*$`";
         const actual = (0, schema_1.getQualifierMessage)({
             minLength: 1,
             maxLength: 40,
@@ -59,42 +59,42 @@ describe("getQualifierMessage", () => {
     // minimum + maximum + exclusiveMinimum + exclusiveMaximum
     //
     it("should render minimum", () => {
-        const expected = "**Possible values:** 1 ≤ value";
+        const expected = "**Possible values:** `>= 1`";
         const actual = (0, schema_1.getQualifierMessage)({ minimum: 1 });
         expect(actual).toBe(expected);
     });
     it("should render maximum", () => {
-        const expected = "**Possible values:** value ≤ 40";
+        const expected = "**Possible values:** `<= 40`";
         const actual = (0, schema_1.getQualifierMessage)({ maximum: 40 });
         expect(actual).toBe(expected);
     });
     it("should render numeric exclusiveMinimum", () => {
-        const expected = "**Possible values:** 1 < value";
+        const expected = "**Possible values:** `> 1`";
         const actual = (0, schema_1.getQualifierMessage)({ exclusiveMinimum: 1 });
         expect(actual).toBe(expected);
     });
     it("should render numeric exclusiveMaximum", () => {
-        const expected = "**Possible values:** value < 40";
+        const expected = "**Possible values:** `< 40`";
         const actual = (0, schema_1.getQualifierMessage)({ exclusiveMaximum: 40 });
         expect(actual).toBe(expected);
     });
     it("should render boolean exclusiveMinimum", () => {
-        const expected = "**Possible values:** 1 < value";
+        const expected = "**Possible values:** `> 1`";
         const actual = (0, schema_1.getQualifierMessage)({ minimum: 1, exclusiveMinimum: true });
         expect(actual).toBe(expected);
     });
     it("should render boolean exclusiveMaximum", () => {
-        const expected = "**Possible values:** value < 40";
+        const expected = "**Possible values:** `< 40`";
         const actual = (0, schema_1.getQualifierMessage)({ maximum: 40, exclusiveMaximum: true });
         expect(actual).toBe(expected);
     });
     it("should render minimum when exclusiveMinimum is false", () => {
-        const expected = "**Possible values:** 1 ≤ value";
+        const expected = "**Possible values:** `>= 1`";
         const actual = (0, schema_1.getQualifierMessage)({ minimum: 1, exclusiveMinimum: false });
         expect(actual).toBe(expected);
     });
     it("should render maximum when exclusiveMaximum is false", () => {
-        const expected = "**Possible values:** value ≤ 40";
+        const expected = "**Possible values:** `<= 40`";
         const actual = (0, schema_1.getQualifierMessage)({
             maximum: 40,
             exclusiveMaximum: false,
@@ -102,12 +102,12 @@ describe("getQualifierMessage", () => {
         expect(actual).toBe(expected);
     });
     it("should render minimum and maximum", () => {
-        const expected = "**Possible values:** 1 ≤ value ≤ 40";
+        const expected = "**Possible values:** `>= 1` and `<= 40`";
         const actual = (0, schema_1.getQualifierMessage)({ minimum: 1, maximum: 40 });
         expect(actual).toBe(expected);
     });
     it("should render boolean exclusiveMinimum and maximum", () => {
-        const expected = "**Possible values:** 1 < value ≤ 40";
+        const expected = "**Possible values:** `> 1` and `<= 40`";
         const actual = (0, schema_1.getQualifierMessage)({
             minimum: 1,
             maximum: 40,
@@ -116,7 +116,7 @@ describe("getQualifierMessage", () => {
         expect(actual).toBe(expected);
     });
     it("should render minimum and boolean exclusiveMaximum", () => {
-        const expected = "**Possible values:** 1 ≤ value < 40";
+        const expected = "**Possible values:** `>= 1` and `< 40`";
         const actual = (0, schema_1.getQualifierMessage)({
             minimum: 1,
             maximum: 40,
@@ -125,7 +125,7 @@ describe("getQualifierMessage", () => {
         expect(actual).toBe(expected);
     });
     it("should render numeric exclusiveMinimum and maximum", () => {
-        const expected = "**Possible values:** 1 < value ≤ 40";
+        const expected = "**Possible values:** `> 1` and `<= 40`";
         const actual = (0, schema_1.getQualifierMessage)({
             exclusiveMinimum: 1,
             maximum: 40,
@@ -133,7 +133,7 @@ describe("getQualifierMessage", () => {
         expect(actual).toBe(expected);
     });
     it("should render minimum and numeric exclusiveMaximum", () => {
-        const expected = "**Possible values:** 1 ≤ value < 40";
+        const expected = "**Possible values:** `>= 1` and `< 40`";
         const actual = (0, schema_1.getQualifierMessage)({
             minimum: 1,
             exclusiveMaximum: 40,
@@ -141,7 +141,7 @@ describe("getQualifierMessage", () => {
         expect(actual).toBe(expected);
     });
     it("should render numeric exclusiveMinimum and boolean exclusiveMaximum", () => {
-        const expected = "**Possible values:** 1 < value < 40";
+        const expected = "**Possible values:** `> 1` and `< 40`";
         const actual = (0, schema_1.getQualifierMessage)({
             exclusiveMinimum: 1,
             maximum: 40,

package/lib/openapi/openapi.js

@@ -16,7 +16,8 @@ const openapi_to_postmanv2_1 = __importDefault(require("@paloaltonetworks/openap
 const postman_collection_1 = __importDefault(require("@paloaltonetworks/postman-collection"));
 const chalk_1 = __importDefault(require("chalk"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const lodash_1 = require("lodash");
+const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
+const kebabCase_1 = __importDefault(require("lodash/kebabCase"));
 const index_1 = require("../index");
 const createExample_1 = require("./createExample");
 const loadAndResolveSpec_1 = require("./utils/loadAndResolveSpec");
@@ -40,7 +41,8 @@ function jsonToCollection(data) {
  */
 async function createPostmanCollection(openapiData) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
-    const data = openapiData;
+    // Create copy of openapiData
+    const data = (0, cloneDeep_1.default)(openapiData);
     // Including `servers` breaks postman, so delete all of them.
     delete data.servers;
     for (let pathItemObject of Object.values(data.paths)) {
@@ -60,7 +62,7 @@ function createItems(openapiData, sidebarOptions) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
     // TODO: Find a better way to handle this
     let items = [];
-    const infoId = (0, lodash_1.kebabCase)(openapiData.info.title);
+    const infoId = (0, kebabCase_1.default)(openapiData.info.title);
     if ((sidebarOptions === null || sidebarOptions === void 0 ? void 0 : sidebarOptions.categoryLinkSource) === "tag") {
         // Only create an tag pages if categoryLinkSource set to tag.
         const tags = (_a = openapiData.tags) !== null && _a !== void 0 ? _a : [];
@@ -71,14 +73,13 @@ function createItems(openapiData, sidebarOptions) {
             .map((tag) => {
             var _a;
             const description = getTagDisplayName(tag.name, (_a = openapiData.tags) !== null && _a !== void 0 ? _a : []);
-            const tagId = (0, lodash_1.kebabCase)(tag.name);
+            const tagId = (0, kebabCase_1.default)(tag.name);
             const tagPage = {
                 type: "tag",
                 id: tagId,
                 unversionedId: tagId,
                 title: description !== null && description !== void 0 ? description : "",
                 description: description !== null && description !== void 0 ? description : "",
-                slug: "/" + tagId,
                 frontMatter: {},
                 tag: {
                     ...tag,
@@ -95,13 +96,14 @@ function createItems(openapiData, sidebarOptions) {
             unversionedId: infoId,
             title: openapiData.info.title,
             description: openapiData.info.description,
-            slug: "/" + infoId,
             frontMatter: {},
             securitySchemes: (_b = openapiData.components) === null || _b === void 0 ? void 0 : _b.securitySchemes,
             info: {
                 ...openapiData.info,
                 tags: (_c = openapiData.tags) === null || _c === void 0 ? void 0 : _c.map((tagName) => { var _a; return getTagDisplayName(tagName.name, (_a = openapiData.tags) !== null && _a !== void 0 ? _a : []); }),
                 title: (_d = openapiData.info.title) !== null && _d !== void 0 ? _d : "Introduction",
+                logo: openapiData.info["x-logo"],
+                darkLogo: openapiData.info["x-dark-logo"],
             },
         };
         items.push(infoPage);
@@ -114,7 +116,9 @@ function createItems(openapiData, sidebarOptions) {
                 operationObject.description =
                     (_h = (_g = operationObject.summary) !== null && _g !== void 0 ? _g : operationObject.operationId) !== null && _h !== void 0 ? _h : "";
             }
-            const baseId = (0, lodash_1.kebabCase)(title);
+            const baseId = operationObject.operationId
+                ? (0, kebabCase_1.default)(operationObject.operationId)
+                : (0, kebabCase_1.default)(operationObject.summary);
             const servers = (_k = (_j = operationObject.servers) !== null && _j !== void 0 ? _j : pathObject.servers) !== null && _k !== void 0 ? _k : openapiData.servers;
             const security = (_l = operationObject.security) !== null && _l !== void 0 ? _l : openapiData.security;
             // Add security schemes so we know how to handle security.
@@ -141,7 +145,6 @@ function createItems(openapiData, sidebarOptions) {
                 unversionedId: baseId,
                 title: title,
                 description: description !== null && description !== void 0 ? description : "",
-                slug: "/" + baseId,
                 frontMatter: {},
                 api: {
                     ...defaults,

package/lib/openapi/types.d.ts

@@ -31,6 +31,13 @@ export interface InfoObject {
     license?: LicenseObject;
     version: string;
     tags?: String[];
+    "x-logo"?: LogoObject;
+    "x-dark-logo"?: LogoObject;
+    logo?: LogoObject;
+    darkLogo?: LogoObject;
+}
+export interface LogoObject {
+    url?: string;
 }
 export interface ContactObject {
     name?: string;

package/lib/openapi/utils/loadAndResolveSpec.js

@@ -15,6 +15,7 @@ const openapi_core_1 = require("@redocly/openapi-core");
 const chalk_1 = __importDefault(require("chalk"));
 // @ts-ignore
 const swagger2openapi_1 = require("swagger2openapi");
+const OpenAPIParser_1 = require("./services/OpenAPIParser");
 function serializer(replacer, cycleReplacer) {
     var stack = [], keys = [];
     if (cycleReplacer === undefined)
@@ -24,6 +25,18 @@ function serializer(replacer, cycleReplacer) {
             return value.title ? `circular(${value.title})` : "circular()";
         };
     return function (key, value) {
+        // Resolve discriminator ref pointers
+        if ((value === null || value === void 0 ? void 0 : value.discriminator) !== undefined) {
+            const parser = new OpenAPIParser_1.OpenAPIParser(stack[0]);
+            for (let [k, v] of Object.entries(value.discriminator.mapping)) {
+                const discriminator = k;
+                if (typeof v === "string" && v.charAt(0) === "#") {
+                    const ref = v;
+                    const resolvedRef = parser.byRef(ref);
+                    value.discriminator.mapping[discriminator] = resolvedRef;
+                }
+            }
+        }
         if (stack.length > 0) {
             // @ts-ignore
             var thisPos = stack.indexOf(this);

package/lib/sidebars/index.js

@@ -9,6 +9,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
 const clsx_1 = __importDefault(require("clsx"));
 const lodash_1 = require("lodash");
 const uniq_1 = __importDefault(require("lodash/uniq"));
@@ -98,8 +99,8 @@ function groupByTags(items, sidebarOptions, options, tags, docPath) {
                 type: "generated-index",
                 title: tag,
                 slug: label
-                    ? "/category/" + (0, lodash_1.kebabCase)(label) + "/" + (0, lodash_1.kebabCase)(tag)
-                    : "/category/" + (0, lodash_1.kebabCase)(tag),
+                    ? path_1.default.join("/category", basePath, (0, lodash_1.kebabCase)(label), (0, lodash_1.kebabCase)(tag))
+                    : path_1.default.join("/category", basePath, (0, lodash_1.kebabCase)(tag)),
             };
         }
         return {

package/lib/types.d.ts

@@ -51,7 +51,7 @@ export interface ApiMetadataBase {
     description: string;
     source: string;
     sourceDirName: string;
-    slug: string;
+    slug?: string;
     permalink: string;
     sidebarPosition?: number;
     frontMatter: Record<string, unknown>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "docusaurus-plugin-openapi-docs",
   "description": "OpenAPI plugin for Docusaurus.",
-  "version": "1.1.0",
+  "version": "1.1.3",
   "license": "MIT",
   "keywords": [
     "openapi",
@@ -28,8 +28,8 @@
     "watch": "tsc --watch"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.0.0-beta.22",
-    "@docusaurus/types": "2.0.0-beta.22",
+    "@docusaurus/module-type-aliases": "2.0.1",
+    "@docusaurus/types": "2.0.1",
     "@types/fs-extra": "^9.0.13",
     "@types/js-yaml": "^4.0.5",
     "@types/json-pointer": "^1.0.31",
@@ -40,10 +40,10 @@
   },
   "dependencies": {
     "@apidevtools/json-schema-ref-parser": "^9.0.9",
-    "@docusaurus/mdx-loader": "2.0.0-beta.22",
-    "@docusaurus/plugin-content-docs": "2.0.0-beta.22",
-    "@docusaurus/utils": "2.0.0-beta.22",
-    "@docusaurus/utils-validation": "2.0.0-beta.22",
+    "@docusaurus/mdx-loader": "2.0.1",
+    "@docusaurus/plugin-content-docs": "2.0.1",
+    "@docusaurus/utils": "2.0.1",
+    "@docusaurus/utils-validation": "2.0.1",
     "@paloaltonetworks/openapi-to-postmanv2": "3.1.0-hotfix.1",
     "@paloaltonetworks/postman-collection": "^4.1.0",
     "@redocly/openapi-core": "^1.0.0-beta.103",
@@ -67,5 +67,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "31b50e968a9cc66b1c3cb078a0fed772054f8246"
+  "gitHead": "4897267289b035aed8155f6001e14c80ba9003a8"
 }

package/src/markdown/createLogo.ts

@@ -0,0 +1,21 @@
+/* ============================================================================
+ * Copyright (c) Palo Alto Networks
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ * ========================================================================== */
+
+import { LogoObject } from "../openapi/types";
+import { create, guard } from "./utils";
+
+export function createLogo(
+  logo: LogoObject | undefined,
+  darkLogo: LogoObject | undefined
+) {
+  return guard(logo || darkLogo, () => [
+    create("ApiLogo", {
+      logo: logo,
+      darkLogo: darkLogo,
+    }),
+  ]);
+}

package/src/markdown/createSchemaDetails.ts

@@ -99,6 +99,7 @@ function createAnyOneOf(schema: SchemaObject): any {
 }
 
 function createProperties(schema: SchemaObject) {
+  const discriminator = schema.discriminator;
   return Object.entries(schema.properties!).map(([key, val]) =>
     createEdges({
       name: key,
@@ -106,6 +107,7 @@ function createProperties(schema: SchemaObject) {
       required: Array.isArray(schema.required)
         ? schema.required.includes(key)
         : false,
+      discriminator,
     })
   );
 }
@@ -277,6 +279,110 @@ function createItems(schema: SchemaObject) {
   );
 }
 
+/**
+ * For handling discriminators that do not map to a same-level property
+ */
+function createDiscriminator(schema: SchemaObject) {
+  const discriminator = schema.discriminator;
+  const propertyName = discriminator?.propertyName;
+  const propertyType = "string"; // should always be string
+  const mapping: any = discriminator?.mapping;
+
+  // Explicit mapping is required since we can't support implicit
+  if (mapping === undefined) {
+    return undefined;
+  }
+
+  // Attempt to get the property description we want to display
+  // TODO: how to make it predictable when handling allOf
+  let propertyDescription;
+  const firstMappingSchema = mapping[Object.keys(mapping)[0]];
+  if (firstMappingSchema.properties !== undefined) {
+    propertyDescription =
+      firstMappingSchema.properties![propertyName!].description;
+  }
+  if (firstMappingSchema.allOf !== undefined) {
+    const { mergedSchemas }: { mergedSchemas: SchemaObject } = mergeAllOf(
+      firstMappingSchema.allOf
+    );
+    if (mergedSchemas.properties !== undefined) {
+      propertyDescription =
+        mergedSchemas.properties[propertyName!]?.description;
+    }
+  }
+
+  if (propertyDescription === undefined) {
+    if (
+      schema.properties !== undefined &&
+      schema.properties![propertyName!] !== undefined
+    ) {
+      propertyDescription = schema.properties![propertyName!].description;
+    }
+  }
+
+  return create("div", {
+    className: "discriminatorItem",
+    children: create("div", {
+      children: [
+        create("strong", {
+          style: { paddingLeft: "1rem" },
+          children: propertyName,
+        }),
+        guard(propertyType, (name) =>
+          create("span", {
+            style: { opacity: "0.6" },
+            children: ` ${propertyType}`,
+          })
+        ),
+        guard(getQualifierMessage(schema.discriminator as any), (message) =>
+          create("div", {
+            style: {
+              paddingLeft: "1rem",
+            },
+            children: createDescription(message),
+          })
+        ),
+        guard(propertyDescription, (description) =>
+          create("div", {
+            style: {
+              paddingLeft: "1rem",
+            },
+            children: createDescription(description),
+          })
+        ),
+        create("DiscriminatorTabs", {
+          children: Object.keys(mapping!).map((key, index) => {
+            if (mapping[key].allOf !== undefined) {
+              const { mergedSchemas }: { mergedSchemas: SchemaObject } =
+                mergeAllOf(mapping[key].allOf);
+              // Cleanup duplicate property from mapping schema
+              delete mergedSchemas.properties![propertyName!];
+              mapping[key] = mergedSchemas;
+            }
+
+            if (mapping[key].properties !== undefined) {
+              // Cleanup duplicate property from mapping schema
+              delete mapping[key].properties![propertyName!];
+            }
+
+            const label = key;
+            return create("TabItem", {
+              label: label,
+              value: `${index}-item-discriminator`,
+              children: [
+                create("div", {
+                  style: { marginLeft: "-4px" },
+                  children: createNodes(mapping[key]),
+                }),
+              ],
+            });
+          }),
+        }),
+      ],
+    }),
+  });
+}
+
 function createDetailsNode(
   name: string,
   schemaName: string,
@@ -331,18 +437,109 @@ function createDetailsNode(
   });
 }
 
+/**
+ * For handling discriminators that map to a same-level property (like 'petType').
+ * Note: These should only be encountered while iterating through properties.
+ */
+function createPropertyDiscriminator(
+  name: string,
+  schemaName: string,
+  schema: SchemaObject,
+  discriminator: any,
+  required: any
+): any {
+  if (schema === undefined) {
+    return undefined;
+  }
+
+  if (discriminator.mapping === undefined) {
+    return undefined;
+  }
+
+  return create("div", {
+    className: "discriminatorItem",
+    children: create("div", {
+      children: [
+        create("strong", { style: { paddingLeft: "1rem" }, children: name }),
+        guard(schemaName, (name) =>
+          create("span", {
+            style: { opacity: "0.6" },
+            children: ` ${schemaName}`,
+          })
+        ),
+        guard(required, () => [
+          create("strong", {
+            style: {
+              fontSize: "var(--ifm-code-font-size)",
+              color: "var(--openapi-required)",
+            },
+            children: " required",
+          }),
+        ]),
+        guard(getQualifierMessage(discriminator), (message) =>
+          create("div", {
+            style: {
+              paddingLeft: "1rem",
+            },
+            children: createDescription(message),
+          })
+        ),
+        guard(schema.description, (description) =>
+          create("div", {
+            style: {
+              paddingLeft: "1rem",
+            },
+            children: createDescription(description),
+          })
+        ),
+        create("DiscriminatorTabs", {
+          children: Object.keys(discriminator?.mapping!).map((key, index) => {
+            const label = key;
+            return create("TabItem", {
+              label: label,
+              value: `${index}-item-discriminator`,
+              children: [
+                create("div", {
+                  style: { marginLeft: "-4px" },
+                  children: createNodes(discriminator?.mapping[key]),
+                }),
+              ],
+            });
+          }),
+        }),
+      ],
+    }),
+  });
+}
+
 interface EdgeProps {
   name: string;
   schema: SchemaObject;
   required: boolean;
+  discriminator?: any | unknown;
 }
 
 /**
  * Creates the edges or "leaves" of a schema tree. Edges can branch into sub-nodes with createDetails().
  */
-function createEdges({ name, schema, required }: EdgeProps): any {
+function createEdges({
+  name,
+  schema,
+  required,
+  discriminator,
+}: EdgeProps): any {
   const schemaName = getSchemaName(schema);
 
+  if (discriminator !== undefined && discriminator.propertyName === name) {
+    return createPropertyDiscriminator(
+      name,
+      "string",
+      schema,
+      discriminator,
+      required
+    );
+  }
+
   if (schema.oneOf !== undefined || schema.anyOf !== undefined) {
     return createDetailsNode(name, schemaName, schema, required);
   }
@@ -409,6 +606,10 @@ function createEdges({ name, schema, required }: EdgeProps): any {
  * Creates a hierarchical level of a schema tree. Nodes produce edges that can branch into sub-nodes with edges, recursively.
  */
 function createNodes(schema: SchemaObject): any {
+  if (schema.discriminator !== undefined) {
+    return createDiscriminator(schema);
+  }
+
   if (schema.oneOf !== undefined || schema.anyOf !== undefined) {
     return createAnyOneOf(schema);
   }