fix: json serializable

xsoulspace · May 19, 2021 · efda93f · efda93f
1 parent e693f21
commit efda93f
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 45 deletions.
diff --git a/dart_packages/cactus_sync_client/lib/src/abstract/cactus_model.dart b/dart_packages/cactus_sync_client/lib/src/abstract/cactus_model.dart
@@ -5,6 +5,7 @@ import '../graphql/graphql_result.dart';
 import '../utils/utils.dart';
 import 'cactus_sync.dart';
 import 'graphql_runner.dart';
+import 'recorded_model.dart';
 
 /// [stringQueryGql] is a gql which replaces the whole gql
 /// TODO: add an example
@@ -24,7 +25,6 @@ typedef CactusModelBuilder<
         TUpdateResult,
         TDeleteInput extends JsonSerializable,
         TDeleteResult,
-        TGetInput extends JsonSerializable,
         TGetResult,
         TFindInput extends JsonSerializable,
         TFindResult>
@@ -36,7 +36,6 @@ typedef CactusModelBuilder<
             TUpdateResult,
             TDeleteInput,
             TDeleteResult,
-            TGetInput,
             TGetResult,
             TFindInput,
             TFindResult>
@@ -50,7 +49,6 @@ abstract class AbstractCactusModel<
     TUpdateResult,
     TRemoveInput,
     TRemoveResult,
-    TGetInput,
     TGetResult,
     TFindInput,
     TFindResult> {
@@ -70,7 +68,7 @@ abstract class AbstractCactusModel<
     bool notifyListeners = true,
   });
   Future<GraphqlResult<TGetResult>> get({
-    required TGetInput variableValues,
+    required RecordedModel variableValues,
     QueryGql? queryGql,
     bool notifyListeners = true,
   });
@@ -89,7 +87,6 @@ class CactusModel<
         TUpdateResult,
         TRemoveInput extends JsonSerializable,
         TRemoveResult,
-        TGetInput extends JsonSerializable,
         TGetResult,
         TFindInput extends JsonSerializable,
         TFindResult>
@@ -101,7 +98,6 @@ class CactusModel<
             TUpdateResult,
             TRemoveInput,
             TRemoveResult,
-            TGetInput,
             TGetResult,
             TFindInput,
             TFindResult> {
@@ -142,7 +138,6 @@ class CactusModel<
       TUpdateResult,
       TDeleteInput,
       TDeleteResult,
-      TGetInput,
       TGetResult,
       TFindInput,
       TFindResult> init<
@@ -153,7 +148,6 @@ class CactusModel<
           TUpdateResult,
           TDeleteInput extends JsonSerializable,
           TDeleteResult,
-          TGetInput extends JsonSerializable,
           TGetResult,
           TFindInput extends JsonSerializable,
           TFindResult>({
@@ -302,10 +296,10 @@ class CactusModel<
   }
 
   @override
-  create({
-    required variableValues,
-    queryGql,
-    notifyListeners = true,
+  Future<GraphqlResult<TCreateResult>> create({
+    required TCreateInput variableValues,
+    QueryGql? queryGql,
+    bool notifyListeners = true,
   }) async {
     CactusSync.l.info('create');
     return _executeMiddleware(
@@ -317,10 +311,10 @@ class CactusModel<
   }
 
   @override
-  update({
-    required variableValues,
-    queryGql,
-    notifyListeners = true,
+  Future<GraphqlResult<TUpdateResult>> update({
+    required TUpdateInput variableValues,
+    QueryGql? queryGql,
+    bool notifyListeners = true,
   }) async {
     CactusSync.l.info('update');
     return _executeMiddleware(
@@ -332,10 +326,10 @@ class CactusModel<
   }
 
   @override
-  remove({
-    required variableValues,
-    queryGql,
-    notifyListeners = true,
+  Future<GraphqlResult<TRemoveResult>> remove({
+    required TRemoveInput variableValues,
+    QueryGql? queryGql,
+    bool notifyListeners = true,
   }) async {
     CactusSync.l.info('remove');
     return _executeMiddleware(
@@ -347,10 +341,10 @@ class CactusModel<
   }
 
   @override
-  find({
-    required variableValues,
-    queryGql,
-    notifyListeners = true,
+  Future<GraphqlResult<TFindResult>> find({
+    required TFindInput variableValues,
+    QueryGql? queryGql,
+    bool notifyListeners = true,
   }) async {
     CactusSync.l.info('find');
     return _executeMiddleware(
@@ -362,10 +356,10 @@ class CactusModel<
   }
 
   @override
-  get({
-    required variableValues,
-    queryGql,
-    notifyListeners = true,
+  Future<GraphqlResult<TGetResult>> get({
+    required RecordedModel variableValues,
+    QueryGql? queryGql,
+    bool notifyListeners = true,
   }) async {
     CactusSync.l.info('get');
     return _executeMiddleware(

diff --git a/dart_packages/cactus_sync_client/lib/src/abstract/cactus_model_state.dart b/dart_packages/cactus_sync_client/lib/src/abstract/cactus_model_state.dart
@@ -5,6 +5,7 @@ import '../graphql/graphql_result.dart';
 import 'cactus_model.dart';
 import 'cactus_sync.dart';
 import 'graphback_result_list.dart';
+import 'recorded_model.dart';
 
 enum StateModelEvents { addUpdateStateModel, removeStateModel }
 
@@ -31,7 +32,6 @@ class CactusModelState<
         TUpdateResult,
         TDeleteInput extends JsonSerializable,
         TDeleteResult,
-        TGetInput extends JsonSerializable,
         TGetResult,
         TFindInput extends JsonSerializable,
         TFindResult> extends StateNotifier<Set<TModel?>>
@@ -43,7 +43,6 @@ class CactusModelState<
             TUpdateResult,
             TDeleteInput,
             TDeleteResult,
-            TGetInput,
             TGetResult,
             TFindInput,
             TFindResult> {
@@ -78,7 +77,6 @@ class CactusModelState<
       TUpdateResult,
       TDeleteInput,
       TDeleteResult,
-      TGetInput,
       TGetResult,
       TFindInput,
       TFindResult> cactusModel;
@@ -236,7 +234,7 @@ class CactusModelState<
 
   @override
   Future<GraphqlResult<TGetResult>> get({
-    required TGetInput variableValues,
+    required RecordedModel variableValues,
     QueryGql? queryGql,
     bool notifyListeners = true,
   }) async {

diff --git a/dart_packages/cactus_sync_client/lib/src/abstract/cactus_sync.dart b/dart_packages/cactus_sync_client/lib/src/abstract/cactus_sync.dart
@@ -36,7 +36,6 @@ class CactusSync {
       TUpdateResult,
       TDeleteInput,
       TDeleteResult,
-      TGetInput,
       TGetResult,
       TFindInput,
       TFindResult> attachModel<
@@ -47,7 +46,6 @@ class CactusSync {
           TUpdateResult,
           TDeleteInput extends JsonSerializable,
           TDeleteResult,
-          TGetInput extends JsonSerializable,
           TGetResult,
           TFindInput extends JsonSerializable,
           TFindResult>(
@@ -59,7 +57,6 @@ class CactusSync {
               TUpdateResult,
               TDeleteInput,
               TDeleteResult,
-              TGetInput,
               TGetResult,
               TFindInput,
               TFindResult>

diff --git a/dart_packages/cactus_sync_client/lib/src/abstract/recorded_model.dart b/dart_packages/cactus_sync_client/lib/src/abstract/recorded_model.dart
@@ -1,8 +1,12 @@
+import 'package:graphql/client.dart';
+
 /// Simple class with only one property - ID
-class RecordedModel {
+
+class RecordedModel extends JsonSerializable {
   final String id;
-  const RecordedModel({
+  RecordedModel({
     required this.id,
   });
+  @override
   Map<String, dynamic> toJson() => {'id': id};
 }
diff --git a/dart_packages/cactus_sync_client_gen/lib/src/gql_model_builder.dart b/dart_packages/cactus_sync_client_gen/lib/src/gql_model_builder.dart
@@ -187,7 +187,7 @@ class GqlModelBuilder extends GqlObjectTypeDefinition {
           (json){
             final verifiedJson = ArgumentError.checkNotNull(json,'json');
             return ${jsonSerializableName ?? properModelType}.fromJson(
-              verifiedJson["$operationName${isPlural ? pluralModelName : properModelType}"],
+              verifiedJson["$operationName${isPlural ? pluralModelName : properModelType}"] as Map<String, dynamic>,
             );
           }"""
           .unindent();
@@ -202,7 +202,6 @@ class GqlModelBuilder extends GqlObjectTypeDefinition {
     final mutationDeleteArgs = 'Mutate${properModelType}Input';
     final mutationDeleteCallback = getCallbackStr(operationName: 'delete');
 
-    const queryGetArgs = 'RecordedModel';
     final queryGetCallback = getCallbackStr(operationName: 'get');
 
     final queryFindArgs = '${properModelType}Filter';
@@ -226,7 +225,6 @@ class GqlModelBuilder extends GqlObjectTypeDefinition {
               $properModelType,
               $mutationDeleteArgs,
               $properModelType,
-              $queryGetArgs,
               $properModelType,
               $queryFindArgs,
               $queryFindResult
@@ -241,7 +239,6 @@ class GqlModelBuilder extends GqlObjectTypeDefinition {
               $properModelType,
               $mutationDeleteArgs,
               $properModelType,
-              $queryGetArgs,
               $properModelType,
               $queryFindArgs,
               $queryFindResult
@@ -263,7 +260,6 @@ class GqlModelBuilder extends GqlObjectTypeDefinition {
             $properModelType,
             $mutationDeleteArgs,
             $properModelType,
-            $queryGetArgs,
             $properModelType,
             $queryFindArgs,
             $queryFindResult
@@ -276,7 +272,6 @@ class GqlModelBuilder extends GqlObjectTypeDefinition {
               $properModelType,
               $mutationDeleteArgs,
               $properModelType,
-              $queryGetArgs,
               $properModelType,
               $queryFindArgs,
               $queryFindResult

diff --git a/dart_packages/cactus_sync_client_gen/lib/src/gql_object_type_definition.dart b/dart_packages/cactus_sync_client_gen/lib/src/gql_object_type_definition.dart
@@ -111,8 +111,8 @@ class GqlObjectTypeDefinition {
             );
           } else {
             b.extend = refer(
-              'JsonSerializable',
-              UsedDirectives.jsonAnnotation,
+              'graphql.JsonSerializable',
+              UsedDirectives.graphqlClient,
             );
           }
 

diff --git a/dart_packages/cactus_sync_client_gen/lib/src/model_builder.dart b/dart_packages/cactus_sync_client_gen/lib/src/model_builder.dart
@@ -64,6 +64,7 @@ class ModelBuilder implements Builder {
         /// Updated: ${DateTime.now()}
         /// !---------- END CAUTION ----------!
         
+        import 'package:graphql/client.dart' as graphql;
         $directivesStr
       """
           .unindent(),

diff --git a/dart_packages/cactus_sync_client_gen/lib/src/used_directives.dart b/dart_packages/cactus_sync_client_gen/lib/src/used_directives.dart
@@ -4,6 +4,7 @@ class UsedDirectives {
   static const jsonAnnotation = 'package:json_annotation/json_annotation.dart';
   static const equatable = 'package:equatable/equatable.dart';
   static const builtValue = 'package:built_value/built_value.dart';
+  static const graphqlClient = 'package:graphql/client.dart';
 }
 
 final usedDirectives = [