dry-types-tuple 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37df5ee0299ce0e65a395a458f0284fa540f1f4c3cbc5f09ca7424a9b5ca1ca3
-  data.tar.gz: 0d83445514c90cf9381c49fb805b98d49ef2c9c6a00c776fc921ba39fda6a5d0
+  metadata.gz: 79f57bc1de003bce8abb343b5335af356aaec2a8a2b292ea07d5738ab26a6f34
+  data.tar.gz: cb76860dc5f9c0625fe1f31ab9977c4417329c5a9a93126bd8974d5d7dab4e09
 SHA512:
-  metadata.gz: e1c4fc70ed670e992613b22444d68fef3a4fcddb6459405657272099dc54caec158f3a77e20ed00df352de869e922188dcac6ba2241aecaec36d5995ae2dd234
-  data.tar.gz: 1a077702745b571a3c0c5d8ec8dd00aa1885971b054dc1b96e23a026b1b24798756e496f653eebdaad611b034ab3e0607934e4c5b75440a930e394eebeb7214c
+  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/version.rb

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

data/lib/dry/types/tuple.rb

@@ -223,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

metadata

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