sorbet-runtime 0.5.9279 → 0.5.9287

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97e70ccff1ad31b25ca778b170ed78fc295fbfd64293fce5b40fbddf2eab7393
-  data.tar.gz: 02d10f5a30930ed5dae32d9e6dd24f1dab1baf5981f2c008f6d7f1fdad109ea5
+  metadata.gz: 53cf2740a5d62c687f1c05148c6e59546c1a0250b706a960e0e1ca998dd9c917
+  data.tar.gz: c607bcf2b4cf9382f15c4274f963bc1033a8dad286b278551a7fb52a84f4b22c
 SHA512:
-  metadata.gz: caf8dece46b93623a080f58da1aaa7e7ef193529254d59dad18dfea48cf77d42eb7fd801bc608a104ca05b138b79f896fae55adc9a24e10142f2aadd6d090077
-  data.tar.gz: bfd44f7636f86e8d10055887dfb1cc95fbe17d4600c9e4c35f929f52f83e13b49b58d6a610c468d494b16b1bb346f40aa0147485dea2712448128d152b22e54a
+  metadata.gz: 7bc3a0dc930e6f8689e041cdc129532607bc295395d190e35d15b6aff494ec9efb98a2d993042eaca6c2d1a6445ba2d5c51c1e44599837dfd39ed7cf2ba3cc98
+  data.tar.gz: 29982ffa0238b6aa91dd653d54d4bead28fb2f99ede5bac9826e758b99e6ce50e0f0f78777ab88235e8209c01c4d8ad71aae2e1a48eef514f0aa33b035e32616

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.9279
+  version: 0.5.9287
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest