elasticgraph-graphql 0.19.2.0 → 0.19.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c406c0dd4109d2b92b834f989f5819fc6342696b9c0b231f38b0bb4fc0d8f858
-  data.tar.gz: 95b206f183b6ccfc644ffab571e43232be92123d8c0998bd4add03b4d8571404
+  metadata.gz: 48f8d7c9aefb1e034cae73f0476b2a5c8a7fa3d653e2c2f0354650a7e18e17b4
+  data.tar.gz: 0eef52c59c0842516168951888b3b2d995f93cc5a5716297e8e9f2b4f5d15db6
 SHA512:
-  metadata.gz: 5a1474ca90d5ec6a4c65996491e3570d3b4fef1bd40c9550b0b850bb663018dd9cd690e262af080212019ab12c05651aeca3f79f22ba1007a676422578e8787e
-  data.tar.gz: 8d7f2aff08c7ea4f6038943682f1231d4371c67003acf2f78321b749d4838550eef4b53df7a37b02ee134a10075e0f382251c06d9d18ce7f8bada9838579f201
+  metadata.gz: 597c2a1678dab99f0425fdec407493e8706c154df056979affaa097253b51084576d500b55a70c3d84ad66915b63476c6c0083cc1f01796ac04d9d82027591bc
+  data.tar.gz: b764415cb4898528a7b1fc54b10fc3a77cb81f92c51a903e9c304ffce0bb0effeeae67c7dd9db57bb8c36952dc93a0c72810c213081dedb6a20b7898b513e2b8

data/lib/elastic_graph/graphql/query_details_tracker.rb

@@ -6,16 +6,11 @@
 #
 # frozen_string_literal: true
 
-require "elastic_graph/graphql/client"
-require "elastic_graph/support/hash_util"
-require "graphql"
-
 module ElasticGraph
   class GraphQL
     # Class used to track details of what happens during a single GraphQL query for the purposes of logging.
     # Here we use `Struct` instead of `Data` specifically because it is designed to be mutable.
     class QueryDetailsTracker < Struct.new(
-      :hidden_types,
       :shard_routing_values,
       :search_index_expressions,
       :query_counts_per_datastore_request,
@@ -26,7 +21,6 @@ module ElasticGraph
     )
       def self.empty
         new(
-          hidden_types: ::Set.new,
           shard_routing_values: ::Set.new,
           search_index_expressions: ::Set.new,
           query_counts_per_datastore_request: [],
@@ -45,12 +39,6 @@ module ElasticGraph
         end
       end
 
-      def record_hidden_type(type)
-        mutex.synchronize do
-          hidden_types << type
-        end
-      end
-
       def record_datastore_query_metrics(client_duration_ms:, server_duration_ms:, queried_shard_count:)
         mutex.synchronize do
           self.datastore_query_client_duration_ms += client_duration_ms

data/lib/elastic_graph/graphql/query_executor.rb

@@ -9,7 +9,6 @@
 require "elastic_graph/graphql/client"
 require "elastic_graph/graphql/query_details_tracker"
 require "elastic_graph/support/hash_util"
-require "graphql"
 
 module ElasticGraph
   class GraphQL
@@ -18,13 +17,11 @@ module ElasticGraph
       # @dynamic schema
       attr_reader :schema
 
-      def initialize(schema:, monotonic_clock:, logger:, slow_query_threshold_ms:, datastore_search_router:, config:)
+      def initialize(schema:, monotonic_clock:, logger:, slow_query_threshold_ms:)
         @schema = schema
         @monotonic_clock = monotonic_clock
         @logger = logger
         @slow_query_threshold_ms = slow_query_threshold_ms
-        @datastore_search_router = datastore_search_router
-        @config = config
       end
 
       # Executes the given `query_string` using the provided `variables`.
@@ -61,13 +58,8 @@ module ElasticGraph
           operation_name: operation_name,
           client: client,
           context: context.merge({
-            logger: @logger,
             monotonic_clock_deadline: timeout_in_ms&.+(start_time_in_ms),
-            elastic_graph_schema: @schema,
-            schema_element_names: @schema.element_names,
-            elastic_graph_query_tracker: query_tracker,
-            datastore_search_router: @datastore_search_router,
-            nested_relationship_resolver_mode: @config.nested_relationship_resolver_mode
+            elastic_graph_query_tracker: query_tracker
           }.compact)
         )
 
@@ -81,10 +73,6 @@ module ElasticGraph
           EOS
         end
 
-        unless query_tracker.hidden_types.empty?
-          @logger.warn "#{query_tracker.hidden_types.size} GraphQL types were hidden from the schema due to their backing indices being inaccessible: #{query_tracker.hidden_types.sort.join(", ")}"
-        end
-
         duration = @monotonic_clock.now_in_ms - start_time_in_ms
 
         # Note: I also wanted to log the sanitized query if `result` has `errors`, but `GraphQL::Query#sanitized_query`
@@ -140,8 +128,7 @@ module ElasticGraph
       # Note: this is designed so that `elasticgraph-query_registry` can hook into this method. It needs to be able
       # to override how the query is built and executed.
       def build_and_execute_query(query_string:, variables:, operation_name:, context:, client:)
-        query = ::GraphQL::Query.new(
-          @schema.graphql_schema,
+        query = @schema.new_graphql_query(
           query_string,
           variables: variables,
           operation_name: operation_name,

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

@@ -109,7 +109,10 @@ module ElasticGraph
           # If `__typename` is available, use that to resolve. It should be available on any embedded abstract types...
           # (See `Inventor` in `config/schema.graphql` for an example of this kind of type union.)
           if (typename = object["__typename"])
-            schema.graphql_schema.possible_types(supertype).find { |t| t.graphql_name == typename }
+            schema
+              .graphql_schema
+              .possible_types(supertype, visibility_profile: VISIBILITY_PROFILE)
+              .find { |t| t.graphql_name == typename }
           else
             # ...otherwise infer the type based on what index the object came from. This is the case
             # with unions/interfaces of individually indexed types.

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

@@ -65,8 +65,9 @@ module ElasticGraph
           @join = join
           @filter_id_field_name_path = @join.filter_id_field_name.split(".")
           @context = context
-          @schema_element_names = @context.fetch(:schema_element_names)
-          @logger = context.fetch(:logger)
+          elastic_graph_schema = context.fetch(:elastic_graph_schema)
+          @schema_element_names = elastic_graph_schema.element_names
+          @logger = elastic_graph_schema.logger
           @monotonic_clock = monotonic_clock
           @mode = mode
         end

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

@@ -20,7 +20,7 @@ module ElasticGraph
         def self.maybe_wrap(search_response, field:, context:, lookahead:, query:)
           return search_response unless field.type.relay_connection?
 
-          schema_element_names = context.fetch(:schema_element_names)
+          schema_element_names = context.fetch(:elastic_graph_schema).element_names
 
           unless field.type.unwrap_fully.indexed_aggregation?
             return SearchResponseAdapterBuilder.build_from(

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

@@ -112,7 +112,10 @@ module ElasticGraph
         # Returns the subtypes of this type, if it has any. This is like `#possible_types` provided by the
         # GraphQL gem, but that includes a type itself when you ask for the possible types of a non-abstract type.
         def subtypes
-          @subtypes ||= @schema.graphql_schema.possible_types(graphql_type).map { |t| @schema.type_from(t) } - [self]
+          @subtypes ||= @schema
+            .graphql_schema
+            .possible_types(graphql_type, visibility_profile: :boot)
+            .map { |t| @schema.type_from(t) } - [self]
         end
 
         def field_named(field_name)

data/lib/elastic_graph/graphql/schema.rb

@@ -6,13 +6,11 @@
 #
 # frozen_string_literal: true
 
+require "graphql"
 require "elastic_graph/constants"
 require "elastic_graph/errors"
-require "elastic_graph/graphql/monkey_patches/schema_field"
-require "elastic_graph/graphql/monkey_patches/schema_object"
 require "elastic_graph/graphql/schema/field"
 require "elastic_graph/graphql/schema/type"
-require "graphql"
 
 module ElasticGraph
   # Wraps a GraphQL::Schema object in order to provide higher-level, more convenient APIs
@@ -26,19 +24,24 @@ module ElasticGraph
         scalar_types.to_set.union(introspection_types)
       )
 
-      attr_reader :element_names, :config, :graphql_schema, :runtime_metadata
+      attr_reader :element_names, :config, :logger, :graphql_schema, :runtime_metadata
 
       def initialize(
         graphql_schema_string:,
         config:,
+        logger:,
         runtime_metadata:,
+        datastore_search_router:,
         index_definitions_by_graphql_type:,
         graphql_gem_plugins:,
         graphql_adapter:
       )
         @element_names = runtime_metadata.schema_element_names
         @config = config
+        @logger = logger
         @runtime_metadata = runtime_metadata
+        @datastore_search_router = datastore_search_router
+
         resolvers_needing_lookahead = runtime_metadata.graphql_resolvers_by_name.filter_map do |name, resolver|
           name if resolver.needs_lookahead
         end.to_set
@@ -60,6 +63,7 @@ module ElasticGraph
         # variables above we'll get `NoMethodError` on `nil`.
         @graphql_schema = ::GraphQL::Schema.from_definition(
           graphql_schema_string,
+          base_types: {object: build_base_object_class},
           default_resolve: graphql_adapter,
           using: graphql_gem_plugins
         )
@@ -67,6 +71,36 @@ module ElasticGraph
         # Pre-load all defined types so that all field extras can get configured as part
         # of loading the schema, before we execute the first query.
         @types_by_name = build_types_by_name
+        @graphql_schema.visibility.preload
+
+        log_hidden_types
+      end
+
+      def new_graphql_query(
+        query_string,
+        operation_name: nil,
+        variables: {},
+        context: {},
+        document: nil,
+        validate: true
+      )
+        ::GraphQL::Query.new(
+          graphql_schema,
+          query_string,
+          variables: variables,
+          operation_name: operation_name,
+          document: document,
+          validate: validate,
+          context: context.merge({
+            datastore_search_router: @datastore_search_router,
+            elastic_graph_schema: self,
+            visibility_profile: VISIBILITY_PROFILE
+          })
+        )
+      end
+
+      def graphql_query_context
+        @graphql_query_context ||= new_graphql_query(nil).context
       end
 
       def type_from(graphql_type)
@@ -119,8 +153,38 @@ module ElasticGraph
 
       private
 
+      def build_base_object_class
+        schema = self
+
+        base_field_class = ::Class.new(::GraphQL::Schema::Field) do
+          define_method :visible? do |context|
+            return super(context) if context[:visibility_profile] == :boot
+
+            if schema.field_named(owner.graphql_name, graphql_name).hidden_from_queries?
+              return false
+            end
+
+            super(context)
+          end
+        end
+
+        ::Class.new(::GraphQL::Schema::Object) do
+          field_class base_field_class
+
+          define_singleton_method :visible? do |context|
+            return super(context) if context[:visibility_profile] == :boot
+
+            if schema.type_named(graphql_name).hidden_from_queries?
+              return false
+            end
+
+            super(context)
+          end
+        end
+      end
+
       def build_types_by_name
-        graphql_schema.types.transform_values do |graphql_type|
+        graphql_schema.types(visibility_profile: :boot).transform_values do |graphql_type|
           @types_by_graphql_type[graphql_type]
         end
       end
@@ -136,6 +200,16 @@ module ElasticGraph
           end
         end.freeze
       end
+
+      def log_hidden_types
+        hidden_types = @types_by_name.values.select(&:hidden_from_queries?)
+        return if hidden_types.empty?
+
+        logger.warn(
+          "#{hidden_types.size} GraphQL types were hidden from the schema due to their backing indices being " \
+          "inaccessible: #{hidden_types.map(&:name).sort.join(", ")}"
+        )
+      end
     end
   end
 end

data/lib/elastic_graph/graphql.rb

@@ -8,6 +8,7 @@
 
 require "elastic_graph/datastore_core"
 require "elastic_graph/graphql/config"
+require "elastic_graph/constants"
 require "elastic_graph/support/from_yaml_file"
 
 module ElasticGraph
@@ -26,7 +27,7 @@ module ElasticGraph
     def self.from_parsed_yaml(parsed_yaml, &datastore_client_customization_block)
       new(
         config: GraphQL::Config.from_parsed_yaml(parsed_yaml),
-        datastore_core: DatastoreCore.from_parsed_yaml(parsed_yaml, for_context: :graphql, &datastore_client_customization_block)
+        datastore_core: DatastoreCore.from_parsed_yaml(parsed_yaml, &datastore_client_customization_block)
       )
     end
 
@@ -55,7 +56,7 @@ module ElasticGraph
 
       # Apply any extension modules that have been configured.
       @config.extension_modules.each { |mod| extend mod }
-      @runtime_metadata.graphql_extension_modules.each { |ext_mod| extend ext_mod.extension_class }
+      @runtime_metadata.graphql_extension_modules.each { |ext_mod| extend ext_mod.load_extension.extension_class }
     end
 
     # @private
@@ -78,9 +79,7 @@ module ElasticGraph
           schema: schema,
           monotonic_clock: monotonic_clock,
           logger: logger,
-          slow_query_threshold_ms: @config.slow_query_latency_warning_threshold_in_ms,
-          datastore_search_router: datastore_search_router,
-          config: config
+          slow_query_threshold_ms: @config.slow_query_latency_warning_threshold_in_ms
         )
       end
     end
@@ -92,7 +91,9 @@ module ElasticGraph
         Schema.new(
           graphql_schema_string: graphql_schema_string,
           config: config,
+          logger: logger,
           runtime_metadata: runtime_metadata,
+          datastore_search_router: datastore_search_router,
           index_definitions_by_graphql_type: @datastore_core.index_definitions_by_graphql_type,
           graphql_gem_plugins: graphql_gem_plugins,
           graphql_adapter: graphql_adapter
@@ -132,15 +133,27 @@ module ElasticGraph
     def graphql_gem_plugins
       @graphql_gem_plugins ||= begin
         require "graphql"
+        # As per https://graphql-ruby.org/language_tools/c_parser.html, loading the
+        # C parser causes the faster parser to be assigned as the `::GraphQL.default_parser`,
+        # providing greater efficiency.
+        #
+        # We load it here since this is where we load the GraphQL gem.
+        require "graphql/c_parser"
+
         {
           # We depend on this to avoid N+1 calls to the datastore.
           ::GraphQL::Dataloader => {},
-          # Here we opt-in to the old `GraphQL::Schema::Warden` visibility plugin.
-          # The new plugin, `GraphQL::Schema::Visibility`, causes a performance regression
-          # in ElasticGraph projects, and until that's fixed we want to stick with the old plugin.
-          #
-          # TODO: switch back to `::GraphQL::Schema::Visibility => {preload: true}` once the perf issue has been fixed.
-          ::GraphQL::Schema::Warden => {}
+          # https://graphql-ruby.org/authorization/visibility.html
+          ::GraphQL::Schema::Visibility => {
+            # The GraphQL gem internally cache the visibility per profile. Ideally, we'd have only a single profile,
+            # but that makes for a chicken-and-egg problem: our visibility logic depends on the schema being fully
+            # loaded, but the `visibility?` methods are called while loading the schema. To deal with that, we're
+            # using tw profiles:
+            #
+            # - `boot` is used while loading, and skips our normal visibility logic.
+            # - `main` is used after that and uses our normal visibility logic.
+            profiles: {:boot => {}, VISIBILITY_PROFILE => {}} # : ::Hash[::Symbol, ::Hash[::Symbol, untyped]]
+          }
         }
       end
     end
@@ -250,6 +263,8 @@ module ElasticGraph
     # it's nice to load dependencies when needed.
     def load_dependencies_eagerly
       require "graphql"
+      require "graphql/c_parser"
+
       ::GraphQL.eager_load!
 
       # run a simple GraphQL query to force load any dependencies needed to handle GraphQL queries

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticgraph-graphql
 version: !ruby/object:Gem::Version
-  version: 0.19.2.0
+  version: 0.19.2.1
 platform: ruby
 authors:
 - Myron Marston
@@ -9,120 +9,154 @@ authors:
 - Block Engineering
 bindir: bin
 cert_chain: []
-date: 2025-04-09 00:00:00.000000000 Z
+date: 2025-04-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: elasticgraph-datastore_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.2.0
+        version: 0.19.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.2.0
+        version: 0.19.2.1
 - !ruby/object:Gem::Dependency
   name: elasticgraph-schema_artifacts
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.2.0
+        version: 0.19.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.2.0
+        version: 0.19.2.1
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.5.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.4
+- !ruby/object:Gem::Dependency
+  name: graphql-c_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: elasticgraph-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.2.0
+        version: 0.19.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.2.0
+        version: 0.19.2.1
 - !ruby/object:Gem::Dependency
   name: elasticgraph-elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.2.0
+        version: 0.19.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.2.0
+        version: 0.19.2.1
 - !ruby/object:Gem::Dependency
   name: elasticgraph-opensearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.2.0
+        version: 0.19.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.2.0
+        version: 0.19.2.1
 - !ruby/object:Gem::Dependency
   name: elasticgraph-indexer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.2.0
+        version: 0.19.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.2.0
+        version: 0.19.2.1
 - !ruby/object:Gem::Dependency
   name: elasticgraph-schema_definition
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.2.0
+        version: 0.19.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.2.0
+        version: 0.19.2.1
 email:
 - myron@squareup.com
 executables: []
@@ -171,8 +205,6 @@ files:
 - lib/elastic_graph/graphql/filtering/filter_value_set_extractor.rb
 - lib/elastic_graph/graphql/filtering/range_query.rb
 - lib/elastic_graph/graphql/http_endpoint.rb
-- lib/elastic_graph/graphql/monkey_patches/schema_field.rb
-- lib/elastic_graph/graphql/monkey_patches/schema_object.rb
 - lib/elastic_graph/graphql/query_adapter/filters.rb
 - lib/elastic_graph/graphql/query_adapter/pagination.rb
 - lib/elastic_graph/graphql/query_adapter/requested_fields.rb
@@ -215,10 +247,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/block/elasticgraph/issues
-  changelog_uri: https://github.com/block/elasticgraph/releases/tag/v0.19.2.0
-  documentation_uri: https://block.github.io/elasticgraph/api-docs/v0.19.2.0/
+  changelog_uri: https://github.com/block/elasticgraph/releases/tag/v0.19.2.1
+  documentation_uri: https://block.github.io/elasticgraph/api-docs/v0.19.2.1/
   homepage_uri: https://block.github.io/elasticgraph/
-  source_code_uri: https://github.com/block/elasticgraph/tree/v0.19.2.0/elasticgraph-graphql
+  source_code_uri: https://github.com/block/elasticgraph/tree/v0.19.2.1/elasticgraph-graphql
   gem_category: core
 rdoc_options: []
 require_paths:

data/lib/elastic_graph/graphql/monkey_patches/schema_field.rb

@@ -1,56 +0,0 @@
-# Copyright 2024 - 2025 Block, Inc.
-#
-# Use of this source code is governed by an MIT-style
-# license that can be found in the LICENSE file or at
-# https://opensource.org/licenses/MIT.
-#
-# frozen_string_literal: true
-
-require "graphql"
-
-module ElasticGraph
-  class GraphQL
-    module MonkeyPatches
-      # This module is designed to monkey patch `GraphQL::Schema::Field`, but to do so in a
-      # conservative, safe way:
-      #
-      # - It defines no new methods.
-      # - It delegates to the original implementation with `super` unless we are sure that a type should be hidden.
-      # - It only changes the behavior for ElasticGraph schemas (as indicated by `:elastic_graph_schema` in the `context`).
-      module SchemaFieldVisibilityDecorator
-        def visible?(context)
-          # `DynamicFields` and `EntryPoints` are built-in introspection types that `field_named` below doesn't support:
-          # https://github.com/rmosolgo/graphql-ruby/blob/0df187995c971b399ed7cc1fbdcbd958af6c4ade/lib/graphql/introspection/entry_points.rb
-          # https://github.com/rmosolgo/graphql-ruby/blob/0df187995c971b399ed7cc1fbdcbd958af6c4ade/lib/graphql/introspection/dynamic_fields.rb
-          #
-          # ...so if the owner is one of those we just return `super` here.
-          return super if %w[DynamicFields EntryPoints].include?(owner.graphql_name)
-
-          if context[:elastic_graph_schema]&.field_named(owner.graphql_name, graphql_name)&.hidden_from_queries?
-            return false
-          end
-
-          super
-        end
-      end
-    end
-  end
-end
-
-# As per https://graphql-ruby.org/authorization/visibility.html, the public API
-# provided by the GraphQL gem to control visibility of object types is to define
-# a `visible?` instance method on a custom subclass of `GraphQL::Schema::Field`.
-# However, because we load our schema from an SDL definition rather than defining
-# classes for each schema type, we don't have a way to register a custom subclass
-# to be used for fields.
-#
-# So, here we solve this a slightly different way: we prepend a module onto
-# the `GraphQL::Schema::Field class. This allows our module to act like a
-# decorator and intercept calls to `visible?` so that it can hide types as needed.
-module GraphQL
-  class Schema
-    class Field
-      prepend ::ElasticGraph::GraphQL::MonkeyPatches::SchemaFieldVisibilityDecorator
-    end
-  end
-end

data/lib/elastic_graph/graphql/monkey_patches/schema_object.rb

@@ -1,48 +0,0 @@
-# Copyright 2024 - 2025 Block, Inc.
-#
-# Use of this source code is governed by an MIT-style
-# license that can be found in the LICENSE file or at
-# https://opensource.org/licenses/MIT.
-#
-# frozen_string_literal: true
-
-require "graphql"
-
-module ElasticGraph
-  class GraphQL
-    module MonkeyPatches
-      # This module is designed to monkey patch `GraphQL::Schema::Object`, but to do so in a
-      # conservative, safe way:
-      #
-      # - It defines no new methods.
-      # - It delegates to the original implementation with `super` unless we are sure that a type should be hidden.
-      # - It only changes the behavior for ElasticGraph schemas (as indicated by `:elastic_graph_schema` in the `context`).
-      module SchemaObjectVisibilityDecorator
-        def visible?(context)
-          if context[:elastic_graph_schema]&.type_named(graphql_name)&.hidden_from_queries?
-            context[:elastic_graph_query_tracker].record_hidden_type(graphql_name)
-            return false
-          end
-
-          super
-        end
-      end
-    end
-  end
-end
-
-# As per https://graphql-ruby.org/authorization/visibility.html, the public API
-# provided by the GraphQL gem to control visibility of object types is to define
-# a `visible?` class method on each of your type classes. However, because we load
-# our schema from an SDL definition rather than defining classes for each schema
-# type, we don't have a way to define the `visible?` on each of our type classes.
-#
-# So, here we solve this a slightly different way: we prepend a module onto
-# the `GraphQL::Schema::Object` singleton class. This allows our module to
-# act like a decorator and intercept calls to `visible?` so that it can hide
-# types as needed. This works because all types must be defined as subclasses
-# of `GraphQL::Schema::Object`, and in fact the GraphQL gem defined anonymous
-# subclasses for each type in our SDL schema, as you can see here:
-#
-# https://github.com/rmosolgo/graphql-ruby/blob/v1.12.16/lib/graphql/schema/build_from_definition.rb#L312
-GraphQL::Schema::Object.singleton_class.prepend ElasticGraph::GraphQL::MonkeyPatches::SchemaObjectVisibilityDecorator