_

Author: codekeyz

packages/pharaoh/lib/src/_next/_router/definition.dart

@@ -24,6 +24,7 @@ class RouteMapping {
 }
 
 typedef OpenApiRoute = ({
+  List<String> tags,
   HTTPMethod method,
   String route,
   List<ControllerMethodParam> args,
@@ -33,6 +34,8 @@ abstract class RouteDefinition {
   late RouteMapping route;
   final RouteDefinitionType type;
 
+  String? group;
+
   RouteDefinition(this.type);
 
   void commit(Spanner spanner);
@@ -61,7 +64,8 @@ class UseAliasedMiddleware {
 
   RouteGroupDefinition routes(List<RouteDefinition> routes) {
     return RouteGroupDefinition._(
-      BASE_PATH,
+      alias,
+      prefix: BASE_PATH,
       definitions: routes,
     )..middleware(mdw);
   }
@@ -135,7 +139,12 @@ class ControllerRouteMethodDefinition extends RouteDefinition {
 
   @override
   List<OpenApiRoute> get openAPIRoutes => route.methods
-      .map((e) => (route: route.path, method: e, args: method.params.toList()))
+      .map((e) => (
+            route: route.path,
+            method: e,
+            args: method.params.toList(),
+            tags: <String>[if (group != null) group!]
+          ))
       .toList();
 }
 
@@ -162,12 +171,12 @@ class RouteGroupDefinition extends RouteDefinition {
   void _unwrapRoutes(Iterable<RouteDefinition> routes) {
     for (final subRoute in routes) {
       if (subRoute is! RouteGroupDefinition) {
-        defns.add(subRoute._prefix(route.path));
+        defns.add(subRoute._prefix(route.path)..group = name);
         continue;
       }
 
       for (var e in subRoute.defns) {
-        defns.add(e._prefix(route.path));
+        defns.add(e._prefix(route.path)..group = subRoute.name);
       }
     }
   }
@@ -232,6 +241,12 @@ class FunctionalRouteDefinition extends RouteDefinition {
   }
 
   @override
-  List<OpenApiRoute> get openAPIRoutes =>
-      [(args: [], method: method, route: route.path)];
+  List<OpenApiRoute> get openAPIRoutes => [
+        (
+          args: [],
+          method: method,
+          route: route.path,
+          tags: <String>[if (group != null) group!]
+        )
+      ];
 }

packages/pharaoh/lib/src/_next/openapi.dart

@@ -21,25 +21,29 @@ class OpenApiGenerator {
 
     for (final route in routes) {
       final pathParams = route.args.where((e) => e.meta is Param).toList();
-      final bodyParam = route.args.firstWhereOrNull((e) => e is Body);
+      final bodyParam = route.args.firstWhereOrNull((e) => e.meta is Body);
+      final parameters = _generateParameters(route.args);
+      final routeMethod = route.method.name.toLowerCase();
 
       var path = route.route;
+
       // Convert Express-style path params (:id) to OpenAPI style ({id})
       for (final param in pathParams) {
         path = path.replaceAll('<${param.name}>', '{${param.name}}');
       }
 
       paths[path] = paths[path] ?? {};
-      paths[path]![route.method.name.toLowerCase()] = {
-        "summary": "", // Could be added as a parameter
-        "parameters": _generateParameters(route.args),
+      paths[path]![routeMethod] = {
+        "summary": "",
+        if (parameters.isNotEmpty) "parameters": parameters,
+        if (route.tags.isNotEmpty) "tags": route.tags,
         "responses": {
           "200": {"description": "Successful response"}
         }
       };
 
       if (bodyParam != null) {
-        paths[path]![route.method.name.toLowerCase()]["requestBody"] = {
+        paths[path]![routeMethod]["requestBody"] = {
           "required": !bodyParam.optional,
           "content": {
             "application/json": {"schema": _generateSchema(bodyParam)}