sorbet-coerce 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f267197b77c7b2c9ed7558ad7f94818fc54f9af5fc56c99c9d824af47e40bf78
-  data.tar.gz: 04da4e2a3ebdde38cf4d2e6d60200c365d371250f9d33f588f67adc5b766c6b2
+  metadata.gz: 8c5679d22c95a68cf624bef8a9d3f0c62b9b33f158b439b4115b2cb2f18dc508
+  data.tar.gz: f74881e16d72bb4b07b5de8072ef1f10d7794e8e6af249f9edcf132628a3a0e2
 SHA512:
-  metadata.gz: 6ee1d39f9e9b12ebdb2d3f1f9c4066ef2f7707329dfe10ab3330fc33b9e943ae9560028ec467203efad12bad567eb5b226ae4669be0b378bf1897a3ca84fbe37
-  data.tar.gz: a989b4a83745234e88e5c1ba5f26bda2d57be9ec0f61d26d4ece75f5db68bc88130fad68ec9fd43c6a4a44ae263231b65c8a0235bd34188b9c875f377ad9ddee
+  metadata.gz: 5f0a4df69764c02a35aba2101740beb6445bc77dec5f5edea12c31c7db18837696153e4f41ab5604ba374a610a203377ec38f621c2d93f5e58a57d72e6e05b4b
+  data.tar.gz: 334a49158e79661994d826dbd5845b071260d66f5ffeae49d45d22c6c62a2deeeccb11fe3efe8e616856c2eb3bf60c12031795c4cace5817b87e6ca7ebfa633f

data/{rbi → lib/bundled_rbi}/sorbet-coerce.rbi

@@ -15,13 +15,3 @@ module TypeCoerce
   class CoercionError < SafeType::CoercionError; end
   class ShapeError < SafeType::CoercionError; end
 end
-
-module T
-  module Private
-    module Types
-      class TypeAlias
-        def aliased_type; end
-      end
-    end
-  end
-end

data/lib/private/converter.rb

@@ -59,6 +59,8 @@ module TypeCoerce::Private
           _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
@@ -72,7 +74,7 @@ module TypeCoerce::Private
       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
+      elsif type.respond_to?(:<) && type < T::Struct
         args = _build_args(value, type, raise_coercion_error)
         type.new(args)
       else
@@ -95,15 +97,18 @@ module TypeCoerce::Private
       else
         safe_type_rule = type
       end
-      SafeType::coerce(value, safe_type_rule)
+
+      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
-    rescue SafeType::InvalidRuleError
-      type.new(value)
     end
 
     sig { params(ary: T.untyped, type: T.untyped, raise_coercion_error: T::Boolean).returns(T.untyped) }

data/lib/private/coverter.rbi

@@ -0,0 +1,10 @@
+# typed: true
+module T
+  module Private
+    module Types
+      class TypeAlias
+        def aliased_type; end
+      end
+    end
+  end
+end

data/spec/coerce_spec.rb

@@ -31,6 +31,10 @@ describe TypeCoerce 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
 
@@ -194,6 +198,8 @@ describe TypeCoerce do
 
   context 'when dealing with hashes' do
     it 'coreces correctly' do
+      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',
@@ -206,6 +212,7 @@ describe TypeCoerce do
         myhash: {'a' => '1', 'b' => '2'},
       }).myhash).to eql({'a' => 1, 'b' => 2})
 
+      expect(TypeCoerce[HashParamsWithDefault].new.from({}).myhash).to eql({'a' => 1})
 
       expect {
         TypeCoerce[T::Hash[String, T::Boolean]].new.from({

data/spec/nested_spec.rb

@@ -75,5 +75,14 @@ describe TypeCoerce do
         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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-coerce
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Chan Zuckerberg Initiative
@@ -118,10 +118,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/bundled_rbi/sorbet-coerce.rbi
 - lib/configuration.rb
 - lib/private/converter.rb
+- lib/private/coverter.rbi
 - lib/sorbet-coerce.rb
-- rbi/sorbet-coerce.rbi
 - spec/coerce_spec.rb
 - spec/nested_spec.rb
 - spec/soft_error_spec.rb