sorbet-runtime 0.5.10511 → 0.5.10514

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 297eb1c7b7982c4ebf3e196c9460fc06a9d1dcae973f657787fa3a397d6b0aa1
-  data.tar.gz: 5bc20896ebcad41de731ceab2116df661702defbfe9c3857564af7d1601c3583
+  metadata.gz: fc2dd38a71b81d23d2610e3f5f9c9cac33625013e352a7daf58ebebd55e78ef0
+  data.tar.gz: fd2f55279f00607fcb7fef6495ca82e323870d2664ab921bfe2749ad085082f4
 SHA512:
-  metadata.gz: 51bffd16e4770f4d14bc35cc2308da33809ed669a156607b2d64d3c7e7b411a869dead700712d5b01736c07c51f0cf9980b4c0db82be14361b2cfed8aa3d92b2
-  data.tar.gz: 86ae3952e29b3c0c7019f75d76b180f1477c7859c76b7e8144c33937a59fddde8cab64781ac07d836f25542bddf32774ee91c3621a1f16c5bea4906ba6a9d303
+  metadata.gz: 1647c5d87016036740e44263c29b13aff039451a1dc45f879e8684820c7b833623613dffd4c3f33219f31dc1b156a0c989dd8dc0a13e2681b1a0c4a790aaed13
+  data.tar.gz: f6a68b760d3e49c5d65fbad93eb91cde28a891dff35f63002d3c3671126b38b4d4dafcad032d57c87020cd8b0199120ece613d73df2b394e36254a3a46f31f3e

data/lib/types/private/methods/_methods.rb

@@ -204,34 +204,6 @@ module T::Private::Methods
     @modules_with_final[mod.singleton_class.object_id]
   end
 
-  private_class_method def self.attr_accessor_reader?(method_name)
-    # If the method name ends with a "=", it's definitely not an attr_accessor reader
-    return false if method_name[-1] == "="
-
-    # If it was "attr_accessor" that triggered this, we should be 3 frames away from it:
-    # 3. `attr_accessor`
-    # 2. method_added hook
-    # 1. `_on_method_added`
-    # 0. `attr_accessor_reader?`
-    caller_frame = caller_locations(3, 1).first
-    return false unless caller_frame
-
-    caller_label = caller_frame.label
-    return false unless caller_label
-
-    caller_label.to_s == "attr_accessor"
-  end
-
-  private_class_method def self.declare_writer_sig_from_reader(method_name, current_declaration)
-    writer_decl = current_declaration.dup
-    # The block for the reader runs the block for the writer,
-    # but also adds the writer param with the same type as the return type.
-    writer_decl.blk = lambda do
-      instance_exec(&current_declaration.blk).params(**{method_name.to_sym => decl.returns})
-    end
-    T::Private::DeclState.current.active_declaration = writer_decl
-  end
-
   # Only public because it needs to get called below inside the replace_method blocks below.
   def self._on_method_added(hook_mod, method_name, is_singleton_method: false)
     if T::Private::DeclState.current.skip_on_method_added
@@ -257,8 +229,6 @@ module T::Private::Methods
     end
     T::Private::DeclState.current.reset!
 
-    declare_writer_sig_from_reader(method_name, current_declaration) if attr_accessor_reader?(method_name)
-
     if method_name == :method_added || method_name == :singleton_method_added
       raise(
         "Putting a `sig` on `#{method_name}` is not supported" \

data/lib/types/private/methods/call_validation.rb

@@ -59,8 +59,9 @@ module T::Private::Methods::CallValidation
 
   def self.create_validator_method(mod, original_method, method_sig, original_visibility)
     has_fixed_arity = method_sig.kwarg_types.empty? && !method_sig.has_rest && !method_sig.has_keyrest &&
-      original_method.parameters.all? {|(kind, _name)| kind == :req}
-    ok_for_fast_path = has_fixed_arity && !method_sig.bind && method_sig.arg_types.length < 5 && is_allowed_to_have_fast_path
+      original_method.parameters.all? {|(kind, _name)| kind == :req || kind == :block}
+    can_skip_block_type = method_sig.block_type.nil? || method_sig.block_type.valid?(nil)
+    ok_for_fast_path = has_fixed_arity && can_skip_block_type && !method_sig.bind && method_sig.arg_types.length < 5 && is_allowed_to_have_fast_path
 
     all_args_are_simple = ok_for_fast_path && method_sig.arg_types.all? {|_name, type| type.is_a?(T::Types::Simple)}
     simple_method = all_args_are_simple && method_sig.return_type.is_a?(T::Types::Simple)
@@ -76,6 +77,11 @@ module T::Private::Methods::CallValidation
           create_validator_procedure_medium(mod, original_method, method_sig, original_visibility)
         elsif ok_for_fast_path
           create_validator_method_medium(mod, original_method, method_sig, original_visibility)
+        elsif can_skip_block_type
+          # The Ruby VM already validates that any block passed to a method
+          # must be either `nil` or a `Proc` object, so there's no need to also
+          # have sorbet-runtime check that.
+          create_validator_slow_skip_block_type(mod, original_method, method_sig, original_visibility)
         else
           create_validator_slow(mod, original_method, method_sig, original_visibility)
         end
@@ -84,6 +90,88 @@ module T::Private::Methods::CallValidation
     end
   end
 
+  def self.create_validator_slow_skip_block_type(mod, original_method, method_sig, original_visibility)
+    T::Private::ClassUtils.def_with_visibility(mod, method_sig.method_name, original_visibility) do |*args, &blk|
+      CallValidation.validate_call_skip_block_type(self, original_method, method_sig, args, blk)
+    end
+  end
+
+  def self.validate_call_skip_block_type(instance, original_method, method_sig, args, blk)
+    # This method is called for every `sig`. It's critical to keep it fast and
+    # reduce number of allocations that happen here.
+
+    if method_sig.bind
+      message = method_sig.bind.error_message_for_obj(instance)
+      if message
+        CallValidation.report_error(
+          method_sig,
+          message,
+          'Bind',
+          nil,
+          method_sig.bind,
+          instance
+        )
+      end
+    end
+
+    # NOTE: We don't bother validating for missing or extra kwargs;
+    # the method call itself will take care of that.
+    method_sig.each_args_value_type(args) do |name, arg, type|
+      message = type.error_message_for_obj(arg)
+      if message
+        CallValidation.report_error(
+          method_sig,
+          message,
+          'Parameter',
+          name,
+          type,
+          arg,
+          caller_offset: 2
+        )
+      end
+    end
+
+    # The original method definition allows passing `nil` for the `&blk`
+    # argument, so we do not have to do any method_sig.block_type type checks
+    # of our own.
+
+    # The following line breaks are intentional to show nice pry message
+
+
+
+
+
+
+
+
+
+
+    # PRY note:
+    # this code is sig validation code.
+    # Please issue `finish` to step out of it
+
+    return_value = T::Configuration::AT_LEAST_RUBY_2_7 ? original_method.bind_call(instance, *args, &blk) : original_method.bind(instance).call(*args, &blk)
+
+    # The only type that is allowed to change the return value is `.void`.
+    # It ignores what you returned and changes it to be a private singleton.
+    if method_sig.return_type.is_a?(T::Private::Types::Void)
+      T::Private::Types::Void::VOID
+    else
+      message = method_sig.return_type.error_message_for_obj(return_value)
+      if message
+        CallValidation.report_error(
+          method_sig,
+          message,
+          'Return value',
+          nil,
+          method_sig.return_type,
+          return_value,
+        )
+      end
+      return_value
+    end
+  end
+
   def self.create_validator_slow(mod, original_method, method_sig, original_visibility)
     T::Private::ClassUtils.def_with_visibility(mod, method_sig.method_name, original_visibility) do |*args, &blk|
       CallValidation.validate_call(self, original_method, method_sig, args, blk)
@@ -125,8 +213,19 @@ module T::Private::Methods::CallValidation
       end
     end
 
-    if method_sig.block_type
-      message = method_sig.block_type.error_message_for_obj(blk)
+    # The Ruby VM already checks that `&blk` is either a `Proc` type or `nil`:
+    # https://github.com/ruby/ruby/blob/v2_7_6/vm_args.c#L1150-L1154
+    # And `T.proc` types don't (can't) do any runtime arg checking, so we can
+    # save work by simply checking that `blk` is non-nil (if the method allows
+    # `nil` for the block, it would not have used this validate_call path).
+    unless blk
+      # Have to use `&.` here, because it's technically a public API that
+      # people can _always_ call `validate_call` to validate any signature
+      # (i.e., the faster validators are merely optimizations).
+      # In practice, this only affects the first call to the method (before the
+      # optimized validators have a chance to replace the initial, slow
+      # wrapper).
+      message = method_sig.block_type&.error_message_for_obj(blk)
       if message
         CallValidation.report_error(
           method_sig,

data/lib/types/private/methods/signature.rb

@@ -58,14 +58,12 @@ class T::Private::Methods::Signature
     @defined_raw = defined_raw
 
     declared_param_names = raw_arg_types.keys
-    # If sig params are declared and there is a single parameter with a missing name
+    # If sig params are declared but there is a single parameter with a missing name
     # **and** the method ends with a "=", assume it is a writer method generated
-    # by attr_writer or attr_accessor.
-    # We fix up the parameter name in that case to be the method name without the "=".
-    if declared_param_names != [nil] && parameters == [[:req]] && method_name[-1] == "="
-      parameters = [[:req, method_name[0...-1].to_sym]]
-    end
-
+    # by attr_writer or attr_accessor
+    writer_method = declared_param_names != [nil] && parameters == [[:req]] && method_name[-1] == "="
+    # For writer methods, map the single parameter to the method name without the "=" at the end
+    parameters = [[:req, method_name[0...-1].to_sym]] if writer_method
     param_names = parameters.map {|_, name| name}
     missing_names = param_names - declared_param_names
     extra_names = declared_param_names - param_names

data/lib/types/types/enum.rb

@@ -29,7 +29,7 @@ module T::Types
 
     # overrides Base
     def name
-      "T.deprecated_enum([#{@values.map(&:inspect).join(', ')}])"
+      @name ||= "T.deprecated_enum([#{@values.map(&:inspect).join(', ')}])"
     end
 
     # overrides Base

metadata

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