graphql-stitching 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 227a7813eed1050c451d9bbee900305cfbac67aff35baa88f6ba9551535d1e97
-  data.tar.gz: 1533e6109c6a72af3f7d07891714c09a73476ca0a5a7ea53d83cbe829564ace3
+  metadata.gz: da2c14565c38d14e4e49f51ff2027f89a2ee4c0313102083c9ea3baadbcd02d4
+  data.tar.gz: eec311845ed143af3f8d598c22f2b6026a46d34868fd7546abfb585a8fed6ebc
 SHA512:
-  metadata.gz: 8342158a10bc25fb68c833a3366c2fd6e831cf86cccf15a2491067680bb5299700783af57fd5042b394131b48759f077d32f4b210149a2b3cb34e43e3cca77ff
-  data.tar.gz: 7313c93bb8cedf7ac06708a1f7fba6a2c46196982380a28a6d9244cf7320ad0149cb17df8ecb1abe438e14eac08b2f71e154dd9f2d6c3095be8e849c46061e16
+  metadata.gz: 87608b9f5391ec190e0d0f534e1a58447f056b37e37c3f569d908b2c7043d40ef38732b3bff6e4975d81d34b04bb84cd88f809b364d73aeade68675f8c35f35f
+  data.tar.gz: eb1e085ad36c36b52b0c871d9d8f3ff0ca5b6d29ff51c1ea6cd9564c0cdba8e554381615099a331426f4857b82049290287c79cc1338388a36027cb451aa3bb9

data/.github/workflows/ci.yml

@@ -14,6 +14,8 @@ jobs:
         include:
           - gemfile: Gemfile
             ruby: 3.3
+          - gemfile: gemfiles/graphql_2.4.0.gemfile
+            ruby: 3.2
           - gemfile: gemfiles/graphql_2.3.0.gemfile
             ruby: 3.2
           - gemfile: gemfiles/graphql_2.2.0.gemfile

data/README.md

@@ -74,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 `Client` is sufficient for most usecases, the library offers several discrete components that can be assembled into tailored workflows:
+A Client bundles up the component parts of stitching, which are worth familiarizing with:
 
 - [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.
@@ -87,7 +87,7 @@ While `Client` is sufficient for most usecases, the library offers several discr
 
 ![Merging types](./docs/images/merging.png)
 
-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).
+To facilitate this, schemas should be designed around **merged type keys** that stitching can cross-reference and fetch across locations using **type resolver queries** (discussed below). For those in an Apollo ecosystem, there's also _limited_ support for merging types though [federation `_entities`](./docs/federation_entities.md).
 
 ### Merged type keys
 

data/gemfiles/graphql_2.4.0.gemfile

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

data/lib/graphql/stitching/composer.rb

@@ -13,13 +13,11 @@ module GraphQL
     class Composer
       # @api private
       NO_DEFAULT_VALUE = begin
-        class T < GraphQL::Schema::Object
-          field(:f, String) do
-            argument(:a, String)
-          end
+        t = Class.new(GraphQL::Schema::Object) do
+          field(:f, String) { _1.argument(:a, String) }
         end
 
-        T.get_field("f").get_argument("a").default_value
+        t.get_field("f").get_argument("a").default_value
       end
 
       # @api private
@@ -103,9 +101,8 @@ module GraphQL
         @subgraph_types_by_name_and_location = schemas.each_with_object({}) do |(location, schema), memo|
           raise CompositionError, "Location keys must be strings" unless location.is_a?(String)
 
-          introspection_types = schema.introspection_system.types.keys
           schema.types.each do |type_name, subgraph_type|
-            next if introspection_types.include?(type_name)
+            next if subgraph_type.introspection?
 
             if type_name == @query_name && subgraph_type != schema.query
               raise CompositionError, "Query name \"#{@query_name}\" is used by non-query type in #{location} schema."
@@ -373,6 +370,7 @@ module GraphQL
             deprecation_reason: merge_deprecations(type_name, fields_by_location, field_name: field_name),
             type: Util.unwrap_non_null(type),
             null: !type.non_null?,
+            connection: false,
             camelize: false,
           )
 
@@ -403,14 +401,6 @@ module GraphQL
             next
           end
 
-          # Getting double args sometimes... why?
-          begin
-            next if owner.arguments(GraphQL::Query::NullContext.instance, false).key?(argument_name)
-          rescue ArgumentError
-            # pre- graphql v2.4.5
-            next if owner.arguments.key?(argument_name)
-          end
-
           kwargs = {}
           default_values_by_location = arguments_by_location.each_with_object({}) do |(location, argument), memo|
             next if argument.default_value == NO_DEFAULT_VALUE
@@ -648,9 +638,8 @@ module GraphQL
         writes = []
 
         schemas.each do |schema|
-          introspection_types = schema.introspection_system.types.keys
           schema.types.each_value do |type|
-            next if introspection_types.include?(type.graphql_name)
+            next if type.introspection?
 
             if type.kind.object? || type.kind.interface?
               type.fields.each_value do |field|

data/lib/graphql/stitching/executor/shaper.rb

@@ -31,8 +31,11 @@ module GraphQL::Stitching
           when GraphQL::Language::Nodes::Field
             field_name = node.alias || node.name
 
-            next if introspection_field?(parent_type, node) do |is_root_typename|
-              raw_object[field_name] = @root_type.graphql_name if is_root_typename
+            if @request.query.get_field(parent_type, node.name).introspection?
+              if node.name == TYPENAME && parent_type == @root_type
+                raw_object[field_name] = @root_type.graphql_name
+              end
+              next
             end
 
             node_type = @supergraph.memoized_schema_fields(parent_type.graphql_name)[node.name].type
@@ -100,21 +103,6 @@ module GraphQL::Stitching
         resolved_list
       end
 
-      def introspection_field?(parent_type, node)
-        return false unless node.name.start_with?("__")
-        is_root = parent_type == @root_type
-
-        case node.name
-        when TYPENAME
-          yield(is_root)
-          true
-        when "__schema", "__type"
-          is_root && @request.operation.operation_type == "query"
-        else
-          false
-        end
-      end
-
       def typename_in_type?(typename, type)
         return true if type.graphql_name == typename
 

data/lib/graphql/stitching/supergraph/to_definition.rb

@@ -17,10 +17,9 @@ module GraphQL::Stitching
         field_map = {}
         resolver_map = {}
         possible_locations = {}
-        introspection_types = schema.introspection_system.types.keys
 
         schema.types.each do |type_name, type|
-          next if introspection_types.include?(type_name)
+          next if type.introspection?
 
           # Collect/build key definitions for each type
           locations_by_key = type.directives.each_with_object({}) do |directive, memo|

data/lib/graphql/stitching/supergraph.rb

@@ -20,8 +20,6 @@ module GraphQL
 
       def initialize(schema:, fields: {}, resolvers: {}, executables: {})
         @schema = schema
-        @schema.use(GraphQL::Schema::AlwaysVisible)
-
         @resolvers = resolvers
         @resolvers_by_version = nil
         @fields_by_type_and_location = nil

data/lib/graphql/stitching/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module Stitching
-    VERSION = "1.6.0"
+    VERSION = "1.6.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-stitching
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Greg MacWilliam
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-17 00:00:00.000000000 Z
+date: 2025-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -155,6 +155,7 @@ files:
 - gemfiles/graphql_2.1.0.gemfile
 - gemfiles/graphql_2.2.0.gemfile
 - gemfiles/graphql_2.3.0.gemfile
+- gemfiles/graphql_2.4.0.gemfile
 - graphql-stitching.gemspec
 - lib/graphql/stitching.rb
 - lib/graphql/stitching/client.rb