graphql-stitching 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b81b29cdab4287ba09d6081595b83b4edcc96f0921790483f44d53ff946fb441
-  data.tar.gz: 39c3351dbb4a712aa4f43006017660a961a2056b82b96a5a14b3110b1ecfad44
+  metadata.gz: a72adc399f618790fc1aefe1b6dca07709d45f10cc2936f5c3978d75b5d3f8c2
+  data.tar.gz: d45d7b73045755a750d6d4334e00e30f33c5124f83c849c24669c98f7912ca92
 SHA512:
-  metadata.gz: d376c15fa17088797be0b2f7ab42a94cf24050f68b37640aac88cc13a526d56f0ee366290b246e4cc6838a60050b9d9073610366cb7ad5bdb0a9a3435e688dd4
-  data.tar.gz: 6a4fda5651bdd8794f59497e32bb9421c1d3f931a706483b55088597efdc9fe0bb1166dca16a66832c4ded42a21c89de2a7a8f2dc36cfb51bc44cfd40df9c4da
+  metadata.gz: 5302083cb9047ad77aa5e6276d02e3bdac8256ef328edb8c72b9248efbb279c48bb3e34b8e220f131d3efa541fdaa1b682fe4622501900defe797217cbc365c8
+  data.tar.gz: 4e238de4607764406ac52634daafc293c1b5fe672457106ff1070e77bc4d52cdc1ace02ce46ca4cacbcde7648d8a4f2bb8cc0321157dfb3c85c3ec40d5f82e43

data/lib/graphql/stitching/{shaper.rb → executor/shaper.rb}

@@ -1,8 +1,8 @@
 # typed: false
 # frozen_string_literal: true
 
-module GraphQL
-  module Stitching
+module GraphQL::Stitching
+  class Executor
     # Shapes the final results payload to the request selection and schema definition.
     # This eliminates unrequested export selections and applies null bubbling.
     # @api private

data/lib/graphql/stitching/executor.rb

@@ -3,6 +3,7 @@
 require "json"
 require_relative "./executor/resolver_source"
 require_relative "./executor/root_source"
+require_relative "./executor/shaper"
 
 module GraphQL
   module Stitching
@@ -33,7 +34,7 @@ module GraphQL
         result = {}
 
         if @data && @data.length > 0
-          result["data"] = raw ? @data : GraphQL::Stitching::Shaper.new(@request).perform!(@data)
+          result["data"] = raw ? @data : Shaper.new(@request).perform!(@data)
         end
 
         if @errors.length > 0

data/lib/graphql/stitching/plan.rb

@@ -2,7 +2,7 @@
 
 module GraphQL
   module Stitching
-    # Immutable structures representing a query plan.
+    # Immutable (in theory) structures representing a query plan.
     # May serialize to/from JSON.
     class Plan
       Op = Struct.new(

data/lib/graphql/stitching/{planner_step.rb → planner/step.rb}

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-module GraphQL
-  module Stitching
+module GraphQL::Stitching
+  class Planner
     # A planned step in the sequence of stitching entrypoints together.
     # This is a mutable object that may change throughout the planning process.
     # It ultimately builds an immutable Plan::Op at the end of planning.
-    class PlannerStep
+    class Step
       GRAPHQL_PRINTER = GraphQL::Language::Printer.new
 
       attr_reader :index, :location, :parent_type, :operation_type, :path

data/lib/graphql/stitching/planner.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "./planner/step"
+
 module GraphQL
   module Stitching
     class Planner
@@ -85,7 +87,7 @@ module GraphQL
         end
 
         if step.nil?
-          @steps_by_entrypoint[entrypoint] = PlannerStep.new(
+          @steps_by_entrypoint[entrypoint] = Step.new(
             index: next_index,
             after: parent_index,
             location: location,
@@ -261,7 +263,7 @@ module GraphQL
 
         # B.4) Add a `__typename` export to abstracts and types that implement
         # fragments so that resolved type information is available during execution.
-        if requires_typename
+        if requires_typename && !locale_selections.include?(Resolver::TYPENAME_EXPORT_NODE)
           locale_selections << Resolver::TYPENAME_EXPORT_NODE
         end
 
@@ -277,6 +279,10 @@ module GraphQL
             route.reduce(locale_selections) do |parent_selections, resolver|
               # E.1) Add the key of each resolver query into the prior location's selection set.
               parent_selections.push(*resolver.key.export_nodes) if resolver.key
+              parent_selections.uniq! do |node|
+                export_node = node.is_a?(GraphQL::Language::Nodes::Field) && Resolver.export_key?(node.alias)
+                export_node ? node.alias : node
+              end
 
               # E.2) Add a planner step for each new entrypoint location.
               add_step(
@@ -289,8 +295,6 @@ module GraphQL
               ).selections
             end
           end
-
-          locale_selections.uniq! { _1.alias || _1.name }
         end
 
         locale_selections

data/lib/graphql/stitching/resolver.rb

@@ -47,7 +47,7 @@ module GraphQL
       end
 
       def version
-        @version ||= Digest::SHA2.hexdigest(as_json.to_json)
+        @version ||= Digest::SHA2.hexdigest("#{Stitching::VERSION}/#{as_json.to_json}")
       end
 
       def ==(other)

data/lib/graphql/stitching/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module Stitching
-    VERSION = "1.4.2"
+    VERSION = "1.4.3"
   end
 end

data/lib/graphql/stitching.rb

@@ -26,16 +26,14 @@ module GraphQL
 end
 
 require_relative "stitching/supergraph"
-require_relative "stitching/resolver"
 require_relative "stitching/client"
 require_relative "stitching/composer"
 require_relative "stitching/executor"
 require_relative "stitching/http_executable"
 require_relative "stitching/plan"
-require_relative "stitching/planner_step"
 require_relative "stitching/planner"
 require_relative "stitching/request"
-require_relative "stitching/shaper"
+require_relative "stitching/resolver"
 require_relative "stitching/skip_include"
 require_relative "stitching/util"
 require_relative "stitching/version"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-stitching
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Greg MacWilliam
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-03 00:00:00.000000000 Z
+date: 2024-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -120,15 +120,15 @@ files:
 - lib/graphql/stitching/executor.rb
 - lib/graphql/stitching/executor/resolver_source.rb
 - lib/graphql/stitching/executor/root_source.rb
+- lib/graphql/stitching/executor/shaper.rb
 - lib/graphql/stitching/http_executable.rb
 - lib/graphql/stitching/plan.rb
 - lib/graphql/stitching/planner.rb
-- lib/graphql/stitching/planner_step.rb
+- lib/graphql/stitching/planner/step.rb
 - lib/graphql/stitching/request.rb
 - lib/graphql/stitching/resolver.rb
 - lib/graphql/stitching/resolver/arguments.rb
 - lib/graphql/stitching/resolver/keys.rb
-- lib/graphql/stitching/shaper.rb
 - lib/graphql/stitching/skip_include.rb
 - lib/graphql/stitching/supergraph.rb
 - lib/graphql/stitching/supergraph/key_directive.rb