elasticgraph-schema_definition 0.18.0.4 → 0.19.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5627aa4be4d0968f9d34d9374b4423713c2cba88e5bbfbc4a4fedea676a906f7
-  data.tar.gz: e04375010eb75f80087bb3396da2915de2a6d78f9c17840a9861a33790efb75e
+  metadata.gz: 8b41786d54c947a50ab0b4cba23f68d2a70c4a49341b12e0733acc5a79bbe1e8
+  data.tar.gz: 1b4315922c6310b88773120c22a94bb2de7ae16087d2f1e6bd14efa3b2da3529
 SHA512:
-  metadata.gz: 4e0cfe74e08755d2886f7fd0aedc037b6999d170e1b377a51a29b4774a39b31e51693af4700e0ea8d37133c14fb57739a5ba4b51155b22aeb69148248a07ddbb
-  data.tar.gz: f35700ff04061b51e997137cee5628bc258fdaa12aa8871ea5ad6dca1de4858ba979b6d78868fe6194d8e3e44623816e2aea10893a195ae8be766b3ee6222da6
+  metadata.gz: 00d281410236882efb20f17a8293b372b682803da9603693b4eb6a8a6c11f0b6790d887f65ae977c7355ee26dfbc32769ae7151c01ad0a66dd879aa8f5fea5de
+  data.tar.gz: d00c0bbc950752e1b05cc122febd33db82368795b4af81c22ee71efcb5e5deaf4f3c9105dad5bfd469df051d074a22c0815c898ff9e3a267345889dc97552f2a

data/elasticgraph-schema_definition.gemspec

@@ -16,7 +16,7 @@ ElasticGraphGemspecHelper.define_elasticgraph_gem(gemspec_file: __FILE__, catego
   spec.add_dependency "elasticgraph-json_schema", eg_version
   spec.add_dependency "elasticgraph-schema_artifacts", eg_version
   spec.add_dependency "elasticgraph-support", eg_version
-  spec.add_dependency "graphql", "~> 2.3.14"
+  spec.add_dependency "graphql", "~> 2.4.5"
   spec.add_dependency "rake", "~> 13.2"
 
   spec.add_development_dependency "elasticgraph-admin", eg_version

data/lib/elastic_graph/schema_definition/api.rb

@@ -6,7 +6,7 @@
 #
 # frozen_string_literal: true
 
-require "elastic_graph/error"
+require "elastic_graph/errors"
 require "elastic_graph/schema_artifacts/runtime_metadata/extension"
 require "elastic_graph/schema_definition/mixins/has_readable_to_s_and_inspect"
 require "elastic_graph/schema_definition/results"
@@ -26,7 +26,7 @@ module ElasticGraph
     if (api_instance = ::Thread.current[:ElasticGraph_SchemaDefinition_API_instance])
       yield api_instance
     else
-      raise SchemaError, "No active `SchemaDefinition::API` instance is available. " \
+      raise Errors::SchemaError, "No active `SchemaDefinition::API` instance is available. " \
         "Let ElasticGraph load the schema definition files."
     end
   end
@@ -314,11 +314,11 @@ module ElasticGraph
       #   end
       def json_schema_version(version)
         if !version.is_a?(Integer) || version < 1
-          raise SchemaError, "`json_schema_version` must be a positive integer. Specified version: #{version}"
+          raise Errors::SchemaError, "`json_schema_version` must be a positive integer. Specified version: #{version}"
         end
 
         if @state.json_schema_version
-          raise SchemaError, "`json_schema_version` can only be set once on a schema. Previously-set version: #{@state.json_schema_version}"
+          raise Errors::SchemaError, "`json_schema_version` can only be set once on a schema. Previously-set version: #{@state.json_schema_version}"
         end
 
         @state.json_schema_version = version

data/lib/elastic_graph/schema_definition/factory.rb

@@ -141,7 +141,7 @@ module ElasticGraph
           t.documentation <<~EOS
             Input type used to specify filters on `#{source_type}` fields.
 
-            Will be ignored if passed as an empty object (or as `null`).
+            Will match all documents if passed as an empty object (or as `null`).
           EOS
 
           t.field @state.schema_elements.any_of, "[#{t.name}!]" do |f|
@@ -149,17 +149,17 @@ module ElasticGraph
               Matches records where any of the provided sub-filters evaluate to true.
               This works just like an OR operator in SQL.
 
-              Will be ignored when `null` is passed. When an empty list is passed, will cause this
-              part of the filter to match no documents.
+              When `null` is passed, matches all documents.
+              When an empty list is passed, this part of the filter matches no documents.
             EOS
           end
 
           t.field @state.schema_elements.not, t.name do |f|
             f.documentation <<~EOS
-              Matches records where the provided sub-filter does not evaluate to true.
+              Matches records where the provided sub-filter evaluates to false.
               This works just like a NOT operator in SQL.
 
-              Will be ignored when `null` or an empty object is passed.
+              When `null` or an empty object is passed, matches no documents.
             EOS
           end
 
@@ -285,10 +285,7 @@ module ElasticGraph
               it usually differs from the true distinct value count by less than 7%.
             EOS
 
-            f.runtime_metadata_graphql_field = f.runtime_metadata_graphql_field.with_computation_detail(
-              empty_bucket_value: 0,
-              function: :cardinality
-            )
+            f.runtime_metadata_computation_detail empty_bucket_value: 0, function: :cardinality
           end
 
           yield type
@@ -306,7 +303,7 @@ module ElasticGraph
             f.documentation <<~EOS
               Matches records where any of the list elements match the provided sub-filter.
 
-              Will be ignored when `null` or an empty object is passed.
+              When `null` or an empty object is passed, matches all documents.
             EOS
           end
 
@@ -318,7 +315,7 @@ module ElasticGraph
               be provided on a single `#{t.name}` input because of collisions between key names. For example, if you want to provide
               multiple `#{any_satisfy}: ...` filters, you could do `#{all_of}: [{#{any_satisfy}: ...}, {#{any_satisfy}: ...}]`.
 
-              Will be ignored when `null` is passed or an empty list is passed.
+              When `null` or an empty list is passed, matches all documents.
             EOS
           end
 
@@ -333,7 +330,7 @@ module ElasticGraph
           t.documentation <<~EOS
             Input type used to specify filters on elements of a `[#{source_type}]` field.
 
-            Will be ignored if passed as an empty object (or as `null`).
+            Will match all documents if passed as an empty object (or as `null`).
           EOS
 
           # While we support `not: {any_satisfy: ...}` we do not support `any_satisfy: {not ...}` at this time.
@@ -377,7 +374,7 @@ module ElasticGraph
             or transitively from a list field that has been configured to index each leaf field as
             its own flattened list of values.
 
-            Will be ignored if passed as an empty object (or as `null`).
+            Will match all documents if passed as an empty object (or as `null`).
           EOS
 
           source_type.graphql_fields_by_name.each do |field_name, field|
@@ -427,7 +424,7 @@ module ElasticGraph
           f.documentation <<~EOS
             Used to filter on the number of non-null elements in this list field.
 
-            Will be ignored when `null` or an empty object is passed.
+            When `null` or an empty object is passed, matches all documents.
           EOS
         end
       end

data/lib/elastic_graph/schema_definition/indexing/derived_indexed_type.rb

@@ -173,7 +173,7 @@ module ElasticGraph
         #   end
         def immutable_value(field_name, from:, nullable: true, can_change_from_null: false)
           if !nullable && can_change_from_null
-            raise SchemaError, "`can_change_from_null: true` is not allowed with `nullable: false` (as there would be no `null` values to change from)."
+            raise Errors::SchemaError, "`can_change_from_null: true` is not allowed with `nullable: false` (as there would be no `null` values to change from)."
           end
 
           fields << DerivedFields::ImmutableValue.new(
@@ -280,7 +280,7 @@ module ElasticGraph
 
         def generate_script
           if fields.empty?
-            raise SchemaError, "`derive_indexed_type_fields` definition for #{destination_type_ref} (from #{source_type.name}) " \
+            raise Errors::SchemaError, "`derive_indexed_type_fields` definition for #{destination_type_ref} (from #{source_type.name}) " \
               "has no derived field definitions."
           end
 

data/lib/elastic_graph/schema_definition/indexing/field_type/object.rb

@@ -6,7 +6,7 @@
 #
 # frozen_string_literal: true
 
-require "elastic_graph/error"
+require "elastic_graph/errors"
 require "elastic_graph/support/hash_util"
 require "elastic_graph/support/memoizable_data"
 
@@ -101,7 +101,7 @@ module ElasticGraph
             return if problem_fields.empty?
 
             field_descriptions = problem_fields.map(&:name).sort.map { |f| "`#{f}`" }.join(", ")
-            raise SchemaError,
+            raise Errors::SchemaError,
               "`#{type_name}` has #{problem_fields.size} field(s) (#{field_descriptions}) that are `sourced_from` " \
               "another type and also have JSON schema customizations. Instead, put the JSON schema " \
               "customizations on the source type's field definitions."

data/lib/elastic_graph/schema_definition/indexing/index.rb

@@ -47,7 +47,7 @@ module ElasticGraph
         # @api private
         def initialize(name, settings, schema_def_state, indexed_type)
           if name.include?(ROLLOVER_INDEX_INFIX_MARKER)
-            raise SchemaError, "`#{name}` is an invalid index definition name since it contains " \
+            raise Errors::SchemaError, "`#{name}` is an invalid index definition name since it contains " \
               "`#{ROLLOVER_INDEX_INFIX_MARKER}` which ElasticGraph treats as special."
           end
 
@@ -124,11 +124,11 @@ module ElasticGraph
 
           unless date_and_datetime_types.include?(timestamp_field_path.type.fully_unwrapped.name)
             date_or_datetime_description = date_and_datetime_types.map { |t| "`#{t}`" }.join(" or ")
-            raise SchemaError, "rollover field `#{timestamp_field_path.full_description}` cannot be used for rollover since it is not a #{date_or_datetime_description} field."
+            raise Errors::SchemaError, "rollover field `#{timestamp_field_path.full_description}` cannot be used for rollover since it is not a #{date_or_datetime_description} field."
           end
 
           if timestamp_field_path.type.list?
-            raise SchemaError, "rollover field `#{timestamp_field_path.full_description}` cannot be used for rollover since it is a list field."
+            raise Errors::SchemaError, "rollover field `#{timestamp_field_path.full_description}` cannot be used for rollover since it is a list field."
           end
 
           timestamp_field_path.path_parts.each { |f| f.json_schema nullable: false }
@@ -172,7 +172,7 @@ module ElasticGraph
           routing_field_path = public_field_path(routing_field_path_name, explanation: "it is referenced as an index `route_with` field")
 
           unless routing_field_path.type.leaf?
-            raise SchemaError, "shard routing field `#{routing_field_path.full_description}` cannot be used for routing since it is not a leaf field."
+            raise Errors::SchemaError, "shard routing field `#{routing_field_path.full_description}` cannot be used for routing since it is not a leaf field."
           end
 
           self.routing_field_path = routing_field_path
@@ -304,7 +304,7 @@ module ElasticGraph
             error_msg += " Note: the `#{indexed_type.name}.#{path_parts.first}` definition must come before the `index` call."
           end
 
-          raise SchemaError, error_msg
+          raise Errors::SchemaError, error_msg
         end
 
         def date_and_datetime_types

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

@@ -6,7 +6,7 @@
 #
 # frozen_string_literal: true
 
-require "elastic_graph/error"
+require "elastic_graph/errors"
 require "elastic_graph/schema_definition/indexing/field_type/union"
 require "elastic_graph/schema_definition/schema_elements/list_counts_state"
 
@@ -79,7 +79,7 @@ module ElasticGraph
                   defs << "on #{st.name}:\n#{field.to_sdl.strip} mapping: #{field.resolve_mapping.inspect}" if st.graphql_fields_by_name.key?(field_name)
                 end
 
-                raise SchemaError,
+                raise Errors::SchemaError,
                   "Conflicting definitions for field `#{field_name}` on the subtypes of `#{name}`. " \
                   "Their definitions must agree. Defs:\n\n#{def_strings.join("\n\n")}"
               end
@@ -102,7 +102,7 @@ module ElasticGraph
               "#{name}: indexed? = #{value}"
             end
 
-            raise SchemaError,
+            raise Errors::SchemaError,
               "The #{self.class.name} #{name} has some indexed subtypes, and some non-indexed subtypes. " \
               "All subtypes must be indexed or all must NOT be indexed. Subtypes:\n" \
               "#{descriptions.join("\n")}"

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

@@ -103,7 +103,7 @@ module ElasticGraph
           param_diff = (options.keys.to_set - CUSTOMIZABLE_DATASTORE_PARAMS).to_a
 
           unless param_diff.empty?
-            raise SchemaError, "Some configured mapping overrides are unsupported: #{param_diff.inspect}"
+            raise Errors::SchemaError, "Some configured mapping overrides are unsupported: #{param_diff.inspect}"
           end
 
           mapping_options.update(options)
@@ -170,7 +170,7 @@ module ElasticGraph
           validatable_json_schema = Support::HashUtil.stringify_keys(options)
 
           if (error_msg = JSONSchema.strict_meta_schema_validator.validate_with_error_message(validatable_json_schema))
-            raise SchemaError, "Invalid JSON schema options set on #{self}:\n\n#{error_msg}"
+            raise Errors::SchemaError, "Invalid JSON schema options set on #{self}:\n\n#{error_msg}"
           end
 
           json_schema_options.update(options)

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

@@ -6,7 +6,7 @@
 #
 # frozen_string_literal: true
 
-require "elastic_graph/error"
+require "elastic_graph/errors"
 
 module ElasticGraph
   module SchemaDefinition
@@ -99,7 +99,7 @@ module ElasticGraph
           end
 
           unless schema_error_messages.empty?
-            raise SchemaError, schema_error_messages.join("\n\n")
+            raise Errors::SchemaError, schema_error_messages.join("\n\n")
           end
         end
 

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

@@ -27,10 +27,10 @@ module ElasticGraph
         #
         # @param name [String] name of GraphQL schema element
         # @return [void]
-        # @raise [InvalidGraphQLNameError] if the name is invalid
+        # @raise [Errors::InvalidGraphQLNameError] if the name is invalid
         def self.verify_name!(name)
           return if GRAPHQL_NAME_PATTERN.match?(name)
-          raise InvalidGraphQLNameError, "Not a valid GraphQL name: `#{name}`. #{GRAPHQL_NAME_VALIDITY_DESCRIPTION}"
+          raise Errors::InvalidGraphQLNameError, "Not a valid GraphQL name: `#{name}`. #{GRAPHQL_NAME_VALIDITY_DESCRIPTION}"
         end
       end
     end

data/lib/elastic_graph/schema_definition/results.rb

@@ -7,7 +7,7 @@
 # frozen_string_literal: true
 
 require "elastic_graph/constants"
-require "elastic_graph/error"
+require "elastic_graph/errors"
 require "elastic_graph/schema_artifacts/runtime_metadata/schema"
 require "elastic_graph/schema_artifacts/artifacts_helper_methods"
 require "elastic_graph/schema_definition/indexing/event_envelope"
@@ -47,10 +47,10 @@ module ElasticGraph
 
       # @param version [Integer] desired JSON schema version
       # @return [Hash<String, Object>] the JSON schema for the requested version, if available
-      # @raise [NotFoundError] if the requested JSON schema version is not available
+      # @raise [Errors::NotFoundError] if the requested JSON schema version is not available
       def json_schemas_for(version)
         unless available_json_schema_versions.include?(version)
-          raise NotFoundError, "The requested json schema version (#{version}) is not available. Available versions: #{available_json_schema_versions.to_a.join(", ")}."
+          raise Errors::NotFoundError, "The requested json schema version (#{version}) is not available. Available versions: #{available_json_schema_versions.to_a.join(", ")}."
         end
 
         @latest_versioned_json_schema ||= merge_field_metadata_into_json_schema(current_public_json_schema).json_schema
@@ -241,7 +241,7 @@ module ElasticGraph
           end
 
           unless full_errors.empty?
-            raise SchemaError, full_errors.join("\n\n")
+            raise Errors::SchemaError, full_errors.join("\n\n")
           end
         end
       end
@@ -263,7 +263,7 @@ module ElasticGraph
       def build_public_json_schema
         json_schema_version = state.json_schema_version
         if json_schema_version.nil?
-          raise SchemaError, "`json_schema_version` must be specified in the schema. To resolve, add `schema.json_schema_version 1` in a schema definition block."
+          raise Errors::SchemaError, "`json_schema_version` must be specified in the schema. To resolve, add `schema.json_schema_version 1` in a schema definition block."
         end
 
         indexed_type_names = state.object_types_by_name.values
@@ -319,7 +319,7 @@ module ElasticGraph
             "- The set of #{set.to_a} forms a circular reference chain."
           end
 
-          raise SchemaError, "Your schema has self-referential types, which are not allowed, since " \
+          raise Errors::SchemaError, "Your schema has self-referential types, which are not allowed, since " \
             "it prevents the datastore mapping and GraphQL schema generation from terminating:\n" \
             "#{descriptions.join("\n")}"
         end
@@ -362,13 +362,13 @@ module ElasticGraph
         end
 
         unless (unknown_type_names = registered_type.derived_type_customizations_by_name.keys - types.map(&:name)).empty?
-          raise SchemaError,
+          raise Errors::SchemaError,
             "`customize_derived_types` was called on `#{registered_type.name}` with some unrecognized type names " \
              "(#{unknown_type_names.join(", ")}). Maybe some of the derived GraphQL types are misspelled?"
         end
 
         unless (unknown_type_names = registered_type.derived_field_customizations_by_type_and_field_name.keys - types.map(&:name)).empty?
-          raise SchemaError,
+          raise Errors::SchemaError,
             "`customize_derived_type_fields` was called on `#{registered_type.name}` with some unrecognized type names " \
              "(#{unknown_type_names.join(", ")}). Maybe some of the derived GraphQL types are misspelled?"
         end
@@ -378,7 +378,7 @@ module ElasticGraph
           field_customizations_by_name = registered_type.derived_field_customizations_by_name_for_type(type)
 
           if field_customizations_by_name.any? && !type.respond_to?(:graphql_fields_by_name)
-            raise SchemaError,
+            raise Errors::SchemaError,
               "`customize_derived_type_fields` was called on `#{registered_type.name}` with a type that can " \
               "never have fields: `#{type.name}`."
           end
@@ -394,7 +394,7 @@ module ElasticGraph
         end
 
         unless unknown_field_names.empty?
-          raise SchemaError,
+          raise Errors::SchemaError,
             "`customize_derived_type_fields` was called on `#{registered_type.name}` with some unrecognized field names " \
             "(#{unknown_field_names.join(", ")}). Maybe one of the field names was misspelled?"
         end

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

@@ -216,7 +216,7 @@ module ElasticGraph
               f.documentation <<~EOS
                 Matches records where the field value matches the provided value using full text search.
 
-                Will be ignored when `null` is passed.
+                When `null` is passed, matches all documents.
               EOS
 
               f.directive "deprecated", reason: "Use `#{names.matches_query}` instead."
@@ -228,7 +228,7 @@ module ElasticGraph
                 This is more lenient than `#{names.matches_phrase}`: the order of terms is ignored, and,
                 by default, only one search term is required to be in the field value.
 
-                Will be ignored when `null` is passed.
+                When `null` is passed, matches all documents.
               EOS
             end
 
@@ -238,7 +238,7 @@ module ElasticGraph
                 full text search. This is stricter than `#{names.matches_query}`: all terms must match
                 and be in the same order as the provided phrase.
 
-                Will be ignored when `null` is passed.
+                When `null` is passed, matches all documents.
               EOS
             end
           end.each do |input_type|
@@ -246,7 +246,7 @@ module ElasticGraph
             input_type.documentation <<~EOS
               Input type used to specify filters on `#{field_type}` fields that have been indexed for full text search.
 
-              Will be ignored if passed as an empty object (or as `null`).
+              Will match all documents if passed as an empty object (or as `null`).
             EOS
 
             register_input_type(input_type)
@@ -256,7 +256,7 @@ module ElasticGraph
             t.documentation <<~EOS
               Input type used to specify parameters for the `#{names.matches_query}` filtering operator.
 
-              Will be ignored if passed as `null`.
+              When `null` is passed, matches all documents.
             EOS
 
             t.field names.query, "String!" do |f|
@@ -280,18 +280,30 @@ module ElasticGraph
 
               f.default false
             end
+
+            # any_of/not don't really make sense on this filter because it doesn't make sense to
+            # apply an OR operator or negation to the fields of this type since they are all an
+            # indivisible part of a single filter operation on a specific field. So we remove them
+            # here.
+            remove_any_of_and_not_filter_operators_on(t)
           end
 
           register_filter "MatchesPhrase" do |t|
             t.documentation <<~EOS
               Input type used to specify parameters for the `#{names.matches_phrase}` filtering operator.
 
-              Will be ignored if passed as `null`.
+              When `null` is passed, matches all documents.
             EOS
 
             t.field names.phrase, "String!" do |f|
               f.documentation "The input phrase to search for."
             end
+
+            # any_of/not don't really make sense on this filter because it doesn't make sense to
+            # apply an OR operator or negation to the fields of this type since they are all an
+            # indivisible part of a single filter operation on a specific field. So we remove them
+            # here.
+            remove_any_of_and_not_filter_operators_on(t)
           end
 
           # This is defined as a built-in ElasticGraph type so that we can leverage Elasticsearch/OpenSearch GeoLocation features
@@ -329,7 +341,7 @@ module ElasticGraph
                 Matches records where the field's geographic location is within a specified distance from the
                 location identified by `#{names.latitude}` and `#{names.longitude}`.
 
-                Will be ignored when `null` or an empty object is passed.
+                When `null` or an empty object is passed, matches all documents.
               EOS
             end
           end.each { |input_filter| register_input_type(input_filter) }
@@ -551,10 +563,7 @@ module ElasticGraph
             t.customize_aggregated_values_type do |avt|
               # not nullable, since sum(empty_set) == 0
               avt.field names.approximate_sum, "Float!", graphql_only: true do |f|
-                f.runtime_metadata_graphql_field = f.runtime_metadata_graphql_field.with_computation_detail(
-                  empty_bucket_value: 0,
-                  function: :sum
-                )
+                f.runtime_metadata_computation_detail empty_bucket_value: 0, function: :sum
 
                 f.documentation <<~EOS
                   The sum of the field values within this grouping.
@@ -574,10 +583,7 @@ module ElasticGraph
               end
 
               avt.field names.approximate_avg, "Float", graphql_only: true do |f|
-                f.runtime_metadata_graphql_field = f.runtime_metadata_graphql_field.with_computation_detail(
-                  empty_bucket_value: nil,
-                  function: :avg
-                )
+                f.runtime_metadata_computation_detail empty_bucket_value: nil, function: :avg
 
                 f.documentation <<~EOS
                   The average (mean) of the field values within this grouping.
@@ -666,7 +672,11 @@ module ElasticGraph
               t.type_ref.as_list_element_filter_input.to_final_form(as_input: true).name
             ) do |ft|
               ft.field names.time_of_day, date_time_time_of_day_ref.as_filter_input.name do |f|
-                f.documentation "Matches records based on the time-of-day of the `DateTime` values."
+                f.documentation <<~EOS
+                  Matches records based on the time-of-day of the `DateTime` values.
+
+                  When `null` is passed, matches all documents.
+                EOS
               end
             end
 
@@ -683,7 +693,7 @@ module ElasticGraph
               t.documentation <<~EOS
                 Input type used to specify filters on the time-of-day of `DateTime` fields.
 
-                Will be ignored if passed as an empty object (or as `null`).
+                Will match all documents if passed as an empty object (or as `null`).
               EOS
 
               fixup_doc = ->(doc_string) do
@@ -855,10 +865,7 @@ module ElasticGraph
             t.customize_aggregated_values_type do |avt|
               # not nullable, since sum(empty_set) == 0
               avt.field names.approximate_sum, "Float!", graphql_only: true do |f|
-                f.runtime_metadata_graphql_field = f.runtime_metadata_graphql_field.with_computation_detail(
-                  empty_bucket_value: 0,
-                  function: :sum
-                )
+                f.runtime_metadata_computation_detail empty_bucket_value: 0, function: :sum
 
                 f.documentation <<~EOS
                   The (approximate) sum of the field values within this grouping.
@@ -870,10 +877,7 @@ module ElasticGraph
               end
 
               avt.field names.exact_sum, "JsonSafeLong", graphql_only: true do |f|
-                f.runtime_metadata_graphql_field = f.runtime_metadata_graphql_field.with_computation_detail(
-                  empty_bucket_value: 0,
-                  function: :sum
-                )
+                f.runtime_metadata_computation_detail empty_bucket_value: 0, function: :sum
 
                 f.documentation <<~EOS
                   The exact sum of the field values within this grouping, if it fits in a `JsonSafeLong`.
@@ -902,10 +906,7 @@ module ElasticGraph
                 names.exact_max => [:max, "maximum", names.approximate_max, "largest"]
               }.each do |exact_name, (func, full_name, approx_name, adjective)|
                 avt.field approx_name, "LongString", graphql_only: true do |f|
-                  f.runtime_metadata_graphql_field = f.runtime_metadata_graphql_field.with_computation_detail(
-                    empty_bucket_value: nil,
-                    function: func
-                  )
+                  f.runtime_metadata_computation_detail empty_bucket_value: nil, function: func
 
                   f.documentation <<~EOS
                     The #{full_name} of the field values within this grouping.
@@ -920,10 +921,7 @@ module ElasticGraph
               end
 
               avt.field names.approximate_avg, "Float", graphql_only: true do |f|
-                f.runtime_metadata_graphql_field = f.runtime_metadata_graphql_field.with_computation_detail(
-                  empty_bucket_value: nil,
-                  function: :avg
-                )
+                f.runtime_metadata_computation_detail empty_bucket_value: nil, function: :avg
 
                 f.documentation <<~EOS
                   The average (mean) of the field values within this grouping.
@@ -1424,10 +1422,7 @@ module ElasticGraph
           scalar_type.customize_aggregated_values_type do |t|
             # not nullable, since sum(empty_set) == 0
             t.field names.approximate_sum, "Float!", graphql_only: true do |f|
-              f.runtime_metadata_graphql_field = f.runtime_metadata_graphql_field.with_computation_detail(
-                empty_bucket_value: 0,
-                function: :sum
-              )
+              f.runtime_metadata_computation_detail empty_bucket_value: 0, function: :sum
 
               f.documentation <<~EOS
                 The (approximate) sum of the field values within this grouping.
@@ -1439,10 +1434,7 @@ module ElasticGraph
             end
 
             t.field names.exact_sum, long_type, graphql_only: true do |f|
-              f.runtime_metadata_graphql_field = f.runtime_metadata_graphql_field.with_computation_detail(
-                empty_bucket_value: 0,
-                function: :sum
-              )
+              f.runtime_metadata_computation_detail empty_bucket_value: 0, function: :sum
 
               f.documentation <<~EOS
                 The exact sum of the field values within this grouping, if it fits in a `#{long_type}`.
@@ -1461,10 +1453,7 @@ module ElasticGraph
             end
 
             t.field names.approximate_avg, "Float", graphql_only: true do |f|
-              f.runtime_metadata_graphql_field = f.runtime_metadata_graphql_field.with_computation_detail(
-                empty_bucket_value: nil,
-                function: :avg
-              )
+              f.runtime_metadata_computation_detail empty_bucket_value: nil, function: :avg
 
               f.documentation <<~EOS
                 The average (mean) of the field values within this grouping.
@@ -1481,10 +1470,7 @@ module ElasticGraph
           define_exact_min_and_max_on_aggregated_values(aggregated_values_type, scalar_type, &block)
 
           aggregated_values_type.field names.approximate_avg, scalar_type, graphql_only: true do |f|
-            f.runtime_metadata_graphql_field = f.runtime_metadata_graphql_field.with_computation_detail(
-              empty_bucket_value: nil,
-              function: :avg
-            )
+            f.runtime_metadata_computation_detail empty_bucket_value: nil, function: :avg
 
             f.documentation <<~EOS
               The average (mean) of the field values within this grouping.
@@ -1501,10 +1487,7 @@ module ElasticGraph
             discussion = yield(adjective: adjective, full_name: full_name)
 
             aggregated_values_type.field name, scalar_type, graphql_only: true do |f|
-              f.runtime_metadata_graphql_field = f.runtime_metadata_graphql_field.with_computation_detail(
-                empty_bucket_value: nil,
-                function: func
-              )
+              f.runtime_metadata_computation_detail empty_bucket_value: nil, function: func
 
               f.documentation ["The #{full_name} of the field values within this grouping.", discussion].compact.join("\n\n")
             end

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

@@ -89,11 +89,11 @@ module ElasticGraph
           value_name = schema_def_state.enum_value_namer.name_for(name, value_name.to_s)
 
           if values_by_name.key?(value_name)
-            raise SchemaError, "Duplicate value on Enum::Type #{name}: #{value_name}"
+            raise Errors::SchemaError, "Duplicate value on Enum::Type #{name}: #{value_name}"
           end
 
           if value_name.length > DEFAULT_MAX_KEYWORD_LENGTH
-            raise SchemaError, "Enum value `#{name}.#{value_name}` is too long: it is #{value_name.length} characters but cannot exceed #{DEFAULT_MAX_KEYWORD_LENGTH} characters."
+            raise Errors::SchemaError, "Enum value `#{name}.#{value_name}` is too long: it is #{value_name.length} characters but cannot exceed #{DEFAULT_MAX_KEYWORD_LENGTH} characters."
           end
 
           values_by_name[value_name] = schema_def_state.factory.new_enum_value(value_name, alternate_original_name, &block)
@@ -127,7 +127,7 @@ module ElasticGraph
         # @return [String] GraphQL SDL form of the enum type
         def to_sdl
           if values_by_name.empty?
-            raise SchemaError, "Enum type #{name} has no values, but enums must have at least one value."
+            raise Errors::SchemaError, "Enum type #{name} has no values, but enums must have at least one value."
           end
 
           <<~EOS