sorbet-coerce 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b782e5a5b86602bca93180834ff7ed40f1fc4f05b112aeff37bc7a64963e9f3a
-  data.tar.gz: cae4b199fe1f9f504641101995a55b2e56e16f8260da8a0b2289f59544fc8af3
+  metadata.gz: 66e3f4b05deb745fbcff9b66bbb7ddfd1d10529ce292e9d27eaacc9bb7b8983f
+  data.tar.gz: 8a3e7c12cf1233854e369f3c6d02f3182ed4977ffee07a8bdd5bc223f02d216b
 SHA512:
-  metadata.gz: d9523a1ce9514a8203377b133b1f56f56c23e241bc01f47018588d11d096a5e1ba87ccb6b4372faea3f6efcf4384478241f1da198739bd0972943b187dd9c00e
-  data.tar.gz: 694ac86c81038acac9b8289dd5ebda5934c1f0f42d0c4a8a4f4d83bd01a58af272c61e95dedf5ff42da0b2a2aba4e5c5a1562d21006c0b51532b5a59f2f76851
+  metadata.gz: cbea704d16c04d30e695c5d65c0963e31288f1a70b5ba205fac12ca48bc65e8977882450927dc062ab26eab6d68c9f0861bf5f1931dec1ba9ebbe55a068c5f83
+  data.tar.gz: '09dda06d9da527001aca7fbbb4bd311385647317150a2efb0fd4fa07e1bfaed22130d4e0d36c4d35e17908cb972203764039a9537314db0507cea0ae595652ba'

data/lib/private/converter.rb

@@ -27,17 +27,32 @@ module T::Private
       if type.is_a?(T::Types::TypedArray)
         _convert_to_a(value, type.type)
       elsif type.is_a?(T::Types::Simple)
-        _convert_simple(value, type.raw_type)
+        _convert(value, type.raw_type)
       elsif type.is_a?(T::Types::Union)
-        raw_types = type.types.map(&:raw_type)
-        raise ArgumentError.new(
-          'the only supported union type is T.nilable',
-        ) unless raw_types.length == 2 && raw_types.include?(NilClass)
+        true_idx = T.let(nil, T.nilable(Integer))
+        false_idx = T.let(nil, T.nilable(Integer))
+        nil_idx = T.let(nil, T.nilable(Integer))
+
+        type.types.each_with_index do |t, i|
+          nil_idx = i if t.is_a?(T::Types::Simple) && t.raw_type == NilClass
+          true_idx = i if t.is_a?(T::Types::Simple) && t.raw_type == TrueClass
+          false_idx = i if t.is_a?(T::Types::Simple) && t.raw_type == FalseClass
+        end
 
-        _convert(
-          value,
-          raw_types.select { |t| t != NilClass }.first,
+        raise ArgumentError.new(
+          'the only supported union types are T.nilable and T::Boolean',
+        ) unless (
+          (!true_idx.nil? && !false_idx.nil? && !nil_idx.nil?) || # T.nilable(T::Boolean)
+          (type.types.length == 2 && (
+            !nil_idx.nil? || (!true_idx.nil? && !false_idx.nil?) # T.nilable || T::Boolean
+          ))
         )
+
+        if !true_idx.nil? && !false_idx.nil?
+          _convert_simple(value, T::Boolean)
+        else
+          _convert(value, type.types[nil_idx == 0 ? 1 : 0])
+        end
       elsif type < T::Struct
         args = _build_args(value, type.props)
         begin
@@ -53,11 +68,14 @@ module T::Private
     sig { params(value: T.untyped, type: T.untyped).returns(T.untyped) }
     def _convert_simple(value, type)
       return nil if value.nil?
-      return value if value.is_a?(type)
-      safe_type_rule = if type == T::Boolean
-        SafeType::Boolean.strict
+      safe_type_rule = T.let(nil, T.untyped)
+
+      if type == T::Boolean
+        safe_type_rule = SafeType::Boolean.strict
+      elsif value.is_a?(type)
+        return value
       elsif PRIMITIVE_TYPES.include?(type)
-        SafeType.const_get(type.name).strict
+        safe_type_rule = SafeType.const_get(type.name).strict
       else
         safe_type_rule = type
       end
@@ -74,7 +92,7 @@ module T::Private
 
     sig { params(ary: T.untyped, type: T.untyped).returns(T.untyped) }
     def _convert_to_a(ary, type)
-      ary = [ary] unless ary.respond_to?(:map)
+      ary = [ary] unless ary.is_a?(::Array)
       T.send(
         'let',
         ary.map { |value| _convert(value, type) },
@@ -86,6 +104,7 @@ module T::Private
 
     sig { params(args: T.untyped, props: T.untyped).returns(T.untyped) }
     def _build_args(args, props)
+      return {} if args.nil?
       args.map { |name, value|
         key = name.to_sym
         [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-coerce
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Chan Zuckerberg Initiative