sorbet-runtime 0.5.5390 → 0.5.5391

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f61e42f854cb513f79864caba36bcf2e8e3dbf8cfffda8d17233e410ef67c20
-  data.tar.gz: fc06307b8c5f290c14ea8dd10a45448d9006397ca968c541387ee6afebfbef8f
+  metadata.gz: e5bde0c41c5f150c9ffffdbd9932cf1e8eb1968c349ef8b5698462c30e2c8130
+  data.tar.gz: e0b3af80d1fa7e9fe41ffd127d840c6bbab035e2b520ca9efa8095252e73762f
 SHA512:
-  metadata.gz: 15e799375879976e7ad4b9fc8a669dba68d33b2bbedb64b39e6233b90c86d416254d45031f43048edd81631a99ef221c6029082af8d2871652a088be7d43dbb2
-  data.tar.gz: 8a8d7c807f27ac90766831e2a3b414167b99eb5e59a9b6fd4ddbd1cfb5a4caa14f931dc9e70d15c6e3e99cf9184d6aad5270dd94c8acb4b6541bff87ecdc1a96
+  metadata.gz: dfb809867db3ba5bb29f457b7bcba08ef9ab6130ed55855947df6dc7cf35741be95b1ebba221b031e4a70c3f8ad2209daf14bf915c6112a1378c111d2a4ee6f9
+  data.tar.gz: 480080a01f4be2b63b1c711fb1db44f56db5572353ca8853b5f50c0a2c235b89a506209ea2b81c6f48dd2f4003e55e13bd54685faac831426dd90d5f034ee154

data/lib/types/props/private/setter_factory.rb

@@ -31,29 +31,64 @@ module T::Props
           T::Utils::Nilable.get_underlying_type_object(rules.fetch(:type_object))
         end
         accessor_key = rules.fetch(:accessor_key)
-        raise_error = ->(val) {raise_pretty_error(klass, prop, non_nil_type, val)}
 
         # It seems like a bug that this affects the behavior of setters, but
         # some existing code relies on this behavior
         has_explicit_nil_default = rules.key?(:default) && rules.fetch(:default).nil?
 
+        # Use separate methods in order to ensure that we only close over necessary
+        # variables
         if !T::Props::Utils.need_nil_write_check?(rules) || has_explicit_nil_default
-          proc do |val|
-            if val.nil?
-              instance_variable_set(accessor_key, nil)
-            elsif non_nil_type.valid?(val)
-              instance_variable_set(accessor_key, val)
-            else
-              raise_error.call(val)
-            end
-          end
+          nilable_proc(prop, accessor_key, non_nil_type)
         else
-          proc do |val|
-            if non_nil_type.valid?(val)
-              instance_variable_set(accessor_key, val)
-            else
-              raise_error.call(val)
-            end
+          non_nil_proc(prop, accessor_key, non_nil_type)
+        end
+      end
+
+      sig do
+        params(
+          prop: Symbol,
+          accessor_key: Symbol,
+          non_nil_type: T.any(T::Types::Base, T.all(T::Props::CustomType, Module)),
+        )
+        .returns(SetterProc)
+      end
+      private_class_method def self.non_nil_proc(prop, accessor_key, non_nil_type)
+        proc do |val|
+          if non_nil_type.valid?(val)
+            instance_variable_set(accessor_key, val)
+          else
+            T::Props::Private::SetterFactory.raise_pretty_error(
+              T.unsafe(self.class),
+              prop,
+              non_nil_type,
+              val,
+            )
+          end
+        end
+      end
+
+      sig do
+        params(
+          prop: Symbol,
+          accessor_key: Symbol,
+          non_nil_type: T.any(T::Types::Base, T.all(T::Props::CustomType, Module)),
+        )
+        .returns(SetterProc)
+      end
+      private_class_method def self.nilable_proc(prop, accessor_key, non_nil_type)
+        proc do |val|
+          if val.nil?
+            instance_variable_set(accessor_key, nil)
+          elsif non_nil_type.valid?(val)
+            instance_variable_set(accessor_key, val)
+          else
+            T::Props::Private::SetterFactory.raise_pretty_error(
+              T.unsafe(self.class),
+              prop,
+              non_nil_type,
+              val,
+            )
           end
         end
       end
@@ -67,7 +102,7 @@ module T::Props
         )
         .void
       end
-      private_class_method def self.raise_pretty_error(klass, prop, type, val)
+      def self.raise_pretty_error(klass, prop, type, val)
         base_message = "Can't set #{klass.name}.#{prop} to #{val.inspect} (instance of #{val.class}) - need a #{type}"
 
         pretty_message = "Parameter '#{prop}': #{base_message}\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.5.5390
+  version: 0.5.5391
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-22 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest