sorbet-runtime 0.4.4788 → 0.4.4901

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31271303dfeb98e19ae3042f9c577f080415b592e005a407be7dab657cae0f77
-  data.tar.gz: 10ebdce3b1e460c9a95b6144e0b0662f98eb77574eb586a1d248c38c91e01b73
+  metadata.gz: acf4827a4df1da708da87821db5e5c62e839731de066277648d6f64e0e3aaaca
+  data.tar.gz: b8c27da475f0641fd75483b9f517118cb4506fa831d7108cea9e18f8cbe3e0b5
 SHA512:
-  metadata.gz: '0027993a7fa1be8694fd2eb2b0b3c64978430bb6d44b91a54ebd8922cbab1a9b40b4ecab04f8d3331acfded84873e49926b6930be53acbd565f418c34e817484'
-  data.tar.gz: 89c69d15484d2f69df868ab465dc8085c1123adae026b1678c28b268211c0b2eb80ef991af6b930572a2c0113fc8bc165e3aba1138d7af187c1487aa79aa2632
+  metadata.gz: e35bbc99c047ac0209fc143ecfc090b24e711ed48036390ceeca031eabea63a3966066ee7d9673e5d93c0a76394c205cc636968e424d8faf4102d44e95f4a4ed
+  data.tar.gz: 62c08b4a00147ef1c55bb9cbe5c0bb28a406d34b033b445293cd623238616e5854f0a4166122d776328bd65c4fe8401b8673858ff27f518669a6ccba57e92be9

data/lib/sorbet-runtime.rb

@@ -24,7 +24,6 @@ require_relative 'types/_types'
 require_relative 'types/private/decl_state'
 require_relative 'types/runtime_profiled'
 require_relative 'types/private/class_utils'
-require_relative 'types/private/error_handler'
 require_relative 'types/private/runtime_levels'
 require_relative 'types/private/methods/_methods'
 require_relative 'types/sig'
@@ -43,6 +42,7 @@ require_relative 'types/types/fixed_hash'
 require_relative 'types/types/intersection'
 require_relative 'types/types/noreturn'
 require_relative 'types/types/proc'
+require_relative 'types/types/attached_class'
 require_relative 'types/types/self_type'
 require_relative 'types/types/simple'
 require_relative 'types/types/opus_enum'
@@ -57,6 +57,7 @@ require_relative 'types/types/untyped'
 require_relative 'types/private/types/not_typed'
 require_relative 'types/private/types/void'
 require_relative 'types/private/types/string_holder'
+require_relative 'types/private/types/type_alias'
 
 require_relative 'types/types/type_variable'
 require_relative 'types/types/type_member'

data/lib/types/_types.rb

@@ -65,6 +65,11 @@ module T
     T::Types::SelfType.new
   end
 
+  # Matches the instance type in a singleton-class context
+  def self.experimental_attached_class
+    T::Types::AttachedClassType.new
+  end
+
   # Matches any class that subclasses or includes the provided class
   # or module
   def self.class_of(klass)
@@ -75,11 +80,11 @@ module T
   ## END OF THE METHODS TO PASS TO `sig`.
 
 
-  # Constructs a type alias. Used to create a short name for a larger
-  # type. In Ruby this is just equivalent to assignment, but this is
-  # needed for support by the static checker. Example usage:
+  # Constructs a type alias. Used to create a short name for a larger type. In Ruby this returns a
+  # wrapper that contains a proc that is evaluated to get the underlying type. This syntax however
+  # is needed for support by the static checker. Example usage:
   #
-  #  NilableString = T.type_alias(T.nilable(String))
+  #  NilableString = T.type_alias {T.nilable(String)}
   #
   #  sig {params(arg: NilableString, default: String).returns(String)}
   #  def or_else(arg, default)
@@ -88,8 +93,14 @@ module T
   #
   # The name of the type alias is not preserved; Error messages will
   # be printed with reference to the underlying type.
-  def self.type_alias(type)
-    T::Utils.coerce(type)
+  #
+  # TODO Remove `type` parameter. This was left in to make life easier while migrating.
+  def self.type_alias(type=nil, &blk)
+    if blk
+      T::Private::Types::TypeAlias.new(blk)
+    else
+      T::Utils.coerce(type)
+    end
   end
 
   # References a type paramater which was previously defined with

data/lib/types/boolean.rb

@@ -4,5 +4,5 @@
 module T
   # T::Boolean is a type alias helper for the common `T.any(TrueClass, FalseClass)`.
   # Defined separately from _types.rb because it has a dependency on T::Types::Union.
-  Boolean = T.type_alias(T.any(TrueClass, FalseClass))
+  Boolean = T.type_alias {T.any(TrueClass, FalseClass)}
 end

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

@@ -58,11 +58,7 @@ module T::Private::Methods::SignatureValidation
   def self.validate_override_mode(signature, super_signature)
     case signature.mode
     when *Modes::OVERRIDE_MODES
-      if !Modes::OVERRIDABLE_MODES.include?(super_signature.mode)
-        raise "You declared `#{signature.method_name}` as #{pretty_mode(signature)}, but the method it overrides is not declared as `overridable` or `abstract`.\n" \
-              "  Parent definition: #{method_loc_str(super_signature.method)}\n" \
-              "  Child definition:  #{method_loc_str(signature.method)}\n"
-      end
+      # Peaceful
     when *Modes::NON_OVERRIDE_MODES
       if super_signature.mode == Modes.standard
         # Peaceful

data/lib/types/private/types/type_alias.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+# typed: true
+
+module T::Private::Types
+  # Wraps a proc for a type alias to defer its evaluation.
+  class TypeAlias < T::Types::Base
+
+    def initialize(callable)
+      @callable = callable
+    end
+
+    def aliased_type
+      @aliased_type ||= T::Utils.coerce(@callable.call)
+    end
+
+    # @override Base
+    def name
+      aliased_type.name
+    end
+
+    # @override Base
+    def valid?(obj)
+      aliased_type.valid?(obj)
+    end
+  end
+end

data/lib/types/props/decorator.rb

@@ -10,11 +10,11 @@
 class T::Props::Decorator
   extend T::Sig
 
-  Rules = T.type_alias(T::Hash[Symbol, T.untyped])
-  DecoratedClass = T.type_alias(T.untyped) # T.class_of(T::Props), but that produces circular reference errors in some circumstances
-  DecoratedInstance = T.type_alias(T.untyped) # Would be T::Props, but that produces circular reference errors in some circumstances
-  PropType = T.type_alias(T.any(T::Types::Base, T::Props::CustomType))
-  PropTypeOrClass = T.type_alias(T.any(PropType, Module))
+  Rules = T.type_alias {T::Hash[Symbol, T.untyped]}
+  DecoratedClass = T.type_alias {T.untyped} # T.class_of(T::Props), but that produces circular reference errors in some circumstances
+  DecoratedInstance = T.type_alias {T.untyped} # Would be T::Props, but that produces circular reference errors in some circumstances
+  PropType = T.type_alias {T.any(T::Types::Base, T::Props::CustomType)}
+  PropTypeOrClass = T.type_alias {T.any(PropType, Module)}
 
   class NoRulesError < StandardError; end
 
@@ -156,10 +156,27 @@ class T::Props::Decorator
       else
         type_object.valid?(val)
       end
+
     if !valid
       raise T::Props::InvalidValueError.new("Can't set #{@class.name}.#{prop} to #{val.inspect} " \
         "(instance of #{val.class}) - need a #{type_object}")
     end
+  rescue T::Props::InvalidValueError => err
+    caller_loc = T.must(caller_locations(8, 1))[0]
+
+    pretty_message = "Parameter '#{prop}': #{err.message}\n" \
+      "Caller: #{caller_loc.path}:#{caller_loc.lineno}\n"
+
+    T::Configuration.call_validation_error_handler(
+      nil,
+      message: err.message,
+      pretty_message: pretty_message,
+      kind: 'Parameter',
+      name: prop,
+      type: type,
+      value: val,
+      location: caller_loc,
+    )
   end
 
   # For performance, don't use named params here.
@@ -330,6 +347,7 @@ class T::Props::Decorator
     .void
   end
   def prop_defined(name, cls, rules={})
+    cls = T::Utils.resolve_alias(cls)
     if rules[:optional] == true
       T::Configuration.hard_assert_handler(
         'Use of `optional: true` is deprecated, please use `T.nilable(...)` instead.',
@@ -556,6 +574,9 @@ class T::Props::Decorator
   if defined?(Opus) && defined?(Opus::Enum)
     TYPES_NOT_NEEDING_CLONE << Opus::Enum
   end
+  if defined?(T::Enum)
+    TYPES_NOT_NEEDING_CLONE << T::Enum
+  end
 
   sig {params(type: PropType).returns(T::Boolean)}
   private def shallow_clone_ok(type)

data/lib/types/props/type_validation.rb

@@ -64,6 +64,8 @@ module T::Props::TypeValidation
         type.types.map {|subtype| find_invalid_subtype(subtype)}.compact.first
       when T::Types::Enum, T::Types::ClassOf
         nil
+      when T::Private::Types::TypeAlias
+        find_invalid_subtype(type.aliased_type)
       when T::Types::Simple
         # TODO Could we manage to define a whitelist, consisting of something
         # like primitives, subdocs, DataInterfaces, and collections/enums/unions

data/lib/types/props/utils.rb

@@ -28,6 +28,8 @@ module T::Props::Utils
       # being defined.
       if defined?(Opus) && defined?(Opus::Enum) && what.class == Opus::Enum
         what
+      elsif defined?(T::Enum) && what.class == T::Enum
+        what
       else
         what.clone
       end

data/lib/types/types/attached_class.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+# typed: true
+
+module T::Types
+  # Modeling AttachedClass properly at runtime would require additional
+  # tracking, so at runtime we permit all values and rely on the static checker.
+  # As AttachedClass is modeled statically as a type member on every singleton
+  # class, this is consistent with the runtime behavior for all type members.
+  class AttachedClassType < Base
+
+    def initialize(); end
+
+    # @override Base
+    def name
+      "AttachedClass"
+    end
+
+    # @override Base
+    def valid?(obj)
+      true
+    end
+
+    # @override Base
+    private def subtype_of_single?(other)
+      case other
+      when AttachedClassType
+        true
+      else
+        false
+      end
+    end
+  end
+end

data/lib/types/types/base.rb

@@ -41,6 +41,14 @@ module T::Types
     def subtype_of?(t2)
       t1 = self
 
+      if t2.is_a?(T::Private::Types::TypeAlias)
+        t2 = t2.aliased_type
+      end
+
+      if t1.is_a?(T::Private::Types::TypeAlias)
+        return t1.aliased_type.subtype_of?(t2)
+      end
+
       # pairs to cover: 1  (_, _)
       #                 2  (_, And)
       #                 3  (_, Or)
@@ -134,7 +142,8 @@ module T::Types
     end
 
     def ==(other)
-      other.class == self.class && other.name == self.name
+      (T::Utils.resolve_alias(other).class == T::Utils.resolve_alias(self).class) &&
+        other.name == self.name
     end
 
     alias_method :eql?, :==

data/lib/types/types/intersection.rb

@@ -8,6 +8,7 @@ module T::Types
 
     def initialize(types)
       @types = 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)
           type.types

data/lib/types/types/union.rb

@@ -8,6 +8,7 @@ module T::Types
 
     def initialize(types)
       @types = types.flat_map do |type|
+        type = T::Utils.resolve_alias(type)
         if type.is_a?(Union)
           # Simplify nested unions (mostly so `name` returns a nicer value)
           type.types

data/lib/types/utils.rb

@@ -4,7 +4,9 @@
 module T::Utils
   # Used to convert from a type specification to a `T::Types::Base`.
   def self.coerce(val)
-    if val.is_a?(T::Types::Base)
+    if val.is_a?(T::Private::Types::TypeAlias)
+      val.aliased_type
+    elsif val.is_a?(T::Types::Base)
       val
     elsif val == ::Array
       T::Array[T.untyped]
@@ -28,6 +30,8 @@ module T::Utils
       T::Private::Methods.finalize_proc(val.decl)
     elsif defined?(::Opus) && defined?(::Opus::Enum) && val.is_a?(::Opus::Enum)
       T::Types::OpusEnum.new(val) # rubocop:disable PrisonGuard/UseOpusTypesShortcut
+    elsif defined?(::T::Enum) && val.is_a?(::T::Enum)
+      T::Types::OpusEnum.new(val) # rubocop:disable PrisonGuard/UseOpusTypesShortcut
     else
       raise "Invalid value for type constraint. Must be an #{T::Types::Base}, a " \
             "class/module, or an array. Got a `#{val.class}`."
@@ -76,6 +80,16 @@ module T::Utils
     T::Private::Methods.run_all_sig_blocks
   end
 
+  # Return the underlying type for a type alias. Otherwise returns type.
+  def self.resolve_alias(type)
+    case type
+    when T::Private::Types::TypeAlias
+      type.aliased_type
+    else
+      type
+    end
+  end
+
   # Give a type which is a subclass of T::Types::Base, determines if the type is a simple nilable type (union of NilClass and something else).
   # If so, returns the T::Types::Base of the something else. Otherwise, returns nil.
   def self.unwrap_nilable(type)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.4.4788
+  version: 0.4.4901
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-24 00:00:00.000000000 Z
+date: 2019-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -88,7 +88,6 @@ files:
 - lib/types/private/casts.rb
 - lib/types/private/class_utils.rb
 - lib/types/private/decl_state.rb
-- lib/types/private/error_handler.rb
 - lib/types/private/final.rb
 - lib/types/private/methods/_methods.rb
 - lib/types/private/methods/call_validation.rb
@@ -101,6 +100,7 @@ files:
 - lib/types/private/sealed.rb
 - lib/types/private/types/not_typed.rb
 - lib/types/private/types/string_holder.rb
+- lib/types/private/types/type_alias.rb
 - lib/types/private/types/void.rb
 - lib/types/profile.rb
 - lib/types/props/_props.rb
@@ -118,6 +118,7 @@ files:
 - lib/types/runtime_profiled.rb
 - lib/types/sig.rb
 - lib/types/struct.rb
+- lib/types/types/attached_class.rb
 - lib/types/types/base.rb
 - lib/types/types/class_of.rb
 - lib/types/types/enum.rb
@@ -145,7 +146,8 @@ files:
 homepage: https://sorbet.run
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/sorbet/sorbet
 post_install_message: 
 rdoc_options: []
 require_paths: