apollo-federation 3.6.8 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26437191f63f4ce0a56dff61e303ffa903ff80df46db23d5840ded158cdef18c
-  data.tar.gz: c19bf4aeb4d78298d0d210ad2078b08d01a8e2fd4de75f5f5d2caccadbaa315d
+  metadata.gz: 7a3acf99a330df8e02ac0217773a9443b400d97a1ad47ed518a2f5631499711f
+  data.tar.gz: f9482d80b73b9ba0396fc51676a1ab28a12910c6a7fc3b7666421efff705a1ef
 SHA512:
-  metadata.gz: '079095e454e865dfceacb37c16e3ce64a23d59f5d937aa8668f7264b8f89ade841df7104b547ced1e4c353f3f81457e793882087b30baaad7d82ffb7c2ce8524'
-  data.tar.gz: 79e15b6604c5f127e0948f4641c8530e4c538a5a587c6fb944a9b5ad874cb3564baf077dba26f1321fbe0580e61d0a157743cbbebfd1874e682c15a250e2dc8b
+  metadata.gz: 10f57a06a03f32dec83f3fbbd293c695a8019914b577b5ae25e6fedd86fa0d0e27be640ccc9261a5fed2f22154535e39d9d9408bfd16cce016ff2bd9cea7beda
+  data.tar.gz: c7bc892658495ae8576159aa0c14be88837744bfde4dbcd30acb15b443eb817b17400e49f8cd46c59e161ac5975374e84f5405bb30eb8f0280fd80dc2a646f51

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [3.7.0](https://github.com/Gusto/apollo-federation-ruby/compare/v3.6.9...v3.7.0) (2023-05-26)
+
+
+### Features
+
+* support [@key](https://github.com/key) directive resolvable argument ([#249](https://github.com/Gusto/apollo-federation-ruby/issues/249)) ([6df7030](https://github.com/Gusto/apollo-federation-ruby/commit/6df70305d3e6035946c9ac35d74387014b08b28a))
+
+## [3.6.9](https://github.com/Gusto/apollo-federation-ruby/compare/v3.6.8...v3.6.9) (2023-05-23)
+
+
+### Bug Fixes
+
+* visibility checks should handle duplicate types and fields ([#245](https://github.com/Gusto/apollo-federation-ruby/issues/245)) ([6401feb](https://github.com/Gusto/apollo-federation-ruby/commit/6401febe65743eb1fae970b3cf865b7007fb27cf))
+
 ## [3.6.8](https://github.com/Gusto/apollo-federation-ruby/compare/v3.6.7...v3.6.8) (2023-05-22)
 
 

data/README.md

@@ -178,6 +178,14 @@ class User < BaseObject
 end
 ```
 
+As well as non-resolvable keys:
+
+```ruby
+class User < BaseObject
+  key fields: :id, resolvable: false
+end
+```
+
 See [field set syntax](#field-set-syntax) for more details on the format of the `fields` option.
 
 ### The `@external` directive

data/lib/apollo-federation/federated_document_from_schema_definition.rb

@@ -69,7 +69,7 @@ module ApolloFederation
     def build_type_definition_nodes(types)
       non_federation_types = types.select do |type|
         if query_type?(type)
-          !type.fields.values.all? { |field| FEDERATION_QUERY_FIELDS.include?(field.graphql_name) }
+          !warden.fields(type).all? { |field| FEDERATION_QUERY_FIELDS.include?(field.graphql_name) }
         else
           !FEDERATION_TYPES.include?(type.graphql_name)
         end

data/lib/apollo-federation/object.rb

@@ -32,13 +32,15 @@ module ApolloFederation
         add_directive(name: 'tag', arguments: [name: 'name', values: name])
       end
 
-      def key(fields:, camelize: true)
+      def key(fields:, camelize: true, resolvable: true)
+        arguments = [
+          name: 'fields',
+          values: ApolloFederation::FieldSetSerializer.serialize(fields, camelize: camelize),
+        ]
+        arguments.append(name: 'resolvable', values: resolvable) unless resolvable
         add_directive(
           name: 'key',
-          arguments: [
-            name: 'fields',
-            values: ApolloFederation::FieldSetSerializer.serialize(fields, camelize: camelize),
-          ],
+          arguments: arguments,
         )
       end
     end

data/lib/apollo-federation/schema.rb

@@ -81,9 +81,9 @@ module ApolloFederation
 
         # Walk through all of the types and determine which ones are entities (any type with a
         # "key" directive)
-        types_schema.types.values.select do |type|
+        types_schema.send(:non_introspection_types).values.flatten.select do |type|
           # TODO: Interfaces can have a key...
-          !type.introspection? && type.include?(ApolloFederation::Object) &&
+          type.include?(ApolloFederation::Object) &&
             type.federation_directives&.any? { |directive| directive[:name] == 'key' }
         end
       end

data/lib/apollo-federation/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ApolloFederation
-  VERSION = '3.6.8'
+  VERSION = '3.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apollo-federation
 version: !ruby/object:Gem::Version
-  version: 3.6.8
+  version: 3.7.0
 platform: ruby
 authors:
 - Noa Elad
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-22 00:00:00.000000000 Z
+date: 2023-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql