graphql-hive 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be9427b081e7a486adf0537b3afa6e073c6c31eba88acae351589d0e1f708c87
-  data.tar.gz: de06ee85feb0ddd539a248534fdfe642aab8a8bb693f0cb66f0519f53ab95e11
+  metadata.gz: 4b97fdc04366ea30fe83277eb7f473dafba08f252166dcbe7496ba099a9d4850
+  data.tar.gz: 9b3e6984f2a218c006544d63d20740c871768fa3090d87176e652b51d5f83915
 SHA512:
-  metadata.gz: eae35b3398dfbf84327efcca83c3ccc206e50698b64646359b6134143b516f2c50a51504cd6a8165ced58487b526d7c019aa95235cb2ba6132146e61e75694af
-  data.tar.gz: 96377bff1cf7c9f7e4e69847f68dc8143bc68702cfedfc6359f0147c16e534e660dcb871f3464a361ec082910a75db2b7ae8410cd6926a6df387ba0143c05cb4
+  metadata.gz: f7fb2302e00132205d34370a41f055101ca5ec2fd55e41839be30b0c235b6c5739e962f98b52b93a5cef74f4535984e09e5d5a62f656cefe5d493e485817ecfb
+  data.tar.gz: 4d5600006f3ccd97b9b1a19f791eecf501fcaf1a356adebb92c455f9a713657df5f5a28ebe28d8b06c1a9dd9d3ffc1658ffb99be07eb313d4cf38f939663270a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphql-hive (0.3.0)
+    graphql-hive (0.3.2)
       graphql (~> 2.0.9)
 
 GEM
@@ -9,7 +9,7 @@ GEM
   specs:
     ast (2.4.2)
     diff-lcs (1.5.0)
-    graphql (2.0.16)
+    graphql (2.0.17)
     parallel (1.22.1)
     parser (3.1.2.0)
       ast (~> 2.4.1)

data/RELEASING.md

@@ -0,0 +1,10 @@
+## Releasing `graphql-hive` on RubyGems
+
+
+1. Ensure dependencies are properly installed: `bundle`
+1. Ensure the is working as expected: `bundle exec rspec`
+1. **Make sure to manually bump the version in `lib/graphql-hive/version.rb`**
+1. Build the gem: `gem build graphql-hive`
+1. A new file should have been created, ex: `graphql-hive-0.3.0.gem`
+1. Then, login to RubyGems: `gem login`
+1. And publish the new version: `gem push <path_to_gem_file>` (ex: `gem push graphql-hive-0.3.0.gem`)

data/k6/graphql-api/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    graphql-hive (0.3.0)
+    graphql-hive (0.3.2)
       graphql (~> 2.0.9)
 
 GEM

data/lib/graphql-hive/analyzer.rb

@@ -9,23 +9,26 @@ module GraphQL
         @used_fields = Set.new
       end
 
-      def on_leave_field(node, _parent, visitor)
+      def on_enter_field(node, _parent, visitor)
         @used_fields.add(visitor.parent_type_definition.graphql_name)
-        @used_fields.add([visitor.parent_type_definition.graphql_name, node.name].join('.'))
+        @used_fields.add(make_id(visitor.parent_type_definition.graphql_name, node.name))
       end
 
-      def on_leave_argument(node, parent, visitor)
-        @used_fields.add([visitor.parent_type_definition.graphql_name, parent.name, node.name].join('.'))
-
+      # Visitor also calls 'on_enter_argument' when visiting input object fields in arguments
+      def on_enter_argument(node, parent, visitor)
         arg_type = visitor.argument_definition.type.unwrap
-        arg_type_kind = visitor.argument_definition.type.unwrap.kind
-        if arg_type_kind.input_object?
-          @used_fields.add(arg_type.graphql_name)
-          arg_type.arguments.each do |arg|
-            @used_fields.add([arg_type.graphql_name, arg[0]].join('.'))
-          end
-        elsif arg_type_kind.enum?
-          @used_fields.add([arg_type.graphql_name, node.value.name].join('.'))
+        @used_fields.add(arg_type.graphql_name)
+
+        # collect field argument path
+        # input object fields won't have a "parent.name" method available
+        if parent.respond_to?(:name)
+          @used_fields.add(make_id(visitor.parent_type_definition.graphql_name, parent.name, node.name))
+        end
+
+        if arg_type.kind.input_object?
+          collect_input_object_fields(node, arg_type)
+        elsif arg_type.kind.enum?
+          collect_enum_values(node, arg_type)
         end
       end
 
@@ -34,6 +37,44 @@ module GraphQL
       def result
         @used_fields
       end
+
+      private
+
+      def collect_input_object_fields(node, input_type)
+        case node.value
+        when GraphQL::Language::Nodes::VariableIdentifier
+          input_type.all_argument_definitions.map(&:graphql_name).each do |n|
+            @used_fields.add(make_id(input_type.graphql_name, n))
+          end
+        when Array
+          node.value.flat_map(&:arguments).map(&:name).each do |n|
+            @used_fields.add(make_id(input_type.graphql_name, n))
+          end
+        else
+          node.value.arguments.map(&:name).each do |n|
+            @used_fields.add(make_id(input_type.graphql_name, n))
+          end
+        end
+      end
+
+      def collect_enum_values(node, enum_type)
+        case node.value
+        when GraphQL::Language::Nodes::VariableIdentifier
+          enum_type.values.values.map(&:graphql_name).each do |n|
+            @used_fields.add(make_id(enum_type.graphql_name, n))
+          end
+        when Array
+          node.value.map(&:name).each do |n|
+            @used_fields.add(make_id(enum_type.graphql_name, n))
+          end
+        else
+          @used_fields.add(make_id(enum_type.graphql_name, node.value.name))
+        end
+      end
+
+      def make_id(*tokens)
+        tokens.join('.')
+      end
     end
   end
 end

data/lib/graphql-hive/printer.rb

@@ -33,7 +33,13 @@ module GraphQL
       end
 
       def print_selections(selections, indent: '')
-        super(selections.sort_by(&:name), indent: indent)
+        sorted_nodes = selections.sort_by do |s|
+          next s.name if s.respond_to?(:name)
+          next s.type.name if s.respond_to?(:type)
+
+          raise "don't know how to sort selection node: #{s.inspect}"
+        end
+        super(sorted_nodes, indent: indent)
       end
 
       def print_directive(directive)

data/lib/graphql-hive/usage_reporter.rb

@@ -69,6 +69,13 @@ module GraphQL
             @options[:logger].debug('shuting down with buffer, sending!')
             process_operations(buffer)
           end
+        rescue StandardError => e
+          # ensure configured logger receives exception as well in setups where STDERR might not be
+          # monitored.
+          @options[:logger].error('GraphQL Hive usage collection thread terminating')
+          @options[:logger].error(e)
+
+          raise e
         end
       end
 

data/lib/graphql-hive/version.rb

@@ -2,6 +2,6 @@
 
 module Graphql
   module Hive
-    VERSION = '0.3.0'
+    VERSION = '0.3.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-hive
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Charly POLY
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-13 00:00:00.000000000 Z
+date: 2023-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -97,6 +97,7 @@ files:
 - Gemfile.lock
 - LICENSE
 - README.md
+- RELEASING.md
 - Rakefile
 - cover.png
 - examples/simple-api/Gemfile
@@ -141,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: '"GraphQL Hive integration for `graphql-ruby`"'