dry-schema 1.9.3 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2dead9a036c0d9322c68b50938417ebe12a4b62ed2f99a8ae6d4f49f894dabd
-  data.tar.gz: ac3b386e3266e8498aa62549cddfbaece9414281beee5710c1930b062eaacde8
+  metadata.gz: 8aa8d227152a712ff8580d62686ad5a4b83b4439dc8d58f42651b869e203697c
+  data.tar.gz: e22028010d0ac11567a8a615725496f77db8a2acd107350363b20174da01a20c
 SHA512:
-  metadata.gz: '0831055ac93da2898c55b6194703e87bda1c27040ac23965c5f261c2e59387888f679b9dcd967a4a0665cef220b7c97db823670067267b34b40ed09a3c315b81'
-  data.tar.gz: d82ee10469742e83ee412ebe6c06593a86c44c1e0f01fd29067700d9a37ecc461dc3e4ad6e2a09bfe4694d1e95b6c28132810bf243d27338257f66e0c50cc98e
+  metadata.gz: ad3350414c764971f4c0e69ca07044901d67488625c691f2a7396c6d17b33d31a2714e8959d5f07598c03894883b7854090c6d77b182f7569acc7a32b43be3d3
+  data.tar.gz: 93320abcdadd4f3c48666507f829d4aaba2c9fc5ae181d2cd68f44e28eb850a8ead7adec29c7be935e17fe4112df09d17ac735dac9f50c49d45e5031f15d1ce6

data/CHANGELOG.md

@@ -1,5 +1,34 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 1.10.1 2022-08-22
+
+
+### Changed
+
+- Reverted zeitwerk-related changes that were included in 1.10.0 by an accident (@solnic)
+
+[Compare v1.10.0...v1.10.1](https://github.com/dry-rb/dry-schema/compare/v1.10.0...v1.10.1)
+
+## 1.10.0 2022-08-16
+
+
+### Added
+
+- Allow nested `filled` and `value` macro usage (via #412) (@robhanlon22)
+- Support for more complex scenarios when composing schemas (via #420) (@robhanlon22)
+
+### Fixed
+
+- Fix `or` messages for complex schemas (via #413) (@robhanlon22)
+- Using `filled` with a constrained constructor type works as expected (via #416) (@robhanlon22)
+- Fix types and key maps for composed schemas (via #415) (@robhanlon22)
+
+### Changed
+
+- Freeze message hash (fixes #417 via #418) (@solnic)
+
+[Compare v1.9.3...v1.10.0](https://github.com/dry-rb/dry-schema/compare/v1.9.3...v1.10.0)
+
 ## 1.9.3 2022-06-23
 
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2021 dry-rb team
+Copyright (c) 2015-2022 dry-rb team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/lib/dry/schema/dsl.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "dry/initializer"
+require "dry/logic"
 
 require "dry/schema/constants"
 require "dry/schema/path"
@@ -16,6 +17,7 @@ require "dry/schema/key_coercer"
 require "dry/schema/key_validator"
 require "dry/schema/value_coercer"
 require "dry/schema/rule_applier"
+require "dry/schema/types_merger"
 
 module Dry
   module Schema
@@ -316,7 +318,7 @@ module Dry
         type = resolve_type(spec)
         meta = {required: false, maybe: type.optional?}
 
-        types[name] = type.meta(meta)
+        @types[name] = type.meta(meta)
       end
 
       # Check if a custom type was set under provided key name
@@ -369,6 +371,18 @@ module Dry
         parents.any?(&:filter_rules?)
       end
 
+      # This DSL's type map merged with any parent type maps
+      #
+      # @api private
+      def types
+        [*parents.map(&:types), @types].reduce(:merge)
+      end
+
+      # @api private
+      def merge_types(op_class, lhs, rhs)
+        types_merger.(op_class, lhs, rhs)
+      end
+
       protected
 
       # Build a rule applier
@@ -495,6 +509,10 @@ module Dry
 
         (parent || Schema).config.dup
       end
+
+      def types_merger
+        @types_merger ||= TypesMerger.new(type_registry)
+      end
     end
   end
 end

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

@@ -15,7 +15,7 @@ module Dry
         def value(*args, **opts, &block)
           type(:array)
 
-          extract_type_spec(*args, set_type: false) do |*predicates, type_spec:, type_rule:|
+          extract_type_spec(args, set_type: false) do |*predicates, type_spec:, type_rule:|
             type(schema_dsl.array[type_spec]) if type_spec
 
             is_hash_block = type_spec.equal?(:hash)

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

@@ -58,12 +58,13 @@ module Dry
         # @return [Macros::Core]
         #
         # @api public
-        def value(...)
-          append_macro(Macros::Value) do |macro|
-            macro.call(...)
+        def value(*args, **opts, &block)
+          extract_type_spec(args) do |*predicates, type_spec:, type_rule:|
+            append_macro(Macros::Value) do |macro|
+              macro.call(*predicates, type_spec: type_spec, type_rule: type_rule, **opts, &block)
+            end
           end
         end
-        ruby2_keywords :value if respond_to?(:ruby2_keywords, true)
 
         # Prepends `:filled?` predicate
         #
@@ -76,12 +77,13 @@ module Dry
         # @return [Macros::Core]
         #
         # @api public
-        def filled(...)
-          append_macro(Macros::Filled) do |macro|
-            macro.call(...)
+        def filled(*args, **opts, &block)
+          extract_type_spec(args) do |*predicates, type_spec:, type_rule:|
+            append_macro(Macros::Filled) do |macro|
+              macro.call(*predicates, type_spec: type_spec, type_rule: type_rule, **opts, &block)
+            end
           end
         end
-        ruby2_keywords :filled if respond_to?(:ruby2_keywords, true)
 
         # Specify a nested hash without enforced `hash?` type-check
         #
@@ -201,7 +203,7 @@ module Dry
 
         # @api private
         # rubocop: disable Metrics/PerceivedComplexity
-        def extract_type_spec(*args, nullable: false, set_type: true)
+        def extract_type_spec(args, nullable: false, set_type: true)
           type_spec = args[0] unless schema_or_predicate?(args[0])
 
           predicates = Array(type_spec ? args[1..] : args)

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

@@ -11,13 +11,15 @@ module Dry
       # @api private
       class Each < DSL
         # @api private
-        def value(*args, **opts)
-          extract_type_spec(*args, set_type: false) do |*predicates, type_spec:, type_rule:|
+        def value(*args, **opts, &block)
+          extract_type_spec(args, set_type: false) do |*predicates, type_spec:, type_rule:|
             if type_spec && !type_spec.is_a?(Dry::Types::Type)
               type(schema_dsl.array[type_spec])
             end
 
-            super(*predicates, type_spec: type_spec, type_rule: type_rule, **opts)
+            append_macro(Macros::Value) do |macro|
+              macro.call(*predicates, type_spec: type_spec, type_rule: type_rule, **opts, &block)
+            end
           end
         end
 

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

@@ -32,49 +32,6 @@ module Dry
         end
         ruby2_keywords(:filter) if respond_to?(:ruby2_keywords, true)
 
-        # @overload value(type_spec, *predicates, **predicate_opts)
-        #   Set type specification and predicates
-        #
-        #   @param [Symbol,Types::Type,Array] type_spec
-        #   @param [Array<Symbol>] predicates
-        #   @param [Hash] predicate_opts
-        #
-        #   @example with a predicate
-        #     required(:name).value(:string, :filled?)
-        #
-        #   @example with a predicate with arguments
-        #     required(:name).value(:string, min_size?: 2)
-        #
-        #   @example with a block
-        #     required(:name).value(:string) { filled? & min_size?(2) }
-        #
-        # @return [Macros::Key]
-        #
-        # @see Macros::DSL#value
-        #
-        # @api public
-        def value(*args, **opts, &block)
-          extract_type_spec(*args) do |*predicates, type_spec:, type_rule:|
-            super(*predicates, type_spec: type_spec, type_rule: type_rule, **opts, &block)
-          end
-        end
-
-        # Set type specification and predicates for a filled value
-        #
-        # @example
-        #   required(:name).filled(:string)
-        #
-        # @see Macros::Key#value
-        #
-        # @return [Macros::Key]
-        #
-        # @api public
-        def filled(*args, **opts, &block)
-          extract_type_spec(*args) do |*predicates, type_spec:, type_rule:|
-            super(*predicates, type_spec: type_spec, type_rule: type_rule, **opts, &block)
-          end
-        end
-
         # Set type specification and predicates for a maybe value
         #
         # @example
@@ -86,7 +43,7 @@ module Dry
         #
         # @api public
         def maybe(*args, **opts, &block)
-          extract_type_spec(*args, nullable: true) do |*predicates, type_spec:, type_rule:|
+          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

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

@@ -30,13 +30,7 @@ module Dry
 
         # @api private
         def process_operation(op)
-          schemas = op.rules.select { |rule| rule.is_a?(Processor) }
-
-          hash_schema = hash_type.schema(
-            schemas.map(&:schema_dsl).map(&:types).reduce(:merge)
-          )
-
-          type(hash_schema)
+          type(hash_type.schema(merge_operation_types(op)))
         end
 
         # @api private
@@ -44,6 +38,23 @@ module Dry
           schema_dsl.resolve_type(:hash)
         end
 
+        # @api private
+        def merge_operation_types(op)
+          op.rules.reduce({}) do |acc, rule|
+            types =
+              case rule
+              when Dry::Logic::Operations::Abstract
+                merge_operation_types(rule)
+              when Processor
+                rule.types
+              else
+                EMPTY_HASH.dup
+              end
+
+            schema_dsl.merge_types(op.class, acc, types)
+          end
+        end
+
         # @api private
         # rubocop: disable Metrics/AbcSize
         def define(*args, &block)

data/lib/dry/schema/message/or/multi_path.rb

@@ -34,17 +34,16 @@ module Dry
             end
           end
 
-          # @api private
-          def self.handler(message)
-            handlers.find { |k,| message.is_a?(k) }&.last
-          end
+          MESSAGE_ARRAY_HANDLER = -> { MessageArray.new(_1) }
 
           # @api private
-          private_class_method def self.handlers
-            @handlers ||= {
-              self => -> { _1 },
-              Array => -> { MessageArray.new(_1) }
-            }.freeze
+          def self.handler(message)
+            case message
+            when self
+              IDENTITY
+            when Array
+              MESSAGE_ARRAY_HANDLER
+            end
           end
 
           # @api public
@@ -59,7 +58,7 @@ module Dry
 
           # @api private
           def root
-            @root ||= _messages.flat_map(&:_paths).reduce(:&)
+            @root ||= _paths.reduce(:&)
           end
 
           # @api private
@@ -67,9 +66,14 @@ module Dry
             root
           end
 
+          # @api private
+          def _path
+            @_path ||= Path[root]
+          end
+
           # @api private
           def _paths
-            @paths ||= [Path[root]]
+            @paths ||= _messages.flat_map(&:_paths)
           end
 
           # @api private

data/lib/dry/schema/message/or/single_path.rb

@@ -21,10 +21,11 @@ module Dry
 
           # @api private
           def initialize(*args, messages)
-            super(*args)
+            super(*args.map { [_1].flatten })
             @messages = messages
-            @path = left.path
-            @_path = left._path
+            message = left.first
+            @path = message.path
+            @_path = message._path
           end
 
           # Dump a message into a string
@@ -38,7 +39,7 @@ module Dry
           #
           # @api public
           def dump
-            @dump ||= "#{left.dump} #{messages[:or]} #{right.dump}"
+            @dump ||= [*left, *right].map(&:dump).join(" #{messages[:or]} ")
           end
           alias_method :to_s, :dump
 
@@ -55,7 +56,16 @@ module Dry
 
           # @api private
           def to_a
-            @to_a ||= [left, right]
+            @to_a ||= [*left, *right]
+          end
+
+          # @api private
+          def to_or(root)
+            to_ored = [left, right].map do |msgs|
+              msgs.map { _1.to_or(root) }
+            end
+
+            self.class.new(*to_ored, messages)
           end
         end
       end

data/lib/dry/schema/message_set.rb

@@ -105,7 +105,7 @@ module Dry
 
       # @api private
       def messages_map(messages = self.messages)
-        combine_message_hashes(messages.map(&:to_h))
+        combine_message_hashes(messages.map(&:to_h)).freeze
       end
 
       # @api private

data/lib/dry/schema/processor.rb

@@ -188,6 +188,13 @@ module Dry
         rule_applier.rules
       end
 
+      # Return the types from the schema DSL
+      #
+      # @api private
+      def types
+        schema_dsl.types
+      end
+
       # Check if there are filter rules
       #
       # @api private

data/lib/dry/schema/types_merger.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+module Dry
+  module Schema
+    # Combines multiple logical operations into a single type, taking into
+    # account the type of logical operation (or, and, implication) and the
+    # underlying types (schemas, nominals, etc.)
+    #
+    # @api private
+    class TypesMerger
+      attr_reader :type_registry
+
+      # @api private
+      class ValueMerger
+        attr_reader :types_merger
+        attr_reader :op_class
+        attr_reader :old
+        attr_reader :new
+
+        # @api private
+        def initialize(types_merger, op_class, old, new)
+          @types_merger = types_merger
+          @op_class = op_class
+          @old = old
+          @new = new
+        end
+
+        # @api private
+        def call
+          handlers.fetch(op_class).call
+        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
+          old | new
+        end
+
+        # @api private
+        def handle_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)
+
+          rule = [old_rule, new_rule].compact.reduce { op_class.new(_1, _2) }
+
+          type = Dry::Types::Constrained.new(type, rule: rule) if rule
+
+          type
+        end
+
+        alias_method :handle_and, :handle_ordered
+        alias_method :handle_implication, :handle_ordered
+
+        # @api private
+        def merge_underlying_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
+              )
+            )
+          in [Dry::Types::AnyClass, _] | [Dry::Types::Hash, Dry::Types::Schema]
+            unwrapped_new
+          in [Dry::Types::Hash, Dry::Types::Schema] | [_, 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
+
+            unwrapped_old
+          end
+        end
+
+        # @api private
+        def unwrap_type(type)
+          rules = []
+
+          while type.is_a?(Dry::Types::Decorator)
+            rules << type.rule if type.is_a?(Dry::Types::Constrained)
+
+            if type.meta[:maybe] & type.respond_to?(:right)
+              type = type.right
+            else
+              type = type.type
+            end
+          end
+
+          [type, rules.reduce(:&)]
+        end
+      end
+
+      def initialize(type_registry = TypeRegistry.new)
+        @type_registry = type_registry
+      end
+
+      # @api private
+      def call(op_class, lhs, rhs)
+        lhs.merge(rhs) do |_k, old, new|
+          ValueMerger.new(self, op_class, old, new).call
+        end
+      end
+    end
+  end
+end

data/lib/dry/schema/version.rb

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

data/lib/dry/schema.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require "dry/core/extensions"
+require "dry/configurable"
+require "dry/logic"
 
 require "dry/schema/config"
 require "dry/schema/constants"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-schema
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.10.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-23 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -230,6 +230,7 @@ files:
 - lib/dry/schema/type_container.rb
 - lib/dry/schema/type_registry.rb
 - lib/dry/schema/types.rb
+- lib/dry/schema/types_merger.rb
 - lib/dry/schema/value_coercer.rb
 - lib/dry/schema/version.rb
 homepage: https://dry-rb.org/gems/dry-schema