dry-schema 1.10.1 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aa8d227152a712ff8580d62686ad5a4b83b4439dc8d58f42651b869e203697c
-  data.tar.gz: e22028010d0ac11567a8a615725496f77db8a2acd107350363b20174da01a20c
+  metadata.gz: 0e0f30051a5014afc7cf0dc8f66f23a20f05e83dd3b2a970491d85d84e5be988
+  data.tar.gz: 771b790fd369f36abf86367a95afaac387825df4b041bdc325c02f7f41cd3487
 SHA512:
-  metadata.gz: ad3350414c764971f4c0e69ca07044901d67488625c691f2a7396c6d17b33d31a2714e8959d5f07598c03894883b7854090c6d77b182f7569acc7a32b43be3d3
-  data.tar.gz: 93320abcdadd4f3c48666507f829d4aaba2c9fc5ae181d2cd68f44e28eb850a8ead7adec29c7be935e17fe4112df09d17ac735dac9f50c49d45e5031f15d1ce6
+  metadata.gz: 12759b86883bd94e85480124539c44a3280491935a86addacd02c799696cce5d5e1cec54238b17d89c05cbe704e2394ac4749c9349e9f8e1bbe6ed92f344af73
+  data.tar.gz: 57b2a77a57ef8587a3a520eeecc7cc3dd5d766a92ba5096ed2306c0e466ee0c9580e7550c3ef475e88eb61a58ce7c92de3860442e29455f5590ccfa0bd7b5eda

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 1.10.2 2022-08-23
+
+
+### Fixed
+
+- Fix value coercion for composed schemas (via #421) (@robhanlon22)
+
+
+[Compare v1.10.1...v1.10.2](https://github.com/dry-rb/dry-schema/compare/v1.10.1...v1.10.2)
+
 ## 1.10.1 2022-08-22
 
 

data/lib/dry/schema/dsl.rb

@@ -288,13 +288,20 @@ module Dry
 
       # Return type schema used by the value coercer
       #
-      # @return [Dry::Types::Safe]
+      # @return [Dry::Types::Lax]
       #
       # @api private
       def type_schema
-        our_schema = type_registry["hash"].schema(types).lax
-        schemas = [*parents.map(&:type_schema), our_schema]
-        schemas.inject { |result, schema| result.schema(schema.to_a) }
+        strict_type_schema.lax
+      end
+
+      # Return type schema used when composing subschemas
+      #
+      # @return [Dry::Types::Schema]
+      #
+      # @api private
+      def strict_type_schema
+        type_registry["hash"].schema(types)
       end
 
       # Return a new DSL instance using the same processor type
@@ -316,7 +323,7 @@ module Dry
       # @api private
       def set_type(name, spec)
         type = resolve_type(spec)
-        meta = {required: false, maybe: type.optional?}
+        meta = {required: true, maybe: type.optional?}
 
         @types[name] = type.meta(meta)
       end

data/lib/dry/schema/macros/schema.rb

@@ -62,11 +62,11 @@ module Dry
           schema = definition.call
           type_schema =
             if array_type?(parent_type)
-              build_array_type(parent_type, definition.type_schema)
+              build_array_type(parent_type, definition.strict_type_schema)
             elsif redefined_schema?(args)
               parent_type.schema(definition.types)
             else
-              definition.type_schema
+              definition.strict_type_schema
             end
           final_type = optional? ? type_schema.optional : type_schema
 

data/lib/dry/schema/macros/value.rb

@@ -30,9 +30,9 @@ module Dry
 
             updated_type =
               if array_type?(current_type)
-                build_array_type(current_type, schema.type_schema)
+                build_array_type(current_type, schema.strict_type_schema)
               else
-                schema.type_schema
+                schema.strict_type_schema
               end
 
             import_steps(schema)

data/lib/dry/schema/processor.rb

@@ -138,13 +138,22 @@ module Dry
 
       # Return the type schema
       #
-      # @return [Dry::Types::Safe]
+      # @return [Dry::Types::Lax]
       #
       # @api private
       def type_schema
         steps.type_schema
       end
 
+      # Return type schema used when composing subschemas
+      #
+      # @return [Dry::Types::Schema]
+      #
+      # @api private
+      def strict_type_schema
+        schema_dsl.strict_type_schema
+      end
+
       # Return the rule applier
       #
       # @api private

data/lib/dry/schema/types_merger.rb

@@ -27,34 +27,34 @@ module Dry
 
         # @api private
         def call
-          handlers.fetch(op_class).call
+          if op_class <= Dry::Logic::Operations::Or
+            merge_or
+          elsif op_class <= Dry::Logic::Operations::And
+            merge_and
+          elsif op_class <= Dry::Logic::Operations::Implication
+            merge_implication
+          else
+            raise ArgumentError, <<~MESSAGE
+              Can't merge operations, op_class=#{op_class}
+            MESSAGE
+          end
         end
 
         private
 
         # @api private
-        def handlers
-          @handlers ||=
-            {
-              Dry::Logic::Operations::Or => method(:handle_or),
-              Dry::Logic::Operations::And => method(:handle_and),
-              Dry::Logic::Operations::Implication => method(:handle_implication)
-            }
-        end
-
-        # @api private
-        def handle_or
+        def merge_or
           old | new
         end
 
         # @api private
-        def handle_ordered
+        def merge_ordered
           return old if old == new
 
           unwrapped_old, old_rule = unwrap_type(old)
           unwrapped_new, new_rule = unwrap_type(new)
 
-          type = merge_underlying_types(unwrapped_old, unwrapped_new)
+          type = merge_unwrapped_types(unwrapped_old, unwrapped_new)
 
           rule = [old_rule, new_rule].compact.reduce { op_class.new(_1, _2) }
 
@@ -63,32 +63,44 @@ module Dry
           type
         end
 
-        alias_method :handle_and, :handle_ordered
-        alias_method :handle_implication, :handle_ordered
+        alias_method :merge_and, :merge_ordered
+        alias_method :merge_implication, :merge_ordered
 
         # @api private
-        def merge_underlying_types(unwrapped_old, unwrapped_new)
+        def merge_unwrapped_types(unwrapped_old, unwrapped_new)
           case [unwrapped_old, unwrapped_new]
           in Dry::Types::Schema, Dry::Types::Schema
-            types_merger.type_registry["hash"].schema(
-              types_merger.call(
-                op_class,
-                unwrapped_old.name_key_map,
-                unwrapped_new.name_key_map
-              )
-            )
+            merge_schemas(unwrapped_old, unwrapped_new)
           in [Dry::Types::AnyClass, _] | [Dry::Types::Hash, Dry::Types::Schema]
             unwrapped_new
-          in [Dry::Types::Hash, Dry::Types::Schema] | [_, Dry::Types::AnyClass]
+          in [Dry::Types::Schema, Dry::Types::Hash] | [_, Dry::Types::AnyClass]
             unwrapped_old
           else
-            if unwrapped_old.primitive != unwrapped_new.primitive
-              raise ArgumentError, <<~MESSAGE
-                Can't merge types, unwrapped_old=#{unwrapped_old.inspect}, unwrapped_new=#{unwrapped_new.inspect}
-              MESSAGE
-            end
+            merge_equivalent_types(unwrapped_old, unwrapped_new)
+          end
+        end
 
+        # @api private
+        def merge_schemas(unwrapped_old, unwrapped_new)
+          types_merger.type_registry["hash"].schema(
+            types_merger.call(
+              op_class,
+              unwrapped_old.name_key_map,
+              unwrapped_new.name_key_map
+            )
+          )
+        end
+
+        # @api private
+        def merge_equivalent_types(unwrapped_old, unwrapped_new)
+          if unwrapped_old.primitive <= unwrapped_new.primitive
+            unwrapped_new
+          elsif unwrapped_new.primitive <= unwrapped_old.primitive
             unwrapped_old
+          else
+            raise ArgumentError, <<~MESSAGE
+              Can't merge types, unwrapped_old=#{unwrapped_old.inspect}, unwrapped_new=#{unwrapped_new.inspect}
+            MESSAGE
           end
         end
 
@@ -96,13 +108,15 @@ module Dry
         def unwrap_type(type)
           rules = []
 
-          while type.is_a?(Dry::Types::Decorator)
-            rules << type.rule if type.is_a?(Dry::Types::Constrained)
+          loop do
+            rules << type.rule if type.respond_to?(:rule)
 
-            if type.meta[:maybe] & type.respond_to?(:right)
-              type = type.right
-            else
+            if type.optional?
+              type = type.left.primitive?(nil) ? type.right : type.left
+            elsif type.is_a?(Dry::Types::Decorator)
               type = type.type
+            else
+              break
             end
           end
 

data/lib/dry/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Schema
-    VERSION = "1.10.1"
+    VERSION = "1.10.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-schema
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.10.2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2022-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby