docusaurus-plugin-openapi-docs 0.0.0-380 → 0.0.0-383

package/README.md

@@ -81,6 +81,7 @@ Here is an example of properly configuring your `docusaurus.config.js` file for
       'docusaurus-plugin-openapi-docs',
       {
         id: "apiDocs",
+        docPluginId: "classic",
         config: {
           petstore: { // Note: petstore key is treated as the <id> and can be used to specify an API doc instance when using CLI commands
             specPath: "examples/petstore.yaml", // Path to designated spec file
@@ -103,23 +104,30 @@ Here is an example of properly configuring your `docusaurus.config.js` file for
 
 > Note: You may optionally configure a dedicated `@docusaurus/plugin-content-docs` instance for use with `docusaurus-theme-openapi-docs` by setting `docItemComponent` to `@theme/ApiItem`.
 
-### Plugin Configuration Options
-
-`docusaurus-plugin-openapi-docs` can be configured with the following options:
-
-| Name              | Type     | Default | Description                                                                                                                 |
-| ----------------- | -------- | ------- | --------------------------------------------------------------------------------------------------------------------------- |
-| `specPath`        | `string` | `null`  | Designated URL or path to the source of an OpenAPI specification file or directory of multiple OpenAPI specification files. |
-| `ouputDir`        | `string` | `null`  | Desired output path for generated MDX files.                                                                                |
-| `contentDocsPath` | `string` | `null`  | Should be equal to the `path` value set in `plugin-content-docs` or preset.                                                 |
-| `ouputDir`        | `string` | `null`  | Desired output path for generated MDX files.                                                                                |
-| `routeBasePath`   | `string` | `null`  | _Optional:_ Should be equal to the `routeBasePath` value set in `plugin-content-docs or preset (if present).                |
-| `template`        | `string` | `null`  | _Optional:_ Customize MDX content with a desired template.                                                                  |
-| `sidebarOptions`  | `object` | `null`  | _Optional:_ Set of options for sidebar configuration. See below for a list of supported options.                            |
-| `version`         | `string` | `null`  | _Optional:_ Version assigned to single or micro-spec API specified in `specPath`.                                           |
-| `label`           | `string` | `null`  | _Optional:_ Version label used when generating version selector dropdown menu.                                              |
-| `baseUrl`         | `string` | `null`  | _Optional:_ Version base URL used when generating version selector dropdown menu.                                           |
-| `versions`        | `object` | `null`  | _Optional:_ Set of options for versioning configuration. See below for a list of supported options.                         |
+## Plugin Configuration Options
+
+The `docusaurus-plugin-openapi-docs` plugin can be configured with the following options:
+
+| Name          | Type     | Default | Description                                                                                                                                          |
+| ------------- | -------- | ------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `id`          | `string` | `null`  | A unique document id.                                                                                                                                |
+| `docPluginId` | `string` | `null`  | The ID associated with the `plugin-content-docs` or `preset` instance used to render the OpenAPI docs (e.g. "your-plugin-id", "classic", "default"). |
+
+### config
+
+`config` can be configured with the following options:
+
+| Name             | Type     | Default | Description                                                                                                                 |
+| ---------------- | -------- | ------- | --------------------------------------------------------------------------------------------------------------------------- |
+| `specPath`       | `string` | `null`  | Designated URL or path to the source of an OpenAPI specification file or directory of multiple OpenAPI specification files. |
+| `ouputDir`       | `string` | `null`  | Desired output path for generated MDX files.                                                                                |
+| `ouputDir`       | `string` | `null`  | Desired output path for generated MDX files.                                                                                |
+| `template`       | `string` | `null`  | _Optional:_ Customize MDX content with a desired template.                                                                  |
+| `sidebarOptions` | `object` | `null`  | _Optional:_ Set of options for sidebar configuration. See below for a list of supported options.                            |
+| `version`        | `string` | `null`  | _Optional:_ Version assigned to single or micro-spec API specified in `specPath`.                                           |
+| `label`          | `string` | `null`  | _Optional:_ Version label used when generating version selector dropdown menu.                                              |
+| `baseUrl`        | `string` | `null`  | _Optional:_ Version base URL used when generating version selector dropdown menu.                                           |
+| `versions`       | `object` | `null`  | _Optional:_ Set of options for versioning configuration. See below for a list of supported options.                         |
 
 `sidebarOptions` can be configured with the following options:
 

package/lib/index.d.ts

@@ -1,6 +1,7 @@
 import type { LoadContext, Plugin } from "@docusaurus/types";
 import type { PluginOptions, LoadedContent } from "./types";
 export declare function isURL(str: string): boolean;
+export declare function getDocsData(dataArray: any[], filter: string): Object | undefined;
 declare function pluginOpenAPIDocs(context: LoadContext, options: PluginOptions): Plugin<LoadedContent>;
 declare namespace pluginOpenAPIDocs {
     var validateOptions: ({ options, validate }: any) => any;

package/lib/index.js

@@ -9,7 +9,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isURL = void 0;
+exports.getDocsData = exports.isURL = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("@docusaurus/utils");
@@ -23,11 +23,48 @@ function isURL(str) {
     return /^(https?:)\/\//m.test(str);
 }
 exports.isURL = isURL;
+function getDocsData(dataArray, filter) {
+    // eslint-disable-next-line array-callback-return
+    const filteredData = dataArray.filter((data) => {
+        if (data[0] === filter) {
+            return data[1];
+        }
+        // Search plugin-content-docs instances
+        if (data[0] === "@docusaurus/plugin-content-docs") {
+            const pluginId = data[1].id ? data[1].id : "default";
+            if (pluginId === filter) {
+                return data[1];
+            }
+        }
+    })[0];
+    if (filteredData) {
+        // Search presets, e.g. "classic"
+        if (filteredData[0] === filter) {
+            return filteredData[1].docs;
+        }
+        // Search plugin-content-docs instances
+        if (filteredData[0] === "@docusaurus/plugin-content-docs") {
+            const pluginId = filteredData[1].id ? filteredData[1].id : "default";
+            if (pluginId === filter) {
+                return filteredData[1];
+            }
+        }
+    }
+    return;
+}
+exports.getDocsData = getDocsData;
 function pluginOpenAPIDocs(context, options) {
-    let { config } = options;
-    let { siteDir } = context;
+    const { config, docPluginId } = options;
+    const { siteDir, siteConfig } = context;
+    // Get routeBasePath and path from plugin-content-docs or preset
+    const presets = siteConfig.presets;
+    const plugins = siteConfig.plugins;
+    const presetsPlugins = presets.concat(plugins);
+    const docData = getDocsData(presetsPlugins, docPluginId);
+    const docRouteBasePath = docData ? docData.routeBasePath : undefined;
+    const docPath = docData ? (docData.path ? docData.path : "docs") : undefined;
     async function generateApiDocs(options) {
-        let { specPath, outputDir, contentDocsPath, routeBasePath, template, sidebarOptions, } = options;
+        let { specPath, outputDir, template, sidebarOptions } = options;
         const contentPath = isURL(specPath)
             ? specPath
             : path_1.default.resolve(siteDir, specPath);
@@ -45,7 +82,7 @@ function pluginOpenAPIDocs(context, options) {
             }
             // TODO: figure out better way to set default
             if (Object.keys(sidebarOptions !== null && sidebarOptions !== void 0 ? sidebarOptions : {}).length > 0) {
-                const sidebarSlice = (0, sidebars_1.default)(sidebarOptions, options, loadedApi, tags);
+                const sidebarSlice = (0, sidebars_1.default)(sidebarOptions, options, loadedApi, tags, docPath);
                 const sidebarSliceTemplate = template
                     ? fs_1.default.readFileSync(template).toString()
                     : `module.exports = {{{slice}}};`;
@@ -136,9 +173,9 @@ import {useCurrentSidebarCategory} from '@docusaurus/theme-common';
                 if (item.type === "api") {
                     item.json = JSON.stringify(item.api);
                     let infoBasePath = `${outputDir}/${item.infoId}`;
-                    if (routeBasePath) {
-                        infoBasePath = `${routeBasePath}/${outputDir
-                            .split(contentDocsPath)[1]
+                    if (docRouteBasePath) {
+                        infoBasePath = `${docRouteBasePath}/${outputDir
+                            .split(docPath)[1]
                             .replace(/^\/+/g, "")}/${item.infoId}`.replace(/^\/+/g, "");
                     }
                     if (item.infoId)

package/lib/options.js

@@ -17,12 +17,11 @@ const sidebarOptions = utils_validation_1.Joi.object({
 });
 exports.OptionsSchema = utils_validation_1.Joi.object({
     id: utils_validation_1.Joi.string().required(),
+    docPluginId: utils_validation_1.Joi.string().required(),
     config: utils_validation_1.Joi.object()
         .pattern(/^/, utils_validation_1.Joi.object({
         specPath: utils_validation_1.Joi.string().required(),
         outputDir: utils_validation_1.Joi.string().required(),
-        contentDocsPath: utils_validation_1.Joi.string().required(),
-        routeBasePath: utils_validation_1.Joi.string(),
         template: utils_validation_1.Joi.string(),
         sidebarOptions: sidebarOptions,
         version: utils_validation_1.Joi.string().when("versions", {

package/lib/sidebars/index.d.ts

@@ -1,4 +1,4 @@
 import { ProcessedSidebar } from "@docusaurus/plugin-content-docs/src/sidebars/types";
 import { TagObject } from "../openapi/types";
 import type { SidebarOptions, APIOptions, ApiMetadata } from "../types";
-export default function generateSidebarSlice(sidebarOptions: SidebarOptions, options: APIOptions, api: ApiMetadata[], tags: TagObject[]): ProcessedSidebar;
+export default function generateSidebarSlice(sidebarOptions: SidebarOptions, options: APIOptions, api: ApiMetadata[], tags: TagObject[], docPath: string): ProcessedSidebar;

package/lib/sidebars/index.js

@@ -18,10 +18,9 @@ function isApiItem(item) {
 function isInfoItem(item) {
     return item.type === "info";
 }
-function groupByTags(items, sidebarOptions, options, tags) {
+function groupByTags(items, sidebarOptions, options, tags, docPath) {
     const { outputDir } = options;
     const { sidebarCollapsed, sidebarCollapsible, customProps, categoryLinkSource, } = sidebarOptions;
-    const { contentDocsPath } = options;
     const apiItems = items.filter(isApiItem);
     const infoItems = items.filter(isInfoItem);
     const intros = infoItems.map((item) => {
@@ -36,8 +35,8 @@ function groupByTags(items, sidebarOptions, options, tags) {
     const apiTags = (0, uniq_1.default)(apiItems
         .flatMap((item) => item.api.tags)
         .filter((item) => !!item));
-    const basePath = contentDocsPath
-        ? outputDir.split(contentDocsPath)[1].replace(/^\/+/g, "")
+    const basePath = docPath
+        ? outputDir.split(docPath)[1].replace(/^\/+/g, "")
         : outputDir.slice(outputDir.indexOf("/", 1)).replace(/^\/+/g, "");
     function createDocItem(item) {
         var _a, _b;
@@ -136,10 +135,10 @@ function groupByTags(items, sidebarOptions, options, tags) {
     }
     return [...tagged, ...untagged];
 }
-function generateSidebarSlice(sidebarOptions, options, api, tags) {
+function generateSidebarSlice(sidebarOptions, options, api, tags, docPath) {
     let sidebarSlice = [];
     if (sidebarOptions.groupPathsBy === "tag") {
-        sidebarSlice = groupByTags(api, sidebarOptions, options, tags);
+        sidebarSlice = groupByTags(api, sidebarOptions, options, tags, docPath);
     }
     return sidebarSlice;
 }

package/lib/types.d.ts

@@ -3,6 +3,7 @@ import { InfoObject, OperationObject, SecuritySchemeObject, TagObject } from "./
 export type { PropSidebarItemCategory, SidebarItemLink, PropSidebar, PropSidebarItem, } from "@docusaurus/plugin-content-docs-types";
 export interface PluginOptions {
     id?: string;
+    docPluginId: string;
     config: {
         [key: string]: APIOptions;
     };
@@ -10,8 +11,6 @@ export interface PluginOptions {
 export interface APIOptions {
     specPath: string;
     outputDir: string;
-    contentDocsPath: string;
-    routeBasePath?: string;
     template?: string;
     sidebarOptions?: SidebarOptions;
     version?: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "docusaurus-plugin-openapi-docs",
   "description": "OpenAPI plugin for Docusaurus.",
-  "version": "0.0.0-380",
+  "version": "0.0.0-383",
   "license": "MIT",
   "keywords": [
     "openapi",
@@ -62,5 +62,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "3322e621893b40124fed23abd7f7aa8f12fed5af"
+  "gitHead": "b1edc577b516f889c4fe7cba5e6ffbbbb6566136"
 }

package/src/index.ts

@@ -23,22 +23,58 @@ export function isURL(str: string): boolean {
   return /^(https?:)\/\//m.test(str);
 }
 
+export function getDocsData(
+  dataArray: any[],
+  filter: string
+): Object | undefined {
+  // eslint-disable-next-line array-callback-return
+  const filteredData = dataArray.filter((data) => {
+    if (data[0] === filter) {
+      return data[1];
+    }
+
+    // Search plugin-content-docs instances
+    if (data[0] === "@docusaurus/plugin-content-docs") {
+      const pluginId = data[1].id ? data[1].id : "default";
+      if (pluginId === filter) {
+        return data[1];
+      }
+    }
+  })[0];
+  if (filteredData) {
+    // Search presets, e.g. "classic"
+    if (filteredData[0] === filter) {
+      return filteredData[1].docs;
+    }
+
+    // Search plugin-content-docs instances
+    if (filteredData[0] === "@docusaurus/plugin-content-docs") {
+      const pluginId = filteredData[1].id ? filteredData[1].id : "default";
+      if (pluginId === filter) {
+        return filteredData[1];
+      }
+    }
+  }
+  return;
+}
+
 export default function pluginOpenAPIDocs(
   context: LoadContext,
   options: PluginOptions
 ): Plugin<LoadedContent> {
-  let { config } = options;
-  let { siteDir } = context;
+  const { config, docPluginId } = options;
+  const { siteDir, siteConfig } = context;
+
+  // Get routeBasePath and path from plugin-content-docs or preset
+  const presets: any = siteConfig.presets;
+  const plugins: any = siteConfig.plugins;
+  const presetsPlugins = presets.concat(plugins);
+  const docData: any = getDocsData(presetsPlugins, docPluginId);
+  const docRouteBasePath = docData ? docData.routeBasePath : undefined;
+  const docPath = docData ? (docData.path ? docData.path : "docs") : undefined;
 
   async function generateApiDocs(options: APIOptions) {
-    let {
-      specPath,
-      outputDir,
-      contentDocsPath,
-      routeBasePath,
-      template,
-      sidebarOptions,
-    } = options;
+    let { specPath, outputDir, template, sidebarOptions } = options;
 
     const contentPath = isURL(specPath)
       ? specPath
@@ -68,7 +104,8 @@ export default function pluginOpenAPIDocs(
           sidebarOptions!,
           options,
           loadedApi,
-          tags
+          tags,
+          docPath
         );
 
         const sidebarSliceTemplate = template
@@ -172,9 +209,9 @@ import {useCurrentSidebarCategory} from '@docusaurus/theme-common';
         if (item.type === "api") {
           item.json = JSON.stringify(item.api);
           let infoBasePath = `${outputDir}/${item.infoId}`;
-          if (routeBasePath) {
-            infoBasePath = `${routeBasePath}/${outputDir
-              .split(contentDocsPath!)[1]
+          if (docRouteBasePath) {
+            infoBasePath = `${docRouteBasePath}/${outputDir
+              .split(docPath!)[1]
               .replace(/^\/+/g, "")}/${item.infoId}`.replace(/^\/+/g, "");
           }
           if (item.infoId) item.infoPath = infoBasePath;

package/src/options.ts

@@ -17,14 +17,13 @@ const sidebarOptions = Joi.object({
 
 export const OptionsSchema = Joi.object({
   id: Joi.string().required(),
+  docPluginId: Joi.string().required(),
   config: Joi.object()
     .pattern(
       /^/,
       Joi.object({
         specPath: Joi.string().required(),
         outputDir: Joi.string().required(),
-        contentDocsPath: Joi.string().required(),
-        routeBasePath: Joi.string(),
         template: Joi.string(),
         sidebarOptions: sidebarOptions,
         version: Joi.string().when("versions", {

package/src/sidebars/index.ts

@@ -35,7 +35,8 @@ function groupByTags(
   items: ApiPageMetadata[],
   sidebarOptions: SidebarOptions,
   options: APIOptions,
-  tags: TagObject[]
+  tags: TagObject[],
+  docPath: string
 ): ProcessedSidebar {
   const { outputDir } = options;
   const {
@@ -45,8 +46,6 @@ function groupByTags(
     categoryLinkSource,
   } = sidebarOptions;
 
-  const { contentDocsPath } = options;
-
   const apiItems = items.filter(isApiItem);
   const infoItems = items.filter(isInfoItem);
   const intros = infoItems.map((item: any) => {
@@ -65,8 +64,8 @@ function groupByTags(
       .filter((item): item is string => !!item)
   );
 
-  const basePath = contentDocsPath
-    ? outputDir.split(contentDocsPath!)[1].replace(/^\/+/g, "")
+  const basePath = docPath
+    ? outputDir.split(docPath!)[1].replace(/^\/+/g, "")
     : outputDir.slice(outputDir.indexOf("/", 1)).replace(/^\/+/g, "");
 
   function createDocItem(item: ApiPageMetadata): SidebarItemDoc {
@@ -185,7 +184,8 @@ export default function generateSidebarSlice(
   sidebarOptions: SidebarOptions,
   options: APIOptions,
   api: ApiMetadata[],
-  tags: TagObject[]
+  tags: TagObject[],
+  docPath: string
 ) {
   let sidebarSlice: ProcessedSidebar = [];
   if (sidebarOptions.groupPathsBy === "tag") {
@@ -193,7 +193,8 @@ export default function generateSidebarSlice(
       api as ApiPageMetadata[],
       sidebarOptions,
       options,
-      tags
+      tags,
+      docPath
     );
   }
   return sidebarSlice;

package/src/types.ts

@@ -22,6 +22,7 @@ export type {
 } from "@docusaurus/plugin-content-docs-types";
 export interface PluginOptions {
   id?: string;
+  docPluginId: string;
   config: {
     [key: string]: APIOptions;
   };
@@ -30,8 +31,6 @@ export interface PluginOptions {
 export interface APIOptions {
   specPath: string;
   outputDir: string;
-  contentDocsPath: string;
-  routeBasePath?: string;
   template?: string;
   sidebarOptions?: SidebarOptions;
   version?: string;