graphql 0.17.1 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a357ade4151d40e569c04a9385a6099f2d8d269
-  data.tar.gz: be1830adfe4470c474c8aa73ce608b8848f4a15c
+  metadata.gz: 0f5960d6a384a464a175999b3cdfa5eb4c2860a9
+  data.tar.gz: d7e7aa462056b9782c50fbc9221ee29954eb8e7e
 SHA512:
-  metadata.gz: 049e8a243a2c2aa8c40a090699ab7338560f2cf02abc294fd27bc11a8045a5abd8b650449a0349bfdfbcbead31266a59f325087fd0200677d30397b19447eca1
-  data.tar.gz: d89e78fcf016747bda82b6b64655de27cfa7d0dddf49a65b543b7df6cb775f594b586334bef0cbd2941febbb50cbc56ae60eb0e02d0e009daa58becddb55b536
+  metadata.gz: 034823d8acddd9ddfc5b1058f2d01994266d6334281660d744046115c8f4f1c89767b6deab971817a71bd495c7de8a2c7cf87e16f4a2551952263f3646cd2379
+  data.tar.gz: b652518f8ca33d1eb7cb73e5b6073e99a5a20305b09da661222e7b901c7035739675a7562c268bf880cd0b81dee184a9f66094e6dbf991c1610f097c0d2d2970

data/lib/graphql/internal_representation/node.rb

@@ -3,12 +3,13 @@ require "set"
 module GraphQL
   module InternalRepresentation
     class Node
-      def initialize(ast_node: nil, return_type: nil, name: nil, definition_name: nil, definitions: {}, children: {}, spreads: [], directives: Set.new)
+      def initialize(parent:, ast_node: nil, return_type: nil, name: nil, definition_name: nil, definitions: {}, children: {}, spreads: [], directives: Set.new)
         # Make sure these are kept in sync with #dup
         @ast_node = ast_node
         @return_type = return_type
         @name = name
         @definition_name = definition_name
+        @parent = parent
         @definitions = definitions
         @children = children
         @spreads = spreads
@@ -16,7 +17,7 @@ module GraphQL
       end
 
       # Note: by the time this gets out of the Rewrite phase, this will be empty -- it's emptied out when fragments are merged back in
-      # @return [Array<GraphQL::Language::Nodes::FragmentSpreads>] Fragment names that were spread in this node
+      # @return [Array<GraphQL::InternalRepresentation::Node>] Fragment names that were spread in this node
       attr_reader :spreads
 
       # These are the compiled directives from fragment spreads, inline fragments, and the field itself
@@ -57,6 +58,20 @@ module GraphQL
       # @return [Array<GraphQL::Query::Node>]
       attr_reader :children
 
+      # @return [GraphQL::InternalRepresentation::Node] The node which this node is a child of
+      attr_reader :parent
+
+      # @return [GraphQL::InternalRepresentation::Node] The root node which this node is a (perhaps-distant) child of, or `self` if this is a root node
+      def owner
+        @owner ||= begin
+          if parent.nil?
+            self
+          else
+            parent.owner
+          end
+        end
+      end
+
       def inspect(indent = 0)
         own_indent = " " * indent
         self_inspect = "#{own_indent}<Node #{name} (#{definition_name}: {#{definitions.keys.join("|")}} -> #{return_type})>"

data/lib/graphql/internal_representation/rewrite.rb

@@ -36,6 +36,7 @@ module GraphQL
             return_type: context.type_definition.unwrap,
             ast_node: ast_node,
             name: ast_node.name,
+            parent: nil,
           )
           @nodes.push(node)
           @operations[ast_node.name] = node
@@ -53,6 +54,7 @@ module GraphQL
               ast_node: ast_node,
               name: node_name,
               definition_name: ast_node.name,
+              parent: parent_node,
             )
           end
           object_type = context.parent_type_definition.unwrap
@@ -72,18 +74,21 @@ module GraphQL
               name: ast_node.name,
               definition_name: ast_node.name,
               ast_node: ast_node,
-              definitions: [context.directive_definition]
+              definitions: [context.directive_definition],
+              # This isn't used, the directive may have many parents in the case of inline fragment
+              parent: nil,
             )
           end
         }
 
         visitor[Nodes::FragmentSpread].enter << -> (ast_node, prev_ast_node) {
+          parent_node = @nodes.last
           # Record _both sides_ of the dependency
           spread_node = Node.new(
+            parent: parent_node,
             name: ast_node.name,
             ast_node: ast_node,
           )
-          parent_node = @nodes.last
           # The parent node has a reference to the fragment
           parent_node.spreads.push(spread_node)
           # And keep a reference from the fragment to the parent node
@@ -94,6 +99,7 @@ module GraphQL
 
         visitor[Nodes::FragmentDefinition].enter << -> (ast_node, prev_ast_node) {
           node = Node.new(
+            parent: nil,
             name: ast_node.name,
             return_type: context.type_definition,
             ast_node: ast_node,
@@ -119,7 +125,7 @@ module GraphQL
           # This fragment doesn't depend on any others,
           # we should save it as the starting point for dependency resolution
           frag_node = @nodes.pop
-          if frag_node.spreads.none?
+          if !any_fragment_spreads?(frag_node)
             @independent_fragments << frag_node
           end
         }
@@ -149,9 +155,9 @@ module GraphQL
 
               # resolve the dependency (merge into dependent node)
               deep_merge(dependent_node, fragment_node, rejected_spread_nodes.first.directives)
-
-              if dependent_node.spreads.none? && dependent_node.ast_node.is_a?(Nodes::FragmentDefinition)
-                @independent_fragments.push(dependent_node)
+              owner = dependent_node.owner
+              if owner.ast_node.is_a?(Nodes::FragmentDefinition) && !any_fragment_spreads?(owner)
+                @independent_fragments.push(owner)
               end
             end
           end
@@ -176,6 +182,11 @@ module GraphQL
         end
         child_node.directives.merge(extra_directives)
       end
+
+      # return true if node or _any_ children have a fragment spread
+      def any_fragment_spreads?(node)
+        node.spreads.any? || node.children.any? { |name, node| any_fragment_spreads?(node) }
+      end
     end
   end
 end

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = "0.17.1"
+  VERSION = "0.17.2"
 end

data/spec/graphql/internal_representation/rewrite_spec.rb

@@ -68,10 +68,18 @@ describe GraphQL::InternalRepresentation::Rewrite do
           fatContent
           origin
         }
+
         ... cheeseFields
 
         ... similarCheeseField
       }
+
+      cheese2: cheese(id: 2) {
+        similarCheese(source: COW) {
+          id
+        }
+        ... cheese2Fields
+      }
     }
 
     fragment cheeseFields on Cheese {
@@ -100,6 +108,18 @@ describe GraphQL::InternalRepresentation::Rewrite do
         }
       }
     }
+
+    fragment cheese2InnerFields on Cheese {
+      id
+      fatContent
+    }
+
+    fragment cheese2Fields on Cheese {
+      similarCheese(source: COW) {
+        ... cheese2InnerFields
+      }
+    }
+
     |}
 
     it "puts all fragment members as children" do
@@ -117,6 +137,10 @@ describe GraphQL::InternalRepresentation::Rewrite do
       assert_equal [EdibleInterface], cheese_field.children["origin"].definitions.keys
       assert_equal [CheeseType, EdibleInterface], cheese_field.children["fatContent"].definitions.keys
       assert_equal [CheeseType], cheese_field.children["flavor"].definitions.keys
+
+      # nested spread inside fragment definition:
+      cheese_2_field = op_node.children["cheese2"].children["similarCheese"]
+      assert_equal ["id", "fatContent"], cheese_2_field.children.keys
     end
   end
 end

metadata

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