sorbet-runtime 0.5.9271 → 0.5.9292

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 487c6488afdbca9a344fdc2caf3cd6afee92e621fca6460687a6f986c19fa7df
-  data.tar.gz: 7bd07b7c270d00c752e2cb317ce98ab3d9d7a2ebd7b6c7df5b6f096ad05e402c
+  metadata.gz: 8df23361dabdfad79ee3a8d712ae789c11d726c11b5c7a09a37f974bf1864e8e
+  data.tar.gz: 2b49914b3b268a89665e86457be57f08de44837a56a40532235cec70e10c56c6
 SHA512:
-  metadata.gz: bb150c4504dd1f78878df81585885beea086dd349702956d1f502b8570320adca26f9ab50d4220e0f9a99875be78075449a4d341ab2669b8c7ba883ecca60270
-  data.tar.gz: 4e8d70a61582e81ffbd711dc8261e6ae4076622e755c8132030aff572de19bbe640a78d05fe28b1782d02d64661e757488b2c007e3a7caba76825c3c55d822d0
+  metadata.gz: ded22a0b2c95f564a626c927ef3434896c8e2fc8d81c3c78a86c74403539fe40dd22b49cb97530aca1376c7ad2e935573a25b6d818ad764edf2cd7098383e1cb
+  data.tar.gz: 8756838892a91115f4b26b849e95b4e0d2281eda05fde267c38c69253f0f7518b26c140580a3d9b6613454a78a4b863e42b9fb68fdff0ef7c72ae9504f6c2557

data/lib/types/private/sealed.rb

@@ -3,11 +3,11 @@
 
 module T::Private::Sealed
   module NoInherit
-    def inherited(other)
+    def inherited(child)
       super
       this_line = Kernel.caller.find {|line| !line.match(/in `inherited'$/)}
-      T::Private::Sealed.validate_inheritance(this_line, self, 'inherited')
-      @sorbet_sealed_module_all_subclasses << other
+      T::Private::Sealed.validate_inheritance(this_line, self, child, 'inherited')
+      @sorbet_sealed_module_all_subclasses << child
     end
 
     def sealed_subclasses
@@ -20,18 +20,18 @@ module T::Private::Sealed
   end
 
   module NoIncludeExtend
-    def included(other)
+    def included(child)
       super
       this_line = Kernel.caller.find {|line| !line.match(/in `included'$/)}
-      T::Private::Sealed.validate_inheritance(this_line, self, 'included')
-      @sorbet_sealed_module_all_subclasses << other
+      T::Private::Sealed.validate_inheritance(this_line, self, child, 'included')
+      @sorbet_sealed_module_all_subclasses << child
     end
 
-    def extended(other)
+    def extended(child)
       super
       this_line = Kernel.caller.find {|line| !line.match(/in `extended'$/)}
-      T::Private::Sealed.validate_inheritance(this_line, self, 'extended')
-      @sorbet_sealed_module_all_subclasses << other
+      T::Private::Sealed.validate_inheritance(this_line, self, child, 'extended')
+      @sorbet_sealed_module_all_subclasses << child
     end
 
     def sealed_subclasses
@@ -68,12 +68,15 @@ module T::Private::Sealed
     mod.instance_variable_defined?(:@sorbet_sealed_module_decl_file)
   end
 
-  def self.validate_inheritance(this_line, parent, verb)
+  def self.validate_inheritance(this_line, parent, child, 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"
+    if !this_file
+      raise "Could not use backtrace to determine file for #{verb} child #{child}"
+    end
+    if !decl_file
+      raise "#{parent} does not seem to be a sealed module (#{verb} by #{child})"
     end
 
     if !this_file.start_with?(decl_file)

data/lib/types/types/base.rb

@@ -133,7 +133,7 @@ module T::Types
       if valid?(obj)
         nil
       else
-        "Expected type #{self.name}, got #{describe_obj(obj)}"
+        error_message(obj)
       end
     end
 
@@ -141,10 +141,14 @@ module T::Types
       if recursively_valid?(obj)
         nil
       else
-        "Expected type #{self.name}, got #{describe_obj(obj)}"
+        error_message(obj)
       end
     end
 
+    private def error_message(obj)
+      "Expected type #{self.name}, got #{describe_obj(obj)}"
+    end
+
     def validate!(obj)
       err = error_message_for_obj(obj)
       raise TypeError.new(err) if err

data/lib/types/types/simple.rb

@@ -34,6 +34,23 @@ module T::Types
       end
     end
 
+    # overrides Base
+    private def error_message(obj)
+      error_message = super(obj)
+      actual_name = obj.class.name
+
+      return error_message unless name == actual_name
+
+      <<~MSG.strip
+        #{error_message}
+
+        The expected type and received object type have the same name but refer to different constants.
+        Expected type is #{name} with object id #{@raw_type.__id__}, but received type is #{actual_name} with object id #{obj.class.__id__}.
+
+        There might be a constant reloading problem in your application.
+      MSG
+    end
+
     def to_nilable
       @nilable ||= T::Types::Union.new([self, T::Utils::Nilable::NIL_TYPE])
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.5.9271
+  version: 0.5.9292
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2021-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest