fix(dart_frog): Request.json and Response.json return dynamic (#411)

Author: felangel

examples/todos/routes/todos/[id].dart

@@ -33,7 +33,9 @@ Future<Response> _get(RequestContext context, Todo todo) async {
 
 Future<Response> _put(RequestContext context, String id, Todo todo) async {
   final dataSource = context.read<TodosDataSource>();
-  final updatedTodo = Todo.fromJson(await context.request.json());
+  final updatedTodo = Todo.fromJson(
+    await context.request.json() as Map<String, dynamic>,
+  );
   final newTodo = await dataSource.update(
     id,
     todo.copyWith(

examples/todos/routes/todos/index.dart

@@ -27,7 +27,9 @@ Future<Response> _get(RequestContext context) async {
 
 Future<Response> _post(RequestContext context) async {
   final dataSource = context.read<TodosDataSource>();
-  final todo = Todo.fromJson(await context.request.json());
+  final todo = Todo.fromJson(
+    await context.request.json() as Map<String, dynamic>,
+  );
 
   return Response.json(
     statusCode: HttpStatus.created,

packages/dart_frog/lib/src/request.dart

@@ -121,10 +121,10 @@ class Request {
   /// The body as a string.
   Future<String> body() => _request.readAsString();
 
-  /// The body as json (`Map<String, dynamic>`).
-  Future<Map<String, dynamic>> json() async {
-    return jsonDecode(await _request.readAsString()) as Map<String, dynamic>;
-  }
+  /// The body as a json object.
+  /// This object could be anything that can be represented by json
+  /// e.g. a map, a list, a string, a number, a bool...
+  Future<dynamic> json() async => jsonDecode(await _request.readAsString());
 
   /// Creates a new [Request] by copying existing values and applying specified
   /// changes.

packages/dart_frog/lib/src/response.dart

@@ -66,7 +66,7 @@ class Response {
   /// The body as a json object.
   /// This object could be anything that can be represented by json
   /// e.g. a map, a list, a string, a number, a bool...
-  Future<Object?> json() async => jsonDecode(await _response.readAsString());
+  Future<dynamic> json() async => jsonDecode(await _response.readAsString());
 
   /// Creates a new [Response] by copying existing values and applying specified
   /// changes.

packages/dart_frog/test/src/request_test.dart

@@ -17,6 +17,11 @@ void main() {
       expect(request.uri, equals(localhost));
     });
 
+    test('has correct body (empty)', () {
+      final request = Request('GET', localhost);
+      expect(request.body(), completion(isEmpty));
+    });
+
     test('has correct body (string)', () {
       const body = '__test_body__';
       final request = Request('GET', localhost, body: body);
@@ -93,5 +98,45 @@ void main() {
         expect(request.method, equals(HttpMethod.put));
       });
     });
+
+    group('bytes', () {
+      test('has correct body', () {
+        final bytes = utf8.encode('hello');
+        final request = Request.get(localhost, body: bytes);
+        expect(request.bytes(), emits(equals(bytes)));
+      });
+    });
+
+    group('json', () {
+      test('has correct body (map)', () {
+        final body = <String, dynamic>{'foo': 'bar'};
+        final request = Request.get(localhost, body: json.encode(body));
+        expect(request.json(), completion(equals(body)));
+      });
+
+      test('has correct body (list)', () {
+        final body = <String>['foo', 'bar'];
+        final request = Request.get(localhost, body: json.encode(body));
+        expect(request.json(), completion(equals(body)));
+      });
+
+      test('has correct body (string)', () {
+        const body = 'foo';
+        final request = Request.get(localhost, body: json.encode(body));
+        expect(request.json(), completion(equals(body)));
+      });
+
+      test('has correct body (number)', () {
+        const body = 42.0;
+        final request = Request.get(localhost, body: json.encode(body));
+        expect(request.json(), completion(equals(body)));
+      });
+
+      test('has correct body (bool)', () {
+        const body = false;
+        final request = Request.get(localhost, body: json.encode(body));
+        expect(request.json(), completion(equals(body)));
+      });
+    });
   });
 }

packages/dart_frog/test/src/response_test.dart

@@ -19,12 +19,17 @@ void main() {
       });
     });
 
-    test('has correct body', () {
+    test('has correct body (string)', () {
       const body = 'test-body';
       final response = Response(body: body);
       expect(response.body(), completion(equals(body)));
     });
 
+    test('has correct body (empty)', () {
+      final response = Response();
+      expect(response.body(), completion(isEmpty));
+    });
+
     test('has correct headers', () {
       const headers = <String, String>{'foo': 'bar'};
       final response = Response(headers: headers);
@@ -91,6 +96,11 @@ void main() {
         final response = Response.json(body: body);
         expect(response.json(), completion(equals(body)));
       });
+
+      test('has correct body (empty)', () {
+        final response = Response.json();
+        expect(response.json(), completion(isEmpty));
+      });
     });
   });
 }