sorbet-runtime 0.4.4869 → 0.4.4878

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dbdfcf412572c9ea831245b35e705b4fee67a51b030569fd5b7e601c579e4f3
-  data.tar.gz: f082863d2331e67ed34c724bc29feae087eeb63af5db6efca6e1c6af89502e9f
+  metadata.gz: 24dc6e9c709ddaa06a39910776ad04d297c87258be1522766bc9debea9e76f7e
+  data.tar.gz: 4b9054f4d6713ff99f90414c036eccc042ba6c02746525fd4e637dda62981825
 SHA512:
-  metadata.gz: 894d0e5fd2fcc17b915dbf16cb8a7c0207d2a7e7f1c8c18d17f35c3f1fb099b06abddbeccb53e0725987a362bca3a90d68d4c734b150e2c45322d22a245ff751
-  data.tar.gz: 6d75e695d9be234474da26b5782382efb10b880cc2c30ec3c32dca6fa3ad0067d249eed35f2398702fe003a27d76588b1309b4daeefd408fc916bc1bf4f701a1
+  metadata.gz: bf094800059eb3a52309de25073025dad8e33253a7318219c6d6c3459c17f5e846ce4b721605a665baf80b6237390d7ca8f83bfd285a0e477af34ff16c8c738f
+  data.tar.gz: 32e44a51c069b5ffee943f289c82523a26b1c13ba14edaada2e750b70989e21d5ac7e8373b61b0dbc31685dc7498a7d2dca25c05e0e7a3f2f5cc1f08280e917a

data/lib/sorbet-runtime.rb

@@ -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/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
+
+    # @override Base
+    def name
+      aliased_type.name
+    end
+
+    # @override Base
+    def valid?(obj)
+      aliased_type.valid?(obj)
+    end
+
+    def aliased_type
+      @aliased_type ||= T::Utils.coerce(@callable.call)
+    end
+  end
+end

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/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]
@@ -76,6 +78,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.4869
+  version: 0.4.4878
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -100,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