elasticgraph-schema_definition 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54e9fd94b73a36f09e090c68605743766da45b9f1777e5622a8b1b0e6985a5a5
-  data.tar.gz: c656f8bf79e9dcfa7bf88d9f4e2944a606d436b440e337fd3db9d064ad59aad5
+  metadata.gz: 2df8cb5a519f1210397de38c6400bb7bbe8ee9f9cdec00c7bc3cb42a774b0b12
+  data.tar.gz: 8217dffbed272a98a731ecac27306b3618aedcbfd0a644ff2baaafcc54b1ca2a
 SHA512:
-  metadata.gz: d348ef2187ff3dbd29c7c3c198a61153fdf86219bca6b37c35f92bafa0bbc17a26ac46d655f5a871c5d33f14568d27ff91a413ed1431a714491119b94d2ac67b
-  data.tar.gz: 7db25426957cd9ddfd2a0af5ee78c7248040a270438d95016b73edf9e2c74a08f830866f17a381488bf11706624ef0c58cfe41405b2eaaa485b5277fd2f75914
+  metadata.gz: '0924aaa26ccb012d51b22208e7c5184b2d9f7c5003c7d405aa2afa189e316a2c11c1075e096ebbad24c951ef611546c8ec8ec358a54fd47c69bfd3747abede1f'
+  data.tar.gz: '091641a18d8483b84c2fb095f1152a310015559fa1a1ae4ae5fcba14bd34db9e7faf86c21a7c15c1f6d6197dd091a7f0408a4ee141a3dc53b2a3e8cf89bd80e1'

data/README.md

@@ -5,3 +5,44 @@ generate ElasticGraph's schema artifacts.
 
 This gem is not intended to be used in production--production should
 just use the schema artifacts instead.
+
+## Dependency Diagram
+
+```mermaid
+graph LR;
+    classDef targetGemStyle fill:#FADBD8,stroke:#EC7063,color:#000,stroke-width:2px;
+    classDef otherEgGemStyle fill:#A9DFBF,stroke:#2ECC71,color:#000;
+    classDef externalGemStyle fill:#E0EFFF,stroke:#70A1D7,color:#2980B9;
+    elasticgraph-schema_definition["elasticgraph-schema_definition"];
+    class elasticgraph-schema_definition targetGemStyle;
+    elasticgraph-graphql["elasticgraph-graphql"];
+    elasticgraph-schema_definition --> elasticgraph-graphql;
+    class elasticgraph-graphql otherEgGemStyle;
+    elasticgraph-indexer["elasticgraph-indexer"];
+    elasticgraph-schema_definition --> elasticgraph-indexer;
+    class elasticgraph-indexer otherEgGemStyle;
+    elasticgraph-json_schema["elasticgraph-json_schema"];
+    elasticgraph-schema_definition --> elasticgraph-json_schema;
+    class elasticgraph-json_schema otherEgGemStyle;
+    elasticgraph-schema_artifacts["elasticgraph-schema_artifacts"];
+    elasticgraph-schema_definition --> elasticgraph-schema_artifacts;
+    class elasticgraph-schema_artifacts otherEgGemStyle;
+    elasticgraph-support["elasticgraph-support"];
+    elasticgraph-schema_definition --> elasticgraph-support;
+    class elasticgraph-support otherEgGemStyle;
+    graphql["graphql"];
+    elasticgraph-schema_definition --> graphql;
+    class graphql externalGemStyle;
+    graphql-c_parser["graphql-c_parser"];
+    elasticgraph-schema_definition --> graphql-c_parser;
+    class graphql-c_parser externalGemStyle;
+    rake["rake"];
+    elasticgraph-schema_definition --> rake;
+    class rake externalGemStyle;
+    elasticgraph-local["elasticgraph-local"];
+    elasticgraph-local --> elasticgraph-schema_definition;
+    class elasticgraph-local otherEgGemStyle;
+    click graphql href "https://rubygems.org/gems/graphql" "Open on RubyGems.org" _blank;
+    click graphql-c_parser href "https://rubygems.org/gems/graphql-c_parser" "Open on RubyGems.org" _blank;
+    click rake href "https://rubygems.org/gems/rake" "Open on RubyGems.org" _blank;
+```

data/lib/elastic_graph/schema_definition/api.rb

@@ -300,28 +300,35 @@ module ElasticGraph
       # @param defined_at [String] the `require` path of the resolver
       # @param resolver_config [Hash<Symbol, Object>] configuration options for the resolver, to support parameterized resolvers
       # @return [void]
+      # @see Mixins::HasIndices#resolve_fields_with
+      # @see SchemaElements::Field#resolve_with
       #
       # @example Register a custom resolver for use by a custom `Query` field
       #   # In `add_resolver.rb`:
       #   class AddResolver
       #     def initialize(elasticgraph_graphql:, config:)
+      #       @multiplier = config.fetch(:multiplier, 1)
       #     end
       #
       #     def resolve(field:, object:, args:, context:)
-      #       args.fetch("x") + args.fetch("y")
+      #       sum = args.fetch("x") + args.fetch("y")
+      #       sum * @multiplier
       #     end
       #   end
       #
       #   # In `config/schema.rb`:
       #   ElasticGraph.define_schema do |schema|
       #     require(resolver_path = "add_resolver")
-      #     schema.register_graphql_resolver :add, AddResolver, defined_at: resolver_path
+      #     schema.register_graphql_resolver :add,
+      #       AddResolver,
+      #       defined_at: resolver_path,
+      #       multiplier: 2 # extra args are passed to the resolver within `config`.
       #
       #     schema.on_root_query_type do |t|
       #       t.field "add", "Int" do |f|
       #         f.argument "x", "Int!"
       #         f.argument "y", "Int!"
-      #         f.resolver = :add
+      #         f.resolve_with :add
       #       end
       #     end
       #   end
@@ -354,7 +361,7 @@ module ElasticGraph
       #
       #     schema.on_root_query_type do |t|
       #       t.field "artist", "Artist" do |f|
-      #         f.resolver = :artist
+      #         f.resolve_with :artist
       #       end
       #     end
       #   end

data/lib/elastic_graph/schema_definition/factory.rb

@@ -286,7 +286,7 @@ module ElasticGraph
         new_object_type @state.type_ref(index_leaf_type).as_aggregated_values.name do |type|
           type.graphql_only true
           type.documentation "A return type used from aggregations to provided aggregated values over `#{index_leaf_type}` fields."
-          type.default_graphql_resolver = :object_with_lookahead
+          type.resolve_fields_with :object_with_lookahead
           type.override_runtime_metadata(elasticgraph_category: :scalar_aggregated_values)
 
           type.field @state.schema_elements.approximate_distinct_value_count, "JsonSafeLong", graphql_only: true do |f|
@@ -437,7 +437,7 @@ module ElasticGraph
 
         new_object_type type_ref.as_edge.name do |t|
           t.relay_pagination_type = true
-          t.default_graphql_resolver = :object_without_lookahead
+          t.resolve_fields_with :object_without_lookahead
           t.override_runtime_metadata(elasticgraph_category: :relay_edge)
 
           t.documentation <<~EOS
@@ -477,7 +477,7 @@ module ElasticGraph
         type_ref = @state.type_ref(type_name)
         new_object_type type_ref.as_connection.name do |t|
           t.relay_pagination_type = true
-          t.default_graphql_resolver = :object_without_lookahead
+          t.resolve_fields_with :object_without_lookahead
           t.override_runtime_metadata(elasticgraph_category: :relay_connection)
 
           if support_pagination

data/lib/elastic_graph/schema_definition/mixins/has_indices.rb

@@ -20,14 +20,14 @@ module ElasticGraph
         attr_reader :runtime_metadata_overrides
 
         # @return [::Symbol, nil] the default GraphQL resolver to use for fields on this type
-        attr_accessor :default_graphql_resolver
-        # @dynamic default_graphql_resolver, default_graphql_resolver=
+        attr_reader :default_graphql_resolver
+        # @dynamic default_graphql_resolver
 
         # @private
         def initialize(*args, **options)
           super(*args, **options)
           @runtime_metadata_overrides = {}
-          self.default_graphql_resolver = :get_record_field_value
+          resolve_fields_with :get_record_field_value
           yield self
 
           # Freeze `indices` so that the indexable status of a type does not change after instantiation.
@@ -72,6 +72,19 @@ module ElasticGraph
           indices.replace([Indexing::Index.new(name, settings, schema_def_state, self, &block)])
         end
 
+        # Configures the default GraphQL resolver that will be used to resolve the fields of this type. Individual fields
+        # can override this using {SchemaElements::Field#resolve_with}.
+        #
+        # @param default_resolver_name [Symbol] name of the GraphQL resolver to use as the default for fields of this type
+        # @param config [Hash<Symbol, Object>] configuration parameters for the resolver
+        # @return [void]
+        # @see API#register_graphql_resolver
+        def resolve_fields_with(default_resolver_name, **config)
+          @default_graphql_resolver = default_resolver_name&.then do
+            SchemaArtifacts::RuntimeMetadata::ConfiguredGraphQLResolver.new(it, config)
+          end
+        end
+
         # List of indices. (Currently we only store one but we may support multiple in the future).
         #
         # @private

data/lib/elastic_graph/schema_definition/mixins/supports_filtering_and_aggregation.rb

@@ -46,7 +46,7 @@ module ElasticGraph
               # Record metadata that is necessary for elasticgraph-graphql to correctly recognize and handle
               # this sub-aggregation correctly.
               t.override_runtime_metadata(elasticgraph_category: :nested_sub_aggregation_connection)
-              t.default_graphql_resolver = :object_without_lookahead
+              t.resolve_fields_with :object_without_lookahead
             end
           end
 
@@ -118,7 +118,7 @@ module ElasticGraph
             schema_def_state.sub_aggregation_paths_for(nested_field_ref.parent_type).map do |path|
               schema_def_state.factory.new_object_type type_ref.as_sub_aggregation(parent_doc_types: path.parent_doc_types).name do |t|
                 t.documentation "Return type representing a bucket of `#{name}` objects for a sub-aggregation within each `#{type_ref.as_parent_aggregation(parent_doc_types: path.parent_doc_types).name}`."
-                t.default_graphql_resolver = :object_without_lookahead
+                t.resolve_fields_with :object_without_lookahead
 
                 t.field schema_def_state.schema_elements.count_detail, "AggregationCountDetail", graphql_only: true do |f|
                   f.documentation "Details of the count of `#{name}` documents in a sub-aggregation bucket."
@@ -166,7 +166,7 @@ module ElasticGraph
             schema_def_state.factory.new_object_type agg_sub_aggs_type_ref.name do |t|
               under_field_description = "under `#{path.field_path_string}` " unless path.field_path.empty?
               t.documentation "Provides access to the `#{schema_def_state.schema_elements.sub_aggregations}` #{under_field_description}within each `#{type_ref.as_parent_aggregation(parent_doc_types: path.parent_doc_types).name}`."
-              t.default_graphql_resolver = :object_with_lookahead
+              t.resolve_fields_with :object_with_lookahead
 
               sub_aggregatable_fields.each do |field|
                 if field.nested?
@@ -229,7 +229,7 @@ module ElasticGraph
 
             # Record metadata that is necessary for elasticgraph-graphql to correctly recognize and handle
             # this indexed aggregation type correctly.
-            t.default_graphql_resolver = :object_without_lookahead
+            t.resolve_fields_with :object_without_lookahead
             t.override_runtime_metadata(source_type: name, elasticgraph_category: :indexed_aggregation)
           end
         end
@@ -241,7 +241,7 @@ module ElasticGraph
 
           new_non_empty_object_type type_ref.as_grouped_by.name do |t|
             t.documentation "Type used to specify the `#{name}` fields to group by for aggregations."
-            t.default_graphql_resolver = :object_with_lookahead
+            t.resolve_fields_with :object_with_lookahead
 
             graphql_fields_by_name.values.each do |field|
               field.define_grouped_by_field(t)
@@ -256,7 +256,7 @@ module ElasticGraph
 
           new_non_empty_object_type type_ref.as_aggregated_values.name do |t|
             t.documentation "Type used to perform aggregation computations on `#{name}` fields."
-            t.default_graphql_resolver = :object_with_lookahead
+            t.resolve_fields_with :object_with_lookahead
 
             graphql_fields_by_name.values.each do |field|
               field.define_aggregated_values_field(t)
@@ -270,7 +270,7 @@ module ElasticGraph
 
           new_non_empty_object_type type_ref.as_highlights.name do |t|
             t.documentation "Type used to request desired `#{name}` search highlight fields."
-            t.default_graphql_resolver = :get_record_field_value
+            t.resolve_fields_with :get_record_field_value
 
             graphql_fields_by_name.values.each do |field|
               field.define_highlights_field(t)

data/lib/elastic_graph/schema_definition/results.rb

@@ -116,7 +116,7 @@ module ElasticGraph
       def define_root_graphql_type
         state.api.object_type "Query" do |query_type|
           query_type.documentation "The query entry point for the entire schema."
-          query_type.default_graphql_resolver = nil
+          query_type.resolve_fields_with nil
 
           state.types_by_name.values.select(&:indexed?).sort_by(&:name).each do |type|
             # @type var indexed_type: Mixins::HasIndices & _Type
@@ -130,7 +130,7 @@ module ElasticGraph
               singular: indexed_type.singular_root_query_field_name
             ) do |f|
               f.documentation "Fetches `#{indexed_type.name}`s based on the provided arguments."
-              f.resolver = :list_records
+              f.resolve_with :list_records
               f.hide_relationship_runtime_metadata = true
               indexed_type.root_query_fields_customizations&.call(f)
             end
@@ -364,8 +364,8 @@ module ElasticGraph
           .object_types_by_name
           .each do |type_name, type|
             type.graphql_fields_by_name.each do |field_name, field|
-              if (resolver = field.resolver)
-                fields_by_resolvers[resolver] << "#{type_name}.#{field_name}"
+              if (resolver_name = field.resolver&.name)
+                fields_by_resolvers[resolver_name] << "#{type_name}.#{field_name}"
               end
             end
           end

data/lib/elastic_graph/schema_definition/schema_elements/built_in_types.rb

@@ -438,7 +438,7 @@ module ElasticGraph
           # to go from non-null to null, but is not a breaking change to make it non-null
           # in the future.
           register_framework_object_type "PageInfo" do |t|
-            t.default_graphql_resolver = :object_without_lookahead
+            t.resolve_fields_with :object_without_lookahead
 
             t.documentation <<~EOS
               Provides information about the specific fetched page. This implements the `PageInfo`
@@ -470,7 +470,7 @@ module ElasticGraph
           end
 
           register_framework_object_type "SearchHighlight" do |t|
-            t.default_graphql_resolver = :object_without_lookahead
+            t.resolve_fields_with :object_without_lookahead
 
             t.documentation "Provides information about why a document matched a search via highlighted snippets."
 
@@ -573,7 +573,7 @@ module ElasticGraph
 
           register_framework_object_type "AggregationCountDetail" do |t|
             t.documentation "Provides detail about an aggregation `#{names.count}`."
-            t.default_graphql_resolver = :object_without_lookahead
+            t.resolve_fields_with :object_without_lookahead
 
             t.field names.approximate_value, "JsonSafeLong!", graphql_only: true do |f|
               f.documentation <<~EOS
@@ -1294,7 +1294,7 @@ module ElasticGraph
           date = schema_def_state.type_ref("Date")
           register_framework_object_type date.as_grouped_by.name do |t|
             t.documentation "Allows for grouping `Date` values based on the desired return type."
-            t.default_graphql_resolver = :object_with_lookahead
+            t.resolve_fields_with :object_with_lookahead
             t.override_runtime_metadata(elasticgraph_category: :date_grouped_by_object)
 
             t.field names.as_date, "Date", graphql_only: true do |f|
@@ -1312,7 +1312,7 @@ module ElasticGraph
           date_time = schema_def_state.type_ref("DateTime")
           register_framework_object_type date_time.as_grouped_by.name do |t|
             t.documentation "Allows for grouping `DateTime` values based on the desired return type."
-            t.default_graphql_resolver = :object_with_lookahead
+            t.resolve_fields_with :object_with_lookahead
             t.override_runtime_metadata(elasticgraph_category: :date_grouped_by_object)
 
             t.field names.as_date_time, "DateTime", graphql_only: true do |f|

data/lib/elastic_graph/schema_definition/schema_elements/field.rb

@@ -8,6 +8,7 @@
 
 require "delegate"
 require "elastic_graph/constants"
+require "elastic_graph/schema_artifacts/runtime_metadata/configured_graphql_resolver"
 require "elastic_graph/schema_definition/indexing/field"
 require "elastic_graph/schema_definition/indexing/field_reference"
 require "elastic_graph/schema_definition/mixins/has_directives"
@@ -141,14 +142,28 @@ module ElasticGraph
             resolver: resolver
           )
 
-          if name != name_in_index && name_in_index.include?(".") && !graphql_only
-            raise Errors::SchemaError, "#{self} has an invalid `name_in_index`: #{name_in_index.inspect}. Only `graphql_only: true` fields can have a `name_in_index` that references a child field."
+          if name != name_in_index
+            if graphql_only
+              schema_def_state.after_user_definition_complete do
+                unless backing_indexing_field
+                  raise Errors::SchemaError,
+                    "GraphQL-only field `#{parent_type.name}.#{name}` has a `name_in_index` (#{name_in_index}) which does not reference an " \
+                    "existing indexing field. To proceed, remove `graphql_only: true` or update `name_in_index` to match an existing indexing field."
+                end
+              end
+            elsif name_in_index.include?(".")
+              raise Errors::SchemaError,
+                "#{self} has an invalid `name_in_index`: #{name_in_index.inspect}. " \
+                "Only `graphql_only: true` fields can have a `name_in_index` that references a child field."
+            end
           end
 
           schema_def_state.register_user_defined_field(self)
           yield self if block_given?
         end
 
+        private :resolver=
+
         # @private
         @@initialize_param_names = instance_method(:initialize).parameters.map(&:last).to_set
 
@@ -492,6 +507,46 @@ module ElasticGraph
           )
         end
 
+        # Configures the GraphQL resolver used to resolve this field. If not set, the resolver configured on the parent type
+        # via {Mixins::HasIndices#resolve_fields_with} will be used.
+        #
+        # @param resolver_name [Symbol] name of the GraphQL resolver
+        # @param config [Hash<Symbol, Object>] configuration parameters for the resolver
+        # @return [void]
+        # @see API#register_graphql_resolver
+        #
+        # @example Use a custom resolver for a custom `Query` field
+        #   # In `add_resolver.rb`:
+        #   class AddResolver
+        #     def initialize(elasticgraph_graphql:, config:)
+        #       @multiplier = config.fetch(:multiplier, 1)
+        #     end
+        #
+        #     def resolve(field:, object:, args:, context:)
+        #       sum = args.fetch("x") + args.fetch("y")
+        #       sum * @multiplier
+        #     end
+        #   end
+        #
+        #   # In `config/schema.rb`:
+        #   ElasticGraph.define_schema do |schema|
+        #     require(resolver_path = "add_resolver")
+        #     schema.register_graphql_resolver :add, AddResolver, defined_at: resolver_path
+        #
+        #     schema.on_root_query_type do |t|
+        #       t.field "add", "Int" do |f|
+        #         f.argument "x", "Int!"
+        #         f.argument "y", "Int!"
+        #
+        #         # Extra args (`multiplier: 2`, in this example) are passed to the resolver within `config`.
+        #         f.resolve_with :add, multiplier: 2
+        #       end
+        #     end
+        #   end
+        def resolve_with(resolver_name, **config)
+          self.resolver = resolver_name&.then { SchemaArtifacts::RuntimeMetadata::ConfiguredGraphQLResolver.new(it, config) }
+        end
+
         # @private
         def runtime_script(script)
           self.runtime_field_script = script
@@ -1005,13 +1060,29 @@ module ElasticGraph
           )
         end
 
-        private
-
+        # The alternate field that is backing this field in the datastore index. Will only be non-`nil` for `graphql_only` fields.
+        # @return [Field, nil] the field backing this field in the index
+        #
+        # @private
         def backing_indexing_field
           return nil unless graphql_only
-          parent_type.indexing_fields_by_name_in_index[name_in_index]
+
+          type = parent_type
+          field = nil
+
+          name_in_index.split(".").each do |path_part|
+            if (field = type&.indexing_fields_by_name_in_index&.fetch(path_part, nil))
+              type = field.type.fully_unwrapped.as_object_type
+            else
+              return nil
+            end
+          end
+
+          field
         end
 
+        private
+
         def args_sdl(joiner:, after_opening_paren: "", &arg_selector)
           selected_args = args.values.select(&arg_selector)
           args_sdl = selected_args.map(&:to_sdl).flat_map { |s| s.split("\n") }.join(joiner)

data/lib/elastic_graph/schema_definition/schema_elements/type_reference.rb

@@ -108,8 +108,12 @@ module ElasticGraph
           when :enum
             true
           else
-            # If we can't determine the type from the name, just raise an error.
-            raise Errors::SchemaError, "Type `#{name}` cannot be resolved. Is it misspelled?"
+            if block_given?
+              yield
+            else
+              # If we can't determine the type from the name, just raise an error.
+              raise Errors::SchemaError, "Type `#{name}` cannot be resolved. Is it misspelled?"
+            end
           end
         end
 
@@ -339,7 +343,8 @@ module ElasticGraph
           return :object if OBJECT_FORMATS.any? { |f| type_namer.matches_format?(name, f) }
 
           if (as_output_enum_name = type_namer.extract_base_from(name, format: :InputEnum))
-            :enum if ENUM_FORMATS.any? { |f| type_namer.matches_format?(as_output_enum_name, f) }
+            return :enum if ENUM_FORMATS.any? { |f| type_namer.matches_format?(as_output_enum_name, f) }
+            :enum if as_output_enum_name != self.name && schema_def_state.type_ref(as_output_enum_name).enum? { false }
           end
         end
 

data/lib/elastic_graph/schema_definition/schema_elements/type_with_subfields.rb

@@ -135,6 +135,8 @@ module ElasticGraph
         #   not provided, ElasticGraph will infer field groupability based on the field's GraphQL type and mapping type.
         # @option options [Boolean] sortable force-enables or disables the ability for queries to sort by this field. When not provided,
         #   ElasticGraph will infer field sortability based on the field's GraphQL type and mapping type.
+        # @option options [Boolean] highlightable force-enables or disables the ability to request search highlights for this field. When
+        #   not provided, ElasticGraph will infer field highlightable based on the field's mapping type.
         # @yield [Field] the field for further customization
         # @return [void]
         #
@@ -279,6 +281,14 @@ module ElasticGraph
         #   differently named field in the index.
         # @param singular [String] indicates what the singular form of a field's name is. When provided, ElasticGraph will define a
         #   `groupedBy` field (using the singular form) allowing clients to group by individual values from the field.
+        # @param aggregatable [Boolean] force-enables or disables the ability for aggregation queries to aggregate over this field.
+        #   When not provided, ElasticGraph will infer field aggregatability based on the field's GraphQL type and mapping type.
+        # @param filterable [Boolean] force-enables or disables the ability for queries to filter by this field. When not provided,
+        #   ElasticGraph will infer field filterability based on the field's GraphQL type and mapping type.
+        # @param groupable [Boolean] force-enables or disables the ability for aggregation queries to group by this field. When
+        #   not provided, ElasticGraph will infer field groupability based on the field's GraphQL type and mapping type.
+        # @param highlightable [Boolean] force-enables or disables the ability to request search highlights for this field. When
+        #   not provided, ElasticGraph will infer field highlightable based on the field's mapping type.
         # @yield [Field] the field for further customization
         # @return [void]
         #
@@ -295,23 +305,39 @@ module ElasticGraph
         #       t.index "authors"
         #     end
         #   end
-        def paginated_collection_field(name, element_type, name_in_index: name, singular: nil, &block)
+        def paginated_collection_field(
+          name,
+          element_type,
+          name_in_index: name,
+          graphql_only: false,
+          singular: nil,
+          groupable: !!singular,
+          filterable: nil,
+          aggregatable: nil,
+          highlightable: nil,
+          &block
+        )
           element_type_ref = schema_def_state.type_ref(element_type).to_final_form
           element_type = element_type_ref.name
 
           schema_def_state.paginated_collection_element_types << element_type
 
-          field(name, "[#{element_type}!]!", indexing_only: true, name_in_index: name_in_index, &block)
+          unless graphql_only
+            field(name, "[#{element_type}!]!", indexing_only: true, name_in_index: name_in_index, &block)
+          end
 
           field(
             name,
             element_type_ref.as_connection.name,
             name_in_index: name_in_index,
             type_for_derived_types: "[#{element_type}]",
-            groupable: !!singular,
-            sortable: false,
             graphql_only: true,
-            singular: singular
+            singular: singular,
+            groupable: groupable,
+            filterable: filterable,
+            aggregatable: aggregatable,
+            highlightable: highlightable,
+            sortable: false
           ) do |f|
             f.define_relay_pagination_arguments!
             block&.call(f)
@@ -535,7 +561,7 @@ module ElasticGraph
             )
 
             field.relationship = relationship
-            field.resolver = :nested_relationships
+            field.resolve_with :nested_relationships
 
             yield relationship if block_given?
 

data/lib/elastic_graph/schema_definition/state.rb

@@ -173,8 +173,7 @@ module ElasticGraph
             raise Errors::SchemaError, "Cannot access `user_defined_field_references_by_type_name` until the schema definition is complete."
           end
 
-          @user_defined_field_references_by_type_name ||= user_defined_fields
-            .group_by { |f| f.type.fully_unwrapped.name }
+          user_defined_fields.group_by { |f| f.type.fully_unwrapped.name }
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticgraph-schema_definition
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Myron Marston
@@ -17,84 +17,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: elasticgraph-indexer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: elasticgraph-json_schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: elasticgraph-schema_artifacts
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: elasticgraph-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.6
+        version: 2.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.6
+        version: 2.5.10
 - !ruby/object:Gem::Dependency
   name: graphql-c_parser
   requirement: !ruby/object:Gem::Requirement
@@ -121,76 +121,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 13.2.1
+        version: '13.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 13.2.1
+        version: '13.3'
 - !ruby/object:Gem::Dependency
   name: elasticgraph-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: elasticgraph-datastore_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: elasticgraph-elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: elasticgraph-opensearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
 email:
 - myron@squareup.com
 executables: []
@@ -275,10 +269,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/block/elasticgraph/issues
-  changelog_uri: https://github.com/block/elasticgraph/releases/tag/v1.0.0.rc1
-  documentation_uri: https://block.github.io/elasticgraph/api-docs/v1.0.0.rc1/
+  changelog_uri: https://github.com/block/elasticgraph/releases/tag/v1.0.0.rc2
+  documentation_uri: https://block.github.io/elasticgraph/api-docs/v1.0.0.rc2/
   homepage_uri: https://block.github.io/elasticgraph/
-  source_code_uri: https://github.com/block/elasticgraph/tree/v1.0.0.rc1/elasticgraph-schema_definition
+  source_code_uri: https://github.com/block/elasticgraph/tree/v1.0.0.rc2/elasticgraph-schema_definition
   gem_category: local
 rdoc_options: []
 require_paths: