@aws-sdk/core 3.940.0 → 3.946.0

package/dist-es/submodules/protocols/json/JsonShapeDeserializer.js

@@ -21,38 +21,40 @@ export class JsonShapeDeserializer extends SerdeContextConfig {
     _read(schema, value) {
         const isObject = value !== null && typeof value === "object";
         const ns = NormalizedSchema.of(schema);
-        if (ns.isListSchema() && Array.isArray(value)) {
-            const listMember = ns.getValueSchema();
-            const out = [];
-            const sparse = !!ns.getMergedTraits().sparse;
-            for (const item of value) {
-                if (sparse || item != null) {
-                    out.push(this._read(listMember, item));
+        if (isObject) {
+            if (ns.isStructSchema()) {
+                const out = {};
+                for (const [memberName, memberSchema] of deserializingStructIterator(ns, value, this.settings.jsonName ? "jsonName" : false)) {
+                    const fromKey = this.settings.jsonName ? memberSchema.getMergedTraits().jsonName ?? memberName : memberName;
+                    const deserializedValue = this._read(memberSchema, value[fromKey]);
+                    if (deserializedValue != null) {
+                        out[memberName] = deserializedValue;
+                    }
                 }
+                return out;
             }
-            return out;
-        }
-        else if (ns.isMapSchema() && isObject) {
-            const mapMember = ns.getValueSchema();
-            const out = {};
-            const sparse = !!ns.getMergedTraits().sparse;
-            for (const [_k, _v] of Object.entries(value)) {
-                if (sparse || _v != null) {
-                    out[_k] = this._read(mapMember, _v);
+            if (Array.isArray(value) && ns.isListSchema()) {
+                const listMember = ns.getValueSchema();
+                const out = [];
+                const sparse = !!ns.getMergedTraits().sparse;
+                for (const item of value) {
+                    if (sparse || item != null) {
+                        out.push(this._read(listMember, item));
+                    }
                 }
+                return out;
             }
-            return out;
-        }
-        else if (ns.isStructSchema() && isObject) {
-            const out = {};
-            for (const [memberName, memberSchema] of deserializingStructIterator(ns, value, this.settings.jsonName ? "jsonName" : false)) {
-                const fromKey = this.settings.jsonName ? memberSchema.getMergedTraits().jsonName ?? memberName : memberName;
-                const deserializedValue = this._read(memberSchema, value[fromKey]);
-                if (deserializedValue != null) {
-                    out[memberName] = deserializedValue;
+            if (ns.isMapSchema()) {
+                const mapMember = ns.getValueSchema();
+                const out = {};
+                const sparse = !!ns.getMergedTraits().sparse;
+                for (const [_k, _v] of Object.entries(value)) {
+                    if (sparse || _v != null) {
+                        out[_k] = this._read(mapMember, _v);
+                    }
                 }
+                return out;
             }
-            return out;
         }
         if (ns.isBlobSchema() && typeof value === "string") {
             return fromBase64(value);
@@ -63,6 +65,7 @@ export class JsonShapeDeserializer extends SerdeContextConfig {
             if (isJson) {
                 return LazyJsonString.from(value);
             }
+            return value;
         }
         if (ns.isTimestampSchema() && value != null) {
             const format = determineTimestampFormat(ns, this.settings);
@@ -100,6 +103,7 @@ export class JsonShapeDeserializer extends SerdeContextConfig {
                 case "NaN":
                     return NaN;
             }
+            return value;
         }
         if (ns.isDocumentSchema()) {
             if (isObject) {

package/dist-es/submodules/protocols/json/JsonShapeSerializer.js

@@ -8,6 +8,7 @@ import { JsonReplacer } from "./jsonReplacer";
 export class JsonShapeSerializer extends SerdeContextConfig {
     settings;
     buffer;
+    useReplacer = false;
     rootSchema;
     constructor(settings) {
         super();
@@ -24,9 +25,13 @@ export class JsonShapeSerializer extends SerdeContextConfig {
         }
     }
     flush() {
-        const { rootSchema } = this;
+        const { rootSchema, useReplacer } = this;
         this.rootSchema = undefined;
+        this.useReplacer = false;
         if (rootSchema?.isStructSchema() || rootSchema?.isDocumentSchema()) {
+            if (!useReplacer) {
+                return JSON.stringify(this.buffer);
+            }
             const replacer = new JsonReplacer();
             return replacer.replaceInJson(JSON.stringify(this.buffer, replacer.createReplacer(), 0));
         }
@@ -35,68 +40,68 @@ export class JsonShapeSerializer extends SerdeContextConfig {
     _write(schema, value, container) {
         const isObject = value !== null && typeof value === "object";
         const ns = NormalizedSchema.of(schema);
-        if (ns.isListSchema() && Array.isArray(value)) {
-            const listMember = ns.getValueSchema();
-            const out = [];
-            const sparse = !!ns.getMergedTraits().sparse;
-            for (const item of value) {
-                if (sparse || item != null) {
-                    out.push(this._write(listMember, item));
+        if (isObject) {
+            if (ns.isStructSchema()) {
+                const out = {};
+                for (const [memberName, memberSchema] of serializingStructIterator(ns, value)) {
+                    const serializableValue = this._write(memberSchema, value[memberName], ns);
+                    if (serializableValue !== undefined) {
+                        const jsonName = memberSchema.getMergedTraits().jsonName;
+                        const targetKey = this.settings.jsonName ? jsonName ?? memberName : memberName;
+                        out[targetKey] = serializableValue;
+                    }
                 }
+                return out;
             }
-            return out;
-        }
-        else if (ns.isMapSchema() && isObject) {
-            const mapMember = ns.getValueSchema();
-            const out = {};
-            const sparse = !!ns.getMergedTraits().sparse;
-            for (const [_k, _v] of Object.entries(value)) {
-                if (sparse || _v != null) {
-                    out[_k] = this._write(mapMember, _v);
+            if (Array.isArray(value) && ns.isListSchema()) {
+                const listMember = ns.getValueSchema();
+                const out = [];
+                const sparse = !!ns.getMergedTraits().sparse;
+                for (const item of value) {
+                    if (sparse || item != null) {
+                        out.push(this._write(listMember, item));
+                    }
                 }
+                return out;
             }
-            return out;
-        }
-        else if (ns.isStructSchema() && isObject) {
-            const out = {};
-            for (const [memberName, memberSchema] of serializingStructIterator(ns, value)) {
-                const serializableValue = this._write(memberSchema, value[memberName], ns);
-                if (serializableValue !== undefined) {
-                    const targetKey = this.settings.jsonName ? memberSchema.getMergedTraits().jsonName ?? memberName : memberName;
-                    out[targetKey] = serializableValue;
+            if (ns.isMapSchema()) {
+                const mapMember = ns.getValueSchema();
+                const out = {};
+                const sparse = !!ns.getMergedTraits().sparse;
+                for (const [_k, _v] of Object.entries(value)) {
+                    if (sparse || _v != null) {
+                        out[_k] = this._write(mapMember, _v);
+                    }
                 }
+                return out;
             }
-            return out;
-        }
-        if (value === null && container?.isStructSchema()) {
-            return void 0;
-        }
-        if ((ns.isBlobSchema() && (value instanceof Uint8Array || typeof value === "string")) ||
-            (ns.isDocumentSchema() && value instanceof Uint8Array)) {
-            if (ns === this.rootSchema) {
-                return value;
+            if (value instanceof Uint8Array && (ns.isBlobSchema() || ns.isDocumentSchema())) {
+                if (ns === this.rootSchema) {
+                    return value;
+                }
+                return (this.serdeContext?.base64Encoder ?? toBase64)(value);
             }
-            return (this.serdeContext?.base64Encoder ?? toBase64)(value);
-        }
-        if ((ns.isTimestampSchema() || ns.isDocumentSchema()) && value instanceof Date) {
-            const format = determineTimestampFormat(ns, this.settings);
-            switch (format) {
-                case 5:
-                    return value.toISOString().replace(".000Z", "Z");
-                case 6:
-                    return dateToUtcString(value);
-                case 7:
-                    return value.getTime() / 1000;
-                default:
-                    console.warn("Missing timestamp format, using epoch seconds", value);
-                    return value.getTime() / 1000;
+            if (value instanceof Date && (ns.isTimestampSchema() || ns.isDocumentSchema())) {
+                const format = determineTimestampFormat(ns, this.settings);
+                switch (format) {
+                    case 5:
+                        return value.toISOString().replace(".000Z", "Z");
+                    case 6:
+                        return dateToUtcString(value);
+                    case 7:
+                        return value.getTime() / 1000;
+                    default:
+                        console.warn("Missing timestamp format, using epoch seconds", value);
+                        return value.getTime() / 1000;
+                }
             }
-        }
-        if (ns.isNumericSchema() && typeof value === "number") {
-            if (Math.abs(value) === Infinity || isNaN(value)) {
-                return String(value);
+            if (value instanceof NumericValue) {
+                this.useReplacer = true;
             }
         }
+        if (value === null && container?.isStructSchema()) {
+            return void 0;
+        }
         if (ns.isStringSchema()) {
             if (typeof value === "undefined" && ns.isIdempotencyToken()) {
                 return generateIdempotencyToken();
@@ -108,12 +113,29 @@ export class JsonShapeSerializer extends SerdeContextConfig {
                     return LazyJsonString.from(value);
                 }
             }
+            return value;
+        }
+        if (typeof value === "number" && ns.isNumericSchema()) {
+            if (Math.abs(value) === Infinity || isNaN(value)) {
+                return String(value);
+            }
+            return value;
+        }
+        if (typeof value === "string" && ns.isBlobSchema()) {
+            if (ns === this.rootSchema) {
+                return value;
+            }
+            return (this.serdeContext?.base64Encoder ?? toBase64)(value);
+        }
+        if (typeof value === "bigint") {
+            this.useReplacer = true;
         }
         if (ns.isDocumentSchema()) {
             if (isObject) {
                 const out = Array.isArray(value) ? [] : {};
                 for (const [k, v] of Object.entries(value)) {
                     if (v instanceof NumericValue) {
+                        this.useReplacer = true;
                         out[k] = v;
                     }
                     else {

package/dist-es/submodules/protocols/query/AwsQueryProtocol.js

@@ -95,18 +95,13 @@ export class AwsQueryProtocol extends RpcProtocol {
             Code: errorData.Code,
             Message: message,
         };
-        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, errorData, metadata, (registry, errorName) => {
-            try {
-                return registry.getSchema(errorName);
-            }
-            catch (e) {
-                return registry.find((schema) => NormalizedSchema.of(schema).getMergedTraits().awsQueryError?.[0] === errorName);
-            }
-        });
+        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, errorData, metadata, this.mixin.findQueryCompatibleError);
         const ns = NormalizedSchema.of(errorSchema);
         const ErrorCtor = TypeRegistry.for(errorSchema[1]).getErrorCtor(errorSchema) ?? Error;
         const exception = new ErrorCtor(message);
         const output = {
+            Type: errorData.Error.Type,
+            Code: errorData.Error.Code,
             Error: errorData.Error,
         };
         for (const [name, member] of ns.structIterator()) {

package/dist-es/submodules/protocols/structIterator.js

@@ -6,7 +6,8 @@ export function* serializingStructIterator(ns, sourceObject) {
     const struct = ns.getSchema();
     for (let i = 0; i < struct[4].length; ++i) {
         const key = struct[4][i];
-        const memberNs = new NormalizedSchema([struct[5][i], 0], key);
+        const memberSchema = struct[5][i];
+        const memberNs = new NormalizedSchema([memberSchema, 0], key);
         if (!(key in sourceObject) && !memberNs.isIdempotencyToken()) {
             continue;
         }
@@ -18,13 +19,14 @@ export function* deserializingStructIterator(ns, sourceObject, nameTrait) {
         return;
     }
     const struct = ns.getSchema();
-    let keysRemaining = Object.keys(sourceObject).length;
+    let keysRemaining = Object.keys(sourceObject).filter((k) => k !== "__type").length;
     for (let i = 0; i < struct[4].length; ++i) {
         if (keysRemaining === 0) {
             break;
         }
         const key = struct[4][i];
-        const memberNs = new NormalizedSchema([struct[5][i], 0], key);
+        const memberSchema = struct[5][i];
+        const memberNs = new NormalizedSchema([memberSchema, 0], key);
         let serializationKey = key;
         if (nameTrait) {
             serializationKey = memberNs.getMergedTraits()[nameTrait] ?? key;

package/dist-es/submodules/protocols/xml/AwsRestXmlProtocol.js

@@ -40,7 +40,9 @@ export class AwsRestXmlProtocol extends HttpBindingProtocol {
         }
         if (request.headers["content-type"] === this.getDefaultContentType()) {
             if (typeof request.body === "string") {
-                request.body = '<?xml version="1.0" encoding="UTF-8"?>' + request.body;
+                if (!request.body.startsWith("<?xml ")) {
+                    request.body = '<?xml version="1.0" encoding="UTF-8"?>' + request.body;
+                }
             }
         }
         return request;

package/dist-types/submodules/protocols/ProtocolLib.d.ts

@@ -51,5 +51,11 @@ export declare class ProtocolLib {
      * @param errorData - canonical error object returned to the caller.
      */
     queryCompatOutput(queryCompatErrorData: any, errorData: any): void;
+    /**
+     * Finds the canonical modeled error using the awsQueryError alias.
+     * @param registry - service error registry.
+     * @param errorName - awsQueryError name or regular qualified shapeId.
+     */
+    findQueryCompatibleError(registry: TypeRegistry, errorName: string): StaticErrorSchema;
 }
 export {};

package/dist-types/submodules/protocols/json/AwsJson1_0Protocol.d.ts

@@ -1,13 +1,15 @@
 import { AwsJsonRpcProtocol } from "./AwsJsonRpcProtocol";
+import type { JsonCodec } from "./JsonCodec";
 /**
  * @public
  * @see https://smithy.io/2.0/aws/protocols/aws-json-1_1-protocol.html#differences-between-awsjson1-0-and-awsjson1-1
  */
 export declare class AwsJson1_0Protocol extends AwsJsonRpcProtocol {
-    constructor({ defaultNamespace, serviceTarget, awsQueryCompatible, }: {
+    constructor({ defaultNamespace, serviceTarget, awsQueryCompatible, jsonCodec, }: {
         defaultNamespace: string;
         serviceTarget: string;
         awsQueryCompatible?: boolean;
+        jsonCodec?: JsonCodec;
     });
     getShapeId(): string;
     protected getJsonRpcVersion(): "1.0";

package/dist-types/submodules/protocols/json/AwsJson1_1Protocol.d.ts

@@ -1,13 +1,15 @@
 import { AwsJsonRpcProtocol } from "./AwsJsonRpcProtocol";
+import type { JsonCodec } from "./JsonCodec";
 /**
  * @public
  * @see https://smithy.io/2.0/aws/protocols/aws-json-1_1-protocol.html#differences-between-awsjson1-0-and-awsjson1-1
  */
 export declare class AwsJson1_1Protocol extends AwsJsonRpcProtocol {
-    constructor({ defaultNamespace, serviceTarget, awsQueryCompatible, }: {
+    constructor({ defaultNamespace, serviceTarget, awsQueryCompatible, jsonCodec, }: {
         defaultNamespace: string;
         serviceTarget: string;
         awsQueryCompatible?: boolean;
+        jsonCodec?: JsonCodec;
     });
     getShapeId(): string;
     protected getJsonRpcVersion(): "1.1";

package/dist-types/submodules/protocols/json/AwsJsonRpcProtocol.d.ts

@@ -11,10 +11,11 @@ export declare abstract class AwsJsonRpcProtocol extends RpcProtocol {
     private readonly codec;
     private readonly mixin;
     private readonly awsQueryCompatible;
-    protected constructor({ defaultNamespace, serviceTarget, awsQueryCompatible, }: {
+    protected constructor({ defaultNamespace, serviceTarget, awsQueryCompatible, jsonCodec, }: {
         defaultNamespace: string;
         serviceTarget: string;
         awsQueryCompatible?: boolean;
+        jsonCodec?: JsonCodec;
     });
     serializeRequest<Input extends object>(operationSchema: OperationSchema, input: Input, context: HandlerExecutionContext & SerdeFunctions & EndpointBearer): Promise<HttpRequest>;
     getPayloadCodec(): JsonCodec;

package/dist-types/submodules/protocols/json/JsonShapeDeserializer.d.ts

@@ -9,5 +9,5 @@ export declare class JsonShapeDeserializer extends SerdeContextConfig implements
     constructor(settings: JsonSettings);
     read(schema: Schema, data: string | Uint8Array | unknown): Promise<any>;
     readObject(schema: Schema, data: DocumentType): any;
-    private _read;
+    protected _read(schema: Schema, value: unknown): any;
 }

package/dist-types/submodules/protocols/json/JsonShapeSerializer.d.ts

@@ -1,3 +1,4 @@
+import { NormalizedSchema } from "@smithy/core/schema";
 import type { Schema, ShapeSerializer } from "@smithy/types";
 import { SerdeContextConfig } from "../ConfigurableSerdeContext";
 import type { JsonSettings } from "./JsonCodec";
@@ -6,8 +7,13 @@ import type { JsonSettings } from "./JsonCodec";
  */
 export declare class JsonShapeSerializer extends SerdeContextConfig implements ShapeSerializer<string> {
     readonly settings: JsonSettings;
-    private buffer;
-    private rootSchema;
+    /**
+     * Write buffer. Reused per value serialization pass.
+     * In the initial implementation, this is not an incremental buffer.
+     */
+    protected buffer: any;
+    protected useReplacer: boolean;
+    protected rootSchema: NormalizedSchema | undefined;
     constructor(settings: JsonSettings);
     write(schema: Schema, value: unknown): void;
     /**
@@ -15,5 +21,8 @@ export declare class JsonShapeSerializer extends SerdeContextConfig implements S
      */
     writeDiscriminatedDocument(schema: Schema, value: unknown): void;
     flush(): string;
-    private _write;
+    /**
+     * Order if-statements by order of likelihood.
+     */
+    protected _write(schema: Schema, value: unknown, container?: NormalizedSchema): any;
 }

package/dist-types/ts3.4/submodules/protocols/ProtocolLib.d.ts

@@ -39,5 +39,9 @@ export declare class ProtocolLib {
     response: IHttpResponse
   ): void;
   queryCompatOutput(queryCompatErrorData: any, errorData: any): void;
+  findQueryCompatibleError(
+    registry: TypeRegistry,
+    errorName: string
+  ): StaticErrorSchema;
 }
 export {};

package/dist-types/ts3.4/submodules/protocols/json/AwsJson1_0Protocol.d.ts

@@ -1,13 +1,16 @@
 import { AwsJsonRpcProtocol } from "./AwsJsonRpcProtocol";
+import { JsonCodec } from "./JsonCodec";
 export declare class AwsJson1_0Protocol extends AwsJsonRpcProtocol {
   constructor({
     defaultNamespace,
     serviceTarget,
     awsQueryCompatible,
+    jsonCodec,
   }: {
     defaultNamespace: string;
     serviceTarget: string;
     awsQueryCompatible?: boolean;
+    jsonCodec?: JsonCodec;
   });
   getShapeId(): string;
   protected getJsonRpcVersion(): "1.0";

package/dist-types/ts3.4/submodules/protocols/json/AwsJson1_1Protocol.d.ts

@@ -1,13 +1,16 @@
 import { AwsJsonRpcProtocol } from "./AwsJsonRpcProtocol";
+import { JsonCodec } from "./JsonCodec";
 export declare class AwsJson1_1Protocol extends AwsJsonRpcProtocol {
   constructor({
     defaultNamespace,
     serviceTarget,
     awsQueryCompatible,
+    jsonCodec,
   }: {
     defaultNamespace: string;
     serviceTarget: string;
     awsQueryCompatible?: boolean;
+    jsonCodec?: JsonCodec;
   });
   getShapeId(): string;
   protected getJsonRpcVersion(): "1.1";

package/dist-types/ts3.4/submodules/protocols/json/AwsJsonRpcProtocol.d.ts

@@ -22,10 +22,12 @@ export declare abstract class AwsJsonRpcProtocol extends RpcProtocol {
     defaultNamespace,
     serviceTarget,
     awsQueryCompatible,
+    jsonCodec,
   }: {
     defaultNamespace: string;
     serviceTarget: string;
     awsQueryCompatible?: boolean;
+    jsonCodec?: JsonCodec;
   });
   serializeRequest<Input extends object>(
     operationSchema: OperationSchema,

package/dist-types/ts3.4/submodules/protocols/json/JsonShapeDeserializer.d.ts

@@ -9,5 +9,5 @@ export declare class JsonShapeDeserializer
   constructor(settings: JsonSettings);
   read(schema: Schema, data: string | Uint8Array | unknown): Promise<any>;
   readObject(schema: Schema, data: DocumentType): any;
-  private _read;
+  protected _read(schema: Schema, value: unknown): any;
 }

package/dist-types/ts3.4/submodules/protocols/json/JsonShapeSerializer.d.ts

@@ -1,3 +1,4 @@
+import { NormalizedSchema } from "@smithy/core/schema";
 import { Schema, ShapeSerializer } from "@smithy/types";
 import { SerdeContextConfig } from "../ConfigurableSerdeContext";
 import { JsonSettings } from "./JsonCodec";
@@ -6,11 +7,16 @@ export declare class JsonShapeSerializer
   implements ShapeSerializer<string>
 {
   readonly settings: JsonSettings;
-  private buffer;
-  private rootSchema;
+  protected buffer: any;
+  protected useReplacer: boolean;
+  protected rootSchema: NormalizedSchema | undefined;
   constructor(settings: JsonSettings);
   write(schema: Schema, value: unknown): void;
   writeDiscriminatedDocument(schema: Schema, value: unknown): void;
   flush(): string;
-  private _write;
+  protected _write(
+    schema: Schema,
+    value: unknown,
+    container?: NormalizedSchema
+  ): any;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/core",
-  "version": "3.940.0",
+  "version": "3.946.0",
   "description": "Core functions & classes shared by multiple AWS SDK clients.",
   "scripts": {
     "build": "yarn lint && concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
@@ -83,12 +83,12 @@
   "dependencies": {
     "@aws-sdk/types": "3.936.0",
     "@aws-sdk/xml-builder": "3.930.0",
-    "@smithy/core": "^3.18.5",
+    "@smithy/core": "^3.18.7",
     "@smithy/node-config-provider": "^4.3.5",
     "@smithy/property-provider": "^4.2.5",
     "@smithy/protocol-http": "^5.3.5",
     "@smithy/signature-v4": "^5.3.5",
-    "@smithy/smithy-client": "^4.9.8",
+    "@smithy/smithy-client": "^4.9.10",
     "@smithy/types": "^4.9.0",
     "@smithy/util-base64": "^4.3.0",
     "@smithy/util-middleware": "^4.2.5",