fix(graphql-flutter): replace document string with AST Document

zino-hofmann · Nov 5, 2019 · 23e40af · 23e40af
1 parent edf7df6
commit 23e40af
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 26 deletions.
diff --git a/packages/graphql_flutter/example/lib/fetchmore/main.dart b/packages/graphql_flutter/example/lib/fetchmore/main.dart
@@ -1,12 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:gql/language.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
 
 import '../graphql_operation/queries/readRepositories.dart' as queries;
-
-// to run the example, create a file ../local.dart with the content:
-// const String YOUR_PERSONAL_ACCESS_TOKEN =
-//    '<YOUR_PERSONAL_ACCESS_TOKEN>';
-// ignore: uri_does_not_exist
 import '../local.dart';
 
 class FetchMoreWidgetScreen extends StatelessWidget {
@@ -85,7 +81,7 @@ class _MyHomePageState extends State<MyHomePage> {
             ),
             Query(
               options: QueryOptions(
-                document: queries.searchRepositories,
+                documentNode: parseString(queries.searchRepositories),
                 variables: <String, dynamic>{
                   'nRepositories': nRepositories,
                   'query': _searchQuery,

diff --git a/packages/graphql_flutter/example/lib/graphql_bloc/bloc.dart b/packages/graphql_flutter/example/lib/graphql_bloc/bloc.dart
@@ -1,13 +1,9 @@
-import 'package:rxdart/subjects.dart';
+import 'package:gql/language.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
+import 'package:rxdart/subjects.dart';
 
 import '../graphql_operation/mutations/mutations.dart' as mutations;
 import '../graphql_operation/queries/readRepositories.dart' as queries;
-
-// to run the example, create a file ../local.dart with the content:
-// const String YOUR_PERSONAL_ACCESS_TOKEN =
-//    '<YOUR_PERSONAL_ACCESS_TOKEN>';
-// ignore: uri_does_not_exist
 import '../local.dart';
 
 class Repo {
@@ -75,8 +71,8 @@ class Bloc {
 
   Future<QueryResult> _mutateToggleStar(Repo repo) async {
     final MutationOptions _options = MutationOptions(
-      document:
-          repo.viewerHasStarred ? mutations.removeStar : mutations.addStar,
+      documentNode: parseString(
+          repo.viewerHasStarred ? mutations.removeStar : mutations.addStar),
       variables: <String, String>{
         'starrableId': repo.id,
       },
@@ -97,7 +93,7 @@ class Bloc {
 //      fetchPolicy = FetchPolicy.cacheAndNetwork;
 //    }
     final WatchQueryOptions _options = WatchQueryOptions(
-      document: queries.readRepositories,
+      documentNode: parseString(queries.readRepositories),
       variables: <String, dynamic>{
         'nRepositories': nRepositories,
       },

diff --git a/packages/graphql_flutter/example/lib/graphql_widget/main.dart b/packages/graphql_flutter/example/lib/graphql_widget/main.dart
@@ -1,14 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:gql/language.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
 
 import '../graphql_operation/mutations/mutations.dart' as mutations;
 import '../graphql_operation/queries/readRepositories.dart' as queries;
 import '../helpers.dart' show withGenericHandling;
-
-// to run the example, create a file ../local.dart with the content:
-// const String YOUR_PERSONAL_ACCESS_TOKEN =
-//    '<YOUR_PERSONAL_ACCESS_TOKEN>';
-// ignore: uri_does_not_exist
 import '../local.dart';
 
 const bool ENABLE_WEBSOCKETS = false;
@@ -98,7 +94,7 @@ class _MyHomePageState extends State<MyHomePage> {
             ),
             Query(
               options: QueryOptions(
-                document: queries.readRepositories,
+                documentNode: parseString(queries.readRepositories),
                 variables: <String, dynamic>{
                   'nRepositories': nRepositories,
                 },
@@ -177,7 +173,8 @@ class StarrableRepository extends StatelessWidget {
   Widget build(BuildContext context) {
     return Mutation(
       options: MutationOptions(
-        document: starred ? mutations.removeStar : mutations.addStar,
+        documentNode:
+            parseString(starred ? mutations.removeStar : mutations.addStar),
         update: (Cache cache, QueryResult result) {
           if (result.hasException) {
             print(result.exception);

diff --git a/packages/graphql_flutter/lib/src/widgets/mutation.dart b/packages/graphql_flutter/lib/src/widgets/mutation.dart
@@ -37,6 +37,7 @@ class MutationState extends State<Mutation> {
 
   WatchQueryOptions get _options => WatchQueryOptions(
         document: widget.options.document,
+        documentNode: widget.options.documentNode,
         variables: widget.options.variables,
         fetchPolicy: widget.options.fetchPolicy,
         errorPolicy: widget.options.errorPolicy,

diff --git a/packages/graphql_flutter/lib/src/widgets/query.dart b/packages/graphql_flutter/lib/src/widgets/query.dart
@@ -40,6 +40,7 @@ class QueryState extends State<Query> {
 
     return WatchQueryOptions(
       document: options.document,
+      documentNode: options.documentNode,
       variables: options.variables,
       fetchPolicy: options.fetchPolicy,
       errorPolicy: options.errorPolicy,

diff --git a/packages/graphql_flutter/lib/src/widgets/subscription.dart b/packages/graphql_flutter/lib/src/widgets/subscription.dart
@@ -1,13 +1,12 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:connectivity/connectivity.dart';
 import 'package:flutter/widgets.dart';
-
+import 'package:gql/language.dart';
 import 'package:graphql/client.dart';
 import 'package:graphql/internal.dart';
-
 import 'package:graphql_flutter/src/widgets/graphql_provider.dart';
-import 'package:connectivity/connectivity.dart';
 
 typedef OnSubscriptionCompleted = void Function();
 
@@ -52,7 +51,7 @@ class _SubscriptionState<T> extends State<Subscription<T>> {
     final GraphQLClient client = GraphQLProvider.of(context).value;
     assert(client != null);
     final Operation operation = Operation(
-      document: widget.query,
+      documentNode: parseString(widget.query),
       variables: widget.variables,
       operationName: widget.operationName,
     );