Address review feedback on JSON ingestion spec migration

- Port the JSON-schema tests from `rake_tasks_spec` (version bump
  enforcement, versioned metadata maintenance, renamed/deleted
  field/type guidance, conflict and routing/rollover deletion errors)
  into `schema_artifact_manager_extension_spec` in place of the minimal
  from-scratch tests, restoring the original coverage.
- Rewrite `wrappers_spec` to drive the wrappers through the public
  schema definition API instead of exercising the internal classes
  directly.
- Fix the value semantics of the stateless field type wrappers
  (`Scalar`, `Enum`, `Union`): `DelegateClass` defines `==` to unwrap
  only the left operand, so two wrappers around equal field types never
  compared equal even though their `hash` values matched, breaking the
  `eql?`/`hash` contract. A shared `ValueSemantics` module now unwraps
  both sides, keeping `==`/`eql?`/`hash` consistent.

Author: jwils

elasticgraph-json_ingestion/lib/elastic_graph/json_ingestion/schema_definition/factory_extension.rb

@@ -90,7 +90,7 @@ def new_scalar_type(name)
               extended_type.json_schema(**options)
             end
 
-            yield extended_type if block_given?
+            yield extended_type
             extended_type.finalize_json_schema_configuration!
           end
         end
@@ -104,7 +104,7 @@ def new_scalar_indexing_field_type(scalar_type:)
         def new_type_with_subfields(schema_kind, name, wrapping_type:, field_factory:)
           super(schema_kind, name, wrapping_type: wrapping_type, field_factory: field_factory) do |type|
             extended_type = type.extend(SchemaElements::TypeWithSubfieldsExtension) # : ::ElasticGraph::SchemaDefinition::SchemaElements::TypeWithSubfields & SchemaElements::TypeWithSubfieldsExtension
-            yield extended_type if block_given?
+            yield extended_type
           end
         end
 

elasticgraph-json_ingestion/lib/elastic_graph/json_ingestion/schema_definition/indexing/field_type/enum.rb

@@ -7,6 +7,7 @@
 # frozen_string_literal: true
 
 require "delegate"
+require "elastic_graph/json_ingestion/schema_definition/indexing/field_type/value_semantics"
 require "elastic_graph/schema_definition/indexing/field_type/enum"
 
 module ElasticGraph
@@ -19,6 +20,10 @@ module FieldType
           #
           # @private
           class Enum < DelegateClass(ElasticGraph::SchemaDefinition::Indexing::FieldType::Enum)
+            prepend ValueSemantics
+
+            # @dynamic __getobj__
+
             # @return [Hash<String, ::Object>] additional ElasticGraph metadata to put in the JSON schema for this enum type.
             def json_schema_field_metadata_by_field_name
               {}

elasticgraph-json_ingestion/lib/elastic_graph/json_ingestion/schema_definition/indexing/field_type/scalar.rb

@@ -7,6 +7,7 @@
 # frozen_string_literal: true
 
 require "delegate"
+require "elastic_graph/json_ingestion/schema_definition/indexing/field_type/value_semantics"
 require "elastic_graph/schema_definition/indexing/field_type/scalar"
 require "elastic_graph/support/hash_util"
 
@@ -19,6 +20,10 @@ module FieldType
           #
           # @private
           class Scalar < DelegateClass(ElasticGraph::SchemaDefinition::Indexing::FieldType::Scalar)
+            prepend ValueSemantics
+
+            # @dynamic __getobj__
+
             # @return [Hash] empty hash, as scalar types have no subfields
             def json_schema_field_metadata_by_field_name
               {}

elasticgraph-json_ingestion/lib/elastic_graph/json_ingestion/schema_definition/indexing/field_type/union.rb

@@ -7,6 +7,7 @@
 # frozen_string_literal: true
 
 require "delegate"
+require "elastic_graph/json_ingestion/schema_definition/indexing/field_type/value_semantics"
 require "elastic_graph/schema_definition/indexing/field_type/union"
 
 module ElasticGraph
@@ -18,6 +19,10 @@ module FieldType
           #
           # @private
           class Union < DelegateClass(ElasticGraph::SchemaDefinition::Indexing::FieldType::Union)
+            prepend ValueSemantics
+
+            # @dynamic __getobj__
+
             # @return [Hash] empty hash, as union types have no subfields
             def json_schema_field_metadata_by_field_name
               {}

elasticgraph-json_ingestion/lib/elastic_graph/json_ingestion/schema_definition/indexing/field_type/value_semantics.rb

@@ -0,0 +1,52 @@
+# 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
+# https://opensource.org/licenses/MIT.
+#
+# frozen_string_literal: true
+
+module ElasticGraph
+  module JSONIngestion
+    module SchemaDefinition
+      module Indexing
+        module FieldType
+          # Provides value-equality semantics for the JSON-schema-aware field type wrappers that delegate
+          # to a wrapped core field type without adding any state of their own (`Scalar`, `Enum`, `Union`).
+          #
+          # `DelegateClass` defines `==` so that it unwraps only the *left* operand before comparing, which
+          # means `wrapper == equivalent_wrapper` compares the wrapped object against the right-hand
+          # *wrapper* (rather than against its wrapped object) and is therefore never equal--even though
+          # `hash` delegates to the wrapped object and reports them equal. That inconsistency breaks the
+          # `eql?`/`hash` contract and causes `Set`/`Hash`/`uniq` de-duplication to treat equivalent
+          # wrappers as distinct. Here we unwrap both sides so two wrappers around equal objects compare
+          # equal, keeping `==`/`eql?`/`hash` consistent. (`FieldType::Object` solves the same problem with
+          # its own implementation because it carries additional JSON schema state in its equality.)
+          #
+          # @private
+          module ValueSemantics
+            # @param other [Object] the object to compare against
+            # @return [Boolean] true when `other` wraps an equal field type (or is the wrapped field type itself)
+            def ==(other)
+              case other
+              when ValueSemantics
+                __getobj__ == other.__getobj__
+              else
+                super
+              end
+            end
+
+            def eql?(other)
+              self == other
+            end
+
+            # @return [Integer] a hash code derived from the wrapped field type
+            def hash
+              __getobj__.hash
+            end
+          end
+        end
+      end
+    end
+  end
+end

elasticgraph-json_ingestion/sig/elastic_graph/json_ingestion/schema_definition/factory_extension.rbs

@@ -13,14 +13,14 @@ module ElasticGraph
           subfields: ::Array[Indexing::Field],
           mapping_options: ::ElasticGraph::SchemaDefinition::Mixins::HasTypeInfo::optionsHash
         ) -> Indexing::FieldType::Object
-        def new_scalar_type: (::String) ?{ (::ElasticGraph::SchemaDefinition::SchemaElements::ScalarType & SchemaElements::ScalarTypeExtension) -> void } -> (::ElasticGraph::SchemaDefinition::SchemaElements::ScalarType & SchemaElements::ScalarTypeExtension)
+        def new_scalar_type: (::String) { (::ElasticGraph::SchemaDefinition::SchemaElements::ScalarType & SchemaElements::ScalarTypeExtension) -> void } -> (::ElasticGraph::SchemaDefinition::SchemaElements::ScalarType & SchemaElements::ScalarTypeExtension)
         def new_scalar_indexing_field_type: (scalar_type: ::ElasticGraph::SchemaDefinition::SchemaElements::ScalarType) -> Indexing::FieldType::Scalar
         def new_type_with_subfields: (
           ::ElasticGraph::SchemaDefinition::SchemaElements::schemaKind,
           ::String,
           wrapping_type: ::ElasticGraph::SchemaDefinition::SchemaElements::anyObjectType,
           field_factory: ::Method
-        ) ?{ (::ElasticGraph::SchemaDefinition::SchemaElements::TypeWithSubfields & SchemaElements::TypeWithSubfieldsExtension) -> void } -> (::ElasticGraph::SchemaDefinition::SchemaElements::TypeWithSubfields & SchemaElements::TypeWithSubfieldsExtension)
+        ) { (::ElasticGraph::SchemaDefinition::SchemaElements::TypeWithSubfields & SchemaElements::TypeWithSubfieldsExtension) -> void } -> (::ElasticGraph::SchemaDefinition::SchemaElements::TypeWithSubfields & SchemaElements::TypeWithSubfieldsExtension)
         def new_union_indexing_field_type: (::Hash[::String, Indexing::FieldType::Object]) -> Indexing::FieldType::Union
         def new_results: () -> ::ElasticGraph::SchemaDefinition::Results
         def new_schema_artifact_manager: (**untyped) -> ::ElasticGraph::SchemaDefinition::SchemaArtifactManager

elasticgraph-json_ingestion/sig/elastic_graph/json_ingestion/schema_definition/indexing/field_type/enum.rbs

@@ -8,9 +8,12 @@ module ElasticGraph
           end
 
           class Enum < EnumSupertype
+            include ValueSemantics
+
             def json_schema_field_metadata_by_field_name: () -> ::Hash[::String, JSONSchemaFieldMetadata]
             def format_field_json_schema_customizations: (::Hash[::String, untyped]) -> ::Hash[::String, untyped]
             def to_json_schema: () -> ::Hash[::String, untyped]
+            def __getobj__: () -> ::ElasticGraph::SchemaDefinition::Indexing::FieldType::Enum
           end
         end
       end

elasticgraph-json_ingestion/sig/elastic_graph/json_ingestion/schema_definition/indexing/field_type/scalar.rbs

@@ -8,9 +8,12 @@ module ElasticGraph
           end
 
           class Scalar < ScalarSupertype
+            include ValueSemantics
+
             def json_schema_field_metadata_by_field_name: () -> ::Hash[::String, JSONSchemaFieldMetadata]
             def format_field_json_schema_customizations: (::Hash[::String, untyped]) -> ::Hash[::String, untyped]
             def to_json_schema: () -> ::Hash[::String, untyped]
+            def __getobj__: () -> ::ElasticGraph::SchemaDefinition::Indexing::FieldType::Scalar
           end
         end
       end

elasticgraph-json_ingestion/sig/elastic_graph/json_ingestion/schema_definition/indexing/field_type/union.rbs

@@ -8,11 +8,14 @@ module ElasticGraph
           end
 
           class Union < UnionSupertype
+            include ValueSemantics
+
             def self.new: (::ElasticGraph::SchemaDefinition::Indexing::FieldType::Union) -> instance
 
             def json_schema_field_metadata_by_field_name: () -> ::Hash[::String, JSONSchemaFieldMetadata]
             def format_field_json_schema_customizations: (::Hash[::String, untyped]) -> ::Hash[::String, untyped]
             def to_json_schema: () -> ::Hash[::String, untyped]
+            def __getobj__: () -> ::ElasticGraph::SchemaDefinition::Indexing::FieldType::Union
           end
         end
       end

elasticgraph-json_ingestion/sig/elastic_graph/json_ingestion/schema_definition/indexing/field_type/value_semantics.rbs

@@ -0,0 +1,22 @@
+module ElasticGraph
+  module JSONIngestion
+    module SchemaDefinition
+      module Indexing
+        module FieldType
+          module ValueSemantics : _Delegator
+            def ==: (untyped other) -> bool
+            def eql?: (untyped other) -> bool
+            def hash: () -> ::Integer
+          end
+
+          interface _Delegator
+            def __getobj__: () -> untyped
+
+            # Provided by `DelegateClass`; `ValueSemantics#==` calls `super` to fall back to it.
+            def ==: (untyped other) -> bool
+          end
+        end
+      end
+    end
+  end
+end