graphql-stitching 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b71b1d9e65a84356466a0ff822e177ef5faccce1e2a0cbd91d930b06ea50923
-  data.tar.gz: 8c73c1bcc78d23ea3b0c3f09da2659d84b7877000ccba86f79fa9f83f5801c60
+  metadata.gz: cf60ae0ef85426a3011223bcc146a74a1664762e5488d8266d0afbf1c2143457
+  data.tar.gz: d20da5d4817193de7e156441cab88b0855f3fa93aeabe5e760f8fd66ac5b3547
 SHA512:
-  metadata.gz: 0e46b25856e61dc033ba0e2640d30133463c550af0071ac0e8bb3836b2fa8f4d0690018359b5b3b086861a907b5c66ea55eece9d4bfebe85296e723aedd96415
-  data.tar.gz: 79180fc8944adde3ee0abf79a6fefa3487724cfbf9fb55e00adf29aa42d637c1c53331aad34a0c9c32ed7e3120fdaa6dd26fba9644df86b0feb774a84a8876b2
+  metadata.gz: b89843bfdd353a6b4aec47fce17a6bd6524b29f7d5fa5dc0452570dc1b4bec63691171f7cd3f841c393015df763e20e1be7cf907cc660fcc576cc93e08c3d4dd
+  data.tar.gz: a20f68f8bac0a52271fdc76ec4f173347669acda7f49b18e177746c83df1ec42dc878e8d3af37545a99f5456acc6d9f7577600d79c4568925cd23837fe5c2d0a

data/.github/workflows/ci.yml

@@ -13,22 +13,20 @@ jobs:
       matrix:
         include:
           - gemfile: Gemfile
+            ruby: 3.3
+          - gemfile: gemfiles/graphql_2.3.0.gemfile
             ruby: 3.2
-          - gemfile: Gemfile
-            ruby: 3.1
-          - gemfile: Gemfile
-            ruby: 2.7
           - gemfile: gemfiles/graphql_2.2.0.gemfile
             ruby: 3.1
           - gemfile: gemfiles/graphql_2.1.0.gemfile
             ruby: 3.1
           - gemfile: gemfiles/graphql_2.0.0.gemfile
             ruby: 3.1
-          - gemfile: gemfiles/graphql_1.13.9.gemfile
-            ruby: 3.1
-
+          - gemfile: gemfiles/graphql_2.0.0.gemfile
+            ruby: 2.7
     steps:
-    - uses: actions/checkout@v2
+    - run: echo BUNDLE_GEMFILE=${{ matrix.gemfile }} > $GITHUB_ENV
+    - uses: actions/checkout@v4
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:

data/Gemfile

@@ -6,3 +6,4 @@ gemspec
 gem 'pry'
 gem 'pry-byebug'
 gem 'warning'
+gem 'minitest-stub-const'

data/README.md

@@ -1,23 +1,22 @@
 ## GraphQL Stitching for Ruby
 
-GraphQL stitching composes a single schema from multiple underlying GraphQL resources, then smartly proxies portions of incoming requests to their respective locations in dependency order and returns the merged results. This allows an entire location graph to be queried through one combined GraphQL surface area.
+GraphQL stitching composes a single schema from multiple underlying GraphQL resources, then smartly proxies portions of incoming requests to their respective locations in dependency order and returns the merged results. This allows an entire graph of locations to be queried through one combined GraphQL surface area.
 
 ![Stitched graph](./docs/images/stitching.png)
 
 **Supports:**
-- All operation types: query, mutation, and subscription.
-- Merged object and abstract types.
+- All operation types: query, mutation, and [subscription](./docs/subscriptions.md).
+- Merged object and abstract types joining though multiple keys.
 - Shared objects, fields, enums, and inputs across locations.
-- Multiple and composite type keys.
 - Combining local and remote schemas.
-- File uploads via [multipart form spec](https://github.com/jaydenseric/graphql-multipart-request-spec).
+- [File uploads](./docs/http_executable.md) via multipart forms.
 - Tested with all minor versions of `graphql-ruby`.
 
 **NOT Supported:**
 - Computed fields (ie: federation-style `@requires`).
 - Defer/stream.
 
-This Ruby implementation is a sibling to [GraphQL Tools](https://the-guild.dev/graphql/stitching) (JS) and [Bramble](https://movio.github.io/bramble/) (Go), and its capabilities fall somewhere in between them. GraphQL stitching is similar in concept to [Apollo Federation](https://www.apollographql.com/docs/federation/), though more generic. The opportunity here is for a Ruby application to stitch its local schemas together or onto remote sources without requiring an additional proxy service running in another language. If your goal is to build a purely high-throughput federated reverse proxy, consider not using Ruby.
+This Ruby implementation is designed as a generic library to join basic spec-compliant GraphQL schemas using their existing types and fields in a [DIY](https://dictionary.cambridge.org/us/dictionary/english/diy) capacity. The opportunity here is for a Ruby application to stitch its local schemas together or onto remote sources without requiring an additional proxy service running in another language. If your goal is a purely high-throughput federation gateway with managed schema deployments, consider more opinionated frameworks such as [Apollo Federation](https://www.apollographql.com/docs/federation/).
 
 ## Getting started
 
@@ -35,7 +34,7 @@ require "graphql/stitching"
 
 ## Usage
 
-The quickest way to start is to use the provided [`Client`](./docs/client.md) component that wraps a stitched graph in an executable workflow (with optional query plan caching hooks):
+The [`Client`](./docs/client.md) component builds a stitched graph wrapped in an executable workflow (with optional query plan caching hooks):
 
 ```ruby
 movies_schema = <<~GRAPHQL
@@ -75,7 +74,7 @@ result = client.execute(
 
 Schemas provided in [location settings](./docs/composer.md#performing-composition) may be class-based schemas with local resolvers (locally-executable schemas), or schemas built from SDL strings (schema definition language parsed using `GraphQL::Schema.from_definition`) and mapped to remote locations via [executables](#executables).
 
-While the `Client` constructor is an easy quick start, the library also has several discrete components that can be assembled into custom workflows:
+While `Client` is sufficient for most usecases, the library offers several discrete components that can be assembled into tailored workflows:
 
 - [Composer](./docs/composer.md) - merges and validates many schemas into one supergraph.
 - [Supergraph](./docs/supergraph.md) - manages the combined schema, location routing maps, and executable resources. Can be exported, cached, and rehydrated.
@@ -88,17 +87,59 @@ While the `Client` constructor is an easy quick start, the library also has seve
 
 ![Merging types](./docs/images/merging.png)
 
-To facilitate this merging of types, stitching must know how to cross-reference and fetch each variant of a type from its source location using [resolver queries](#merged-type-resolver-queries). For those in an Apollo ecosystem, there's also _limited_ support for merging types though a [federation `_entities` protocol](./docs/federation_entities.md).
+To facilitate this, schemas should be designed around [merged type keys](#merged-type-keys) that stitching can cross-reference and fetch across locations using [type resolver queries](#merged-type-resolver-queries). For those in an Apollo ecosystem, there's also _limited_ support for merging types though a [federation `_entities` protocol](./docs/federation_entities.md).
+
+### Merged type keys
+
+Foreign keys in a GraphQL schema frequently look like the `Product.imageId` field here:
+
+```graphql
+# -- Products schema:
+
+type Product {
+  id: ID!
+  imageId: ID!
+}
+
+# -- Images schema:
+
+type Image {
+  id: ID!
+  url: String!
+}
+```
+
+However, this design does not lend itself to merging types across locations. A simple schema refactor makes this foreign key more expressive as an entity type, and turns the key into an _object_ that will merge with analogous objects in other locations:
+
+```graphql
+# -- Products schema:
+
+type Product {
+  id: ID!
+  image: Image!
+}
+
+type Image {
+  id: ID!
+}
+
+# -- Images schema:
+
+type Image {
+  id: ID!
+  url: String!
+}
+```
 
 ### Merged type resolver queries
 
-Types merge through resolver queries identified by a `@stitch` directive:
+Each location that provides a unique variant of a type must provide at least one _resolver query_ for accessing it. Type resolvers are root queries identified by a `@stitch` directive:
 
 ```graphql
 directive @stitch(key: String!, arguments: String) repeatable on FIELD_DEFINITION
 ```
 
-This directive (or [static configuration](#sdl-based-schemas)) is applied to root queries where a merged type may be accessed in each location, and a `key` argument specifies a field needed from other locations to be used as a query argument.
+This directive tells stitching how to cross-reference and fetch types from across locations, for example:
 
 ```ruby
 products_schema = <<~GRAPHQL
@@ -151,10 +192,10 @@ type Query {
 }
 ```
 
-* The `@stitch` directive is applied to a root query where the merged type may be accessed. The merged type identity is inferred from the field return.
-* The `key: "id"` parameter indicates that an `{ id }` must be selected from prior locations so it may be submitted as an argument to this query. The query argument used to send the key is inferred when possible ([more on arguments](#argument-shapes) later).
+* The `@stitch` directive marks a root query where the merged type may be accessed. The merged type identity is inferred from the field return. This identifier can also be provided as [static configuration](#sdl-based-schemas).
+* The `key: "id"` parameter indicates that an `{ id }` must be selected from prior locations so it can be submitted as an argument to this query. The query argument used to send the key is inferred when possible ([more on arguments](#argument-shapes) later).
 
-Each location that provides a unique variant of a type must provide at least one resolver query for the type. The exception to this requirement are [outbound-only types](./docs/mechanics.md#outbound-only-merged-types) and/or [foreign key types](./docs/mechanics.md##modeling-foreign-keys-for-stitching) that contain no exclusive data:
+Merged types must have a resolver query in each of their possible locations. The one exception to this requirement are [outbound-only types](./docs/mechanics.md#outbound-only-merged-types) that contain no exclusive data, such as foreign keys:
 
 ```graphql
 type Product {
@@ -162,7 +203,7 @@ type Product {
 }
 ```
 
-The above representation of a `Product` type contains nothing but a key that is available in other locations. Therefore, this representation will never require an inbound request to fetch it, and its resolver query may be omitted.
+The above type contains nothing but a key field that is available in other locations. Therefore, this variant will never require an inbound request to fetch it, and its resolver query may be omitted from this location.
 
 #### List queries
 
@@ -249,7 +290,7 @@ type Query {
 }
 ```
 
-See [resolver arguments](./docs/resolver.md#arguments) for full documentation on shaping input.
+See [resolver arguments](./docs/type_resolver.md#arguments) for full documentation on shaping input.
 
 #### Composite type keys
 
@@ -258,7 +299,6 @@ Resolver keys may make composite selections for multiple key fields and/or neste
 ```graphql
 interface FieldOwner {
   id: ID!
-  type: String!
 }
 type CustomField {
   owner: FieldOwner!
@@ -273,8 +313,8 @@ input CustomFieldLookup {
 
 type Query {
   customFields(lookups: [CustomFieldLookup!]!): [CustomField]! @stitch(
-    key: "owner { id type } key",
-    arguments: "lookups: { ownerId: $.owner.id, ownerType: $.owner.type, key: $.key }"
+    key: "owner { id __typename } key",
+    arguments: "lookups: { ownerId: $.owner.id, ownerType: $.owner.__typename, key: $.key }"
   )
 }
 ```
@@ -443,7 +483,6 @@ The [Executor](./docs/executor.md) component builds atop the Ruby fiber-based im
 
 ## Additional topics
 
-- [Modeling foreign keys for stitching](./docs/mechanics.md##modeling-foreign-keys-for-stitching)
 - [Deploying a stitched schema](./docs/mechanics.md#deploying-a-stitched-schema)
 - [Schema composition merge patterns](./docs/composer.md#merge-patterns)
 - [Subscriptions tutorial](./docs/subscriptions.md)
@@ -458,6 +497,7 @@ This repo includes working examples of stitched schemas running across small Rac
 
 - [Merged types](./examples/merged_types)
 - [File uploads](./examples/file_uploads)
+- [Subscriptions](./examples/subscriptions)
 
 ## Tests
 

data/docs/client.md

@@ -68,6 +68,12 @@ client.on_cache_write do |request, payload|
 end
 ```
 
+All request digests use SHA2 by default. You can swap in [a faster algorithm](https://github.com/Shopify/blake3-rb) and/or add base scoping by reconfiguring the stitching library:
+
+```ruby
+GraphQL::Stitching.digest { |str| Digest::MD5.hexdigest("v2/#{str}") }
+```
+
 Note that inlined input data works against caching, so you should _avoid_ these input literals when possible:
 
 ```graphql

data/docs/composer.md

@@ -10,6 +10,7 @@ A `Composer` may be constructed with optional settings that tune how it builds a
 composer = GraphQL::Stitching::Composer.new(
   query_name: "Query",
   mutation_name: "Mutation",
+  subscription_name: "Subscription",
   description_merger: ->(values_by_location, info) { values_by_location.values.join("\n") },
   deprecation_merger: ->(values_by_location, info) { values_by_location.values.first },
   default_value_merger: ->(values_by_location, info) { values_by_location.values.first },
@@ -24,6 +25,8 @@ Constructor arguments:
 
 - **`mutation_name:`** _optional_, the name of the root mutation type in the composed schema; `Mutation` by default. The root mutation types from all location schemas will be merged into this type, regardless of their local names.
 
+- **`subscription_name:`** _optional_, the name of the root subscription type in the composed schema; `Subscription` by default. The root subscription types from all location schemas will be merged into this type, regardless of their local names.
+
 - **`description_merger:`** _optional_, a [value merger function](#value-merger-functions) for merging element description strings from across locations.
 
 - **`deprecation_merger:`** _optional_, a [value merger function](#value-merger-functions) for merging element deprecation strings from across locations.
@@ -98,17 +101,16 @@ Location settings have top-level keys that specify arbitrary location names, eac
 
 The strategy used to merge source schemas into the combined schema is based on each element type:
 
+- Arguments of fields, directives, and `InputObject` types intersect for each parent element across locations (an element's arguments must appear in all locations):
+  - Arguments must share a value type, and the strictest nullability across locations is used.
+  - Composition fails if argument intersection would eliminate a non-null argument.
+
 - `Object` and `Interface` types merge their fields and directives together:
   - Common fields across locations must share a value type, and the weakest nullability is used.
-  - Field and directive arguments merge using the same rules as `InputObject`.
   - Objects with unique fields across locations must implement [`@stitch` accessors](../README.md#merged-types).
   - Shared object types without `@stitch` accessors must contain identical fields.
   - Merged interfaces must remain compatible with all underlying implementations.
 
-- `InputObject` types intersect arguments from across locations (arguments must appear in all locations):
-  - Arguments must share a value type, and the strictest nullability across locations is used.
-  - Composition fails if argument intersection would eliminate a non-null argument.
-
 - `Enum` types merge their values based on how the enum is used:
   - Enums used anywhere as an argument will intersect their values (common values across all locations).
   - Enums used exclusively in read contexts will provide a union of values (all values across all locations).
@@ -118,7 +120,6 @@ The strategy used to merge source schemas into the combined schema is based on e
 - `Scalar` types are added for all scalar names across all locations.
 
 - `Directive` definitions are added for all distinct names across locations:
-  - Arguments merge using the same rules as `InputObject`.
   - Stitching directives (both definitions and assignments) are omitted.
 
 Note that the structure of a composed schema may change based on new schema additions and/or element usage (ie: changing input object arguments in one service may cause the intersection of arguments to change). Therefore, it's highly recommended that you use a [schema comparator](https://github.com/xuorig/graphql-schema_comparator) to flag regressions across composed schema versions.

data/docs/federation_entities.md

@@ -65,6 +65,6 @@ It's perfectly fine to mix and match schemas that implement an `_entities` query
 
 ### Federation features that will most definitly break
 
-- `@external` fields will confuse the stitching query planner.
+- `@external` fields will confuse the stitching query planner (as the fields aren't natively resolvable at the location).
 - `@requires` fields will not be sent any dependencies.
 - No support for Apollo composition directives.

data/docs/mechanics.md

@@ -1,47 +1,5 @@
 ## Schema Stitching, mechanics
 
-### Modeling foreign keys for stitching
-
-Foreign keys in a GraphQL schema typically look like the `Product.imageId` field here:
-
-```graphql
-# -- Products schema:
-
-type Product {
-  id: ID!
-  imageId: ID!
-}
-
-# -- Images schema:
-
-type Image {
-  id: ID!
-  url: String!
-}
-```
-
-However, this design does not lend itself to stitching where types need to _merge_ across locations. A simple schema refactor makes this foreign key more expressive as an entity type, and turns the key into an _object_ that will merge with analogous object types in other locations:
-
-```graphql
-# -- Products schema:
-
-type Product {
-  id: ID!
-  image: Image!
-}
-
-type Image {
-  id: ID!
-}
-
-# -- Images schema:
-
-type Image {
-  id: ID!
-  url: String!
-}
-```
-
 ### Deploying a stitched schema
 
 Among the simplest and most effective ways to manage a stitched schema is to compose it locally, write the composed SDL as a `.graphql` file in your repo, and then load the composed schema into a stitching client at runtime. For example, setup a `rake` task that loads/fetches subgraph schemas, composes them, and then writes the composed schema definition as a file committed to the repo:
@@ -94,7 +52,7 @@ class GraphQlController
 end
 ```
 
-This process assures that composition always happens before deployment where failures can be detected. Hot reloading of the supergraph can also be accommodated by uploading the composed schema to a sync location (cloud storage, etc) that is polled by the application runtime. When the schema changes, load it into a new stitching client and swap that into the application.
+This process assures that composition always happens before deployment where failures can be detected. Use CI to verify that the repo's supergraph output is always up to date. Hot reloading of the supergraph can also be accommodated by uploading the composed schema to a sync location (cloud storage, etc) that is polled by the application runtime. When the schema changes, load it into a new stitching client and swap that into the application.
 
 ### Field selection routing
 

data/docs/request.md

@@ -15,15 +15,15 @@ request = GraphQL::Stitching::Request.new(
 
 A `Request` provides the following information:
 
-- `req.document`: parsed AST of the GraphQL source
-- `req.variables`: a hash of user-submitted variables
-- `req.string`: the original GraphQL source string, or printed document
-- `req.digest`: a SHA2 of the request string
-- `req.normalized_string`: printed document string with consistent whitespace
-- `req.normalized_digest`: a SHA2 of the normalized string
-- `req.operation`: the operation definition selected for the request
-- `req.variable_definitions`: a mapping of variable names to their type definitions
-- `req.fragment_definitions`: a mapping of fragment names to their fragment definitions
+- `req.document`: parsed AST of the GraphQL source.
+- `req.variables`: a hash of user-submitted variables.
+- `req.string`: the original GraphQL source string, or printed document.
+- `req.digest`: a digest of the request string, hashed by the `Stitching.digest` implementation.
+- `req.normalized_string`: printed document string with consistent whitespace.
+- `req.normalized_digest`: a digest of the normalized string, hashed by the `Stitching.digest` implementation.
+- `req.operation`: the operation definition selected for the request.
+- `req.variable_definitions`: a mapping of variable names to their type definitions.
+- `req.fragment_definitions`: a mapping of fragment names to their fragment definitions.
 
 ### Request lifecycle
 
@@ -32,5 +32,5 @@ component, or you may invoke them manually:
 
 1. `request.validate`: runs static validations on the request using the combined schema.
 2. `request.prepare!`: inserts variable defaults and pre-renders skip/include conditional shaping.
-3. `request.plan`: builds a plan for the request. May act as a setting for plans pulled from cache.
+3. `request.plan`: builds a plan for the request. May act as a setter for plans pulled from cache.
 4. `request.execute`: executes the request, and returns the resulting data.

data/docs/subscriptions.md

@@ -4,7 +4,7 @@ Stitching is an interesting prospect for subscriptions because socket-based inte
 
 ### Composing a subscriptions schema
 
-For simplicity, subscription resolvers should exist together in a single schema (multiple schemas with subscriptions probably aren't worth the confusion). This subscriptions schema may provide basic entity types that will merge with other locations. For example, here's a bare-bones subscriptions schema:
+For simplicity, subscription resolvers are best kept together in a single schema (multiple schemas with subscriptions probably aren't worth the confusion). This subscriptions schema may provide basic entity types that will merge with other locations. For example, here's a bare-bones subscriptions schema:
 
 ```ruby
 class SubscriptionSchema < GraphQL::Schema
@@ -88,7 +88,7 @@ class EntitiesSchema < GraphQL::Schema
 end
 ```
 
-These schemas can be composed as normal into a stitching client. The subscriptions schema must be locally-executable while other entity schema(s) may be served from anywhere:
+These schemas can be composed as normal into a stitching client. The subscriptions schema must be locally-executable while the other entity schema(s) may be served from anywhere:
 
 ```ruby
 StitchedSchema = GraphQL::Stitching::Client.new(locations: {
@@ -104,7 +104,7 @@ StitchedSchema = GraphQL::Stitching::Client.new(locations: {
 
 ### Serving stitched subscriptions
 
-Once you've stitched a schema with subscriptions, it gets called as part of three workflows:
+Once you've composed a schema with subscriptions, it gets called as part of three workflows:
 
 1. Controller - handles normal query and mutation requests recieved via HTTP.
 2. Channel - handles subscription-create requests recieved through a socket connection.
@@ -122,7 +122,7 @@ class GraphqlController < ApplicationController
   def execute
     result = StitchedSchema.execute(
       params[:query],
-      context: {}, 
+      context: {},
       variables: params[:variables],
       operation_name: params[:operationName],
     )
@@ -164,7 +164,7 @@ class GraphqlChannel < ApplicationCable::Channel
 
   def unsubscribed
     @subscription_ids.each { |sid|
-      # Go directly through the subscriptions subschema 
+      # Go directly through the subscriptions subschema
       # when managing/triggering subscriptions:
       SubscriptionSchema.subscriptions.delete_subscription(sid)
     }
@@ -172,7 +172,7 @@ class GraphqlChannel < ApplicationCable::Channel
 end
 ```
 
-What happens behind the scenes here is that stitching filters the `execute` request down to just subscription selections, and passes those through to the subscriptions subschema where they register an event binding. The subscriber response gets stitched while passing back up through the stitching client.
+What happens behind the scenes here is that stitching filters the `execute` request down to just subscription selections, and passes those through to the subscriptions subschema where they register an event binding. The subscriber response gets stitched while passing back out through the stitching client. The `unsubscribed` method works directly with the subschema where subscriptions are managed.
 
 #### Plugin
 
@@ -181,14 +181,14 @@ Lastly, update events trigger with the filtered subscriptions selection, so must
 ```ruby
 class StitchedActionCableSubscriptions < GraphQL::Subscriptions::ActionCableSubscriptions
   def execute_update(subscription_id, event, object)
-    super(subscription_id, event, object).tap do |result|
-      result.context[:stitch_subscription_update]&.call(result)
-    end
+    result = super(subscription_id, event, object)
+    result.context[:stitch_subscription_update]&.call(result)
+    result
   end
 end
 
 class SubscriptionSchema < GraphQL::Schema
-  # switch the plugin on the subscriptions schema to use the patched class... 
+  # switch the plugin on the subscriptions schema to use the patched class...
   use StitchedActionCableSubscriptions
 end
 ```
@@ -200,7 +200,7 @@ Subscription update events are triggered as normal directly through the subscrip
 ```ruby
 class Comment < ApplicationRecord
   after_create :trigger_subscriptions
-  
+
   def trigger_subscriptions
     SubscriptionsSchema.subscriptions.trigger(:comment_added_to_post, { post_id: post_id }, self)
   end

data/docs/supergraph.md

@@ -9,17 +9,17 @@ A Supergraph is designed to be composed, cached, and restored. Calling `to_defin
 ```ruby
 supergraph_sdl = supergraph.to_definition
 
-# stash this composed schema in a cache...
-$cache.set("cached_supergraph_sdl", supergraph_sdl)
-
-# or, write the composed schema as a file into your repo...
+# write the composed schema as a file into your repo...
 File.write("supergraph/schema.graphql", supergraph_sdl)
+
+# or, stash this composed schema in a cache...
+$cache.set("cached_supergraph_sdl", supergraph_sdl)
 ```
 
 To restore a Supergraph, call `from_definition` providing the cached SDL string and a hash of executables keyed by their location names:
 
 ```ruby
-supergraph_sdl = $cache.get("cached_supergraph_sdl")
+supergraph_sdl = File.read("supergraph/schema.graphql")
 
 supergraph = GraphQL::Stitching::Supergraph.from_definition(
   supergraph_sdl,

data/docs/{resolver.md → type_resolver.md}

@@ -1,10 +1,10 @@
-## GraphQL::Stitching::Resolver
+## GraphQL::Stitching::TypeResolver
 
-A `Resolver` contains all information about a root query used by stitching to fetch location-specific variants of a merged type. Specifically, resolvers manage parsed keys and argument structures.
+A `TypeResolver` contains all information about a root query used by stitching to fetch location-specific variants of a merged type. Specifically, resolvers manage parsed keys and argument structures.
 
 ### Arguments
 
-Resolvers configure arguments through a template string of [GraphQL argument literal syntax](https://spec.graphql.org/October2021/#sec-Language.Arguments). This allows sending multiple arguments that intermix stitching keys with complex object shapes and other static values.
+Type resolvers configure arguments through a template string of [GraphQL argument literal syntax](https://spec.graphql.org/October2021/#sec-Language.Arguments). This allows sending multiple arguments that intermix stitching keys with complex object shapes and other static values.
 
 #### Key insertions
 

data/examples/subscriptions/app/graphql/subscriptions_schema.rb

@@ -1,9 +1,9 @@
 class SubscriptionsSchema < GraphQL::Schema
   class StitchedActionCableSubscriptions < GraphQL::Subscriptions::ActionCableSubscriptions
     def execute_update(subscription_id, event, object)
-      super(subscription_id, event, object).tap do |result|
-        result.context[:stitch_subscription_update]&.call(result)
-      end
+      result = super(subscription_id, event, object)
+      result.context[:stitch_subscription_update]&.call(result)
+      result
     end
   end
 

data/gemfiles/graphql_2.0.0.gemfile

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-gemspec
 
 gem 'graphql', '~> 2.0.0'
+gem 'warning'
+gem 'minitest-stub-const'
+
+gemspec path: "../"

data/gemfiles/graphql_2.1.0.gemfile

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-gemspec
 
 gem 'graphql', '~> 2.1.0'
+gem 'warning'
+gem 'minitest-stub-const'
+
+gemspec path: "../"

data/gemfiles/graphql_2.2.0.gemfile

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-gemspec
 
 gem 'graphql', '~> 2.2.0'
+gem 'warning'
+gem 'minitest-stub-const'
+
+gemspec path: "../"

data/gemfiles/graphql_2.3.0.gemfile

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'graphql', '~> 2.3.0'
+gem 'warning'
+gem 'minitest-stub-const'
+
+gemspec path: "../"

data/graphql-stitching.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'graphql', '>= 1.13.9'
+  spec.add_runtime_dependency 'graphql', '>= 2.0'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 12.0'

data/lib/graphql/stitching/client.rb

@@ -7,8 +7,6 @@ module GraphQL
     # Client is an out-of-the-box helper that assembles all 
     # stitching components into a workflow that executes requests.
     class Client
-      class ClientError < StitchingError; end
-
       # @return [Supergraph] composed supergraph that services incoming requests.
       attr_reader :supergraph
 
@@ -18,9 +16,9 @@ module GraphQL
       # @param composer [Composer] optional, a pre-configured composer instance for use with `locations` configuration.
       def initialize(locations: nil, supergraph: nil, composer: nil)
         @supergraph = if locations && supergraph
-          raise ClientError, "Cannot provide both locations and a supergraph."
+          raise ArgumentError, "Cannot provide both locations and a supergraph."
         elsif supergraph && !supergraph.is_a?(Supergraph)
-          raise ClientError, "Provided supergraph must be a GraphQL::Stitching::Supergraph instance."
+          raise ArgumentError, "Provided supergraph must be a GraphQL::Stitching::Supergraph instance."
         elsif supergraph
           supergraph
         else
@@ -58,17 +56,17 @@ module GraphQL
       end
 
       def on_cache_read(&block)
-        raise ClientError, "A cache read block is required." unless block_given?
+        raise ArgumentError, "A cache read block is required." unless block_given?
         @on_cache_read = block
       end
 
       def on_cache_write(&block)
-        raise ClientError, "A cache write block is required." unless block_given?
+        raise ArgumentError, "A cache write block is required." unless block_given?
         @on_cache_write = block
       end
 
       def on_error(&block)
-        raise ClientError, "An error handler block is required." unless block_given?
+        raise ArgumentError, "An error handler block is required." unless block_given?
         @on_error = block
       end
 

data/lib/graphql/stitching/composer/{resolver_config.rb → type_resolver_config.rb}

@@ -2,7 +2,7 @@
 
 module GraphQL::Stitching
   class Composer
-    class ResolverConfig
+    class TypeResolverConfig
       ENTITY_TYPENAME = "_Entity"
       ENTITIES_QUERY = "_entities"
 
@@ -30,7 +30,7 @@ module GraphQL::Stitching
             entity_type.directives.each do |directive|
               next unless directive.graphql_name == "key"
 
-              key = Resolver.parse_key(directive.arguments.keyword_arguments.fetch(:fields))
+              key = TypeResolver.parse_key(directive.arguments.keyword_arguments.fetch(:fields))
               key_fields = key.map { "#{_1.name}: $.#{_1.name}" }
               field_path = "#{location}._entities"
 

data/lib/graphql/stitching/composer/{validate_resolvers.rb → validate_type_resolvers.rb}

@@ -2,7 +2,7 @@
 
 module GraphQL::Stitching
   class Composer
-    class ValidateResolvers < BaseValidator
+    class ValidateTypeResolvers < BaseValidator
 
       def perform(supergraph, composer)
         root_types = [