@cdklabs/cdk-ecs-codedeploy 0.0.420 → 0.0.422

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

@@ -1,7 +1,10 @@
-import { NormalizedSchema, SCHEMA } from "@smithy/core/schema";
+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/util-base64";
 import { SerdeContextConfig } from "../ConfigurableSerdeContext";
+import { deserializingStructIterator } from "../structIterator";
+import { UnionSerde } from "../UnionSerde";
 import { jsonReviver } from "./jsonReviver";
 import { parseJsonBody } from "./parseJsonBody";
 export class JsonShapeDeserializer extends SerdeContextConfig {
@@ -19,38 +22,50 @@ 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 union = ns.isUnionSchema();
+                const out = {};
+                let unionSerde;
+                if (union) {
+                    unionSerde = new UnionSerde(value, out);
                 }
+                for (const [memberName, memberSchema] of deserializingStructIterator(ns, value, this.settings.jsonName ? "jsonName" : false)) {
+                    const fromKey = this.settings.jsonName ? memberSchema.getMergedTraits().jsonName ?? memberName : memberName;
+                    if (union) {
+                        unionSerde.mark(fromKey);
+                    }
+                    if (value[fromKey] != null) {
+                        out[memberName] = this._read(memberSchema, value[fromKey]);
+                    }
+                }
+                if (union) {
+                    unionSerde.writeUnknown();
+                }
+                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 ns.structIterator()) {
-                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);
@@ -61,20 +76,16 @@ export class JsonShapeDeserializer extends SerdeContextConfig {
             if (isJson) {
                 return LazyJsonString.from(value);
             }
+            return value;
         }
-        if (ns.isTimestampSchema()) {
-            const options = this.settings.timestampFormat;
-            const format = options.useTrait
-                ? ns.getSchema() === SCHEMA.TIMESTAMP_DEFAULT
-                    ? options.default
-                    : ns.getSchema() ?? options.default
-                : options.default;
+        if (ns.isTimestampSchema() && value != null) {
+            const format = determineTimestampFormat(ns, this.settings);
             switch (format) {
-                case SCHEMA.TIMESTAMP_DATE_TIME:
+                case 5:
                     return parseRfc3339DateTimeWithOffset(value);
-                case SCHEMA.TIMESTAMP_HTTP_DATE:
+                case 6:
                     return parseRfc7231DateTime(value);
-                case SCHEMA.TIMESTAMP_EPOCH_SECONDS:
+                case 7:
                     return parseEpochTimestamp(value);
                 default:
                     console.warn("Missing timestamp format, parsing value with Date constructor:", value);
@@ -88,6 +99,10 @@ export class JsonShapeDeserializer extends SerdeContextConfig {
             if (value instanceof NumericValue) {
                 return value;
             }
+            const untyped = value;
+            if (untyped.type === "bigDecimal" && "string" in untyped) {
+                return new NumericValue(untyped.string, untyped.type);
+            }
             return new NumericValue(String(value), "bigDecimal");
         }
         if (ns.isNumericSchema() && typeof value === "string") {
@@ -99,6 +114,24 @@ export class JsonShapeDeserializer extends SerdeContextConfig {
                 case "NaN":
                     return NaN;
             }
+            return value;
+        }
+        if (ns.isDocumentSchema()) {
+            if (isObject) {
+                const out = Array.isArray(value) ? [] : {};
+                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);
+            }
         }
         return value;
     }

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

@@ -1,11 +1,14 @@
-import { NormalizedSchema, SCHEMA } from "@smithy/core/schema";
-import { dateToUtcString } from "@smithy/core/serde";
-import { LazyJsonString } from "@smithy/core/serde";
+import { determineTimestampFormat } from "@smithy/core/protocols";
+import { NormalizedSchema } from "@smithy/core/schema";
+import { dateToUtcString, generateIdempotencyToken, LazyJsonString, NumericValue } from "@smithy/core/serde";
+import { toBase64 } from "@smithy/util-base64";
 import { SerdeContextConfig } from "../ConfigurableSerdeContext";
+import { serializingStructIterator } from "../structIterator";
 import { JsonReplacer } from "./jsonReplacer";
 export class JsonShapeSerializer extends SerdeContextConfig {
     settings;
     buffer;
+    useReplacer = false;
     rootSchema;
     constructor(settings) {
         super();
@@ -15,8 +18,20 @@ export class JsonShapeSerializer extends SerdeContextConfig {
         this.rootSchema = NormalizedSchema.of(schema);
         this.buffer = this._write(this.rootSchema, value);
     }
+    writeDiscriminatedDocument(schema, value) {
+        this.write(schema, value);
+        if (typeof this.buffer === "object") {
+            this.buffer.__type = NormalizedSchema.of(schema).getName(true);
+        }
+    }
     flush() {
-        if (this.rootSchema?.isStructSchema() || this.rootSchema?.isDocumentSchema()) {
+        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));
         }
@@ -25,80 +40,119 @@ 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;
+                    }
                 }
+                if (ns.isUnionSchema() && Object.keys(out).length === 0) {
+                    const { $unknown } = value;
+                    if (Array.isArray($unknown)) {
+                        const [k, v] = $unknown;
+                        out[k] = this._write(15, v);
+                    }
+                }
+                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 ns.structIterator()) {
-                const targetKey = this.settings.jsonName ? memberSchema.getMergedTraits().jsonName ?? memberName : memberName;
-                const serializableValue = this._write(memberSchema, value[memberName], ns);
-                if (serializableValue !== undefined) {
-                    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;
+            }
+            if (value instanceof Uint8Array && (ns.isBlobSchema() || ns.isDocumentSchema())) {
+                if (ns === this.rootSchema) {
+                    return value;
+                }
+                return (this.serdeContext?.base64Encoder ?? toBase64)(value);
+            }
+            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 (value instanceof NumericValue) {
+                this.useReplacer = true;
             }
-            return out;
         }
         if (value === null && container?.isStructSchema()) {
             return void 0;
         }
-        if (ns.isBlobSchema() && (value instanceof Uint8Array || typeof value === "string")) {
-            if (ns === this.rootSchema) {
-                return value;
-            }
-            if (!this.serdeContext?.base64Encoder) {
-                throw new Error("Missing base64Encoder in serdeContext");
+        if (ns.isStringSchema()) {
+            if (typeof value === "undefined" && ns.isIdempotencyToken()) {
+                return generateIdempotencyToken();
             }
-            return this.serdeContext?.base64Encoder(value);
-        }
-        if (ns.isTimestampSchema() && value instanceof Date) {
-            const options = this.settings.timestampFormat;
-            const format = options.useTrait
-                ? ns.getSchema() === SCHEMA.TIMESTAMP_DEFAULT
-                    ? options.default
-                    : ns.getSchema() ?? options.default
-                : options.default;
-            switch (format) {
-                case SCHEMA.TIMESTAMP_DATE_TIME:
-                    return value.toISOString().replace(".000Z", "Z");
-                case SCHEMA.TIMESTAMP_HTTP_DATE:
-                    return dateToUtcString(value);
-                case SCHEMA.TIMESTAMP_EPOCH_SECONDS:
-                    return value.getTime() / 1000;
-                default:
-                    console.warn("Missing timestamp format, using epoch seconds", value);
-                    return value.getTime() / 1000;
+            const mediaType = ns.getMergedTraits().mediaType;
+            if (value != null && mediaType) {
+                const isJson = mediaType === "application/json" || mediaType.endsWith("+json");
+                if (isJson) {
+                    return LazyJsonString.from(value);
+                }
             }
+            return value;
         }
-        if (ns.isNumericSchema() && typeof value === "number") {
+        if (typeof value === "number" && ns.isNumericSchema()) {
             if (Math.abs(value) === Infinity || isNaN(value)) {
                 return String(value);
             }
+            return value;
         }
-        const mediaType = ns.getMergedTraits().mediaType;
-        if (ns.isStringSchema() && typeof value === "string" && mediaType) {
-            const isJson = mediaType === "application/json" || mediaType.endsWith("+json");
-            if (isJson) {
-                return LazyJsonString.from(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 {
+                        out[k] = this._write(ns, v);
+                    }
+                }
+                return out;
+            }
+            else {
+                return structuredClone(value);
             }
         }
         return value;

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

@@ -0,0 +1,136 @@
+import { determineTimestampFormat } from "@smithy/core/protocols";
+import { NormalizedSchema } from "@smithy/core/schema";
+import { dateToUtcString, generateIdempotencyToken, LazyJsonString, NumericValue } from "@smithy/core/serde";
+import { toBase64 } from "@smithy/util-base64";
+import { SerdeContextConfig } from "../../ConfigurableSerdeContext";
+import { serializingStructIterator } from "../../structIterator";
+export class SinglePassJsonShapeSerializer extends SerdeContextConfig {
+    settings;
+    buffer;
+    rootSchema;
+    constructor(settings) {
+        super();
+        this.settings = settings;
+    }
+    write(schema, value) {
+        this.rootSchema = NormalizedSchema.of(schema);
+        this.buffer = this.writeObject(this.rootSchema, value);
+    }
+    writeDiscriminatedDocument(schema, value) {
+        this.write(schema, value);
+        if (typeof this.buffer === "object") {
+            this.buffer.__type = NormalizedSchema.of(schema).getName(true);
+        }
+    }
+    flush() {
+        this.rootSchema = undefined;
+        return this.buffer;
+    }
+    writeObject(schema, value) {
+        if (value == undefined) {
+            return "";
+        }
+        let b = "";
+        const ns = NormalizedSchema.of(schema);
+        const sparse = !!ns.getMergedTraits().sparse;
+        if (Array.isArray(value) && (ns.isDocumentSchema() || ns.isListSchema())) {
+            b += "[";
+            for (let i = 0; i < value.length; ++i) {
+                const item = value[i];
+                if (item != null || sparse) {
+                    b += this.writeValue(ns.getValueSchema(), item);
+                    b += ",";
+                }
+            }
+        }
+        else if (ns.isStructSchema()) {
+            b += "{";
+            let didWriteMember = false;
+            for (const [name, member] of serializingStructIterator(ns, value)) {
+                const item = value[name];
+                const targetKey = this.settings.jsonName ? member.getMergedTraits().jsonName ?? name : name;
+                const serializableValue = this.writeValue(member, item);
+                if (item != null || member.isIdempotencyToken()) {
+                    didWriteMember = true;
+                    b += `"${targetKey}":${serializableValue}`;
+                    b += ",";
+                }
+            }
+            if (!didWriteMember && ns.isUnionSchema()) {
+                const { $unknown } = value;
+                if (Array.isArray($unknown)) {
+                    const [k, v] = $unknown;
+                    b += `"${k}":${this.writeValue(15, v)}`;
+                }
+            }
+        }
+        else if (ns.isMapSchema() || ns.isDocumentSchema()) {
+            b += "{";
+            for (const [k, v] of Object.entries(value)) {
+                if (v != null || sparse) {
+                    b += `"${k}":${this.writeValue(ns, v)}`;
+                    b += ",";
+                }
+            }
+        }
+        if (b[b.length - 1] === ",") {
+            b = b.slice(0, -1);
+        }
+        if (b[0] === "[") {
+            b += "]";
+        }
+        if (b[0] === "{") {
+            b += "}";
+        }
+        return b;
+    }
+    writeValue(schema, value) {
+        const isObject = value !== null && typeof value === "object";
+        const ns = NormalizedSchema.of(schema);
+        const quote = (_) => `"${_}"`;
+        if ((ns.isBlobSchema() && (value instanceof Uint8Array || typeof value === "string")) ||
+            (ns.isDocumentSchema() && value instanceof Uint8Array)) {
+            return quote((this.serdeContext?.base64Encoder ?? toBase64)(value));
+        }
+        if ((ns.isTimestampSchema() || ns.isDocumentSchema()) && value instanceof Date) {
+            const format = determineTimestampFormat(ns, this.settings);
+            switch (format) {
+                case 5:
+                    return quote(value.toISOString().replace(".000Z", "Z"));
+                case 6:
+                    return quote(dateToUtcString(value));
+                case 7:
+                    return String(value.getTime() / 1000);
+                default:
+                    console.warn("Missing timestamp format, using epoch seconds", value);
+                    return String(value.getTime() / 1000);
+            }
+        }
+        if (ns.isNumericSchema() && typeof value === "number") {
+            if (Math.abs(value) === Infinity || isNaN(value)) {
+                return quote(String(value));
+            }
+        }
+        if (ns.isStringSchema()) {
+            if (typeof value === "undefined" && ns.isIdempotencyToken()) {
+                return quote(generateIdempotencyToken());
+            }
+            if (typeof value === "string") {
+                const mediaType = ns.getMergedTraits().mediaType;
+                if (mediaType) {
+                    const isJson = mediaType === "application/json" || mediaType.endsWith("+json");
+                    if (isJson) {
+                        return quote(LazyJsonString.from(value).toString());
+                    }
+                }
+            }
+        }
+        if (value instanceof NumericValue) {
+            return value.string;
+        }
+        if (isObject) {
+            return this.writeObject(ns, value);
+        }
+        return typeof value === "string" ? quote(value) : String(value);
+    }
+}

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

@@ -14,7 +14,7 @@ export class JsonReplacer {
         this.stage = 1;
         return (key, value) => {
             if (value instanceof NumericValue) {
-                const v = `${NUMERIC_CONTROL_CHAR + +"nv" + this.counter++}_` + value.string;
+                const v = `${NUMERIC_CONTROL_CHAR + "nv" + this.counter++}_` + value.string;
                 this.values.set(`"${v}"`, value.string);
                 return v;
             }

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

@@ -1,12 +1,13 @@
 import { collectBody, RpcProtocol } from "@smithy/core/protocols";
-import { deref, NormalizedSchema, SCHEMA, TypeRegistry } from "@smithy/core/schema";
-import { calculateBodyLength } from "@smithy/util-body-length-browser";
+import { deref, NormalizedSchema, TypeRegistry } from "@smithy/core/schema";
+import { ProtocolLib } from "../ProtocolLib";
 import { XmlShapeDeserializer } from "../xml/XmlShapeDeserializer";
 import { QueryShapeSerializer } from "./QueryShapeSerializer";
 export class AwsQueryProtocol extends RpcProtocol {
     options;
     serializer;
     deserializer;
+    mixin = new ProtocolLib();
     constructor(options) {
         super({
             defaultNamespace: options.defaultNamespace,
@@ -15,7 +16,7 @@ export class AwsQueryProtocol extends RpcProtocol {
         const settings = {
             timestampFormat: {
                 useTrait: true,
-                default: SCHEMA.TIMESTAMP_DATE_TIME,
+                default: 5,
             },
             httpBindings: false,
             xmlNamespace: options.xmlNamespace,
@@ -46,14 +47,11 @@ export class AwsQueryProtocol extends RpcProtocol {
         if (deref(operationSchema.input) === "unit" || !request.body) {
             request.body = "";
         }
-        request.body = `Action=${operationSchema.name.split("#")[1]}&Version=${this.options.version}` + request.body;
+        const action = operationSchema.name.split("#")[1] ?? operationSchema.name;
+        request.body = `Action=${action}&Version=${this.options.version}` + request.body;
         if (request.body.endsWith("&")) {
             request.body = request.body.slice(-1);
         }
-        try {
-            request.headers["content-length"] = String(calculateBodyLength(request.body));
-        }
-        catch (e) { }
         return request;
     }
     async deserializeResponse(operationSchema, context, response) {
@@ -63,7 +61,7 @@ export class AwsQueryProtocol extends RpcProtocol {
         if (response.statusCode >= 300) {
             const bytes = await collectBody(response.body, context);
             if (bytes.byteLength > 0) {
-                Object.assign(dataObject, await deserializer.read(SCHEMA.DOCUMENT, bytes));
+                Object.assign(dataObject, await deserializer.read(15, bytes));
             }
             await this.handleError(operationSchema, context, response, dataObject, this.deserializeMetadata(response));
         }
@@ -72,7 +70,8 @@ export class AwsQueryProtocol extends RpcProtocol {
             delete response.headers[header];
             response.headers[header.toLowerCase()] = value;
         }
-        const awsQueryResultKey = ns.isStructSchema() && this.useNestedResult() ? operationSchema.name.split("#")[1] + "Result" : undefined;
+        const shortName = operationSchema.name.split("#")[1] ?? operationSchema.name;
+        const awsQueryResultKey = ns.isStructSchema() && this.useNestedResult() ? shortName + "Result" : undefined;
         const bytes = await collectBody(response.body, context);
         if (bytes.byteLength > 0) {
             Object.assign(dataObject, await deserializer.read(ns, bytes, awsQueryResultKey));
@@ -88,45 +87,32 @@ export class AwsQueryProtocol extends RpcProtocol {
     }
     async handleError(operationSchema, context, response, dataObject, metadata) {
         const errorIdentifier = this.loadQueryErrorCode(response, dataObject) ?? "Unknown";
-        let namespace = this.options.defaultNamespace;
-        let errorName = errorIdentifier;
-        if (errorIdentifier.includes("#")) {
-            [namespace, errorName] = errorIdentifier.split("#");
-        }
-        const errorDataSource = this.loadQueryError(dataObject);
-        const registry = TypeRegistry.for(namespace);
-        let errorSchema;
-        try {
-            errorSchema = registry.find((schema) => NormalizedSchema.of(schema).getMergedTraits().awsQueryError?.[0] === errorName);
-            if (!errorSchema) {
-                errorSchema = registry.getSchema(errorIdentifier);
-            }
-        }
-        catch (e) {
-            const baseExceptionSchema = TypeRegistry.for("smithy.ts.sdk.synthetic." + namespace).getBaseException();
-            if (baseExceptionSchema) {
-                const ErrorCtor = baseExceptionSchema.ctor;
-                throw Object.assign(new ErrorCtor(errorName), errorDataSource);
-            }
-            throw new Error(errorName);
-        }
-        const ns = NormalizedSchema.of(errorSchema);
+        const errorData = this.loadQueryError(dataObject);
         const message = this.loadQueryErrorMessage(dataObject);
-        const exception = new errorSchema.ctor(message);
-        const output = {};
+        errorData.message = message;
+        errorData.Error = {
+            Type: errorData.Type,
+            Code: errorData.Code,
+            Message: message,
+        };
+        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()) {
             const target = member.getMergedTraits().xmlName ?? name;
-            const value = errorDataSource[target] ?? dataObject[target];
+            const value = errorData[target] ?? dataObject[target];
             output[name] = this.deserializer.readSchema(member, value);
         }
-        Object.assign(exception, {
-            $metadata: metadata,
-            $response: response,
+        throw this.mixin.decorateServiceException(Object.assign(exception, errorMetadata, {
             $fault: ns.getMergedTraits().error,
             message,
-            ...output,
-        });
-        throw exception;
+        }, output), dataObject);
     }
     loadQueryErrorCode(output, data) {
         const code = (data.Errors?.[0]?.Error ?? data.Errors?.Error ?? data.Error)?.Code;
@@ -144,4 +130,7 @@ export class AwsQueryProtocol extends RpcProtocol {
         const errorData = this.loadQueryError(data);
         return errorData?.message ?? errorData?.Message ?? data.message ?? data.Message ?? "Unknown";
     }
+    getDefaultContentType() {
+        return "application/x-www-form-urlencoded";
+    }
 }