@kizunajs/openapi 2.0.0-beta.16 → 2.0.0-beta.18

package/dist/index.cjs

@@ -169,7 +169,7 @@ const deriveHeadOperation = (getOperation) => {
 const openApiWalk = (options, api) => {
 	const paths = {};
 	return {
-		processRoute({ routeKey, route, routeTags, deprecated, hidden }) {
+		processRoute({ routeKey, route, routeGroups, deprecated, hidden }) {
 			if (hidden && options.includeHidden !== true) return;
 			const openApiPath = convertPath(route.path);
 			const method = route.method.toLowerCase();
@@ -180,9 +180,8 @@ const openApiWalk = (options, api) => {
 			};
 			if (options.setOperationId) operation.operationId = options.setOperationId === "concatenated-path" ? routeKey : routeKey.slice(routeKey.lastIndexOf(".") + 1);
 			if (deprecated) operation.deprecated = true;
-			const resolveTagTitle = (key) => options.tagLookup?.get(key)?.title ?? key;
-			const mergedTags = [...new Set([...routeTags, ...route.tags ?? []].map(resolveTagTitle))];
-			if (mergedTags.length > 0) operation.tags = mergedTags;
+			const tags = [...new Set(routeGroups.flatMap((group) => options.groupTags?.get(group) ?? [group]))];
+			if (tags.length > 0) operation.tags = tags;
 			if (route.security && route.security.length > 0) {
 				const emittedSecurity = toOpenApiSecurity(route.security, api);
 				if (emittedSecurity.length > 0) operation.security = emittedSecurity;
@@ -443,19 +442,29 @@ const buildSecuritySchemes = (api) => {
 	}
 	return Object.keys(result).length > 0 ? result : void 0;
 };
-const buildTagLookup = (api) => new Map(Object.entries(api.tags?.tags ?? {}));
 /**
-* Document-level tag definitions from the api's declared tag set, one
-* entry per declared tag, in declaration order, named by its `title`.
+* The tag for each group path: its top-level group's title, since OpenAPI 3.1.0
+* has no nested tags.
+*/
+const buildGroupTags = (api) => {
+	const groups = api.groups?.groups;
+	const tags = /* @__PURE__ */ new Map();
+	if (!groups) return tags;
+	for (const group of groups.values()) tags.set(group.path, [groups.get(group.lineage[0]).title]);
+	return tags;
+};
+/**
+* One tag per top-level group.
 */
 const tagsFromApi = (api) => {
-	const declared = api.tags?.tags;
-	if (!declared) return [];
+	const groups = api.groups?.groups;
+	if (!groups) return [];
 	const tags = [];
-	for (const options of Object.values(declared)) {
-		const entry = { name: options.title };
-		if (options.description) entry.description = options.description;
-		if (options.externalDocs) entry.externalDocs = options.externalDocs;
+	for (const group of groups.values()) {
+		if (group.lineage.length > 1) continue;
+		const entry = { name: group.title };
+		if (group.description) entry.description = group.description;
+		if (group.externalDocs) entry.externalDocs = group.externalDocs;
 		tags.push(entry);
 	}
 	return tags;
@@ -473,7 +482,7 @@ const optionsFromInstalledPlugin = (api) => {
 function renderOpenApi(api, options) {
 	const renderer = (0, kizunajs_generator.walkApi)(api, openApiWalk({
 		...options,
-		tagLookup: buildTagLookup(api)
+		groupTags: buildGroupTags(api)
 	}, api));
 	const tags = tagsFromApi(api);
 	if (tags.length > 0) renderer("json").tags = tags;

package/dist/index.mjs

@@ -168,7 +168,7 @@ const deriveHeadOperation = (getOperation) => {
 const openApiWalk = (options, api) => {
 	const paths = {};
 	return {
-		processRoute({ routeKey, route, routeTags, deprecated, hidden }) {
+		processRoute({ routeKey, route, routeGroups, deprecated, hidden }) {
 			if (hidden && options.includeHidden !== true) return;
 			const openApiPath = convertPath(route.path);
 			const method = route.method.toLowerCase();
@@ -179,9 +179,8 @@ const openApiWalk = (options, api) => {
 			};
 			if (options.setOperationId) operation.operationId = options.setOperationId === "concatenated-path" ? routeKey : routeKey.slice(routeKey.lastIndexOf(".") + 1);
 			if (deprecated) operation.deprecated = true;
-			const resolveTagTitle = (key) => options.tagLookup?.get(key)?.title ?? key;
-			const mergedTags = [...new Set([...routeTags, ...route.tags ?? []].map(resolveTagTitle))];
-			if (mergedTags.length > 0) operation.tags = mergedTags;
+			const tags = [...new Set(routeGroups.flatMap((group) => options.groupTags?.get(group) ?? [group]))];
+			if (tags.length > 0) operation.tags = tags;
 			if (route.security && route.security.length > 0) {
 				const emittedSecurity = toOpenApiSecurity(route.security, api);
 				if (emittedSecurity.length > 0) operation.security = emittedSecurity;
@@ -442,19 +441,29 @@ const buildSecuritySchemes = (api) => {
 	}
 	return Object.keys(result).length > 0 ? result : void 0;
 };
-const buildTagLookup = (api) => new Map(Object.entries(api.tags?.tags ?? {}));
 /**
-* Document-level tag definitions from the api's declared tag set, one
-* entry per declared tag, in declaration order, named by its `title`.
+* The tag for each group path: its top-level group's title, since OpenAPI 3.1.0
+* has no nested tags.
+*/
+const buildGroupTags = (api) => {
+	const groups = api.groups?.groups;
+	const tags = /* @__PURE__ */ new Map();
+	if (!groups) return tags;
+	for (const group of groups.values()) tags.set(group.path, [groups.get(group.lineage[0]).title]);
+	return tags;
+};
+/**
+* One tag per top-level group.
 */
 const tagsFromApi = (api) => {
-	const declared = api.tags?.tags;
-	if (!declared) return [];
+	const groups = api.groups?.groups;
+	if (!groups) return [];
 	const tags = [];
-	for (const options of Object.values(declared)) {
-		const entry = { name: options.title };
-		if (options.description) entry.description = options.description;
-		if (options.externalDocs) entry.externalDocs = options.externalDocs;
+	for (const group of groups.values()) {
+		if (group.lineage.length > 1) continue;
+		const entry = { name: group.title };
+		if (group.description) entry.description = group.description;
+		if (group.externalDocs) entry.externalDocs = group.externalDocs;
 		tags.push(entry);
 	}
 	return tags;
@@ -472,7 +481,7 @@ const optionsFromInstalledPlugin = (api) => {
 function renderOpenApi(api, options) {
 	const renderer = walkApi(api, openApiWalk({
 		...options,
-		tagLookup: buildTagLookup(api)
+		groupTags: buildGroupTags(api)
 	}, api));
 	const tags = tagsFromApi(api);
 	if (tags.length > 0) renderer("json").tags = tags;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kizunajs/openapi",
-  "version": "2.0.0-beta.16",
+  "version": "2.0.0-beta.18",
   "description": "OpenAPI 3.1 generation for Kizuna.js APIs",
   "keywords": [
     "kizunajs",
@@ -59,12 +59,12 @@
     "yaml": "^2.8.4"
   },
   "peerDependencies": {
-    "kizunajs": "2.0.0-beta.16",
+    "kizunajs": "2.0.0-beta.18",
     "zod": "^4.0.0"
   },
   "devDependencies": {
-    "kizunajs": "2.0.0-beta.16",
-    "@kizunajs/express": "2.0.0-beta.16",
+    "kizunajs": "2.0.0-beta.18",
+    "@kizunajs/express": "2.0.0-beta.18",
     "@types/express": "^5.0.0",
     "express": "^5.0.0",
     "tsdown": "^0.21.0",