sorbet-runtime 0.5.5439 → 0.5.5449

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15b884405afe5ef1a9261206433553142c10166302d6bcc80e9ffed82343ac4c
-  data.tar.gz: 2c5a550e1d9b9363cacefc36ce53fa86a3b36bde40f6f018e8bfad4632130a5b
+  metadata.gz: 86d060de12c48696ab8a6c9647bb57c006d71c23cd8e1256796b3057a436c050
+  data.tar.gz: 16a69f327d8477a9f8c0ea2320a226037489ad58fa0dab940a863819365c6ad5
 SHA512:
-  metadata.gz: '0038a4dd9590fd6c8cdd30c41eea8767f2ad6c30e779979e8d4b880132c8d352343d0a46ef1ef1852edcadc157b28b09e498d356721d518734817e0759958aa1'
-  data.tar.gz: c6e0dad262a7105db18b126d8fc01168ec3a3a7c5f6982f1753368561d77540b40384f7cfaed50e38e94767ff136a306c22d377b0c6db6ee965cd3d44f14a793
+  metadata.gz: eee05964b0496ec92f20dd35f425c375b7e5f20a856ef84a450383a5f164e62a76d0c94cda65074624b9730c6975563e3e9946525acccc532530d8fbce93540a
+  data.tar.gz: 0eed76a0fa31537f0362bc779b8787d59457c3c882d53432412b03a20015d77dbccb89556235a412d91a966fe45f8866e313dc9b352b6f53c52a7de38ae0ddc9

data/lib/types/props/generated_code_validation.rb

@@ -148,7 +148,24 @@ module T::Props
       assert_equal(s(:op_asgn, s(:lvasgn, :found), :-, s(:int, 1)), found_else_body)
 
       validate_deserialize_handle_nil(handle_nil)
-      validate_lack_of_side_effects(else_body, whitelisted_methods_for_deserialize)
+
+      if else_body.type == :kwbegin
+        rescue_expression, = else_body.children
+        assert_equal(:rescue, rescue_expression.type)
+
+        try, rescue_body = rescue_expression.children
+        validate_lack_of_side_effects(try, whitelisted_methods_for_deserialize)
+
+        assert_equal(:resbody, rescue_body.type)
+        exceptions, assignment, handler =  rescue_body.children
+        assert_equal(:array, exceptions.type)
+        exceptions.children.each {|c| assert_equal(:const, c.type)}
+        assert_equal(:lvasgn, assignment.type)
+        assert_equal([:e], assignment.children)
+        validate_lack_of_side_effects(handler, whitelisted_methods_for_deserialize)
+      else
+        validate_lack_of_side_effects(else_body, whitelisted_methods_for_deserialize)
+      end
     end
 
     private_class_method def self.validate_deserialize_handle_nil(node)
@@ -244,7 +261,7 @@ module T::Props
     private_class_method def self.whitelisted_methods_for_deserialize
       @whitelisted_methods_for_deserialize ||= {
         :lvar => %i{dup map transform_values transform_keys each_with_object nil? []=},
-        :const => %i{deserialize from_hash deep_clone_object},
+        :const => %i{deserialize from_hash deep_clone_object soft_assert_handler},
       }
     end
   end

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

@@ -43,11 +43,33 @@ module T::Props
           ivar_name = rules.fetch(:accessor_key).to_s
           raise unless ivar_name.start_with?('@') && T::Props::Decorator::SAFE_NAME.match?(ivar_name[1..-1])
 
-          transformed_val = SerdeTransform.generate(
+          transformation = SerdeTransform.generate(
             T::Utils::Nilable.get_underlying_type_object(rules.fetch(:type_object)),
             SerdeTransform::Mode::DESERIALIZE,
             'val'
-          ) || 'val'
+          )
+          if transformation
+            # Rescuing exactly NoMethodError is intended as a temporary hack
+            # to preserve the semantics from before codegen. More generally
+            # we are inconsistent about typechecking on deser and need to decide
+            # our strategy here.
+            transformed_val = <<~RUBY
+              begin
+                #{transformation}
+              rescue NoMethodError => e
+                T::Configuration.soft_assert_handler(
+                  'Deserialization error (probably unexpected stored type)',
+                  klass: self.class,
+                  prop: #{prop.inspect},
+                  value: val,
+                  error: e.message
+                )
+                val
+              end
+            RUBY
+          else
+            transformed_val = 'val'
+          end
 
           nil_handler = generate_nil_handler(
             prop: prop,

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

@@ -69,6 +69,16 @@ module T::Props
             handle_serializable_subtype(varname, raw, mode)
           elsif raw.singleton_class < T::Props::CustomType
             handle_custom_type(varname, T.unsafe(raw), mode)
+          elsif T::Configuration.scalar_types.include?(raw.name)
+            # It's a bit of a hack that this is separate from NO_TRANSFORM_TYPES
+            # and doesn't check inheritance (like `T::Props::CustomType.scalar_type?`
+            # does), but it covers the main use case (pay-server's custom `Boolean`
+            # module) without either requiring `T::Configuration.scalar_types` to
+            # accept modules instead of strings (which produces load-order issues
+            # and subtle behavior changes) or eating the performance cost of doing
+            # an inheritance check by manually crawling a class hierarchy and doing
+            # string comparisons.
+            nil
           else
             "T::Props::Utils.deep_clone_object(#{varname})"
           end
@@ -82,7 +92,12 @@ module T::Props
               "#{varname}.nil? ? nil : #{inner}"
             end
           else
-            "T::Props::Utils.deep_clone_object(#{varname})"
+            # Handle, e.g., T::Boolean
+            if type.types.all? {|t| generate(t, mode, varname).nil?}
+              nil
+            else
+              "T::Props::Utils.deep_clone_object(#{varname})"
+            end
           end
         when T::Types::Enum
           generate(T::Utils.lift_enum(type), mode, varname)

data/lib/types/props/serializable.rb

@@ -16,7 +16,21 @@ module T::Props::Serializable
   #   values.
   # @return [Hash] A serialization of this object.
   def serialize(strict=true)
-    h = __t_props_generated_serialize(strict)
+    begin
+      h = __t_props_generated_serialize(strict)
+    rescue => e
+      msg = self.class.decorator.message_with_generated_source_context(
+        e,
+        :__t_props_generated_serialize,
+        :generate_serialize_source
+      )
+      if msg
+        raise T::Props::InvalidValueError.new(msg)
+      else
+        raise
+      end
+    end
+
     h.merge!(@_extra_props) if @_extra_props
     h
   end
@@ -39,7 +53,21 @@ module T::Props::Serializable
   #  props on this instance.
   # @return [void]
   def deserialize(hash, strict=false)
-    hash_keys_matching_props = __t_props_generated_deserialize(hash)
+    begin
+      hash_keys_matching_props = __t_props_generated_deserialize(hash)
+    rescue => e
+      msg = self.class.decorator.message_with_generated_source_context(
+        e,
+        :__t_props_generated_deserialize,
+        :generate_deserialize_source
+      )
+      if msg
+        raise T::Props::InvalidValueError.new(msg)
+      else
+        raise
+      end
+    end
+
     if hash.size > hash_keys_matching_props
       serialized_forms = self.class.decorator.prop_by_serialized_forms
       extra = hash.reject {|k, _| serialized_forms.key?(k)}
@@ -181,6 +209,24 @@ module T::Props::Serializable::DecoratorMethods
     )
   end
 
+  def message_with_generated_source_context(error, generated_method, generate_source_method)
+    line_label = error.backtrace.find {|l| l.end_with?("in `#{generated_method}'")}
+    return unless line_label
+
+    line_num = line_label.split(':')[1]&.to_i
+    return unless line_num
+
+    source_lines = self.send(generate_source_method).split("\n")
+    previous_blank = source_lines[0...line_num].rindex(&:empty?) || 0
+    next_blank = line_num + (source_lines[line_num..-1].find_index(&:empty?) || 0)
+    context = "  " + source_lines[(previous_blank + 1)...(next_blank)].join("\n  ")
+    <<~MSG
+      Error in #{decorated_class.name}##{generated_method}: #{error.message}
+      at line #{line_num-previous_blank-1} in:
+      #{context}
+    MSG
+  end
+
   def raise_nil_deserialize_error(hkey)
     msg = "Tried to deserialize a required prop from a nil value. It's "\
       "possible that a nil value exists in the database, so you should "\

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.5.5439
+  version: 0.5.5449
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-14 00:00:00.000000000 Z
+date: 2020-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest