sorbet-runtime 0.5.11144 → 0.5.11663

data/lib/types/types/fixed_hash.rb

@@ -5,30 +5,37 @@ module T::Types
   # Takes a hash of types. Validates each item in a hash using the type in the same position
   # in the list.
   class FixedHash < Base
-    attr_reader :types
-
     def initialize(types)
-      @types = types.transform_values {|v| T::Utils.coerce(v)}
+      @inner_types = types
+    end
+
+    def types
+      @types ||= @inner_types.transform_values {|v| T::Utils.coerce(v)}
+    end
+
+    def build_type
+      types
+      nil
     end
 
     # overrides Base
     def name
-      serialize_hash(@types)
+      serialize_hash(types)
     end
 
     # overrides Base
     def recursively_valid?(obj)
       return false unless obj.is_a?(Hash)
-      return false if @types.any? {|key, type| !type.recursively_valid?(obj[key])}
-      return false if obj.any? {|key, _| !@types[key]}
+      return false if types.any? {|key, type| !type.recursively_valid?(obj[key])}
+      return false if obj.any? {|key, _| !types[key]}
       true
     end
 
     # overrides Base
     def valid?(obj)
       return false unless obj.is_a?(Hash)
-      return false if @types.any? {|key, type| !type.valid?(obj[key])}
-      return false if obj.any? {|key, _| !@types[key]}
+      return false if types.any? {|key, type| !type.valid?(obj[key])}
+      return false if obj.any? {|key, _| !types[key]}
       true
     end
 
@@ -37,7 +44,7 @@ module T::Types
       case other
       when FixedHash
         # Using `subtype_of?` here instead of == would be unsound
-        @types == other.types
+        types == other.types
       when TypedHash
         # warning: covariant hashes
 

data/lib/types/types/intersection.rb

@@ -4,10 +4,12 @@
 module T::Types
   # Takes a list of types. Validates that an object matches all of the types.
   class Intersection < Base
-    attr_reader :types
-
     def initialize(types)
-      @types = types.flat_map do |type|
+      @inner_types = types
+    end
+
+    def types
+      @types ||= @inner_types.flat_map do |type|
         type = T::Utils.resolve_alias(type)
         if type.is_a?(Intersection)
           # Simplify nested intersections (mostly so `name` returns a nicer value)
@@ -18,19 +20,24 @@ module T::Types
       end.uniq
     end
 
+    def build_type
+      types
+      nil
+    end
+
     # overrides Base
     def name
-      "T.all(#{@types.map(&:name).compact.sort.join(', ')})"
+      "T.all(#{types.map(&:name).compact.sort.join(', ')})"
     end
 
     # overrides Base
     def recursively_valid?(obj)
-      @types.all? {|type| type.recursively_valid?(obj)}
+      types.all? {|type| type.recursively_valid?(obj)}
     end
 
     # overrides Base
     def valid?(obj)
-      @types.all? {|type| type.valid?(obj)}
+      types.all? {|type| type.valid?(obj)}
     end
 
     # overrides Base

data/lib/types/types/noreturn.rb

@@ -6,6 +6,10 @@ module T::Types
   class NoReturn < Base
     def initialize; end
 
+    def build_type
+      nil
+    end
+
     # overrides Base
     def name
       "T.noreturn"

data/lib/types/types/proc.rb

@@ -8,21 +8,31 @@ module T::Types
   # At present, we only support fixed-arity procs with no optional or
   # keyword arguments.
   class Proc < Base
-    attr_reader :arg_types
-    attr_reader :returns
-
     def initialize(arg_types, returns)
-      @arg_types = {}
-      arg_types.each do |key, raw_type|
-        @arg_types[key] = T::Utils.coerce(raw_type)
+      @inner_arg_types = arg_types
+      @inner_returns = returns
+    end
+
+    def arg_types
+      @arg_types ||= @inner_arg_types.transform_values do |raw_type|
+        T::Utils.coerce(raw_type)
       end
-      @returns = T::Utils.coerce(returns)
+    end
+
+    def returns
+      @returns ||= T::Utils.coerce(@inner_returns)
+    end
+
+    def build_type
+      arg_types
+      returns
+      nil
     end
 
     # overrides Base
     def name
       args = []
-      @arg_types.each do |k, v|
+      arg_types.each do |k, v|
         args << "#{k}: #{v.name}"
       end
       "T.proc.params(#{args.join(', ')}).returns(#{returns})"
@@ -41,7 +51,7 @@ module T::Types
           return false
         end
         arg_types.values.zip(other.arg_types.values).all? do |a, b|
-          b.subtype_of?(a)
+          !b.nil? && b.subtype_of?(a)
         end && returns.subtype_of?(other.returns)
       else
         false

data/lib/types/types/self_type.rb

@@ -8,6 +8,10 @@ module T::Types
 
     def initialize(); end
 
+    def build_type
+      nil
+    end
+
     # overrides Base
     def name
       "T.self_type"

data/lib/types/types/simple.rb

@@ -13,13 +13,22 @@ module T::Types
       @raw_type = raw_type
     end
 
+    def build_type
+      nil
+    end
+
     # overrides Base
     def name
       # Memoize to mitigate pathological performance with anonymous modules (https://bugs.ruby-lang.org/issues/11119)
       #
       # `name` isn't normally a hot path for types, but it is used in initializing a T::Types::Union,
       # and so in `T.nilable`, and so in runtime constructions like `x = T.let(nil, T.nilable(Integer))`.
+      #
+      # Care more about back compat than we do about performance here.
+      # Once 2.6 is well in the rear view mirror, we can replace this.
+      # rubocop:disable Performance/BindCall
       @name ||= (NAME_METHOD.bind(@raw_type).call || @raw_type.name).freeze
+      # rubocop:enable Performance/BindCall
     end
 
     # overrides Base

data/lib/types/types/t_enum.rb

@@ -10,6 +10,10 @@ module T::Types
       @val = val
     end
 
+    def build_type
+      nil
+    end
+
     # overrides Base
     def name
       # Strips the #<...> off, just leaving the ...

data/lib/types/types/type_parameter.rb

@@ -20,6 +20,10 @@ module T::Types
       @name = name
     end
 
+    def build_type
+      nil
+    end
+
     def self.make(name)
       cached = Private.cached_entry(name)
       return cached if cached

data/lib/types/types/type_variable.rb

@@ -19,6 +19,10 @@ module T::Types
       @variance = variance
     end
 
+    def build_type
+      nil
+    end
+
     def valid?(obj)
       true
     end

data/lib/types/types/typed_array.rb

@@ -5,7 +5,7 @@ module T::Types
   class TypedArray < TypedEnumerable
     # overrides Base
     def name
-      "T::Array[#{@type.name}]"
+      "T::Array[#{type.name}]"
     end
 
     def underlying_class
@@ -53,13 +53,18 @@ module T::Types
 
     class Untyped < TypedArray
       def initialize
-        super(T.untyped)
+        super(T::Types::Untyped::Private::INSTANCE)
       end
 
       def valid?(obj)
         obj.is_a?(Array)
       end
 
+      def freeze
+        build_type # force lazy initialization before freezing the object
+        super
+      end
+
       module Private
         INSTANCE = Untyped.new.freeze
       end

data/lib/types/types/typed_class.rb

@@ -3,15 +3,22 @@
 
 module T::Types
   class TypedClass < T::Types::Base
-    attr_reader :type
-
     def initialize(type)
-      @type = T::Utils.coerce(type)
+      @inner_type = type
+    end
+
+    def type
+      @type ||= T::Utils.coerce(@inner_type)
+    end
+
+    def build_type
+      type
+      nil
     end
 
     # overrides Base
     def name
-      "T::Class[#{@type.name}]"
+      "T::Class[#{type.name}]"
     end
 
     def underlying_class
@@ -64,7 +71,12 @@ module T::Types
 
     class Untyped < TypedClass
       def initialize
-        super(T.untyped)
+        super(T::Types::Untyped::Private::INSTANCE)
+      end
+
+      def freeze
+        build_type # force lazy initialization before freezing the object
+        super
       end
 
       module Private
@@ -77,6 +89,11 @@ module T::Types
         super(T.anything)
       end
 
+      def freeze
+        build_type # force lazy initialization before freezing the object
+        super
+      end
+
       module Private
         INSTANCE = Anything.new.freeze
       end

data/lib/types/types/typed_enumerable.rb

@@ -6,10 +6,17 @@ module T::Types
   # `case` statement below in `describe_obj` in order to get better
   # error messages.
   class TypedEnumerable < Base
-    attr_reader :type
-
     def initialize(type)
-      @type = T::Utils.coerce(type)
+      @inner_type = type
+    end
+
+    def type
+      @type ||= T::Utils.coerce(@inner_type)
+    end
+
+    def build_type
+      type
+      nil
     end
 
     def underlying_class
@@ -18,7 +25,7 @@ module T::Types
 
     # overrides Base
     def name
-      "T::Enumerable[#{@type.name}]"
+      "T::Enumerable[#{type.name}]"
     end
 
     # overrides Base
@@ -34,20 +41,19 @@ module T::Types
         begin
           it = 0
           while it < obj.count
-            return false unless @type.recursively_valid?(obj[it])
+            return false unless type.recursively_valid?(obj[it])
             it += 1
           end
           true
         end
       when Hash
-        return false unless @type.is_a?(FixedArray)
-        types = @type.types
-        return false if types.count != 2
-        key_type = types[0]
-        value_type = types[1]
+        type_ = self.type
+        return false unless type_.is_a?(FixedArray)
+        key_type, value_type = type_.types
+        return false if key_type.nil? || value_type.nil? || type_.types.size > 2
         obj.each_pair do |key, val|
           # Some objects (I'm looking at you Rack::Utils::HeaderHash) don't
-          # iterate over a [key, value] array, so we can't juse use the @type.recursively_valid?(v)
+          # iterate over a [key, value] array, so we can't just use the type.recursively_valid?(v)
           return false if !key_type.recursively_valid?(key) || !value_type.recursively_valid?(val)
         end
         true
@@ -65,10 +71,10 @@ module T::Types
         # boundlessness, it does not express a type. For example `(nil...nil)` is not a T::Range[NilClass], its a range
         # of unknown types (T::Range[T.untyped]).
         # Similarly, `(nil...1)` is not a `T::Range[T.nilable(Integer)]`, it's a boundless range of Integer.
-        (obj.begin.nil? || @type.recursively_valid?(obj.begin)) && (obj.end.nil? || @type.recursively_valid?(obj.end))
+        (obj.begin.nil? || type.recursively_valid?(obj.begin)) && (obj.end.nil? || type.recursively_valid?(obj.end))
       when Set
         obj.each do |item|
-          return false unless @type.recursively_valid?(item)
+          return false unless type.recursively_valid?(item)
         end
 
         true
@@ -90,7 +96,7 @@ module T::Types
         # should be invariant because they are mutable and support
         # both reading and writing. However, Sorbet treats *all*
         # Enumerable subclasses as covariant for ease of adoption.
-        @type.subtype_of?(other.type)
+        type.subtype_of?(other.type)
       elsif other.class <= Simple
         underlying_class <= other.raw_type
       else
@@ -165,14 +171,14 @@ module T::Types
         if T::Configuration::AT_LEAST_RUBY_2_7
           Object.instance_method(:class).bind_call(obj)
         else
-          Object.instance_method(:class).bind(obj).call
+          Object.instance_method(:class).bind(obj).call # rubocop:disable Performance/BindCall
         end
       end
     end
 
     class Untyped < TypedEnumerable
       def initialize
-        super(T.untyped)
+        super(T::Types::Untyped::Private::INSTANCE)
       end
 
       def valid?(obj)

data/lib/types/types/typed_enumerator.rb

@@ -3,15 +3,13 @@
 
 module T::Types
   class TypedEnumerator < TypedEnumerable
-    attr_reader :type
-
     def underlying_class
       Enumerator
     end
 
     # overrides Base
     def name
-      "T::Enumerator[#{@type.name}]"
+      "T::Enumerator[#{type.name}]"
     end
 
     # overrides Base
@@ -30,7 +28,7 @@ module T::Types
 
     class Untyped < TypedEnumerator
       def initialize
-        super(T.untyped)
+        super(T::Types::Untyped::Private::INSTANCE)
       end
 
       def valid?(obj)

data/lib/types/types/typed_enumerator_chain.rb

@@ -3,15 +3,13 @@
 
 module T::Types
   class TypedEnumeratorChain < TypedEnumerable
-    attr_reader :type
-
     def underlying_class
       Enumerator::Chain
     end
 
     # overrides Base
     def name
-      "T::Enumerator::Chain[#{@type.name}]"
+      "T::Enumerator::Chain[#{type.name}]"
     end
 
     # overrides Base
@@ -30,7 +28,7 @@ module T::Types
 
     class Untyped < TypedEnumeratorChain
       def initialize
-        super(T.untyped)
+        super(T::Types::Untyped::Private::INSTANCE)
       end
 
       def valid?(obj)

data/lib/types/types/typed_enumerator_lazy.rb

@@ -3,15 +3,13 @@
 
 module T::Types
   class TypedEnumeratorLazy < TypedEnumerable
-    attr_reader :type
-
     def underlying_class
       Enumerator::Lazy
     end
 
     # overrides Base
     def name
-      "T::Enumerator::Lazy[#{@type.name}]"
+      "T::Enumerator::Lazy[#{type.name}]"
     end
 
     # overrides Base
@@ -30,7 +28,7 @@ module T::Types
 
     class Untyped < TypedEnumeratorLazy
       def initialize
-        super(T.untyped)
+        super(T::Types::Untyped::Private::INSTANCE)
       end
 
       def valid?(obj)

data/lib/types/types/typed_hash.rb

@@ -3,22 +3,32 @@
 
 module T::Types
   class TypedHash < TypedEnumerable
-    # Technically we don't need these, but they are a nice api
-    attr_reader :keys, :values
-
     def underlying_class
       Hash
     end
 
     def initialize(keys:, values:)
-      @keys = T::Utils.coerce(keys)
-      @values = T::Utils.coerce(values)
-      @type = T::Utils.coerce([keys, values])
+      @inner_keys = keys
+      @inner_values = values
+    end
+
+    # Technically we don't need this, but it is a nice api
+    def keys
+      @keys ||= T::Utils.coerce(@inner_keys)
+    end
+
+    # Technically we don't need this, but it is a nice api
+    def values
+      @values ||= T::Utils.coerce(@inner_values)
+    end
+
+    def type
+      @type ||= T::Utils.coerce([keys, values])
     end
 
     # overrides Base
     def name
-      "T::Hash[#{@keys.name}, #{@values.name}]"
+      "T::Hash[#{keys.name}, #{values.name}]"
     end
 
     # overrides Base

data/lib/types/types/typed_range.rb

@@ -3,15 +3,13 @@
 
 module T::Types
   class TypedRange < TypedEnumerable
-    attr_reader :type
-
     def underlying_class
-      Hash
+      Range
     end
 
     # overrides Base
     def name
-      "T::Range[#{@type.name}]"
+      "T::Range[#{type.name}]"
     end
 
     # overrides Base

data/lib/types/types/typed_set.rb

@@ -3,15 +3,13 @@
 
 module T::Types
   class TypedSet < TypedEnumerable
-    attr_reader :type
-
     def underlying_class
-      Hash
+      Set
     end
 
     # overrides Base
     def name
-      "T::Set[#{@type.name}]"
+      "T::Set[#{type.name}]"
     end
 
     # overrides Base
@@ -39,7 +37,7 @@ module T::Types
 
     class Untyped < TypedSet
       def initialize
-        super(T.untyped)
+        super(T::Types::Untyped::Private::INSTANCE)
       end
 
       def valid?(obj)

data/lib/types/types/union.rb

@@ -4,12 +4,14 @@
 module T::Types
   # Takes a list of types. Validates that an object matches at least one of the types.
   class Union < Base
-    attr_reader :types
-
     # Don't use Union.new directly, use `Private::Pool.union_of_types`
     # inside sorbet-runtime and `T.any` elsewhere.
     def initialize(types)
-      @types = types.flat_map do |type|
+      @inner_types = types
+    end
+
+    def types
+      @types ||= @inner_types.flat_map do |type|
         type = T::Utils.coerce(type)
         if type.is_a?(Union)
           # Simplify nested unions (mostly so `name` returns a nicer value)
@@ -20,6 +22,11 @@ module T::Types
       end.uniq
     end
 
+    def build_type
+      types
+      nil
+    end
+
     # overrides Base
     def name
       # Use the attr_reader here so we can override it in SimplePairUnion
@@ -51,12 +58,12 @@ module T::Types
 
     # overrides Base
     def recursively_valid?(obj)
-      @types.any? {|type| type.recursively_valid?(obj)}
+      types.any? {|type| type.recursively_valid?(obj)}
     end
 
     # overrides Base
     def valid?(obj)
-      @types.any? {|type| type.valid?(obj)}
+      types.any? {|type| type.valid?(obj)}
     end
 
     # overrides Base

data/lib/types/types/untyped.rb

@@ -7,6 +7,10 @@ module T::Types
 
     def initialize; end
 
+    def build_type
+      nil
+    end
+
     # overrides Base
     def name
       "T.untyped"

data/lib/types/utils.rb

@@ -4,6 +4,7 @@
 module T::Utils
   module Private
     def self.coerce_and_check_module_types(val, check_val, check_module_type)
+      # rubocop:disable Style/CaseLikeIf
       if val.is_a?(T::Types::Base)
         if val.is_a?(T::Private::Types::TypeAlias)
           val.aliased_type
@@ -31,6 +32,7 @@ module T::Utils
         raise "Invalid value for type constraint. Must be an #{T::Types::Base}, a " \
               "class/module, or an array. Got a `#{val.class}`."
       end
+      # rubocop:enable Style/CaseLikeIf
     end
   end
 
@@ -79,8 +81,8 @@ module T::Utils
   end
 
   # Unwraps all the sigs.
-  def self.run_all_sig_blocks
-    T::Private::Methods.run_all_sig_blocks
+  def self.run_all_sig_blocks(force_type_init: true)
+    T::Private::Methods.run_all_sig_blocks(force_type_init: force_type_init)
   end
 
   # Return the underlying type for a type alias. Otherwise returns type.
@@ -153,7 +155,7 @@ module T::Utils
       raise ArgumentError.new("#{enum.inspect} is not a T.deprecated_enum")
     end
 
-    classes = enum.values.map(&:class).uniq
+    classes = T.unsafe(enum.values).map(&:class).uniq
     if classes.empty?
       T.untyped
     elsif classes.length > 1
@@ -173,7 +175,7 @@ module T::Utils
     def self.get_type_info(prop_type)
       if prop_type.is_a?(T::Types::Union)
         non_nilable_type = prop_type.unwrap_nilable
-        if non_nilable_type&.is_a?(T::Types::Simple)
+        if non_nilable_type.is_a?(T::Types::Simple)
           non_nilable_type = non_nilable_type.raw_type
         end
         TypeInfo.new(true, non_nilable_type)
@@ -188,7 +190,7 @@ module T::Utils
     def self.get_underlying_type(prop_type)
       if prop_type.is_a?(T::Types::Union)
         non_nilable_type = prop_type.unwrap_nilable
-        if non_nilable_type&.is_a?(T::Types::Simple)
+        if non_nilable_type.is_a?(T::Types::Simple)
           non_nilable_type = non_nilable_type.raw_type
         end
         non_nilable_type || prop_type