fumadocs-openapi 11.3.4 → 11.3.5

package/dist/utils/document/load.js

@@ -6,9 +6,7 @@ import { bundle } from "@fumadocs/api-docs/schema/bundle";
 */
 async function loadDocument(input) {
 	try {
-		let bundled = await bundle(input);
-		bundled = upgrade(bundled, "3.2");
-		return { bundled };
+		return { bundled: await bundle(input, { transform: (document) => typeof document === "object" && document !== null ? upgrade(document, "3.2") : document }) };
 	} catch (e) {
 		throw new Error(`[OpenAPI] Failed to resolve input: ${input}`, { cause: e });
 	}

package/dist/utils/pages/preset-auto.js

@@ -1,3 +1,4 @@
+import { getTagDisplayName } from "../schema.js";
 import * as path$1 from "node:path";
 import { dereferenceShallow } from "@fumadocs/api-docs/schema/dereference";
 //#region src/utils/pages/preset-auto.ts
@@ -31,6 +32,36 @@ function createAutoPreset(options) {
 		const rest = [];
 		const doc = builder.document;
 		const { groupBy = "none" } = options;
+		const docTags = /* @__PURE__ */ new Map();
+		if (groupBy === "tag") {
+			for (const tag of doc.tags ?? []) if (tag.name) docTags.set(tag.name, tag);
+		}
+		const tagGroups = /* @__PURE__ */ new Map();
+		let warnedUntagged = false;
+		function tagGroup(name, seen) {
+			let group = tagGroups.get(name);
+			if (group) return group;
+			const tag = docTags.get(name);
+			let parent;
+			if (tag?.parent) {
+				(seen ??= /* @__PURE__ */ new Set()).add(name);
+				if (!seen.has(tag.parent)) parent = tagGroup(tag.parent, seen);
+			}
+			group = {
+				type: "group",
+				info: {
+					title: getTagDisplayName(tag ?? { name }),
+					description: tag?.description
+				},
+				tag,
+				entries: [],
+				schemaId: builder.id,
+				path: path$1.join(parent?.path ?? "", slugify(name))
+			};
+			tagGroups.set(name, group);
+			(parent ? parent.entries : rest).push(group);
+			return group;
+		}
 		for (const entry of entries) switch (groupBy) {
 			case "route": {
 				const groupName = builder.routePathToFilePath(entry.type === "operation" ? entry.item.path : entry.item.name);
@@ -52,33 +83,25 @@ function createAutoPreset(options) {
 				break;
 			}
 			case "tag": {
-				let tags = entry.type === "operation" ? dereferenceShallow(doc.paths?.[entry.item.path])?.[entry.item.method]?.tags : dereferenceShallow(doc.webhooks?.[entry.item.name])?.[entry.item.method]?.tags;
-				if (!tags || tags.length === 0) {
-					console.warn("When `groupBy` is set to `tag`, make sure a `tags` is defined for every operation schema.");
-					tags = ["unknown"];
+				const operation = entry.type === "operation" ? dereferenceShallow(doc.paths?.[entry.item.path])?.[entry.item.method] : dereferenceShallow(doc.webhooks?.[entry.item.name])?.[entry.item.method];
+				const tags = [];
+				for (const name of operation?.tags ?? []) {
+					const kind = docTags.get(name)?.kind;
+					if (!kind || kind === "nav") tags.push(name);
 				}
-				for (const tag of tags) {
-					const res = builder.fromTagName(tag);
-					if (!res) continue;
-					const groupName = slugify(tag);
-					let group = groups.get(groupName);
-					if (!group) {
-						group = {
-							type: "group",
-							info: {
-								title: res.displayName,
-								description: res.info.description
-							},
-							tag: res.info,
-							entries: [],
-							schemaId: builder.id,
-							path: groupName
-						};
-						groups.set(groupName, group);
+				if (tags.length === 0) {
+					if (!warnedUntagged) {
+						warnedUntagged = true;
+						console.warn("[Fumadocs OpenAPI] found operations without tags, they will be grouped under \"unknown\".");
 					}
+					tags.push("unknown");
+				}
+				const fileName = `${nameFn.call(builder, entry)}.mdx`;
+				for (const name of tags) {
+					const group = tagGroup(name);
 					group.entries.push({
 						...entry,
-						path: path$1.join(groupName, `${nameFn.call(builder, entry)}.mdx`)
+						path: path$1.join(group.path, fileName)
 					});
 				}
 				break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fumadocs-openapi",
-  "version": "11.3.4",
+  "version": "11.3.5",
   "description": "Generate MDX docs for your OpenAPI spec",
   "keywords": [
     "Docs",
@@ -56,8 +56,8 @@
     "remark-rehype": "^11.1.2",
     "shiki": "^4.4.3",
     "yaml": "^2.9.0",
-    "@fumari/stf": "1.1.0",
-    "@fumadocs/api-docs": "0.2.5"
+    "@fumadocs/api-docs": "0.2.6",
+    "@fumari/stf": "1.1.0"
   },
   "devDependencies": {
     "@scalar/api-client-react": "^2.0.42",
@@ -69,8 +69,8 @@
     "json-schema-typed": "^8.0.2",
     "tsdown": "0.22.14",
     "xml-js": "^1.6.11",
-    "fumadocs-core": "16.15.2",
-    "fumadocs-ui": "npm:@fumadocs/base-ui@16.15.2",
+    "fumadocs-ui": "npm:@fumadocs/base-ui@16.15.4",
+    "fumadocs-core": "16.15.4",
     "tsconfig": "0.0.0"
   },
   "peerDependencies": {