elasticgraph-apollo 0.18.0.1 → 0.18.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d85c5582cff5009df1817c82726653674d045ecfd8d13a5316e881f81d080c03
-  data.tar.gz: 18db0d78bfb86312cfc84a48949f167fc1890c41e721427c27c0823d7d899933
+  metadata.gz: dfd5fec5a0bdef7dfbf71553b054801edc9a5e7686bf85254ec568f788ea057e
+  data.tar.gz: e4a7aaf30ac783e18b5a37ef16631fab747a4f02f5c3817f7215317653366751
 SHA512:
-  metadata.gz: 519e0fbb74e0335848bc9dacad1b5241d6b6eb5ccef1fb0745c80dfbd7ae3e95c7b5d9967d1586593eeacaacc5ba3a5faf4173de4e4a3bb4fb48794daeaeab2e
-  data.tar.gz: 63d55b48e6a056512734832fd3fb4fb7b67edd0c622865e798b3c4854b9d569aac83d2cee5b0501e208d69f86eb2c73c8caca97884120140a31746e75bb9fa34
+  metadata.gz: 16e0fd760779255d136ae66a13596a42c29f22411c8680ecc379a4db88e53ba0ca0da11bbb83d716a0506b8f482eab044e27b192a1bbb8f569390efb960eca29
+  data.tar.gz: f009432bd23fec7e4d9e50a95c8ef70e3e54cab9d5064cdd785ab1d0a2b41b773e1140a0d69f2dbf51d5bce28ddef0ed24883aac23b70331ebf3839aa62766fa

data/elasticgraph-apollo.gemspec

@@ -13,7 +13,7 @@ ElasticGraphGemspecHelper.define_elasticgraph_gem(gemspec_file: __FILE__, catego
 
   spec.add_dependency "elasticgraph-graphql", eg_version
   spec.add_dependency "elasticgraph-support", eg_version
-  spec.add_dependency "graphql", ">= 2.3.7", "< 2.4"
+  spec.add_dependency "graphql", "~> 2.3.14"
   spec.add_dependency "apollo-federation", "~> 3.8"
 
   # Note: technically, this is not purely a development dependency, but since `eg-schema_def`

data/lib/elastic_graph/apollo/schema_definition/api_extension.rb

@@ -284,7 +284,7 @@ module ElasticGraph
 
           entity_types = state.object_types_by_name.values.select do |object_type|
             object_type.directives.any? do |directive|
-              directive.name == "key" && directive.arguments[:resolvable]
+              directive.name == "key" && directive.arguments.fetch(:resolvable, true)
             end
           end
 
@@ -357,26 +357,40 @@ module ElasticGraph
         # @dynamic state
 
         def validate_entity_types_can_all_be_resolved(entity_types)
-          entity_types.reject(&:indexed?).each do |object_type|
-            key_field_names = object_type.directives
-              .select { |dir| dir.name == "key" }
-              # https://rubular.com/r/JEuYKzqnyR712A
-              .flat_map { |dir| dir.arguments[:fields].to_s.gsub(/{.*}/, "").split(" ") }
-              .to_set
-            unresolvable_fields = object_type.graphql_fields_by_name.values.reject do |field|
-              key_field_names.include?(field.name) ||
-                field.relationship ||
-                field.directives.any? { |directive| directive.name == "external" }
-            end
-            if unresolvable_fields.any?
-              raise SchemaError, <<~EOS
-                `#{object_type.name}` has fields that ElasticGraph will be unable to resolve when Apollo requests it as an entity:
-                #{unresolvable_fields.map { |field| "  * `#{field.name}`" }.join("\n")}
-                On a non-indexed entity type like this, ElasticGraph can only resolve `@key` fields and `relates_to_(one|many)` fields.
-                To fix this, add these fields to the `apollo_key`, redefine them as a relationship, use `field.apollo_external` so Apollo
-                knows how to treat them, or remove them.
-              EOS
+          unresolvable_field_errors =
+            entity_types.reject(&:indexed?).filter_map do |object_type|
+              key_field_names = object_type.directives
+                .select { |dir| dir.name == "key" }
+                # https://rubular.com/r/JEuYKzqnyR712A
+                .flat_map { |dir| dir.arguments[:fields].to_s.gsub(/{.*}/, "").split(" ") }
+                .to_set
+
+              unresolvable_fields = object_type.graphql_fields_by_name.values.reject do |field|
+                key_field_names.include?(field.name) ||
+                  field.relationship ||
+                  field.directives.any? { |directive| directive.name == "external" }
+              end
+
+              if unresolvable_fields.any?
+                <<~EOS.strip
+                  `#{object_type.name}` has fields that ElasticGraph will be unable to resolve when Apollo requests it as an entity:
+
+                  #{unresolvable_fields.map { |field| "  * `#{field.name}`" }.join("\n")}
+
+                  On a resolvable non-indexed entity type like this, ElasticGraph can only resolve `@key` fields and
+                  `relates_to_(one|many)` fields. To fix this, either add `resolvable: false` to the `apollo_key` or
+                  do one of the following for each unresolvable field:
+
+                    * Add it to the `apollo_key`
+                    * Redefine it as a relationship
+                    * Use `field.apollo_external` so Apollo knows how to treat it
+                    * Remove it
+                EOS
+              end
             end
+
+          if unresolvable_field_errors.any?
+            raise SchemaError, unresolvable_field_errors.join("\n#{"-" * 100}\n")
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticgraph-apollo
 version: !ruby/object:Gem::Version
-  version: 0.18.0.1
+  version: 0.18.0.2
 platform: ruby
 authors:
 - Myron Marston
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-28 00:00:00.000000000 Z
+date: 2024-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop-factory_bot
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.39.0
+        version: 1.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.39.0
+        version: 1.40.0
 - !ruby/object:Gem::Dependency
   name: steep
   requirement: !ruby/object:Gem::Requirement
@@ -98,22 +98,22 @@ dependencies:
   name: flatware-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.2
-    - - "<"
+        version: '2.3'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 2.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.2
-    - - "<"
+        version: '2.3'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 2.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -132,16 +132,16 @@ dependencies:
   name: super_diff
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -160,42 +160,30 @@ dependencies:
   name: simplecov-console
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: httpx
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.6
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.6
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: method_source
   requirement: !ruby/object:Gem::Requirement
@@ -228,22 +216,22 @@ dependencies:
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.3.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 7.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.3.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
@@ -278,48 +266,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.1
+        version: 0.18.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.1
+        version: 0.18.0.2
 - !ruby/object:Gem::Dependency
   name: elasticgraph-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.1
+        version: 0.18.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.1
+        version: 0.18.0.2
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.7
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 2.3.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.7
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 2.3.14
 - !ruby/object:Gem::Dependency
   name: apollo-federation
   requirement: !ruby/object:Gem::Requirement
@@ -340,70 +322,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.1
+        version: 0.18.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.1
+        version: 0.18.0.2
 - !ruby/object:Gem::Dependency
   name: elasticgraph-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.1
+        version: 0.18.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.1
+        version: 0.18.0.2
 - !ruby/object:Gem::Dependency
   name: elasticgraph-elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.1
+        version: 0.18.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.1
+        version: 0.18.0.2
 - !ruby/object:Gem::Dependency
   name: elasticgraph-opensearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.1
+        version: 0.18.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.1
+        version: 0.18.0.2
 - !ruby/object:Gem::Dependency
   name: elasticgraph-indexer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.1
+        version: 0.18.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.1
+        version: 0.18.0.2
 description: 
 email:
 - myron@squareup.com