sorbet-runtime 0.4.4602 → 0.4.4651

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 669bee02c8d49eb43e2875a57f68471811056521
-  data.tar.gz: 00f343319dc4bf60291fff125981531f47373cda
+  metadata.gz: eb29fced50e91266ad73cc771434de432387bd12
+  data.tar.gz: 9278be4e1ef30d46845e89a7647ad57a7d701966
 SHA512:
-  metadata.gz: e6d6f5672d20293f428939d370061fb036d84592d5f8fef5c8d802d80d62bb2ca94b7906078141e68773cfc355f6d26911d3ea0818ece94d32006f4634c2f20d
-  data.tar.gz: b851511665722ea42fa7fc18908c00ee3be0a0cb6f5b9ebac07c4bfc6e207bf24b38676d29b0acfcc07beefb02fa922f23fca80c724854823635f342a2ffb1e5
+  metadata.gz: 4bb1fc554bbce84f6c4989eef5d2c546c1ec77546663b19381d62ed74cae7be800c26630f9efbad29b0dd9055d036afcc333a0dab18861b8372271fd4009b545
+  data.tar.gz: 94817c53e7bd2649434f1477a7ab8107ccf1331f3757d2882fb1827a44af712cf70c9007b5634052363e00aeba1b4080cf462702a2689e88e864f7a7899aa403

data/lib/sorbet-runtime.rb

@@ -30,6 +30,7 @@ require_relative 'types/private/methods/_methods'
 require_relative 'types/sig'
 require_relative 'types/helpers'
 require_relative 'types/private/final'
+require_relative 'types/private/sealed'
 
 # The types themselves. First base classes
 require_relative 'types/types/base'
@@ -44,6 +45,7 @@ require_relative 'types/types/noreturn'
 require_relative 'types/types/proc'
 require_relative 'types/types/self_type'
 require_relative 'types/types/simple'
+require_relative 'types/types/opus_enum'
 require_relative 'types/types/type_parameter'
 require_relative 'types/types/typed_array'
 require_relative 'types/types/typed_enumerator'

data/lib/types/helpers.rb

@@ -21,7 +21,7 @@ module T::Helpers
   end
 
   def sealed!
-    Kernel.raise "TODO(jez) sealed is not implemented in the runtime yet."
+    Private::Sealed.declare(self, Kernel.caller(1..1)&.first&.split(':')&.first)
   end
 
   # Causes a mixin to also mix in class methods from the named module.

data/lib/types/private/class_utils.rb

@@ -96,9 +96,9 @@ module T::Private::ClassUtils
 
     overwritten = original_owner == mod
     T::Configuration.without_ruby_warnings do
-      T::Private::DeclState.current.skip_on_method_added = true
-      mod.send(:define_method, name, &blk) # rubocop:disable PrisonGuard/UsePublicSend
-      T::Private::DeclState.current.skip_on_method_added = false
+      T::Private::DeclState.current.without_on_method_added do
+        mod.send(:define_method, name, &blk) # rubocop:disable PrisonGuard/UsePublicSend
+      end
     end
     mod.send(original_visibility, name) # rubocop:disable PrisonGuard/UsePublicSend
     new_method = mod.instance_method(name)

data/lib/types/private/decl_state.rb

@@ -16,4 +16,15 @@ class T::Private::DeclState
   def reset!
     self.active_declaration = nil
   end
+
+  def without_on_method_added
+    begin
+      # explicit 'self' is needed here
+      old_value = self.skip_on_method_added
+      self.skip_on_method_added = true
+      yield
+    ensure
+      self.skip_on_method_added = old_value
+    end
+  end
 end

data/lib/types/private/final.rb

@@ -31,6 +31,9 @@ module T::Private::Final
     if T::AbstractUtils.abstract_module?(mod)
       raise "#{mod} was already declared as abstract and cannot be declared as final"
     end
+    if T::Private::Sealed.sealed_module?(mod)
+      raise "#{mod} was already declared as sealed 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)

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

@@ -37,9 +37,9 @@ module T::Private::Methods::CallValidation
     else
       T::Configuration.without_ruby_warnings do
         # get all the shims out of the way and put back the original method
-        T::Private::DeclState.current.skip_on_method_added = true
-        mod.send(:define_method, method_sig.method_name, original_method)
-        T::Private::DeclState.current.skip_on_method_added = false
+        T::Private::DeclState.current.without_on_method_added do
+          mod.send(:define_method, method_sig.method_name, original_method)
+        end
         mod.send(original_visibility, method_sig.method_name)
       end
     end
@@ -172,15 +172,15 @@ module T::Private::Methods::CallValidation
     has_simple_procedure_types = all_args_are_simple && method_sig.return_type.is_a?(T::Private::Types::Void)
 
     T::Configuration.without_ruby_warnings do
-      T::Private::DeclState.current.skip_on_method_added = true
-      if has_fixed_arity && has_simple_method_types && method_sig.arg_types.length < 5 && is_allowed_to_have_fast_path
-        create_validator_method_fast(mod, original_method, method_sig)
-      elsif has_fixed_arity && has_simple_procedure_types && method_sig.arg_types.length < 5 && is_allowed_to_have_fast_path
-        create_validator_procedure_fast(mod, original_method, method_sig)
-      else
-        create_validator_slow(mod, original_method, method_sig)
-      end
-      T::Private::DeclState.current.skip_on_method_added = false
+      T::Private::DeclState.current.without_on_method_added do
+        if has_fixed_arity && has_simple_method_types && method_sig.arg_types.length < 5 && is_allowed_to_have_fast_path
+          create_validator_method_fast(mod, original_method, method_sig)
+        elsif has_fixed_arity && has_simple_procedure_types && method_sig.arg_types.length < 5 && is_allowed_to_have_fast_path
+          create_validator_procedure_fast(mod, original_method, method_sig)
+        else
+          create_validator_slow(mod, original_method, method_sig)
+        end
+      end
     end
     mod.send(original_visibility, method_sig.method_name)
   end

data/lib/types/private/sealed.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+# typed: false
+
+module T::Private::Sealed
+  module NoInherit
+    def inherited(other)
+      super
+      this_line = Kernel.caller.find {|line| !line.match(/in `inherited'$/)}
+      T::Private::Sealed.validate_inheritance(this_line, self, 'inherited')
+    end
+  end
+
+  module NoIncludeExtend
+    def included(other)
+      super
+      this_line = Kernel.caller.find {|line| !line.match(/in `included'$/)}
+      T::Private::Sealed.validate_inheritance(this_line, self, 'included')
+    end
+
+    def extended(other)
+      super
+      this_line = Kernel.caller.find {|line| !line.match(/in `extended'$/)}
+      T::Private::Sealed.validate_inheritance(this_line, self, 'extended')
+    end
+  end
+
+  def self.declare(mod, decl_file)
+    if !mod.is_a?(Module)
+      raise "#{mod} is not a class or module and cannot be declared `sealed!`"
+    end
+    if sealed_module?(mod)
+      raise "#{mod} was already declared `sealed!` and cannot be re-declared `sealed!`"
+    end
+    if T::Private::Final.final_module?(mod)
+      raise "#{mod} was already declared `final!` and cannot be declared `sealed!`"
+    end
+    mod.extend(mod.is_a?(Class) ? NoInherit : NoIncludeExtend)
+    if !decl_file
+      raise "Couldn't determine declaration file for sealed class."
+    end
+    mod.instance_variable_set(:@sorbet_sealed_module_decl_file, decl_file)
+  end
+
+  def self.sealed_module?(mod)
+    mod.instance_variable_defined?(:@sorbet_sealed_module_decl_file)
+  end
+
+  def self.validate_inheritance(this_line, parent, verb)
+    this_file = this_line&.split(':').first
+    decl_file = parent.instance_variable_get(:@sorbet_sealed_module_decl_file)
+
+    if !this_file || !decl_file
+      raise "Couldn't determine enough file information for checking sealed modules"
+    end
+
+    if !this_file.start_with?(decl_file)
+      raise "#{parent} was declared sealed and can only be #{verb} in #{decl_file}, not #{this_file}"
+    end
+  end
+end

data/lib/types/types/opus_enum.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+# typed: true
+
+module T::Types
+  # Validates that an object is equal to another Opus::Enum singleton value.
+  class OpusEnum < Base
+    attr_reader :val
+
+    def initialize(val)
+      @val = val
+    end
+
+    # @override Base
+    def name
+      @val.inspect
+    end
+
+    # @override Base
+    def valid?(obj)
+      @val == obj
+    end
+
+    # @override Base
+    private def subtype_of_single?(other)
+      case other
+      when OpusEnum
+        @val == other.val
+      else
+        false
+      end
+    end
+  end
+end

data/lib/types/utils.rb

@@ -26,6 +26,8 @@ module T::Utils
       T::Types::FixedHash.new(val) # rubocop:disable PrisonGuard/UseOpusTypesShortcut
     elsif val.is_a?(T::Private::Methods::DeclBuilder)
       T::Private::Methods.finalize_proc(val.decl)
+    elsif defined?(::Opus) && defined?(::Opus::Enum) && val.is_a?(::Opus::Enum)
+      T::Types::OpusEnum.new(val) # rubocop:disable PrisonGuard/UseOpusTypesShortcut
     else
       raise "Invalid value for type constraint. Must be an #{T::Types::Base}, a " \
             "class/module, or an array. Got a `#{val.class}`."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.4.4602
+  version: 0.4.4651
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-09 00:00:00.000000000 Z
+date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -98,6 +98,7 @@ files:
 - lib/types/private/methods/signature_validation.rb
 - lib/types/private/mixins/mixins.rb
 - lib/types/private/runtime_levels.rb
+- lib/types/private/sealed.rb
 - lib/types/private/types/not_typed.rb
 - lib/types/private/types/string_holder.rb
 - lib/types/private/types/void.rb
@@ -124,6 +125,7 @@ files:
 - lib/types/types/fixed_hash.rb
 - lib/types/types/intersection.rb
 - lib/types/types/noreturn.rb
+- lib/types/types/opus_enum.rb
 - lib/types/types/proc.rb
 - lib/types/types/self_type.rb
 - lib/types/types/simple.rb