test(core/protocols): use serde instead of JSON native

Author: kuhe

packages/core/src/submodules/protocols/json/JsonShapeDeserializer.ts

@@ -108,6 +108,10 @@ export class JsonShapeDeserializer extends SerdeContextConfig implements ShapeDe
       if (value instanceof NumericValue) {
         return value;
       }
+      const untyped = value as any;
+      if (untyped.type === "bigDecimal" && "string" in untyped) {
+        return new NumericValue(untyped.string, untyped.type);
+      }
       return new NumericValue(String(value), "bigDecimal");
     }
 
@@ -123,7 +127,19 @@ export class JsonShapeDeserializer extends SerdeContextConfig implements ShapeDe
     }
 
     if (ns.isDocumentSchema()) {
-      return structuredClone(value);
+      if (isObject) {
+        const out = Array.isArray(value) ? [] : ({} as any);
+        for (const [k, v] of Object.entries(value)) {
+          if (v instanceof NumericValue) {
+            out[k] = v;
+          } else {
+            out[k] = this._read(ns, v);
+          }
+        }
+        return out;
+      } else {
+        return structuredClone(value);
+      }
     }
 
     // covers string, numeric, boolean, document, bigDecimal

packages/core/src/submodules/protocols/json/JsonShapeSerializer.ts

@@ -1,6 +1,6 @@
 import { determineTimestampFormat } from "@smithy/core/protocols";
 import { NormalizedSchema, SCHEMA } from "@smithy/core/schema";
-import { dateToUtcString, generateIdempotencyToken, LazyJsonString } from "@smithy/core/serde";
+import { dateToUtcString, generateIdempotencyToken, LazyJsonString, NumericValue } from "@smithy/core/serde";
 import { Schema, ShapeSerializer } from "@smithy/types";
 import { toBase64 } from "@smithy/util-base64";
 
@@ -138,8 +138,20 @@ export class JsonShapeSerializer extends SerdeContextConfig implements ShapeSeri
       }
     }
 
-    if (ns.isDocumentSchema() && isObject) {
-      return structuredClone(value);
+    if (ns.isDocumentSchema()) {
+      if (isObject) {
+        const out = Array.isArray(value) ? [] : ({} as any);
+        for (const [k, v] of Object.entries(value)) {
+          if (v instanceof NumericValue) {
+            out[k] = v;
+          } else {
+            out[k] = this._write(ns, v);
+          }
+        }
+        return out;
+      } else {
+        return structuredClone(value);
+      }
     }
 
     return value;

packages/core/src/submodules/protocols/schema-testing/new-document-type-test-cases.json

@@ -88,7 +88,7 @@
         "float": 0,
         "double": 0,
         "bigInteger": 0,
-        "bigDecimal": 0.0,
+        "bigDecimal": 0,
         "timestamp": 0,
         "timestampDateTime": "1970-01-01T00:00:00Z",
         "timestampHttpDate": "Thu, 01 Jan 1970 00:00:00 GMT",
@@ -111,7 +111,7 @@
         "float": 0,
         "double": 0,
         "bigInteger": 0,
-        "bigDecimal": 0.0,
+        "bigDecimal": 0,
         "timestamp": 0,
         "timestampDateTime": "1970-01-01T00:00:00Z",
         "timestampHttpDate": "Thu, 01 Jan 1970 00:00:00 GMT",

packages/core/src/submodules/protocols/schema-testing/schema-documents.spec.ts

@@ -86,7 +86,7 @@ function getJsonCodec(test: { settings: JsonSettings }): JsonCodec {
  */
 function readDocument(deserializer: JsonShapeDeserializer, data: DocumentType): any {
   if (data && typeof data === "object" && typeof (data as any).__type === "string") {
-    const object = structuredClone(data as any);
+    const object = data as any;
     const [namespace, name] = object.__type.split("#");
     delete object.__type;
     const schema = TypeRegistry.for(namespace).getSchema(name);
@@ -105,18 +105,19 @@ describe("schema conversion tests for serializations, data objects, and document
       const serializer = codec.createSerializer();
       const deserializer = codec.createDeserializer();
 
-      const serialization = JSON.stringify(test.serialized);
-      const documentFromSerialization = JSON.parse(serialization);
+      serializer.write(SCHEMA.DOCUMENT, test.serialized);
+      const serialization = serializer.flush();
+      const documentFromSerialization = await deserializer.read(SCHEMA.DOCUMENT, serialization);
       const canonicalDataObject = await deserializer.read(subjectSchema, serialization);
 
       serializer.writeDiscriminatedDocument(subjectSchema, canonicalDataObject);
-      const documentFromDataObject = JSON.parse(serializer.flush());
+      const documentFromDataObject = await deserializer.read(SCHEMA.DOCUMENT, serializer.flush());
 
       // 1. data object from serialization
       expect(typeof documentFromSerialization).toBe("object");
 
       // 2. data object document back to data object
-      const dataObjectFromDocument = await readDocument(deserializer, documentFromDataObject);
+      const dataObjectFromDocument = await deserializer.readObject(subjectSchema, documentFromDataObject);
       expect(dataObjectFromDocument).toEqual(canonicalDataObject);
 
       // 3. data object from serialization document
@@ -134,9 +135,8 @@ describe("schema conversion tests for serializations, data objects, and document
       expect(serializationFromSerializedDocument).toEqual(serialization);
 
       // 6. serialization from data object document
-      const undiscriminatedDocument = structuredClone(documentFromDataObject);
-      delete undiscriminatedDocument.__type;
-      serializer.write(SCHEMA.DOCUMENT, undiscriminatedDocument);
+      delete documentFromDataObject.__type;
+      serializer.write(SCHEMA.DOCUMENT, documentFromDataObject);
       const serializationFromDocumentFromDataObject = serializer.flush();
       expect(serializationFromDocumentFromDataObject).toEqual(serialization);
     });