@code-yeongyu/senpi 2026.8.20-2 → 2026.8.20

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/index.js

@@ -1,14 +1,13 @@
 export { AwsSmithyRpcV2CborProtocol } from "./cbor/AwsSmithyRpcV2CborProtocol";
+export { _toStr, _toBool, _toNum } from "./coercing-serializers";
 export { AwsJson1_0Protocol } from "./json/AwsJson1_0Protocol";
 export { AwsJson1_1Protocol } from "./json/AwsJson1_1Protocol";
 export { AwsJsonRpcProtocol } from "./json/AwsJsonRpcProtocol";
 export { AwsRestJsonProtocol } from "./json/AwsRestJsonProtocol";
-export { JsonCodec } from "./json/codec-v1/JsonCodec";
-export { JsonShapeDeserializer } from "./json/codec-v1/JsonShapeDeserializer";
-export { JsonShapeSerializer } from "./json/codec-v1/JsonShapeSerializer";
-export { JsonCodec2 } from "./json/codec-v2/JsonCodec2";
-export { JsonShapeDeserializer2 } from "./json/codec-v2/JsonShapeDeserializer2";
-export { JsonShapeSerializer2 } from "./json/codec-v2/JsonShapeSerializer2";
+export { JsonCodec } from "./json/JsonCodec";
+export { JsonShapeDeserializer } from "./json/JsonShapeDeserializer";
+export { JsonShapeSerializer } from "./json/JsonShapeSerializer";
+export { awsExpectUnion } from "./json/awsExpectUnion";
 export { parseJsonBody, parseJsonErrorBody, loadRestJsonErrorCode, loadJsonRpcErrorCode } from "./json/parseJsonBody";
 export { AwsEc2QueryProtocol } from "./query/AwsEc2QueryProtocol";
 export { AwsQueryProtocol } from "./query/AwsQueryProtocol";
@@ -18,5 +17,3 @@ export { XmlCodec } from "./xml/XmlCodec";
 export { XmlShapeDeserializer } from "./xml/XmlShapeDeserializer";
 export { XmlShapeSerializer } from "./xml/XmlShapeSerializer";
 export { parseXmlBody, parseXmlErrorBody, loadRestXmlErrorCode } from "./xml/parseXmlBody";
-export { awsExpectUnion } from "./json/awsExpectUnion";
-export { _toStr, _toBool, _toNum } from "./coercing-serializers";

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/AwsJsonRpcProtocol.js

@@ -1,7 +1,7 @@
 import { RpcProtocol } from "@smithy/core/protocols";
 import { deref, NormalizedSchema } from "@smithy/core/schema";
 import { ProtocolLib } from "../ProtocolLib";
-import { JsonCodec2 } from "./codec-v2/JsonCodec2";
+import { JsonCodec } from "./JsonCodec";
 import { loadJsonRpcErrorCode } from "./parseJsonBody";
 export class AwsJsonRpcProtocol extends RpcProtocol {
     serializer;
@@ -18,7 +18,7 @@ export class AwsJsonRpcProtocol extends RpcProtocol {
         this.serviceTarget = serviceTarget;
         this.codec =
             jsonCodec ??
-                new JsonCodec2({
+                new JsonCodec({
                     timestampFormat: {
                         useTrait: true,
                         default: 7,

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/AwsRestJsonProtocol.js

@@ -1,14 +1,14 @@
 import { HttpBindingProtocol, HttpInterceptingShapeDeserializer, HttpInterceptingShapeSerializer, } from "@smithy/core/protocols";
 import { NormalizedSchema } from "@smithy/core/schema";
 import { ProtocolLib } from "../ProtocolLib";
-import { JsonCodec2 } from "./codec-v2/JsonCodec2";
+import { JsonCodec } from "./JsonCodec";
 import { loadRestJsonErrorCode } from "./parseJsonBody";
 export class AwsRestJsonProtocol extends HttpBindingProtocol {
     serializer;
     deserializer;
     codec;
     mixin = new ProtocolLib();
-    constructor({ defaultNamespace, errorTypeRegistries, jsonCodec, }) {
+    constructor({ defaultNamespace, errorTypeRegistries, }) {
         super({
             defaultNamespace,
             errorTypeRegistries,
@@ -21,7 +21,7 @@ export class AwsRestJsonProtocol extends HttpBindingProtocol {
             httpBindings: true,
             jsonName: true,
         };
-        this.codec = jsonCodec ?? new JsonCodec2(settings);
+        this.codec = new JsonCodec(settings);
         this.serializer = new HttpInterceptingShapeSerializer(this.codec.createSerializer(), settings);
         this.deserializer = new HttpInterceptingShapeDeserializer(this.codec.createDeserializer(), settings);
     }

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/{codec-v1/JsonCodec.js → JsonCodec.js}

@@ -1,4 +1,4 @@
-import { SerdeContextConfig } from "../../ConfigurableSerdeContext";
+import { SerdeContextConfig } from "../ConfigurableSerdeContext";
 import { JsonShapeDeserializer } from "./JsonShapeDeserializer";
 import { JsonShapeSerializer } from "./JsonShapeSerializer";
 export class JsonCodec extends SerdeContextConfig {

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/{codec-v1/JsonShapeDeserializer.js → JsonShapeDeserializer.js}

@@ -2,12 +2,12 @@ import { determineTimestampFormat } from "@smithy/core/protocols";
 import { NormalizedSchema } from "@smithy/core/schema";
 import { LazyJsonString, NumericValue, parseEpochTimestamp, parseRfc3339DateTimeWithOffset, parseRfc7231DateTime, } from "@smithy/core/serde";
 import { fromBase64 } from "@smithy/core/serde";
-import { SerdeContextConfig } from "../../ConfigurableSerdeContext";
-import { UnionSerde } from "../../UnionSerde";
-import { jsonReviver } from "../jsonReviver";
-import { needsReviver } from "../needsReviver";
-import { parseJsonBody } from "../parseJsonBody";
-import { writeKey } from "../../writeKey";
+import { SerdeContextConfig } from "../ConfigurableSerdeContext";
+import { UnionSerde } from "../UnionSerde";
+import { jsonReviver } from "./jsonReviver";
+import { needsReviver } from "./needsReviver";
+import { parseJsonBody } from "./parseJsonBody";
+import { writeKey } from "../writeKey";
 export class JsonShapeDeserializer extends SerdeContextConfig {
     settings;
     constructor(settings) {

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/{codec-v1/JsonShapeSerializer.js → JsonShapeSerializer.js}

@@ -1,9 +1,9 @@
 import { determineTimestampFormat } from "@smithy/core/protocols";
 import { NormalizedSchema } from "@smithy/core/schema";
 import { dateToUtcString, generateIdempotencyToken, LazyJsonString, NumericValue, toBase64 } from "@smithy/core/serde";
-import { SerdeContextConfig } from "../../ConfigurableSerdeContext";
-import { JsonReplacer } from "../jsonReplacer";
-import { writeKey } from "../../writeKey";
+import { SerdeContextConfig } from "../ConfigurableSerdeContext";
+import { JsonReplacer } from "./jsonReplacer";
+import { writeKey } from "../writeKey";
 export class JsonShapeSerializer extends SerdeContextConfig {
     settings;
     buffer;
@@ -108,7 +108,7 @@ export class JsonShapeSerializer extends SerdeContextConfig {
                 }
                 return out;
             }
-            if (value instanceof Uint8Array && ns.isBlobSchema()) {
+            if (value instanceof Uint8Array && (ns.isBlobSchema() || ns.isDocumentSchema())) {
                 if (ns === this.rootSchema) {
                     return value;
                 }
@@ -148,7 +148,7 @@ export class JsonShapeSerializer extends SerdeContextConfig {
             }
             return value;
         }
-        if (typeof value === "number") {
+        if (typeof value === "number" && ns.isNumericSchema()) {
             if (Math.abs(value) === Infinity || isNaN(value)) {
                 return String(value);
             }
@@ -165,9 +165,6 @@ export class JsonShapeSerializer extends SerdeContextConfig {
         }
         if (ns.isDocumentSchema()) {
             if (isObject) {
-                if (value instanceof Uint8Array) {
-                    return (this.serdeContext?.base64Encoder ?? toBase64)(value);
-                }
                 const out = Array.isArray(value) ? [] : {};
                 for (const k in value) {
                     const v = value[k];

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/{codec-v2/JsonShapeDeserializer2.js → experimental/BufferJsonShapeDeserializer.js}

@@ -1,6 +1,7 @@
 import { determineTimestampFormat } from "@smithy/core/protocols";
 import { NormalizedSchema } from "@smithy/core/schema";
-import { fromBase64, LazyJsonString, NumericValue, parseEpochTimestamp, parseRfc3339DateTimeWithOffset, parseRfc7231DateTime, } from "@smithy/core/serde";
+import { LazyJsonString, NumericValue, parseEpochTimestamp, parseRfc3339DateTimeWithOffset, parseRfc7231DateTime, } from "@smithy/core/serde";
+import { fromBase64 } from "@smithy/core/serde";
 import { SerdeContextConfig } from "../../ConfigurableSerdeContext";
 import { UnionSerde } from "../../UnionSerde";
 import { detectBufferParsing } from "../detectBufferParsing";
@@ -8,7 +9,7 @@ import { jsonReviver } from "../jsonReviver";
 import { needsReviver } from "../needsReviver";
 import { parseJsonBody } from "../parseJsonBody";
 import { writeKey } from "../../writeKey";
-export class JsonShapeDeserializer2 extends SerdeContextConfig {
+export class BufferJsonShapeDeserializer extends SerdeContextConfig {
     settings;
     constructor(settings) {
         super();
@@ -18,20 +19,14 @@ export class JsonShapeDeserializer2 extends SerdeContextConfig {
         const reviver = needsReviver(schema) ? jsonReviver : undefined;
         let parsed;
         if (typeof data === "string") {
-            if (data.length === 0) {
-                return {};
-            }
             parsed = JSON.parse(data, reviver);
         }
         else if (data instanceof Uint8Array && detectBufferParsing()) {
-            if (data.byteLength === 0) {
-                return {};
-            }
             const buf = Buffer.isBuffer(data) ? data : Buffer.from(data.buffer, data.byteOffset, data.byteLength);
             parsed = JSON.parse(buf, reviver);
         }
         else {
-            parsed = await parseJsonBody(data, this.serdeContext, schema);
+            parsed = await parseJsonBody(data, this.serdeContext);
         }
         return this._read(schema, parsed);
     }
@@ -47,23 +42,19 @@ export class JsonShapeDeserializer2 extends SerdeContextConfig {
             }
             if (Array.isArray(value) && ns.isListSchema()) {
                 const listMember = ns.getValueSchema();
-                if (this.needsTransform(listMember)) {
-                    for (let i = 0; i < value.length; ++i) {
-                        value[i] = this._read(listMember, value[i]);
-                    }
+                for (let i = 0; i < value.length; ++i) {
+                    value[i] = this._read(listMember, value[i]);
                 }
                 return value;
             }
             if (ns.isMapSchema()) {
                 const mapMember = ns.getValueSchema();
                 const map = value;
-                if (this.needsTransform(mapMember)) {
-                    for (const k in map) {
-                        if (k === "__proto__") {
-                            writeKey(map);
-                        }
-                        map[k] = this._read(mapMember, map[k]);
+                for (const k in map) {
+                    if (k === "__proto__") {
+                        writeKey(map);
                     }
+                    map[k] = this._read(mapMember, map[k]);
                 }
                 return map;
             }
@@ -139,6 +130,10 @@ export class JsonShapeDeserializer2 extends SerdeContextConfig {
                         }
                     }
                 }
+                return value;
+            }
+            else {
+                return value;
             }
         }
         return value;
@@ -146,10 +141,9 @@ export class JsonShapeDeserializer2 extends SerdeContextConfig {
     _readStruct(ns, record) {
         const union = ns.isUnionSchema();
         const out = {};
-        let nameMap;
-        const hasType = typeof record.__type === "string";
+        let nameMap = void 0;
         const { jsonName } = this.settings;
-        if (jsonName && hasType) {
+        if (jsonName) {
             nameMap = {};
         }
         let unionSerde;
@@ -160,9 +154,7 @@ export class JsonShapeDeserializer2 extends SerdeContextConfig {
             let fromKey = memberName;
             if (jsonName) {
                 fromKey = memberSchema.getMergedTraits().jsonName ?? fromKey;
-                if (hasType) {
-                    nameMap[fromKey] = memberName;
-                }
+                nameMap[fromKey] = memberName;
             }
             if (union) {
                 unionSerde.mark(fromKey);
@@ -174,7 +166,7 @@ export class JsonShapeDeserializer2 extends SerdeContextConfig {
         if (union) {
             unionSerde.writeUnknown();
         }
-        else if (hasType) {
+        else if (typeof record.__type === "string") {
             for (const k in record) {
                 const v = record[k];
                 const t = jsonName ? (nameMap[k] ?? k) : k;
@@ -185,16 +177,4 @@ export class JsonShapeDeserializer2 extends SerdeContextConfig {
         }
         return out;
     }
-    needsTransform(ns) {
-        if (ns.isBlobSchema() || ns.isTimestampSchema() || ns.isBigIntegerSchema() || ns.isBigDecimalSchema()) {
-            return true;
-        }
-        if (ns.isDocumentSchema() || ns.isStructSchema() || ns.isListSchema() || ns.isMapSchema()) {
-            return true;
-        }
-        if (ns.isStringSchema() && ns.getMergedTraits().mediaType) {
-            return true;
-        }
-        return false;
-    }
 }

package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/{codec-v2/JsonShapeSerializer2.js → experimental/ByteJsonShapeSerializer.js}

@@ -2,7 +2,7 @@ import { determineTimestampFormat } from "@smithy/core/protocols";
 import { NormalizedSchema } from "@smithy/core/schema";
 import { dateToUtcString, generateIdempotencyToken, LazyJsonString, NumericValue, toBase64 } from "@smithy/core/serde";
 import { SerdeContextConfig } from "../../ConfigurableSerdeContext";
-import { JsonBytesStringAdapter } from "./JsonBytesStringAdapter";
+import { writeKey } from "../../writeKey";
 const encoder = new TextEncoder();
 const OPEN_BRACE = 0x7b;
 const CLOSE_BRACE = 0x7d;
@@ -30,15 +30,13 @@ for (let i = 0; i < 0x20; i++) {
 }
 const INITIAL_BUFFER_SIZE = 2048;
 function alloc(size) {
-    return JsonBytesStringAdapter.allocUnsafe(size);
+    return typeof Buffer !== "undefined" ? Buffer.allocUnsafe(size) : new Uint8Array(size);
 }
-export class JsonShapeSerializer2 extends SerdeContextConfig {
+export class ByteJsonShapeSerializer extends SerdeContextConfig {
     settings;
     json;
     i = 0;
     rootSchema;
-    rawValue;
-    passthrough = false;
     constructor(settings) {
         super();
         this.settings = settings;
@@ -46,25 +44,38 @@ export class JsonShapeSerializer2 extends SerdeContextConfig {
     }
     write(schema, value) {
         this.i = 0;
-        this.rawValue = value;
         this.rootSchema = NormalizedSchema.of(schema);
-        this.passthrough = this.rootSchema.isBlobSchema() || this.rootSchema.isStringSchema();
-        if (!this.passthrough) {
-            this.writeValue(this.rootSchema, value, undefined);
-        }
+        this.writeValue(this.rootSchema, value, undefined);
     }
     writeDiscriminatedDocument(schema, value) {
         this.i = 0;
         this.rootSchema = NormalizedSchema.of(schema);
         const ns = this.rootSchema;
         if (ns.isStructSchema() && value != null && typeof value === "object") {
-            this.writeValue(ns, value, undefined);
-            const prefix = `"__type":"${ns.getName(true) ?? "Unknown"}",`;
-            const z = prefix.length;
-            this.ensure(z);
-            this.json.copyWithin(1 + z, 1, this.i);
-            encoder.encodeInto(prefix, this.json.subarray(1));
-            this.i += z;
+            this.ensure(2);
+            this.json[this.i++] = OPEN_BRACE;
+            this.writeAsciiQuoted("__type");
+            this.json[this.i++] = COLON;
+            this.writeAsciiQuoted(ns.getName(true) ?? "Unknown");
+            let wroteAny = true;
+            const { jsonName } = this.settings;
+            for (const [memberName, memberSchema] of ns.structIterator()) {
+                const item = value[memberName];
+                if (item == null && !memberSchema.isIdempotencyToken()) {
+                    continue;
+                }
+                if (wroteAny) {
+                    this.ensure(1);
+                    this.json[this.i++] = COMMA;
+                }
+                const targetKey = jsonName ? (memberSchema.getMergedTraits().jsonName ?? memberName) : memberName;
+                this.writeAsciiQuoted(targetKey);
+                this.json[this.i++] = COLON;
+                this.writeValue(memberSchema, item, ns);
+                wroteAny = true;
+            }
+            this.ensure(1);
+            this.json[this.i++] = CLOSE_BRACE;
         }
         else {
             this.writeValue(ns, value, undefined);
@@ -74,11 +85,6 @@ export class JsonShapeSerializer2 extends SerdeContextConfig {
         this.rootSchema = undefined;
         const finalPosition = this.i;
         this.i = 0;
-        const raw = this.rawValue;
-        this.rawValue = undefined;
-        if (finalPosition === 0) {
-            return raw;
-        }
         const result = this.json.subarray(0, finalPosition);
         this.json = alloc(INITIAL_BUFFER_SIZE);
         return result;
@@ -117,7 +123,7 @@ export class JsonShapeSerializer2 extends SerdeContextConfig {
         this.i = i;
     }
     writeJsonString(s) {
-        this.ensure(s.length * 3 + 2);
+        this.ensure(s.length * 2 + 2);
         this.json[this.i++] = QUOTE;
         const z = s.length;
         for (let j = 0; j < z; ++j) {
@@ -144,7 +150,7 @@ export class JsonShapeSerializer2 extends SerdeContextConfig {
                     this.ensure(4);
                     const { written } = encoder.encodeInto(s.substring(j, j + 2), this.json.subarray(this.i));
                     this.i += written;
-                    ++j;
+                    j++;
                 }
                 else {
                     this.ensure(6);
@@ -184,16 +190,15 @@ export class JsonShapeSerializer2 extends SerdeContextConfig {
     static B64 = (() => {
         const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
         const table = new Uint8Array(64);
-        for (let i = 0; i < 64; ++i) {
+        for (let i = 0; i < 64; i++)
             table[i] = chars.charCodeAt(i);
-        }
         return table;
     })();
     writeBase64(data) {
         const b64Len = Math.ceil(data.length / 3) * 4;
         this.ensure(b64Len + 2);
         const json = this.json;
-        const B64 = JsonShapeSerializer2.B64;
+        const B64 = ByteJsonShapeSerializer.B64;
         let i = this.i;
         json[i++] = QUOTE;
         const len = data.length;
@@ -245,16 +250,6 @@ export class JsonShapeSerializer2 extends SerdeContextConfig {
         }
         const ns = NormalizedSchema.of(schema);
         const isObject = typeof value === "object";
-        if (ns.isStringSchema()) {
-            const mediaType = ns.getMergedTraits().mediaType;
-            if (mediaType) {
-                const isJson = mediaType === "application/json" || mediaType.endsWith("+json");
-                if (isJson) {
-                    this.writeJsonString(LazyJsonString.from(value).toString());
-                    return;
-                }
-            }
-        }
         if (isObject) {
             if (ns.isStructSchema()) {
                 this.writeStruct(ns, value);
@@ -294,6 +289,16 @@ export class JsonShapeSerializer2 extends SerdeContextConfig {
             return;
         }
         if (typeof value === "string") {
+            if (ns.isStringSchema()) {
+                const mediaType = ns.getMergedTraits().mediaType;
+                if (mediaType) {
+                    const isJson = mediaType === "application/json" || mediaType.endsWith("+json");
+                    if (isJson) {
+                        this.writeJsonString(LazyJsonString.from(value).toString());
+                        return;
+                    }
+                }
+            }
             if (ns.isBlobSchema()) {
                 const b64 = (this.serdeContext?.base64Encoder ?? toBase64)(value);
                 this.writeAsciiQuoted(b64);
@@ -303,7 +308,7 @@ export class JsonShapeSerializer2 extends SerdeContextConfig {
             return;
         }
         if (typeof value === "number") {
-            if (Math.abs(value) === Infinity || Number.isNaN(value)) {
+            if (ns.isNumericSchema() && (Math.abs(value) === Infinity || isNaN(value))) {
                 this.writeAsciiQuoted(String(value));
                 return;
             }
@@ -313,16 +318,14 @@ export class JsonShapeSerializer2 extends SerdeContextConfig {
         }
         if (typeof value === "boolean") {
             this.ensure(5);
-            let { i, json } = this;
             if (value) {
-                json.set(TRUE, i);
-                i += 4;
+                this.json.set(TRUE, this.i);
+                this.i += 4;
             }
             else {
-                json.set(FALSE, i);
-                i += 5;
+                this.json.set(FALSE, this.i);
+                this.i += 5;
             }
-            this.i = i;
             return;
         }
         if (typeof value === "bigint") {
@@ -334,6 +337,7 @@ export class JsonShapeSerializer2 extends SerdeContextConfig {
     writeStruct(ns, value) {
         this.ensure(2);
         this.json[this.i++] = OPEN_BRACE;
+        let first = true;
         let wroteAny = false;
         const hasType = typeof value.__type === "string";
         let writtenKeys;
@@ -342,13 +346,13 @@ export class JsonShapeSerializer2 extends SerdeContextConfig {
         }
         for (const [memberName, memberSchema] of ns.structIterator()) {
             const item = value[memberName];
-            if (item == null && !memberSchema.isIdempotencyToken()) {
+            if (item == null && !memberSchema.isIdempotencyToken())
                 continue;
-            }
-            if (wroteAny) {
+            if (!first) {
                 this.ensure(1);
                 this.json[this.i++] = COMMA;
             }
+            first = false;
             wroteAny = true;
             const targetKey = this.settings.jsonName ? (memberSchema.getMergedTraits().jsonName ?? memberName) : memberName;
             if (writtenKeys) {
@@ -371,17 +375,17 @@ export class JsonShapeSerializer2 extends SerdeContextConfig {
         }
         else if (hasType) {
             for (const k in value) {
-                if (writtenKeys.has(k)) {
+                const targetKey = this.settings.jsonName ? (writtenKeys.has(k) ? k : k) : k;
+                if (writtenKeys.has(targetKey))
                     continue;
-                }
-                writtenKeys.add(k);
+                writtenKeys.add(targetKey);
                 const v = value[k];
-                if (wroteAny) {
+                if (!first) {
                     this.ensure(1);
                     this.json[this.i++] = COMMA;
                 }
-                wroteAny = true;
-                this.writeAsciiQuoted(k);
+                first = false;
+                this.writeAsciiQuoted(targetKey);
                 this.ensure(1);
                 this.json[this.i++] = COLON;
                 this.writeValue(15, v, undefined);
@@ -391,56 +395,20 @@ export class JsonShapeSerializer2 extends SerdeContextConfig {
         this.json[this.i++] = CLOSE_BRACE;
     }
     writeList(ns, value, isDocument) {
-        const sparse = !!ns.getMergedTraits().sparse;
-        const valueSchema = ns.getValueSchema();
-        if (!isDocument) {
-            if (valueSchema.isStringSchema() || valueSchema.isNumericSchema() || valueSchema.isBooleanSchema()) {
-                let hasSpecials = false;
-                for (let i = 0; i < value.length; ++i) {
-                    const v = value[i];
-                    if (Number.isNaN(v) || v === Infinity || v === -Infinity || (v == null && !sparse)) {
-                        hasSpecials = true;
-                        break;
-                    }
-                }
-                let json;
-                if (!hasSpecials) {
-                    json = JSON.stringify(value);
-                }
-                else {
-                    const out = [];
-                    for (let i = 0; i < value.length; ++i) {
-                        const v = value[i];
-                        if (v == null && !sparse)
-                            continue;
-                        if (Number.isNaN(v) || v === Infinity || v === -Infinity) {
-                            out.push(String(v));
-                        }
-                        else {
-                            out.push(v);
-                        }
-                    }
-                    json = JSON.stringify(out);
-                }
-                this.ensure(json.length * 3);
-                this.i += encoder.encodeInto(json, this.json.subarray(this.i)).written;
-                return;
-            }
-        }
         this.ensure(2);
         this.json[this.i++] = OPEN_BRACKET;
-        let wroteFirstItem = false;
+        const sparse = !!ns.getMergedTraits().sparse;
+        const valueSchema = ns.getValueSchema();
         for (let i = 0; i < value.length; ++i) {
             const item = value[i];
             if (isDocument ? item === undefined : item == null && !sparse) {
                 continue;
             }
-            if (wroteFirstItem) {
+            if (i !== 0) {
                 this.ensure(1);
                 this.json[this.i++] = COMMA;
             }
             this.writeValue(valueSchema, item, undefined);
-            wroteFirstItem = true;
         }
         this.ensure(1);
         this.json[this.i++] = CLOSE_BRACKET;
@@ -450,24 +418,20 @@ export class JsonShapeSerializer2 extends SerdeContextConfig {
         const valueSchema = ns.getValueSchema();
         if (!isDocument) {
             if (valueSchema.isStringSchema() || valueSchema.isNumericSchema() || valueSchema.isBooleanSchema()) {
-                let modifications;
-                for (const k in value) {
-                    const v = value[k];
-                    if (Number.isNaN(v) || v === Infinity || v === -Infinity) {
-                        (modifications ??= {})[k] = v;
-                        value[k] = String(v);
-                    }
-                    else if (v === null && !sparse) {
-                        (modifications ??= {})[k] = null;
-                        value[k] = undefined;
+                let input = value;
+                if (sparse) {
+                    input = {};
+                    for (const k in value) {
+                        if (k === "__proto__") {
+                            writeKey(input);
+                        }
+                        input[k] = value[k] ?? null;
                     }
                 }
-                const json = JSON.stringify(value);
-                if (modifications) {
-                    Object.assign(value, modifications);
-                }
+                const json = JSON.stringify(input);
                 this.ensure(json.length * 3);
-                this.i += encoder.encodeInto(json, this.json.subarray(this.i)).written;
+                const { written } = encoder.encodeInto(json, this.json.subarray(this.i));
+                this.i += written;
                 return;
             }
         }