graphql 0.18.12 → 0.18.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbb584f225769c48d6c7d9878ff6d237068f0c5b
-  data.tar.gz: cf2c4052c0b5facfcf788524bf6a9b3b1b89b167
+  metadata.gz: 4ede8bf16e041625d9150b4a02ca1203e5f77f67
+  data.tar.gz: be963dcb88acc294fd826798a1d1e480d3abb8f1
 SHA512:
-  metadata.gz: 4d09502f2198d2e0cc265db03d49bc80061c999e23471615622793b8d7ef25cea10e7a9fbd4ff48302f01453ae36652cb8c9b6fcca1ceac8c8c17578d3f2beb7
-  data.tar.gz: 81eb4cd1c6d3f00f9770a6929da390caac133266b89bd3c1ad8737ce8fd53a4cd750942db35332c34ba856559c1bfa53f33e82777a8b88b08eec74fda9921e2e
+  metadata.gz: 6e440fc7cc28cf50d1817e5a7bf9d04b3a4e0cb7fc85708f8b7820b1a239305494015e487fbfd3417e24cfe3198ee40507daa709e66267913569f08f7df94a4a
+  data.tar.gz: c3f9943e6016f805f6f2340065ab703c30d96b8130be5369b6095814f6c68b248d4a586dda1a35d9554294ba449698ac18a0e4817b4402a103f69752efe481bc

data/lib/graphql/static_validation/rules/fragments_are_finite.rb

@@ -14,14 +14,25 @@ module GraphQL
       private
 
       def has_nested_spread(fragment_def, parent_fragment_names, context)
-        nested_spreads = fragment_def.selections
-          .select {|f| f.is_a?(GraphQL::Language::Nodes::FragmentSpread)}
+        nested_spreads = get_spreads(fragment_def.selections)
 
         nested_spreads.any? do |spread|
           nested_def = context.fragments[spread.name]
           parent_fragment_names.include?(spread.name) || has_nested_spread(nested_def, parent_fragment_names + [fragment_def.name], context)
         end
       end
+
+      # Find spreads contained in this selection & return them in a flat array
+      def get_spreads(selection)
+        case selection
+        when GraphQL::Language::Nodes::FragmentSpread
+          [selection]
+        when GraphQL::Language::Nodes::Field, GraphQL::Language::Nodes::InlineFragment
+          get_spreads(selection.selections)
+        when Array
+          selection.map { |s| get_spreads(s) }.flatten
+        end
+      end
     end
   end
 end

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = "0.18.12"
+  VERSION = "0.18.13"
 end

data/spec/graphql/static_validation/rules/fragments_are_finite_spec.rb

@@ -6,7 +6,9 @@ describe GraphQL::StaticValidation::FragmentsAreFinite do
       cheese(id: 1) {
         ... idField
         ... sourceField
-        ... flavorField
+        similarCheese {
+          ... flavorField
+        }
       }
     }
 
@@ -17,7 +19,9 @@ describe GraphQL::StaticValidation::FragmentsAreFinite do
     }
     fragment flavorField on Cheese {
       flavor,
-      ... sourceField
+      similarCheese {
+        ... sourceField
+      }
     }
     fragment idField on Cheese {
       id
@@ -32,12 +36,12 @@ describe GraphQL::StaticValidation::FragmentsAreFinite do
     expected = [
       {
         "message"=>"Fragment sourceField contains an infinite loop",
-        "locations"=>[{"line"=>10, "column"=>5}],
+        "locations"=>[{"line"=>12, "column"=>5}],
         "path"=>["fragment sourceField"],
       },
       {
         "message"=>"Fragment flavorField contains an infinite loop",
-        "locations"=>[{"line"=>15, "column"=>5}],
+        "locations"=>[{"line"=>17, "column"=>5}],
         "path"=>["fragment flavorField"],
       }
     ]

data/spec/graphql/static_validation/validator_spec.rb

@@ -39,7 +39,9 @@ describe GraphQL::StaticValidation::Validator do
           }
         }
         fragment cheeseFields on Cheese {
-          id, ... cheeseFields
+          ... on Cheese {
+            id, ... cheeseFields
+          }
         }
       |}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.18.12
+  version: 0.18.13
 platform: ruby
 authors:
 - Robert Mosolgo