graphql-stitching 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a0b6a79a253614edadb1151490e42e32164e9f10c8e110806978160efd8b482
-  data.tar.gz: ff9d5a50b4bc41392a2777fc7bbdf401820a0fea899ef43736047f0efb196742
+  metadata.gz: ccc67e1b52f1a0688d25958d1955580c7f88a8115dc6b6b6905f785da94089db
+  data.tar.gz: 8e0925fb1ad0584bce11672be24868dc261cf680f8f88acdff87a7ca3819d9f8
 SHA512:
-  metadata.gz: ffb8d232df37ff5b858f95344566774c314132c89bd4353b84ad603d54f1242581df452aef50db0ec4193428a6de72179063bf1213cd74ce0038b0a5cd5aad9b
-  data.tar.gz: 585e94aaaf146a642f36cb184c91e69aacd8ed9988fd4c4cfc350feb83662b4955cb72d5efe2bdf7606f198a5f03b51d0f809fade8ba8e25367479d3d5902c44
+  metadata.gz: 9213dbd90d0fc0caf10a09b9ba68bfbfe072c3cce9d51c47623b0d5edabb9bfe1eac849fb3135bade04863c2ca9b62c42c2f67b469f1fc268f039fab15f17372
+  data.tar.gz: c62c51fda4c9210ba71c9be894e7a31fe3346c0e4d49ac57632efa32b8db9809174b6d0fb048eddc1437584c57d7f2bd748e4fab3f1e1440c2d5c6f3647657dd

data/lib/graphql/stitching/composer.rb

@@ -8,8 +8,8 @@ module GraphQL
 
       attr_reader :query_name, :mutation_name, :candidate_types_by_name_and_location, :schema_directives
 
-      DEFAULT_VALUE_MERGER = ->(values_by_location, _info) { values_by_location.values.find { !_1.nil? } }
-      DEFAULT_ROOT_FIELD_LOCATION_SELECTOR = ->(locations, _info) { locations.last }
+      BASIC_VALUE_MERGER = ->(values_by_location, _info) { values_by_location.values.find { !_1.nil? } }
+      BASIC_ROOT_FIELD_LOCATION_SELECTOR = ->(locations, _info) { locations.last }
 
       VALIDATORS = [
         "ValidateInterfaces",
@@ -21,15 +21,17 @@ module GraphQL
         mutation_name: "Mutation",
         description_merger: nil,
         deprecation_merger: nil,
+        default_value_merger: nil,
         directive_kwarg_merger: nil,
         root_field_location_selector: nil
       )
         @query_name = query_name
         @mutation_name = mutation_name
-        @description_merger = description_merger || DEFAULT_VALUE_MERGER
-        @deprecation_merger = deprecation_merger || DEFAULT_VALUE_MERGER
-        @directive_kwarg_merger = directive_kwarg_merger || DEFAULT_VALUE_MERGER
-        @root_field_location_selector = root_field_location_selector || DEFAULT_ROOT_FIELD_LOCATION_SELECTOR
+        @description_merger = description_merger || BASIC_VALUE_MERGER
+        @deprecation_merger = deprecation_merger || BASIC_VALUE_MERGER
+        @default_value_merger = default_value_merger || BASIC_VALUE_MERGER
+        @directive_kwarg_merger = directive_kwarg_merger || BASIC_VALUE_MERGER
+        @root_field_location_selector = root_field_location_selector || BASIC_ROOT_FIELD_LOCATION_SELECTOR
         @stitch_directives = {}
       end
 
@@ -214,17 +216,17 @@ module GraphQL
         builder = self
 
         # "value" => "location" => enum_value
-        enum_values_by_value_location = types_by_location.each_with_object({}) do |(location, type_candidate), memo|
+        enum_values_by_name_location = types_by_location.each_with_object({}) do |(location, type_candidate), memo|
           type_candidate.enum_values.each do |enum_value_candidate|
-            memo[enum_value_candidate.value] ||= {}
-            memo[enum_value_candidate.value][location] ||= {}
-            memo[enum_value_candidate.value][location] = enum_value_candidate
+            memo[enum_value_candidate.graphql_name] ||= {}
+            memo[enum_value_candidate.graphql_name][location] ||= {}
+            memo[enum_value_candidate.graphql_name][location] = enum_value_candidate
           end
         end
 
         # intersect input enum types
-        if enum_usage.fetch(type_name, []).include?(:write)
-          enum_values_by_value_location.reject! do |value, enum_values_by_location|
+        if enum_usage.fetch(type_name, EMPTY_ARRAY).include?(:write)
+          enum_values_by_name_location.reject! do |value, enum_values_by_location|
             types_by_location.keys.length != enum_values_by_location.keys.length
           end
         end
@@ -234,14 +236,14 @@ module GraphQL
           description(builder.merge_descriptions(type_name, types_by_location))
           builder.build_merged_directives(type_name, types_by_location, self)
 
-          enum_values_by_value_location.each do |value, enum_values_by_location|
-            enum_value = value(value,
-              value: value,
-              description: builder.merge_descriptions(type_name, enum_values_by_location, enum_value: value),
-              deprecation_reason: builder.merge_deprecations(type_name, enum_values_by_location, enum_value: value),
+          enum_values_by_name_location.each do |value_name, enum_values_by_location|
+            enum_value = value(value_name,
+              value: value_name,
+              description: builder.merge_descriptions(type_name, enum_values_by_location, enum_value: value_name),
+              deprecation_reason: builder.merge_deprecations(type_name, enum_values_by_location, enum_value: value_name),
             )
 
-            builder.build_merged_directives(type_name, enum_values_by_location, enum_value, enum_value: value)
+            builder.build_merged_directives(type_name, enum_values_by_location, enum_value, enum_value: value_name)
           end
         end
       end
@@ -362,8 +364,22 @@ module GraphQL
             next
           end
 
-          # Getting double args sometimes... why?
-          return if owner.arguments.any? { _1.first == argument_name }
+          # Getting double args sometimes on auto-generated connection types... why?
+          next if owner.arguments.any? { _1.first == argument_name }
+
+          kwargs = {}
+          default_values_by_location = arguments_by_location.each_with_object({}) do |(location, argument), memo|
+            next if argument.default_value.class == Object # << pass on NOT_CONFIGURED (todo: improve this check)
+            memo[location] = argument.default_value
+          end
+
+          if default_values_by_location.any?
+            kwargs[:default_value] = @default_value_merger.call(default_values_by_location, {
+              type_name: type_name,
+              field_name: field_name,
+              argument_name: argument_name,
+            })
+          end
 
           type = merge_value_types(type_name, value_types, argument_name: argument_name, field_name: field_name)
           schema_argument = owner.argument(
@@ -373,6 +389,7 @@ module GraphQL
             type: Util.unwrap_non_null(type),
             required: type.non_null?,
             camelize: false,
+            **kwargs,
           )
 
           build_merged_directives(type_name, arguments_by_location, schema_argument, field_name: field_name, argument_name: argument_name)
@@ -583,11 +600,11 @@ module GraphQL
           end
         end
 
-        usage = reads.uniq.each_with_object({}) do |enum_name, memo|
+        usage = reads.tap(&:uniq!).each_with_object({}) do |enum_name, memo|
           memo[enum_name] ||= []
           memo[enum_name] << :read
         end
-        writes.uniq.each_with_object(usage) do |enum_name, memo|
+        writes.tap(&:uniq!).each_with_object(usage) do |enum_name, memo|
           memo[enum_name] ||= []
           memo[enum_name] << :write
         end

data/lib/graphql/stitching/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module Stitching
-    VERSION = "1.0.2"
+    VERSION = "1.0.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-stitching
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Greg MacWilliam
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-16 00:00:00.000000000 Z
+date: 2023-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql