dry-types 1.7.2 → 1.8.2

data/lib/dry/types/default.rb

@@ -8,7 +8,7 @@ module Dry
     class Default
       # @api private
       class Callable < Default
-        include Dry::Equalizer(:type, inspect: false, immutable: true)
+        include ::Dry::Equalizer(:type, inspect: false, immutable: true)
 
         # Evaluates given callable
         # @return [Object]
@@ -26,7 +26,7 @@ module Dry
       include Decorator
       include Builder
       include Printable
-      include Dry::Equalizer(:type, :value, inspect: false, immutable: true)
+      include ::Dry::Equalizer(:type, :value, inspect: false, immutable: true)
 
       # @return [Object]
       attr_reader :value
@@ -62,32 +62,30 @@ module Dry
       # @return [Default]
       #
       # @api public
-      def constrained(...)
-        type.constrained(...).default(value)
-      end
+      def constrained(...) = type.constrained(...).default(value)
 
       # @return [true]
       #
       # @api public
-      def default?
-        true
-      end
+      def default? = true
 
       # @param [Object] input
       #
       # @return [Result::Success]
       #
       # @api public
-      def try(input)
-        success(call(input))
+      def try(input = Undefined, &)
+        if input.equal?(Undefined)
+          success(evaluate)
+        else
+          type.try(input)
+        end
       end
 
       # @return [Boolean]
       #
       # @api public
-      def valid?(value = Undefined)
-        Undefined.equal?(value) || super
-      end
+      def valid?(value = Undefined) = Undefined.equal?(value) || super
 
       # @param [Object] input
       #
@@ -107,20 +105,18 @@ module Dry
       # @return [Object] value passed through {#type} or {#default} value
       #
       # @api private
-      def call_safe(input = Undefined, &block)
+      def call_safe(input = Undefined, &)
         if input.equal?(Undefined)
           evaluate
         else
-          Undefined.default(type.call_safe(input, &block)) { evaluate }
+          Undefined.default(type.call_safe(input, &)) { evaluate }
         end
       end
 
       # @return [false]
       #
       # @api private
-      def callable?
-        false
-      end
+      def callable? = false
     end
   end
 end

data/lib/dry/types/enum.rb

@@ -7,7 +7,7 @@ module Dry
     # @api public
     class Enum
       include Type
-      include Dry::Equalizer(:type, :mapping, inspect: false, immutable: true)
+      include ::Dry::Equalizer(:type, :mapping, inspect: false, immutable: true)
       include Decorator
       include Builder
 
@@ -36,27 +36,21 @@ module Dry
       # @return [Object]
       #
       # @api private
-      def call_unsafe(input)
-        type.call_unsafe(map_value(input))
-      end
+      def call_unsafe(input) = type.call_unsafe(map_value(input))
 
       # @return [Object]
       #
       # @api private
-      def call_safe(input, &block)
-        type.call_safe(map_value(input), &block)
-      end
+      def call_safe(input, &) = type.call_safe(map_value(input), &)
 
       # @see Dry::Types::Constrained#try
       #
       # @api public
-      def try(input)
-        super(map_value(input))
-      end
+      def try(input, &) = super(map_value(input))
 
       # @api private
       def default(*)
-        raise ".enum(*values).default(value) is not supported. Call "\
+        raise ".enum(*values).default(value) is not supported. Call " \
               ".default(value).enum(*values) instead"
       end
 
@@ -73,11 +67,37 @@ module Dry
       # @return [String]
       #
       # @api public
-      def to_s
-        PRINTER.(self)
+      def to_s = PRINTER.(self)
+
+      # Iterate over each enum value
+      #
+      # @return [Array, Enumerator]
+      #
+      # @api public
+      def each_value(&)
+        values.each(&)
       end
+
       alias_method :inspect, :to_s
 
+      # @return [String]
+      #
+      # @api public
+      def name = "#{super}(#{joined_values})"
+
+      # @return [String]
+      #
+      # @api private
+      def joined_values
+        mapping.keys.map { |value|
+          if value.is_a?(::String)
+            value
+          else
+            value.inspect
+          end
+        }.join("|")
+      end
+
       private
 
       # Maps a value

data/lib/dry/types/errors.rb

@@ -56,14 +56,10 @@ module Dry
       end
 
       # @return string
-      def message
-        errors.map(&:message).join(", ")
-      end
+      def message = errors.map(&:message).join(", ")
 
       # @return [Array]
-      def meta
-        errors.map(&:meta)
-      end
+      def meta = errors.map(&:meta)
     end
 
     class SchemaError < CoercionError
@@ -80,7 +76,7 @@ module Dry
         @key = key
         @value = value
         super(
-          "#{value.inspect} (#{value.class}) has invalid type "\
+          "#{value.inspect} (#{value.class}) has invalid type " \
           "for :#{key} violates constraints (#{result} failed)"
         )
       end
@@ -125,7 +121,7 @@ module Dry
         @result = result
         @input = input
 
-        if result.is_a?(String)
+        if result.is_a?(::String)
           super(result)
         else
           super(to_s)

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

@@ -57,7 +57,7 @@ module Dry
       # @return [Result::Success]
       #
       # @api public
-      def try(input = Undefined)
+      def try(input = Undefined, &)
         result = type.try(input)
 
         if result.success?
@@ -70,9 +70,7 @@ module Dry
       # @return [true]
       #
       # @api public
-      def default?
-        true
-      end
+      def default? = true
 
       # @param [Object] value
       #
@@ -83,7 +81,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
@@ -96,17 +94,13 @@ module Dry
       # @return [Maybe]
       #
       # @api public
-      def maybe
-        Maybe.new(Types["nil"] | self)
-      end
+      def maybe = Maybe.new(Types["nil"] | self)
     end
 
     # @api private
     class Schema::Key # rubocop:disable Style/ClassAndModuleChildren
       # @api private
-      def maybe
-        __new__(type.maybe)
-      end
+      def maybe = __new__(type.maybe)
     end
 
     # @api private

data/lib/dry/types/fn_container.rb

@@ -12,8 +12,8 @@ module Dry
       end
 
       # @api private
-      def self.register(function = Dry::Core::Constants::Undefined, &block)
-        fn = Dry::Core::Constants::Undefined.default(function, block)
+      def self.register(function = ::Dry::Core::Constants::Undefined, &block)
+        fn = ::Dry::Core::Constants::Undefined.default(function, block)
         fn_name = register_name(fn)
         container.register(fn_name, fn) unless container.key?(fn_name)
         fn_name
@@ -30,7 +30,7 @@ module Dry
 
       # @api private
       def self.register_name(function)
-        "fn_#{function.object_id}"
+        "fn_#{function.__id__}"
       end
     end
   end

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

@@ -8,23 +8,17 @@ module Dry
     class Hash < Nominal
       class Constructor < ::Dry::Types::Constructor
         # @api private
-        def constructor_type
-          ::Dry::Types::Hash::Constructor
-        end
+        def constructor_type = ::Dry::Types::Hash::Constructor
 
         # @return [Lax]
         #
         # @api public
-        def lax
-          type.lax.constructor(fn, meta: meta)
-        end
+        def lax = Lax.new(type.lax.constructor(fn, meta: meta))
 
         # @see Dry::Types::Array#of
         #
         # @api public
-        def schema(...)
-          type.schema(...).constructor(fn, meta: meta)
-        end
+        def schema(...) = type.schema(...).constructor(fn, meta: meta)
       end
     end
   end

data/lib/dry/types/hash.rb

@@ -48,7 +48,7 @@ module Dry
 
       # @api private
       def weak(*)
-        raise "Support for old hash schemas was removed, please refer to the CHANGELOG "\
+        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/main/CHANGELOG.md"
       end
       alias_method :permissive, :weak
@@ -67,9 +67,9 @@ 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)
+        handle = ::Dry::Types::FnContainer.register(fn)
         with(type_transform_fn: handle)
       end
 
@@ -93,7 +93,9 @@ module Dry
       #
       # @api public
       def to_ast(meta: true)
-        [:hash, [options.slice(:type_transform_fn), meta ? self.meta : EMPTY_HASH]]
+        [:hash,
+         [options.slice(:type_transform_fn),
+          meta ? self.meta : EMPTY_HASH]]
       end
 
       private
@@ -101,7 +103,7 @@ module Dry
       # @api private
       def build_keys(type_map)
         type_fn = options.fetch(:type_transform_fn, Schema::NO_TRANSFORM)
-        type_transform = Dry::Types::FnContainer[type_fn]
+        type_transform = ::Dry::Types::FnContainer[type_fn]
 
         type_map.map do |map_key, type|
           name, options = key_name(map_key)
@@ -115,7 +117,7 @@ module Dry
         case type
         when Type then type
         when ::Class, ::String then Types[type]
-        else type
+        else type # rubocop:disable Lint/DuplicateBranch
         end
       end
 

data/lib/dry/types/implication.rb

@@ -8,9 +8,7 @@ module Dry
     class Implication
       include Composition
 
-      def self.operator
-        :>
-      end
+      def self.operator = :>
 
       # @param [Object] input
       #
@@ -30,9 +28,9 @@ module Dry
       # @return [Object]
       #
       # @api private
-      def call_safe(input, &block)
+      def call_safe(input, &)
         if left.try(input).success?
-          right.call_safe(input, &block)
+          right.call_safe(input, &)
         else
           input
         end
@@ -41,9 +39,9 @@ module Dry
       # @param [Object] input
       #
       # @api public
-      def try(input)
+      def try(input, &)
         if left.try(input).success?
-          right.try(input)
+          right.try(input, &)
         else
           Result::Success.new(input)
         end

data/lib/dry/types/inflector.rb

@@ -4,6 +4,6 @@ require "dry/inflector"
 
 module Dry
   module Types
-    Inflector = Dry::Inflector.new
+    Inflector = ::Dry::Inflector.new
   end
 end

data/lib/dry/types/intersection.rb

@@ -12,9 +12,7 @@ module Dry
     class Intersection
       include Composition
 
-      def self.operator
-        :&
-      end
+      def self.operator = :&
 
       # @param [Object] input
       #
@@ -30,9 +28,7 @@ module Dry
       # @return [Object]
       #
       # @api private
-      def call_safe(input, &block)
-        try_sides(input, &block).input
-      end
+      def call_safe(input, &) = try_sides(input, &).input
 
       # @param [Object] input
       #
@@ -94,9 +90,7 @@ module Dry
       def merge_results(left_result, right_result)
         case left_result
         when ::Array
-          left_result
-            .zip(right_result)
-            .map { |lhs, rhs| merge_results(lhs, rhs) }
+          left_result.zip(right_result).map { merge_results(_1, _2) }
         when ::Hash
           left_result.merge(right_result)
         else

data/lib/dry/types/lax.rb

@@ -10,7 +10,7 @@ module Dry
       include Decorator
       include Builder
       include Printable
-      include Dry::Equalizer(:type, inspect: false, immutable: true)
+      include ::Dry::Equalizer(:type, inspect: false, immutable: true)
 
       undef :options, :constructor, :<<, :>>, :prepend, :append
 
@@ -19,7 +19,7 @@ module Dry
       # @return [Object]
       #
       # @api public
-      def call(input)
+      def call(input, &)
         type.call_safe(input) { |output = input| output }
       end
       alias_method :[], :call
@@ -35,23 +35,17 @@ module Dry
       # @return [Result,Logic::Result]
       #
       # @api public
-      def try(input, &block)
-        type.try(input, &block)
-      end
+      def try(input, &) = type.try(input, &)
 
       # @see Nominal#to_ast
       #
       # @api public
-      def to_ast(meta: true)
-        [:lax, type.to_ast(meta: meta)]
-      end
+      def to_ast(meta: true) = [:lax, type.to_ast(meta: meta)]
 
       # @return [Lax]
       #
       # @api public
-      def lax
-        self
-      end
+      def lax = self
 
       private
 

data/lib/dry/types/map.rb

@@ -24,29 +24,23 @@ module Dry
     # @api public
     class Map < Nominal
       def initialize(primitive, key_type: Types["any"], value_type: Types["any"], meta: EMPTY_HASH)
-        super(primitive, key_type: key_type, value_type: value_type, meta: meta)
+        super
       end
 
       # @return [Type]
       #
       # @api public
-      def key_type
-        options[:key_type]
-      end
+      def key_type = options[:key_type]
 
       # @return [Type]
       #
       # @api public
-      def value_type
-        options[:value_type]
-      end
+      def value_type = options[:value_type]
 
       # @return [String]
       #
       # @api public
-      def name
-        "Map"
-      end
+      def name = "Map"
 
       # @param [Hash] hash
       #
@@ -64,9 +58,7 @@ module Dry
       # @return [Hash]
       #
       # @api private
-      def call_safe(hash)
-        try(hash) { return yield }.input
-      end
+      def call_safe(hash) = try(hash) { return yield }.input
 
       # @param [Hash] hash
       #
@@ -95,48 +87,48 @@ module Dry
       # @return [Boolean]
       #
       # @api public
-      def constrained?
-        value_type.constrained?
-      end
+      def constrained? = value_type.constrained?
 
       private
 
       # @api private
-      # rubocop:disable Metrics/PerceivedComplexity
       # rubocop:disable Metrics/AbcSize
       def coerce(input)
-        unless primitive?(input)
-          return failure(
-            input, CoercionError.new("#{input.inspect} must be an instance of #{primitive}")
-          )
-        end
-
-        output = {}
-        failures = []
-
-        input.each do |k, v|
-          res_k = key_type.try(k)
-          res_v = value_type.try(v)
+        assert_primitive(input) do
+          output = {}
+          failures = []
+
+          input.each do |k, v|
+            res_k = key_type.try(k)
+            res_v = value_type.try(v)
+
+            if res_k.failure?
+              failures << res_k.error
+            elsif output.key?(res_k.input)
+              failures << CoercionError.new("duplicate coerced hash key #{res_k.input.inspect}")
+            elsif res_v.failure?
+              failures << res_v.error
+            else
+              output[res_k.input] = res_v.input
+            end
+          end
 
-          if res_k.failure?
-            failures << res_k.error
-          elsif output.key?(res_k.input)
-            failures << CoercionError.new("duplicate coerced hash key #{res_k.input.inspect}")
-          elsif res_v.failure?
-            failures << res_v.error
+          if failures.empty?
+            success(output)
           else
-            output[res_k.input] = res_v.input
+            failure(input, MultipleError.new(failures))
           end
         end
+      end
+      # rubocop:enable Metrics/AbcSize
 
-        if failures.empty?
-          success(output)
+      def assert_primitive(input)
+        if primitive?(input)
+          yield
         else
-          failure(input, MultipleError.new(failures))
+          failure(input, CoercionError.new("#{input.inspect} must be an instance of #{primitive}"))
         end
       end
-      # rubocop:enable Metrics/PerceivedComplexity
-      # rubocop:enable Metrics/AbcSize
     end
   end
 end

data/lib/dry/types/meta.rb

@@ -16,9 +16,7 @@ module Dry
       # @return [Type]
       #
       # @api public
-      def with(**options)
-        super(meta: @meta, **options)
-      end
+      def with(**options) = super(meta: @meta, **options)
 
       # @overload meta
       #   @return [Hash] metadata associated with type
@@ -43,9 +41,7 @@ module Dry
       # @return [Dry::Types::Type]
       #
       # @api public
-      def pristine
-        with(meta: EMPTY_HASH)
-      end
+      def pristine = with(meta: EMPTY_HASH)
     end
   end
 end

data/lib/dry/types/module.rb

@@ -38,7 +38,6 @@ module Dry
 
       # @api private
       # rubocop:disable Metrics/AbcSize
-      # rubocop:disable Metrics/CyclomaticComplexity
       # rubocop:disable Metrics/PerceivedComplexity
       def type_constants(*namespaces, default: Undefined, **aliases)
         if namespaces.empty? && aliases.empty? && Undefined.equal?(default)
@@ -52,7 +51,7 @@ module Dry
         tree = registry_tree
 
         if namespaces.empty? && aliases.empty?
-          modules = tree.select { |_, v| v.is_a?(::Hash) }.map(&:first)
+          modules = tree.select { _2.is_a?(::Hash) }.map(&:first)
         else
           modules = (namespaces + aliases.keys).map { |n|
             Types::Inflector.camelize(n).to_sym
@@ -69,7 +68,6 @@ module Dry
         end
       end
       # rubocop:enable Metrics/AbcSize
-      # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/PerceivedComplexity
 
       # @api private
@@ -101,8 +99,8 @@ module Dry
         unknown = (referenced.uniq - known).first
 
         if unknown
-          raise ArgumentError,
-                "#{unknown.inspect} is not a known type namespace. "\
+          raise ::ArgumentError,
+                "#{unknown.inspect} is not a known type namespace. " \
                 "Supported options are #{known.map(&:inspect).join(", ")}"
         end
       end