@aws-sdk/core 3.974.8 → 3.974.9

package/dist-cjs/submodules/protocols/index.js

@@ -2,11 +2,9 @@
 
 var cbor = require('@smithy/core/cbor');
 var schema = require('@smithy/core/schema');
-var smithyClient = require('@smithy/smithy-client');
+var client = require('@smithy/core/client');
 var protocols = require('@smithy/core/protocols');
 var serde = require('@smithy/core/serde');
-var utilBase64 = require('@smithy/util-base64');
-var utilUtf8 = require('@smithy/util-utf8');
 var xmlBuilder = require('@aws-sdk/xml-builder');
 
 class ProtocolLib {
@@ -92,7 +90,7 @@ class ProtocolLib {
     decorateServiceException(exception, additions = {}) {
         if (this.queryCompat) {
             const msg = exception.Message ?? additions.Message;
-            const error = smithyClient.decorateServiceException(exception, additions);
+            const error = client.decorateServiceException(exception, additions);
             if (msg) {
                 error.message = msg;
             }
@@ -107,7 +105,7 @@ class ProtocolLib {
             }
             return error;
         }
-        return smithyClient.decorateServiceException(exception, additions);
+        return client.decorateServiceException(exception, additions);
     }
     setQueryCompatError(output, response) {
         const queryErrorHeader = response.headers?.["x-amzn-query-error"];
@@ -180,7 +178,7 @@ class AwsSmithyRpcV2CborProtocol extends cbor.SmithyRpcV2CborProtocol {
         const ns = schema.NormalizedSchema.of(errorSchema);
         const message = dataObject.message ?? dataObject.Message ?? "UnknownError";
         const ErrorCtor = this.compositeErrorRegistry.getErrorCtor(errorSchema) ?? Error;
-        const exception = new ErrorCtor(message);
+        const exception = new ErrorCtor({});
         const output = {};
         for (const [name, member] of ns.structIterator()) {
             if (dataObject[name] != null) {
@@ -299,7 +297,7 @@ function jsonReviver(key, value, context) {
     return value;
 }
 
-const collectBodyString = (streamBody, context) => smithyClient.collectBody(streamBody, context).then((body) => (context?.utf8Encoder ?? utilUtf8.toUtf8)(body));
+const collectBodyString = (streamBody, context) => protocols.collectBody(streamBody, context).then((body) => (context?.utf8Encoder ?? serde.toUtf8)(body));
 
 const parseJsonBody = (streamBody, context) => collectBodyString(streamBody, context).then((encoded) => {
     if (encoded.length) {
@@ -323,7 +321,7 @@ const parseJsonErrorBody = async (errorBody, context) => {
     return value;
 };
 const findKey = (object, key) => Object.keys(object).find((k) => k.toLowerCase() === key.toLowerCase());
-const sanitizeErrorCode = (rawValue) => {
+const sanitizeErrorCode = (rawValue, removeNamespace = true) => {
     let cleanValue = rawValue;
     if (typeof cleanValue === "number") {
         cleanValue = cleanValue.toString();
@@ -334,23 +332,38 @@ const sanitizeErrorCode = (rawValue) => {
     if (cleanValue.indexOf(":") >= 0) {
         cleanValue = cleanValue.split(":")[0];
     }
-    if (cleanValue.indexOf("#") >= 0) {
+    if (removeNamespace && cleanValue.indexOf("#") >= 0) {
         cleanValue = cleanValue.split("#")[1];
     }
     return cleanValue;
 };
 const loadRestJsonErrorCode = (output, data) => {
-    const headerKey = findKey(output.headers, "x-amzn-errortype");
-    if (headerKey !== undefined) {
-        return sanitizeErrorCode(output.headers[headerKey]);
-    }
-    if (data && typeof data === "object") {
-        const codeKey = findKey(data, "code");
-        if (codeKey && data[codeKey] !== undefined) {
-            return sanitizeErrorCode(data[codeKey]);
-        }
-        if (data["__type"] !== undefined) {
-            return sanitizeErrorCode(data["__type"]);
+    return loadErrorCode(output, data, true, ["header", "code", "type"]);
+};
+const loadJsonRpcErrorCode = (output, data, removeNamespace, queryCompat = false) => {
+    return loadErrorCode(output, data, removeNamespace, queryCompat ? ["code", "header", "type"] : ["type", "code", "header"]);
+};
+const loadErrorCode = ({ headers }, data, removeNamespace, order) => {
+    while (order.length > 0) {
+        const location = order.shift();
+        switch (location) {
+            case "header":
+                const headerKey = findKey(headers ?? {}, "x-amzn-errortype");
+                if (headerKey !== undefined) {
+                    return sanitizeErrorCode(headers[headerKey], removeNamespace);
+                }
+                break;
+            case "code":
+                const codeKey = findKey(data ?? {}, "code");
+                if (codeKey && data[codeKey] !== undefined) {
+                    return sanitizeErrorCode(data[codeKey], removeNamespace);
+                }
+                break;
+            case "type":
+                if (data?.__type !== undefined) {
+                    return sanitizeErrorCode(data.__type, removeNamespace);
+                }
+                break;
         }
     }
 };
@@ -429,7 +442,7 @@ class JsonShapeDeserializer extends SerdeContextConfig {
             }
         }
         if (ns.isBlobSchema() && typeof value === "string") {
-            return utilBase64.fromBase64(value);
+            return serde.fromBase64(value);
         }
         const mediaType = ns.getMergedTraits().mediaType;
         if (ns.isStringSchema() && typeof value === "string" && mediaType) {
@@ -647,7 +660,7 @@ class JsonShapeSerializer extends SerdeContextConfig {
                 if (ns === this.rootSchema) {
                     return value;
                 }
-                return (this.serdeContext?.base64Encoder ?? utilBase64.toBase64)(value);
+                return (this.serdeContext?.base64Encoder ?? serde.toBase64)(value);
             }
             if (value instanceof Date && (ns.isTimestampSchema() || ns.isDocumentSchema())) {
                 const format = protocols.determineTimestampFormat(ns, this.settings);
@@ -693,7 +706,7 @@ class JsonShapeSerializer extends SerdeContextConfig {
             if (ns === this.rootSchema) {
                 return value;
             }
-            return (this.serdeContext?.base64Encoder ?? utilBase64.toBase64)(value);
+            return (this.serdeContext?.base64Encoder ?? serde.toBase64)(value);
         }
         if (typeof value === "bigint") {
             this.useReplacer = true;
@@ -785,16 +798,17 @@ class AwsJsonRpcProtocol extends protocols.RpcProtocol {
         return this.codec;
     }
     async handleError(operationSchema, context, response, dataObject, metadata) {
-        if (this.awsQueryCompatible) {
+        const { awsQueryCompatible } = this;
+        if (awsQueryCompatible) {
             this.mixin.setQueryCompatError(dataObject, response);
         }
-        const errorIdentifier = loadRestJsonErrorCode(response, dataObject) ?? "Unknown";
+        const errorIdentifier = loadJsonRpcErrorCode(response, dataObject, this.getJsonRpcVersion() === "1.1", awsQueryCompatible) ?? "Unknown";
         this.mixin.compose(this.compositeErrorRegistry, errorIdentifier, this.options.defaultNamespace);
-        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, dataObject, metadata, this.awsQueryCompatible ? this.mixin.findQueryCompatibleError : undefined);
+        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, dataObject, metadata, awsQueryCompatible ? this.mixin.findQueryCompatibleError : undefined);
         const ns = schema.NormalizedSchema.of(errorSchema);
         const message = dataObject.message ?? dataObject.Message ?? "UnknownError";
         const ErrorCtor = this.compositeErrorRegistry.getErrorCtor(errorSchema) ?? Error;
-        const exception = new ErrorCtor(message);
+        const exception = new ErrorCtor({});
         const output = {};
         const errorDeserializer = this.codec.createDeserializer();
         for (const [name, member] of ns.structIterator()) {
@@ -802,7 +816,7 @@ class AwsJsonRpcProtocol extends protocols.RpcProtocol {
                 output[name] = errorDeserializer.readObject(member, dataObject[name]);
             }
         }
-        if (this.awsQueryCompatible) {
+        if (awsQueryCompatible) {
             this.mixin.queryCompatOutput(dataObject, output);
         }
         throw this.mixin.decorateServiceException(Object.assign(exception, errorMetadata, {
@@ -917,7 +931,7 @@ class AwsRestJsonProtocol extends protocols.HttpBindingProtocol {
         const ns = schema.NormalizedSchema.of(errorSchema);
         const message = dataObject.message ?? dataObject.Message ?? "UnknownError";
         const ErrorCtor = this.compositeErrorRegistry.getErrorCtor(errorSchema) ?? Error;
-        const exception = new ErrorCtor(message);
+        const exception = new ErrorCtor({});
         await this.deserializeHttpMessage(errorSchema, context, response, dataObject);
         const output = {};
         const errorDeserializer = this.codec.createDeserializer();
@@ -942,7 +956,7 @@ const awsExpectUnion = (value) => {
     if (typeof value === "object" && "__type" in value) {
         delete value.__type;
     }
-    return smithyClient.expectUnion(value);
+    return serde.expectUnion(value);
 };
 
 class XmlShapeDeserializer extends SerdeContextConfig {
@@ -977,7 +991,7 @@ class XmlShapeDeserializer extends SerdeContextConfig {
             }
             return output;
         }
-        const xmlString = (this.serdeContext?.utf8Encoder ?? utilUtf8.toUtf8)(bytes);
+        const xmlString = (this.serdeContext?.utf8Encoder ?? serde.toUtf8)(bytes);
         const parsedObject = this.parseXml(xmlString);
         return this.readSchema(schema$1, key ? parsedObject[key] : parsedObject);
     }
@@ -1086,7 +1100,7 @@ class XmlShapeDeserializer extends SerdeContextConfig {
                 parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
                 delete parsedObjToReturn[textNodeName];
             }
-            return smithyClient.getValueFromTextNode(parsedObjToReturn);
+            return client.getValueFromTextNode(parsedObjToReturn);
         }
         return {};
     }
@@ -1110,7 +1124,7 @@ class QueryShapeSerializer extends SerdeContextConfig {
         if (ns.isBlobSchema()) {
             if (typeof value === "string" || value instanceof Uint8Array) {
                 this.writeKey(prefix);
-                this.writeValue((this.serdeContext?.base64Encoder ?? utilBase64.toBase64)(value));
+                this.writeValue((this.serdeContext?.base64Encoder ?? serde.toBase64)(value));
             }
         }
         else if (ns.isBooleanSchema() || ns.isNumericSchema() || ns.isStringSchema()) {
@@ -1144,7 +1158,7 @@ class QueryShapeSerializer extends SerdeContextConfig {
                         this.writeValue(value.toISOString().replace(".000Z", "Z"));
                         break;
                     case 6:
-                        this.writeValue(smithyClient.dateToUtcString(value));
+                        this.writeValue(serde.dateToUtcString(value));
                         break;
                     case 7:
                         this.writeValue(String(value.getTime() / 1000));
@@ -1368,7 +1382,7 @@ class AwsQueryProtocol extends protocols.RpcProtocol {
         const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, errorData, metadata, this.mixin.findQueryCompatibleError);
         const ns = schema.NormalizedSchema.of(errorSchema);
         const ErrorCtor = this.compositeErrorRegistry.getErrorCtor(errorSchema) ?? Error;
-        const exception = new ErrorCtor(message);
+        const exception = new ErrorCtor({});
         const output = {
             Type: errorData.Error.Type,
             Code: errorData.Error.Code,
@@ -1447,7 +1461,7 @@ const parseXmlBody = (streamBody, context) => collectBodyString(streamBody, cont
             parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
             delete parsedObjToReturn[textNodeName];
         }
-        return smithyClient.getValueFromTextNode(parsedObjToReturn);
+        return client.getValueFromTextNode(parsedObjToReturn);
     }
     return {};
 });
@@ -1488,7 +1502,7 @@ class XmlShapeSerializer extends SerdeContextConfig {
             this.byteBuffer =
                 "byteLength" in value
                     ? value
-                    : (this.serdeContext?.base64Decoder ?? utilBase64.fromBase64)(value);
+                    : (this.serdeContext?.base64Decoder ?? serde.fromBase64)(value);
         }
         else {
             this.buffer = this.writeStruct(ns, value, undefined);
@@ -1692,7 +1706,7 @@ class XmlShapeSerializer extends SerdeContextConfig {
         let nodeContents = null;
         if (value && typeof value === "object") {
             if (ns.isBlobSchema()) {
-                nodeContents = (this.serdeContext?.base64Encoder ?? utilBase64.toBase64)(value);
+                nodeContents = (this.serdeContext?.base64Encoder ?? serde.toBase64)(value);
             }
             else if (ns.isTimestampSchema() && value instanceof Date) {
                 const format = protocols.determineTimestampFormat(ns, this.settings);
@@ -1701,14 +1715,14 @@ class XmlShapeSerializer extends SerdeContextConfig {
                         nodeContents = value.toISOString().replace(".000Z", "Z");
                         break;
                     case 6:
-                        nodeContents = smithyClient.dateToUtcString(value);
+                        nodeContents = serde.dateToUtcString(value);
                         break;
                     case 7:
                         nodeContents = String(value.getTime() / 1000);
                         break;
                     default:
                         console.warn("Missing timestamp format, using http date", value);
-                        nodeContents = smithyClient.dateToUtcString(value);
+                        nodeContents = serde.dateToUtcString(value);
                         break;
                 }
             }
@@ -1847,7 +1861,7 @@ class AwsRestXmlProtocol extends protocols.HttpBindingProtocol {
             dataObject.Message ??
             "UnknownError";
         const ErrorCtor = this.compositeErrorRegistry.getErrorCtor(errorSchema) ?? Error;
-        const exception = new ErrorCtor(message);
+        const exception = new ErrorCtor({});
         await this.deserializeHttpMessage(errorSchema, context, response, dataObject);
         const output = {};
         const errorDeserializer = this.codec.createDeserializer();
@@ -1893,6 +1907,7 @@ exports._toBool = _toBool;
 exports._toNum = _toNum;
 exports._toStr = _toStr;
 exports.awsExpectUnion = awsExpectUnion;
+exports.loadJsonRpcErrorCode = loadJsonRpcErrorCode;
 exports.loadRestJsonErrorCode = loadRestJsonErrorCode;
 exports.loadRestXmlErrorCode = loadRestXmlErrorCode;
 exports.parseJsonBody = parseJsonBody;

package/dist-cjs/submodules/util/index.js

@@ -0,0 +1,59 @@
+'use strict';
+
+var protocols = require('@smithy/core/protocols');
+
+const validate = (str) => typeof str === "string" && str.indexOf("arn:") === 0 && str.split(":").length >= 6;
+const parse = (arn) => {
+    const segments = arn.split(":");
+    if (segments.length < 6 || segments[0] !== "arn")
+        throw new Error("Malformed ARN");
+    const [, partition, service, region, accountId, ...resource] = segments;
+    return {
+        partition,
+        service,
+        region,
+        accountId,
+        resource: resource.join(":"),
+    };
+};
+const build = (arnObject) => {
+    const { partition = "aws", service, region, accountId, resource } = arnObject;
+    if ([service, region, accountId, resource].some((segment) => typeof segment !== "string")) {
+        throw new Error("Input ARN object is invalid");
+    }
+    return `arn:${partition}:${service}:${region}:${accountId}:${resource}`;
+};
+
+function formatUrl(request) {
+    const { port, query } = request;
+    let { protocol, path, hostname } = request;
+    if (protocol && protocol.slice(-1) !== ":") {
+        protocol += ":";
+    }
+    if (port) {
+        hostname += `:${port}`;
+    }
+    if (path && path.charAt(0) !== "/") {
+        path = `/${path}`;
+    }
+    let queryString = query ? protocols.buildQueryString(query) : "";
+    if (queryString && queryString[0] !== "?") {
+        queryString = `?${queryString}`;
+    }
+    let auth = "";
+    if (request.username != null || request.password != null) {
+        const username = request.username ?? "";
+        const password = request.password ?? "";
+        auth = `${username}:${password}@`;
+    }
+    let fragment = "";
+    if (request.fragment) {
+        fragment = `#${request.fragment}`;
+    }
+    return `${protocol}//${auth}${hostname}${path}${queryString}${fragment}`;
+}
+
+exports.build = build;
+exports.formatUrl = formatUrl;
+exports.parse = parse;
+exports.validate = validate;

package/dist-es/submodules/account-id-endpoint/AccountIdEndpointModeConfigResolver.js

@@ -1,4 +1,4 @@
-import { normalizeProvider } from "@smithy/util-middleware";
+import { normalizeProvider } from "@smithy/core/client";
 import { DEFAULT_ACCOUNT_ID_ENDPOINT_MODE, validateAccountIdEndpointMode } from "./AccountIdEndpointModeConstants";
 export const resolveAccountIdEndpointModeConfig = (input) => {
     const { accountIdEndpointMode } = input;

package/dist-es/submodules/client/setFeature.js

@@ -1,4 +1,4 @@
-import { Retry } from "@smithy/util-retry";
+import { Retry } from "@smithy/core/retry";
 Retry.v2026 ||= typeof process === "object" && process.env?.AWS_NEW_RETRIES_2026 === "true";
 export function setFeature(context, feature, value) {
     if (!context.__aws_sdk_context) {

package/dist-es/submodules/httpAuthSchemes/aws_sdk/AwsSdkSigV4ASigner.js

@@ -1,4 +1,4 @@
-import { HttpRequest } from "@smithy/protocol-http";
+import { HttpRequest } from "@smithy/core/protocols";
 import { getSkewCorrectedDate } from "../utils";
 import { AwsSdkSigV4Signer, validateSigningProperties } from "./AwsSdkSigV4Signer";
 export class AwsSdkSigV4ASigner extends AwsSdkSigV4Signer {

package/dist-es/submodules/httpAuthSchemes/aws_sdk/AwsSdkSigV4Signer.js

@@ -1,4 +1,4 @@
-import { HttpRequest } from "@smithy/protocol-http";
+import { HttpRequest } from "@smithy/core/protocols";
 import { getDateHeader, getSkewCorrectedDate, getUpdatedSystemClockOffset } from "../utils";
 const throwSigningPropertyError = (name, property) => {
     if (!property) {

package/dist-es/submodules/httpAuthSchemes/aws_sdk/resolveAwsSdkSigV4AConfig.js

@@ -1,5 +1,5 @@
 import { normalizeProvider } from "@smithy/core";
-import { ProviderError } from "@smithy/property-provider";
+import { ProviderError } from "@smithy/core/config";
 export const resolveAwsSdkSigV4AConfig = (config) => {
     config.sigv4aSigningRegionSet = normalizeProvider(config.sigv4aSigningRegionSet);
     return config;

package/dist-es/submodules/httpAuthSchemes/utils/getDateHeader.js

@@ -1,2 +1,2 @@
-import { HttpResponse } from "@smithy/protocol-http";
+import { HttpResponse } from "@smithy/core/protocols";
 export const getDateHeader = (response) => HttpResponse.isInstance(response) ? response.headers?.date ?? response.headers?.Date : undefined;

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

@@ -1,5 +1,5 @@
+import { decorateServiceException } from "@smithy/core/client";
 import { NormalizedSchema, TypeRegistry } from "@smithy/core/schema";
-import { decorateServiceException } from "@smithy/smithy-client";
 export class ProtocolLib {
     queryCompat;
     errorRegistry;

package/dist-es/submodules/protocols/cbor/AwsSmithyRpcV2CborProtocol.js

@@ -32,7 +32,7 @@ export class AwsSmithyRpcV2CborProtocol extends SmithyRpcV2CborProtocol {
         const ns = NormalizedSchema.of(errorSchema);
         const message = dataObject.message ?? dataObject.Message ?? "UnknownError";
         const ErrorCtor = this.compositeErrorRegistry.getErrorCtor(errorSchema) ?? Error;
-        const exception = new ErrorCtor(message);
+        const exception = new ErrorCtor({});
         const output = {};
         for (const [name, member] of ns.structIterator()) {
             if (dataObject[name] != null) {

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

@@ -1,3 +1,3 @@
-import { collectBody } from "@smithy/smithy-client";
-import { toUtf8 } from "@smithy/util-utf8";
+import { collectBody } from "@smithy/core/protocols";
+import { toUtf8 } from "@smithy/core/serde";
 export const collectBodyString = (streamBody, context) => collectBody(streamBody, context).then((body) => (context?.utf8Encoder ?? toUtf8)(body));

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

@@ -2,7 +2,7 @@ import { RpcProtocol } from "@smithy/core/protocols";
 import { deref, NormalizedSchema } from "@smithy/core/schema";
 import { ProtocolLib } from "../ProtocolLib";
 import { JsonCodec } from "./JsonCodec";
-import { loadRestJsonErrorCode } from "./parseJsonBody";
+import { loadJsonRpcErrorCode } from "./parseJsonBody";
 export class AwsJsonRpcProtocol extends RpcProtocol {
     serializer;
     deserializer;
@@ -49,16 +49,17 @@ export class AwsJsonRpcProtocol extends RpcProtocol {
         return this.codec;
     }
     async handleError(operationSchema, context, response, dataObject, metadata) {
-        if (this.awsQueryCompatible) {
+        const { awsQueryCompatible } = this;
+        if (awsQueryCompatible) {
             this.mixin.setQueryCompatError(dataObject, response);
         }
-        const errorIdentifier = loadRestJsonErrorCode(response, dataObject) ?? "Unknown";
+        const errorIdentifier = loadJsonRpcErrorCode(response, dataObject, this.getJsonRpcVersion() === "1.1", awsQueryCompatible) ?? "Unknown";
         this.mixin.compose(this.compositeErrorRegistry, errorIdentifier, this.options.defaultNamespace);
-        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, dataObject, metadata, this.awsQueryCompatible ? this.mixin.findQueryCompatibleError : undefined);
+        const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, dataObject, metadata, awsQueryCompatible ? this.mixin.findQueryCompatibleError : undefined);
         const ns = NormalizedSchema.of(errorSchema);
         const message = dataObject.message ?? dataObject.Message ?? "UnknownError";
         const ErrorCtor = this.compositeErrorRegistry.getErrorCtor(errorSchema) ?? Error;
-        const exception = new ErrorCtor(message);
+        const exception = new ErrorCtor({});
         const output = {};
         const errorDeserializer = this.codec.createDeserializer();
         for (const [name, member] of ns.structIterator()) {
@@ -66,7 +67,7 @@ export class AwsJsonRpcProtocol extends RpcProtocol {
                 output[name] = errorDeserializer.readObject(member, dataObject[name]);
             }
         }
-        if (this.awsQueryCompatible) {
+        if (awsQueryCompatible) {
             this.mixin.queryCompatOutput(dataObject, output);
         }
         throw this.mixin.decorateServiceException(Object.assign(exception, errorMetadata, {

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

@@ -66,7 +66,7 @@ export class AwsRestJsonProtocol extends HttpBindingProtocol {
         const ns = NormalizedSchema.of(errorSchema);
         const message = dataObject.message ?? dataObject.Message ?? "UnknownError";
         const ErrorCtor = this.compositeErrorRegistry.getErrorCtor(errorSchema) ?? Error;
-        const exception = new ErrorCtor(message);
+        const exception = new ErrorCtor({});
         await this.deserializeHttpMessage(errorSchema, context, response, dataObject);
         const output = {};
         const errorDeserializer = this.codec.createDeserializer();

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

@@ -1,7 +1,7 @@
 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 { fromBase64 } from "@smithy/core/serde";
 import { SerdeContextConfig } from "../ConfigurableSerdeContext";
 import { UnionSerde } from "../UnionSerde";
 import { jsonReviver } from "./jsonReviver";

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

@@ -1,7 +1,6 @@
 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 { dateToUtcString, generateIdempotencyToken, LazyJsonString, NumericValue, toBase64 } from "@smithy/core/serde";
 import { SerdeContextConfig } from "../ConfigurableSerdeContext";
 import { JsonReplacer } from "./jsonReplacer";
 export class JsonShapeSerializer extends SerdeContextConfig {

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

@@ -1,4 +1,4 @@
-import { expectUnion } from "@smithy/smithy-client";
+import { expectUnion } from "@smithy/core/serde";
 export const awsExpectUnion = (value) => {
     if (value == null) {
         return undefined;

package/dist-es/submodules/protocols/json/experimental/SinglePassJsonShapeSerializer.js

@@ -1,7 +1,6 @@
 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 { dateToUtcString, generateIdempotencyToken, LazyJsonString, NumericValue, toBase64 } from "@smithy/core/serde";
 import { SerdeContextConfig } from "../../ConfigurableSerdeContext";
 export class SinglePassJsonShapeSerializer extends SerdeContextConfig {
     settings;

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

@@ -21,7 +21,7 @@ export const parseJsonErrorBody = async (errorBody, context) => {
     return value;
 };
 const findKey = (object, key) => Object.keys(object).find((k) => k.toLowerCase() === key.toLowerCase());
-const sanitizeErrorCode = (rawValue) => {
+const sanitizeErrorCode = (rawValue, removeNamespace = true) => {
     let cleanValue = rawValue;
     if (typeof cleanValue === "number") {
         cleanValue = cleanValue.toString();
@@ -32,23 +32,38 @@ const sanitizeErrorCode = (rawValue) => {
     if (cleanValue.indexOf(":") >= 0) {
         cleanValue = cleanValue.split(":")[0];
     }
-    if (cleanValue.indexOf("#") >= 0) {
+    if (removeNamespace && cleanValue.indexOf("#") >= 0) {
         cleanValue = cleanValue.split("#")[1];
     }
     return cleanValue;
 };
 export const loadRestJsonErrorCode = (output, data) => {
-    const headerKey = findKey(output.headers, "x-amzn-errortype");
-    if (headerKey !== undefined) {
-        return sanitizeErrorCode(output.headers[headerKey]);
-    }
-    if (data && typeof data === "object") {
-        const codeKey = findKey(data, "code");
-        if (codeKey && data[codeKey] !== undefined) {
-            return sanitizeErrorCode(data[codeKey]);
-        }
-        if (data["__type"] !== undefined) {
-            return sanitizeErrorCode(data["__type"]);
+    return loadErrorCode(output, data, true, ["header", "code", "type"]);
+};
+export const loadJsonRpcErrorCode = (output, data, removeNamespace, queryCompat = false) => {
+    return loadErrorCode(output, data, removeNamespace, queryCompat ? ["code", "header", "type"] : ["type", "code", "header"]);
+};
+const loadErrorCode = ({ headers }, data, removeNamespace, order) => {
+    while (order.length > 0) {
+        const location = order.shift();
+        switch (location) {
+            case "header":
+                const headerKey = findKey(headers ?? {}, "x-amzn-errortype");
+                if (headerKey !== undefined) {
+                    return sanitizeErrorCode(headers[headerKey], removeNamespace);
+                }
+                break;
+            case "code":
+                const codeKey = findKey(data ?? {}, "code");
+                if (codeKey && data[codeKey] !== undefined) {
+                    return sanitizeErrorCode(data[codeKey], removeNamespace);
+                }
+                break;
+            case "type":
+                if (data?.__type !== undefined) {
+                    return sanitizeErrorCode(data.__type, removeNamespace);
+                }
+                break;
         }
     }
 };

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

@@ -95,7 +95,7 @@ export class AwsQueryProtocol extends RpcProtocol {
         const { errorSchema, errorMetadata } = await this.mixin.getErrorSchemaOrThrowBaseException(errorIdentifier, this.options.defaultNamespace, response, errorData, metadata, this.mixin.findQueryCompatibleError);
         const ns = NormalizedSchema.of(errorSchema);
         const ErrorCtor = this.compositeErrorRegistry.getErrorCtor(errorSchema) ?? Error;
-        const exception = new ErrorCtor(message);
+        const exception = new ErrorCtor({});
         const output = {
             Type: errorData.Error.Type,
             Code: errorData.Error.Code,

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

@@ -1,8 +1,7 @@
 import { determineTimestampFormat, extendedEncodeURIComponent } from "@smithy/core/protocols";
 import { NormalizedSchema } from "@smithy/core/schema";
-import { generateIdempotencyToken, NumericValue } from "@smithy/core/serde";
-import { dateToUtcString } from "@smithy/smithy-client";
-import { toBase64 } from "@smithy/util-base64";
+import { dateToUtcString } from "@smithy/core/serde";
+import { generateIdempotencyToken, NumericValue, toBase64 } from "@smithy/core/serde";
 import { SerdeContextConfig } from "../ConfigurableSerdeContext";
 export class QueryShapeSerializer extends SerdeContextConfig {
     settings;

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

@@ -71,7 +71,7 @@ export class AwsRestXmlProtocol extends HttpBindingProtocol {
             dataObject.Message ??
             "UnknownError";
         const ErrorCtor = this.compositeErrorRegistry.getErrorCtor(errorSchema) ?? Error;
-        const exception = new ErrorCtor(message);
+        const exception = new ErrorCtor({});
         await this.deserializeHttpMessage(errorSchema, context, response, dataObject);
         const output = {};
         const errorDeserializer = this.codec.createDeserializer();

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

@@ -1,8 +1,8 @@
 import { parseXML } from "@aws-sdk/xml-builder";
+import { getValueFromTextNode } from "@smithy/core/client";
 import { FromStringShapeDeserializer } from "@smithy/core/protocols";
 import { NormalizedSchema } from "@smithy/core/schema";
-import { getValueFromTextNode } from "@smithy/smithy-client";
-import { toUtf8 } from "@smithy/util-utf8";
+import { toUtf8 } from "@smithy/core/serde";
 import { SerdeContextConfig } from "../ConfigurableSerdeContext";
 import { UnionSerde } from "../UnionSerde";
 export class XmlShapeDeserializer extends SerdeContextConfig {

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

@@ -1,9 +1,8 @@
 import { XmlNode, XmlText } from "@aws-sdk/xml-builder";
 import { determineTimestampFormat } from "@smithy/core/protocols";
 import { NormalizedSchema } from "@smithy/core/schema";
-import { generateIdempotencyToken, NumericValue } from "@smithy/core/serde";
-import { dateToUtcString } from "@smithy/smithy-client";
-import { fromBase64, toBase64 } from "@smithy/util-base64";
+import { dateToUtcString } from "@smithy/core/serde";
+import { fromBase64, generateIdempotencyToken, NumericValue, toBase64 } from "@smithy/core/serde";
 import { SerdeContextConfig } from "../ConfigurableSerdeContext";
 export class XmlShapeSerializer extends SerdeContextConfig {
     settings;

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

@@ -1,5 +1,5 @@
 import { parseXML } from "@aws-sdk/xml-builder";
-import { getValueFromTextNode } from "@smithy/smithy-client";
+import { getValueFromTextNode } from "@smithy/core/client";
 import { collectBodyString } from "../common";
 export const parseXmlBody = (streamBody, context) => collectBodyString(streamBody, context).then((encoded) => {
     if (encoded.length) {

package/dist-es/submodules/util/index.js

@@ -0,0 +1,2 @@
+export { build, parse, validate } from "./util-arn-parser/arn";
+export { formatUrl } from "./util-format-url/format-url";