apollo-federation 2.2.4 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba95ea6ff91193e1c977c0bd3eea9a5e9d697ae8f1fdf189823eb81d0a911bc3
-  data.tar.gz: 51e4f2204aaab9ce67b3578454ec2d33b59ed9ffb90e73331a36b93e19b73dd9
+  metadata.gz: b48438a1b967fedac245550c5e46d887f7c4978d54736d90ba14aef61be5d4b7
+  data.tar.gz: 982dd4cc577d286793e57aef3ba63cab338a48e7034bd3c65aaacd1367b64b40
 SHA512:
-  metadata.gz: 94cb699aa812877a646ded92f8fc1a4b12e8137410fea54c470e851e402110b8bb6b2c4ab1c42bb422e09616a910da90683e38ea69bf85365f3a86e9121aa3cc
-  data.tar.gz: a74321947eb59666acd5420df26c554d48166f1f29aeaa4d3ce30d6e4f374090c7c7c83c4585c8fdbbad585adec8de6421f90c68072d0d144e33c73a6fa37bf4
+  metadata.gz: 18c9bd5dbdce6fa9b526fbc1df531a6a435c00d42ea8ac097ad008d32c748b910e2145a0832a03b630190cfaad0a2a9a7121a47f45eacee253132d46255f9a89
+  data.tar.gz: 415f518015e14e6a833643796748edd3ae1835678d6d1cf3f13920b903061193ae8caec3ef7975fc3ab63c9df4cc1e9853211c5e5374c2466df367515ca29d20

data/CHANGELOG.md

@@ -1,3 +1,101 @@
+# [3.6.0](https://github.com/Gusto/apollo-federation-ruby/compare/v3.5.3...v3.6.0) (2023-03-17)
+
+
+### Features
+
+* attempt to fix missing CHANGELOG entries ([07170d3](https://github.com/Gusto/apollo-federation-ruby/commit/07170d39738bec59952b0b952431ee2aecbf8f89))
+
+## [3.5.3](https://github.com/Gusto/apollo-federation-ruby/compare/v3.5.2...v3.5.3) (2023-03-17)
+
+
+### Features
+
+* Support @inaccessible on remaining types ([#230](https://github.com/Gusto/apollo-federation-ruby/pull/230)) ([b62e6d9](https://github.com/Gusto/apollo-federation-ruby/commit/b62e6d9fc5ad0acae00746a80a622ac22dfa0c1f))
+
+### Bug Fixes
+
+* Inherit federation directives ([#94](https://github.com/Gusto/apollo-federation-ruby/issues/94)) ([822f92b](https://github.com/Gusto/apollo-federation-ruby/commit/822f92b229f3437c474721082033b74c8cc63553))
+
+## [3.5.2](https://github.com/Gusto/apollo-federation-ruby/compare/v3.5.1...v3.5.2) (2023-03-08)
+
+
+### Reverts
+
+* Revert "chore: use Github App for authentication (#216)" (#227) ([f503704](https://github.com/Gusto/apollo-federation-ruby/commit/f5037047da67d809c3ffcbcc20318cd3996fb2e1)), closes [#216](https://github.com/Gusto/apollo-federation-ruby/issues/216) [#227](https://github.com/Gusto/apollo-federation-ruby/issues/227)
+
+## [3.5.1](https://github.com/Gusto/apollo-federation-ruby/compare/v3.5.0...v3.5.1) (2023-03-08)
+
+
+### Bug Fixes
+
+* semantic PR title workflow ([#225](https://github.com/Gusto/apollo-federation-ruby/issues/225)) ([ee6041f](https://github.com/Gusto/apollo-federation-ruby/commit/ee6041f169b5f21427b704f4c71ee6dd0ea5c8b2))
+
+# [3.5.0](https://github.com/Gusto/apollo-federation-ruby/compare/v3.4.1...v3.5.0) (2023-03-08)
+
+
+### Features
+
+* add tag directive from federation v2 ([#210](https://github.com/Gusto/apollo-federation-ruby/issues/210)) ([8c6e112](https://github.com/Gusto/apollo-federation-ruby/commit/8c6e11251b7bc7d6888a7a2b6e0feeea70171cb0))
+
+## [3.4.1](https://github.com/Gusto/apollo-federation-ruby/compare/v3.4.0...v3.4.1) (2023-02-21)
+
+
+### Bug Fixes
+
+* import [@inaccessible](https://github.com/inaccessible) directive in Fed v2.3 ([#220](https://github.com/Gusto/apollo-federation-ruby/issues/220)) ([5d4d86e](https://github.com/Gusto/apollo-federation-ruby/commit/5d4d86e8155efe83470c58012454c79c910219ff))
+
+# [3.4.0](https://github.com/Gusto/apollo-federation-ruby/compare/v3.3.1...v3.4.0) (2023-02-21)
+
+
+### Bug Fixes
+
+* address some lint violations ([#219](https://github.com/Gusto/apollo-federation-ruby/issues/219)) ([dcd11e9](https://github.com/Gusto/apollo-federation-ruby/commit/dcd11e9384f168d125d2b60941d4bff161799824))
+
+
+### Features
+
+* add support for the [@interface](https://github.com/interface)Object directive ([#218](https://github.com/Gusto/apollo-federation-ruby/issues/218)) ([c7b987d](https://github.com/Gusto/apollo-federation-ruby/commit/c7b987de1d2b32a4a77ceb09718373ffa5a60abb))
+
+## [3.3.1](https://github.com/Gusto/apollo-federation-ruby/compare/v3.3.0...v3.3.1) (2023-01-05)
+
+
+### Bug Fixes
+
+* address SNYK-RUBY-GOOGLEPROTOBUF-3167775 ([#212](https://github.com/Gusto/apollo-federation-ruby/issues/212)) ([c36b51e](https://github.com/Gusto/apollo-federation-ruby/commit/c36b51e521a60e8186100405cf81bba1a37f5978))
+
+# [3.3.0](https://github.com/Gusto/apollo-federation-ruby/compare/v3.2.0...v3.3.0) (2022-08-24)
+
+
+### Features
+
+* introduce optional `resolve_references` method ([#206](https://github.com/Gusto/apollo-federation-ruby/issues/206)) ([1e3b631](https://github.com/Gusto/apollo-federation-ruby/commit/1e3b631609e1dfec8c3f126cd9dc8e0a2b3a0a57))
+
+# [3.2.0](https://github.com/Gusto/apollo-federation-ruby/compare/v3.1.0...v3.2.0) (2022-08-15)
+
+
+### Features
+
+* allow custom namespace for linked directives ([03fdfea](https://github.com/Gusto/apollo-federation-ruby/commit/03fdfeafaaea3c98ca4b7a734ce760ea08410530))
+
+# [3.1.0](https://github.com/Gusto/apollo-federation-ruby/compare/v3.0.0...v3.1.0) (2022-06-21)
+
+
+### Features
+
+* Support Federation v2 ([#196](https://github.com/Gusto/apollo-federation-ruby/issues/196)) ([238736c](https://github.com/Gusto/apollo-federation-ruby/commit/238736cdb6f12121ce2a295c7a28fba3990012b9)), closes [/www.apollographql.com/docs/federation/federation-2/moving-to-federation-2/#opt-in-to-federation-2](https://github.com//www.apollographql.com/docs/federation/federation-2/moving-to-federation-2//issues/opt-in-to-federation-2)
+
+# [3.0.0](https://github.com/Gusto/apollo-federation-ruby/compare/v2.2.4...v3.0.0) (2022-04-05)
+
+
+### Bug Fixes
+
+* camelize string fields to match sym behavior ([8f0382b](https://github.com/Gusto/apollo-federation-ruby/commit/8f0382b346d2cde5be252138275d67373b36acd7))
+
+
+### BREAKING CHANGES
+
+* string fields will be camelized by default rather than passed as is.
+
 ## [2.2.4](https://github.com/Gusto/apollo-federation-ruby/compare/v2.2.3...v2.2.4) (2022-04-01)
 
 

data/README.md

@@ -22,13 +22,21 @@ Or install it yourself as:
 
 ## Getting Started
 
-Include the `ApolloFederation::Field` module in your base field class:
+Include the `ApolloFederation::Argument` module in your base argument class:
 
 ```ruby
-require 'apollo-federation'
+class BaseArgument < GraphQL::Schema::Argument
+  include ApolloFederation::Argument
+end
+```
 
+Include the `ApolloFederation::Field` module in your base field class:
+
+```ruby
 class BaseField < GraphQL::Schema::Field
   include ApolloFederation::Field
+
+  argument_class BaseArgument
 end
 ```
 
@@ -53,6 +61,50 @@ module BaseInterface
 end
 ```
 
+Include the `ApolloFederation::Union` module in your base union class:
+
+```ruby
+class BaseUnion < GraphQL::Schema::Union
+  include ApolloFederation::Union
+end
+```
+
+Include the `ApolloFederation::EnumValue` module in your base enum value class:
+
+```ruby
+class BaseEnumValue < GraphQL::Schema::EnumValue
+  include ApolloFederation::EnumValue
+end
+```
+
+Include the `ApolloFederation::Enum` module in your base enum class:
+
+```ruby
+class BaseEnum < GraphQL::Schema::Enum
+  include ApolloFederation::Enum
+
+  enum_value_class BaseEnumValue
+end
+```
+
+Include the `ApolloFederation::InputObject` module in your base input object class:
+
+```ruby
+class BaseInputObject < GraphQL::Schema::InputObject
+  include ApolloFederation::InputObject
+
+  argument_class BaseArgument
+end
+```
+
+Include the `ApolloFederation::Scalar` module in your base scalar class:
+
+```ruby
+class BaseScalar < GraphQL::Schema::Scalar
+  include ApolloFederation::Scalar
+end
+```
+
 Finally, include the `ApolloFederation::Schema` module in your schema:
 
 ```ruby
@@ -61,6 +113,15 @@ class MySchema < GraphQL::Schema
 end
 ```
 
+**Optional:** To opt in to Federation v2, specify the version in your schema:
+
+```ruby
+class MySchema < GraphQL::Schema
+  include ApolloFederation::Schema
+  federation version: '2.0'
+end
+```
+
 ## Example
 
 The [`example`](./example/) folder contains a Ruby implementation of Apollo's [`federation-demo`](https://github.com/apollographql/federation-demo). To run it locally, install the Ruby dependencies:
@@ -160,6 +221,79 @@ end
 ```
 See [field set syntax](#field-set-syntax) for more details on the format of the `fields` option.
 
+### The `@shareable` directive (Apollo Federation v2)
+
+[Apollo documentation](https://www.apollographql.com/docs/federation/federated-types/federated-directives/#shareable)
+
+Call `shareable` within your class definition:
+
+```ruby
+class User < BaseObject
+  shareable
+end
+```
+
+Pass the `shareable: true` option to your field definition:
+
+```ruby
+class User < BaseObject
+  field :id, ID, null: false, shareable: true
+end
+```
+
+### The `@inaccessible` directive (Apollo Federation v2)
+
+[Apollo documentation](https://www.apollographql.com/docs/federation/federated-types/federated-directives/#inaccessible)
+
+Call `inaccessible` within your class definition:
+
+```ruby
+class User < BaseObject
+  inaccessible
+end
+```
+
+Pass the `inaccessible: true` option to your field definition:
+
+```ruby
+class User < BaseObject
+  field :id, ID, null: false, inaccessible: true
+end
+```
+
+### The `@override` directive (Apollo Federation v2)
+
+[Apollo documentation](https://www.apollographql.com/docs/federation/federated-types/federated-directives/#override)
+
+Pass the `override:` option to your field definition:
+
+```ruby
+class Product < BaseObject
+  field :id, ID, null: false
+  field :inStock, Boolean, null: false, override: { from: 'Products' }
+end
+```
+
+### The `@tag` directive (Apollo Federation v2)
+
+[Apollo documentation](https://www.apollographql.com/docs/federation/federated-types/federated-directives/#tag)
+
+Call `tag` within your class definition:
+
+```ruby
+class User < BaseObject
+  tag name: 'private'
+end
+```
+
+Pass the `tags:` option to your field definition:
+
+```ruby
+class User < BaseObject
+  field :id, ID, null: false, tags: [{ name: 'private' }]
+end
+```
+
 ### Field set syntax
 
 Field sets can be either strings encoded with the Apollo Field Set [syntax]((https://www.apollographql.com/docs/apollo-server/federation/federation-spec/#scalar-_fieldset)) or arrays, hashes and snake case symbols that follow the graphql-ruby conventions:

data/lib/apollo-federation/argument.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'apollo-federation/has_directives'
+
+module ApolloFederation
+  module Argument
+    include HasDirectives
+
+    VERSION_2_DIRECTIVES = %i[tags inaccessible].freeze
+
+    def initialize(*args, **kwargs, &block)
+      add_v2_directives(**kwargs)
+
+      # Remove the custom kwargs
+      kwargs = kwargs.delete_if do |k, _|
+        VERSION_2_DIRECTIVES.include?(k)
+      end
+
+      # Pass on the default args:
+      super(*args, **kwargs, &block)
+    end
+
+    private
+
+    def add_v2_directives(tags: [], inaccessible: nil, **_kwargs)
+      tags.each do |tag|
+        add_directive(
+          name: 'tag',
+          arguments: [
+            name: 'name',
+            values: tag[:name],
+          ],
+        )
+      end
+
+      add_directive(name: 'inaccessible') if inaccessible
+    end
+  end
+end

data/lib/apollo-federation/entities_field.rb

@@ -27,8 +27,10 @@ module ApolloFederation
     end
 
     def _entities(representations:)
-      representations.map do |reference|
-        typename = reference[:__typename]
+      grouped_references = representations.group_by { |r| r[:__typename] }
+
+      final_results = []
+      grouped_references.each do |typename, references|
         # TODO: Use warden or schema?
         type = context.warden.get_type(typename)
         if type.nil? || type.kind != GraphQL::TypeKinds::OBJECT
@@ -40,21 +42,27 @@ module ApolloFederation
         # TODO: What if the type is an interface?
         type_class = class_of_type(type)
 
-        if type_class.respond_to?(:resolve_reference)
-          result = type_class.resolve_reference(reference, context)
+        if type_class.respond_to?(:resolve_references)
+          results = type_class.resolve_references(references, context)
+        elsif type_class.respond_to?(:resolve_reference)
+          results = references.map { |reference| type_class.resolve_reference(reference, context) }
         else
-          result = reference
+          results = references
         end
 
-        context.schema.after_lazy(result) do |resolved_value|
-          # TODO: This isn't 100% correct: if (for some reason) 2 different resolve_reference calls
-          # return the same object, it might not have the right type
-          # Right now, apollo-federation just adds a __typename property to the result,
-          # but I don't really like the idea of modifying the resolved object
-          context[resolved_value] = type
-          resolved_value
+        results = results.map do |result|
+          context.schema.after_lazy(result) do |resolved_value|
+            # TODO: This isn't 100% correct: if (for some reason) 2 different resolve_reference
+            # calls return the same object, it might not have the right type
+            # Right now, apollo-federation just adds a __typename property to the result,
+            # but I don't really like the idea of modifying the resolved object
+            context[resolved_value] = type
+            resolved_value
+          end
         end
+        final_results = final_results.concat(results)
       end
+      final_results
     end
 
     private

data/lib/apollo-federation/enum.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'apollo-federation/has_directives'
+
+module ApolloFederation
+  module Enum
+    def self.included(klass)
+      klass.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      include HasDirectives
+
+      def tag(name:)
+        add_directive(name: 'tag', arguments: [name: 'name', values: name])
+      end
+
+      def inaccessible
+        add_directive(name: 'inaccessible')
+      end
+    end
+  end
+end

data/lib/apollo-federation/enum_value.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'apollo-federation/has_directives'
+
+module ApolloFederation
+  module EnumValue
+    include HasDirectives
+
+    VERSION_2_DIRECTIVES = %i[tags inaccessible].freeze
+
+    def initialize(*args, **kwargs, &block)
+      add_v2_directives(**kwargs)
+
+      # Remove the custom kwargs
+      kwargs = kwargs.delete_if do |k, _|
+        VERSION_2_DIRECTIVES.include?(k)
+      end
+
+      # Pass on the default args:
+      super(*args, **kwargs, &block)
+    end
+
+    private
+
+    def add_v2_directives(tags: [], inaccessible: nil, **_kwargs)
+      tags.each do |tag|
+        add_directive(
+          name: 'tag',
+          arguments: [
+            name: 'name',
+            values: tag[:name],
+          ],
+        )
+      end
+
+      add_directive(name: 'inaccessible') if inaccessible
+    end
+  end
+end

data/lib/apollo-federation/federated_document_from_schema_definition.rb

@@ -27,8 +27,38 @@ module ApolloFederation
     end
 
     def build_interface_type_node(interface_type)
-      field_node = super
-      merge_directives(field_node, interface_type)
+      interface_node = super
+      merge_directives(interface_node, interface_type)
+    end
+
+    def build_union_type_node(union_type)
+      union_node = super
+      merge_directives(union_node, union_type)
+    end
+
+    def build_enum_type_node(enum_type)
+      enum_node = super
+      merge_directives(enum_node, enum_type)
+    end
+
+    def build_enum_value_node(enum_value_type)
+      enum_value_node = super
+      merge_directives(enum_value_node, enum_value_type)
+    end
+
+    def build_scalar_type_node(scalar_type)
+      scalar_node = super
+      merge_directives(scalar_node, scalar_type)
+    end
+
+    def build_input_object_node(input_object_type)
+      input_object_node = super
+      merge_directives(input_object_node, input_object_type)
+    end
+
+    def build_argument_node(argument_type)
+      argument_node = super
+      merge_directives(argument_node, argument_type)
     end
 
     def build_field_node(field_type)
@@ -55,20 +85,28 @@ module ApolloFederation
 
     def merge_directives(node, type)
       if type.is_a?(ApolloFederation::HasDirectives)
-        directives = type.federation_directives
+        directives = type.federation_directives || []
       else
         directives = []
       end
 
-      (directives || []).each do |directive|
+      directives.each do |directive|
         node = node.merge_directive(
-          name: directive[:name],
+          name: directive_name(directive),
           arguments: build_arguments_node(directive[:arguments]),
         )
       end
       node
     end
 
+    def directive_name(directive)
+      if schema.federation_2? && !Schema::IMPORTED_DIRECTIVES.include?(directive[:name])
+        "#{schema.link_namespace}__#{directive[:name]}"
+      else
+        directive[:name]
+      end
+    end
+
     def build_arguments_node(arguments)
       (arguments || []).map do |arg|
         GraphQL::Language::Nodes::Argument.new(name: arg[:name], value: arg[:values])

data/lib/apollo-federation/field.rb

@@ -7,31 +7,88 @@ module ApolloFederation
   module Field
     include HasDirectives
 
-    def initialize(*args, external: false, requires: nil, provides: nil, **kwargs, &block)
+    VERSION_1_DIRECTIVES = %i[external requires provides].freeze
+    VERSION_2_DIRECTIVES = %i[shareable inaccessible override tags].freeze
+
+    def initialize(*args, **kwargs, &block)
+      add_v1_directives(**kwargs)
+      add_v2_directives(**kwargs)
+
+      # Remove the custom kwargs
+      kwargs = kwargs.delete_if do |k, _|
+        VERSION_1_DIRECTIVES.include?(k) || VERSION_2_DIRECTIVES.include?(k)
+      end
+
+      # Pass on the default args:
+      super(*args, **kwargs, &block)
+    end
+
+    private
+
+    def add_v1_directives(external: nil, requires: nil, provides: nil, **_kwargs)
       if external
         add_directive(name: 'external')
       end
+
       if requires
         add_directive(
           name: 'requires',
           arguments: [
             name: 'fields',
-            values: ApolloFederation::FieldSetSerializer.serialize(requires[:fields]),
+            values: ApolloFederation::FieldSetSerializer.serialize(
+              requires[:fields],
+              camelize: requires.fetch(:camelize, true),
+            ),
           ],
         )
       end
+
       if provides
         add_directive(
           name: 'provides',
           arguments: [
             name: 'fields',
-            values: ApolloFederation::FieldSetSerializer.serialize(provides[:fields]),
+            values: ApolloFederation::FieldSetSerializer.serialize(
+              provides[:fields],
+              camelize: provides.fetch(:camelize, true),
+            ),
           ],
         )
       end
 
-      # Pass on the default args:
-      super(*args, **kwargs, &block)
+      nil
+    end
+
+    def add_v2_directives(shareable: nil, inaccessible: nil, override: nil, tags: [], **_kwargs)
+      if shareable
+        add_directive(name: 'shareable')
+      end
+
+      if inaccessible
+        add_directive(name: 'inaccessible')
+      end
+
+      if override
+        add_directive(
+          name: 'override',
+          arguments: [
+            name: 'from',
+            values: override[:from],
+          ],
+        )
+      end
+
+      tags.each do |tag|
+        add_directive(
+          name: 'tag',
+          arguments: [
+            name: 'name',
+            values: tag[:name],
+          ],
+        )
+      end
+
+      nil
     end
   end
 end

data/lib/apollo-federation/field_set_serializer.rb

@@ -6,20 +6,18 @@ module ApolloFederation
   module FieldSetSerializer
     extend self
 
-    def serialize(fields)
+    def serialize(fields, camelize: true)
       case fields
       when Hash
         fields.map do |field, nested_selections|
-          "#{camelize(field)} { #{serialize(nested_selections)} }"
+          "#{camelize(field, camelize)} { #{serialize(nested_selections, camelize: camelize)} }"
         end.join(' ')
       when Array
         fields.map do |field|
-          serialize(field)
+          serialize(field, camelize: camelize)
         end.join(' ')
-      when String
-        fields
-      when Symbol
-        camelize(fields)
+      when Symbol, String
+        camelize(fields, camelize)
       else
         raise ArgumentError, "Unexpected field set type: #{fields.class}"
       end
@@ -27,8 +25,8 @@ module ApolloFederation
 
     private
 
-    def camelize(field)
-      GraphQL::Schema::Member::BuildType.camelize(field.to_s)
+    def camelize(field, camelize)
+      camelize ? GraphQL::Schema::Member::BuildType.camelize(field.to_s) : field.to_s
     end
   end
 end

data/lib/apollo-federation/has_directives.rb

@@ -2,11 +2,20 @@
 
 module ApolloFederation
   module HasDirectives
-    attr_reader :federation_directives
-
     def add_directive(name:, arguments: nil)
-      @federation_directives ||= []
-      @federation_directives << { name: name, arguments: arguments }
+      own_federation_directives << { name: name, arguments: arguments }
+    end
+
+    def federation_directives
+      if is_a?(Class)
+        own_federation_directives + find_inherited_value(:federation_directives, [])
+      else
+        own_federation_directives
+      end
+    end
+
+    def own_federation_directives
+      @own_federation_directives ||= []
     end
   end
 end

data/lib/apollo-federation/input_object.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'apollo-federation/has_directives'
+
+module ApolloFederation
+  module InputObject
+    def self.included(klass)
+      klass.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      include HasDirectives
+
+      def tag(name:)
+        add_directive(name: 'tag', arguments: [name: 'name', values: name])
+      end
+
+      def inaccessible
+        add_directive(name: 'inaccessible')
+      end
+    end
+  end
+end

data/lib/apollo-federation/interface.rb

@@ -18,12 +18,20 @@ module ApolloFederation
         add_directive(name: 'extends')
       end
 
-      def key(fields:)
+      def inaccessible
+        add_directive(name: 'inaccessible')
+      end
+
+      def tag(name:)
+        add_directive(name: 'tag', arguments: [name: 'name', values: name])
+      end
+
+      def key(fields:, camelize: true)
         add_directive(
           name: 'key',
           arguments: [
             name: 'fields',
-            values: ApolloFederation::FieldSetSerializer.serialize(fields),
+            values: ApolloFederation::FieldSetSerializer.serialize(fields, camelize: camelize),
           ],
         )
       end

data/lib/apollo-federation/object.rb

@@ -16,12 +16,28 @@ module ApolloFederation
         add_directive(name: 'extends')
       end
 
-      def key(fields:)
+      def shareable
+        add_directive(name: 'shareable')
+      end
+
+      def inaccessible
+        add_directive(name: 'inaccessible')
+      end
+
+      def interface_object
+        add_directive(name: 'interfaceObject')
+      end
+
+      def tag(name:)
+        add_directive(name: 'tag', arguments: [name: 'name', values: name])
+      end
+
+      def key(fields:, camelize: true)
         add_directive(
           name: 'key',
           arguments: [
             name: 'fields',
-            values: ApolloFederation::FieldSetSerializer.serialize(fields),
+            values: ApolloFederation::FieldSetSerializer.serialize(fields, camelize: camelize),
           ],
         )
       end

data/lib/apollo-federation/scalar.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'apollo-federation/has_directives'
+
+module ApolloFederation
+  module Scalar
+    def self.included(klass)
+      klass.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      include HasDirectives
+
+      def tag(name:)
+        add_directive(name: 'tag', arguments: [name: 'name', values: name])
+      end
+
+      def inaccessible
+        add_directive(name: 'inaccessible')
+      end
+    end
+  end
+end

data/lib/apollo-federation/schema.rb

@@ -7,14 +7,38 @@ require 'apollo-federation/federated_document_from_schema_definition.rb'
 
 module ApolloFederation
   module Schema
+    IMPORTED_DIRECTIVES = ['inaccessible', 'tag'].freeze
+
     def self.included(klass)
       klass.extend(CommonMethods)
     end
 
     module CommonMethods
+      DEFAULT_LINK_NAMESPACE = 'federation'
+
+      def federation(version: '1.0', link: {})
+        @federation_version = version
+        @link = { as: DEFAULT_LINK_NAMESPACE }.merge(link)
+      end
+
+      def federation_version
+        @federation_version || find_inherited_value(:federation_version, '1.0')
+      end
+
+      def federation_2?
+        Gem::Version.new(federation_version.to_s) >= Gem::Version.new('2.0.0')
+      end
+
       def federation_sdl(context: nil)
         document_from_schema = FederatedDocumentFromSchemaDefinition.new(self, context: context)
-        GraphQL::Language::Printer.new.print(document_from_schema.document)
+
+        output = GraphQL::Language::Printer.new.print(document_from_schema.document)
+        output.prepend(federation_2_prefix) if federation_2?
+        output
+      end
+
+      def link_namespace
+        @link ? @link[:as] : find_inherited_value(:link_namespace)
       end
 
       def query(new_query_object = nil)
@@ -34,6 +58,16 @@ module ApolloFederation
 
       private
 
+      def federation_2_prefix
+        federation_namespace = ", as: \"#{link_namespace}\"" if link_namespace != DEFAULT_LINK_NAMESPACE
+
+        <<~SCHEMA
+          extend schema
+            @link(url: "https://specs.apollo.dev/federation/v2.3"#{federation_namespace}, import: [#{(IMPORTED_DIRECTIVES.map { |directive| "\"@#{directive}\"" }).join(', ')}])
+
+        SCHEMA
+      end
+
       def schema_entities
         # Create a temporary schema that inherits from this one to extract the types
         types_schema = Class.new(self)

data/lib/apollo-federation/union.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'apollo-federation/has_directives'
+
+module ApolloFederation
+  module Union
+    def self.included(klass)
+      klass.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      include HasDirectives
+
+      def tag(name:)
+        add_directive(name: 'tag', arguments: [name: 'name', values: name])
+      end
+
+      def inaccessible
+        add_directive(name: 'inaccessible')
+      end
+    end
+  end
+end

data/lib/apollo-federation/version.rb

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

data/lib/apollo-federation.rb

@@ -4,7 +4,13 @@ require 'apollo-federation/version'
 require 'apollo-federation/schema'
 require 'apollo-federation/object'
 require 'apollo-federation/interface'
+require 'apollo-federation/union'
+require 'apollo-federation/enum'
+require 'apollo-federation/enum_value'
 require 'apollo-federation/field'
+require 'apollo-federation/scalar'
+require 'apollo-federation/input_object'
+require 'apollo-federation/argument'
 require 'apollo-federation/tracing/proto'
 require 'apollo-federation/tracing/node_map'
 require 'apollo-federation/tracing/tracer'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apollo-federation
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 3.6.0
 platform: ruby
 authors:
 - Noa Elad
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-01 00:00:00.000000000 Z
+date: 2023-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.19'
+        version: 3.21.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.19'
+        version: 3.21.7
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -194,14 +194,19 @@ files:
 - bin/rspec
 - lib/apollo-federation.rb
 - lib/apollo-federation/any.rb
+- lib/apollo-federation/argument.rb
 - lib/apollo-federation/entities_field.rb
 - lib/apollo-federation/entity.rb
+- lib/apollo-federation/enum.rb
+- lib/apollo-federation/enum_value.rb
 - lib/apollo-federation/federated_document_from_schema_definition.rb
 - lib/apollo-federation/field.rb
 - lib/apollo-federation/field_set_serializer.rb
 - lib/apollo-federation/has_directives.rb
+- lib/apollo-federation/input_object.rb
 - lib/apollo-federation/interface.rb
 - lib/apollo-federation/object.rb
+- lib/apollo-federation/scalar.rb
 - lib/apollo-federation/schema.rb
 - lib/apollo-federation/service.rb
 - lib/apollo-federation/service_field.rb
@@ -211,6 +216,7 @@ files:
 - lib/apollo-federation/tracing/proto/apollo.proto
 - lib/apollo-federation/tracing/proto/apollo_pb.rb
 - lib/apollo-federation/tracing/tracer.rb
+- lib/apollo-federation/union.rb
 - lib/apollo-federation/version.rb
 homepage: https://github.com/Gusto/apollo-federation-ruby
 licenses: