dry-types 1.6.1 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4ee8c4beedab353a6e3998fb6bf9bfe5cc61989acede9bb9dd5f5f1005d92d3
-  data.tar.gz: 1814b031b9e3de53b1a6162da3935bae8dacd04826e158b91dbcd32f367c9078
+  metadata.gz: de2177cef33e440a52114ce67514c41a77b8efabb21d6c02c225160da1aebe13
+  data.tar.gz: 29767eb8a1d0b1f776dbc780734972038fa649f27a8d864f798c738ef103ea6c
 SHA512:
-  metadata.gz: a5ab795414ca2f9ffa143e274dd7b9c606a923038422d72ebe996b20e37ff3bac29d994cf59d60d2ab6dc22e70378f461b414f945c598e8cbb7d2ece93912035
-  data.tar.gz: 5d482e5ffb8e3ec65e2651b07bb430bf596dc3cfa8bff91f8342bb332f844dbb2d083a9eb2bfdcc70c9d5785731806319c424695560d4a2713d8445d338ab5ea
+  metadata.gz: b9a87a1ba9e5897272e9a6beb699a13548acf94175cf25c080548ea50e92f84b9feef6d8cbdb94965fb2d839d9fd9ec1db17a1352f879a929b2143ecd265aa4e
+  data.tar.gz: 74453f830111bb02b2a2067c8c2f6104691d4946a8fe84b9ad6234fdc67c66697c4937a8fd722af92781c6c9d111b38b092ecb0583421b6c979cfb1cf08bf6aa

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 1.7.1 2023-02-17
+
+
+### Fixed
+
+- Warning from jruby about overwritten keyword (@flash-gordon + @klobuczek in #454)
+
+
+[Compare v1.7.0...v1.7.1](https://github.com/dry-rb/dry-types/compare/v1.7.0...v1.7.1)
+
+## 1.7.0 2022-11-04
+
+
+### Changed
+
+- This version is compatible with recently released dry-rb dependencies (@flash-gordon)
+- Updated to dry-core 1.0 (@flash-gordon + @solnic)
+- Dependency on dry-container was dropped (@flash-gordon)
+
+[Compare v1.6.1...v1.7.0](https://github.com/dry-rb/dry-types/compare/v1.6.1...v1.7.0)
+
 ## 1.6.1 2022-10-15
 
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2022 dry-rb team
+Copyright (c) 2015-2023 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,29 +1,21 @@
 <!--- 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
-[chat]: https://dry-rb.zulipchat.com
-[inchpages]: http://inch-ci.org/github/dry-rb/dry-types
 
-# dry-types [![Join the chat at https://dry-rb.zulipchat.com](https://img.shields.io/badge/dry--rb-join%20chat-%23346b7a.svg)][chat]
-
-[![Gem Version](https://badge.fury.io/rb/dry-types.svg)][gem]
-[![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=main)][inchpages]
+# dry-types [![Gem Version](https://badge.fury.io/rb/dry-types.svg)][gem] [![CI Status](https://github.com/dry-rb/dry-types/workflows/ci/badge.svg)][actions]
 
 ## Links
 
 * [User documentation](https://dry-rb.org/gems/dry-types)
 * [API documentation](http://rubydoc.info/gems/dry-types)
+* [Forum](https://discourse.dry-rb.org)
 
 ## Supported Ruby versions
 
 This library officially supports the following Ruby versions:
 
 * MRI `>= 2.7.0`
-* jruby `>= 9.3` (postponed until 2.7 is supported)
+* jruby `>= 9.4` (not tested on CI)
 
 ## License
 

data/dry-types.gemspec

@@ -30,14 +30,12 @@ Gem::Specification.new do |spec|
 
   # 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.9", ">= 0.9"
-  spec.add_runtime_dependency "dry-inflector", "~> 0.1", ">= 0.1.2"
-  spec.add_runtime_dependency "dry-logic", "~> 1.3", ">= 1.3"
+  spec.add_runtime_dependency "dry-core", "~> 1.0"
+  spec.add_runtime_dependency "dry-inflector", "~> 1.0"
+  spec.add_runtime_dependency "dry-logic", "~> 1.4"
   spec.add_runtime_dependency "zeitwerk", "~> 2.6"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "dry-monads", "~> 1.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "yard"

data/lib/dry/types/builder.rb

@@ -5,6 +5,7 @@ module Dry
     # Common API for building types and composition
     #
     # @api public
+    # rubocop:disable Metrics/ModuleLength
     module Builder
       include Dry::Core::Constants
 
@@ -30,8 +31,29 @@ module Dry
       #
       # @api private
       def |(other)
-        klass = constrained? && other.constrained? ? Sum::Constrained : Sum
-        klass.new(self, other)
+        compose(other, Sum)
+      end
+
+      # Compose two types into an Intersection type
+      #
+      # @param [Type] other
+      #
+      # @return [Intersection, Intersection::Constrained]
+      #
+      # @api private
+      def &(other)
+        compose(other, Intersection)
+      end
+
+      # Compose two types into an Implication type
+      #
+      # @param [Type] other
+      #
+      # @return [Implication, Implication::Constrained]
+      #
+      # @api private
+      def >(other)
+        compose(other, Implication)
       end
 
       # Turn a type into an optional type
@@ -179,6 +201,21 @@ module Dry
           end
         end
       end
+
+      private
+
+      # @api private
+      def compose(other, composition_class)
+        klass =
+          if constrained? && other.constrained?
+            composition_class::Constrained
+          else
+            composition_class
+          end
+
+        klass.new(self, other)
+      end
     end
+    # rubocop:enable Metrics/ModuleLength
   end
 end

data/lib/dry/types/composition.rb

@@ -0,0 +1,152 @@
+# frozen_string_literal: true
+
+require "dry/core/equalizer"
+require "dry/types/options"
+require "dry/types/meta"
+
+module Dry
+  module Types
+    module Composition
+      include Type
+      include Builder
+      include Options
+      include Meta
+      include Printable
+      include Dry::Equalizer(:left, :right, :options, :meta, inspect: false, immutable: true)
+
+      # @return [Type]
+      attr_reader :left
+
+      # @return [Type]
+      attr_reader :right
+
+      module Constrained
+        def rule
+          left.rule.public_send(self.class.operator, right.rule)
+        end
+
+        def constrained?
+          true
+        end
+      end
+
+      def self.included(base)
+        composition_name = Inflector.demodulize(base)
+        ast_type = Inflector.underscore(composition_name).to_sym
+        base.define_singleton_method(:ast_type) { ast_type }
+        base.define_singleton_method(:composition_name) { composition_name }
+        base.const_set("Constrained", Class.new(base) { include Constrained })
+      end
+
+      # @param [Type] left
+      # @param [Type] right
+      # @param [Hash] options
+      #
+      # @api private
+      def initialize(left, right, **options)
+        super
+        @left, @right = left, right
+        freeze
+      end
+
+      # @return [String]
+      #
+      # @api public
+      def name
+        [left, right].map(&:name).join(" #{self.class.operator} ")
+      end
+
+      # @return [false]
+      #
+      # @api public
+      def default?
+        false
+      end
+
+      # @return [false]
+      #
+      # @api public
+      def constrained?
+        false
+      end
+
+      # @return [Boolean]
+      #
+      # @api public
+      def optional?
+        false
+      end
+
+      # @param [Object] input
+      #
+      # @return [Object]
+      #
+      # @api private
+      def call_unsafe(input)
+        raise NotImplementedError
+      end
+
+      # @param [Object] input
+      #
+      # @return [Object]
+      #
+      # @api private
+      def call_safe(input, &block)
+        raise NotImplementedError
+      end
+
+      # @param [Object] input
+      #
+      # @api public
+      def try(input)
+        raise NotImplementedError
+      end
+
+      # @api private
+      def success(input)
+        result = try(input)
+        if result.success?
+          result
+        else
+          raise ArgumentError, "Invalid success value '#{input}' for #{inspect}"
+        end
+      end
+
+      # @api private
+      def failure(input, _error = nil)
+        result = try(input)
+        if result.failure?
+          result
+        else
+          raise ArgumentError, "Invalid failure value '#{input}' for #{inspect}"
+        end
+      end
+
+      # @param [Object] value
+      #
+      # @return [Boolean]
+      #
+      # @api private
+      def primitive?(value)
+        raise NotImplementedError
+      end
+
+      # @see Nominal#to_ast
+      #
+      # @api public
+      def to_ast(meta: true)
+        [self.class.ast_type,
+         [left.to_ast(meta: meta), right.to_ast(meta: meta), meta ? self.meta : EMPTY_HASH]]
+      end
+
+      # Wrap the type with a proc
+      #
+      # @return [Proc]
+      #
+      # @api public
+      def to_proc
+        proc { |value| self.(value) }
+      end
+    end
+  end
+end

data/lib/dry/types/constructor.rb

@@ -22,9 +22,9 @@ module Dry
       # @param [#call, nil] block
       #
       # @api public
-      def self.new(input, **options, &block)
+      def self.new(input, fn: Undefined, **options, &block)
         type = input.is_a?(Builder) ? input : Nominal.new(input)
-        super(type, **options, fn: Function[options.fetch(:fn, block)])
+        super(type, **options, fn: Function[Undefined.default(fn, block)])
       end
 
       # @param [Builder, Object] input

data/lib/dry/types/container.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
-require "dry/container"
-
 module Dry
   module Types
     # Internal container for the built-in types
     #
     # @api private
     class Container
-      include Dry::Container::Mixin
+      include Core::Container::Mixin
     end
   end
 end

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

@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
-require "dry/monads/maybe"
+require "dry/monads"
+require "dry/monads/version"
+
+if Gem::Version.new(Dry::Monads::VERSION) < Gem::Version.new("1.5.0")
+  raise "dry-types requires dry-monads >= 1.5.0"
+end
 
 module Dry
   module Types
@@ -13,7 +18,7 @@ module Dry
       include Decorator
       include Builder
       include Printable
-      include ::Dry::Monads::Maybe::Mixin
+      include ::Dry::Monads[:maybe]
 
       # @param [Dry::Monads::Maybe, Object] input
       #

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

@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
-require "dry/monads/result"
+require "dry/monads"
+require "dry/monads/version"
+
+if Gem::Version.new(Dry::Monads::VERSION) < Gem::Version.new("1.5.0")
+  raise "dry-types requires dry-monads >= 1.5.0"
+end
 
 module Dry
   module Types
@@ -8,7 +13,7 @@ module Dry
     #
     # @api public
     class Result
-      include Dry::Monads::Result::Mixin
+      include ::Dry::Monads[:result]
 
       # Turn result into a monad
       #

data/lib/dry/types/hash.rb

@@ -49,7 +49,7 @@ 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"
+              "on how to proceed with the new API https://github.com/dry-rb/dry-types/blob/main/CHANGELOG.md"
       end
       alias_method :permissive, :weak
       alias_method :strict, :weak

data/lib/dry/types/implication.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Dry
+  module Types
+    # Implication type
+    #
+    # @api public
+    class Implication
+      include Composition
+
+      def self.operator
+        :>
+      end
+
+      # @param [Object] input
+      #
+      # @return [Object]
+      #
+      # @api private
+      def call_unsafe(input)
+        if left.try(input).success?
+          right.call_unsafe(input)
+        else
+          input
+        end
+      end
+
+      # @param [Object] input
+      #
+      # @return [Object]
+      #
+      # @api private
+      def call_safe(input, &block)
+        if left.try(input).success?
+          right.call_safe(input, &block)
+        else
+          input
+        end
+      end
+
+      # @param [Object] input
+      #
+      # @api public
+      def try(input)
+        if left.try(input).success?
+          right.try(input)
+        else
+          Result::Success.new(input)
+        end
+      end
+
+      # @param [Object] value
+      #
+      # @return [Boolean]
+      #
+      # @api private
+      def primitive?(value)
+        if left.primitive?(value)
+          right.primitive?(value)
+        else
+          true
+        end
+      end
+    end
+  end
+end

data/lib/dry/types/intersection.rb

@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+require "dry/core/equalizer"
+require "dry/types/options"
+require "dry/types/meta"
+
+module Dry
+  module Types
+    # Intersection type
+    #
+    # @api public
+    class Intersection
+      include Composition
+
+      def self.operator
+        :&
+      end
+
+      # @param [Object] input
+      #
+      # @return [Object]
+      #
+      # @api private
+      def call_unsafe(input)
+        merge_results(left.call_unsafe(input), right.call_unsafe(input))
+      end
+
+      # @param [Object] input
+      #
+      # @return [Object]
+      #
+      # @api private
+      def call_safe(input, &block)
+        try_sides(input, &block).input
+      end
+
+      # @param [Object] input
+      #
+      # @api public
+      def try(input)
+        try_sides(input) do |failure|
+          if block_given?
+            yield(failure)
+          else
+            failure
+          end
+        end
+      end
+
+      # @param [Object] value
+      #
+      # @return [Boolean]
+      #
+      # @api private
+      def primitive?(value)
+        left.primitive?(value) && right.primitive?(value)
+      end
+
+      private
+
+      # @api private
+      def try_sides(input, &block)
+        results = []
+
+        [left, right].each do |side|
+          result = try_side(side, input, &block)
+          return result if result.failure?
+
+          results << result
+        end
+
+        Result::Success.new(merge_results(*results.map(&:input)))
+      end
+
+      # @api private
+      def try_side(side, input)
+        failure = nil
+
+        result = side.try(input) do |f|
+          failure = f
+          yield(f)
+        end
+
+        if result.is_a?(Result)
+          result
+        elsif failure
+          Result::Failure.new(result, failure)
+        else
+          Result::Success.new(result)
+        end
+      end
+
+      # @api private
+      def merge_results(left_result, right_result)
+        case left_result
+        when ::Array
+          left_result
+            .zip(right_result)
+            .map { |lhs, rhs| merge_results(lhs, rhs) }
+        when ::Hash
+          left_result.merge(right_result)
+        else
+          left_result
+        end
+      end
+    end
+  end
+end

data/lib/dry/types/predicate_registry.rb

@@ -15,27 +15,14 @@ module Dry
       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 initialize(predicates = Logic::Predicates)
+        @predicates = predicates
+      end
 
-        # @api private
-        def key?(name)
-          has_predicate.(name)
-        end
+      # @api private
+      def key?(name)
+        KERNEL_RESPOND_TO.bind_call(@predicates, name)
       end
 
       # @api private

data/lib/dry/types/printer/composition.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Dry
+  module Types
+    # @api private
+    class Printer
+      # @api private
+      class Composition
+        def initialize(printer, composition_class)
+          @printer = printer
+          @composition_class = composition_class
+          freeze
+        end
+
+        def visit(composition)
+          visit_constructors(composition) do |constructors|
+            @printer.visit_options(composition.options, composition.meta) do |opts|
+              yield "#{@composition_class.composition_name}<#{constructors}#{opts}>"
+            end
+          end
+        end
+
+        private
+
+        def visit_constructors(composition)
+          visit_constructor(composition.left) do |left|
+            visit_constructor(composition.right) do |right|
+              yield "#{left} #{@composition_class.operator} #{right}"
+            end
+          end
+        end
+
+        def visit_constructor(type, &block)
+          case type
+          when @composition_class
+            visit_constructors(type, &block)
+          else
+            @printer.visit(type, &block)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dry/types/printer.rb

@@ -1,17 +1,21 @@
 # frozen_string_literal: true
 
+require "dry/types/printer/composition"
+
 module Dry
   # rubocop:disable Metrics/AbcSize
   # rubocop:disable Metrics/PerceivedComplexity
   module Types
     # @api private
     class Printer
-      MAPPING = { # rubocop:disable Style/MutableConstant
+      MAPPING = {
         Nominal => :visit_nominal,
         Constructor => :visit_constructor,
-        Constrained => :visit_constrained,
-        Constrained::Coercible => :visit_constrained,
-        Hash => :visit_hash,
+        [
+          Constrained,
+          Constrained::Coercible
+        ] => :visit_constrained,
+        Types::Hash => :visit_hash,
         Schema => :visit_schema,
         Schema::Key => :visit_key,
         Map => :visit_map,
@@ -19,12 +23,22 @@ module Dry
         Array::Member => :visit_array_member,
         Lax => :visit_lax,
         Enum => :visit_enum,
-        Default => :visit_default,
-        Default::Callable => :visit_default,
-        Sum => :visit_sum,
-        Sum::Constrained => :visit_sum,
+        [Default, Default::Callable] => :visit_default,
+        [
+          Sum,
+          Sum::Constrained,
+          Intersection,
+          Intersection::Constrained,
+          Implication,
+          Implication::Constrained
+        ] => :visit_composition,
         Any.class => :visit_any
-      }
+      }.flat_map { |k, v| Array(k).map { |kk| [kk, v] } }.to_h
+
+      def initialize
+        @composition_printers = {}
+        freeze
+      end
 
       def call(type)
         output = "".dup
@@ -87,106 +101,10 @@ module Dry
         end
       end
 
-      def visit_schema(schema)
-        options = schema.options.dup
-        size = schema.count
-        key_fn_str = ""
-        type_fn_str = ""
-        strict_str = ""
-
-        strict_str = "strict " if options.delete(:strict)
-
-        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))
-          visit_callable(type_fn) do |fn|
-            type_fn_str = "type_fn=#{fn} "
-          end
-        end
-
-        keys = options.delete(:keys)
-
-        visit_options(options, schema.meta) do |opts|
-          opts = "#{opts[1..]} " unless opts.empty?
-          schema_parameters = "#{key_fn_str}#{type_fn_str}#{strict_str}#{opts}"
-
-          header = "Schema<#{schema_parameters}keys={"
-
-          if size.zero?
-            yield "#{header}}>"
-          else
-            yield header.dup << keys.map { |key|
-              visit(key) { |type| type }
-            }.join(" ") << "}>"
-          end
-        end
-      end
-
-      def visit_map(map)
-        visit(map.key_type) do |key|
-          visit(map.value_type) do |value|
-            options = map.options.dup
-            options.delete(:key_type)
-            options.delete(:value_type)
-
-            visit_options(options) do |_opts|
-              yield "Map<#{key} => #{value}>"
-            end
-          end
-        end
-      end
-
-      def visit_key(key)
-        visit(key.type) do |type|
-          if key.required?
-            yield "#{key.name}: #{type}"
-          else
-            yield "#{key.name}?: #{type}"
-          end
-        end
-      end
-
-      def visit_sum(sum)
-        visit_sum_constructors(sum) do |constructors|
-          visit_options(sum.options, sum.meta) do |opts|
-            yield "Sum<#{constructors}#{opts}>"
-          end
-        end
-      end
-
-      def visit_sum_constructors(sum)
-        case sum.left
-        when Sum
-          visit_sum_constructors(sum.left) do |left|
-            case sum.right
-            when Sum
-              visit_sum_constructors(sum.right) do |right|
-                yield "#{left} | #{right}"
-              end
-            else
-              visit(sum.right) do |right|
-                yield "#{left} | #{right}"
-              end
-            end
-          end
-        else
-          visit(sum.left) do |left|
-            case sum.right
-            when Sum
-              visit_sum_constructors(sum.right) do |right|
-                yield "#{left} | #{right}"
-              end
-            else
-              visit(sum.right) do |right|
-                yield "#{left} | #{right}"
-              end
-            end
-          end
-        end
+      def visit_composition(composition, &block)
+        klass = composition.class
+        @composition_printers[klass] = Composition.new(self, klass)
+        @composition_printers[klass].visit(composition, &block)
       end
 
       def visit_enum(enum)
@@ -234,25 +152,6 @@ module Dry
         end
       end
 
-      def visit_hash(hash)
-        options = hash.options.dup
-        type_fn_str = ""
-
-        if (type_fn = options.delete(:type_transform_fn))
-          visit_callable(type_fn) do |fn|
-            type_fn_str = "type_fn=#{fn}"
-          end
-        end
-
-        visit_options(options, hash.meta) do |opts|
-          if opts.empty? && type_fn_str.empty?
-            yield "Hash"
-          else
-            yield "Hash<#{type_fn_str}#{opts}>"
-          end
-        end
-      end
-
       def visit_callable(callable)
         fn = callable.is_a?(String) ? FnContainer[callable] : callable
 
@@ -288,6 +187,88 @@ module Dry
         end
       end
 
+      def visit_schema(schema)
+        options = schema.options.dup
+        size = schema.count
+        key_fn_str = ""
+        type_fn_str = ""
+        strict_str = ""
+
+        strict_str = "strict " if options.delete(:strict)
+
+        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))
+          visit_callable(type_fn) do |fn|
+            type_fn_str = "type_fn=#{fn} "
+          end
+        end
+
+        keys = options.delete(:keys)
+
+        visit_options(options, schema.meta) do |opts|
+          opts = "#{opts[1..]} " unless opts.empty?
+          schema_parameters = "#{key_fn_str}#{type_fn_str}#{strict_str}#{opts}"
+
+          header = "Schema<#{schema_parameters}keys={"
+
+          if size.zero?
+            yield "#{header}}>"
+          else
+            yield header.dup << keys.map { |key|
+              visit(key) { |type| type }
+            }.join(" ") << "}>"
+          end
+        end
+      end
+
+      def visit_map(map)
+        visit(map.key_type) do |key|
+          visit(map.value_type) do |value|
+            options = map.options.dup
+            options.delete(:key_type)
+            options.delete(:value_type)
+
+            visit_options(options) do |_opts|
+              yield "Map<#{key} => #{value}>"
+            end
+          end
+        end
+      end
+
+      def visit_key(key)
+        visit(key.type) do |type|
+          if key.required?
+            yield "#{key.name}: #{type}"
+          else
+            yield "#{key.name}?: #{type}"
+          end
+        end
+      end
+
+      def visit_hash(hash)
+        options = hash.options.dup
+        type_fn_str = ""
+
+        if (type_fn = options.delete(:type_transform_fn))
+          visit_callable(type_fn) do |fn|
+            type_fn_str = "type_fn=#{fn}"
+          end
+        end
+
+        visit_options(options, hash.meta) do |opts|
+          if opts.empty? && type_fn_str.empty?
+            yield "Hash"
+          else
+            yield "Hash<#{type_fn_str}#{opts}>"
+          end
+        end
+      end
+
       def visit_options(options, meta = EMPTY_HASH) # rubocop:disable Metrics/PerceivedComplexity
         if options.empty? && meta.empty?
           yield ""
@@ -312,7 +293,7 @@ module Dry
       end
     end
 
-    PRINTER = Printer.new.freeze
+    PRINTER = Printer.new
   end
   # rubocop:enable Metrics/AbcSize
   # rubocop:enable Metrics/PerceivedComplexity

data/lib/dry/types/sum.rb

@@ -6,62 +6,10 @@ module Dry
     #
     # @api public
     class Sum
-      include Type
-      include Builder
-      include Options
-      include Meta
-      include Printable
-      include Dry::Equalizer(:left, :right, :options, :meta, inspect: false, immutable: true)
+      include Composition
 
-      # @return [Type]
-      attr_reader :left
-
-      # @return [Type]
-      attr_reader :right
-
-      # @api private
-      class Constrained < Sum
-        # @return [Dry::Logic::Operations::Or]
-        def rule
-          left.rule | right.rule
-        end
-
-        # @return [true]
-        def constrained?
-          true
-        end
-      end
-
-      # @param [Type] left
-      # @param [Type] right
-      # @param [Hash] options
-      #
-      # @api private
-      def initialize(left, right, **options)
-        super
-        @left, @right = left, right
-        freeze
-      end
-
-      # @return [String]
-      #
-      # @api public
-      def name
-        [left, right].map(&:name).join(" | ")
-      end
-
-      # @return [false]
-      #
-      # @api public
-      def default?
-        false
-      end
-
-      # @return [false]
-      #
-      # @api public
-      def constrained?
-        false
+      def self.operator
+        :|
       end
 
       # @return [Boolean]
@@ -104,26 +52,6 @@ module Dry
         end
       end
 
-      # @api private
-      def success(input)
-        if left.valid?(input)
-          left.success(input)
-        elsif right.valid?(input)
-          right.success(input)
-        else
-          raise ArgumentError, "Invalid success value '#{input}' for #{inspect}"
-        end
-      end
-
-      # @api private
-      def failure(input, _error = nil)
-        if left.valid?(input)
-          right.failure(input, right.try(input).error)
-        else
-          left.failure(input, left.try(input).error)
-        end
-      end
-
       # @param [Object] value
       #
       # @return [Boolean]
@@ -149,13 +77,6 @@ module Dry
         end
       end
 
-      # @see Nominal#to_ast
-      #
-      # @api public
-      def to_ast(meta: true)
-        [:sum, [left.to_ast(meta: meta), right.to_ast(meta: meta), meta ? self.meta : EMPTY_HASH]]
-      end
-
       # @param [Hash] options
       #
       # @return [Constrained,Sum]
@@ -170,15 +91,6 @@ module Dry
           super
         end
       end
-
-      # Wrap the type with a proc
-      #
-      # @return [Proc]
-      #
-      # @api public
-      def to_proc
-        proc { |value| self.(value) }
-      end
     end
   end
 end

data/lib/dry/types/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Types
-    VERSION = "1.6.1"
+    VERSION = "1.7.1"
   end
 end

data/lib/dry/types.rb

@@ -8,7 +8,6 @@ require "zeitwerk"
 require "concurrent/map"
 
 require "dry/core"
-require "dry/container"
 require "dry/logic"
 
 require "dry/types/constraints"
@@ -41,6 +40,7 @@ module Dry
         loader.ignore(
           "#{root}/dry-types.rb",
           "#{root}/dry/types/extensions",
+          "#{root}/dry/types/printer",
           "#{root}/dry/types/spec/types.rb",
           "#{root}/dry/types/{#{%w[
             compat

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-types
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-15 00:00:00.000000000 Z
+date: 2023-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -24,80 +24,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: dry-container
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: dry-logic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -126,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: dry-monads
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +161,7 @@ files:
 - lib/dry/types/coercions/params.rb
 - lib/dry/types/compat.rb
 - lib/dry/types/compiler.rb
+- lib/dry/types/composition.rb
 - lib/dry/types/constrained.rb
 - lib/dry/types/constrained/coercible.rb
 - lib/dry/types/constraints.rb
@@ -225,7 +180,9 @@ files:
 - lib/dry/types/fn_container.rb
 - lib/dry/types/hash.rb
 - lib/dry/types/hash/constructor.rb
+- lib/dry/types/implication.rb
 - lib/dry/types/inflector.rb
+- lib/dry/types/intersection.rb
 - lib/dry/types/json.rb
 - lib/dry/types/lax.rb
 - lib/dry/types/map.rb
@@ -239,6 +196,7 @@ files:
 - lib/dry/types/primitive_inferrer.rb
 - lib/dry/types/printable.rb
 - lib/dry/types/printer.rb
+- lib/dry/types/printer/composition.rb
 - lib/dry/types/result.rb
 - lib/dry/types/schema.rb
 - lib/dry/types/schema/key.rb
@@ -269,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Type system for Ruby supporting coercions, constraints and complex types