microsoft_kiota_serialization_json 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59042763f87da919ad53d61e9daad7d62d774ef8e80a5bfcc432ade069d398ca
-  data.tar.gz: 556c117d3424c77b020f2a83d8a2150198fbe0d10d63765fa4dd55cd69fb61dc
+  metadata.gz: 7ddf6f99fb31acc71c42cea0e6b087efa575634c9232600c6b568229697c9389
+  data.tar.gz: 51d9e9f60534287d141f2922211a943649e7cb6b150aa224665b85e975a38f66
 SHA512:
-  metadata.gz: d05a08b1944e97f8cfe3f68326c535f50ae8ea2697339f8c7e77340f4a9bac48cca733713fa77360385c5b47ffc6b6a2277a92d25e308e5e38369c6b7e0e337a
-  data.tar.gz: cc7bd127c101182b1452f0ac971fbc5f27ba40254946effefb8e1e391f293e831269066f7dc67e81990b3933a5f61926592ee597337c3b10d3e513b467e53623
+  metadata.gz: c767f85a36ccd8a650dabd9daa4d698226e01a44b95ad36a1e1b1c84899c9b856751d91e0111f722f12549e6dd26b29ff7982f533fcea056d349786c36a1bfdc
+  data.tar.gz: 852474c98de9e0ab50d955565768e5ac55807d841dc079e4113efbe1b98a4af0514eea3af3936c63312b622c5464d3de7bde0f1aa8426e5bc2ac61672a910830

data/lib/microsoft_kiota_serialization_json/json_parse_node.rb

@@ -55,6 +55,10 @@ module MicrosoftKiotaSerializationJson
       MicrosoftKiotaAbstractions::ISODuration.new(@current_node) if @current_node.is_a?(String)
     end
 
+    def get_byte_array_value
+      @current_node.unpack1('m') if @current_node.is_a?(String)
+    end
+
     # The generator passes the type as a class, except for booleans which it passes as a plain
     # string. A `case` cannot dispatch on that: `when String` asks whether the type is an instance
     # of String, and a class is an instance of Class, so every branch fell through to the string
@@ -95,7 +99,7 @@ module MicrosoftKiotaSerializationJson
       @current_node.map do |object|
         next if object.nil?
 
-        current_parse_node = JsonParseNode.new(object)
+        current_parse_node = child_node(object)
         current_parse_node.get_object_value(factory)
       end
     end
@@ -104,7 +108,12 @@ module MicrosoftKiotaSerializationJson
       raise StandardError, 'Factory cannot be null' if factory.nil?
 
       item = factory.call(self)
-      assign_field_values(item)
+      begin
+        on_before_assign_field_values&.call(item)
+        assign_field_values(item)
+      ensure
+        on_after_assign_field_values&.call(item)
+      end
       item
     rescue StandardError => e
       raise e.class, 'Error during deserialization'
@@ -118,7 +127,7 @@ module MicrosoftKiotaSerializationJson
         next if v.nil?
 
         deserializer = fields[k]
-        next deserializer.call(JsonParseNode.new(v)) if deserializer
+        next deserializer.call(child_node(v)) if deserializer
 
         additional_data = item.respond_to?(:additional_data) ? item.additional_data : nil
         next if additional_data.nil?
@@ -158,7 +167,17 @@ module MicrosoftKiotaSerializationJson
       return unless @current_node.is_a?(Hash)
 
       raw_value = @current_node[name]
-      JsonParseNode.new(raw_value) if raw_value
+      child_node(raw_value) if raw_value
+    end
+
+    private
+
+    # nested nodes keep the callbacks so nested models are tracked too
+    def child_node(value)
+      JsonParseNode.new(value).tap do |node|
+        node.on_before_assign_field_values = on_before_assign_field_values
+        node.on_after_assign_field_values = on_after_assign_field_values
+      end
     end
   end
 end

data/lib/microsoft_kiota_serialization_json/json_serialization_writer.rb

@@ -102,6 +102,14 @@ module MicrosoftKiotaSerializationJson
       @writer[key] = value.string
     end
 
+    def write_byte_array_value(key, value)
+      raise StandardError, 'no key or value included in write_byte_array_value(key, value)' if key.nil? && value.nil?
+      return set_root_value([value].pack('m0')) if key.nil?
+      return if value.nil?
+
+      @writer[key] = [value].pack('m0')
+    end
+
     def write_collection_of_primitive_values(key, values)
       return unless values
       return set_root_value(values.map { |v| serialized_scalar(v) }) unless key
@@ -113,7 +121,7 @@ module MicrosoftKiotaSerializationJson
 
     def write_collection_of_object_values(key, values)
       return unless values
-      return values.map { |v| write_object_value(nil, v) } unless key
+      return set_root_value(values.map { |v| object_value_hash(v) }) unless key
 
       @writer[key] = values.map { |v| object_value_hash(v) }
     end
@@ -125,10 +133,16 @@ module MicrosoftKiotaSerializationJson
       if key
         @writer[key] = object_value_hash(*values)
       else
-        values.each { |v| v.serialize(self) }
+        values.each { |v| serialize_object(v, self) }
       end
     end
 
+    def write_null_value(key)
+      return set_root_value(nil) if key.nil?
+
+      @writer[key] = nil
+    end
+
     def write_collection_of_enum_values(key, values)
       return unless values
 
@@ -160,12 +174,30 @@ module MicrosoftKiotaSerializationJson
     private
 
     def object_value_hash(value, *additional_values_to_merge)
-      temp = JsonSerializationWriter.new
-      value.serialize(temp)
-      additional_values_to_merge.each { |v| v&.serialize(temp) }
+      temp = child_writer
+      serialize_object(value, temp)
+      additional_values_to_merge.each { |v| serialize_object(v, temp) unless v.nil? }
       temp.writer
     end
 
+    # the after hook runs even when writing the model raised, so callbacks can restore their state
+    def serialize_object(value, writer)
+      on_before_object_serialization&.call(value)
+      on_start_object_serialization&.call(value, writer)
+      value.serialize(writer)
+    ensure
+      on_after_object_serialization&.call(value)
+    end
+
+    # nested writers keep the callbacks so nested models write only their changes too
+    def child_writer
+      JsonSerializationWriter.new.tap do |writer|
+        writer.on_before_object_serialization = on_before_object_serialization
+        writer.on_after_object_serialization = on_after_object_serialization
+        writer.on_start_object_serialization = on_start_object_serialization
+      end
+    end
+
     public
 
     def serialized_scalar(value)

data/lib/microsoft_kiota_serialization_json/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MicrosoftKiotaSerializationJson
-  VERSION = '0.24.0' # x-release-please-version
+  VERSION = '0.25.0' # x-release-please-version
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: microsoft_kiota_serialization_json
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Microsoft Corporation
@@ -35,14 +35,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.25.0
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement