Merge pull request #308 from comigor/bugfix/multiple_queries_in_document

bugfix/multiple_queries_in_document

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 7.0.0-beta.11
+
+- document generation fix for https://github.com/comigor/artemis/issues/307
+
 ## 7.0.0-beta.10
 
 - union generation fix for https://github.com/comigor/artemis/issues/284

lib/generator.dart

@@ -127,8 +127,6 @@ Iterable<QueryDefinition> generateDefinitions(
   List<FragmentDefinitionNode> fragmentsCommon,
   CanonicalVisitor canonicalVisitor,
 ) {
-  final fragments = <FragmentDefinitionNode>[];
-
   final documentFragments =
       document.definitions.whereType<FragmentDefinitionNode>();
 
@@ -140,12 +138,19 @@ Iterable<QueryDefinition> generateDefinitions(
       document.definitions.whereType<OperationDefinitionNode>().toList();
 
   return operations.map((operation) {
+    final fragments = <FragmentDefinitionNode>[];
+    final definitions = document.definitions
+        // filtering unused operations
+        .where((e) {
+      return e is! OperationDefinitionNode || e == operation;
+    }).toList();
+
     if (fragmentsCommon.isEmpty) {
       fragments.addAll(documentFragments);
     } else {
       final fragmentsOperation =
           _extractFragments(operation.selectionSet, fragmentsCommon);
-      document.definitions.addAll(fragmentsOperation);
+      definitions.addAll(fragmentsOperation);
       fragments.addAll(fragmentsOperation);
     }
 
@@ -174,14 +179,14 @@ Iterable<QueryDefinition> generateDefinitions(
 
     final rootTypeName =
         (schemaVisitor.schemaDefinitionNode?.operationTypes ?? [])
-                .firstWhereOrNull((e) => e.operation == operation.type)
-                ?.type
-                .name
-                .value ??
+            .firstWhereOrNull((e) => e.operation == operation.type)
+            ?.type
+            .name
+            .value ??
             suffix;
 
     final TypeDefinitionNode parentType =
-        objectVisitor.getByName(rootTypeName)!;
+    objectVisitor.getByName(rootTypeName)!;
 
     final name = QueryName.fromPath(
       path: createPathName([
@@ -208,21 +213,14 @@ Iterable<QueryDefinition> generateDefinitions(
       usedInputObjects: {},
     );
 
-    final visitor = GeneratorVisitor(
-      context: context,
-    );
-
-    DocumentNode(
-      definitions: document.definitions
-          // filtering unused operations
-          .where((e) => e is! OperationDefinitionNode || e == operation)
-          .toList(),
-    ).accept(visitor);
+    final visitor = GeneratorVisitor(context: context);
+    final documentDefinitions = DocumentNode(definitions: definitions);
+    documentDefinitions.accept(visitor);
 
     return QueryDefinition(
       name: name,
       operationName: operationName,
-      document: document,
+      document: documentDefinitions,
       classes: [
         ...canonicalVisitor.enums
             .where((e) => context.usedEnums.contains(e.name)),

pubspec.yaml

@@ -1,5 +1,5 @@
 name: artemis
-version: 7.0.0-beta.10
+version: 7.0.0-beta.11
 
 description: Build dart types from GraphQL schemas and queries (using Introspection Query).
 homepage: https://github.com/comigor/artemis
@@ -22,7 +22,7 @@ dependencies:
   gql_http_link: ^0.4.0-nullsafety.1
   gql_link: ^0.4.0-nullsafety.3
   gql: ^0.13.0-nullsafety.2
-  http: ^0.13.2
+  http: ^0.13.3
   json_annotation: ^4.0.1
   meta: ^1.3.0
   path: ^1.8.0
@@ -32,7 +32,7 @@ dependencies:
 
 dev_dependencies:
   args: ^2.1.0
-  build_runner: ^2.0.1
+  build_runner: ^2.0.2
   build_test: ^2.1.0
   json_serializable: ^4.1.1
   build_resolvers: ^2.0.1