tapioca 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e91a1bbe5ebcaf20ba9eef68ab2771424d8c4918f6a4e142f35980ac347e151
-  data.tar.gz: d65e59b181163aadce492d737c148486d847fcc799fd0206ca7dad865098cdb9
+  metadata.gz: 1b06e8ec67c72db19639c21a8a123ecbe7c3c58ad27eb8956d6e3772cb68dc1e
+  data.tar.gz: e8c0bb1073cc08c2fc9d7eea7b523ebe1bc87e7f162c0413e2f0f29be67481c4
 SHA512:
-  metadata.gz: b9a1e46d7097ebc4cac468b8fa6e9296d9ba1567c37504f4084ed6cda3b070009839156615499860d86e7a2e4e04436f93e6baa5711ca1569f7104033ee9202d
-  data.tar.gz: d1ebc6209ccf853eacd7f4e166e9ebc3a55e03a906febd9e3dfd6e10aac326c742bfad133b29b034ab73a7b8610be25b44a22b8939b9f54dba510226e9c7cad2
+  metadata.gz: fd44669e05b95b61ea62c3c5e7a640bc664a036418d66fad6734065caadaa52ec545408376d4e9ada732d2a976dc599b92fc374ec53ad2a1ffa247adee989acd
+  data.tar.gz: 8f6e3a4223c42f9271321b31c8f26199a9b371865041f3455b3e3350e356adaf0eca2c5d83bcec9e0247f76ed0434c1b93627e19f8c3d10893e084e5c88f7d3e

data/lib/tapioca/sorbet_ext/generic_name_patch.rb

@@ -21,47 +21,33 @@ module T
         Tapioca::Runtime::GenericTypeRegistry.register_type(constant, types)
       end
 
-      def type_member(variance = :invariant, fixed: nil, lower: nil, upper: nil, &blk)
+      def type_member(variance = :invariant, fixed: nil, lower: nil, upper: nil, &bounds_proc)
         # `T::Generic#type_member` just instantiates a `T::Type::TypeMember` instance and returns it.
         # We use that when registering the type member and then later return it from this method.
-        hash = if blk
-          blk.call
-        else
-          {
-            fixed: fixed,
-            lower: lower,
-            upper: upper,
-          }
-        end
-
         Tapioca::TypeVariableModule.new(
           T.cast(self, Module),
           Tapioca::TypeVariableModule::Type::Member,
           variance,
-          **hash,
+          fixed,
+          lower,
+          upper,
+          bounds_proc
         ).tap do |type_variable|
           Tapioca::Runtime::GenericTypeRegistry.register_type_variable(self, type_variable)
         end
       end
 
-      def type_template(variance = :invariant, fixed: nil, lower: nil, upper: nil, &blk)
+      def type_template(variance = :invariant, fixed: nil, lower: nil, upper: nil, &bounds_proc)
         # `T::Generic#type_template` just instantiates a `T::Type::TypeTemplate` instance and returns it.
         # We use that when registering the type template and then later return it from this method.
-        hash = if blk
-          blk.call
-        else
-          {
-            fixed: fixed,
-            lower: lower,
-            upper: upper,
-          }
-        end
-
         Tapioca::TypeVariableModule.new(
           T.cast(self, Module),
           Tapioca::TypeVariableModule::Type::Template,
           variance,
-          **hash,
+          fixed,
+          lower,
+          upper,
+          bounds_proc
         ).tap do |type_variable|
           Tapioca::Runtime::GenericTypeRegistry.register_type_variable(self, type_variable)
         end
@@ -136,18 +122,31 @@ module Tapioca
       end
     end
 
+    # rubocop:disable Metrics/ParameterLists
     sig do
-      params(context: Module, type: Type, variance: Symbol, fixed: T.untyped, lower: T.untyped, upper: T.untyped).void
+      params(
+        context: Module,
+        type: Type,
+        variance: Symbol,
+        fixed: T.untyped,
+        lower: T.untyped,
+        upper: T.untyped,
+        bounds_proc: T.nilable(T.proc.returns(T::Hash[Symbol, T.untyped]))
+      ).void
     end
-    def initialize(context, type, variance, fixed: nil, lower: nil, upper: nil)
+    def initialize(context, type, variance, fixed, lower, upper, bounds_proc)
       @context = context
       @type = type
       @variance = variance
-      @fixed = fixed
-      @lower = lower
-      @upper = upper
+      @bounds_proc = if bounds_proc
+        bounds_proc
+      else
+        build_bounds_proc(fixed, lower, upper)
+      end
+
       super()
     end
+    # rubocop:enable Metrics/ParameterLists
 
     sig { returns(T.nilable(String)) }
     def name
@@ -170,9 +169,10 @@ module Tapioca
 
     sig { returns(String) }
     def serialize
-      fixed = @fixed.to_s if @fixed
-      upper = @upper.to_s if @upper
-      lower = @lower.to_s if @lower
+      bounds = @bounds_proc.call
+      fixed = bounds[:fixed].to_s if bounds.key?(:fixed)
+      lower = bounds[:lower].to_s if bounds.key?(:lower)
+      upper = bounds[:upper].to_s if bounds.key?(:upper)
 
       TypeVariableHelper.serialize_type_variable(
         @type.serialize,
@@ -190,6 +190,19 @@ module Tapioca
 
     private
 
+    sig do
+      params(fixed: T.untyped, lower: T.untyped, upper: T.untyped)
+        .returns(T.proc.returns(T::Hash[Symbol, T.untyped]))
+    end
+    def build_bounds_proc(fixed, lower, upper)
+      bounds = {}
+      bounds[:fixed] = fixed unless fixed.nil?
+      bounds[:lower] = lower unless lower.nil?
+      bounds[:upper] = upper unless upper.nil?
+
+      -> { bounds }
+    end
+
     sig do
       type_parameters(:Result)
         .params(block: T.proc.returns(T.type_parameter(:Result)))

data/lib/tapioca/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Tapioca
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler