sorbet-coerce 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61b6f639daa4889060a9540e4fd31f7fbfe19529dac7246a91dc4ea9355b9d70
-  data.tar.gz: 7d0ec3164d26cbf16bc45e94820f02142197191e3cc7ae4db7e8c21db351a0f3
+  metadata.gz: 017a474302bad34d6523e0140f0a221419874ddb6488f5cde3075458c54a245e
+  data.tar.gz: '0822f50c595a31bd377ff359d7e05f42ef60a2c4a9dd46915527dcf47c344081'
 SHA512:
-  metadata.gz: d2ce360c7fd4474d57e3fc5b1115d3711ae41b177a60dcc2f07239f602aab45ab2a6a0ba429df9d7d2edc7df4689cac4f76d3b363ebd055b5b9a53be551e6e83
-  data.tar.gz: 3a3af86be35e961882e11a326e4609376eb3a2fd6a30658be044559fad9b56feabeeae226b91fb85f6b515304a9f982d40e1aaebc9b3a462c076031c1418dfd4
+  metadata.gz: e105f8b039d77562b9a03ed58cc55cebb2e55a526917d1965c2fce7e410869d8bb9ea1d94e50f8086d298bf818eb63b5fb6293326e073621f6dc66450d6632c8
+  data.tar.gz: 2c0be667253b77c2e84930cf1fa526b01ed79c3cb603b708e2256958d3def7679adb275cbeccee3f5e7e6649408445c43d3bb6892281fe42efaa511464963fbc

data/lib/sorbet-coerce.rb

@@ -1,23 +1,8 @@
-# typed: strict
-require 'sorbet-coerce/configuration'
+# typed: ignore
 require 'sorbet-coerce/converter'
-require 'safe_type'
 
 module TypeCoerce
-  class CoercionError < SafeType::CoercionError; end
-  class ShapeError < SafeType::CoercionError; end
-
-  define_singleton_method(:[]) do |type|
-    Class.new(TypeCoerce::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 = TypeCoerce::Configuration.raise_coercion_error
-        end
-
-        T.send('let', send('_convert', args, type, raise_coercion_error), type)
-      end
-    end
+  def self.[](type)
+    TypeCoerce::Converter.new(type)
   end
 end

data/lib/sorbet-coerce/converter.rb

@@ -1,153 +1,169 @@
-# typed: strict
+# typed: ignore
+require 'polyfill'
 require 'safe_type'
 require 'set'
 require 'sorbet-runtime'
-require 'polyfill'
+require 'sorbet-coerce/configuration'
 
 using Polyfill(Hash: %w[#slice])
 
-module TypeCoerce; end
-
-module TypeCoerce::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::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)
+module TypeCoerce
+  class CoercionError < SafeType::CoercionError; end
+  class ShapeError < SafeType::CoercionError; end
+end
 
-        _convert_simple(value, type, raise_coercion_error)
-      end
-    end
+class TypeCoerce::Converter
+  def initialize(type)
+    @type = type
+  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)
+  def new
+    self
+  end
 
-      safe_type_rule = T.let(nil, T.untyped)
+  def to_s
+    "#{name}#[#{@type.to_s}]"
+  end
 
-      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
+  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
 
-      if safe_type_rule.is_a?(SafeType::Rule)
-        SafeType::coerce(value, safe_type_rule)
+      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
-        type.new(value)
+        _convert(value, type.types[nil_idx == 0 ? 1 : 0], raise_coercion_error)
       end
-    rescue SafeType::EmptyValueError, SafeType::CoercionError
-      if raise_coercion_error
-        raise TypeCoerce::CoercionError.new(value, type)
-      else
-        nil
+    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
 
-    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)
+  def _convert_simple(value, type, raise_coercion_error)
+    return nil if _nil_like?(value, type)
 
-      unless ary.respond_to?(:map)
-        raise TypeCoerce::ShapeError.new(ary, type)
-      end
+    safe_type_rule = T.let(nil, T.untyped)
 
-      ary.map { |value| _convert(value, type, raise_coercion_error) }
+    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
 
-    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)
+    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
 
-      unless args.respond_to?(:each_pair)
-        raise TypeCoerce::ShapeError.new(args, type)
-      end
+  def _convert_to_a(ary, type, raise_coercion_error)
+    return [] if _nil_like?(ary, type)
 
-      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)
+    unless ary.respond_to?(:map)
+      raise TypeCoerce::ShapeError.new(ary, type)
     end
 
-    sig { params(value: T.untyped, type: T.untyped).returns(T::Boolean) }
-    def _nil_like?(value, type)
-      value.nil? || (value == '' && type != String)
+    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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-coerce
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Chan Zuckerberg Initiative
@@ -122,7 +122,6 @@ files:
 - lib/sorbet-coerce.rb
 - lib/sorbet-coerce/configuration.rb
 - lib/sorbet-coerce/converter.rb
-- lib/sorbet-coerce/coverter.rbi
 - spec/coerce_spec.rb
 - spec/nested_spec.rb
 - spec/soft_error_spec.rb
@@ -148,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/sorbet-coerce/coverter.rbi

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