sorbet-runtime 0.5.11176 → 0.5.11212

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

@@ -7,6 +7,7 @@ module T::Props
       extend T::Sig
 
       SetterProc = T.type_alias {T.proc.params(val: T.untyped).void}
+      ValueValidationProc = T.type_alias {T.proc.params(val: T.untyped).void}
       ValidateProc = T.type_alias {T.proc.params(prop: Symbol, value: T.untyped).void}
 
       sig do
@@ -15,7 +16,7 @@ module T::Props
           prop: Symbol,
           rules: T::Hash[Symbol, T.untyped]
         )
-        .returns(SetterProc)
+        .returns([SetterProc, ValueValidationProc])
         .checked(:never)
       end
       def self.build_setter_proc(klass, prop, rules)
@@ -55,20 +56,32 @@ module T::Props
           non_nil_type: Module,
           klass: T.all(Module, T::Props::ClassMethods),
         )
-        .returns(SetterProc)
+        .returns([SetterProc, ValueValidationProc])
       end
       private_class_method def self.simple_non_nil_proc(prop, accessor_key, non_nil_type, klass)
-        proc do |val|
-          unless val.is_a?(non_nil_type)
-            T::Props::Private::SetterFactory.raise_pretty_error(
-              klass,
-              prop,
-              T::Utils.coerce(non_nil_type),
-              val,
-            )
-          end
-          instance_variable_set(accessor_key, val)
-        end
+        [
+          proc do |val|
+            unless val.is_a?(non_nil_type)
+              T::Props::Private::SetterFactory.raise_pretty_error(
+                klass,
+                prop,
+                T::Utils.coerce(non_nil_type),
+                val,
+              )
+            end
+            instance_variable_set(accessor_key, val)
+          end,
+          proc do |val|
+            unless val.is_a?(non_nil_type)
+              T::Props::Private::SetterFactory.raise_pretty_error(
+                klass,
+                prop,
+                T::Utils.coerce(non_nil_type),
+                val,
+              )
+            end
+          end,
+        ]
       end
 
       sig do
@@ -79,27 +92,46 @@ module T::Props
           klass: T.all(Module, T::Props::ClassMethods),
           validate: T.nilable(ValidateProc)
         )
-        .returns(SetterProc)
+        .returns([SetterProc, ValueValidationProc])
       end
       private_class_method def self.non_nil_proc(prop, accessor_key, non_nil_type, klass, validate)
-        proc do |val|
-          # this use of recursively_valid? is intentional: unlike for
-          # methods, we want to make sure data at the 'edge'
-          # (e.g. models that go into databases or structs serialized
-          # from disk) are correct, so we use more thorough runtime
-          # checks there
-          if non_nil_type.recursively_valid?(val)
-            validate&.call(prop, val)
-          else
-            T::Props::Private::SetterFactory.raise_pretty_error(
-              klass,
-              prop,
-              non_nil_type,
-              val,
-            )
-          end
-          instance_variable_set(accessor_key, val)
-        end
+        [
+          proc do |val|
+            # this use of recursively_valid? is intentional: unlike for
+            # methods, we want to make sure data at the 'edge'
+            # (e.g. models that go into databases or structs serialized
+            # from disk) are correct, so we use more thorough runtime
+            # checks there
+            if non_nil_type.recursively_valid?(val)
+              validate&.call(prop, val)
+            else
+              T::Props::Private::SetterFactory.raise_pretty_error(
+                klass,
+                prop,
+                non_nil_type,
+                val,
+              )
+            end
+            instance_variable_set(accessor_key, val)
+          end,
+          proc do |val|
+            # this use of recursively_valid? is intentional: unlike for
+            # methods, we want to make sure data at the 'edge'
+            # (e.g. models that go into databases or structs serialized
+            # from disk) are correct, so we use more thorough runtime
+            # checks there
+            if non_nil_type.recursively_valid?(val)
+              validate&.call(prop, val)
+            else
+              T::Props::Private::SetterFactory.raise_pretty_error(
+                klass,
+                prop,
+                non_nil_type,
+                val,
+              )
+            end
+          end,
+        ]
       end
 
       sig do
@@ -109,24 +141,32 @@ module T::Props
           non_nil_type: Module,
           klass: T.all(Module, T::Props::ClassMethods),
         )
-        .returns(SetterProc)
+        .returns([SetterProc, ValueValidationProc])
       end
       private_class_method def self.simple_nilable_proc(prop, accessor_key, non_nil_type, klass)
-        proc do |val|
-          if val.nil?
-            instance_variable_set(accessor_key, nil)
-          elsif val.is_a?(non_nil_type)
-            instance_variable_set(accessor_key, val)
-          else
-            T::Props::Private::SetterFactory.raise_pretty_error(
-              klass,
-              prop,
-              T::Utils.coerce(non_nil_type),
-              val,
-            )
+        [
+          proc do |val|
+            unless val.nil? || val.is_a?(non_nil_type)
+              T::Props::Private::SetterFactory.raise_pretty_error(
+                klass,
+                prop,
+                T::Utils.coerce(non_nil_type),
+                val,
+              )
+            end
             instance_variable_set(accessor_key, val)
-          end
-        end
+          end,
+          proc do |val|
+            unless val.nil? || val.is_a?(non_nil_type)
+              T::Props::Private::SetterFactory.raise_pretty_error(
+                klass,
+                prop,
+                T::Utils.coerce(non_nil_type),
+                val,
+              )
+            end
+          end,
+        ]
       end
 
       sig do
@@ -137,30 +177,50 @@ module T::Props
           klass: T.all(Module, T::Props::ClassMethods),
           validate: T.nilable(ValidateProc),
         )
-        .returns(SetterProc)
+        .returns([SetterProc, ValueValidationProc])
       end
       private_class_method def self.nilable_proc(prop, accessor_key, non_nil_type, klass, validate)
-        proc do |val|
-          if val.nil?
-            instance_variable_set(accessor_key, nil)
-          # this use of recursively_valid? is intentional: unlike for
-          # methods, we want to make sure data at the 'edge'
-          # (e.g. models that go into databases or structs serialized
-          # from disk) are correct, so we use more thorough runtime
-          # checks there
-          elsif non_nil_type.recursively_valid?(val)
-            validate&.call(prop, val)
-            instance_variable_set(accessor_key, val)
-          else
-            T::Props::Private::SetterFactory.raise_pretty_error(
-              klass,
-              prop,
-              non_nil_type,
-              val,
-            )
-            instance_variable_set(accessor_key, val)
-          end
-        end
+        [
+          proc do |val|
+            if val.nil?
+              instance_variable_set(accessor_key, nil)
+            # this use of recursively_valid? is intentional: unlike for
+            # methods, we want to make sure data at the 'edge'
+            # (e.g. models that go into databases or structs serialized
+            # from disk) are correct, so we use more thorough runtime
+            # checks there
+            elsif non_nil_type.recursively_valid?(val)
+              validate&.call(prop, val)
+              instance_variable_set(accessor_key, val)
+            else
+              T::Props::Private::SetterFactory.raise_pretty_error(
+                klass,
+                prop,
+                non_nil_type,
+                val,
+              )
+              instance_variable_set(accessor_key, val)
+            end
+          end,
+          proc do |val|
+            if val.nil?
+            # this use of recursively_valid? is intentional: unlike for
+            # methods, we want to make sure data at the 'edge'
+            # (e.g. models that go into databases or structs serialized
+            # from disk) are correct, so we use more thorough runtime
+            # checks there
+            elsif non_nil_type.recursively_valid?(val)
+              validate&.call(prop, val)
+            else
+              T::Props::Private::SetterFactory.raise_pretty_error(
+                klass,
+                prop,
+                non_nil_type,
+                val,
+              )
+            end
+          end,
+        ]
       end
 
       sig do

data/lib/types/types/typed_enumerable.rb

@@ -54,7 +54,7 @@ module T::Types
         value_type = types[1]
         obj.each_pair do |key, val|
           # Some objects (I'm looking at you Rack::Utils::HeaderHash) don't
-          # iterate over a [key, value] array, so we can't juse use the type.recursively_valid?(v)
+          # iterate over a [key, value] array, so we can't just use the type.recursively_valid?(v)
           return false if !key_type.recursively_valid?(key) || !value_type.recursively_valid?(val)
         end
         true

data/lib/types/types/typed_hash.rb

@@ -26,12 +26,6 @@ module T::Types
       @type ||= T::Utils.coerce([keys, values])
     end
 
-    def build_type
-      keys
-      values
-      super
-    end
-
     # overrides Base
     def name
       "T::Hash[#{keys.name}, #{values.name}]"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.5.11176
+  version: 0.5.11212
 platform: ruby
 authors:
 - Stripe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-05 00:00:00.000000000 Z
+date: 2024-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -165,7 +165,6 @@ files:
 - lib/types/enum.rb
 - lib/types/generic.rb
 - lib/types/helpers.rb
-- lib/types/interface_wrapper.rb
 - lib/types/non_forcing_constants.rb
 - lib/types/private/abstract/data.rb
 - lib/types/private/abstract/declare.rb

data/lib/types/interface_wrapper.rb

@@ -1,162 +0,0 @@
-# frozen_string_literal: true
-# typed: false
-
-# Wraps an object, exposing only the methods defined on a given class/module. The idea is that, in
-# the absence of a static type checker that would prevent you from calling non-Bar methods on a
-# variable of type Bar, we can use these wrappers as a way of enforcing it at runtime.
-#
-# Once we ship static type checking, we should get rid of this entirely.
-class T::InterfaceWrapper
-  extend T::Sig
-
-  module Helpers
-    def wrap_instance(obj)
-      T::InterfaceWrapper.wrap_instance(obj, self)
-    end
-
-    def wrap_instances(arr)
-      T::InterfaceWrapper.wrap_instances(arr, self)
-    end
-  end
-
-  private_class_method :new # use `wrap_instance`
-
-  def self.wrap_instance(obj, interface_mod)
-    wrapper = wrapped_dynamic_cast(obj, interface_mod)
-    if wrapper.nil?
-      raise "#{obj.class} cannot be cast to #{interface_mod}"
-    end
-    wrapper
-  end
-
-  sig do
-    params(
-      arr: Array,
-      interface_mod: T.untyped
-    )
-    .returns(Array)
-  end
-  def self.wrap_instances(arr, interface_mod)
-    arr.map {|instance| self.wrap_instance(instance, interface_mod)}
-  end
-
-  def initialize(target_obj, interface_mod)
-    if target_obj.is_a?(T::InterfaceWrapper)
-      # wrapped_dynamic_cast should guarantee this never happens.
-      raise "Unexpected: wrapping a wrapper. Please report this bug at https://github.com/sorbet/sorbet/issues"
-    end
-
-    if !target_obj.is_a?(interface_mod)
-      # wrapped_dynamic_cast should guarantee this never happens.
-      raise "Unexpected: `is_a?` failed. Please report this bug at https://github.com/sorbet/sorbet/issues"
-    end
-
-    if target_obj.class == interface_mod
-      # wrapped_dynamic_cast should guarantee this never happens.
-      raise "Unexpected: exact class match. Please report this bug at https://github.com/sorbet/sorbet/issues"
-    end
-
-    @target_obj = target_obj
-    @interface_mod = interface_mod
-    self_methods = self.class.self_methods
-
-    # If perf becomes an issue, we can define these on an anonymous subclass, and keep a cache
-    # so we only need to do it once per unique `interface_mod`
-    T::Utils.methods_excluding_object(interface_mod).each do |method_name|
-      if self_methods.include?(method_name)
-        raise "interface_mod has a method that conflicts with #{self.class}: #{method_name}"
-      end
-
-      define_singleton_method(method_name) do |*args, &blk|
-        target_obj.send(method_name, *args, &blk)
-      end
-
-      if singleton_class.respond_to?(:ruby2_keywords, true)
-        singleton_class.send(:ruby2_keywords, method_name)
-      end
-
-      if target_obj.singleton_class.public_method_defined?(method_name)
-        # no-op, it's already public
-      elsif target_obj.singleton_class.protected_method_defined?(method_name)
-        singleton_class.send(:protected, method_name)
-      elsif target_obj.singleton_class.private_method_defined?(method_name)
-        singleton_class.send(:private, method_name)
-      else
-        raise "This should never happen. Report this bug at https://github.com/sorbet/sorbet/issues"
-      end
-    end
-  end
-
-  def kind_of?(other)
-    is_a?(other)
-  end
-
-  def is_a?(other)
-    if !other.is_a?(Module)
-      raise TypeError.new("class or module required")
-    end
-
-    # This makes is_a? return true for T::InterfaceWrapper (and its ancestors),
-    # as well as for @interface_mod and its ancestors.
-    self.class <= other || @interface_mod <= other
-  end
-
-  # Prefixed because we're polluting the namespace of the interface we're wrapping, and we don't
-  # want anyone else (besides dynamic_cast) calling it.
-  def __target_obj_DO_NOT_USE # rubocop:disable Naming/MethodName
-    @target_obj
-  end
-
-  # Prefixed because we're polluting the namespace of the interface we're wrapping, and we don't
-  # want anyone else (besides wrapped_dynamic_cast) calling it.
-  def __interface_mod_DO_NOT_USE # rubocop:disable Naming/MethodName
-    @interface_mod
-  end
-
-  # "Cast" an object to another type. If `obj` is an InterfaceWrapper, returns the the wrapped
-  # object if that matches `type`. Otherwise, returns `obj` if it matches `type`. Otherwise,
-  # returns nil.
-  #
-  # @param obj [Object] object to cast
-  # @param mod [Module] type to cast `obj` to
-  #
-  # @example
-  #   if (impl = T::InterfaceWrapper.dynamic_cast(iface, MyImplementation))
-  #     impl.do_things
-  #   end
-  def self.dynamic_cast(obj, mod)
-    if obj.is_a?(T::InterfaceWrapper)
-      target_obj = obj.__target_obj_DO_NOT_USE
-      target_obj.is_a?(mod) ? target_obj : nil
-    elsif obj.is_a?(mod)
-      obj
-    else
-      nil
-    end
-  end
-
-  # Like dynamic_cast, but puts the result in its own wrapper if necessary.
-  #
-  # @param obj [Object] object to cast
-  # @param mod [Module] type to cast `obj` to
-  def self.wrapped_dynamic_cast(obj, mod)
-    # Avoid unwrapping and creating an equivalent wrapper.
-    if obj.is_a?(T::InterfaceWrapper) && obj.__interface_mod_DO_NOT_USE == mod
-      return obj
-    end
-
-    cast_obj = dynamic_cast(obj, mod)
-    if cast_obj.nil?
-      nil
-    elsif cast_obj.class == mod
-      # Nothing to wrap, they want the full class
-      cast_obj
-    else
-      new(cast_obj, mod)
-    end
-  end
-
-  def self.self_methods
-    @self_methods ||= self.instance_methods(false).to_set
-  end
-end