feat(ferry_generator): generate varsToJson() method

gql-dart · Nov 10, 2023 · 598ddec · 598ddec
1 parent fbd0b3f
commit 598ddec
Show file tree

Hide file tree

Showing 34 changed files with 235 additions and 7 deletions.
diff --git a/packages/ferry_exec/lib/src/json_operation_request.dart b/packages/ferry_exec/lib/src/json_operation_request.dart
@@ -5,7 +5,8 @@ import 'package:gql_exec/gql_exec.dart';
 /// A [OperationRequest] that parses the response into a [Map<String, dynamic>]
 /// this is useful for when you don't have a generated class for the operation
 /// or as an escape hatch for when you want to parse the response yourself.
-class JsonOperationRequest implements OperationRequest<Map<String, dynamic>, Map<String, dynamic>> {
+class JsonOperationRequest
+    implements OperationRequest<Map<String, dynamic>, Map<String, dynamic>> {
   @override
   final FetchPolicy fetchPolicy;
 
@@ -25,7 +26,8 @@ class JsonOperationRequest implements OperationRequest<Map<String, dynamic>, Map
   final Map<String, dynamic> vars;
 
   @override
-  final Map<String, dynamic>? Function(Map<String, dynamic>?, Map<String, dynamic>?)? updateResult;
+  final Map<String, dynamic>? Function(
+      Map<String, dynamic>?, Map<String, dynamic>?)? updateResult;
 
   @override
   final Operation operation;
@@ -62,8 +64,10 @@ class JsonOperationRequest implements OperationRequest<Map<String, dynamic>, Map
         o.fetchPolicy == fetchPolicy &&
         o.requestId == requestId &&
         o.updateCacheHandlerKey == updateCacheHandlerKey &&
-        o.updateCacheHandlerContext == updateCacheHandlerContext &&
-        o.executeOnListen == executeOnListen &&
+        const DeepCollectionEquality().equals(
+                    updateCacheHandlerContext, o.updateCacheHandlerContext) &
+                o.executeOnListen ==
+            executeOnListen &&
         const DeepCollectionEquality().equals(vars, o.vars) &&
         o.updateResult == updateResult &&
         o.optimisticResponse == optimisticResponse;
@@ -75,7 +79,7 @@ class JsonOperationRequest implements OperationRequest<Map<String, dynamic>, Map
         fetchPolicy.hashCode ^
         requestId.hashCode ^
         updateCacheHandlerKey.hashCode ^
-        updateCacheHandlerContext.hashCode ^
+        const DeepCollectionEquality().hash(updateCacheHandlerContext) ^
         executeOnListen.hashCode ^
         const DeepCollectionEquality().hash(vars) ^
         updateResult.hashCode ^

diff --git a/packages/ferry_generator/lib/src/codegen/fragment_req.dart b/packages/ferry_generator/lib/src/codegen/fragment_req.dart
@@ -80,7 +80,6 @@ Class _buildFragmentReqClass(
         (b) => b
           ..annotations.add(refer('override'))
           ..returns = refer('Map<String, dynamic>')
-          ..type = MethodType.getter
           ..name = 'varsToJson'
           ..lambda = true
           ..body = refer('vars').property('toJson').call([]).code,

diff --git a/packages/ferry_generator/lib/src/codegen/operation_req.dart b/packages/ferry_generator/lib/src/codegen/operation_req.dart
@@ -163,7 +163,6 @@ Class _buildOperationReqClass(
         (b) => b
           ..annotations.add(refer('override'))
           ..returns = refer('Map<String, dynamic>')
-          ..type = MethodType.getter
           ..name = 'varsToJson'
           ..lambda = true
           ..body = (refer('vars').property('toJson').call([])).code,

diff --git a/packages/ferry_test_graphql2/lib/fragments/__generated__/review_fragment.data.gql.dart b/packages/ferry_test_graphql2/lib/fragments/__generated__/review_fragment.data.gql.dart
diff --git a/packages/ferry_test_graphql2/lib/fragments/__generated__/review_fragment.req.gql.dart b/packages/ferry_test_graphql2/lib/fragments/__generated__/review_fragment.req.gql.dart
diff --git a/packages/ferry_test_graphql2/lib/fragments/__generated__/review_fragment.var.gql.dart b/packages/ferry_test_graphql2/lib/fragments/__generated__/review_fragment.var.gql.dart
diff --git a/packages/ferry_test_graphql2/lib/mutations/__generated__/create_review.data.gql.dart b/packages/ferry_test_graphql2/lib/mutations/__generated__/create_review.data.gql.dart
diff --git a/packages/ferry_test_graphql2/lib/mutations/__generated__/create_review.req.gql.dart b/packages/ferry_test_graphql2/lib/mutations/__generated__/create_review.req.gql.dart
diff --git a/packages/ferry_test_graphql2/lib/mutations/__generated__/create_review.var.gql.dart b/packages/ferry_test_graphql2/lib/mutations/__generated__/create_review.var.gql.dart
diff --git a/...ges/ferry_test_graphql2/lib/mutations/__generated__/review_with_date_scalar.data.gql.dart b/...ges/ferry_test_graphql2/lib/mutations/__generated__/review_with_date_scalar.data.gql.dart
diff --git a/...ages/ferry_test_graphql2/lib/mutations/__generated__/review_with_date_scalar.req.gql.dart b/...ages/ferry_test_graphql2/lib/mutations/__generated__/review_with_date_scalar.req.gql.dart
diff --git a/...ages/ferry_test_graphql2/lib/mutations/__generated__/review_with_date_scalar.var.gql.dart b/...ages/ferry_test_graphql2/lib/mutations/__generated__/review_with_date_scalar.var.gql.dart
diff --git a/packages/ferry_test_graphql2/lib/queries/__generated__/aliased_hero.data.gql.dart b/packages/ferry_test_graphql2/lib/queries/__generated__/aliased_hero.data.gql.dart
diff --git a/packages/ferry_test_graphql2/lib/queries/__generated__/aliased_hero.req.gql.dart b/packages/ferry_test_graphql2/lib/queries/__generated__/aliased_hero.req.gql.dart