_

Author: codekeyz

packages/pharaoh/lib/src/_next/_core/reflector.dart

@@ -103,8 +103,10 @@ ControllerMethod parseControllerMethod(ControllerMethodDefinition defn) {
     );
   }
 
+  final returnType = getActualType(actualMethod.reflectedReturnType);
+
   final parameters = actualMethod.parameters;
-  if (parameters.isEmpty) return ControllerMethod(defn);
+  if (parameters.isEmpty) return ControllerMethod(defn, returnType: returnType);
 
   if (parameters.any((e) => e.metadata.length > 1)) {
     throw ArgumentError(
@@ -132,7 +134,17 @@ ControllerMethod parseControllerMethod(ControllerMethodDefinition defn) {
     );
   });
 
-  return ControllerMethod(defn, params);
+  return ControllerMethod(defn, params: params, returnType: returnType);
+}
+
+final _regex = RegExp(r"^(\w+)<(.+)>$");
+Type? getActualType(Type type) {
+  final match = _regex.firstMatch(type.toString());
+  if (match != null) {
+    return q.data[inject]!.types
+        .firstWhereOrNull((type) => type.toString() == match.group(2));
+  }
+  return type;
 }
 
 BaseDTO? _tryResolveDtoInstance(Type type) {

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

@@ -25,6 +25,7 @@ class RouteMapping {
 
 typedef OpenApiRoute = ({
   List<String> tags,
+  Type? returnType,
   HTTPMethod method,
   String route,
   List<ControllerMethodParam> args,
@@ -89,14 +90,19 @@ class _MiddlewareDefinition extends RouteDefinition {
 typedef ControllerMethodDefinition = (Type controller, Symbol symbol);
 
 class ControllerMethod {
+  final Type? returnType;
   final ControllerMethodDefinition method;
   final Iterable<ControllerMethodParam> params;
 
   String get methodName => symbolToString(method.$2);
 
   Type get controller => method.$1;
 
-  ControllerMethod(this.method, [this.params = const []]);
+  ControllerMethod(
+    this.method, {
+    this.params = const [],
+    this.returnType,
+  });
 }
 
 class ControllerMethodParam {
@@ -143,6 +149,7 @@ class ControllerRouteMethodDefinition extends RouteDefinition {
             route: route.path,
             method: e,
             args: method.params.toList(),
+            returnType: method.returnType,
             tags: <String>[if (group != null) group!]
           ))
       .toList();
@@ -244,6 +251,7 @@ class FunctionalRouteDefinition extends RouteDefinition {
   List<OpenApiRoute> get openAPIRoutes => [
         (
           args: [],
+          returnType: Response,
           method: method,
           route: route.path,
           tags: <String>[if (group != null) group!]

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

@@ -6,6 +6,7 @@ import 'dart:io';
 
 import 'package:pharaoh/pharaoh.dart';
 import 'package:reflectable/reflectable.dart' as r;
+import 'package:reflectable/src/reflectable_builder_based.dart' as q;
 import 'package:spanner/spanner.dart';
 import 'package:spookie/spookie.dart' as spookie;
 import 'package:collection/collection.dart';

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

@@ -1,5 +1,5 @@
 import 'package:collection/collection.dart';
-import 'package:pharaoh/src/_next/router.dart';
+import 'package:pharaoh/pharaoh_next.dart';
 
 class OpenApiGenerator {
   static Map<String, dynamic> generateOpenApi(
@@ -38,7 +38,17 @@ class OpenApiGenerator {
         if (parameters.isNotEmpty) "parameters": parameters,
         if (route.tags.isNotEmpty) "tags": route.tags,
         "responses": {
-          "200": {"description": "Successful response"}
+          "200": {
+            "description": "Successful response",
+            if (route.returnType != null && route.returnType != Response)
+              "content": {
+                "application/json": {
+                  "schema": {
+                    "\$ref": "#/components/schemas/${route.returnType}"
+                  },
+                },
+              }
+          }
         }
       };
 
@@ -104,18 +114,31 @@ class OpenApiGenerator {
   }
 
   static Map<String, dynamic> _typeToOpenApiType(Type type) {
-    switch (type.toString()) {
-      case "String":
+    switch (type) {
+      case const (String):
         return {"type": "string"};
-      case "int":
+      case const (int):
         return {"type": "integer", "format": "int32"};
-      case "double":
+      case const (double):
         return {"type": "number", "format": "double"};
-      case "bool":
+      case const (bool):
         return {"type": "boolean"};
-      case "DateTime":
+      case const (DateTime):
         return {"type": "string", "format": "date-time"};
       default:
+        final actualType = getActualType(type);
+        if (actualType == null) return {"type": "object"};
+
+        // final properties = <VariableMirror>[];
+
+        // ClassMirror? clazz = reflectType(actualType);
+        // while (clazz?.superclass != null) {
+        //   properties.addAll(clazz!.variables);
+        //   clazz = clazz.superclass;
+        // }
+
+        // print(properties);
+
         return {"type": "object"};
     }
   }
@@ -124,6 +147,7 @@ class OpenApiGenerator {
     final schemas = <String, dynamic>{};
 
     for (final route in routes) {
+      final returnType = route.returnType;
       for (final arg in route.args) {
         final dto = arg.dto;
         if (dto == null) continue;
@@ -134,6 +158,18 @@ class OpenApiGenerator {
               (preV, curr) => preV..[curr.name] = _typeToOpenApiType(curr.type))
         };
       }
+
+      if (returnType == null || returnType == Response) continue;
+
+      final properties = reflectType(returnType).variables;
+
+      schemas[returnType.toString()] = {
+        "type": "object",
+        "properties": properties.fold(
+            {},
+            (preV, curr) => preV
+              ..[curr.simpleName] = _typeToOpenApiType(curr.reflectedType))
+      };
     }
 
     return schemas;

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

@@ -73,9 +73,13 @@ abstract interface class Route {
     return ControllerRouteMethodDefinition(defn, mapping);
   }
 
-  static RouteGroupDefinition group(String name, List<RouteDefinition> routes,
-          {String? prefix}) =>
-      RouteGroupDefinition._(name, definitions: routes, prefix: prefix);
+  static RouteGroupDefinition group(
+    String name,
+    List<RouteDefinition> routes, {
+    String? prefix,
+  }) {
+    return RouteGroupDefinition._(name, definitions: routes, prefix: prefix);
+  }
 
   static RouteGroupDefinition resource(String resource, Type controller,
       {String? parameterName}) {
@@ -103,6 +107,9 @@ abstract interface class Route {
       Route.route(method, '/*', handler);
 }
 
-Middleware useAliasedMiddleware(String alias) =>
-    ApplicationFactory.resolveMiddlewareForGroup(alias)
-        .reduce((val, e) => val.chain(e));
+@inject
+abstract mixin class ApiResource {
+  const ApiResource();
+
+  Map<String, dynamic> toJson();
+}

packages/pharaoh/test/pharaoh_next/core/application_factory_test.dart

@@ -35,7 +35,7 @@ void main() {
         test('for method with args', () async {
           final showMethod = ControllerMethod(
             (TestHttpController, #show),
-            [ControllerMethodParam('userId', int, meta: query)],
+            params: [ControllerMethodParam('userId', int, meta: query)],
           );
 
           final handler = ApplicationFactory.buildControllerMethod(showMethod);