elasticgraph-graphql 1.0.2 → 1.0.3.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ddbc4f495bfbdd561f8bd06c8f8335a6a4f34595442079f2d3334b81ff41e33
-  data.tar.gz: 8dc723137bf6f4a797c1730328998590edb5f18e320508c63230318912319bff
+  metadata.gz: 491f97b51a739a57f7fd24238518fc02c0642ba2536da338d287694025f1cc9a
+  data.tar.gz: ed33c16391844f8b3321ec5849dba8a7acbe502ace6286aaabc401122d085aee
 SHA512:
-  metadata.gz: b51d3a76bb336ff1515381b15d1c96b9aaaf983627991083b93cd709d075b8e23c15f4992e712e4392e4b7627fad05b20802135e7373550265f59cdda3132bf4
-  data.tar.gz: 2442920912c9351603f69035ade684316dbda364295d0ba8d8c7450e5929c77da273501a110ebab7e2e39ecdb6f9296eaddad36afc13f694c8a76d379fd93098
+  metadata.gz: 4608f68a96a8f3f55af27ca0102552888f391243c2d71961a0e395f3b9c66ea0d4fde3b68933e04d974243c4ef10c8282ff377f5888e5c1de799f4660a6b15d8
+  data.tar.gz: 9c3e3ea42f82d421c5319c373f60f23666bee9237ed7df0e84ea2a51f0d7228af49bbc8e3cce9856eaac532b5ea0b0110e7afb9204abd9e737e055743425bb9e

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2024 - 2025 Block, Inc.
+Copyright (c) 2024 - 2026 Block, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/elastic_graph/graphql/aggregation/composite_grouping_adapter.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/aggregation/computation.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/aggregation/date_histogram_grouping.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at
@@ -53,6 +53,10 @@ module ElasticGraph
           INNER_META
         end
 
+        def handles_missing_values?
+          false
+        end
+
         INNER_META = {
           # On a date histogram aggregation, the `key` is formatted as a number (milliseconds since epoch). We
           # need it formatted as a string, which `key_as_string` provides.

data/lib/elastic_graph/graphql/aggregation/field_path_encoder.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/aggregation/field_term_grouping.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at
@@ -11,10 +11,30 @@ require "elastic_graph/graphql/aggregation/term_grouping"
 module ElasticGraph
   class GraphQL
     module Aggregation
-      class FieldTermGrouping < Support::MemoizableData.define(:field_path)
+      class FieldTermGrouping < Support::MemoizableData.define(:field_path, :missing_value_placeholder)
         # @dynamic field_path
         include TermGrouping
 
+        # Returns true if this grouping handles missing values using a placeholder value
+        # instead of a separate missing aggregation.
+        #
+        # @return [Boolean] true if missing values are handled via placeholder
+        def handles_missing_values?
+          !missing_value_placeholder.nil?
+        end
+
+        def non_composite_clause_for(query)
+          return super unless handles_missing_values?
+
+          Support::HashUtil.deep_merge(super, {"terms" => {"missing" => missing_value_placeholder}})
+        end
+
+        def inner_meta
+          return super unless handles_missing_values?
+
+          super.merge({"missing_values" => [missing_value_placeholder]})
+        end
+
         private
 
         def terms_subclause

data/lib/elastic_graph/graphql/aggregation/key.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/aggregation/nested_sub_aggregation.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/aggregation/non_composite_grouping_adapter.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at
@@ -65,29 +65,38 @@ module ElasticGraph
           def format_buckets(sub_agg, buckets_path, parent_key_fields: {}, parent_key_values: [])
             agg_with_buckets = sub_agg.dig(*buckets_path)
 
-            missing_bucket = {
-              # Doc counts in missing value buckets are always perfectly accurate.
-              "doc_count_error_upper_bound" => 0
-            }.merge(sub_agg.dig(*missing_bucket_path_from(buckets_path))) # : ::Hash[::String, untyped]
-
             meta = agg_with_buckets.fetch("meta")
 
             grouping_field_names = meta.fetch("grouping_fields") # provides the names of the fields being grouped on
             key_path = meta.fetch("key_path") # indicates whether we want to get the key values from `key` or `key_as_string`.
             sub_buckets_path = meta["buckets_path"] # buckets_path is optional, so we don't use fetch.
+            missing_values = meta["missing_values"] # missing_values is optional, so we don't use fetch.
             merge_into_bucket = meta.fetch("merge_into_bucket")
 
             raw_buckets = agg_with_buckets.fetch("buckets") # : ::Array[::Hash[::String, untyped]]
 
             # If the missing bucket is non-empty, include it. This matches the behavior of composite aggregations
             # when the `missing_bucket` option is used.
-            raw_buckets += [missing_bucket] if missing_bucket.fetch("doc_count") > 0
+            missing_bucket = sub_agg.dig(*missing_bucket_path_from(buckets_path)) || {}
+            if missing_bucket.fetch("doc_count", 0) > 0
+              # Doc counts in missing value buckets are always perfectly accurate.
+              raw_buckets += [{"doc_count_error_upper_bound" => 0}.merge(missing_bucket)]
+            end
 
             raw_buckets.flat_map do |raw_bucket|
+              key_values = Array(raw_bucket.dig(*key_path))
+              if missing_values
+                # if missing_values are present, then for each element in key_values, replace with nil if it matches the placeholder value from missing_values
+                key_values = key_values.each_with_index.map do |value, index|
+                  # @type var value: untyped
+                  # @type var index: Integer
+                  (value == missing_values[index]) ? nil : value
+                end
+              end
+
               # The key will either be a single value (e.g. `47`) if we used a `terms`/`date_histogram` aggregation,
               # or a tuple of values (e.g. `[47, "abc"]`) if we used a `multi_terms` aggregation. Here we convert it
               # to the form needed for resolving `grouped_by` fields: a hash like `{"size" => 47, "tag" => "abc"}`.
-              key_values = Array(raw_bucket.dig(*key_path))
               key_fields_hash = grouping_field_names.zip(key_values).to_h
 
               # If we have multiple levels of aggregations, we need to merge the key fields hash with the key fields from the parent levels.

data/lib/elastic_graph/graphql/aggregation/path_segment.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/aggregation/query.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at
@@ -154,27 +154,30 @@ module ElasticGraph
             "meta" => meta.merge(extra_inner_meta)
           }.compact
 
-          missing_bucket_inner_agg_hash = inner_agg_hash.key?("aggs") ? inner_agg_hash : {} # : ::Hash[::String, untyped]
-
-          AggregationDetail.new(
-            {
-              agg_key => grouping.non_composite_clause_for(query).merge(inner_agg_hash),
-
-              # Here we include a `missing` aggregation as a sibling to the main grouping aggregation. We do this
-              # so that we get a bucket of documents that have `null` values for the field we are grouping on, in
-              # order to provide the same behavior as the `CompositeGroupingAdapter` (which uses the built-in
-              # `missing_bucket` option).
-              #
-              # To work correctly, we need to include this `missing` aggregation as a sibling at _every_ level of
-              # the aggregation structure, and the `missing` aggregation needs the same child aggregations as the
-              # main grouping aggregation has. Given the recursive nature of how this is applied, this results in
-              # a fairly complex structure, even though conceptually the idea behind this isn't _too_ bad.
-              Key.missing_value_bucket_key(agg_key) => {
-                "missing" => {"field" => grouping.encoded_index_field_path}
-              }.merge(missing_bucket_inner_agg_hash)
-            },
-            {"buckets_path" => [agg_key]}
-          )
+          wrapped_clauses = {
+            agg_key => grouping.non_composite_clause_for(query).merge(inner_agg_hash)
+          }
+
+          unless grouping.handles_missing_values?
+            # Here we include a `missing` aggregation as a sibling to the main grouping aggregation. We do this
+            # so that we get a bucket of documents that have `null` values for the field we are grouping on, in
+            # order to provide the same behavior as the `CompositeGroupingAdapter` (which uses the built-in
+            # `missing_bucket` option).
+            #
+            # To work correctly, we need to include this `missing` aggregation as a sibling at _every_ level of
+            # the aggregation structure, and the `missing` aggregation needs the same child aggregations as the
+            # main grouping aggregation has. Given the recursive nature of how this is applied, this results in
+            # a fairly complex structure, even though conceptually the idea behind this isn't _too_ bad.
+            missing_bucket_inner_agg_hash = inner_agg_hash.key?("aggs") ? inner_agg_hash : {} # : ::Hash[::String, untyped]
+            missing_bucket_inner_agg_hash = missing_bucket_inner_agg_hash.merge({
+              "missing" => {"field" => grouping.encoded_index_field_path}
+            })
+            wrapped_clauses = wrapped_clauses.merge({
+              Key.missing_value_bucket_key(agg_key) => missing_bucket_inner_agg_hash
+            })
+          end
+
+          AggregationDetail.new(wrapped_clauses, {"buckets_path" => [agg_key]})
         end
       end
     end

data/lib/elastic_graph/graphql/aggregation/query_adapter.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at
@@ -211,7 +211,8 @@ module ElasticGraph
               date_time_groupings_from(field_path: field_path, node: node)
             elsif !field.type.object?
               # Non-date/time grouping
-              [FieldTermGrouping.new(field_path: field_path)]
+              missing_value_placeholder = field.type.unwrap_fully.grouping_missing_value_placeholder
+              [FieldTermGrouping.new(field_path: field_path, missing_value_placeholder: missing_value_placeholder)]
             end
           end
         end

data/lib/elastic_graph/graphql/aggregation/query_optimizer.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/aggregation/resolvers/aggregated_values.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/aggregation/resolvers/count_detail.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/aggregation/resolvers/grouped_by.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/aggregation/resolvers/node.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/aggregation/resolvers/relay_connection_builder.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/aggregation/resolvers/sub_aggregations.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/aggregation/script_term_grouping.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at
@@ -16,6 +16,10 @@ module ElasticGraph
         # @dynamic field_path
         include TermGrouping
 
+        def handles_missing_values?
+          false
+        end
+
         private
 
         def terms_subclause

data/lib/elastic_graph/graphql/aggregation/term_grouping.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/client.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/config.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/datastore_query/document_paginator.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/datastore_query/index_expression_builder.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/datastore_query/paginator.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/datastore_query/routing_picker.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/datastore_query.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/datastore_response/document.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/datastore_response/search_response.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/datastore_search_router.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/decoded_cursor.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at
@@ -55,7 +55,7 @@ module ElasticGraph
       # Encodes the cursor to a string using JSON and Base64 encoding.
       def encode
         @encode ||= begin
-          json = ::JSON.fast_generate(sort_values)
+          json = ::JSON.generate(sort_values)
           ::Base64.urlsafe_encode64(json, padding: false)
         end
       end

data/lib/elastic_graph/graphql/filtering/boolean_query.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/filtering/field_path.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/filtering/filter_args_translator.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/filtering/filter_interpreter.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/filtering/filter_node_interpreter.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/filtering/filter_value_set_extractor.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/filtering/range_query.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at
@@ -39,15 +39,49 @@ module ElasticGraph
       # a value > 10 and a value < 100 (even though no single value satisfies both parts!). When we combine
       # the clauses into a single `range` query then the filtering works like we expect.
       class RangeQuery < ::Data.define(:field_name, :operator, :value)
+        SAME_TYPE_OPS = {
+          gt: [:gt, :gte],
+          gte: [:gt, :gte],
+          lt: [:lt, :lte],
+          lte: [:lt, :lte]
+        }.freeze
+
         def merge_into(bool_node)
           existing_range_index = bool_node[:filter].find_index { |clause| clause.dig(:range, field_name) }
-          new_range_clause = {range: {field_name => {operator => value}}}
 
           if existing_range_index
-            existing_range_clause = bool_node[:filter][existing_range_index]
-            bool_node[:filter][existing_range_index] = Support::HashUtil.deep_merge(existing_range_clause, new_range_clause)
+            existing_range_hash = bool_node[:filter][existing_range_index].dig(:range, field_name)
+            merged_range_hash = merge_operators(existing_range_hash)
+            bool_node[:filter][existing_range_index] = {range: {field_name => merged_range_hash}}
+          else
+            bool_node[:filter] << {range: {field_name => {operator => value}}}
+          end
+        end
+
+        private
+
+        # Merges the new operator with existing operators.
+        # Keeps the stricter one (gt vs gte or lt vs lte) when there are conflicts.
+        def merge_operators(existing_range_hash)
+          conflicting_op = SAME_TYPE_OPS.fetch(operator).find { |op| existing_range_hash.key?(op) }
+
+          if conflicting_op
+            existing_val = existing_range_hash[conflicting_op]
+            stricter_op, stricter_val = stricter_operator(operator, value, conflicting_op, existing_val)
+            existing_range_hash.except(conflicting_op).merge(stricter_op => stricter_val)
+          else
+            existing_range_hash.merge(operator => value)
+          end
+        end
+
+        # Returns the stricter of two operators/values in the same direction.
+        def stricter_operator(op1, val1, op2, val2)
+          if [:gt, :gte].include?(op1)
+            # lower bound: higher is stricter, gt wins ties
+            (val1 > val2 || (val1 == val2 && op1 == :gt)) ? [op1, val1] : [op2, val2]
           else
-            bool_node[:filter] << new_range_clause
+            # upper bound: lower is stricter; lt wins ties
+            (val1 < val2 || (val1 == val2 && op1 == :lt)) ? [op1, val1] : [op2, val2]
           end
         end
       end

data/lib/elastic_graph/graphql/http_endpoint.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/query_adapter/filters.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/query_adapter/pagination.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/query_adapter/requested_fields.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/query_adapter/sort.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/query_details_tracker.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at
@@ -17,6 +17,7 @@ module ElasticGraph
       :datastore_query_server_duration_ms,
       :datastore_query_client_duration_ms,
       :queried_shard_count,
+      :extension_data,
       :mutex
     )
       def self.empty
@@ -27,6 +28,7 @@ module ElasticGraph
           datastore_query_server_duration_ms: 0,
           datastore_query_client_duration_ms: 0,
           queried_shard_count: 0,
+          extension_data: {},
           mutex: ::Thread::Mutex.new
         )
       end
@@ -52,6 +54,13 @@ module ElasticGraph
       def datastore_request_transport_duration_ms
         datastore_query_client_duration_ms - datastore_query_server_duration_ms
       end
+
+      # Allows extensions to set custom data that will be included in the query duration log.
+      def []=(key, value)
+        mutex.synchronize do
+          extension_data[key] = value
+        end
+      end
     end
   end
 end

data/lib/elastic_graph/graphql/query_executor.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at
@@ -65,7 +65,7 @@ module ElasticGraph
 
         unless result.to_h.fetch("errors", []).empty?
           @logger.error <<~EOS
-            Query #{query.operation_name}[1] for client #{client.description} resulted in errors[2].
+            Query #{query.selected_operation_name}[1] for client #{client.description} resulted in errors[2].
 
             [1] #{full_description_of(query)}
 
@@ -79,7 +79,7 @@ module ElasticGraph
         # returns `nil` on an invalid query, and I don't want to risk leaking PII by logging the raw query string, so
         # we don't log any form of the query in that case.
         if duration > @slow_query_threshold_ms
-          @logger.warn "Query #{query.operation_name} for client #{client.description} with shard routing values " \
+          @logger.warn "Query #{query.selected_operation_name} for client #{client.description} with shard routing values " \
             "#{query_tracker.shard_routing_values.sort.inspect} and search index expressions #{query_tracker.search_index_expressions.sort.inspect} took longer " \
             "(#{duration} ms) than the configured slow query threshold (#{@slow_query_threshold_ms} ms). " \
             "Sanitized query:\n\n#{query.sanitized_query_string}"
@@ -90,7 +90,7 @@ module ElasticGraph
             "message_type" => "ElasticGraphQueryExecutorQueryDuration",
             "client" => client.name,
             "query_fingerprint" => fingerprint_for(query),
-            "query_name" => query.operation_name,
+            "query_name" => query.selected_operation_name,
             "duration_ms" => duration,
             # How long the datastore queries took according to what the datastore itself reported.
             "datastore_server_duration_ms" => query_tracker.datastore_query_server_duration_ms,
@@ -117,7 +117,7 @@ module ElasticGraph
             "datastore_query_count" => query_tracker.query_counts_per_datastore_request.sum,
             "over_slow_threshold" => (duration > @slow_query_threshold_ms).to_s,
             "slo_result" => slo_result_for(query, duration)
-          })
+          }.merge(query_tracker.extension_data))
         end
 
         result
@@ -147,7 +147,7 @@ module ElasticGraph
         query.result
       rescue => ex
         @logger.error <<~EOS
-          Query #{query.operation_name}[1] for client #{client.description} failed with an exception[2].
+          Query #{query.selected_operation_name}[1] for client #{client.description} failed with an exception[2].
 
           [1] #{full_description_of(query)}
 

data/lib/elastic_graph/graphql/resolvers/get_record_field_value.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/resolvers/graphql_adapter_builder.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/resolvers/list_records.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/resolvers/nested_relationships.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/resolvers/nested_relationships_source.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/resolvers/object.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/resolvers/query_adapter.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/resolvers/query_source.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/resolvers/relay_connection/array_adapter.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/resolvers/relay_connection/generic_adapter.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/resolvers/relay_connection/page_info.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/resolvers/relay_connection/search_response_adapter_builder.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/resolvers/relay_connection.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/resolvers/resolvable_value.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/scalar_coercion_adapters/cursor.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/scalar_coercion_adapters/date.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/scalar_coercion_adapters/date_time.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at
@@ -6,14 +6,13 @@
 #
 # frozen_string_literal: true
 
+require "elastic_graph/constants"
 require "time"
 
 module ElasticGraph
   class GraphQL
     module ScalarCoercionAdapters
       class DateTime
-        PRECISION = 3 # millisecond precision
-
         def self.coerce_input(value, ctx)
           return value if value.nil?
 
@@ -33,7 +32,7 @@ module ElasticGraph
           # format, so here we convert it to that format (which is just ISO8601 format). Ultimately,
           # that means that this method just "roundtrips" the input string back to a string, but it validates
           # the string is formatted correctly and returns a string in the exact format we need for the datastore.
-          time.iso8601(PRECISION)
+          time.iso8601(DATE_TIME_PRECISION)
         rescue ::ArgumentError, ::TypeError
           raise_coercion_error(value)
         end
@@ -41,9 +40,9 @@ module ElasticGraph
         def self.coerce_result(value, ctx)
           case value
           when ::Time
-            value.iso8601(PRECISION)
+            value.iso8601(DATE_TIME_PRECISION)
           when ::String
-            ::Time.iso8601(value).iso8601(PRECISION)
+            ::Time.iso8601(value).iso8601(DATE_TIME_PRECISION)
           end
         rescue ::ArgumentError
           nil

data/lib/elastic_graph/graphql/scalar_coercion_adapters/local_time.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/scalar_coercion_adapters/longs.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/scalar_coercion_adapters/no_op.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/scalar_coercion_adapters/time_zone.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/scalar_coercion_adapters/untyped.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/scalar_coercion_adapters/valid_time_zones.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/schema/arguments.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/schema/enum_value.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/schema/field.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/schema/relation_join.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/graphql/schema/type.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at
@@ -19,12 +19,19 @@ module ElasticGraph
       class Type
         attr_reader :graphql_type, :fields_by_name, :index_definitions, :elasticgraph_category, :graphql_only_return_type
 
+        # Returns the grouping missing value placeholder for this type, if one is defined.
+        # This is used to handle missing values in aggregations without creating separate
+        # missing subaggregations, reducing the exponential explosion of subaggregations.
+        # @return [String, Numeric, nil] the placeholder value to use for missing values in grouping operations
+        attr_reader :grouping_missing_value_placeholder
+
         def initialize(
           schema,
           graphql_type,
           index_definitions,
           object_runtime_metadata,
           enum_runtime_metadata,
+          scalar_runtime_metadata,
           resolvers_needing_lookahead
         )
           @schema = schema
@@ -44,6 +51,7 @@ module ElasticGraph
           end
 
           @fields_by_name = build_fields_by_name_hash(schema, graphql_type).freeze
+          @grouping_missing_value_placeholder = determine_grouping_missing_value_placeholder(scalar_runtime_metadata&.grouping_missing_value_placeholder)
         end
 
         def name
@@ -232,6 +240,21 @@ module ElasticGraph
 
         private
 
+        def determine_grouping_missing_value_placeholder(scalar_placeholder)
+          if enum?
+            MISSING_ENUM_PLACEHOLDER
+          elsif scalar_placeholder == MISSING_STRING_PLACEHOLDER
+            # We replace the MISSING_STRING_PLACEHOLDER ($SECURE_RANDOM) with the secure random value
+            # generated and stored at MISSING_STRING_PLACEHOLDER_VALUE.
+            MISSING_STRING_PLACEHOLDER_VALUE
+          else
+            # Note that if the type is not a scalar then scalar_placeholder will be nil.
+            # We don't use missing value placeholders (or group aggregations) on fields
+            # that are not scalars or enums.
+            scalar_placeholder
+          end
+        end
+
         def lookup_enum_value_by_name(enum_value_name)
           graphql_enum_value = @graphql_type.values.fetch(enum_value_name)
 

data/lib/elastic_graph/graphql/schema.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at
@@ -53,6 +53,7 @@ module ElasticGraph
             index_definitions_by_graphql_type[key.graphql_name] || [],
             runtime_metadata.object_types_by_name[key.graphql_name],
             runtime_metadata.enum_types_by_name[key.graphql_name],
+            runtime_metadata.scalar_types_by_name[key.graphql_name],
             resolvers_needing_lookahead
           )
         end

data/lib/elastic_graph/graphql.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/script/dump_time_zones

@@ -8,7 +8,7 @@ updated_code_filename = "#{__dir__}/../../tmp/updated_valid_time_zones.rb"
 java_time_zones = `java --source 11 #{__dir__}/dump_time_zones.java`.split("\n")
 
 ::File.write(updated_code_filename, <<~EOS)
-  # Copyright 2024 - 2025 Block, Inc.
+  # Copyright 2024 - 2026 Block, Inc.
   #
   # Use of this source code is governed by an MIT-style
   # license that can be found in the LICENSE file or at

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticgraph-graphql
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3.rc1
 platform: ruby
 authors:
 - Myron Marston
@@ -31,42 +31,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3.rc1
 - !ruby/object:Gem::Dependency
   name: elasticgraph-schema_artifacts
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3.rc1
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.11
+        version: 2.5.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.11
+        version: 2.5.18
 - !ruby/object:Gem::Dependency
   name: graphql-c_parser
   requirement: !ruby/object:Gem::Requirement
@@ -93,70 +93,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3.rc1
 - !ruby/object:Gem::Dependency
   name: elasticgraph-elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3.rc1
 - !ruby/object:Gem::Dependency
   name: elasticgraph-opensearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3.rc1
 - !ruby/object:Gem::Dependency
   name: elasticgraph-indexer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3.rc1
 - !ruby/object:Gem::Dependency
   name: elasticgraph-schema_definition
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3.rc1
 email:
 - myron@squareup.com
 executables: []
@@ -247,10 +247,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/block/elasticgraph/issues
-  changelog_uri: https://github.com/block/elasticgraph/releases/tag/v1.0.2
-  documentation_uri: https://block.github.io/elasticgraph/api-docs/v1.0.2/
+  changelog_uri: https://github.com/block/elasticgraph/releases/tag/v1.0.3.rc1
+  documentation_uri: https://block.github.io/elasticgraph/api-docs/v1.0.3.rc1/
   homepage_uri: https://block.github.io/elasticgraph/
-  source_code_uri: https://github.com/block/elasticgraph/tree/v1.0.2/elasticgraph-graphql
+  source_code_uri: https://github.com/block/elasticgraph/tree/v1.0.3.rc1/elasticgraph-graphql
   gem_category: core
 rdoc_options: []
 require_paths:
@@ -262,14 +262,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.4'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.5'
+      version: '4.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Provides the ElasticGraph GraphQL query engine.
 test_files: []