elasticgraph-graphql 0.18.0.0 → 0.18.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b19df00bc750f39aa2cbccab58af18c6cb2a2329017e9d0aa8f889dce5b1c377
-  data.tar.gz: 8308fce167bd7cf625bb7b82f2f717c174ffa12655b1df77e58e37369b8d6294
+  metadata.gz: 3b80c95effea6c96d77f52275854dcf2ef14fa9b56c56cbca44fef5b5e34da5d
+  data.tar.gz: 6af6c4269f7d9b4822a16e0007c24574593261a585cc7de9227ec3584c50a5ed
 SHA512:
-  metadata.gz: c983f82a5da8da47c2f8146337b9425623d1ebfacf0e2f93db706cd53e465725f12cc43fe4e49d2b7885422a428e7744ae61642264941d3d497eb4d4fd3bc9f6
-  data.tar.gz: 277958b0fee144f62342f2e3081f4ebbb9a7529456e62a2b5183ad8fe93f2cca7fd5013cbe9bf461fceee46d5f42cea8149d40b624410fbb9498267e78d1dedb
+  metadata.gz: 33c540e6691fa35958a4b8c01984909f36a12092e05bb78e4cf91424a555d2932b79cdb50e8007756c2bd7d4a44bc176b36a7363cf5e5b2be75f3d5475d616d7
+  data.tar.gz: 9ee9a9790c301d17f6467413d2ad02f6e01fd2305b5989eaed5fcbd78fdd8d84b9b8f21ef14cdd109444675a6e63df737555be7eb34be988bb44359a834ab0ea

data/elasticgraph-graphql.gemspec

@@ -13,7 +13,7 @@ ElasticGraphGemspecHelper.define_elasticgraph_gem(gemspec_file: __FILE__, catego
 
   spec.add_dependency "elasticgraph-datastore_core", eg_version
   spec.add_dependency "elasticgraph-schema_artifacts", eg_version
-  spec.add_dependency "graphql", ">= 2.3.7", "< 2.4"
+  spec.add_dependency "graphql", "~> 2.3.14"
 
   spec.add_development_dependency "elasticgraph-admin", eg_version
   spec.add_development_dependency "elasticgraph-elasticsearch", eg_version

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

@@ -7,6 +7,7 @@
 # frozen_string_literal: true
 
 require "elastic_graph/graphql/aggregation/field_path_encoder"
+require "elastic_graph/support/memoizable_data"
 
 module ElasticGraph
   class GraphQL
@@ -14,14 +15,23 @@ module ElasticGraph
       # Represents a sub-aggregation on a `nested` field.
       # For the relevant Elasticsearch docs, see:
       # https://www.elastic.co/guide/en/elasticsearch/reference/8.10/search-aggregations-bucket-nested-aggregation.html
-      class NestedSubAggregation < ::Data.define(:nested_path, :query)
+      class NestedSubAggregation < Support::MemoizableData.define(:nested_path, :query)
+        # The nested path in the GraphQL query from the parent aggregation to this-subaggregation, encoded
+        # for use as a hash key.
+        #
+        # This key will be unique in the scope of the parent aggregation query, and thus suitable as a key
+        # in a sub-aggregations hash.
+        def nested_path_key
+          @nested_path_key ||= FieldPathEncoder.encode(nested_path.map(&:name_in_graphql_query))
+        end
+
         def build_agg_hash(filter_interpreter, parent_queries:)
           detail = query.build_agg_detail(filter_interpreter, field_path: nested_path, parent_queries: parent_queries)
           return {} if detail.nil?
 
-          query_names = parent_queries.map(&:name) + [query.name]
+          parent_query_names = parent_queries.map(&:name)
           {
-            Key.encode(query_names) => {
+            Key.encode(parent_query_names + [nested_path_key]) => {
               "nested" => {"path" => FieldPathEncoder.encode(nested_path.filter_map(&:name_in_index))},
               "aggs" => detail.clauses,
               "meta" => detail.meta.merge({

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

@@ -9,6 +9,7 @@
 require "elastic_graph/graphql/aggregation/key"
 require "elastic_graph/graphql/datastore_query"
 require "elastic_graph/graphql/filtering/field_path"
+require "elastic_graph/support/hash_util"
 
 module ElasticGraph
   class GraphQL
@@ -62,7 +63,7 @@ module ElasticGraph
 
           filter_detail(filter_interpreter, field_path) do
             grouping_adapter.grouping_detail_for(self) do
-              computations_detail.merge(sub_aggregation_detail(filter_interpreter, queries))
+              Support::HashUtil.disjoint_merge(computations_detail, sub_aggregation_detail(filter_interpreter, queries))
             end
           end
         end
@@ -114,7 +115,10 @@ module ElasticGraph
         end
 
         def build_inner_aggregation_detail(collection, &block)
-          collection.map(&block).reduce({}, :merge)
+          initial = {} # : ::Hash[::String, untyped]
+          collection.map(&block).reduce(initial) do |accum, hash|
+            Support::HashUtil.disjoint_merge(accum, hash)
+          end
         end
       end
 

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

@@ -15,6 +15,7 @@ require "elastic_graph/graphql/aggregation/path_segment"
 require "elastic_graph/graphql/aggregation/query"
 require "elastic_graph/graphql/aggregation/script_term_grouping"
 require "elastic_graph/graphql/schema/arguments"
+require "elastic_graph/support/hash_util"
 require "elastic_graph/support/memoizable_data"
 
 module ElasticGraph
@@ -303,22 +304,25 @@ module ElasticGraph
         end
 
         def build_sub_aggregations_from(node_node, parent_nested_path: [])
-          build_clauses_from(node_node.selection(element_names.sub_aggregations)) do |node, field, field_path|
-            if field.type.elasticgraph_category == :nested_sub_aggregation_connection
-              nested_path = parent_nested_path + field_path
-              nested_sub_agg = NestedSubAggregation.new(
-                nested_path: nested_path,
-                query: build_aggregation_query_for(
-                  node,
-                  field: field,
-                  grouping_adapter: sub_aggregation_grouping_adapter,
-                  nested_path: nested_path
+          key_sub_agg_pairs =
+            build_clauses_from(node_node.selection(element_names.sub_aggregations)) do |node, field, field_path|
+              if field.type.elasticgraph_category == :nested_sub_aggregation_connection
+                nested_path = parent_nested_path + field_path
+                nested_sub_agg = NestedSubAggregation.new(
+                  nested_path: nested_path,
+                  query: build_aggregation_query_for(
+                    node,
+                    field: field,
+                    grouping_adapter: sub_aggregation_grouping_adapter,
+                    nested_path: nested_path
+                  )
                 )
-              )
 
-              [[nested_sub_agg.query.name, nested_sub_agg]]
+                [[nested_sub_agg.nested_path_key, nested_sub_agg]] # : ::Array[[::String, NestedSubAggregation]]
+              end
             end
-          end.to_h
+
+          Support::HashUtil.strict_to_h(key_sub_agg_pairs)
         end
 
         def build_paginator_for(node)

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

@@ -8,6 +8,7 @@
 
 require "elastic_graph/graphql/aggregation/key"
 require "elastic_graph/graphql/aggregation/path_segment"
+require "elastic_graph/support/hash_util"
 
 module ElasticGraph
   class GraphQL
@@ -27,7 +28,7 @@ module ElasticGraph
               function_name: field.name_in_index.to_s
             )
 
-            result = bucket.fetch(key.encode)
+            result = Support::HashUtil.verbose_fetch(bucket, key.encode)
 
             # Aggregated value results always have a `value` key; in addition, for `date` field, they also have a `value_as_string`.
             # In that case, `value` is a number (e.g. ms since epoch) whereas `value_as_string` is a formatted value. ElasticGraph

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

@@ -7,6 +7,7 @@
 # frozen_string_literal: true
 
 require "elastic_graph/graphql/aggregation/field_path_encoder"
+require "elastic_graph/support/hash_util"
 
 module ElasticGraph
   class GraphQL
@@ -21,7 +22,8 @@ module ElasticGraph
             new_field_path = field_path + [PathSegment.for(field: field, lookahead: lookahead)]
             return with(field_path: new_field_path) if field.type.object?
 
-            bucket.fetch("key").fetch(FieldPathEncoder.encode(new_field_path.map(&:name_in_graphql_query)))
+            bucket_entry = Support::HashUtil.verbose_fetch(bucket, "key")
+            Support::HashUtil.verbose_fetch(bucket_entry, FieldPathEncoder.encode(new_field_path.map(&:name_in_graphql_query)))
           end
         end
       end

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

@@ -7,17 +7,19 @@
 # frozen_string_literal: true
 
 require "elastic_graph/graphql/aggregation/composite_grouping_adapter"
+require "elastic_graph/graphql/aggregation/field_path_encoder"
 require "elastic_graph/graphql/aggregation/key"
 require "elastic_graph/graphql/aggregation/non_composite_grouping_adapter"
 require "elastic_graph/graphql/aggregation/resolvers/count_detail"
 require "elastic_graph/graphql/decoded_cursor"
 require "elastic_graph/graphql/resolvers/resolvable_value"
+require "elastic_graph/support/hash_util"
 
 module ElasticGraph
   class GraphQL
     module Aggregation
       module Resolvers
-        class SubAggregations < ::Data.define(:schema_element_names, :sub_aggregations, :parent_queries, :sub_aggs_by_name, :field_path)
+        class SubAggregations < ::Data.define(:schema_element_names, :sub_aggregations, :parent_queries, :sub_aggs_by_agg_key, :field_path)
           def can_resolve?(field:, object:)
             true
           end
@@ -27,25 +29,26 @@ module ElasticGraph
             new_field_path = field_path + [path_segment]
             return with(field_path: new_field_path) unless field.type.elasticgraph_category == :nested_sub_aggregation_connection
 
-            aggregation_name = path_segment.name_in_graphql_query
-            sub_agg_query = sub_aggregations.fetch(aggregation_name).query
+            sub_agg_key = FieldPathEncoder.encode(new_field_path.map(&:name_in_graphql_query))
+            sub_agg_query = Support::HashUtil.verbose_fetch(sub_aggregations, sub_agg_key).query
 
             RelayConnectionBuilder.build_from_buckets(
               query: sub_agg_query,
               parent_queries: parent_queries,
               schema_element_names: schema_element_names,
               field_path: new_field_path
-            ) { extract_buckets(aggregation_name, args) }
+            ) { extract_buckets(sub_agg_key, args) }
           end
 
           private
 
-          def extract_buckets(aggregation_name, args)
+          def extract_buckets(aggregation_field_path, args)
             # When the client passes `first: 0`, we omit the sub-aggregation from the query body entirely,
-            # and it wont' be in `sub_aggs_by_name`. Instead, we can just return an empty list of buckets.
+            # and it wont' be in `sub_aggs_by_agg_key`. Instead, we can just return an empty list of buckets.
             return [] if args[schema_element_names.first] == 0
 
-            sub_agg = sub_aggs_by_name.fetch(Key.encode(parent_queries.map(&:name) + [aggregation_name]))
+            sub_agg_key = Key.encode(parent_queries.map(&:name) + [aggregation_field_path])
+            sub_agg = Support::HashUtil.verbose_fetch(sub_aggs_by_agg_key, sub_agg_key)
             meta = sub_agg.fetch("meta")
 
             # When the sub-aggregation node of the GraphQL query has a `filter` argument, the direct sub-aggregation returned by

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

@@ -62,6 +62,11 @@ module ElasticGraph
 
         def process_filter_hash(bool_node, filter_hash, field_path)
           filter_hash.each do |field_or_op, expression|
+            # `nil` filter predicates should be ignored, so we can safely `compact` them out.
+            # It also is simpler to handle them once here instead of the different branches
+            # below having to be aware of possible `nil` predicates.
+            expression = expression.compact if expression.is_a?(::Hash)
+
             case identify_expression_type(field_or_op, expression)
             when :empty
               # This is an "empty" filter predicate and we can ignore it.
@@ -86,7 +91,7 @@ module ElasticGraph
         end
 
         def identify_expression_type(field_or_op, expression)
-          return :empty if expression.nil?
+          return :empty if expression.nil? || expression == {}
           return :not if field_or_op == schema_names.not
           return :list_any_filter if field_or_op == schema_names.any_satisfy
           return :all_of if field_or_op == schema_names.all_of
@@ -160,9 +165,7 @@ module ElasticGraph
             process_filter_hash(inner_node, filter, field_path.nested)
           end
 
-          if sub_filter
-            bool_node[:filter] << {nested: {path: field_path.from_root.join("."), query: sub_filter}}
-          end
+          bool_node[:filter] << {nested: {path: field_path.from_root.join("."), query: sub_filter}}
         end
 
         # On a list-of-leaf-values field, `any_satisfy` doesn't _do_ anything: it just expresses
@@ -302,7 +305,7 @@ module ElasticGraph
               process_filter_hash(inner_node, expression, field_path)
             end
 
-            bool_node[:filter] << sub_filter if sub_filter
+            bool_node[:filter] << sub_filter
           else
             process_filter_hash(bool_node, expression, field_path)
           end

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

@@ -33,7 +33,7 @@ module ElasticGraph
               [arg_name, args[schema_element_names.public_send(arg_name)]]
             end.compact
 
-            graphql_impl = ::GraphQL::Pagination::ArrayConnection.new(nodes, context: context, **relay_args)
+            graphql_impl = ::GraphQL::Pagination::ArrayConnection.new(nodes || [], context: context, **relay_args)
             new(schema_element_names, graphql_impl)
           end
 

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

@@ -8,6 +8,7 @@
 
 require "elastic_graph/graphql/aggregation/resolvers/relay_connection_builder"
 require "elastic_graph/graphql/resolvers/relay_connection/search_response_adapter_builder"
+require "elastic_graph/support/hash_util"
 
 module ElasticGraph
   class GraphQL
@@ -33,7 +34,7 @@ module ElasticGraph
           Aggregation::Resolvers::RelayConnectionBuilder.build_from_search_response(
             schema_element_names: schema_element_names,
             search_response: search_response,
-            query: query.aggregations.fetch(agg_name)
+            query: Support::HashUtil.verbose_fetch(query.aggregations, agg_name)
           )
         end
       end

data/lib/elastic_graph/graphql.rb

@@ -171,7 +171,6 @@ module ElasticGraph
     # @private
     def datastore_query_adapters
       @datastore_query_adapters ||= begin
-        require "elastic_graph/graphql/aggregation/non_composite_grouping_adapter"
         require "elastic_graph/graphql/aggregation/query_adapter"
         require "elastic_graph/graphql/query_adapter/filters"
         require "elastic_graph/graphql/query_adapter/pagination"

metadata

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