sorbet-runtime 0.5.9267 → 0.5.9291

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ed2af794518a54686c8a19decce01e150f1403f21cdc5e655d3bdba9508bf4b
-  data.tar.gz: 7e119b3388be6f114273164db1b6afe0dd1c43eb31b03934cf958081fb3d8ae0
+  metadata.gz: 96fecd9fed07a4fc62f4c1d6919ffb8309ad93dd6bc6fb1fff54a7dbc6a62c3e
+  data.tar.gz: 077f2995f9722bd657d44b2e8fedba0766808cbc117b12dd8294450c1acae8d2
 SHA512:
-  metadata.gz: b9bd6299ed1aa59bc85d4ee0d5311510109e0b350a0f08329214a95128c0a716d4129873268f265c72694e6b5b31fbaa3190ec10cbf94e0124e7dacdd53203aa
-  data.tar.gz: '0586deb12fcf163ff9d820a55b76d0e41d35d5b470eb3b85e48c09aad152fce40ade6eab3fa3ac67a6982e63adff862b65ef2dc55ee15bf202d691a8be3e965c'
+  metadata.gz: 5d83e6803524f46463e431e1b867b003d6e1f99a21ee4564b0157e95c8315b75900c7d89caf0f8866279234b4ee5b9cd427b4ab0b8cfdd833b7f047c1ac52836
+  data.tar.gz: 705e848b18ea78e783a1f8794a53f3eb676cabfa17438e48a6d671185084eb9165a2a27e4e8e1916e0757f4ca475b4b0d2dec02678519a943df965c68ea94974

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/props/decorator.rb

@@ -61,7 +61,6 @@ class T::Props::Decorator
   VALID_RULE_KEYS = T.let(%i[
     enum
     foreign
-    foreign_hint_only
     ifunset
     immutable
     override
@@ -359,12 +358,7 @@ class T::Props::Decorator
     # get at the property (e.g., Chalk::ODM::Document exposes `get` and `set`).
     define_getter_and_setter(name, rules) unless rules[:without_accessors]
 
-    if rules[:foreign] && rules[:foreign_hint_only]
-      raise ArgumentError.new(":foreign and :foreign_hint_only are mutually exclusive.")
-    end
-
     handle_foreign_option(name, cls, rules, rules[:foreign]) if rules[:foreign]
-    handle_foreign_hint_only_option(name, cls, rules[:foreign_hint_only]) if rules[:foreign_hint_only]
     handle_redaction_option(name, rules[:redaction]) if rules[:redaction]
   end
 
@@ -484,42 +478,6 @@ class T::Props::Decorator
     end
   end
 
-  sig do
-    params(
-      prop_name: Symbol,
-      prop_cls: Module,
-      foreign_hint_only: T.untyped,
-    )
-    .void
-  end
-  private def handle_foreign_hint_only_option(prop_name, prop_cls, foreign_hint_only)
-    if ![String, Array].include?(prop_cls) && !prop_cls.is_a?(T::Props::CustomType)
-      raise ArgumentError.new(
-        "`foreign_hint_only` can only be used with String or Array prop types"
-      )
-    end
-
-    validate_foreign_option(
-      :foreign_hint_only, foreign_hint_only,
-      valid_type_msg: "an individual or array of a model class, or a Proc returning such."
-    )
-
-    unless foreign_hint_only.is_a?(Proc)
-      T::Configuration.soft_assert_handler(<<~MESSAGE, storytime: {prop: prop_name, value: foreign_hint_only}, notify: 'jerry')
-        Please use a Proc that returns a model class instead of the model class itself as the argument to `foreign_hint_only`. In other words:
-
-          instead of `prop :foo, String, foreign_hint_only: FooModel`
-          use `prop :foo, String, foreign_hint_only: -> {FooModel}`
-
-          OR
-
-          instead of `prop :foo, String, foreign_hint_only: [FooModel, BarModel]`
-          use `prop :foo, String, foreign_hint_only: -> {[FooModel, BarModel]}`
-
-      MESSAGE
-    end
-  end
-
   # checked(:never) - Rules hash is expensive to check
   sig do
     params(
@@ -598,8 +556,8 @@ class T::Props::Decorator
       # keep them from being lurky performance hits by issuing a bunch of un-batched DB queries.
       # We could potentially address that by porting over something like AmbiguousIDLoader.
       raise ArgumentError.new(
-        "Using an array for `foreign` is no longer supported. Instead, use `foreign_hint_only` " \
-        "with an array or a Proc that returns an array, e.g., foreign_hint_only: -> {[Foo, Bar]}"
+        "Using an array for `foreign` is no longer supported. Instead, please use a union type of " \
+        "token types for the prop type, e.g., T.any(Opus::Autogen::Tokens::FooModelToken, Opus::Autogen::Tokens::BarModelToken)"
       )
     end
 

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