sorbet-coerce 0.2.2 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5c3d4dbcef7e149630285f69ffdb189af9c939a6fc23569550f98c8f6dee5fa
-  data.tar.gz: d6692abfe404b6cc9c0a7e3e79a7c3ff43416f1a68ab9c2140f552d17395141e
+  metadata.gz: 017a474302bad34d6523e0140f0a221419874ddb6488f5cde3075458c54a245e
+  data.tar.gz: '0822f50c595a31bd377ff359d7e05f42ef60a2c4a9dd46915527dcf47c344081'
 SHA512:
-  metadata.gz: 71d5ff39ed7674752b3437e812d4518c7f3e51d28d517e47fcdaea32d0d548c8e56eb9178158a8db990fa15d1dce71f91697a4250c99578dda1b05fa91503e95
-  data.tar.gz: bf4534d41c56e2e82a5a5219099dcefa8d96fd4887670b50c86dfd60dede71710dbc934addafb83e833a7a7ce221789244089ddfb5caec637e84af57e1bf325e
+  metadata.gz: e105f8b039d77562b9a03ed58cc55cebb2e55a526917d1965c2fce7e410869d8bb9ea1d94e50f8086d298bf818eb63b5fb6293326e073621f6dc66450d6632c8
+  data.tar.gz: 2c0be667253b77c2e84930cf1fa526b01ed79c3cb603b708e2256958d3def7679adb275cbeccee3f5e7e6649408445c43d3bb6892281fe42efaa511464963fbc

data/lib/bundled_rbi/sorbet-coerce.rbi

@@ -0,0 +1,17 @@
+# typed: true
+module SafeType
+  class CoercionError < StandardError; end
+end
+
+module TypeCoerce
+  extend T::Sig
+  extend T::Generic
+
+  Elem = type_member
+
+  sig { params(args: T.untyped, raise_coercion_error: T.nilable(T::Boolean)).returns(Elem) }
+  def from(args, raise_coercion_error: nil); end
+
+  class CoercionError < SafeType::CoercionError; end
+  class ShapeError < SafeType::CoercionError; end
+end

data/lib/sorbet-coerce.rb

@@ -1,23 +1,8 @@
-# typed: strict
-require_relative 'configuration'
-require 'private/converter'
-require 'safe_type'
+# typed: ignore
+require 'sorbet-coerce/converter'
 
-module T::Coerce
-  class CoercionError < SafeType::CoercionError; end
-  class ShapeError < SafeType::CoercionError; end
-
-  define_singleton_method(:[]) do |type|
-    Class.new(T::Private::Converter) do
-      define_method(:to_s) { "#{name}#[#{type.to_s}]" }
-
-      define_method(:from) do |args, raise_coercion_error: nil|
-        if raise_coercion_error.nil?
-          raise_coercion_error = T::Coerce::Configuration.raise_coercion_error
-        end
-
-        T.send('let', send('_convert', args, type, raise_coercion_error), type)
-      end
-    end
+module TypeCoerce
+  def self.[](type)
+    TypeCoerce::Converter.new(type)
   end
 end

data/lib/{configuration.rb → sorbet-coerce/configuration.rb}

@@ -1,7 +1,7 @@
 # typed: true
 require 'sorbet-runtime'
 
-module T::Coerce
+module TypeCoerce
   module Configuration
     class << self
       extend T::Sig
@@ -12,4 +12,4 @@ module T::Coerce
   end
 end
 
-T::Coerce::Configuration.raise_coercion_error = true
+TypeCoerce::Configuration.raise_coercion_error = true

data/lib/sorbet-coerce/converter.rb

@@ -0,0 +1,169 @@
+# typed: ignore
+require 'polyfill'
+require 'safe_type'
+require 'set'
+require 'sorbet-runtime'
+require 'sorbet-coerce/configuration'
+
+using Polyfill(Hash: %w[#slice])
+
+module TypeCoerce
+  class CoercionError < SafeType::CoercionError; end
+  class ShapeError < SafeType::CoercionError; end
+end
+
+class TypeCoerce::Converter
+  def initialize(type)
+    @type = type
+  end
+
+  def new
+    self
+  end
+
+  def to_s
+    "#{name}#[#{@type.to_s}]"
+  end
+
+  def from(args, raise_coercion_error: nil)
+    if raise_coercion_error.nil?
+      raise_coercion_error = TypeCoerce::Configuration.raise_coercion_error
+    end
+
+    T.let(_convert(args, @type, raise_coercion_error), @type)
+  end
+
+  private
+
+  PRIMITIVE_TYPES = T.let(::Set[
+    Date,
+    DateTime,
+    Float,
+    Integer,
+    String,
+    Symbol,
+    Time,
+  ], T.untyped)
+
+  def _convert(value, type, raise_coercion_error)
+    if type.is_a?(T::Types::Untyped)
+      value
+    elsif type.is_a?(T::Types::TypedArray)
+      _convert_to_a(value, type.type, raise_coercion_error)
+    elsif type.is_a?(T::Types::TypedSet)
+      Set.new(_convert_to_a(value, type.type, raise_coercion_error))
+    elsif type.is_a?(T::Types::Simple)
+      _convert(value, type.raw_type, raise_coercion_error)
+    elsif type.is_a?(T::Types::Union)
+      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
+
+      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, raise_coercion_error)
+      else
+        _convert(value, type.types[nil_idx == 0 ? 1 : 0], raise_coercion_error)
+      end
+    elsif type.is_a?(T::Types::TypedHash)
+      return {} if _nil_like?(value, type)
+
+      unless value.respond_to?(:map)
+        raise TypeCoerce::ShapeError.new(value, type)
+      end
+
+      value.map do |k, v|
+        [
+          _convert(k, type.keys, raise_coercion_error),
+          _convert(v, type.values, raise_coercion_error),
+        ]
+      end.to_h
+    elsif Object.const_defined?('T::Private::Types::TypeAlias') &&
+          type.is_a?(T::Private::Types::TypeAlias)
+      _convert(value, type.aliased_type, raise_coercion_error)
+    elsif type.respond_to?(:<) && type < T::Struct
+      return value if value.is_a?(type)
+
+      args = _build_args(value, type, raise_coercion_error)
+      type.new(args)
+    else
+      return value if value.is_a?(type)
+
+      _convert_simple(value, type, raise_coercion_error)
+    end
+  end
+
+  def _convert_simple(value, type, raise_coercion_error)
+    return nil if _nil_like?(value, type)
+
+    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)
+      safe_type_rule = SafeType.const_get(type.name).strict
+    else
+      safe_type_rule = type
+    end
+
+    if safe_type_rule.is_a?(SafeType::Rule)
+      SafeType::coerce(value, safe_type_rule)
+    else
+      type.new(value)
+    end
+  rescue SafeType::EmptyValueError, SafeType::CoercionError
+    if raise_coercion_error
+      raise TypeCoerce::CoercionError.new(value, type)
+    else
+      nil
+    end
+  end
+
+  def _convert_to_a(ary, type, raise_coercion_error)
+    return [] if _nil_like?(ary, type)
+
+    unless ary.respond_to?(:map)
+      raise TypeCoerce::ShapeError.new(ary, type)
+    end
+
+    ary.map { |value| _convert(value, type, raise_coercion_error) }
+  end
+
+  def _build_args(args, type, raise_coercion_error)
+    return {} if _nil_like?(args, Hash)
+
+    unless args.respond_to?(:each_pair)
+      raise TypeCoerce::ShapeError.new(args, type)
+    end
+
+    props = type.props
+    args.map { |name, value|
+      key = name.to_sym
+      [
+        key,
+        (!props.include?(key) || value.nil?) ?
+          nil : _convert(value, props[key][:type], raise_coercion_error),
+      ]
+    }.to_h.slice(*props.keys)
+  end
+
+  def _nil_like?(value, type)
+    value.nil? || (value == '' && type != String)
+  end
+end

data/spec/coerce_spec.rb

@@ -2,7 +2,7 @@
 require 'sorbet-coerce'
 require 'sorbet-runtime'
 
-describe T::Coerce do
+describe TypeCoerce do
   context 'when given T::Struct' do
     class ParamInfo < T::Struct
       const :name, String
@@ -31,6 +31,10 @@ describe T::Coerce do
       const :myhash, T::Hash[String, Integer]
     end
 
+    class HashParamsWithDefault < T::Struct
+      const :myhash, T::Hash[String, Integer], default: Hash['a' => 1]
+    end
+
     class CustomType
       attr_reader :a
 
@@ -48,7 +52,7 @@ describe T::Coerce do
     end
 
     let!(:param) {
-      T::Coerce[Param].new.from({
+      TypeCoerce[Param].new.from({
         id: 1,
         info: {
           name: 'mango',
@@ -64,7 +68,7 @@ describe T::Coerce do
     }
 
     let!(:param2) {
-      T::Coerce[Param].new.from({
+      TypeCoerce[Param].new.from({
         id: '2',
         info: {
           name: 'honeydew',
@@ -95,6 +99,7 @@ describe T::Coerce do
       expect(param.info.name).to eql 'mango'
       expect(param.info.skill_ids).to eql [123, 456]
       expect(param.opt.notes).to eql []
+      expect(TypeCoerce[Param].new.from(param)).to eq(param)
 
       expect(param2.id).to eql 2
       expect(param2.info.name).to eql 'honeydew'
@@ -105,7 +110,7 @@ describe T::Coerce do
       expect(param2.opt.notes).to eql []
 
       expect {
-        T::Coerce[Param].new.from({
+        TypeCoerce[Param].new.from({
           id: 3,
           info: {
             # missing required name
@@ -114,8 +119,8 @@ describe T::Coerce do
         })
       }.to raise_error(ArgumentError)
 
-      expect(T::Coerce[DefaultParams].new.from(nil).a).to be 1
-      expect(T::Coerce[DefaultParams].new.from('').a).to be 1
+      expect(TypeCoerce[DefaultParams].new.from(nil).a).to be 1
+      expect(TypeCoerce[DefaultParams].new.from('').a).to be 1
     end
   end
 
@@ -127,74 +132,78 @@ describe T::Coerce do
 
     it 'raises an error' do
       expect {
-        T::Coerce[Param2].new.from({id: 1, info: 1})
+        TypeCoerce[Param2].new.from({id: 1, info: 1})
       }.to raise_error(ArgumentError)
     end
   end
 
   context 'when given primitive types' do
     it 'reveals the right type' do
-      T.assert_type!(T::Coerce[Integer].new.from(1), Integer)
-      T.assert_type!(T::Coerce[Integer].new.from('1.0'), Integer)
-      T.assert_type!(T::Coerce[T.nilable(Integer)].new.from(nil), T.nilable(Integer))
+      T.assert_type!(TypeCoerce[Integer].new.from(1), Integer)
+      T.assert_type!(TypeCoerce[Integer].new.from('1.0'), Integer)
+      T.assert_type!(TypeCoerce[T.nilable(Integer)].new.from(nil), T.nilable(Integer))
     end
 
     it 'coreces correctly' do
-      expect{T::Coerce[Integer].new.from(nil)}.to raise_error(TypeError)
-      expect(T::Coerce[T.nilable(Integer)].new.from(nil) || 1).to eql 1
-      expect(T::Coerce[Integer].new.from(2)).to eql 2
-      expect(T::Coerce[Integer].new.from('1.0')).to eql 1
+      expect{TypeCoerce[Integer].new.from(nil)}.to raise_error(TypeError)
+      expect(TypeCoerce[T.nilable(Integer)].new.from(nil) || 1).to eql 1
+      expect(TypeCoerce[Integer].new.from(2)).to eql 2
+      expect(TypeCoerce[Integer].new.from('1.0')).to eql 1
 
-      expect{T::Coerce[T.nilable(Integer)].new.from('invalid integer string')}.to raise_error(T::Coerce::CoercionError)
-      expect(T::Coerce[Float].new.from('1.0')).to eql 1.0
+      expect{TypeCoerce[T.nilable(Integer)].new.from('invalid integer string')}.to raise_error(TypeCoerce::CoercionError)
+      expect(TypeCoerce[Float].new.from('1.0')).to eql 1.0
 
-      expect(T::Coerce[T::Boolean].new.from('false')).to be false
-      expect(T::Coerce[T::Boolean].new.from('true')).to be true
+      expect(TypeCoerce[T::Boolean].new.from('false')).to be false
+      expect(TypeCoerce[T::Boolean].new.from('true')).to be true
 
-      expect(T::Coerce[T.nilable(Integer)].new.from('')).to be nil
-      expect{T::Coerce[T.nilable(Integer)].new.from([])}.to raise_error(T::Coerce::CoercionError)
-      expect(T::Coerce[T.nilable(String)].new.from('')).to eql ''
+      expect(TypeCoerce[T.nilable(Integer)].new.from('')).to be nil
+      expect{TypeCoerce[T.nilable(Integer)].new.from([])}.to raise_error(TypeCoerce::CoercionError)
+      expect(TypeCoerce[T.nilable(String)].new.from('')).to eql ''
     end
   end
 
   context 'when given custom types' do
     it 'coerces correctly' do
-      T.assert_type!(T::Coerce[CustomType].new.from(a: 1), CustomType)
-      expect(T::Coerce[CustomType].new.from(1).a).to be 1
+      obj = TypeCoerce[CustomType].new.from(1)
+      T.assert_type!(obj, CustomType)
+      expect(obj.a).to be 1
+      expect(TypeCoerce[CustomType].new.from(obj)).to be obj
 
-      expect{T::Coerce[UnsupportedCustomType].new.from(1)}.to raise_error(ArgumentError)
+      expect{TypeCoerce[UnsupportedCustomType].new.from(1)}.to raise_error(ArgumentError)
       # CustomType2.new(anything) returns Integer 1; 1.is_a?(CustomType2) == false
-      expect{T::Coerce[CustomType2].new.from(1)}.to raise_error(TypeError)
+      expect{TypeCoerce[CustomType2].new.from(1)}.to raise_error(TypeError)
     end
   end
 
   context 'when dealing with arries' do
     it 'coreces correctly' do
-      expect(T::Coerce[T::Array[Integer]].new.from(nil)).to eql []
-      expect(T::Coerce[T::Array[Integer]].new.from('')).to eql []
-      expect{T::Coerce[T::Array[Integer]].new.from('not an array')}.to raise_error(T::Coerce::ShapeError)
-      expect{T::Coerce[T::Array[Integer]].new.from('1')}.to raise_error(T::Coerce::ShapeError)
-      expect(T::Coerce[T::Array[Integer]].new.from(['1', '2', '3'])).to eql [1, 2, 3]
-      expect{T::Coerce[T::Array[Integer]].new.from(['1', 'invalid', '3'])}.to raise_error(T::Coerce::CoercionError)
-      expect{T::Coerce[T::Array[Integer]].new.from({a: 1})}.to raise_error(T::Coerce::CoercionError)
-
-      infos = T::Coerce[T::Array[ParamInfo]].new.from([{name: 'a', skill_ids: []}])
+      expect(TypeCoerce[T::Array[Integer]].new.from(nil)).to eql []
+      expect(TypeCoerce[T::Array[Integer]].new.from('')).to eql []
+      expect{TypeCoerce[T::Array[Integer]].new.from('not an array')}.to raise_error(TypeCoerce::ShapeError)
+      expect{TypeCoerce[T::Array[Integer]].new.from('1')}.to raise_error(TypeCoerce::ShapeError)
+      expect(TypeCoerce[T::Array[Integer]].new.from(['1', '2', '3'])).to eql [1, 2, 3]
+      expect{TypeCoerce[T::Array[Integer]].new.from(['1', 'invalid', '3'])}.to raise_error(TypeCoerce::CoercionError)
+      expect{TypeCoerce[T::Array[Integer]].new.from({a: 1})}.to raise_error(TypeCoerce::CoercionError)
+
+      infos = TypeCoerce[T::Array[ParamInfo]].new.from([{name: 'a', skill_ids: []}])
       T.assert_type!(infos, T::Array[ParamInfo])
       expect(infos.first.name).to eql 'a'
 
-      infos = T::Coerce[T::Array[ParamInfo]].new.from([{name: 'b', skill_ids: []}])
+      infos = TypeCoerce[T::Array[ParamInfo]].new.from([{name: 'b', skill_ids: []}])
       T.assert_type!(infos, T::Array[ParamInfo])
       expect(infos.first.name).to eql 'b'
 
       expect {
-        T::Coerce[ParamInfo2].new.from({a: nil, b: nil})
+        TypeCoerce[ParamInfo2].new.from({a: nil, b: nil})
       }.to raise_error(TypeError)
     end
   end
 
-  context 'when dealing with hashes'  do
+  context 'when dealing with hashes' do
     it 'coreces correctly' do
-      expect(T::Coerce[T::Hash[String, T::Boolean]].new.from({
+      expect(TypeCoerce[T::Hash[T.untyped, T.untyped]].new.from(nil)).to eql({})
+
+      expect(TypeCoerce[T::Hash[String, T::Boolean]].new.from({
         a: 'true',
         b: 'false',
       })).to eql({
@@ -202,21 +211,38 @@ describe T::Coerce do
         'b' => false,
       })
 
-      expect(T::Coerce[HashParams].new.from({
+      expect(TypeCoerce[HashParams].new.from({
         myhash: {'a' => '1', 'b' => '2'},
       }).myhash).to eql({'a' => 1, 'b' => 2})
 
+      expect(TypeCoerce[HashParamsWithDefault].new.from({}).myhash).to eql({'a' => 1})
 
       expect {
-        T::Coerce[T::Hash[String, T::Boolean]].new.from({
+        TypeCoerce[T::Hash[String, T::Boolean]].new.from({
           a: 'invalid',
           b: 'false',
         })
-      }.to raise_error(T::Coerce::CoercionError)
+      }.to raise_error(TypeCoerce::CoercionError)
+
+      expect {
+        TypeCoerce[T::Hash[String, Integer]].new.from(1)
+      }.to raise_error(TypeCoerce::ShapeError)
+    end
+  end
+
+  context 'when dealing with sets' do
+    it 'coreces correctly' do
+      expect(TypeCoerce[T::Set[Integer]].new.from(
+        Set.new(['1', '2', '3'])
+      )).to eq Set.new([1, 2, 3])
+
+      expect {
+        TypeCoerce[T::Set[Integer]].new.from(Set.new(['1', 'invalid', '3']))
+      }.to raise_error(TypeCoerce::CoercionError)
 
       expect {
-        T::Coerce[T::Hash[String, Integer]].new.from(1)
-      }.to raise_error(T::Coerce::ShapeError)
+        TypeCoerce[T::Set[Integer]].new.from(1)
+      }.to raise_error(TypeCoerce::ShapeError)
     end
   end
 
@@ -224,7 +250,14 @@ describe T::Coerce do
     MyType = T.type_alias(T::Boolean)
 
     it 'coerces correctly' do
-      expect(T::Coerce[MyType].new.from('false')).to be false
+      expect(TypeCoerce[MyType].new.from('false')).to be false
     end
   end
+
+  it 'works with T.untyped' do
+    expect(TypeCoerce[T.untyped].new.from(1)).to eql 1
+
+    obj = CustomType.new(1)
+    expect(TypeCoerce[T::Hash[String, T.untyped]].new.from({a: obj})).to eq({'a' => obj})
+  end
 end

data/spec/nested_spec.rb

@@ -2,7 +2,7 @@
 require 'sorbet-coerce'
 require 'sorbet-runtime'
 
-describe T::Coerce do
+describe TypeCoerce do
   context 'when given nested types' do
     class User < T::Struct
       const :id, Integer
@@ -15,7 +15,7 @@ describe T::Coerce do
     end
 
     it 'works with nest T::Struct' do
-      converted = T::Coerce[NestedParam].new.from({
+      converted = TypeCoerce[NestedParam].new.from({
         users: [{id: '1'}],
         params: {
           users: [{id: '2', valid: 'true'}],
@@ -42,16 +42,16 @@ describe T::Coerce do
 
     it 'works with nest T::Array' do
       expect {
-        T::Coerce[T::Array[T.nilable(Integer)]].new.from(['1', 'invalid', '3'])
-      }.to raise_error(T::Coerce::CoercionError)
+        TypeCoerce[T::Array[T.nilable(Integer)]].new.from(['1', 'invalid', '3'])
+      }.to raise_error(TypeCoerce::CoercionError)
       expect(
-        T::Coerce[T::Array[T::Array[Integer]]].new.from([nil])
+        TypeCoerce[T::Array[T::Array[Integer]]].new.from([nil])
       ).to eql([[]])
       expect(
-        T::Coerce[T::Array[T::Array[Integer]]].new.from([['1'], ['2'], ['3']]),
+        TypeCoerce[T::Array[T::Array[Integer]]].new.from([['1'], ['2'], ['3']]),
       ).to eql [[1], [2], [3]]
 
-      expect(T::Coerce[
+      expect(TypeCoerce[
         T::Array[
           T::Array[
             T::Array[User]
@@ -59,7 +59,7 @@ describe T::Coerce do
         ]
       ].new.from([[[{id: '1'}]]]).flatten.first.id).to eql(1)
 
-      expect(T::Coerce[
+      expect(TypeCoerce[
         T::Array[
           T::Array[
             T::Array[
@@ -71,9 +71,18 @@ describe T::Coerce do
         ]
       ].new.from([[[[[{id: 1}]]]]]).flatten.first.id).to eql 1
 
-      expect(T::Coerce[
+      expect(TypeCoerce[
         T.nilable(T::Array[T.nilable(T::Array[T.nilable(User)])])
       ].new.from([[{id: '1'}]]).flatten.map(&:id)).to eql([1])
     end
+
+    it 'works with nested T::Hash' do
+      expect(
+        TypeCoerce[T::Hash[Symbol, T::Hash[Symbol, Integer]]].new.from({
+          a: nil,
+          b: {c: '1'}
+        })
+      ).to eql({a: {}, b: {c: 1}})
+    end
   end
 end

data/spec/soft_error_spec.rb

@@ -2,12 +2,12 @@
 require 'sorbet-coerce'
 require 'sorbet-runtime'
 
-describe T::Coerce do
+describe TypeCoerce do
   context 'when type errors are soft errors' do
     let(:ignore_error) { Proc.new {} }
 
     before(:each) do
-      allow(T::Coerce::Configuration).to receive(
+      allow(TypeCoerce::Configuration).to receive(
         :raise_coercion_error,
       ).and_return(false)
 
@@ -42,24 +42,24 @@ describe T::Coerce do
 
     it 'overwrites the global config when inline config is set' do
       expect {
-        T::Coerce[Integer].new.from(invalid_arg, raise_coercion_error: true)
-      }.to raise_error(T::Coerce::CoercionError)
+        TypeCoerce[Integer].new.from(invalid_arg, raise_coercion_error: true)
+      }.to raise_error(TypeCoerce::CoercionError)
     end
 
     it 'works as expected' do
-      expect(T::Coerce[Integer].new.from(invalid_arg)).to eql(nil)
+      expect(TypeCoerce[Integer].new.from(invalid_arg)).to eql(nil)
 
-      expect{T::Coerce[T::Array[Integer]].new.from(1)}.to raise_error(T::Coerce::ShapeError)
-      expect(T::Coerce[T::Array[Integer]].new.from({a: 1})).to eql([nil])
+      expect{TypeCoerce[T::Array[Integer]].new.from(1)}.to raise_error(TypeCoerce::ShapeError)
+      expect(TypeCoerce[T::Array[Integer]].new.from({a: 1})).to eql([nil])
 
       expect {
-        T::Coerce[CustomTypeRaisesHardError].new.from(1)
+        TypeCoerce[CustomTypeRaisesHardError].new.from(1)
       }.to raise_error(StandardError)
-      expect(T::Coerce[CustomTypeDoesNotRiaseHardError].new.from(1)).to eql(1)
+      expect(TypeCoerce[CustomTypeDoesNotRiaseHardError].new.from(1)).to eql(1)
 
       sorbet_version = Gem.loaded_specs['sorbet-runtime'].version
       if sorbet_version >= Gem::Version.new('0.4.4948')
-        expect(T::Coerce[ParamsWithSortError].new.from({a: invalid_arg}).a).to eql(nil)
+        expect(TypeCoerce[ParamsWithSortError].new.from({a: invalid_arg}).a).to eql(nil)
       end
     end
   end

data/spec/sorbet_test_cases.rb

@@ -1,22 +1,22 @@
 # typed: true
 require 'sorbet-coerce'
 
-T.assert_type!(T::Coerce[Integer].new.from('1'), Integer)
+T.assert_type!(TypeCoerce[Integer].new.from('1'), Integer)
 T.assert_type!(
-  T::Coerce[T.nilable(Integer)].new.from('invalid', raise_coercion_error: false),
+  TypeCoerce[T.nilable(Integer)].new.from('invalid', raise_coercion_error: false),
   T.nilable(Integer),
 )
 
-T::Coerce::Configuration.raise_coercion_error = true
+TypeCoerce::Configuration.raise_coercion_error = true
 coercion_error = nil
 begin
-  T::Coerce[T.nilable(Integer)].new.from('invalid')
-rescue T::Coerce::CoercionError => e
+  TypeCoerce[T.nilable(Integer)].new.from('invalid')
+rescue TypeCoerce::CoercionError => e
   coercion_error = e
 end
 raise 'no coercion error is raised' unless coercion_error
 
 T.assert_type!(
-  T::Coerce[T.nilable(Integer)].new.from('invalid', raise_coercion_error: false),
+  TypeCoerce[T.nilable(Integer)].new.from('invalid', raise_coercion_error: false),
   T.nilable(Integer),
 )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-coerce
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.7
 platform: ruby
 authors:
 - Chan Zuckerberg Initiative
@@ -118,10 +118,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/configuration.rb
-- lib/private/converter.rb
+- lib/bundled_rbi/sorbet-coerce.rbi
 - lib/sorbet-coerce.rb
-- rbi/sorbet-coerce.rbi
+- lib/sorbet-coerce/configuration.rb
+- lib/sorbet-coerce/converter.rb
 - spec/coerce_spec.rb
 - spec/nested_spec.rb
 - spec/soft_error_spec.rb
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: A type coercion lib works with Sorbet's static type checker and type definitions;

data/lib/private/converter.rb

@@ -1,137 +0,0 @@
-# typed: strict
-require 'safe_type'
-require 'sorbet-runtime'
-require 'polyfill'
-
-using Polyfill(Hash: %w[#slice])
-
-module T::Private
-  class Converter
-    extend T::Sig
-
-    PRIMITIVE_TYPES = T.let(::Set[
-      Date,
-      DateTime,
-      Float,
-      Integer,
-      String,
-      Symbol,
-      Time,
-    ], T.untyped)
-
-    protected
-    sig { params(value: T.untyped, type: T.untyped, raise_coercion_error: T::Boolean).returns(T.untyped) }
-    def _convert(value, type, raise_coercion_error)
-      if type.is_a?(T::Types::TypedArray)
-        _convert_to_a(value, type.type, raise_coercion_error)
-      elsif type.is_a?(T::Types::Simple)
-        _convert(value, type.raw_type, raise_coercion_error)
-      elsif type.is_a?(T::Types::Union)
-        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
-
-        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, raise_coercion_error)
-        else
-          _convert(value, type.types[nil_idx == 0 ? 1 : 0], raise_coercion_error)
-        end
-      elsif type.is_a?(T::Types::TypedHash)
-        unless value.respond_to?(:map)
-          raise T::Coerce::ShapeError.new(value, type)
-        end
-
-        value.map do |k, v|
-          [
-            _convert(k, type.keys, raise_coercion_error),
-            _convert(v, type.values, raise_coercion_error),
-          ]
-        end.to_h
-      elsif Object.const_defined?('T::Private::Types::TypeAlias') &&
-            type.is_a?(T::Private::Types::TypeAlias)
-        _convert(value, type.aliased_type, raise_coercion_error)
-      elsif type < T::Struct
-        args = _build_args(value, type, raise_coercion_error)
-        type.new(args)
-      else
-        _convert_simple(value, type, raise_coercion_error)
-      end
-    end
-
-    sig { params(value: T.untyped, type: T.untyped, raise_coercion_error: T::Boolean).returns(T.untyped) }
-    def _convert_simple(value, type, raise_coercion_error)
-      return nil if _nil_like?(value, type)
-
-      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)
-        safe_type_rule = SafeType.const_get(type.name).strict
-      else
-        safe_type_rule = type
-      end
-      SafeType::coerce(value, safe_type_rule)
-    rescue SafeType::EmptyValueError, SafeType::CoercionError
-      if raise_coercion_error
-        raise T::Coerce::CoercionError.new(value, type)
-      else
-        nil
-      end
-    rescue SafeType::InvalidRuleError
-      type.new(value)
-    end
-
-    sig { params(ary: T.untyped, type: T.untyped, raise_coercion_error: T::Boolean).returns(T.untyped) }
-    def _convert_to_a(ary, type, raise_coercion_error)
-      return [] if _nil_like?(ary, type)
-
-      unless ary.respond_to?(:map)
-        raise T::Coerce::ShapeError.new(ary, type)
-      end
-
-      ary.map { |value| _convert(value, type, raise_coercion_error) }
-    end
-
-    sig { params(args: T.untyped, type: T.untyped, raise_coercion_error: T::Boolean).returns(T.untyped) }
-    def _build_args(args, type, raise_coercion_error)
-      return {} if _nil_like?(args, Hash)
-
-      unless args.respond_to?(:each_pair)
-        raise T::Coerce::ShapeError.new(args, type)
-      end
-
-      props = type.props
-      args.map { |name, value|
-        key = name.to_sym
-        [
-          key,
-          (!props.include?(key) || value.nil?) ?
-            nil : _convert(value, props[key][:type], raise_coercion_error),
-        ]
-      }.to_h.slice(*props.keys)
-    end
-
-    sig { params(value: T.untyped, type: T.untyped).returns(T::Boolean) }
-    def _nil_like?(value, type)
-      value.nil? || (value == '' && type != String)
-    end
-  end
-end

data/rbi/sorbet-coerce.rbi

@@ -1,27 +0,0 @@
-# typed: true
-module SafeType
-  class CoercionError < StandardError; end
-end
-
-module T
-  module Coerce
-    extend T::Sig
-    extend T::Generic
-
-    Elem = type_member
-
-    sig { params(args: T.untyped, raise_coercion_error: T.nilable(T::Boolean)).returns(Elem) }
-    def from(args, raise_coercion_error: nil); end
-
-    class CoercionError < SafeType::CoercionError; end
-    class ShapeError < SafeType::CoercionError; end
-  end
-
-  module Private
-    module Types
-      class TypeAlias
-        def aliased_type; end
-      end
-    end
-  end
-end