dry-types-tuple 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d045e436a8d045af55c65dd3278b67ef1c07fd90971ceea8a3fa2bf7e39279d9
-  data.tar.gz: 769f6744fe426662e65f4f6c8314f4d62f41f1f73b700ab4a39d992f6faf298a
+  metadata.gz: 79f57bc1de003bce8abb343b5335af356aaec2a8a2b292ea07d5738ab26a6f34
+  data.tar.gz: cb76860dc5f9c0625fe1f31ab9977c4417329c5a9a93126bd8974d5d7dab4e09
 SHA512:
-  metadata.gz: 7ca8466bb3dfbae6b6d7265bd1f84d7c930747748476c0b1c3c7d1ee6894e08e5f753ac35dc5f6902657ad438d135b39fd31b78433983e73cb57abafb6fdf58a
-  data.tar.gz: 1a558eebab32a111fbcb8899b524cfc74a9fba7b901c98dcb4c4084cdff76847b6692fe7e21b0f31a62b01834e934ea4c1150c52a749552e05a90f923e2c7e1b
+  metadata.gz: beb9c8e509014a76d91327e3eeba59d35fb3e66f833384480ef05a63a426497e479ba0493c057fa7134cdc87117e794e88de4e84329bfed0f5ff347774f9035b
+  data.tar.gz: 882be3b1c04acaa62d974eed786521083e07ae3969c549b8612f7448dbfde6da995c1f24c048dea16bca5c60b7439053bb67a86701d0a324010ab7b35ad0c57d

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.0 2025-07-02
+
+- Better matching of sums and complex tuples by `Dry::Types[…]` inferrer.
+- Add more specs for inferrer; bit of rework in specs in general.
+
 ## 0.3.1 2025-06-26
 
 - Change minimal ruby version to 3.1

data/lib/dry/tuple/type_coercer.rb

@@ -5,14 +5,14 @@ module Dry
     module TypeCoercer
       module_function
 
-      # @overload Coercer.call(array)
+      # @overload TypeCoercer.call(array)
       #   @param array [Array<Mixed>]
-      # @overload Coercer.call(input)
+      # @overload TypeCoercer.call(input)
       #   @param tuple [Dry::Types::Tuple]
-      # @overload Coercer.call(type)
+      # @overload TypeCoercer.call(type)
       #   @param type [Dry::Types::Constrained]
       # @example Usage
-      #   Dry::Types::Tuple::Coercer.([Dry::Types['any'], Dry::Types['string']])
+      #   Dry::Tuple::TypeCoercer.([Dry::Types['any'], Dry::Types['string']])
       def call(input, returns: Undefined)
         case input when Array
           Dry::Types::Tuple.coerce(input)
@@ -27,7 +27,7 @@ module Dry
 
       # @see Tuple.coerce
       # @example Usage
-      #   Dry::Types::Tuple::Coercer[Dry::Types['any'], Dry::Types['string']]
+      #   Dry::Tuple::TypeCoercer[Dry::Types['any'], Dry::Types['string']]
       def [](*input, **opts)
         call(input, **opts)
       end

data/lib/dry/tuple/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Tuple
-    VERSION = '0.3.1'
+    VERSION = '0.4.0'
   end
 end

data/lib/dry/tuple.rb

@@ -33,14 +33,12 @@ module Dry
       @loader ||=
         ::Zeitwerk::Loader.new.tap do |loader|
           root = ::File.expand_path("..", __dir__)
-          warn root
           loader.tag = "dry-types-tuple"
           loader.inflector = ::Zeitwerk::GemInflector.new("#{root}/dry-types-tuple.rb")
           loader.push_dir root
           loader.ignore \
             "#{root}/dry-types-tuple.rb",
             "#{root}/dry/types",
-            # "#{root}/dry/tuple.rb",
             "#{root}/dry/tuple/{struct,version}.rb"
 
           if defined?(Pry)

data/lib/dry/types/tuple.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "dry/tuple"
+
 module Dry
   module Types
     # @example
@@ -221,35 +223,56 @@ module Dry
     register "coercible.tuple", nominal_tuple.constructor(Kernel.method(:Array))
     register "params.tuple", nominal_tuple.constructor(Coercions::Params.method(:to_ary))
 
-    TUPLE_PREFIX_REGEX = /(?:(?:coercible|nominal|params|strict)\.)?tuple(?=\<)/
-    TUPLE_MEMBERS_REGEX = /(?<=tuple<).+(?=>)/
-    TUPLE_MEMBERS_SCAN_REGEX = /(tuple\<(?:\g<1>\,)*\g<1>\>|\[(\g<1>)\](?=$)|[^,]+)(?=,|$)/
-    SUM_MATCH_REGEX = /((?:(?:\A|\|)(?:[^\|]+))*)\|([^\|]+)\z/
+    TUPLE_TYPE_SPEC_REGEX = /\A((?:(?:coercible|nominal|params|strict)\.)?tuple)\<(.+)\>\z/
+    TUPLE_MEMBERS_SCAN_REGEX = /(?<=\A|,)(tuple\<(?:\g<1>\,)*\g<1>\>|\[(\g<1>)\](?=$)|[^,]+)(?=,|\z)/
 
     # @api private
-    module ReferenceHook
+    # Patch for {Dry::Types.[]} inferrer, that adds support for `tuple<type,types…,[rest]>` syntax
+    # to compose {Dry::Types::Tuple} types.
+    module ReferenceHookToMatchTuple
+      # Wraps over the original method.
+      # @see Dry::Types.[]
+      # @return [Dry::Types::Type]
       def [](name)
-        case name
-        when TUPLE_PREFIX_REGEX
-          type_map.fetch_or_store(name) do
-            key = Regexp.last_match[0]
-            types =
-              name[TUPLE_MEMBERS_REGEX].
-                scan(TUPLE_MEMBERS_SCAN_REGEX).
-                map { |(type, rest)| rest.nil? ? self[type] : [self[rest]] }
-            super(key).of(*types)
+        type_map.fetch_or_store(name) do
+          if tuple_match = name.match(TUPLE_TYPE_SPEC_REGEX)
+            type_id, members = tuple_match[1..2]
+            types = members.scan(TUPLE_MEMBERS_SCAN_REGEX).map do |(type, rest)|
+              rest.nil? ? self[type] : [self[rest]]
+            end
+
+            super(type_id).of(*types)
+          else
+            super
           end
-        when SUM_MATCH_REGEX
-          type_map.fetch_or_store(name) do
-            left, right = Regexp.last_match.captures
-            self[left] | super(right)
+        end
+      end
+    end
+
+    singleton_class.prepend ReferenceHookToMatchTuple
+
+    SUM_MATCH_REGEX = /(?<=\A)(.+)\|(?!\w+[\>\],])([^\|]+)\z/
+
+    # @api private
+    # Patch for {Dry::Types.[]} inferrer, that adds support for `type|type|…` syntax
+    # to compose {Dry::Types::Sum} types.
+    module ReferenceHookToMatchSum
+      # Wraps over the previously hooked method.
+      # @see Dry::Types::ReferenceHookToMatchTuple#[]
+      # @see Dry::Types.[]
+      # @return [Dry::Types::Type]
+      def [](name)
+        type_map.fetch_or_store(name) do
+          if sum_match = name.match(SUM_MATCH_REGEX)
+            left, right = sum_match.captures
+            self[left] | self[right]
+          else
+            super
           end
-        else
-          super(name)
         end
       end
     end
 
-    singleton_class.prepend ReferenceHook
+    singleton_class.prepend ReferenceHookToMatchSum
   end
 end

data/lib/dry-types-tuple.rb

@@ -1,4 +1,3 @@
 # frozen_string_literal: true
 
-require "dry/tuple"
 require "dry/types/tuple"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-types-tuple
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Anton Semenov