appmap 0.93.5 → 0.94.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e06f80a7364f75faaa0a8838b5053ea147349c3737b4072003aef809e6e2bbec
-  data.tar.gz: 004e1d57ebe2a8c1aa718062cec50d1846526e12b6cd014b7780cbb636417500
+  metadata.gz: ca46315eb8aa31221cee8a1d656187a4e4355e63f6b2be1d591829dddb76f7e0
+  data.tar.gz: d038130a2827f01f573bf69dbe32ab837d7ff68b28dce7a6076a80eee2f4550e
 SHA512:
-  metadata.gz: 524637c14e1fb40dc5d8174af904adf7f5f72827d8c2c61689e612602d1d9a15464697ec65c207d295e7a9752af9bdaeedab26ff515e2db3f324bec4bc3de97a
-  data.tar.gz: 2239720d8ede87ba270e57299dfd63842eee3e07d9426249d647cbcc48095ba6439d796f090b5ab55fd76ba62afd8c3117944db067180d5d0628c9e19fed30e5
+  metadata.gz: 58a84ec34e17b22acf37fd0b9f964fb93f82531cb7f800721d33214b1bc434b81e47cbf7202f87ddeade990644d4cc512898125bc59851e82f035f9093c31eb2
+  data.tar.gz: a8a0bfa9cf83dc59d6e3848228f602bf8030c01601755a853a55ee4b452a970e2de1c823649da1fc0b557b8b9b6ba24c142f324975a20a222aadc239d37958b1

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.94.1](https://github.com/getappmap/appmap-ruby/compare/v0.94.0...v0.94.1) (2022-11-23)
+
+
+### Bug Fixes
+
+* Handle properties of mixed content and repeated values ([4e14eb8](https://github.com/getappmap/appmap-ruby/commit/4e14eb8f4650368b3fdcb3f30be2969df3998e05))
+
+# [0.94.0](https://github.com/getappmap/appmap-ruby/compare/v0.93.5...v0.94.0) (2022-11-22)
+
+
+### Features
+
+* Emit nested return_value.properties ([2c74c68](https://github.com/getappmap/appmap-ruby/commit/2c74c68f9e2a5bcb3f095850c9d520422b63e25f))
+
 ## [0.93.5](https://github.com/getappmap/appmap-ruby/compare/v0.93.4...v0.93.5) (2022-11-08)
 
 

data/lib/appmap/event.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'weakref'
+require_relative './value_inspector'
 
 module AppMap
   module Event
@@ -20,6 +21,8 @@ module AppMap
     MethodEventStruct = Struct.new(:id, :event, :thread_id)
 
     class MethodEvent < MethodEventStruct
+      extend ValueInspector
+
       MAX_ARRAY_ENUMERATION = 10
       MAX_HASH_ENUMERATION = 10
       MAX_STRING_LENGTH = 100
@@ -61,33 +64,12 @@ module AppMap
         end
 
         def add_size(param, value)
-          # Don't risk calling #size on things like data-access objects, which can and will issue queries for this information.
-          if value.is_a?(Array) || value.is_a?(Hash)
-            param[:size] = value.size
-          end
+          size = ValueInspector.detect_size(value)
+          param[:size] = size if size
         end
 
         def add_schema(param, value)
-          begin
-            if value.respond_to?(:keys)
-              param[:properties] = value.keys.map { |key| { name: key, class: best_class_name(value[key]) } }
-            elsif value.respond_to?(:first) && value.first
-              if value.first != value
-                add_schema param, value.first
-              end
-            end
-          rescue
-            warn "Error in add_schema(#{value.class})", $!
-          end
-        end
-
-        # Heuristic for dynamically defined class whose name can be nil
-        def best_class_name(value)
-          value_cls = value.class
-          while value_cls && value_cls.name.nil?
-            value_cls = value_cls.superclass
-          end
-          value_cls&.name || 'unknown'
+          ValueInspector.detect_schema(value, type_info: param)
         end
 
         def encode_display_string(value)

data/lib/appmap/value_inspector.rb

@@ -0,0 +1,50 @@
+module AppMap
+  module ValueInspector
+    extend self
+
+    MAX_DEPTH = 3
+
+    def detect_size(value)
+      # Don't risk calling #size on things like data-access objects, which can and will issue queries for this information.
+      if value.is_a?(Array) || value.is_a?(Hash)
+        value.size
+      end
+    end
+
+    def detect_schema(value, max_depth: MAX_DEPTH, type_info: {}, observed_values: Set.new(), depth: 0)
+      return type_info if depth == max_depth
+
+      if value.respond_to?(:keys)
+        return if observed_values.include?(value.object_id)
+
+        observed_values << value.object_id
+
+        properties = value.keys.select { |key| key != "" && !key.nil? }.map do |key|
+          next_value = value[key]
+
+          value_schema = begin
+              { name: key, class: best_class_name(next_value) }
+            rescue
+              warn "Error in add_schema(#{next_value.class})", $!
+              raise
+            end
+
+          detect_schema(next_value, **{ max_depth: max_depth, type_info: value_schema, observed_values: observed_values, depth: depth + 1 })
+        end.compact
+        type_info[:properties] = properties unless properties.empty?
+      elsif value.respond_to?(:first)
+        detect_schema(value.first, **{ max_depth: max_depth, type_info: type_info, observed_values: observed_values, depth: depth + 1 })
+      end
+      type_info
+    end
+
+    # Heuristic for dynamically defined class whose name can be nil
+    def best_class_name(value)
+      value_cls = value.class
+      while value_cls && value_cls.name.nil?
+        value_cls = value_cls.superclass
+      end
+      value_cls&.name || "unknown"
+    end
+  end
+end

data/lib/appmap/version.rb

@@ -3,9 +3,9 @@
 module AppMap
   URL = 'https://github.com/applandinc/appmap-ruby'
 
-  VERSION = '0.93.5'
+  VERSION = '0.94.1'
 
-  APPMAP_FORMAT_VERSION = '1.9.0'
+  APPMAP_FORMAT_VERSION = '1.10.0'
 
   SUPPORTED_RUBY_VERSIONS = %w[2.5 2.6 2.7 3.0 3.1].freeze
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.93.5
+  version: 0.94.1
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-08 00:00:00.000000000 Z
+date: 2022-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source
@@ -432,6 +432,7 @@ files:
 - lib/appmap/swagger/stable.rb
 - lib/appmap/trace.rb
 - lib/appmap/util.rb
+- lib/appmap/value_inspector.rb
 - lib/appmap/version.rb
 - package.json
 - release.sh