sorbet-runtime 0.4.4446 → 0.4.4447

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a800d5e7728111e31a78225eaf32a47c00e3fed
-  data.tar.gz: e8546195bf3b79b86484089e66a78966d8cbc9ef
+  metadata.gz: 3c132d32b8c7d993430e728c4f46c2078c676510
+  data.tar.gz: 7359c29f33e709cefbf722379705e15a1ab31f74
 SHA512:
-  metadata.gz: c2cc3a61f53c8073bcbc091bb5a244059714de8ef38d4f101f5d4d626ab928cfd546a504ce6ef77d1a972b824d0fbfaffdbf11f6fd7e85b6ad8f238131fee3d2
-  data.tar.gz: 8db326b0147134aabba33d5500065d5438ed2d362fc86f90ac36c8d53318c228439ace3c4ccb194ec35d8d42991a26a63d0c2ee433867ddbd98ad9710f8abcf6
+  metadata.gz: 38f93ace75826198d0d1ad340d15fbfabad353b70ce557e35c78b6b41e80ff6f58b331fc999ea741d27182ac7696f21f43dc81a9dc0615db3b953a6ac21fa3e8
+  data.tar.gz: 43691e7d1b193dba7306b0b00c1f175b0cb24df57bcf9dab5abf2ea39b23e43eb73d8aea0c7e67ccd9a3db3e5c63d8fc5b2eda11ef159666a4f4dead2a230407

data/lib/sorbet-runtime.rb

@@ -29,6 +29,7 @@ require_relative 'types/private/runtime_levels'
 require_relative 'types/private/methods/_methods'
 require_relative 'types/sig'
 require_relative 'types/helpers'
+require_relative 'types/private/final'
 
 # The types themselves. First base classes
 require_relative 'types/types/base'

data/lib/types/helpers.rb

@@ -16,6 +16,10 @@ module T::Helpers
     Private::Abstract::Declare.declare_abstract(self, type: :interface)
   end
 
+  def final!
+    Private::Final.declare(self)
+  end
+
   # Causes a mixin to also mix in class methods from the named module.
   #
   # Nearly equivalent to

data/lib/types/private/abstract/declare.rb

@@ -9,6 +9,9 @@ module T::Private::Abstract::Declare
     if AbstractUtils.abstract_module?(mod)
       raise "#{mod.name} is already declared as abstract"
     end
+    if T::Private::Final.final_module?(mod)
+      raise "#{mod.name} was already declared as final and cannot be declared as abstract"
+    end
 
     Abstract::Data.set(mod, :can_have_abstract_methods, true)
     Abstract::Data.set(mod.singleton_class, :can_have_abstract_methods, true)

data/lib/types/private/final.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+# typed: false
+
+module T::Private::Final
+  module NoInherit
+    def inherited(arg)
+      super(arg)
+      raise "#{self.name} was declared as final and cannot be inherited"
+    end
+  end
+
+  module NoIncludeExtend
+    def included(arg)
+      super(arg)
+      raise "#{self.name} was declared as final and cannot be included"
+    end
+
+    def extended(arg)
+      super(arg)
+      raise "#{self.name} was declared as final and cannot be extended"
+    end
+  end
+
+  def self.declare(mod)
+    if !mod.is_a?(Module)
+      raise "#{mod.name} is not a class or module and cannot be declared as final with `final!`"
+    end
+    if final_module?(mod)
+      raise "#{mod.name} was already declared as final and cannot be re-declared as final"
+    end
+    if T::AbstractUtils.abstract_module?(mod)
+      raise "#{mod.name} was already declared as abstract and cannot be declared as final"
+    end
+    mod.extend(mod.is_a?(Class) ? NoInherit : NoIncludeExtend)
+    mark_as_final_module(mod)
+    mark_as_final_module(mod.singleton_class)
+    T::Private::Methods.install_hooks(mod)
+  end
+
+  def self.final_module?(mod)
+    mod.instance_variable_defined?(:@sorbet_final_module)
+  end
+
+  private_class_method def self.mark_as_final_module(mod)
+    mod.instance_variable_set(:@sorbet_final_module, true)
+    T::Private::Methods.add_module_with_final(mod)
+  end
+end

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

@@ -168,6 +168,9 @@ module T::Private::Methods
     mod = is_singleton_method ? hook_mod.singleton_class : hook_mod
     original_method = mod.instance_method(method_name)
 
+    if T::Private::Final.final_module?(mod) && (current_declaration.nil? || !current_declaration.final)
+      raise "`#{mod.name}` was declared as final but its method `#{method_name}` was not declared as final"
+    end
     _check_final_ancestors(mod, mod.ancestors, [method_name])
 
     return if current_declaration.nil?
@@ -182,6 +185,8 @@ module T::Private::Methods
     # This wrapper is very slow, so it will subsequently re-wrap with a much faster wrapper
     # (or unwrap back to the original method).
     new_method = nil
+    # this prevents us from running the final checks twice for every method def.
+    T::Private::DeclState.current.skip_next_on_method_added = true
     T::Private::ClassUtils.replace_method(mod, method_name) do |*args, &blk|
       if !T::Private::Methods.has_sig_block_for_method(new_method)
         # This should only happen if the user used alias_method to grab a handle
@@ -408,6 +413,9 @@ module T::Private::Methods
 
   private_class_method def self.install_singleton_method_added_hook(singleton_klass)
     attached = nil
+    # this prevents the final checks from triggering about singleton_method_added not being a final method even if the
+    # module is final.
+    T::Private::DeclState.current.skip_next_on_method_added = true
     original_singleton_method = T::Private::ClassUtils.replace_method(singleton_klass, :singleton_method_added) do |name|
       attached = self
       T::Private::Methods._on_method_added(self, name, is_singleton_method: true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.4.4446
+  version: 0.4.4447
 platform: ruby
 authors:
 - Stripe
@@ -75,6 +75,7 @@ files:
 - lib/types/private/class_utils.rb
 - lib/types/private/decl_state.rb
 - lib/types/private/error_handler.rb
+- lib/types/private/final.rb
 - lib/types/private/methods/_methods.rb
 - lib/types/private/methods/call_validation.rb
 - lib/types/private/methods/decl_builder.rb