fix: a bug where additional data would not go to the dedicated property

Signed-off-by: Vincent Biret <vibiret@microsoft.com>

Author: baywet

packages/serialization/json/src/jsonParseNode.ts

@@ -5,7 +5,7 @@
  * -------------------------------------------------------------------------------------------
  */
 
-import { DateOnly, Duration, TimeOnly, UntypedNode, createBackedModelProxyHandler, createUntypedArray, createUntypedBoolean, createUntypedNodeFromDiscriminatorValue, createUntypedNull, createUntypedNumber, createUntypedObject, createUntypedString, inNodeEnv, isBackingStoreEnabled, isUntypedNode, parseGuidString, getEnumValueFromStringValue, type Parsable, type ParsableFactory, type ParseNode } from "@microsoft/kiota-abstractions";
+import { DateOnly, Duration, TimeOnly, UntypedNode, createBackedModelProxyHandler, createUntypedArray, createUntypedBoolean, createUntypedNodeFromDiscriminatorValue, createUntypedNull, createUntypedNumber, createUntypedObject, createUntypedString, inNodeEnv, isBackingStoreEnabled, isUntypedNode, parseGuidString, getEnumValueFromStringValue, type Parsable, type ParsableFactory, type ParseNode, AdditionalDataHolder } from "@microsoft/kiota-abstractions";
 export class JsonParseNode implements ParseNode {
 	constructor(private readonly _jsonNode: unknown) {}
 	public onBeforeAssignFieldValues: ((value: Parsable) => void) | undefined;
@@ -108,8 +108,11 @@ export class JsonParseNode implements ParseNode {
 			if (deserializer) {
 				deserializer(new JsonParseNode(v));
 			} else {
+				// there is no real way to test if the model is actually a holder or not
 				// additional properties
-				(model as Record<string, unknown>)[k] = v;
+				const modelDataHolder = model as AdditionalDataHolder;
+				modelDataHolder.additionalData ??= {} as Record<string, unknown>;
+				modelDataHolder.additionalData[k] = v;
 			}
 		});
 	};

packages/serialization/json/test/common/jsonSerializationWriter.ts

@@ -36,7 +36,14 @@ describe("JsonParseNode", () => {
 			},
 			testDate,
 		};
-		const expectedObject: TestParser = {
+
+		const writer = new JsonSerializationWriter();
+		writer.writeObjectValue("", inputObject, serializeTestParser);
+		const serializedContent = writer.getSerializedContent();
+		const decoder = new TextDecoder();
+		const contentAsStr = decoder.decode(serializedContent);
+		const result = JSON.parse(contentAsStr);
+		assert.deepEqual(result, {
 			testCollection: ["2", "3"],
 			testString: "test",
 			testComplexString: "A more \"complex\" string with \r\nlinebreaks and 'weird' characters",
@@ -46,17 +53,23 @@ describe("JsonParseNode", () => {
 					someValue: 123,
 				},
 			},
-			testDate,
-		};
-
-		const writer = new JsonSerializationWriter();
-		writer.writeObjectValue("", inputObject, serializeTestParser);
-		const serializedContent = writer.getSerializedContent();
-		const decoder = new TextDecoder();
-		const contentAsStr = decoder.decode(serializedContent);
-		const result = JSON.parse(contentAsStr);
-		const stringValueResult = new JsonParseNode(result).getObjectValue(createTestParserFromDiscriminatorValue) as TestParser;
-		assert.deepEqual(stringValueResult, expectedObject);
+			testDate: testDate.toISOString(),
+		});
+		const parsedValueResult = new JsonParseNode(result).getObjectValue(createTestParserFromDiscriminatorValue);
+		assert.deepEqual(parsedValueResult as object, {
+			testCollection: ["2", "3"],
+			testString: "test",
+			testComplexString: "A more \"complex\" string with \r\nlinebreaks and 'weird' characters",
+			testObject: {
+				additionalData: {
+					testObjectName: "str",
+					testObjectProp: {
+						someValue: 123,
+					},
+				},
+			},
+			testDate: testDate.toISOString(),
+		});
 	});
 
 	it("Test enum serialization", async () => {