feat(fdc): Fix NativeToJSON

packages/firebase_data_connect/firebase_data_connect/example/dataconnect/connector/queries.gql

@@ -6,6 +6,7 @@ query ListMovies @auth(level: USER) {
     directed_by: people_via_DirectedBy {
       name
     }
+    rating
   }
 }
 

packages/firebase_data_connect/firebase_data_connect/example/integration_test/generation_e2e.dart

@@ -37,14 +37,14 @@ void runGenerationTest() {
           rating: 4.5,
         );
         expect(ref, isNotNull);
-        expect(ref.execute, isNotNull);
+        expect(ref.build().execute, isNotNull);
       });
 
       testWidgets('should have generated correct QueryRef',
           (WidgetTester tester) async {
         final ref = MoviesConnector.instance.listMovies.ref();
         expect(ref, isNotNull);
-        expect(ref.execute, isNotNull);
+        expect(ref.build().execute, isNotNull);
       });
 
       testWidgets('should have generated correct MutationRef using name',
@@ -53,7 +53,7 @@ void runGenerationTest() {
           name: 'Keanu Reeves',
         );
         expect(ref, isNotNull);
-        expect(ref.execute, isNotNull);
+        expect(ref.build().execute, isNotNull);
       });
 
       testWidgets('should have generated correct MutationRef using nested id',
@@ -63,7 +63,7 @@ void runGenerationTest() {
           personId: AddDirectorToMovieVariablesPersonId(id: 'personId'),
         );
         expect(ref, isNotNull);
-        expect(ref.execute, isNotNull);
+        expect(ref.build().execute, isNotNull);
       });
     },
   );

packages/firebase_data_connect/firebase_data_connect/example/integration_test/listen_e2e.dart

@@ -21,7 +21,7 @@ void runListenTests() {
       testWidgets('should be able to listen to the list of movies',
           (WidgetTester tester) async {
         final initialValue =
-            await MoviesConnector.instance.listMovies.ref().execute();
+            await MoviesConnector.instance.listMovies.ref().build().execute();
         expect(initialValue.data.movies.length, 0,
             reason: 'Initial movie list should be empty');
 
@@ -31,6 +31,7 @@ void runListenTests() {
 
         final listener = MoviesConnector.instance.listMovies
             .ref()
+            .build()
             .subscribe()
             .listen((value) {
           final movies = value.data.movies;
@@ -60,9 +61,10 @@ void runListenTests() {
               releaseYear: 1999,
               rating: 4.5,
             )
+            .build()
             .execute();
 
-        await MoviesConnector.instance.listMovies.ref().execute();
+        await MoviesConnector.instance.listMovies.ref().build().execute();
 
         // Wait for the listener to receive the movie update
         final bool hasListenerReceived = await hasBeenListened.future;

packages/firebase_data_connect/firebase_data_connect/example/integration_test/query_e2e.dart

@@ -7,10 +7,14 @@ import 'package:firebase_data_connect_example/generated/movies.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 Future<void> deleteAllMovies() async {
-  final value = await MoviesConnector.instance.listMovies.ref().execute();
+  final value =
+      await MoviesConnector.instance.listMovies.ref().build().execute();
   final result = value.data;
   for (var movie in result.movies) {
-    await MoviesConnector.instance.deleteMovie.ref(id: movie.id).execute();
+    await MoviesConnector.instance.deleteMovie
+        .ref(id: movie.id)
+        .build()
+        .execute();
   }
 }
 
@@ -23,98 +27,112 @@ void runQueryTests() {
       });
 
       testWidgets('can query', (WidgetTester tester) async {
-        final value = await MoviesConnector.instance.listMovies.ref().execute();
+        final value =
+            await MoviesConnector.instance.listMovies.ref().build().execute();
 
         final result = value.data;
         expect(result.movies.length, 0);
       });
 
       testWidgets('can add a movie', (WidgetTester tester) async {
-        MutationRef ref = MoviesConnector.instance.createMovie.ref(
-          genre: 'Action',
-          title: 'The Matrix',
-          releaseYear: 1999,
-          rating: 4.5,
-        );
+        MutationRef ref = MoviesConnector.instance.createMovie
+            .ref(
+              genre: 'Action',
+              title: 'The Matrix',
+              releaseYear: 1999,
+              rating: 4.5,
+            )
+            .build();
 
         await ref.execute();
 
-        final value = await MoviesConnector.instance.listMovies.ref().execute();
+        final value =
+            await MoviesConnector.instance.listMovies.ref().build().execute();
         final result = value.data;
         expect(result.movies.length, 1);
         expect(result.movies[0].title, 'The Matrix');
       });
 
       testWidgets('can add a director to a movie', (WidgetTester tester) async {
-        MutationRef ref = MoviesConnector.instance.addPerson.ref(
-          name: 'Keanu Reeves',
-        );
+        MutationRef ref = MoviesConnector.instance.addPerson
+            .ref(
+              name: 'Keanu Reeves',
+            )
+            .build();
 
         await ref.execute();
 
         final personId =
-            (await MoviesConnector.instance.listPersons.ref().execute())
+            (await MoviesConnector.instance.listPersons.ref().build().execute())
                 .data
                 .people[0]
                 .id;
 
-        final value = await MoviesConnector.instance.listMovies.ref().execute();
+        final value =
+            await MoviesConnector.instance.listMovies.ref().build().execute();
         final result = value.data;
         expect(result.movies.length, 0);
 
-        ref = MoviesConnector.instance.createMovie.ref(
-          genre: 'Action',
-          title: 'The Matrix',
-          releaseYear: 1999,
-          rating: 4.5,
-        );
+        ref = MoviesConnector.instance.createMovie
+            .ref(
+              genre: 'Action',
+              title: 'The Matrix',
+              releaseYear: 1999,
+              rating: 4.5,
+            )
+            .build();
 
         await ref.execute();
 
         final value2 =
-            await MoviesConnector.instance.listMovies.ref().execute();
+            await MoviesConnector.instance.listMovies.ref().build().execute();
         final result2 = value2.data;
         expect(result2.movies.length, 1);
 
         final movieId = result2.movies[0].id;
 
-        ref = MoviesConnector.instance.addDirectorToMovie.ref(
-          movieId: movieId,
-          personId: AddDirectorToMovieVariablesPersonId(id: personId),
-        );
+        ref = MoviesConnector.instance.addDirectorToMovie
+            .ref(
+              movieId: movieId,
+              personId: AddDirectorToMovieVariablesPersonId(id: personId),
+            )
+            .build();
 
         await ref.execute();
 
         final value3 =
-            await MoviesConnector.instance.listMovies.ref().execute();
+            await MoviesConnector.instance.listMovies.ref().build().execute();
         final result3 = value3.data;
         expect(result3.movies.length, 1);
         expect(result3.movies[0].directed_by.length, 1);
         expect(result3.movies[0].directed_by[0].name, 'Keanu Reeves');
       });
 
       testWidgets('can delete a movie', (WidgetTester tester) async {
-        MutationRef ref = MoviesConnector.instance.createMovie.ref(
-          genre: 'Action',
-          title: 'The Matrix',
-          releaseYear: 1999,
-          rating: 4.5,
-        );
+        MutationRef ref = MoviesConnector.instance.createMovie
+            .ref(
+              genre: 'Action',
+              title: 'The Matrix',
+              releaseYear: 1999,
+              rating: 4.5,
+            )
+            .build();
 
         await ref.execute();
 
-        final value = await MoviesConnector.instance.listMovies.ref().execute();
+        final value =
+            await MoviesConnector.instance.listMovies.ref().build().execute();
         final result = value.data;
         expect(result.movies.length, 1);
 
         final movieId = result.movies[0].id;
 
-        ref = MoviesConnector.instance.deleteMovie.ref(id: movieId);
+        ref = MoviesConnector.instance.deleteMovie.ref(id: movieId).build();
 
         await ref.execute();
 
         final value2 =
-            await MoviesConnector.instance.listMovies.ref().execute();
+            await MoviesConnector.instance.listMovies.ref().build().execute();
         final result2 = value2.data;
         expect(result2.movies.length, 0);
       });

packages/firebase_data_connect/firebase_data_connect/example/lib/generated/add_date_and_timestamp.dart

@@ -1,25 +1,44 @@
 part of movies;
 
-class AddDateAndTimestamp {
-  String name = "addDateAndTimestamp";
-  AddDateAndTimestamp({required this.dataConnect});
+class AddDateAndTimestampVariablesBuilder {
+  DateTime date;
+  Timestamp timestamp;
+
+  FirebaseDataConnect dataConnect;
 
+  AddDateAndTimestampVariablesBuilder(
+    this.dataConnect, {
+    required DateTime this.date,
+    required Timestamp this.timestamp,
+  });
   Deserializer<AddDateAndTimestampData> dataDeserializer = (String json) =>
       AddDateAndTimestampData.fromJson(
           jsonDecode(json) as Map<String, dynamic>);
   Serializer<AddDateAndTimestampVariables> varsSerializer =
       (AddDateAndTimestampVariables vars) => jsonEncode(vars.toJson());
-  MutationRef<AddDateAndTimestampData, AddDateAndTimestampVariables> ref({
-    required DateTime date,
-    required Timestamp timestamp,
-  }) {
+  MutationRef<AddDateAndTimestampData, AddDateAndTimestampVariables> build() {
     AddDateAndTimestampVariables vars = AddDateAndTimestampVariables(
       date: date,
       timestamp: timestamp,
     );
 
     return dataConnect.mutation(
-        this.name, dataDeserializer, varsSerializer, vars);
+        "addDateAndTimestamp", dataDeserializer, varsSerializer, vars);
+  }
+}
+
+class AddDateAndTimestamp {
+  String name = "addDateAndTimestamp";
+  AddDateAndTimestamp({required this.dataConnect});
+  AddDateAndTimestampVariablesBuilder ref({
+    required DateTime date,
+    required Timestamp timestamp,
+  }) {
+    return AddDateAndTimestampVariablesBuilder(
+      dataConnect,
+      date: date,
+      timestamp: timestamp,
+    );
   }
 
   FirebaseDataConnect dataConnect;
@@ -28,6 +47,7 @@ class AddDateAndTimestamp {
 class AddDateAndTimestampTimestampHolderInsert {
   String id;
 
+  // TODO(mtewani): Check what happens when an optional field is retrieved from json.
   AddDateAndTimestampTimestampHolderInsert.fromJson(Map<String, dynamic> json)
       : id = nativeFromJson<String>(json['id']) {}
 
@@ -41,14 +61,13 @@ class AddDateAndTimestampTimestampHolderInsert {
 
   AddDateAndTimestampTimestampHolderInsert({
     required this.id,
-  }) {
-    // TODO: Only show this if there are optional fields.
-  }
+  });
 }
 
 class AddDateAndTimestampData {
   AddDateAndTimestampTimestampHolderInsert timestampHolder_insert;
 
+  // TODO(mtewani): Check what happens when an optional field is retrieved from json.
   AddDateAndTimestampData.fromJson(Map<String, dynamic> json)
       : timestampHolder_insert =
             AddDateAndTimestampTimestampHolderInsert.fromJson(
@@ -64,16 +83,15 @@ class AddDateAndTimestampData {
 
   AddDateAndTimestampData({
     required this.timestampHolder_insert,
-  }) {
-    // TODO: Only show this if there are optional fields.
-  }
+  });
 }
 
 class AddDateAndTimestampVariables {
   DateTime date;
 
   Timestamp timestamp;
 
+  // TODO(mtewani): Check what happens when an optional field is retrieved from json.
   AddDateAndTimestampVariables.fromJson(Map<String, dynamic> json)
       : date = nativeFromJson<DateTime>(json['date']),
         timestamp = Timestamp.fromJson(json['timestamp']) {}
@@ -91,7 +109,5 @@ class AddDateAndTimestampVariables {
   AddDateAndTimestampVariables({
     required this.date,
     required this.timestamp,
-  }) {
-    // TODO: Only show this if there are optional fields.
-  }
+  });
 }