docusaurus-plugin-openapi-docs 0.0.0-1080 → 0.0.0-1082

package/lib/index.js

@@ -234,6 +234,7 @@ custom_edit_url: null
                 schema: schemaPageGenerator,
             };
             loadedApi.map(async (item) => {
+                var _a, _b;
                 if (downloadUrl) {
                     item.downloadUrl = downloadUrl;
                 }
@@ -257,9 +258,14 @@ custom_edit_url: null
                             .toString("base64"));
                     let infoBasePath = `${outputDir}/${item.infoId}`;
                     if (docRouteBasePath) {
-                        infoBasePath = `${docRouteBasePath}/${outputDir
-                            .split(docPath)[1]
-                            .replace(/^\/+/g, "")}/${item.infoId}`.replace(/^\/+/g, "");
+                        // Safely extract path segment, handling cases where docPath may not be in outputDir
+                        const outputSegment = docPath && outputDir.includes(docPath)
+                            ? ((_b = (_a = outputDir.split(docPath)[1]) === null || _a === void 0 ? void 0 : _a.replace(/^\/+/g, "")) !== null && _b !== void 0 ? _b : "")
+                            : outputDir
+                                .slice(outputDir.indexOf("/", 1))
+                                .replace(/^\/+/g, "");
+                        infoBasePath =
+                            `${docRouteBasePath}/${outputSegment}/${item.infoId}`.replace(/^\/+/g, "");
                     }
                     if (item.infoId)
                         item.infoPath = infoBasePath;

package/lib/openapi/createSchemaExample.js

@@ -58,7 +58,14 @@ function sampleFromProp(name, prop, obj, context) {
         return obj;
     }
     // TODO: handle discriminators
-    if (prop.oneOf) {
+    // Check for explicit example/examples first (OAS 3.1 support)
+    if (prop.example !== undefined) {
+        obj[name] = prop.example;
+    }
+    else if (prop.examples !== undefined && prop.examples.length > 0) {
+        obj[name] = prop.examples[0];
+    }
+    else if (prop.oneOf) {
         obj[name] = (0, exports.sampleFromSchema)(prop.oneOf[0], context);
     }
     else if (prop.anyOf) {
@@ -77,10 +84,14 @@ const sampleFromSchema = (schema = {}, context) => {
     try {
         // deep copy schema before processing
         let schemaCopy = JSON.parse(JSON.stringify(schema));
-        let { type, example, allOf, properties, items, oneOf, anyOf, const: constant, } = schemaCopy;
+        let { type, example, examples, allOf, properties, items, oneOf, anyOf, const: constant, } = schemaCopy;
         if (example !== undefined) {
             return example;
         }
+        // OAS 3.1 / JSON Schema: examples is an array
+        if (examples !== undefined && examples.length > 0) {
+            return examples[0];
+        }
         if (oneOf) {
             if (properties) {
                 const combinedSchemas = (0, merge_1.default)(schemaCopy, oneOf[0]);

package/lib/sidebars/index.js

@@ -81,9 +81,18 @@ function groupByTags(items, sidebarOptions, options, tags, docPath) {
     if (sidebarOptions.groupPathsBy !== "tagGroup") {
         apiTags = (0, uniq_1.default)(apiTags.concat(operationTags, schemaTags));
     }
-    const basePath = docPath
-        ? outputDir.split(docPath)[1].replace(/^\/+/g, "")
-        : outputDir.slice(outputDir.indexOf("/", 1)).replace(/^\/+/g, "");
+    // Extract base path from outputDir, handling cases where docPath may not be in outputDir
+    const getBasePathFromOutput = (output, doc) => {
+        var _a, _b;
+        if (doc && output.includes(doc)) {
+            return (_b = (_a = output.split(doc)[1]) === null || _a === void 0 ? void 0 : _a.replace(/^\/+/g, "")) !== null && _b !== void 0 ? _b : "";
+        }
+        const slashIndex = output.indexOf("/", 1);
+        return slashIndex === -1
+            ? ""
+            : output.slice(slashIndex).replace(/^\/+/g, "");
+    };
+    const basePath = getBasePathFromOutput(outputDir, docPath);
     const createDocItemFnContext = {
         sidebarOptions,
         basePath,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "docusaurus-plugin-openapi-docs",
   "description": "OpenAPI plugin for Docusaurus.",
-  "version": "0.0.0-1080",
+  "version": "0.0.0-1082",
   "license": "MIT",
   "keywords": [
     "openapi",
@@ -65,5 +65,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "4ee6a0705e5fd50fc7c80d735ebd5239c5cca770"
+  "gitHead": "7e23eae947f6c077f3a087f2b42368dbbadcb6bb"
 }

package/src/index.ts

@@ -353,9 +353,18 @@ custom_edit_url: null
                 .toString("base64"));
           let infoBasePath = `${outputDir}/${item.infoId}`;
           if (docRouteBasePath) {
-            infoBasePath = `${docRouteBasePath}/${outputDir
-              .split(docPath!)[1]
-              .replace(/^\/+/g, "")}/${item.infoId}`.replace(/^\/+/g, "");
+            // Safely extract path segment, handling cases where docPath may not be in outputDir
+            const outputSegment =
+              docPath && outputDir.includes(docPath)
+                ? (outputDir.split(docPath)[1]?.replace(/^\/+/g, "") ?? "")
+                : outputDir
+                    .slice(outputDir.indexOf("/", 1))
+                    .replace(/^\/+/g, "");
+            infoBasePath =
+              `${docRouteBasePath}/${outputSegment}/${item.infoId}`.replace(
+                /^\/+/g,
+                ""
+              );
           }
           if (item.infoId) item.infoPath = infoBasePath;
         }

package/src/openapi/createSchemaExample.ts

@@ -91,7 +91,12 @@ function sampleFromProp(
 
   // TODO: handle discriminators
 
-  if (prop.oneOf) {
+  // Check for explicit example/examples first (OAS 3.1 support)
+  if (prop.example !== undefined) {
+    obj[name] = prop.example;
+  } else if (prop.examples !== undefined && prop.examples.length > 0) {
+    obj[name] = prop.examples[0];
+  } else if (prop.oneOf) {
     obj[name] = sampleFromSchema(prop.oneOf[0], context);
   } else if (prop.anyOf) {
     obj[name] = sampleFromSchema(prop.anyOf[0], context);
@@ -114,6 +119,7 @@ export const sampleFromSchema = (
     let {
       type,
       example,
+      examples,
       allOf,
       properties,
       items,
@@ -126,6 +132,11 @@ export const sampleFromSchema = (
       return example;
     }
 
+    // OAS 3.1 / JSON Schema: examples is an array
+    if (examples !== undefined && examples.length > 0) {
+      return examples[0];
+    }
+
     if (oneOf) {
       if (properties) {
         const combinedSchemas = merge(schemaCopy, oneOf[0]);

package/src/sidebars/index.ts

@@ -125,9 +125,21 @@ function groupByTags(
     apiTags = uniq(apiTags.concat(operationTags, schemaTags));
   }
 
-  const basePath = docPath
-    ? outputDir.split(docPath!)[1].replace(/^\/+/g, "")
-    : outputDir.slice(outputDir.indexOf("/", 1)).replace(/^\/+/g, "");
+  // Extract base path from outputDir, handling cases where docPath may not be in outputDir
+  const getBasePathFromOutput = (
+    output: string,
+    doc: string | undefined
+  ): string => {
+    if (doc && output.includes(doc)) {
+      return output.split(doc)[1]?.replace(/^\/+/g, "") ?? "";
+    }
+    const slashIndex = output.indexOf("/", 1);
+    return slashIndex === -1
+      ? ""
+      : output.slice(slashIndex).replace(/^\/+/g, "");
+  };
+
+  const basePath = getBasePathFromOutput(outputDir, docPath);
 
   const createDocItemFnContext = {
     sidebarOptions,