dry-types 1.2.2 → 1.5.1

data/lib/dry/types/constructor/wrapper.rb

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+module Dry
+  module Types
+    # @api public
+    class Constructor < Nominal
+      module Wrapper
+        # @return [Object]
+        #
+        # @api private
+        def call_safe(input, &block)
+          fn.(input, type, &block)
+        end
+
+        # @return [Object]
+        #
+        # @api private
+        def call_unsafe(input)
+          fn.(input, type)
+        end
+
+        # @param [Object] input
+        # @param [#call,nil] block
+        #
+        # @return [Logic::Result, Types::Result]
+        # @return [Object] if block given and try fails
+        #
+        # @api public
+        def try(input, &block)
+          value = fn.(input, type)
+        rescue CoercionError => e
+          failure = failure(input, e)
+          block_given? ? yield(failure) : failure
+        else
+          type.try(value, &block)
+        end
+
+        # Define a constructor for the type
+        #
+        # @param [#call,nil] constructor
+        # @param [Hash] options
+        # @param [#call,nil] block
+        #
+        # @return [Constructor]
+        #
+        # @api public
+        define_method(:constructor, Builder.instance_method(:constructor))
+        alias_method :append, :constructor
+        alias_method :>>, :constructor
+
+        # Build a new constructor by prepending a block to the coercion function
+        #
+        # @param [#call, nil] new_fn
+        # @param [Hash] options
+        # @param [#call, nil] block
+        #
+        # @return [Constructor]
+        #
+        # @api public
+        def prepend(new_fn = nil, **options, &block)
+          prep_fn = Function[new_fn || block]
+
+          decorated =
+            if prep_fn.wrapper?
+              type.constructor(prep_fn, **options)
+            else
+              type.prepend(prep_fn, **options)
+            end
+
+          __new__(decorated)
+        end
+        alias_method :<<, :prepend
+
+        # @return [Constructor]
+        #
+        # @api public
+        def lax
+          # return self back because wrapping function
+          # can handle failed type check
+          self
+        end
+
+        private
+
+        # Replace underlying type
+        #
+        # @api private
+        def __new__(type)
+          self.class.new(type, *@__args__.drop(1), **@options)
+        end
+      end
+    end
+  end
+end

data/lib/dry/types/container.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/container'
+require "dry/container"
 
 module Dry
   module Types

data/lib/dry/types/core.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/types/any'
+require "dry/types/any"
 
 module Dry
   module Types
@@ -72,7 +72,9 @@ module Dry
 
     # Register optional strict {NON_NIL} types
     NON_NIL.each_key do |name|
-      register("optional.strict.#{name}", self["strict.#{name}"].optional)
+      type = self[name.to_s].optional
+      register("optional.strict.#{name}", type)
+      register("optional.#{name}", type)
     end
 
     # Register optional {COERCIBLE} types
@@ -81,17 +83,17 @@ module Dry
     end
 
     # Register `:bool` since it's common and not a built-in Ruby type :(
-    register('nominal.bool', self['nominal.true'] | self['nominal.false'])
-    bool = self['strict.true'] | self['strict.false']
-    register('strict.bool', bool)
-    register('bool', bool)
-
-    register('any', Any)
-    register('nominal.any', Any)
-    register('strict.any', Any)
+    register("nominal.bool", self["nominal.true"] | self["nominal.false"])
+    bool = self["strict.true"] | self["strict.false"]
+    register("strict.bool", bool)
+    register("bool", bool)
+
+    register("any", Any)
+    register("nominal.any", Any)
+    register("strict.any", Any)
   end
 end
 
-require 'dry/types/coercions'
-require 'dry/types/params'
-require 'dry/types/json'
+require "dry/types/coercions"
+require "dry/types/params"
+require "dry/types/json"

data/lib/dry/types/decorator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/types/options'
+require "dry/types/options"
 
 module Dry
   module Types
@@ -44,13 +44,6 @@ module Dry
         type.constrained?
       end
 
-      # @return [Sum]
-      #
-      # @api public
-      def optional
-        Types['strict.nil'] | self
-      end
-
       # @param [Symbol] meth
       # @param [Boolean] include_private
       #
@@ -107,7 +100,7 @@ module Dry
       #
       # @api private
       def __new__(type)
-        self.class.new(type, *@__args__[1..-1], **@options)
+        self.class.new(type, *@__args__.drop(1), **@options)
       end
     end
   end

data/lib/dry/types/default.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/types/decorator'
+require "dry/core/equalizer"
+require "dry/types/decorator"
 
 module Dry
   module Types
@@ -17,6 +18,11 @@ module Dry
         def evaluate
           value.call(type)
         end
+
+        # @return [true]
+        def callable?
+          true
+        end
       end
 
       include Type
@@ -111,6 +117,13 @@ module Dry
           Undefined.default(type.call_safe(input, &block)) { evaluate }
         end
       end
+
+      # @return [false]
+      #
+      # @api private
+      def callable?
+        false
+      end
     end
   end
 end

data/lib/dry/types/enum.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/types/decorator'
+require "dry/core/equalizer"
+require "dry/types/decorator"
 
 module Dry
   module Types
@@ -58,8 +59,8 @@ module Dry
 
       # @api private
       def default(*)
-        raise '.enum(*values).default(value) is not supported. Call '\
-              '.default(value).enum(*values) instead'
+        raise ".enum(*values).default(value) is not supported. Call "\
+              ".default(value).enum(*values) instead"
       end
 
       # Check whether a value is in the enum

data/lib/dry/types/errors.rb

@@ -56,7 +56,7 @@ module Dry
 
       # @return string
       def message
-        errors.map(&:message).join(', ')
+        errors.map(&:message).join(", ")
       end
 
       # @return [Array]

data/lib/dry/types/extensions.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 Dry::Types.register_extension(:maybe) do
-  require 'dry/types/extensions/maybe'
+  require "dry/types/extensions/maybe"
 end
 
 Dry::Types.register_extension(:monads) do
-  require 'dry/types/extensions/monads'
+  require "dry/types/extensions/monads"
 end

data/lib/dry/types/extensions/maybe.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-require 'dry/monads/maybe'
-require 'dry/types/decorator'
+require "dry/core/equalizer"
+require "dry/monads/maybe"
+require "dry/types/decorator"
 
 module Dry
   module Types
@@ -10,11 +11,11 @@ module Dry
     # @api public
     class Maybe
       include Type
-      include Dry::Equalizer(:type, :options, inspect: false, immutable: true)
+      include ::Dry::Equalizer(:type, :options, inspect: false, immutable: true)
       include Decorator
       include Builder
       include Printable
-      include Dry::Monads::Maybe::Mixin
+      include ::Dry::Monads::Maybe::Mixin
 
       # @param [Dry::Monads::Maybe, Object] input
       #
@@ -23,7 +24,7 @@ module Dry
       # @api private
       def call_unsafe(input = Undefined)
         case input
-        when Dry::Monads::Maybe
+        when ::Dry::Monads::Maybe
           input
         when Undefined
           None()
@@ -37,14 +38,14 @@ module Dry
       # @return [Dry::Monads::Maybe]
       #
       # @api private
-      def call_safe(input = Undefined, &block)
+      def call_safe(input = Undefined)
         case input
-        when Dry::Monads::Maybe
+        when ::Dry::Monads::Maybe
           input
         when Undefined
           None()
         else
-          Maybe(type.call_safe(input, &block))
+          Maybe(type.call_safe(input) { |output = input| return yield(output) })
         end
       end
 
@@ -54,13 +55,13 @@ module Dry
       #
       # @api public
       def try(input = Undefined)
-        res = if input.equal?(Undefined)
-                None()
-              else
-                Maybe(type[input])
-              end
+        result = type.try(input)
 
-        Result::Success.new(res)
+        if result.success?
+          Result::Success.new(Maybe(result.input))
+        else
+          result
+        end
       end
 
       # @return [true]
@@ -79,7 +80,7 @@ module Dry
       # @api public
       def default(value)
         if value.nil?
-          raise ArgumentError, 'nil cannot be used as a default of a maybe type'
+          raise ArgumentError, "nil cannot be used as a default of a maybe type"
         else
           super
         end
@@ -93,7 +94,7 @@ module Dry
       #
       # @api public
       def maybe
-        Maybe.new(Types['strict.nil'] | self)
+        Maybe.new(Types["nil"] | self)
       end
     end
 
@@ -119,7 +120,7 @@ module Dry
 
     # Register non-coercible maybe types
     NON_NIL.each_key do |name|
-      register("maybe.strict.#{name}", self["strict.#{name}"].maybe)
+      register("maybe.strict.#{name}", self[name.to_s].maybe)
     end
 
     # Register coercible maybe types

data/lib/dry/types/extensions/monads.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/monads/result'
+require "dry/monads/result"
 
 module Dry
   module Types

data/lib/dry/types/fn_container.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/types/container'
+require "dry/types/container"
 
 module Dry
   module Types

data/lib/dry/types/hash.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/types/hash/constructor'
+require "dry/types/hash/constructor"
 
 module Dry
   module Types
@@ -8,7 +8,7 @@ module Dry
     #
     # @api public
     class Hash < Nominal
-      NOT_REQUIRED = { required: false }.freeze
+      NOT_REQUIRED = {required: false}.freeze
 
       # @overload schema(type_map, meta = EMPTY_HASH)
       #   @param [{Symbol => Dry::Types::Nominal}] type_map
@@ -50,8 +50,8 @@ module Dry
 
       # @api private
       def weak(*)
-        raise 'Support for old hash schemas was removed, please refer to the CHANGELOG '\
-              'on how to proceed with the new API https://github.com/dry-rb/dry-types/blob/master/CHANGELOG.md'
+        raise "Support for old hash schemas was removed, please refer to the CHANGELOG "\
+              "on how to proceed with the new API https://github.com/dry-rb/dry-types/blob/master/CHANGELOG.md"
       end
       alias_method :permissive, :weak
       alias_method :strict, :weak
@@ -69,7 +69,7 @@ module Dry
       def with_type_transform(proc = nil, &block)
         fn = proc || block
 
-        raise ArgumentError, 'a block or callable argument is required' if fn.nil?
+        raise ArgumentError, "a block or callable argument is required" if fn.nil?
 
         handle = Dry::Types::FnContainer.register(fn)
         with(type_transform_fn: handle)
@@ -95,13 +95,7 @@ module Dry
       #
       # @api public
       def to_ast(meta: true)
-        opts = if RUBY_VERSION >= '2.5'
-                 options.slice(:type_transform_fn)
-               else
-                 options.select { |k, _| k == :type_transform_fn }
-               end
-
-        [:hash, [opts, meta ? self.meta : EMPTY_HASH]]
+        [:hash, [options.slice(:type_transform_fn), meta ? self.meta : EMPTY_HASH]]
       end
 
       private
@@ -129,7 +123,7 @@ module Dry
 
       # @api private
       def key_name(key)
-        if key.to_s.end_with?('?')
+        if key.to_s.end_with?("?")
           [key.to_s.chop.to_sym, NOT_REQUIRED]
         else
           [key, EMPTY_HASH]
@@ -139,5 +133,5 @@ module Dry
   end
 end
 
-require 'dry/types/schema/key'
-require 'dry/types/schema'
+require "dry/types/schema/key"
+require "dry/types/schema"

data/lib/dry/types/hash/constructor.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/types/constructor'
+require "dry/types/constructor"
 
 module Dry
   module Types