dry-types 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ffbb2a3ad9a5c532228eccc2c56690e1e7ea8808b579a140f804a46a5263d69
-  data.tar.gz: 04e2f92495290236be6daf9be2963649f5350c38f69c16a992649610986bbe5e
+  metadata.gz: 9875a9faf12df26231bd206db5e75e78cdb104277f34947b01e0d104537b63b4
+  data.tar.gz: 8358caef2ad9e5f83b635531b512f507a9b1776b26ba39f3b69090c6edcc1e71
 SHA512:
-  metadata.gz: 53f6b6604552a3dacfbfdb64713e8cfdbc47e51b0b0061b6ab186c948ec207b7159c2a076dd17dead3f4d55e4cc300d2133831590f6b56105ac0754bbfd36e99
-  data.tar.gz: d7050f2070155e72c560f35392121d0de222da270495cbf7f65f0b7c9dcb91f9d9c3db20b119b9a9f1a62c8fae58e49474beaebf81b7df47095cf518607df25c
+  metadata.gz: 5bab1e2bb31fc25d9eb8765177717f985d433115cf756bcda8cdedf201bfca90627c942d5183962f428c7c2d67789b08ac95b2e3e0b741c7cccbd39d13ab0ba6
+  data.tar.gz: caa7de7d979423fd8d8b5dd0b64642104f40029dcfeec7fe81ff05ef516c76d4bef1a59e341d0580b15022429a3f0d8a89c2f6170fdab0f398c330f157e4cf43

data/CHANGELOG.md

@@ -1,6 +1,26 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
-## 1.5.0 2020-01-21
+## 1.6.0 2022-10-15
+
+
+### Changed
+
+- Optimize `PredicateRegistry` for Ruby 2.7+ (see #420 for more details) (@casperisfine)
+- Use zeitwerk for auto-loading (@flash-gordon)
+
+[Compare v1.5.1...v1.6.0](https://github.com/dry-rb/dry-types/compare/v1.5.1...v1.6.0)
+
+## 1.5.1 2021-02-16
+
+
+### Fixed
+
+- Add missing requires for internal usage of `Dry::Equalizer` (@timriley in #418)
+
+
+[Compare v1.5.0...v1.5.1](https://github.com/dry-rb/dry-types/compare/v1.5.0...v1.5.1)
+
+## 1.5.0 2021-01-21
 
 
 ### Added

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/README.md

@@ -1,3 +1,4 @@
+<!--- this file is synced from dry-rb/template-gem project -->
 [gem]: https://rubygems.org/gems/dry-types
 [actions]: https://github.com/dry-rb/dry-types/actions
 [codacy]: https://www.codacy.com/gh/dry-rb/dry-types
@@ -10,19 +11,19 @@
 [![CI Status](https://github.com/dry-rb/dry-types/workflows/ci/badge.svg)][actions]
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/f2d71613195f4da993acb9ac9d6ea336)][codacy]
 [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/f2d71613195f4da993acb9ac9d6ea336)][codacy]
-[![Inline docs](http://inch-ci.org/github/dry-rb/dry-types.svg?branch=master)][inchpages]
+[![Inline docs](http://inch-ci.org/github/dry-rb/dry-types.svg?branch=main)][inchpages]
 
 ## Links
 
-* [User documentation](http://dry-rb.org/gems/dry-types)
+* [User documentation](https://dry-rb.org/gems/dry-types)
 * [API documentation](http://rubydoc.info/gems/dry-types)
 
 ## Supported Ruby versions
 
 This library officially supports the following Ruby versions:
 
-* MRI >= `2.5`
-* jruby >= `9.2`
+* MRI `>= 2.7.0`
+* jruby `>= 9.3` (postponed until 2.7 is supported)
 
 ## License
 

data/dry-types.gemspec

@@ -1,38 +1,40 @@
 # frozen_string_literal: true
-# this file is managed by dry-rb/devtools project
 
-lib = File.expand_path('lib', __dir__)
+# this file is synced from dry-rb/template-gem project
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'dry/types/version'
+require "dry/types/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'dry-types'
+  spec.name          = "dry-types"
   spec.authors       = ["Piotr Solnica"]
   spec.email         = ["piotr.solnica@gmail.com"]
-  spec.license       = 'MIT'
+  spec.license       = "MIT"
   spec.version       = Dry::Types::VERSION.dup
 
   spec.summary       = "Type system for Ruby supporting coercions, constraints and complex types like structs, value objects, enums etc"
   spec.description   = spec.summary
-  spec.homepage      = 'https://dry-rb.org/gems/dry-types'
+  spec.homepage      = "https://dry-rb.org/gems/dry-types"
   spec.files         = Dir["CHANGELOG.md", "LICENSE", "README.md", "dry-types.gemspec", "lib/**/*"]
-  spec.bindir        = 'bin'
+  spec.bindir        = "bin"
   spec.executables   = []
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
-  spec.metadata['changelog_uri']     = 'https://github.com/dry-rb/dry-types/blob/master/CHANGELOG.md'
-  spec.metadata['source_code_uri']   = 'https://github.com/dry-rb/dry-types'
-  spec.metadata['bug_tracker_uri']   = 'https://github.com/dry-rb/dry-types/issues'
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-types/blob/main/CHANGELOG.md"
+  spec.metadata["source_code_uri"]   = "https://github.com/dry-rb/dry-types"
+  spec.metadata["bug_tracker_uri"]   = "https://github.com/dry-rb/dry-types/issues"
 
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   # to update dependencies edit project.yml
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
   spec.add_runtime_dependency "dry-container", "~> 0.3"
-  spec.add_runtime_dependency "dry-core", "~> 0.5", ">= 0.5"
+  spec.add_runtime_dependency "dry-core", "~> 0.9", ">= 0.9"
   spec.add_runtime_dependency "dry-inflector", "~> 0.1", ">= 0.1.2"
-  spec.add_runtime_dependency "dry-logic", "~> 1.0", ">= 1.0.2"
+  spec.add_runtime_dependency "dry-logic", "~> 1.3", ">= 1.3"
+  spec.add_runtime_dependency "zeitwerk", "~> 2.6"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "dry-monads", "~> 1.0"

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/constructor"
-
 module Dry
   module Types
     # @api public

data/lib/dry/types/array/member.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/array/constructor"
-
 module Dry
   module Types
     class Array < Nominal
@@ -72,7 +70,7 @@ module Dry
         # @return [Result,Logic::Result]
         #
         # @api public
-        def try(input, &block)
+        def try(input, &block) # rubocop:disable Metrics/PerceivedComplexity
           if primitive?(input)
             output = []
 

data/lib/dry/types/array.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/array/member"
-require "dry/types/array/constructor"
-
 module Dry
   module Types
     # Array type can be used to define an array with optional member type

data/lib/dry/types/builder.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-
 module Dry
   module Types
     # Common API for building types and composition
@@ -76,7 +74,7 @@ module Dry
             " value every time. Call `.freeze` when setting the default"\
             " or pass `shared: true` to discard this warning."\
             "\n#{where}",
-            tag: :'dry-types'
+            tag: :"dry-types"
           )
         end
 
@@ -105,7 +103,7 @@ module Dry
           if values.length == 1 && values[0].is_a?(::Hash)
             values[0]
           else
-            ::Hash[values.zip(values)]
+            values.zip(values).to_h
           end
 
         Enum.new(constrained(included_in: mapping.keys), mapping: mapping)
@@ -147,7 +145,7 @@ module Dry
       # @return [Constructor]
       #
       # @api public
-      def fallback(value = Undefined, shared: false, &_fallback)
+      def fallback(value = Undefined, shared: false, &_fallback) # rubocop:disable Metrics/PerceivedComplexity
         if Undefined.equal?(value) && !block_given?
           raise ::ArgumentError, "fallback value or a block must be given"
         end
@@ -167,7 +165,7 @@ module Dry
             " value every time. Call `.freeze` when setting the fallback"\
             " or pass `shared: true` to discard this warning."\
             "\n#{where}",
-            tag: :'dry-types'
+            tag: :"dry-types"
           )
         end
 
@@ -184,9 +182,3 @@ module Dry
     end
   end
 end
-
-require "dry/types/default"
-require "dry/types/constrained"
-require "dry/types/enum"
-require "dry/types/lax"
-require "dry/types/sum"

data/lib/dry/types/builder_methods.rb

@@ -80,7 +80,7 @@ module Dry
       # @param [#call,nil] block Value constructor
       #
       # @return [Dry::Types::Type]
-      def Constructor(klass, cons = nil, &block)
+      def Constructor(klass, cons = nil, &block) # rubocop:disable Metrics/PerceivedComplexity:
         if klass.is_a?(Type)
           if cons || block
             klass.constructor(cons || block)

data/lib/dry/types/coercions/params.rb

@@ -12,9 +12,10 @@ module Dry
       module Params
         TRUE_VALUES = %w[1 on On ON t true True TRUE T y yes Yes YES Y].freeze
         FALSE_VALUES = %w[0 off Off OFF f false False FALSE F n no No NO N].freeze
-        BOOLEAN_MAP = ::Hash[
-          TRUE_VALUES.product([true]) + FALSE_VALUES.product([false])
-        ].merge(true => true, false => false).freeze
+        BOOLEAN_MAP = EMPTY_HASH.merge(
+          [true, *TRUE_VALUES].to_h { |v| [v, true] },
+          [false, *FALSE_VALUES].to_h { |v| [v, false] }
+        ).freeze
 
         extend Coercions
 

data/lib/dry/types/compat.rb

@@ -0,0 +1 @@
+# frozen_string_literal: true

data/lib/dry/types/compiler.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-
 module Dry
   module Types
     # @api private
     class Compiler
-      extend ::Dry::Core::Deprecations[:'dry-types']
+      extend ::Dry::Core::Deprecations[:"dry-types"]
 
       attr_reader :registry
 

data/lib/dry/types/constrained.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/decorator"
-require "dry/types/constraints"
-require "dry/types/constrained/coercible"
-
 module Dry
   module Types
     # Constrained types apply rules to the input

data/lib/dry/types/constraints.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/logic/rule_compiler"
-require "dry/logic/predicates"
-require "dry/logic/rule/predicate"
-
 module Dry
   # Helper methods for constraint types
   #
@@ -17,8 +13,8 @@ module Dry
     def self.Rule(options)
       rule_compiler.(
         options.map { |key, val|
-          Logic::Rule::Predicate.build(
-            Logic::Predicates[:"#{key}?"]
+          ::Dry::Logic::Rule::Predicate.build(
+            ::Dry::Logic::Predicates[:"#{key}?"]
           ).curry(val).to_ast
         }
       ).reduce(:and)
@@ -28,7 +24,7 @@ module Dry
     #
     # @api private
     def self.rule_compiler
-      @rule_compiler ||= Logic::RuleCompiler.new(Logic::Predicates)
+      @rule_compiler ||= ::Dry::Logic::RuleCompiler.new(::Dry::Logic::Predicates)
     end
   end
 end

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

@@ -61,17 +61,17 @@ module Dry
                 ::Module.new do
                   if safe
                     module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
-                      def call(input, &block)
-                        @target.#{method}(input, &block)
-                      end
+                      def call(input, &block)              # def call(input, &block)
+                        @target.#{method}(input, &block)   #   @target.coerve(input, &block)
+                      end                                  # end
                     RUBY
                   else
                     module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
-                      def call(input, &block)
-                        @target.#{method}(input)
-                      rescue ::NoMethodError, ::TypeError, ::ArgumentError => error
-                        CoercionError.handle(error, &block)
-                      end
+                      def call(input, &block)                                        # def call(input, &block)
+                        @target.#{method}(input)                                     #   @target.coerce(input)
+                      rescue ::NoMethodError, ::TypeError, ::ArgumentError => error  # rescue ::NoMethodError, ::TypeError, ::ArgumentError => error
+                        CoercionError.handle(error, &block)                          #   CoercionError.handle(error, &block)
+                      end                                                            # end
                     RUBY
                   end
                 end

data/lib/dry/types/constructor.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/fn_container"
-require "dry/types/constructor/function"
-require "dry/types/constructor/wrapper"
-
 module Dry
   module Types
     # Constructor types apply a function to the input that is supposed to return
@@ -48,13 +44,12 @@ module Dry
 
       # @api private
       def self.wrapper_type
-        @wrapper_type ||= begin
+        @wrapper_type ||=
           if self < Wrapper
             self
           else
             const_set(:Wrapping, ::Class.new(self).include(Wrapper))
           end
-        end
       end
 
       # Instantiate a new constructor type instance
@@ -190,7 +185,7 @@ module Dry
         if type.respond_to?(method)
           response = type.public_send(method, *args, &block)
 
-          if response.is_a?(Type) && type.class.equal?(response.class)
+          if response.is_a?(Type) && response.instance_of?(type.class)
             response.constructor_type[response, **options]
           else
             response

data/lib/dry/types/core.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/any"
-
 module Dry
   module Types
     # Primitives with {Kernel} coercion methods
@@ -60,7 +58,8 @@ module Dry
 
     # Register {KERNEL_COERCIBLE} types
     KERNEL_COERCIBLE.each do |name, primitive|
-      register("coercible.#{name}", self["nominal.#{name}"].constructor(Kernel.method(primitive.name)))
+      register("coercible.#{name}",
+               self["nominal.#{name}"].constructor(Kernel.method(primitive.name)))
     end
 
     # Register {METHOD_COERCIBLE} types

data/lib/dry/types/decorator.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/options"
-
 module Dry
   module Types
     # Common API for types

data/lib/dry/types/default.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/decorator"
-
 module Dry
   module Types
     # Default types are useful when a missing value should be replaced by a default one
@@ -52,7 +50,7 @@ module Dry
       # @param [Object] value
       #
       # @api private
-      def initialize(type, value, **options)
+      def initialize(type, value, **)
         super
         @value = value
       end
@@ -64,8 +62,8 @@ module Dry
       # @return [Default]
       #
       # @api public
-      def constrained(*args)
-        type.constrained(*args).default(value)
+      def constrained(...)
+        type.constrained(...).default(value)
       end
 
       # @return [true]

data/lib/dry/types/enum.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/decorator"
-
 module Dry
   module Types
     # Enum types can be used to define an enum on top of an existing type

data/lib/dry/types/errors.rb

@@ -51,6 +51,7 @@ module Dry
 
       # @param [Array<CoercionError>] errors
       def initialize(errors)
+        super("")
         @errors = errors
       end
 
@@ -66,11 +67,22 @@ module Dry
     end
 
     class SchemaError < CoercionError
+      # @return [String, Symbol]
+      attr_reader :key
+
+      # @return [Object]
+      attr_reader :value
+
       # @param [String,Symbol] key
       # @param [Object] value
       # @param [String, #to_s] result
       def initialize(key, value, result)
-        super("#{value.inspect} (#{value.class}) has invalid type for :#{key} violates constraints (#{result} failed)")
+        @key = key
+        @value = value
+        super(
+          "#{value.inspect} (#{value.class}) has invalid type "\
+          "for :#{key} violates constraints (#{result} failed)"
+        )
       end
     end
 

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "dry/monads/maybe"
-require "dry/types/decorator"
 
 module Dry
   module Types
@@ -98,7 +97,7 @@ module Dry
     end
 
     # @api private
-    class Schema::Key
+    class Schema::Key # rubocop:disable Style/ClassAndModuleChildren
       # @api private
       def maybe
         __new__(type.maybe)

data/lib/dry/types/fn_container.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/container"
-
 module Dry
   module Types
     # Internal container for constructor functions used by the built-in types

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/constructor"
-
 module Dry
   module Types
     # Hash type exposes additional APIs for working with schema hashes
@@ -24,8 +22,8 @@ module Dry
         # @see Dry::Types::Array#of
         #
         # @api public
-        def schema(*args)
-          type.schema(*args).constructor(fn, meta: meta)
+        def schema(...)
+          type.schema(...).constructor(fn, meta: meta)
         end
       end
     end

data/lib/dry/types/hash.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/hash/constructor"
-
 module Dry
   module Types
     # Hash types can be used to define maps and schemas
@@ -132,6 +130,3 @@ module Dry
     end
   end
 end
-
-require "dry/types/schema/key"
-require "dry/types/schema"

data/lib/dry/types/lax.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-require "dry/types/decorator"
-
 module Dry
   module Types
     # Lax types rescue from type-related errors when constructors fail
@@ -68,7 +65,7 @@ module Dry
       end
     end
 
-    extend ::Dry::Core::Deprecations[:'dry-types']
+    extend ::Dry::Core::Deprecations[:"dry-types"]
     Safe = Lax
     deprecate_constant(:Safe)
   end

data/lib/dry/types/map.rb

@@ -14,15 +14,17 @@ module Dry
     #   # => {1 => 'right'}
     #
     #   type.('1' => 'wrong')
-    #   # Dry::Types::MapError: "1" violates constraints (type?(Integer, "1") AND gteq?(1, "1") AND lteq?(10, "1") failed)
+    #   # Dry::Types::MapError: "1" violates constraints (type?(Integer, "1")
+    #   #                                                 AND gteq?(1, "1")
+    #   #                                                 AND lteq?(10, "1") failed)
     #
     #   type.(11 => 'wrong')
     #   # Dry::Types::MapError: 11 violates constraints (lteq?(10, 11) failed)
     #
     # @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)
+      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)
       end
 
       # @return [Type]
@@ -100,6 +102,8 @@ module Dry
       private
 
       # @api private
+      # rubocop:disable Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/AbcSize
       def coerce(input)
         unless primitive?(input)
           return failure(
@@ -131,6 +135,8 @@ module Dry
           failure(input, MultipleError.new(failures))
         end
       end
+      # rubocop:enable Metrics/PerceivedComplexity
+      # rubocop:enable Metrics/AbcSize
     end
   end
 end

data/lib/dry/types/module.rb

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-require "dry/types/builder_methods"
-
 module Dry
   module Types
     # Export types registered in a container as module constants.
     # @example
     #   module Types
-    #     include Dry::Types(:strict, :coercible, :nominal, default: :strict)
+    #     include Dry.Types(:strict, :coercible, :nominal, default: :strict)
     #   end
     #
     #   Types.constants
@@ -26,10 +23,10 @@ module Dry
         extend(BuilderMethods)
 
         if constants.key?(:Nominal)
-          singleton_class.send(:define_method, :included) do |base|
+          singleton_class.define_method(:included) do |base|
             super(base)
             base.instance_exec(const_get(:Nominal, false)) do |nominal|
-              extend Dry::Core::Deprecations[:'dry-types']
+              extend Dry::Core::Deprecations[:"dry-types"]
               const_set(:Definition, nominal)
               deprecate_constant(:Definition, message: "Nominal")
             end
@@ -38,6 +35,9 @@ module Dry
       end
 
       # @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)
           default_ns = :Strict
@@ -64,6 +64,9 @@ module Dry
           constants.update(value) if key == default_ns
         end
       end
+      # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/PerceivedComplexity
 
       # @api private
       def registry_tree
@@ -91,9 +94,11 @@ module Dry
           ns.to_sym unless path.empty?
         }.compact.uniq
 
-        (referenced.uniq - known).each do |name|
+        unknown = (referenced.uniq - known).first
+
+        if unknown
           raise ArgumentError,
-                "#{name.inspect} is not a known type namespace. "\
+                "#{unknown.inspect} is not a known type namespace. "\
                 "Supported options are #{known.map(&:inspect).join(", ")}"
         end
       end

data/lib/dry/types/nominal.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-require "dry/types/builder"
-require "dry/types/result"
-require "dry/types/options"
-require "dry/types/meta"
-
 module Dry
   module Types
     # Nominal types define a primitive class and do not apply any constructors or constraints
@@ -19,7 +13,7 @@ module Dry
       include Meta
       include Builder
       include Printable
-      include Dry::Equalizer(:primitive, :options, :meta, inspect: false, immutable: true)
+      include ::Dry::Equalizer(:primitive, :options, :meta, inspect: false, immutable: true)
 
       # @return [Class]
       attr_reader :primitive
@@ -198,12 +192,8 @@ module Dry
       end
     end
 
-    extend Dry::Core::Deprecations[:'dry-types']
+    extend ::Dry::Core::Deprecations[:"dry-types"]
     Definition = Nominal
     deprecate_constant(:Definition, message: "Nominal")
   end
 end
-
-require "dry/types/array"
-require "dry/types/hash"
-require "dry/types/map"

data/lib/dry/types/predicate_inferrer.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/cache"
-require "dry/core/class_attributes"
-require "dry/types/predicate_registry"
-
 module Dry
   module Types
     # PredicateInferrer returns the list of predicates used by a type.
@@ -55,7 +51,7 @@ module Dry
         end
 
         # @api private
-        def infer_predicate(type)
+        def infer_predicate(type) # rubocop:disable Metrics/PerceivedComplexity
           pred = TYPE_TO_PREDICATE.fetch(type) do
             if type.name.nil? || self.class.infer_predicate_by_class_name.equal?(false)
               nil
@@ -175,9 +171,9 @@ module Dry
         def visit_predicate(node)
           pred, args = node
 
-          if pred.equal?(:type?)
+          if pred.equal?(:type?) || !registry.key?(pred)
             EMPTY_ARRAY
-          elsif registry.key?(pred)
+          else
             *curried, _ = args
             values = curried.map { |_, v| v }
 
@@ -186,8 +182,6 @@ module Dry
             else
               [pred => values[0]]
             end
-          else
-            EMPTY_ARRAY
           end
         end
 

data/lib/dry/types/predicate_registry.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/logic/predicates"
-
 module Dry
   module Types
     # A registry with predicate objects from `Dry::Logic::Predicates`
@@ -14,21 +12,36 @@ module Dry
       # @api private
       attr_reader :has_predicate
 
-      # @api private
-      def initialize(predicates = Logic::Predicates)
-        @predicates = predicates
-        @has_predicate = ::Kernel.instance_method(:respond_to?).bind(@predicates)
+      KERNEL_RESPOND_TO = ::Kernel.instance_method(:respond_to?)
+      private_constant(:KERNEL_RESPOND_TO)
+
+      if ::UnboundMethod.method_defined?(:bind_call)
+        # @api private
+        def initialize(predicates = Logic::Predicates)
+          @predicates = predicates
+        end
+
+        # @api private
+        def key?(name)
+          KERNEL_RESPOND_TO.bind_call(@predicates, name)
+        end
+      else
+        # @api private
+        def initialize(predicates = Logic::Predicates)
+          @predicates = predicates
+          @has_predicate = KERNEL_RESPOND_TO.bind(@predicates)
+        end
+
+        # @api private
+        def key?(name)
+          has_predicate.(name)
+        end
       end
 
       # @api private
       def [](name)
         predicates[name]
       end
-
-      # @api private
-      def key?(name)
-        has_predicate.(name)
-      end
     end
   end
 end

data/lib/dry/types/primitive_inferrer.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/cache"
-
 module Dry
   module Types
     # PrimitiveInferrer returns the list of classes matching a type.

data/lib/dry/types/printer.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 module Dry
+  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/PerceivedComplexity
   module Types
     # @api private
     class Printer
-      MAPPING = {
+      MAPPING = { # rubocop:disable Style/MutableConstant
         Nominal => :visit_nominal,
         Constructor => :visit_constructor,
         Constrained => :visit_constrained,
@@ -94,13 +96,13 @@ module Dry
 
         strict_str = "strict " if options.delete(:strict)
 
-        if key_fn = options.delete(:key_transform_fn)
+        if (key_fn = options.delete(:key_transform_fn))
           visit_callable(key_fn) do |fn|
             key_fn_str = "key_fn=#{fn} "
           end
         end
 
-        if type_fn = options.delete(:type_transform_fn)
+        if (type_fn = options.delete(:type_transform_fn))
           visit_callable(type_fn) do |fn|
             type_fn_str = "type_fn=#{fn} "
           end
@@ -109,7 +111,7 @@ module Dry
         keys = options.delete(:keys)
 
         visit_options(options, schema.meta) do |opts|
-          opts = "#{opts[1..-1]} " unless opts.empty?
+          opts = "#{opts[1..]} " unless opts.empty?
           schema_parameters = "#{key_fn_str}#{type_fn_str}#{strict_str}#{opts}"
 
           header = "Schema<#{schema_parameters}keys={"
@@ -236,7 +238,7 @@ module Dry
         options = hash.options.dup
         type_fn_str = ""
 
-        if type_fn = options.delete(:type_transform_fn)
+        if (type_fn = options.delete(:type_transform_fn))
           visit_callable(type_fn) do |fn|
             type_fn_str = "type_fn=#{fn}"
           end
@@ -263,9 +265,9 @@ module Dry
           if line&.zero?
             yield ".#{path}"
           elsif path
-            yield "#{path.sub(Dir.pwd + "/", EMPTY_STRING)}:#{line}"
+            yield "#{path.sub("#{Dir.pwd}/", EMPTY_STRING)}:#{line}"
           else
-            match = fn.to_s.match(/\A#<Proc:0x\h+\(&:(?<name>\w+)\)(:? \(lambda\))?>\z/)
+            match = fn.to_s.match(/\A#<Proc:0x\h+\(&:(?<name>\w+)\)(:? \(lambda\))?>\z/) # rubocop:disable Lint/MixedRegexpCaptureTypes
 
             if match
               yield ".#{match[:name]}"
@@ -286,7 +288,7 @@ module Dry
         end
       end
 
-      def visit_options(options, meta = EMPTY_HASH)
+      def visit_options(options, meta = EMPTY_HASH) # rubocop:disable Metrics/PerceivedComplexity
         if options.empty? && meta.empty?
           yield ""
         else
@@ -312,4 +314,6 @@ module Dry
 
     PRINTER = Printer.new.freeze
   end
+  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/PerceivedComplexity
 end

data/lib/dry/types/result.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
-
 module Dry
   module Types
     # Result class used by {Type#try}

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
-require "dry/core/deprecations"
-
 module Dry
   module Types
     # Schema is a hash with explicit member types defined
@@ -15,7 +12,7 @@ module Dry
       #
       # @see Dry::Types::Schema
       class Key
-        extend ::Dry::Core::Deprecations[:'dry-types']
+        extend ::Dry::Core::Deprecations[:"dry-types"]
         include Type
         include Dry::Equalizer(:name, :type, :options, inspect: false, immutable: true)
         include Decorator

data/lib/dry/types/schema.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/fn_container"
-
 module Dry
   module Types
     # The built-in Hash type can be defined in terms of keys and associated types
@@ -92,6 +90,8 @@ module Dry
       # @return [Object] if coercion fails and a block is given
       #
       # @api public
+      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/PerceivedComplexity
       def try(input)
         if primitive?(input)
           success = true
@@ -138,6 +138,8 @@ module Dry
           failure
         end
       end
+      # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/PerceivedComplexity
 
       # @param meta [Boolean] Whether to dump the meta to the AST
       #
@@ -167,7 +169,7 @@ module Dry
       # @return [Schema]
       #
       # @api public
-      def strict(strict = true)
+      def strict(strict = true) # rubocop:disable Style/OptionalBooleanParameter
         with(strict: strict)
       end
 
@@ -368,7 +370,7 @@ module Dry
       # Try to add missing keys to the hash
       #
       # @api private
-      def resolve_missing_keys(hash, options)
+      def resolve_missing_keys(hash, options) # rubocop:disable Metrics/PerceivedComplexity
         skip_missing = options.fetch(:skip_missing, false)
         resolve_defaults = options.fetch(:resolve_defaults, true)
 

data/lib/dry/types/sum.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/options"
-require "dry/types/meta"
-
 module Dry
   module Types
     # Sum type
@@ -120,10 +117,10 @@ module Dry
 
       # @api private
       def failure(input, _error = nil)
-        if !left.valid?(input)
-          left.failure(input, left.try(input).error)
-        else
+        if left.valid?(input)
           right.failure(input, right.try(input).error)
+        else
+          left.failure(input, left.try(input).error)
         end
       end
 

data/lib/dry/types/type.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
-require "dry/core/deprecations"
-
 module Dry
   module Types
     # Common Type module denoting an object is a Type
     #
     # @api public
     module Type
-      extend ::Dry::Core::Deprecations[:'dry-types']
+      extend ::Dry::Core::Deprecations[:"dry-types"]
 
       deprecate(:safe, :lax)
 

data/lib/dry/types/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Types
-    VERSION = "1.5.0"
+    VERSION = "1.6.0"
   end
 end

data/lib/dry/types.rb

@@ -3,37 +3,58 @@
 require "bigdecimal"
 require "date"
 require "set"
+require "zeitwerk"
 
 require "concurrent/map"
 
+require "dry/core"
 require "dry/container"
-require "dry/core/extensions"
-require "dry/core/constants"
-require "dry/core/class_attributes"
-
-require "dry/types/version"
-require "dry/types/container"
-require "dry/types/inflector"
-require "dry/types/type"
-require "dry/types/printable"
-require "dry/types/nominal"
-require "dry/types/constructor"
-require "dry/types/module"
+require "dry/logic"
 
+require "dry/types/constraints"
 require "dry/types/errors"
+require "dry/types/version"
 
 module Dry
   # Main library namespace
   #
   # @api public
   module Types
-    extend Dry::Core::Extensions
-    extend Dry::Core::ClassAttributes
-    extend Dry::Core::Deprecations[:'dry-types']
-    include Dry::Core::Constants
+    extend ::Dry::Core::Extensions
+    extend ::Dry::Core::ClassAttributes
+    extend ::Dry::Core::Deprecations[:"dry-types"]
+    include ::Dry::Core::Constants
 
     TYPE_SPEC_REGEX = /(.+)<(.+)>/.freeze
 
+    def self.loader
+      @loader ||= ::Zeitwerk::Loader.new.tap do |loader|
+        root = ::File.expand_path("..", __dir__)
+        loader.tag = "dry-types"
+        loader.inflector = ::Zeitwerk::GemInflector.new("#{root}/dry-types.rb")
+        loader.inflector.inflect("json" => "JSON")
+        loader.push_dir(root)
+        loader.ignore(
+          "#{root}/dry-types.rb",
+          "#{root}/dry/types/extensions",
+          "#{root}/dry/types/spec/types.rb",
+          "#{root}/dry/types/{#{%w[
+            compat
+            constraints
+            core
+            errors
+            extensions
+            json
+            params
+            printer
+            version
+          ].join(",")}}.rb"
+        )
+      end
+    end
+
+    loader.setup
+
     # @see Dry.Types
     def self.module(*namespaces, default: :nominal, **aliases)
       ::Module.new(container, *namespaces, default: default, **aliases)
@@ -180,7 +201,7 @@ module Dry
   #
   #   module Types
   #     # imports all types as constants, uses modules for namespaces
-  #     include Dry::Types()
+  #     include Dry.Types()
   #   end
   #   # strict types are exported by default
   #   Types::Integer
@@ -191,7 +212,7 @@ module Dry
   # @example changing default types
   #
   #   module Types
-  #     include Dry::Types(default: :nominal)
+  #     include Dry.Types(default: :nominal)
   #   end
   #   Types::Integer
   #   # => #<Dry::Types[Nominal<Integer>]>
@@ -199,7 +220,7 @@ module Dry
   # @example cherry-picking namespaces
   #
   #   module Types
-  #     include Dry::Types(:strict, :coercible)
+  #     include Dry.Types(:strict, :coercible)
   #   end
   #   # cherry-picking discards default types,
   #   # provide the :default option along with the list of
@@ -208,7 +229,7 @@ module Dry
   #
   # @example custom names
   #   module Types
-  #     include Dry::Types(coercible: :Kernel)
+  #     include Dry.Types(coercible: :Kernel)
   #   end
   #   Types::Kernel::Integer
   #   # => #<Dry::Types[Constructor<Nominal<Integer> fn=Kernel.Integer>]>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-types
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2022-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -44,20 +44,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
@@ -84,20 +84,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -237,7 +251,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/dry-rb/dry-types/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/dry-rb/dry-types/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/dry-rb/dry-types
   bug_tracker_uri: https://github.com/dry-rb/dry-types/issues
 post_install_message: 
@@ -248,14 +262,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Type system for Ruby supporting coercions, constraints and complex types