sorbet-runtime 0.5.5651 → 0.5.5657

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 181d169545984c142df587bedf3995e13a6c18c15b59fb04816e712104a11dc3
-  data.tar.gz: 47fecc926152e65fd6db14c2df9ed8f870105272bc09c07ef9bbf11e2748aade
+  metadata.gz: 04dbb8ac655032897af8b72e52e41e60bbb08d471e1bb3257422b0f765eca12e
+  data.tar.gz: 7e661cde9f4fefc762c72875b320c54da69971f96a0906137ed1c398aea4c9bd
 SHA512:
-  metadata.gz: a741a233e4bc0e8b4efb1b0fdbaa785c361828ff8eb93d7effc1e90cdfc4166b6aa0e4e1356487294b33049ecefd070b060bf46b307172f787181b55223419b6
-  data.tar.gz: 85ba00d5ed36916c261d5d1ccb752def465eb4276a230477135f995b47c7fb180d53dd15262d2b9d5d85a5a0682f6bdfabe7ccd3d0d80c874025bdf710cec096
+  metadata.gz: 4c7c50b7f66658e4e427629bcc881ddb9c7cf987c00b4a06e91c871c7e4105354811a4f6c40d72649a605b178ed8b7896f539f7329c30e6860ef8378964ce48b
+  data.tar.gz: 07d5d1764063df2a278a0eb16363756cf33d12afb19ea10727a77600787238b3219661b1c0113d4b3a90f970c245da3953df21254b2eccd494f3da2f8c8390f7

data/lib/types/props/decorator.rb

@@ -220,12 +220,6 @@ class T::Props::Decorator
       raise ArgumentError.new("At least one invalid prop arg supplied in #{self}: #{rules.keys.inspect}")
     end
 
-    if (array = rules[:array])
-      unless array.is_a?(Module)
-        raise ArgumentError.new("Bad class as subtype in prop #{@class.name}.#{name}: #{array.inspect}")
-      end
-    end
-
     if !(rules[:clobber_existing_method!]) && !(rules[:without_accessors])
       if BANNED_METHOD_NAMES.include?(name.to_sym)
         raise ArgumentError.new(
@@ -350,7 +344,7 @@ class T::Props::Decorator
     if !cls.is_a?(Module)
       cls = convert_type_to_class(cls)
     end
-    type_object = smart_coerce(type, array: rules[:array], enum: rules[:enum])
+    type_object = smart_coerce(type, enum: rules[:enum])
 
     prop_validate_definition!(name, cls, rules, type_object)
 
@@ -441,27 +435,21 @@ class T::Props::Decorator
   end
 
   sig do
-    params(type: PropTypeOrClass, array: T.untyped, enum: T.untyped)
+    params(type: PropTypeOrClass, enum: T.untyped)
     .returns(T::Types::Base)
   end
-  private def smart_coerce(type, array:, enum:)
+  private def smart_coerce(type, enum:)
     # Backwards compatibility for pre-T::Types style
-    if !array.nil? && !enum.nil?
-      raise ArgumentError.new("Cannot specify both :array and :enum options")
-    elsif !array.nil?
-      if type == Set
-        T::Set[array]
-      else
-        T::Array[array]
-      end
-    elsif !enum.nil?
-      if T::Utils.unwrap_nilable(type)
-        T.nilable(T.enum(enum))
+    type = T::Utils.coerce(type)
+    if enum.nil?
+      type
+    else
+      nonnil_type = T::Utils.unwrap_nilable(type)
+      if nonnil_type
+        T.nilable(T.all(nonnil_type, T.enum(enum)))
       else
-        T.enum(enum)
+        T.all(type, T.enum(enum))
       end
-    else
-      T::Utils.coerce(type)
     end
   end
 

data/lib/types/props/private/serde_transform.rb

@@ -99,6 +99,38 @@ module T::Props
               "T::Props::Utils.deep_clone_object(#{varname})"
             end
           end
+        when T::Types::Intersection
+          dynamic_fallback = "T::Props::Utils.deep_clone_object(#{varname})"
+
+          # Transformations for any members of the intersection type where we
+          # know what we need to do and did not have to fall back to the
+          # dynamic deep clone method.
+          #
+          # NB: This deliberately does include `nil`, which means we know we
+          # don't need to do any transforming.
+          inner_known = type.types
+            .map {|t| generate(t, mode, varname)}
+            .reject {|t| t == dynamic_fallback}
+            .uniq
+
+          if inner_known.size != 1
+            # If there were no cases where we could tell what we need to do,
+            # e.g. if this is `T.all(SomethingWeird, WhoKnows)`, just use the
+            # dynamic fallback.
+            #
+            # If there were multiple cases and they weren't consistent, e.g.
+            # if this is `T.all(String, T::Array[Integer])`, the type is probably
+            # bogus/uninhabited, but use the dynamic fallback because we still
+            # don't have a better option, and this isn't the place to raise that
+            # error.
+            dynamic_fallback
+          else
+            # This is probably something like `T.all(String, SomeMarker)` or
+            # `T.all(SomeEnum, T.enum(SomeEnum::FOO))` and we should treat it
+            # like String or SomeEnum even if we don't know what to do with
+            # the rest of the type.
+            inner_known.first
+          end
         when T::Types::Enum
           generate(T::Utils.lift_enum(type), mode, varname)
         else

data/lib/types/props/type_validation.rb

@@ -63,7 +63,16 @@ module T::Props::TypeValidation
       when T::Types::FixedHash
         type.types.values.map {|subtype| find_invalid_subtype(subtype)}.compact.first
       when T::Types::Union, T::Types::FixedArray
+        # `T.any` is valid if all of the members are valid
         type.types.map {|subtype| find_invalid_subtype(subtype)}.compact.first
+      when T::Types::Intersection
+        # `T.all` is valid if at least one of the members is valid
+        invalid = type.types.map {|subtype| find_invalid_subtype(subtype)}.compact
+        if invalid.length == type.types.length
+          invalid.first
+        else
+          nil
+        end
       when T::Types::Enum, T::Types::ClassOf
         nil
       when T::Private::Types::TypeAlias

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.5.5651
+  version: 0.5.5657
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest