dry-schema 1.10.1 → 1.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aa8d227152a712ff8580d62686ad5a4b83b4439dc8d58f42651b869e203697c
-  data.tar.gz: e22028010d0ac11567a8a615725496f77db8a2acd107350363b20174da01a20c
+  metadata.gz: 3a3fdab16834d270d9cdfd3788fffb0899b711fc946e6aa3f4bc98115983acb7
+  data.tar.gz: c8349be888a2d957ba67137a7877828031d385e1452793730654cee3a9994e68
 SHA512:
-  metadata.gz: ad3350414c764971f4c0e69ca07044901d67488625c691f2a7396c6d17b33d31a2714e8959d5f07598c03894883b7854090c6d77b182f7569acc7a32b43be3d3
-  data.tar.gz: 93320abcdadd4f3c48666507f829d4aaba2c9fc5ae181d2cd68f44e28eb850a8ead7adec29c7be935e17fe4112df09d17ac735dac9f50c49d45e5031f15d1ce6
+  metadata.gz: 23d0a177d1b2bfe8ba70ca0de182785ef9016d271e28ae36dd5590aae7f0b30d6a9ae1336948d3a862bf6b04afcc75cb2a115c3de589509cf46bd4a471c5e054
+  data.tar.gz: 478dc03869f1913f736db5ec2c69ff17c68440463f4cf23f337ef5d3b41cc944242075ce0bc36c1971765563566eb2d86e15f54ff7e1d762f6dbd6ccb3217947

data/CHANGELOG.md

@@ -1,5 +1,35 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 1.10.4 2022-10-13
+
+
+### Fixed
+
+- Once again reverting zeitwerk related changes that were included in 1.10.3 by an accident :( (@solnic)
+
+
+[Compare v1.10.3...v1.10.4](https://github.com/dry-rb/dry-schema/compare/v1.10.3...v1.10.4)
+
+## 1.10.3 2022-10-10
+
+
+### Fixed
+
+- Addressed regressions causing issues with handling sum types (see #419 and #423 fixed via #425) (@robhanlon22)
+
+
+[Compare v1.10.2...v1.10.3](https://github.com/dry-rb/dry-schema/compare/v1.10.2...v1.10.3)
+
+## 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
 
 
@@ -194,7 +224,7 @@ This release ships with a bunch of internal refactorings that should improve per
 
 [Compare v1.5.4...v1.5.5](https://github.com/dry-rb/dry-schema/compare/v1.5.4...v1.5.5)
 
-## 1.5.4 
+## 1.5.4
 
 2020-09-03
 

data/dry-schema.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "dry-configurable", "~> 0.13", ">= 0.13.0"
   spec.add_runtime_dependency "dry-core", "~> 0.5", ">= 0.5"
   spec.add_runtime_dependency "dry-initializer", "~> 3.0"
-  spec.add_runtime_dependency "dry-logic", "~> 1.0"
+  spec.add_runtime_dependency "dry-logic", "~> 1.2"
   spec.add_runtime_dependency "dry-types", "~> 1.5"
 
   spec.add_development_dependency "bundler"

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/dsl.rb

@@ -85,6 +85,24 @@ module Dry
           end
         end
 
+        # Set type specification and predicates for a maybe value
+        #
+        # @example
+        #   required(:name).maybe(:string)
+        #
+        # @see Macros::Key#value
+        #
+        # @return [Macros::Key]
+        #
+        # @api public
+        def maybe(*args, **opts, &block)
+          extract_type_spec(args, nullable: true) do |*predicates, type_spec:, type_rule:|
+            append_macro(Macros::Maybe) do |macro|
+              macro.call(*predicates, type_spec: type_spec, type_rule: type_rule, **opts, &block)
+            end
+          end
+        end
+
         # Specify a nested hash without enforced `hash?` type-check
         #
         # This is a simpler building block than `hash` macro, use it

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

@@ -13,12 +13,15 @@ module Dry
         def call(*predicates, **opts, &block)
           ensure_valid_predicates(predicates)
 
-          if opts[:type_spec] && !filter_empty_string?
-            value(predicates[0], :filled?, *predicates[1..predicates.size - 1], **opts, &block)
-          elsif opts[:type_rule]
-            value(:filled?).value(*predicates, **opts, &block)
-          else
-            value(:filled?, *predicates, **opts, &block)
+          append_macro(Macros::Value) do |macro|
+            if opts[:type_spec] && !filter_empty_string?
+              macro.call(predicates[0], :filled?, *predicates[1..predicates.size - 1], **opts,
+                         &block)
+            elsif opts[:type_rule]
+              macro.call(:filled?).value(*predicates, **opts, &block)
+            else
+              macro.call(:filled?, *predicates, **opts, &block)
+            end
           end
         end
 

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

@@ -32,24 +32,6 @@ module Dry
         end
         ruby2_keywords(:filter) if respond_to?(:ruby2_keywords, true)
 
-        # Set type specification and predicates for a maybe value
-        #
-        # @example
-        #   required(:name).maybe(:string)
-        #
-        # @see Macros::Key#value
-        #
-        # @return [Macros::Key]
-        #
-        # @api public
-        def maybe(*args, **opts, &block)
-          extract_type_spec(args, nullable: true) do |*predicates, type_spec:, type_rule:|
-            append_macro(Macros::Maybe) do |macro|
-              macro.call(*predicates, type_spec: type_spec, type_rule: type_rule, **opts, &block)
-            end
-          end
-        end
-
         # Coerce macro to a rule
         #
         # @return [Dry::Logic::Rule]

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

@@ -19,7 +19,9 @@ module Dry
             raise ::Dry::Schema::InvalidSchemaError, "Using maybe with nil? predicate is redundant"
           end
 
-          value(*args, **opts, &block)
+          append_macro(Macros::Value) do |macro|
+            macro.call(*args, **opts, &block)
+          end
 
           self
         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.4"
   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.4
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -84,14 +84,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement