docusaurus-plugin-openapi-docs 1.0.6 → 1.1.2

package/src/sidebars/index.ts

@@ -67,7 +67,6 @@ function groupByTags(
   const basePath = docPath
     ? outputDir.split(docPath!)[1].replace(/^\/+/g, "")
     : outputDir.slice(outputDir.indexOf("/", 1)).replace(/^\/+/g, "");
-
   function createDocItem(item: ApiPageMetadata): SidebarItemDoc {
     const sidebar_label = item.frontMatter.sidebar_label;
     const title = item.title;
@@ -94,7 +93,7 @@ function groupByTags(
     const id = infoItem.id;
     rootIntroDoc = {
       type: "doc" as const,
-      id: `${basePath}/${id}`,
+      id: basePath === "" || undefined ? `${id}` : `${basePath}/${id}`,
     };
   }
 
@@ -117,7 +116,10 @@ function groupByTags(
       if (taggedInfoObject !== undefined && categoryLinkSource === "info") {
         linkConfig = {
           type: "doc",
-          id: `${basePath}/${taggedInfoObject.id}`,
+          id:
+            basePath === "" || undefined
+              ? `${taggedInfoObject.id}`
+              : `${basePath}/${taggedInfoObject.id}`,
         } as SidebarItemCategoryLinkConfig;
       }
 
@@ -126,7 +128,8 @@ function groupByTags(
         const tagId = kebabCase(tagObject.name);
         linkConfig = {
           type: "doc",
-          id: `${basePath}/${tagId}`,
+          id:
+            basePath === "" || undefined ? `${tagId}` : `${basePath}/${tagId}`,
         } as SidebarItemCategoryLinkConfig;
       }
 

package/lib/openapi/utils/loadAndBundleSpec.d.ts

@@ -1,3 +0,0 @@
-import { OpenAPISpec } from "./types";
-export declare function loadAndBundleSpec(specUrlOrObject: object | string, parseJsonRefs: boolean | undefined): Promise<OpenAPISpec>;
-export declare function convertSwagger2OpenAPI(spec: any): Promise<OpenAPISpec>;

package/src/openapi/utils/loadAndBundleSpec.ts

@@ -1,93 +0,0 @@
-/* ============================================================================
- * 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.
- * ========================================================================== */
-
-// @ts-nocheck
-
-import $RefParser from "@apidevtools/json-schema-ref-parser";
-import type { Source, Document } from "@redocly/openapi-core";
-import { bundle } from "@redocly/openapi-core/lib/bundle";
-import type { ResolvedConfig } from "@redocly/openapi-core/lib/config";
-import { Config } from "@redocly/openapi-core/lib/config/config";
-import chalk from "chalk";
-import { convertObj } from "swagger2openapi";
-
-import { OpenAPISpec } from "./types";
-
-async function resolveJsonRefs(specUrlOrObject: object | string) {
-  try {
-    let schema = await $RefParser.dereference(specUrlOrObject, {
-      continueOnError: true,
-      resolve: {
-        http: {
-          timeout: 15000, // 15 sec timeout
-        },
-      },
-      dereference: {
-        circular: "ignore",
-      },
-    });
-    return schema;
-  } catch (err) {
-    console.error(chalk.yellow(err.errors[0]?.message ?? err));
-    return;
-  }
-}
-
-export async function loadAndBundleSpec(
-  specUrlOrObject: object | string,
-  parseJsonRefs: boolean | undefined
-): Promise<OpenAPISpec> {
-  const config = new Config({} as ResolvedConfig);
-  const bundleOpts = {
-    config,
-    base: process.cwd(),
-  };
-
-  if (typeof specUrlOrObject === "object" && specUrlOrObject !== null) {
-    bundleOpts["doc"] = {
-      source: { absoluteRef: "" } as Source,
-      parsed: specUrlOrObject,
-    } as Document;
-  } else {
-    bundleOpts["ref"] = specUrlOrObject;
-  }
-
-  // Force dereference ?
-  // bundleOpts["dereference"] = true;
-
-  const {
-    bundle: { parsed },
-  } = await bundle(bundleOpts);
-  if (parseJsonRefs) {
-    const resolved = resolveJsonRefs(parsed);
-    return typeof resolved === Object
-      ? resolved.swagger !== undefined
-        ? convertSwagger2OpenAPI(resolved)
-        : resolved
-      : parsed;
-  }
-  return parsed.swagger !== undefined ? convertSwagger2OpenAPI(parsed) : parsed;
-}
-
-export function convertSwagger2OpenAPI(spec: any): Promise<OpenAPISpec> {
-  console.warn(
-    "[ReDoc Compatibility mode]: Converting OpenAPI 2.0 to OpenAPI 3.0"
-  );
-  return new Promise<OpenAPISpec>((resolve, reject) =>
-    convertObj(
-      spec,
-      { patch: true, warnOnly: true, text: "{}", anchors: true },
-      (err, res) => {
-        // TODO: log any warnings
-        if (err) {
-          return reject(err);
-        }
-        resolve(res && (res.openapi as any));
-      }
-    )
-  );
-}