docusaurus-plugin-openapi-docs 0.0.0-1130 → 0.0.0-1153

package/lib/openapi/utils/loadAndResolveSpec.js

@@ -104,7 +104,7 @@ async function resolveJsonRefs(specUrlOrObject) {
     }
 }
 async function loadAndResolveSpec(specUrlOrObject) {
-    const config = new openapi_core_1.Config({});
+    const config = await (0, openapi_core_1.createConfig)({});
     const bundleOpts = {
         config,
         base: process.cwd(),
@@ -121,9 +121,10 @@ async function loadAndResolveSpec(specUrlOrObject) {
     // Force dereference ?
     // bundleOpts["dereference"] = true;
     const { bundle: { parsed }, } = await (0, openapi_core_1.bundle)(bundleOpts);
+    const parsedSpec = parsed;
     //Pre-processing before resolving JSON refs
-    if (parsed.components) {
-        for (let [component, type] of Object.entries(parsed.components)) {
+    if (parsedSpec.components) {
+        for (let [component, type] of Object.entries(parsedSpec.components)) {
             if (component === "schemas") {
                 for (let [schemaKey, schemaValue] of Object.entries(type)) {
                     const title = schemaValue["title"];
@@ -134,7 +135,7 @@ async function loadAndResolveSpec(specUrlOrObject) {
             }
         }
     }
-    const resolved = await resolveJsonRefs(parsed);
+    const resolved = await resolveJsonRefs(parsedSpec);
     // Force serialization and replace circular $ref pointers
     // @ts-ignore
     const serialized = JSON.stringify(resolved, serializer());

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "docusaurus-plugin-openapi-docs",
   "description": "OpenAPI plugin for Docusaurus.",
-  "version": "0.0.0-1130",
+  "version": "0.0.0-1153",
   "license": "MIT",
   "keywords": [
     "openapi",
@@ -40,10 +40,10 @@
     "eslint-plugin-prettier": "^5.5.1"
   },
   "dependencies": {
-    "@apidevtools/json-schema-ref-parser": "^11.5.4",
-    "@redocly/openapi-core": "^1.34.3",
+    "@apidevtools/json-schema-ref-parser": "^15.3.3",
+    "@redocly/openapi-core": "^2.25.2",
     "allof-merge": "^0.6.6",
-    "chalk": "^4.1.2",
+    "chalk": "^5.6.2",
     "clsx": "^2.1.1",
     "fs-extra": "^11.3.0",
     "json-pointer": "^0.6.2",
@@ -65,5 +65,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "5e9591e0e848677c7589a091580feffcc0a86b41"
+  "gitHead": "9010772cfcb0e6b5f09ec3fab585c36af1deb0d7"
 }

package/src/openapi/utils/loadAndResolveSpec.ts

@@ -6,9 +6,8 @@
  * ========================================================================== */
 
 import $RefParser from "@apidevtools/json-schema-ref-parser";
-import { bundle, Config } from "@redocly/openapi-core";
+import { bundle, createConfig } from "@redocly/openapi-core";
 import type { Source, Document } from "@redocly/openapi-core";
-import { ResolvedConfig } from "@redocly/openapi-core/lib/config";
 import chalk from "chalk";
 // @ts-ignore
 import { convertObj } from "swagger2openapi";
@@ -116,7 +115,7 @@ async function resolveJsonRefs(specUrlOrObject: object | string) {
 }
 
 export async function loadAndResolveSpec(specUrlOrObject: object | string) {
-  const config = new Config({} as ResolvedConfig);
+  const config = await createConfig({});
   const bundleOpts = {
     config,
     base: process.cwd(),
@@ -137,10 +136,13 @@ export async function loadAndResolveSpec(specUrlOrObject: object | string) {
   const {
     bundle: { parsed },
   } = await bundle(bundleOpts);
+  const parsedSpec = parsed as any;
 
   //Pre-processing before resolving JSON refs
-  if (parsed.components) {
-    for (let [component, type] of Object.entries(parsed.components) as any) {
+  if (parsedSpec.components) {
+    for (let [component, type] of Object.entries(
+      parsedSpec.components
+    ) as any) {
       if (component === "schemas") {
         for (let [schemaKey, schemaValue] of Object.entries(type) as any) {
           const title: string | undefined = schemaValue["title"];
@@ -152,7 +154,7 @@ export async function loadAndResolveSpec(specUrlOrObject: object | string) {
     }
   }
 
-  const resolved = await resolveJsonRefs(parsed);
+  const resolved = await resolveJsonRefs(parsedSpec);
 
   // Force serialization and replace circular $ref pointers
   // @ts-ignore