Merge pull request #378 from comigor/feature/no-need-for-fragments-glob

no need for fragments glob
comigor · Mar 28, 2022 · ed08803 · ed08803
2 parents 8577d97 + 90e30bb
commit ed08803
Show file tree

Hide file tree

Showing 6 changed files with 230 additions and 120 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 7.5.0-beta
+
+- there is no need to use `fragments_glob` any more just specify the glob which will include all your graphql docs
+
 ## 7.4.0-beta
 
 - allow using file fragments and common fragments at the same time

diff --git a/lib/generator.dart b/lib/generator.dart
@@ -56,15 +56,31 @@ LibraryDefinition generateLibrary(
 
   schema.accept(canonicalVisitor);
 
-  final queryDefinitions = gqlDocs
+  final documentFragments = gqlDocs
+      .map((doc) => doc.definitions.whereType<FragmentDefinitionNode>())
+      .expand((e) => e)
+      .toList();
+
+  final documentsWithoutFragments = gqlDocs.map((doc) {
+    return DocumentNode(
+      definitions:
+          doc.definitions.where((e) => e is! FragmentDefinitionNode).toList(),
+      span: doc.span,
+    );
+  }).toList();
+
+  final queryDefinitions = documentsWithoutFragments
       .map((doc) => generateDefinitions(
             schema: schema,
             typeDefinitionNodeVisitor: typeDefinitionNodeVisitor,
             path: path,
             document: doc,
             options: options,
             schemaMap: schemaMap,
-            fragmentsCommon: fragmentsCommon,
+            fragmentsCommon: [
+              ...documentFragments,
+              ...fragmentsCommon,
+            ],
             canonicalVisitor: canonicalVisitor,
           ))
       .expand((e) => e)
@@ -110,12 +126,13 @@ Set<FragmentDefinitionNode> _extractFragments(SelectionSetNode? selectionSet,
     selectionSet.selections
         .whereType<FragmentSpreadNode>()
         .forEach((selection) {
-      final fragmentDefinitions = fragmentsCommon.firstWhere(
-          (fragmentDefinition) =>
-              fragmentDefinition.name.value == selection.name.value);
-      result.add(fragmentDefinitions);
-      result.addAll(
-          _extractFragments(fragmentDefinitions.selectionSet, fragmentsCommon));
+      final fragmentDefinitions = fragmentsCommon.where((fragmentDefinition) =>
+          fragmentDefinition.name.value == selection.name.value);
+      result.addAll(fragmentDefinitions);
+      for (var fragmentDefinition in fragmentDefinitions) {
+        result.addAll(_extractFragments(
+            fragmentDefinition.selectionSet, fragmentsCommon));
+      }
     });
   }
   return result;
@@ -133,8 +150,8 @@ Iterable<QueryDefinition> generateDefinitions({
   required List<FragmentDefinitionNode> fragmentsCommon,
   required CanonicalVisitor canonicalVisitor,
 }) {
-  final documentFragments =
-      document.definitions.whereType<FragmentDefinitionNode>();
+  // final documentFragments =
+  //     document.definitions.whereType<FragmentDefinitionNode>();
 
   // if (documentFragments.isNotEmpty && fragmentsCommon.isNotEmpty) {
   //   throw FragmentIgnoreException();
@@ -144,9 +161,9 @@ Iterable<QueryDefinition> generateDefinitions({
       document.definitions.whereType<OperationDefinitionNode>().toList();
 
   return operations.map((operation) {
-    final fragments = <FragmentDefinitionNode>[
-      ...documentFragments,
-    ];
+    // final fragments = <FragmentDefinitionNode>[
+    //   ...documentFragments,
+    // ];
     final definitions = document.definitions
         // filtering unused operations
         .where((e) {
@@ -157,7 +174,7 @@ Iterable<QueryDefinition> generateDefinitions({
       final fragmentsOperation =
           _extractFragments(operation.selectionSet, fragmentsCommon);
       definitions.addAll(fragmentsOperation);
-      fragments.addAll(fragmentsOperation);
+      // fragments.addAll(fragmentsOperation);
     }
 
     final basename = p.basenameWithoutExtension(path).split('.').first;
@@ -218,7 +235,7 @@ Iterable<QueryDefinition> generateDefinitions({
       currentClassName: null,
       generatedClasses: [],
       inputsClasses: [],
-      fragments: fragments,
+      fragments: fragmentsCommon,
       usedEnums: {},
       usedInputObjects: {},
     );

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: artemis
-version: 7.4.0-beta
+version: 7.5.0-beta
 
 description: Build dart types from GraphQL schemas and queries (using Introspection Query).
 homepage: https://github.com/comigor/artemis