sorbet-runtime 0.5.10575 → 0.5.10576

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e31c71beffdd1f77f3e281d0098644c812c42a204b0e033dc165539a3f5099e
-  data.tar.gz: a1affa874ac17a4611ba72375585a2f120a257c728d7378bf4514610e8fd99bb
+  metadata.gz: 57e2d9879044c87f4a728718f0d455a3e91bd52197e21eb151b31341190c20f0
+  data.tar.gz: 7b9566557f8b1105d8cdaf01f7875435a3c3ba28dcc08b926ee52d71c7932f4a
 SHA512:
-  metadata.gz: 6f3c62a3f0b579375c2025e1d0945132b0a7e3cb482c6caf25b13b3ff31e0018854d24cf6b364e5641cd177c58eb41e46274b7fceb0a7e0b9054eeed7c545ee9
-  data.tar.gz: 3d7489b23e5e512bcdf197dab0f65b889e139013cca77c28e732d45cbf2b85e8c21517993b9c6bc22256d92e99904971efde05739361cc85571f46ea52e69a23
+  metadata.gz: 60fcb254c9aa69b182f31d1e29475ce1cde419d0ffc631774e833993e10457f61b65c508bd89ce37b34369671435370acb33f3686a6d500deabd8d900e7849a3
+  data.tar.gz: c4df33cfcafab1ac05720a2f361b801ce5ea58a845295261b9faa705ebba22fb63ed7416a94d976e7fa4c7ba10011baa16995510beca9df8c6d80344f3ce68e7

data/lib/types/props/pretty_printable.rb

@@ -1,52 +1,18 @@
 # frozen_string_literal: true
 # typed: true
-require 'pp'
 
 module T::Props::PrettyPrintable
   include T::Props::Plugin
 
-  # Override the PP gem with something that's similar, but gives us a hook to do redaction and customization
-  def pretty_print(pp)
-    clazz = T.unsafe(T.cast(self, Object).class).decorator
-    multiline = pp.is_a?(PP)
-    pp.group(1, "<#{T.unsafe(self).class}", ">") do
-      clazz.all_props.sort.each do |prop|
-        pp.breakable
-        val = clazz.get(self, prop)
-        rules = clazz.prop_rules(prop)
-        pp.text("#{prop}=")
-        if (custom_inspect = rules[:inspect])
-          inspected = if T::Utils.arity(custom_inspect) == 1
-            custom_inspect.call(val)
-          else
-            custom_inspect.call(val, {multiline: multiline})
-          end
-          pp.text(inspected.nil? ? "nil" : "\"#{inspected}\"")
-        elsif rules[:sensitivity] && !rules[:sensitivity].empty? && !val.nil?
-          pp.text("<REDACTED #{rules[:sensitivity].join(', ')}>")
-        else
-          val.pretty_print(pp)
-        end
-      end
-      clazz.pretty_print_extra(self, pp)
-    end
-  end
-
-  # Overridable method to add anything that is not a prop
-  def pretty_print_extra(instance, pp); end
-
-  # Return a string representation of this object and all of its props in a single line
+  # Return a string representation of this object and all of its props
   def inspect
-    string = +""
-    PP.singleline_pp(self, string)
-    string
+    T.unsafe(T.cast(self, Object).class).decorator.inspect_instance(self)
   end
 
-  # Return a pretty string representation of this object and all of its props
+  # Override the PP gem with something that's similar, but gives us a hook
+  # to do redaction
   def pretty_inspect
-    string = +""
-    PP.pp(self, string)
-    string
+    T.unsafe(T.cast(self, Object).class).decorator.inspect_instance(self, multiline: true)
   end
 
   module DecoratorMethods
@@ -56,5 +22,86 @@ module T::Props::PrettyPrintable
     def valid_rule_key?(key)
       super || key == :inspect
     end
+
+    sig do
+      params(instance: T::Props::PrettyPrintable, multiline: T::Boolean, indent: String)
+      .returns(String)
+    end
+    def inspect_instance(instance, multiline: false, indent: '  ')
+      components =
+        inspect_instance_components(
+          instance,
+          multiline: multiline,
+          indent: indent
+        )
+          .reject(&:empty?)
+
+      # Not using #<> here as that makes pry highlight these objects
+      # as if they were all comments, whereas this makes them look
+      # like the structured thing they are.
+      if multiline
+        "#{components[0]}:\n" + T.must(components[1..-1]).join("\n")
+      else
+        "<#{components.join(' ')}>"
+      end
+    end
+
+    sig do
+      params(instance: T::Props::PrettyPrintable, multiline: T::Boolean, indent: String)
+      .returns(T::Array[String])
+    end
+    private def inspect_instance_components(instance, multiline:, indent:)
+      pretty_props = T.unsafe(self).all_props.map do |prop|
+        [prop, inspect_prop_value(instance, prop, multiline: multiline, indent: indent)]
+      end
+
+      joined_props = join_props_with_pretty_values(
+        pretty_props,
+        multiline: multiline,
+        indent: indent
+      )
+
+      [
+        T.unsafe(self).decorated_class.to_s,
+        joined_props,
+      ]
+    end
+
+    sig do
+      params(instance: T::Props::PrettyPrintable, prop: Symbol, multiline: T::Boolean, indent: String)
+      .returns(String)
+      .checked(:never)
+    end
+    private def inspect_prop_value(instance, prop, multiline:, indent:)
+      val = T.unsafe(self).get(instance, prop)
+      rules = T.unsafe(self).prop_rules(prop)
+      if (custom_inspect = rules[:inspect])
+        if T::Utils.arity(custom_inspect) == 1
+          custom_inspect.call(val)
+        else
+          custom_inspect.call(val, {multiline: multiline, indent: indent})
+        end
+      elsif rules[:sensitivity] && !rules[:sensitivity].empty? && !val.nil?
+        "<REDACTED #{rules[:sensitivity].join(', ')}>"
+      else
+        val.inspect
+      end
+    end
+
+    sig do
+      params(pretty_kvs: T::Array[[Symbol, String]], multiline: T::Boolean, indent: String)
+      .returns(String)
+    end
+    private def join_props_with_pretty_values(pretty_kvs, multiline:, indent: '  ')
+      pairs = pretty_kvs
+        .sort_by {|k, _v| k.to_s}
+        .map {|k, v| "#{k}=#{v}"}
+
+      if multiline
+        indent + pairs.join("\n#{indent}")
+      else
+        pairs.join(', ')
+      end
+    end
   end
 end

data/lib/types/props/serializable.rb

@@ -338,18 +338,14 @@ module T::Props::Serializable::DecoratorMethods
     end
   end
 
-  # adds to the default result of T::Props::PrettyPrintable
-  def pretty_print_extra(instance, pp)
+  # overrides T::Props::PrettyPrintable
+  private def inspect_instance_components(instance, multiline:, indent:)
     if (extra_props = extra_props(instance)) && !extra_props.empty?
-      pp.breakable
-      pp.text("@_extra_props=")
-      pp.group(1, "<", ">") do
-        extra_props.each_with_index do |(prop, value), i|
-          pp.breakable unless i.zero?
-          pp.text("#{prop}=")
-          value.pretty_print(pp)
-        end
-      end
+      pretty_kvs = extra_props.map {|k, v| [k.to_sym, v.inspect]}
+      extra = join_props_with_pretty_values(pretty_kvs, multiline: false)
+      super + ["@_extra_props=<#{extra}>"]
+    else
+      super
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.5.10575
+  version: 0.5.10576
 platform: ruby
 authors:
 - Stripe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-06 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest