sorbet-runtime 0.5.10813 → 0.5.10820

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d139387630eac4ebd032d807b545028012c477eddbacdce1bc24cca8cbadedf3
-  data.tar.gz: 5764af0e42e85f0bb094a83c1c258479ba9f20a4a61da50269a4cae040313bd0
+  metadata.gz: 31e1d95e4d9432b739e9ff5d24434c73387a008a8545730f014ab21b54154706
+  data.tar.gz: 51caacddddeb714f872de2531bef586126df4b01ecaaa15b6925c7588c3684e1
 SHA512:
-  metadata.gz: 02dde0ee309fdeb78efaeec183db979fa09892e3c9dd75c661f785d0ea026e9ba5424d59a5d5ad3f2fe9117f639b6d16480c56c00790b49887574b12b6cfe127
-  data.tar.gz: 75bf26f1cb4ce0689bfd4a3d4b85f649eff942b48553259ae971000d620f81364875b6150b62c28ff53f07211a6d9b43690b942ab9ef59aa946aabf914b86324
+  metadata.gz: 1ebd9c1f1ceabcc31b5923f849c66fd2dfd6ea90ee50cce8340f771d5f135aee783016a60dade22f90b4576e2df1e566046147c55e52b6a5093b28d1c69a4815
+  data.tar.gz: 9ec4e2036b31c3394ecfcaf7c84fcf7fd8c3062ded3c853e041ecd6ae55c65f84f862e51ce8d5c32f0e4c0c29889bf90a7afe094ce8237b13363a2cf327c1fc7

data/lib/sorbet-runtime.rb

@@ -85,6 +85,7 @@ require_relative 'types/boolean'
 
 # Depends on types/utils
 require_relative 'types/types/typed_array'
+require_relative 'types/types/typed_class'
 
 # Props dependencies
 require_relative 'types/private/abstract/data'

data/lib/types/_types.rb

@@ -355,4 +355,16 @@ module T
       end
     end
   end
+
+  module Class
+    def self.[](type)
+      if type.is_a?(T::Types::Untyped)
+        T::Types::TypedClass::Untyped::Private::INSTANCE
+      elsif type.is_a?(T::Types::Anything)
+        T::Types::TypedClass::Anything::Private::INSTANCE
+      else
+        T::Types::TypedClass::Private::Pool.type_for_module(type)
+      end
+    end
+  end
 end

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

@@ -8,19 +8,19 @@ class T::Private::Methods::Signature
               :check_level, :parameters, :on_failure, :override_allow_incompatible,
               :defined_raw
 
-  SIG_EMPTY_DECLARED_PARAMETERS = [nil].freeze
   UNNAMED_REQUIRED_PARAMETERS = [[:req]].freeze
 
   def self.new_untyped(method:, mode: T::Private::Methods::Modes.untyped, parameters: method.parameters)
-    # Using `Untyped` ensures we'll get an error if we ever try validation on these.
-    not_typed = T::Private::Types::NotTyped.new
+    # Using `NotTyped` ensures we'll get an error if we ever try validation on these.
+    not_typed = T::Private::Types::NotTyped::INSTANCE
     raw_return_type = not_typed
     # Map missing parameter names to "argN" positionally
     parameters = parameters.each_with_index.map do |(param_kind, param_name), index|
       [param_kind, param_name || "arg#{index}"]
     end
-    raw_arg_types = parameters.to_h do |_param_kind, param_name|
-      [param_name, not_typed]
+    raw_arg_types = {}
+    parameters.each do |_, param_name|
+      raw_arg_types[param_name] = not_typed
     end
 
     self.new(
@@ -60,21 +60,23 @@ class T::Private::Methods::Signature
     @override_allow_incompatible = override_allow_incompatible
     @defined_raw = defined_raw
 
-    declared_param_names = raw_arg_types.keys
     # If sig params are declared but there is a single parameter with a missing name
     # **and** the method ends with a "=", assume it is a writer method generated
     # by attr_writer or attr_accessor
-    writer_method = declared_param_names != SIG_EMPTY_DECLARED_PARAMETERS && parameters == UNNAMED_REQUIRED_PARAMETERS && method_name[-1] == "="
+    writer_method = !(raw_arg_types.size == 1 && raw_arg_types.key?(nil)) && parameters == UNNAMED_REQUIRED_PARAMETERS && method_name[-1] == "="
     # For writer methods, map the single parameter to the method name without the "=" at the end
     parameters = [[:req, method_name[0...-1].to_sym]] if writer_method
-    param_names = parameters.map {|_, name| name}
-    missing_names = param_names - declared_param_names
-    if !missing_names.empty?
+    is_name_missing = parameters.any? {|_, name| !raw_arg_types.key?(name)}
+    if is_name_missing
+      param_names = parameters.map {|_, name| name}
+      missing_names = param_names - raw_arg_types.keys
       raise "The declaration for `#{method.name}` is missing parameter(s): #{missing_names.join(', ')}"
-    elsif param_names.length == declared_param_names.length
+    elsif parameters.length == raw_arg_types.size
     else
-      extra_names = declared_param_names - param_names
-      if !extra_names.empty?
+      param_names = parameters.map {|_, name| name}
+      has_extra_names = parameters.count {|_, name| raw_arg_types.key?(name)} < raw_arg_types.size
+      if has_extra_names
+        extra_names = raw_arg_types.keys - param_names
         raise "The declaration for `#{method.name}` has extra parameter(s): #{extra_names.join(', ')}"
       end
     end
@@ -82,8 +84,10 @@ class T::Private::Methods::Signature
     if parameters.size != raw_arg_types.size
       raise "The declaration for `#{method.name}` has arguments with duplicate names"
     end
+    i = 0
+    raw_arg_types.each do |type_name, raw_type|
+      param_kind, param_name = parameters[i]
 
-    parameters.zip(raw_arg_types) do |(param_kind, param_name), (type_name, raw_type)|
       if type_name != param_name
         hint = ""
         # Ruby reorders params so that required keyword arguments
@@ -97,8 +101,8 @@ class T::Private::Methods::Signature
         end
 
         raise "Parameter `#{type_name}` is declared out of order (declared as arg number " \
-              "#{declared_param_names.index(type_name) + 1}, defined in the method as arg number " \
-              "#{param_names.index(type_name) + 1}).#{hint}\nMethod: #{method_desc}"
+              "#{i + 1}, defined in the method as arg number " \
+              "#{parameters.index {|_, name| name == type_name} + 1}).#{hint}\nMethod: #{method_desc}"
       end
 
       type = T::Utils.coerce(raw_type)
@@ -139,6 +143,8 @@ class T::Private::Methods::Signature
       else
         raise "Unexpected param_kind: `#{param_kind}`. Method: #{method_desc}"
       end
+
+      i += 1
     end
   end
 

data/lib/types/private/types/not_typed.rb

@@ -20,4 +20,6 @@ class T::Private::Types::NotTyped < T::Types::Base
   private def subtype_of_single?(other)
     raise ERROR_MESSAGE
   end
+
+  INSTANCE = ::T::Private::Types::NotTyped.new.freeze
 end

data/lib/types/types/class_of.rb

@@ -27,6 +27,8 @@ module T::Types
         @type <= other.type
       when Simple
         @type.is_a?(other.raw_type)
+      when TypedClass
+        true
       else
         false
       end

data/lib/types/types/typed_class.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+# typed: true
+
+module T::Types
+  class TypedClass < T::Types::Base
+    attr_reader :type
+
+    def initialize(type)
+      @type = T::Utils.coerce(type)
+    end
+
+    # overrides Base
+    def name
+      "T::Class[#{@type.name}]"
+    end
+
+    def underlying_class
+      Class
+    end
+
+    # overrides Base
+    def valid?(obj)
+      Class.===(obj)
+    end
+
+    # overrides Base
+    private def subtype_of_single?(type)
+      case type
+      when TypedClass
+        # treat like generics are erased
+        true
+      when Simple
+        Class <= type.raw_type
+      else
+        false
+      end
+    end
+
+    module Private
+      module Pool
+        CACHE_FROZEN_OBJECTS =
+          begin
+            ObjectSpace::WeakMap.new[1] = 1
+            true # Ruby 2.7 and newer
+          rescue ArgumentError
+            false # Ruby 2.6 and older
+          end
+
+        @cache = ObjectSpace::WeakMap.new
+
+        def self.type_for_module(mod)
+          cached = @cache[mod]
+          return cached if cached
+
+          type = TypedClass.new(mod)
+
+          if CACHE_FROZEN_OBJECTS || (!mod.frozen? && !type.frozen?)
+            @cache[mod] = type
+          end
+          type
+        end
+      end
+    end
+
+    class Untyped < TypedClass
+      def initialize
+        super(T.untyped)
+      end
+
+      module Private
+        INSTANCE = Untyped.new.freeze
+      end
+    end
+
+    class Anything < TypedClass
+      def initialize
+        super(T.anything)
+      end
+
+      module Private
+        INSTANCE = Anything.new.freeze
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.5.10813
+  version: 0.5.10820
 platform: ruby
 authors:
 - Stripe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -233,6 +233,7 @@ files:
 - lib/types/types/type_template.rb
 - lib/types/types/type_variable.rb
 - lib/types/types/typed_array.rb
+- lib/types/types/typed_class.rb
 - lib/types/types/typed_enumerable.rb
 - lib/types/types/typed_enumerator.rb
 - lib/types/types/typed_enumerator_chain.rb