graphql-client 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb27216cecd8b82430beda5f04f9eb8883be29ba245c0b7db606f835ede4a044
-  data.tar.gz: 782d1321f053407d369e1a119feebf9799612b4103395c2ff72a17bb7680a6c2
+  metadata.gz: 342aa95830be1c53716c72962fad3c3785058f160404fba1aa603f9b94a96f92
+  data.tar.gz: c63ff270ab64ad1ee8a8ece5a36d20be9b12e138e86cc0a4eb88246bf2d4c2bb
 SHA512:
-  metadata.gz: 251c12981e0af0c0b4c10261880b9c6f01aea92c2ccdd35a35cc484796354fbd8aeb365d077b93a41618269341e64bceb5a85985df3af623f12abeab6591db23
-  data.tar.gz: 023c4081d943267049fc6f7b0be964445fc5f7bb65460015ac3d849177b75a76a1158eae4a67810c9d9ca3a3c5ca61f6f8c689fbafdc3a1010c6d912d9675433
+  metadata.gz: a701d2ad7b0776f43d04b63fa394d5470fe7f5a8d0d71467affd78d04069ec212249fc1e0ab9c86d82bdabadc750ac6eb63b7e6c77d3b842f82f5c6c88d81baf
+  data.tar.gz: 3033fcb57a59f3518436f0f903154f9eaaa070230afd6ba4f83d3c6c42904f71a503f92f42aa5b91932770c15bb8551a5ea7ce7130a9bf8ac7eca11756ef53ce

data/lib/graphql/client.rb

@@ -120,13 +120,21 @@ module GraphQL
 
       definition_dependencies = Set.new
 
+      # Replace Ruby constant reference with GraphQL fragment names,
+      # while populating `definition_dependencies` with
+      # GraphQL Fragment ASTs which this operation depends on
       str = str.gsub(/\.\.\.([a-zA-Z0-9_]+(::[a-zA-Z0-9_]+)*)/) do
         match = Regexp.last_match
         const_name = match[1]
 
         if str.match(/fragment\s*#{const_name}/)
+          # It's a fragment _definition_, not a fragment usage
           match[0]
         else
+          # It's a fragment spread, so we should load the fragment
+          # which corresponds to the spread.
+          # We depend on ActiveSupport to either find the already-loaded
+          # constant, or to load the constant by name
           begin
             fragment = ActiveSupport::Inflector.constantize(const_name)
           rescue NameError
@@ -135,6 +143,10 @@ module GraphQL
 
           case fragment
           when FragmentDefinition
+            # We found the fragment definition that this fragment spread belongs to.
+            # So, register the AST of this fragment in `definition_dependencies`
+            # and update the query string to valid GraphQL syntax,
+            # replacing the Ruby constant
             definition_dependencies.merge(fragment.document.definitions)
             "...#{fragment.definition_name}"
           else
@@ -157,10 +169,17 @@ module GraphQL
       doc = GraphQL.parse(str)
 
       document_types = DocumentTypes.analyze_types(self.schema, doc).freeze
-      QueryTypename.insert_typename_fields(doc, types: document_types)
+      doc = QueryTypename.insert_typename_fields(doc, types: document_types)
 
       doc.definitions.each do |node|
-        node.name ||= "__anonymous__"
+        if node.name.nil?
+          if node.respond_to?(:merge) # GraphQL 1.9 +
+            node_with_name = node.merge(name: "__anonymous__")
+            doc = doc.replace_child(node, node_with_name)
+          else
+            node.name = "__anonymous__"
+          end
+        end
       end
 
       document_dependencies = Language::Nodes::Document.new(definitions: doc.definitions + definition_dependencies.to_a)
@@ -192,7 +211,6 @@ module GraphQL
           raise TypeError, "unexpected #{node.class}"
         end
 
-        node.name = nil if node.name == "__anonymous__"
         sliced_document = Language::DefinitionSlice.slice(document_dependencies, node.name)
         definition = Definition.for(
           client: self,
@@ -205,18 +223,26 @@ module GraphQL
       end
 
       name_hook = RenameNodeHook.new(definitions)
-      visitor = Language::Visitor.new(doc)
+      visitor = Language::Visitor.new(document_dependencies)
       visitor[Language::Nodes::FragmentDefinition].leave << name_hook.method(:rename_node)
       visitor[Language::Nodes::OperationDefinition].leave << name_hook.method(:rename_node)
       visitor[Language::Nodes::FragmentSpread].leave << name_hook.method(:rename_node)
       visitor.visit
 
-      doc.deep_freeze
+      if !doc.respond_to?(:merge)
+        doc.deep_freeze # 1.9 introduced immutable AST nodes, so we skip this on 1.9+
+      end
 
-      document.definitions.concat(doc.definitions) if document_tracking_enabled
+      if document_tracking_enabled
+        if @document.respond_to?(:merge) # GraphQL 1.9+
+          @document = @document.merge(definitions: @document.definitions + doc.definitions)
+        else
+          @document.definitions.concat(doc.definitions)
+        end
+      end
 
-      if definitions[nil]
-        definitions[nil]
+      if definitions["__anonymous__"]
+        definitions["__anonymous__"]
       else
         Module.new do
           definitions.each do |name, definition|
@@ -235,7 +261,7 @@ module GraphQL
         definition = @definitions[node.name]
         if definition
           node.extend(LazyName)
-          node.name = -> { definition.definition_name }
+          node.name_proc = -> { definition.definition_name }
         end
       end
     end
@@ -358,8 +384,10 @@ module GraphQL
     # name to point to a lazily defined Proc instead of a static string.
     module LazyName
       def name
-        @name.call
+        @name_proc.call
       end
+
+      attr_writer :name_proc
     end
 
     private

data/lib/graphql/client/query_typename.rb

@@ -13,33 +13,84 @@ module GraphQL
       # document - GraphQL::Language::Nodes::Document to modify
       # schema - Optional Map of GraphQL::Language::Nodes::Node to GraphQL::Type
       #
-      # Returns nothing.
-      def self.insert_typename_fields(document, types: {})
-        on_selections = ->(node, _parent) do
-          type = types[node]
-
-          if node.selections.any?
-            case type && type.unwrap
-            when NilClass, GraphQL::InterfaceType, GraphQL::UnionType
-              names = node_flatten_selections(node.selections).map { |s| s.respond_to?(:name) ? s.name : nil }
+      # Returns the document with `__typename` added to it
+      if GraphQL::Language::Nodes::AbstractNode.method_defined?(:merge)
+        # GraphQL 1.9 introduces a new visitor class
+        # and doesn't expose writer methods for node attributes.
+        # So, use the node mutation API instead.
+        class InsertTypenameVisitor < GraphQL::Language::Visitor
+          def initialize(document, types:)
+            @types = types
+            super(document)
+          end
+
+          def add_typename(node, parent)
+            type = @types[node]
+            type = type && type.unwrap
+
+            if (node.selections.any? && (type.nil? || type.is_a?(GraphQL::InterfaceType) || type.is_a?(GraphQL::UnionType))) ||
+              (node.selections.none? && type.is_a?(GraphQL::ObjectType))
+              names = QueryTypename.node_flatten_selections(node.selections).map { |s| s.respond_to?(:name) ? s.name : nil }
               names = Set.new(names.compact)
 
-              unless names.include?("__typename")
-                node.selections = [GraphQL::Language::Nodes::Field.new(name: "__typename")] + node.selections
+              if names.include?("__typename")
+                yield(node, parent)
+              else
+                node_with_typename = node.merge(selections: [GraphQL::Language::Nodes::Field.new(name: "__typename")] + node.selections)
+                yield(node_with_typename, parent)
               end
+            else
+              yield(node, parent)
             end
-          elsif type && type.unwrap.is_a?(GraphQL::ObjectType)
-            node.selections = [GraphQL::Language::Nodes::Field.new(name: "__typename")]
+          end
+
+          def on_operation_definition(node, parent)
+            add_typename(node, parent) { |n, p| super(n, p) }
+          end
+
+          def on_field(node, parent)
+            add_typename(node, parent) { |n, p| super(n, p) }
+          end
+
+          def on_fragment_definition(node, parent)
+            add_typename(node, parent) { |n, p| super(n, p) }
           end
         end
 
-        visitor = GraphQL::Language::Visitor.new(document)
-        visitor[GraphQL::Language::Nodes::Field].leave << on_selections
-        visitor[GraphQL::Language::Nodes::FragmentDefinition].leave << on_selections
-        visitor[GraphQL::Language::Nodes::OperationDefinition].leave << on_selections
-        visitor.visit
+        def self.insert_typename_fields(document, types: {})
+          visitor = InsertTypenameVisitor.new(document, types: types)
+          visitor.visit
+          visitor.result
+        end
+
+      else
+        def self.insert_typename_fields(document, types: {})
+          on_selections = ->(node, _parent) do
+            type = types[node]
+
+            if node.selections.any?
+              case type && type.unwrap
+              when NilClass, GraphQL::InterfaceType, GraphQL::UnionType
+                names = node_flatten_selections(node.selections).map { |s| s.respond_to?(:name) ? s.name : nil }
+                names = Set.new(names.compact)
 
-        nil
+                unless names.include?("__typename")
+                  node.selections = [GraphQL::Language::Nodes::Field.new(name: "__typename")] + node.selections
+                end
+              end
+            elsif type && type.unwrap.is_a?(GraphQL::ObjectType)
+              node.selections = [GraphQL::Language::Nodes::Field.new(name: "__typename")]
+            end
+          end
+
+          visitor = GraphQL::Language::Visitor.new(document)
+          visitor[GraphQL::Language::Nodes::Field].leave << on_selections
+          visitor[GraphQL::Language::Nodes::FragmentDefinition].leave << on_selections
+          visitor[GraphQL::Language::Nodes::OperationDefinition].leave << on_selections
+          visitor.visit
+
+          document
+        end
       end
 
       def self.node_flatten_selections(selections)

data/lib/graphql/client/schema/possible_types.rb

@@ -41,7 +41,7 @@ module GraphQL
             if type = possible_types[typename]
               type.cast(value, errors)
             else
-              raise InvariantError, "expected value to be one of (#{possible_types.keys.join(", ")}), but was #{typename}"
+              raise InvariantError, "expected value to be one of (#{possible_types.keys.join(", ")}), but was #{typename.inspect}"
             end
           when NilClass
             nil

data/lib/graphql/language/nodes/deep_freeze_ext.rb

@@ -10,6 +10,7 @@ module GraphQL
         #
         # Returns self Node.
         def deep_freeze
+          scalars # load internal state
           children.each(&:deep_freeze)
           scalars.each { |s| s && s.freeze }
           freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-client
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - GitHub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2018-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport