@aws-amplify/core 5.5.3-graphql-api-functional-options.2 → 5.5.3-unstable.ec57e85.2

package/internals/aws-client-utils/composers/package.json

@@ -0,0 +1,8 @@
+{
+	"name": "@aws-amplify/core/internals/aws-client-utils/composers",
+	"types": "../../../lib-esm/clients/internal/index.d.ts",
+	"main": "../../../lib/clients/internal/index.js",
+	"module": "../../../lib-esm/clients/internal/index.js",
+	"react-native": "../../../lib-esm/clients/internal/index.js",
+	"sideEffects": false
+}

package/internals/aws-client-utils/package.json

@@ -1,8 +1,8 @@
 {
 	"name": "@aws-amplify/core/internals/aws-client-utils",
-	"types": "../../../lib-esm/clients/index.d.ts",
-	"main": "../../../lib/clients/index.js",
-	"module": "../../../lib-esm/clients/index.js",
-	"react-native": "../../../lib-esm/clients/index.js",
+	"types": "../../lib-esm/clients/index.d.ts",
+	"main": "../../lib/clients/index.js",
+	"module": "../../lib-esm/clients/index.js",
+	"react-native": "../../lib-esm/clients/index.js",
 	"sideEffects": false
 }

package/lib/AwsClients/CognitoIdentity/base.d.ts

@@ -5,7 +5,7 @@ import { Endpoint, EndpointResolverOptions, Headers, HttpRequest, HttpResponse }
  *
  * @internal
  */
-export declare const cognitoIdentityTransferHandler: (request: HttpRequest, options: import("../../clients/middleware/userAgent").UserAgentOptions & import("../../clients/middleware/retry").RetryOptions<HttpResponse>) => Promise<HttpResponse>;
+export declare const cognitoIdentityTransferHandler: (request: HttpRequest, options: import("../../clients").UserAgentOptions & import("../../clients").RetryOptions<HttpResponse>) => Promise<HttpResponse>;
 /**
  * @internal
  */

package/lib/AwsClients/CognitoIdentity/getCredentialsForIdentity.d.ts

@@ -4,9 +4,20 @@ export type { GetCredentialsForIdentityInput, GetCredentialsForIdentityOutput };
 /**
  * @internal
  */
-export declare const getCredentialsForIdentity: (config: Omit<import("../../clients/middleware/userAgent").UserAgentOptions & import("../../clients/middleware/retry").RetryOptions<HttpResponse> & import("../../clients").ServiceClientOptions, "retryDecider" | "computeDelay" | "userAgentValue" | "endpointResolver"> & {
-    retryDecider?: (response?: HttpResponse, error?: unknown) => Promise<boolean>;
+export declare const getCredentialsForIdentity: (config: Omit<import("../../clients").UserAgentOptions & import("../../clients").RetryOptions<HttpResponse> & import("../../clients").ServiceClientOptions & {
+    service: string;
+    endpointResolver: ({ region }: import("../../clients").EndpointResolverOptions) => {
+        url: URL;
+    };
+    retryDecider: (response?: HttpResponse, error?: Error) => Promise<boolean>;
+    computeDelay: (attempt: number) => number;
+    userAgentValue: string;
+}, "retryDecider" | "computeDelay" | "userAgentValue" | "service" | "endpointResolver"> & {
+    retryDecider?: ((response?: HttpResponse, error?: unknown) => Promise<boolean>) & ((response?: HttpResponse, error?: Error) => Promise<boolean>);
     computeDelay?: (attempt: number) => number;
     userAgentValue?: string;
-    endpointResolver?: (options: import("../../clients").EndpointResolverOptions) => Endpoint;
+    service?: string;
+    endpointResolver?: ((options: import("../../clients").EndpointResolverOptions, input?: any) => Endpoint) & (({ region }: import("../../clients").EndpointResolverOptions) => {
+        url: URL;
+    });
 }, input: GetCredentialsForIdentityInput) => Promise<GetCredentialsForIdentityOutput>;

package/lib/AwsClients/CognitoIdentity/getCredentialsForIdentity.js

@@ -41,6 +41,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCredentialsForIdentity = void 0;
 var base_1 = require("./base");
 var clients_1 = require("../../clients");
+var internal_1 = require("../../clients/internal");
 var getCredentialsForIdentitySerializer = function (input, endpoint) {
     var headers = (0, base_1.getSharedHeaders)('GetCredentialsForIdentity');
     var body = JSON.stringify(input);
@@ -79,4 +80,4 @@ var deserializeCredentials = function (output) {
 /**
  * @internal
  */
-exports.getCredentialsForIdentity = (0, clients_1.composeServiceApi)(base_1.cognitoIdentityTransferHandler, getCredentialsForIdentitySerializer, getCredentialsForIdentityDeserializer, base_1.defaultConfig);
+exports.getCredentialsForIdentity = (0, internal_1.composeServiceApi)(base_1.cognitoIdentityTransferHandler, getCredentialsForIdentitySerializer, getCredentialsForIdentityDeserializer, base_1.defaultConfig);

package/lib/AwsClients/CognitoIdentity/getId.d.ts

@@ -4,9 +4,20 @@ export type { GetIdInput, GetIdOutput };
 /**
  * @internal
  */
-export declare const getId: (config: Omit<import("../../clients/middleware/userAgent").UserAgentOptions & import("../../clients/middleware/retry").RetryOptions<HttpResponse> & import("../../clients").ServiceClientOptions, "retryDecider" | "computeDelay" | "userAgentValue" | "endpointResolver"> & {
-    retryDecider?: (response?: HttpResponse, error?: unknown) => Promise<boolean>;
+export declare const getId: (config: Omit<import("../../clients").UserAgentOptions & import("../../clients").RetryOptions<HttpResponse> & import("../../clients").ServiceClientOptions & {
+    service: string;
+    endpointResolver: ({ region }: import("../../clients").EndpointResolverOptions) => {
+        url: URL;
+    };
+    retryDecider: (response?: HttpResponse, error?: Error) => Promise<boolean>;
+    computeDelay: (attempt: number) => number;
+    userAgentValue: string;
+}, "retryDecider" | "computeDelay" | "userAgentValue" | "service" | "endpointResolver"> & {
+    retryDecider?: ((response?: HttpResponse, error?: unknown) => Promise<boolean>) & ((response?: HttpResponse, error?: Error) => Promise<boolean>);
     computeDelay?: (attempt: number) => number;
     userAgentValue?: string;
-    endpointResolver?: (options: import("../../clients").EndpointResolverOptions) => Endpoint;
+    service?: string;
+    endpointResolver?: ((options: import("../../clients").EndpointResolverOptions, input?: any) => Endpoint) & (({ region }: import("../../clients").EndpointResolverOptions) => {
+        url: URL;
+    });
 }, input: GetIdInput) => Promise<GetIdOutput>;

package/lib/AwsClients/CognitoIdentity/getId.js

@@ -41,6 +41,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getId = void 0;
 var base_1 = require("./base");
 var clients_1 = require("../../clients");
+var internal_1 = require("../../clients/internal");
 var getIdSerializer = function (input, endpoint) {
     var headers = (0, base_1.getSharedHeaders)('GetId');
     var body = JSON.stringify(input);
@@ -69,4 +70,4 @@ var getIdDeserializer = function (response) { return __awaiter(void 0, void 0, v
 /**
  * @internal
  */
-exports.getId = (0, clients_1.composeServiceApi)(base_1.cognitoIdentityTransferHandler, getIdSerializer, getIdDeserializer, base_1.defaultConfig);
+exports.getId = (0, internal_1.composeServiceApi)(base_1.cognitoIdentityTransferHandler, getIdSerializer, getIdDeserializer, base_1.defaultConfig);

package/lib/AwsClients/Pinpoint/getInAppMessages.d.ts

@@ -4,10 +4,20 @@ export type { GetInAppMessagesInput, GetInAppMessagesOutput };
 /**
  * @internal
  */
-export declare const getInAppMessages: (config: Omit<import("../../clients/middleware/userAgent").UserAgentOptions & import("../../clients/middleware/retry").RetryOptions<HttpResponse> & import("../../clients/middleware/signing").SigningOptions & import("../../clients/types").ServiceClientOptions, "retryDecider" | "computeDelay" | "userAgentValue" | "service" | "endpointResolver"> & {
-    retryDecider?: (response?: HttpResponse, error?: unknown) => Promise<boolean>;
+export declare const getInAppMessages: (config: Omit<import("../../clients").UserAgentOptions & import("../../clients").RetryOptions<HttpResponse> & import("../../clients").SigningOptions & import("../../clients/types").ServiceClientOptions & {
+    service: string;
+    endpointResolver: ({ region }: import("../../clients/types").EndpointResolverOptions) => {
+        url: URL;
+    };
+    retryDecider: (response?: HttpResponse, error?: Error) => Promise<boolean>;
+    computeDelay: (attempt: number) => number;
+    userAgentValue: string;
+}, "retryDecider" | "computeDelay" | "userAgentValue" | "service" | "endpointResolver"> & {
+    retryDecider?: ((response?: HttpResponse, error?: unknown) => Promise<boolean>) & ((response?: HttpResponse, error?: Error) => Promise<boolean>);
     computeDelay?: (attempt: number) => number;
     userAgentValue?: string;
     service?: string;
-    endpointResolver?: (options: import("../../clients/types").EndpointResolverOptions) => Endpoint;
+    endpointResolver?: ((options: import("../../clients/types").EndpointResolverOptions, input?: any) => Endpoint) & (({ region }: import("../../clients/types").EndpointResolverOptions) => {
+        url: URL;
+    });
 }, input: GetInAppMessagesInput) => Promise<GetInAppMessagesOutput>;

package/lib/AwsClients/Pinpoint/putEvents.d.ts

@@ -4,10 +4,20 @@ export type { PutEventsInput, PutEventsOutput };
 /**
  * @internal
  */
-export declare const putEvents: (config: Omit<import("../../clients/middleware/userAgent").UserAgentOptions & import("../../clients/middleware/retry").RetryOptions<HttpResponse> & import("../../clients/middleware/signing").SigningOptions & import("../../clients/types").ServiceClientOptions, "retryDecider" | "computeDelay" | "userAgentValue" | "service" | "endpointResolver"> & {
-    retryDecider?: (response?: HttpResponse, error?: unknown) => Promise<boolean>;
+export declare const putEvents: (config: Omit<import("../../clients").UserAgentOptions & import("../../clients").RetryOptions<HttpResponse> & import("../../clients").SigningOptions & import("../../clients/types").ServiceClientOptions & {
+    service: string;
+    endpointResolver: ({ region }: import("../../clients/types").EndpointResolverOptions) => {
+        url: URL;
+    };
+    retryDecider: (response?: HttpResponse, error?: Error) => Promise<boolean>;
+    computeDelay: (attempt: number) => number;
+    userAgentValue: string;
+}, "retryDecider" | "computeDelay" | "userAgentValue" | "service" | "endpointResolver"> & {
+    retryDecider?: ((response?: HttpResponse, error?: unknown) => Promise<boolean>) & ((response?: HttpResponse, error?: Error) => Promise<boolean>);
     computeDelay?: (attempt: number) => number;
     userAgentValue?: string;
     service?: string;
-    endpointResolver?: (options: import("../../clients/types").EndpointResolverOptions) => Endpoint;
+    endpointResolver?: ((options: import("../../clients/types").EndpointResolverOptions, input?: any) => Endpoint) & (({ region }: import("../../clients/types").EndpointResolverOptions) => {
+        url: URL;
+    });
 }, input: PutEventsInput) => Promise<PutEventsOutput>;

package/lib/AwsClients/Pinpoint/updateEndpoint.d.ts

@@ -4,10 +4,20 @@ export type { UpdateEndpointInput, UpdateEndpointOutput };
 /**
  * @internal
  */
-export declare const updateEndpoint: (config: Omit<import("../../clients/middleware/userAgent").UserAgentOptions & import("../../clients/middleware/retry").RetryOptions<HttpResponse> & import("../../clients/middleware/signing").SigningOptions & import("../../clients/types").ServiceClientOptions, "retryDecider" | "computeDelay" | "userAgentValue" | "service" | "endpointResolver"> & {
-    retryDecider?: (response?: HttpResponse, error?: unknown) => Promise<boolean>;
+export declare const updateEndpoint: (config: Omit<import("../../clients").UserAgentOptions & import("../../clients").RetryOptions<HttpResponse> & import("../../clients").SigningOptions & import("../../clients/types").ServiceClientOptions & {
+    service: string;
+    endpointResolver: ({ region }: import("../../clients/types").EndpointResolverOptions) => {
+        url: URL;
+    };
+    retryDecider: (response?: HttpResponse, error?: Error) => Promise<boolean>;
+    computeDelay: (attempt: number) => number;
+    userAgentValue: string;
+}, "retryDecider" | "computeDelay" | "userAgentValue" | "service" | "endpointResolver"> & {
+    retryDecider?: ((response?: HttpResponse, error?: unknown) => Promise<boolean>) & ((response?: HttpResponse, error?: Error) => Promise<boolean>);
     computeDelay?: (attempt: number) => number;
     userAgentValue?: string;
     service?: string;
-    endpointResolver?: (options: import("../../clients/types").EndpointResolverOptions) => Endpoint;
+    endpointResolver?: ((options: import("../../clients/types").EndpointResolverOptions, input?: any) => Endpoint) & (({ region }: import("../../clients/types").EndpointResolverOptions) => {
+        url: URL;
+    });
 }, input: UpdateEndpointInput) => Promise<UpdateEndpointOutput>;

package/lib/Platform/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.3.4-graphql-api-functional-options.2+627f308ed";
+export declare const version = "5.3.4-unstable.ec57e85.2+ec57e855d";

package/lib/Platform/version.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
 // generated by genversion
-exports.version = '5.3.4-graphql-api-functional-options.2+627f308ed';
+exports.version = '5.3.4-unstable.ec57e85.2+ec57e855d';

package/lib/clients/handlers/fetch.js

@@ -51,6 +51,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchTransferHandler = void 0;
 require("isomorphic-unfetch"); // TODO: remove this dependency in v6
+var memoization_1 = require("../utils/memoization");
 var shouldSendBody = function (method) {
     return !['HEAD', 'GET', 'DELETE'].includes(method.toUpperCase());
 };
@@ -93,9 +94,9 @@ var fetchTransferHandler = function (_a, _b) {
                         body: null,
                     };
                     bodyWithMixin = Object.assign((_d = resp.body) !== null && _d !== void 0 ? _d : {}, {
-                        text: withMemoization(function () { return resp.text(); }),
-                        blob: withMemoization(function () { return resp.blob(); }),
-                        json: withMemoization(function () { return resp.json(); }),
+                        text: (0, memoization_1.withMemoization)(function () { return resp.text(); }),
+                        blob: (0, memoization_1.withMemoization)(function () { return resp.blob(); }),
+                        json: (0, memoization_1.withMemoization)(function () { return resp.json(); }),
                     });
                     return [2 /*return*/, __assign(__assign({}, httpResponse), { body: bodyWithMixin })];
             }
@@ -103,21 +104,3 @@ var fetchTransferHandler = function (_a, _b) {
     });
 };
 exports.fetchTransferHandler = fetchTransferHandler;
-/**
- * Cache the payload of a response body. It allows multiple calls to the body,
- * for example, when reading the body in both retry decider and error deserializer.
- * Caching body is allowed here because we call the body accessor(blob(), json(),
- * etc.) when body is small or streaming implementation is not available(RN).
- */
-var withMemoization = function (payloadAccessor) {
-    var cached;
-    return function () {
-        if (!cached) {
-            // Explicitly not awaiting. Intermediate await would add overhead and
-            // introduce a possible race in the event that this wrapper is called
-            // again before the first `payloadAccessor` call resolves.
-            cached = payloadAccessor();
-        }
-        return cached;
-    };
-};

package/lib/clients/index.d.ts

@@ -2,7 +2,12 @@ export { getDnsSuffix } from './endpoints';
 export { fetchTransferHandler } from './handlers/fetch';
 export { unauthenticatedHandler } from './handlers/unauthenticated';
 export { authenticatedHandler } from './handlers/authenticated';
-export { composeServiceApi } from './internal/composeServiceApi';
-export { signRequest, presignUrl, } from './middleware/signing/signer/signatureV4';
+export { getHashedPayload, presignUrl, PresignUrlOptions, signRequest, SignRequestOptions, } from './middleware/signing/signer/signatureV4';
+export { EMPTY_HASH as EMPTY_SHA256_HASH } from './middleware/signing/signer/signatureV4/constants';
+export { extendedEncodeURIComponent } from './middleware/signing/utils/extendedEncodeURIComponent';
+export { signingMiddleware, SigningOptions } from './middleware/signing';
+export { getRetryDecider, jitteredBackoff, retryMiddleware, RetryOptions, } from './middleware/retry';
+export { userAgentMiddleware, UserAgentOptions } from './middleware/userAgent';
 export { parseJsonBody, parseJsonError, parseMetadata } from './serde';
+export { withMemoization } from './utils/memoization';
 export * from './types';

package/lib/clients/index.js

@@ -16,7 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseMetadata = exports.parseJsonError = exports.parseJsonBody = exports.presignUrl = exports.signRequest = exports.composeServiceApi = exports.authenticatedHandler = exports.unauthenticatedHandler = exports.fetchTransferHandler = exports.getDnsSuffix = void 0;
+exports.withMemoization = exports.parseMetadata = exports.parseJsonError = exports.parseJsonBody = exports.userAgentMiddleware = exports.retryMiddleware = exports.jitteredBackoff = exports.getRetryDecider = exports.signingMiddleware = exports.extendedEncodeURIComponent = exports.EMPTY_SHA256_HASH = exports.signRequest = exports.presignUrl = exports.getHashedPayload = exports.authenticatedHandler = exports.unauthenticatedHandler = exports.fetchTransferHandler = exports.getDnsSuffix = void 0;
 var endpoints_1 = require("./endpoints");
 Object.defineProperty(exports, "getDnsSuffix", { enumerable: true, get: function () { return endpoints_1.getDnsSuffix; } });
 var fetch_1 = require("./handlers/fetch");
@@ -25,13 +25,26 @@ var unauthenticated_1 = require("./handlers/unauthenticated");
 Object.defineProperty(exports, "unauthenticatedHandler", { enumerable: true, get: function () { return unauthenticated_1.unauthenticatedHandler; } });
 var authenticated_1 = require("./handlers/authenticated");
 Object.defineProperty(exports, "authenticatedHandler", { enumerable: true, get: function () { return authenticated_1.authenticatedHandler; } });
-var composeServiceApi_1 = require("./internal/composeServiceApi");
-Object.defineProperty(exports, "composeServiceApi", { enumerable: true, get: function () { return composeServiceApi_1.composeServiceApi; } });
 var signatureV4_1 = require("./middleware/signing/signer/signatureV4");
-Object.defineProperty(exports, "signRequest", { enumerable: true, get: function () { return signatureV4_1.signRequest; } });
+Object.defineProperty(exports, "getHashedPayload", { enumerable: true, get: function () { return signatureV4_1.getHashedPayload; } });
 Object.defineProperty(exports, "presignUrl", { enumerable: true, get: function () { return signatureV4_1.presignUrl; } });
+Object.defineProperty(exports, "signRequest", { enumerable: true, get: function () { return signatureV4_1.signRequest; } });
+var constants_1 = require("./middleware/signing/signer/signatureV4/constants");
+Object.defineProperty(exports, "EMPTY_SHA256_HASH", { enumerable: true, get: function () { return constants_1.EMPTY_HASH; } });
+var extendedEncodeURIComponent_1 = require("./middleware/signing/utils/extendedEncodeURIComponent");
+Object.defineProperty(exports, "extendedEncodeURIComponent", { enumerable: true, get: function () { return extendedEncodeURIComponent_1.extendedEncodeURIComponent; } });
+var signing_1 = require("./middleware/signing");
+Object.defineProperty(exports, "signingMiddleware", { enumerable: true, get: function () { return signing_1.signingMiddleware; } });
+var retry_1 = require("./middleware/retry");
+Object.defineProperty(exports, "getRetryDecider", { enumerable: true, get: function () { return retry_1.getRetryDecider; } });
+Object.defineProperty(exports, "jitteredBackoff", { enumerable: true, get: function () { return retry_1.jitteredBackoff; } });
+Object.defineProperty(exports, "retryMiddleware", { enumerable: true, get: function () { return retry_1.retryMiddleware; } });
+var userAgent_1 = require("./middleware/userAgent");
+Object.defineProperty(exports, "userAgentMiddleware", { enumerable: true, get: function () { return userAgent_1.userAgentMiddleware; } });
 var serde_1 = require("./serde");
 Object.defineProperty(exports, "parseJsonBody", { enumerable: true, get: function () { return serde_1.parseJsonBody; } });
 Object.defineProperty(exports, "parseJsonError", { enumerable: true, get: function () { return serde_1.parseJsonError; } });
 Object.defineProperty(exports, "parseMetadata", { enumerable: true, get: function () { return serde_1.parseMetadata; } });
+var memoization_1 = require("./utils/memoization");
+Object.defineProperty(exports, "withMemoization", { enumerable: true, get: function () { return memoization_1.withMemoization; } });
 __exportStar(require("./types"), exports);

package/lib/clients/internal/composeServiceApi.d.ts

@@ -1,7 +1,7 @@
 import { ServiceClientOptions } from '../types/aws';
 import { TransferHandler, Endpoint } from '../types/core';
 import { HttpRequest, HttpResponse } from '../types/http';
-export declare const composeServiceApi: <TransferHandlerOptions, Input, Output, DefaultConfig extends Partial<TransferHandlerOptions & ServiceClientOptions>>(transferHandler: TransferHandler<HttpRequest, HttpResponse, TransferHandlerOptions>, serializer: (input: Input, endpoint: Endpoint) => HttpRequest, deserializer: (output: HttpResponse) => Promise<Output>, defaultConfig: DefaultConfig) => (config: OptionalizeKey<TransferHandlerOptions & ServiceClientOptions, keyof DefaultConfig>, input: Input) => Promise<Output>;
+export declare const composeServiceApi: <TransferHandlerOptions, Input, Output, DefaultConfig extends Partial<TransferHandlerOptions & ServiceClientOptions>>(transferHandler: TransferHandler<HttpRequest, HttpResponse, TransferHandlerOptions>, serializer: (input: Input, endpoint: Endpoint) => HttpRequest, deserializer: (output: HttpResponse) => Promise<Output>, defaultConfig: DefaultConfig) => (config: OptionalizeKey<TransferHandlerOptions & ServiceClientOptions & DefaultConfig, keyof DefaultConfig>, input: Input) => Promise<Output>;
 type OptionalizeKey<T, K> = Omit<T, K & keyof T> & {
     [P in K & keyof T]?: T[P];
 };

package/lib/clients/internal/composeServiceApi.js

@@ -57,9 +57,7 @@ var composeServiceApi = function (transferHandler, serializer, deserializer, def
             switch (_a.label) {
                 case 0:
                     resolvedConfig = __assign(__assign({}, defaultConfig), config);
-                    return [4 /*yield*/, resolvedConfig.endpointResolver({
-                            region: resolvedConfig.region,
-                        })];
+                    return [4 /*yield*/, resolvedConfig.endpointResolver(resolvedConfig, input)];
                 case 1:
                     endpoint = _a.sent();
                     request = serializer(input, endpoint);

package/lib/clients/internal/index.d.ts

@@ -0,0 +1,7 @@
+/**
+ * This index should NOT be included in the ../index.ts because the composer functions
+ * here requires TypeScript >= 4. Given other scoped packages may use TypeScript < 4,
+ * they should not be exposed to upper level index.
+ */
+export { composeServiceApi } from './composeServiceApi';
+export { composeTransferHandler } from './composeTransferHandler';

package/lib/clients/internal/index.js

@@ -0,0 +1,14 @@
+"use strict";
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.composeTransferHandler = exports.composeServiceApi = void 0;
+/**
+ * This index should NOT be included in the ../index.ts because the composer functions
+ * here requires TypeScript >= 4. Given other scoped packages may use TypeScript < 4,
+ * they should not be exposed to upper level index.
+ */
+var composeServiceApi_1 = require("./composeServiceApi");
+Object.defineProperty(exports, "composeServiceApi", { enumerable: true, get: function () { return composeServiceApi_1.composeServiceApi; } });
+var composeTransferHandler_1 = require("./composeTransferHandler");
+Object.defineProperty(exports, "composeTransferHandler", { enumerable: true, get: function () { return composeTransferHandler_1.composeTransferHandler; } });

package/lib/clients/middleware/retry/middleware.d.ts

@@ -1,4 +1,3 @@
-import { MetadataBearer } from '@aws-sdk/types';
 import { MiddlewareContext, MiddlewareHandler, Request, Response } from '../../types/core';
 /**
  * Configuration of the retry middleware
@@ -32,9 +31,3 @@ export interface RetryOptions<TResponse = Response> {
  * Retry middleware
  */
 export declare const retryMiddleware: <TInput = Request, TOutput = Response>({ maxAttempts, retryDecider, computeDelay, abortSignal, }: RetryOptions<TOutput>) => (next: MiddlewareHandler<TInput, TOutput>, context: MiddlewareContext) => (request: TInput) => Promise<TOutput>;
-/**
- * Check if the response is a contains `$metadata` property.
- *
- * @internal Amplify internal use only
- */
-export declare const isMetadataBearer: (response: unknown) => response is MetadataBearer;

package/lib/clients/middleware/retry/middleware.js

@@ -1,6 +1,17 @@
 "use strict";
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -38,7 +49,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMetadataBearer = exports.retryMiddleware = void 0;
+exports.retryMiddleware = void 0;
 var DEFAULT_RETRY_ATTEMPTS = 3;
 /**
  * Retry middleware
@@ -52,26 +63,36 @@ var retryMiddleware = function (_a) {
         return function retryMiddleware(request) {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var error, attemptsCount, response, e_1, delay;
+                var error, attemptsCount, response, handleTerminalErrorOrResponse, e_1, delay;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
                             attemptsCount = (_a = context.attemptsCount) !== null && _a !== void 0 ? _a : 0;
+                            handleTerminalErrorOrResponse = function () {
+                                if (response) {
+                                    addOrIncrementMetadataAttempts(response, attemptsCount);
+                                    return response;
+                                }
+                                else {
+                                    addOrIncrementMetadataAttempts(error, attemptsCount);
+                                    throw error;
+                                }
+                            };
                             _b.label = 1;
                         case 1:
                             if (!(!(abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted) && attemptsCount < maxAttempts)) return [3 /*break*/, 11];
-                            error = undefined;
-                            response = undefined;
                             _b.label = 2;
                         case 2:
                             _b.trys.push([2, 4, , 5]);
                             return [4 /*yield*/, next(request)];
                         case 3:
                             response = _b.sent();
+                            error = undefined;
                             return [3 /*break*/, 5];
                         case 4:
                             e_1 = _b.sent();
                             error = e_1;
+                            response = undefined;
                             return [3 /*break*/, 5];
                         case 5:
                             // context.attemptsCount may be updated after calling next handler which may retry the request by itself.
@@ -90,20 +111,16 @@ var retryMiddleware = function (_a) {
                             _b.sent();
                             _b.label = 8;
                         case 8: return [3 /*break*/, 1];
-                        case 9:
-                            if (response) {
-                                updateMetadataAttempts(response, attemptsCount);
-                                return [2 /*return*/, response];
+                        case 9: return [2 /*return*/, handleTerminalErrorOrResponse()];
+                        case 10: return [3 /*break*/, 1];
+                        case 11:
+                            if (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted) {
+                                throw new Error('Request aborted.');
                             }
                             else {
-                                updateMetadataAttempts(error, attemptsCount);
-                                throw error;
+                                return [2 /*return*/, handleTerminalErrorOrResponse()];
                             }
-                            _b.label = 10;
-                        case 10: return [3 /*break*/, 1];
-                        case 11: throw (abortSignal === null || abortSignal === void 0 ? void 0 : abortSignal.aborted)
-                            ? new Error('Request aborted')
-                            : error !== null && error !== void 0 ? error : new Error('Retry attempts exhausted');
+                            return [2 /*return*/];
                     }
                 });
             });
@@ -128,16 +145,10 @@ var cancellableSleep = function (timeoutMs, abortSignal) {
     });
     return sleepPromise;
 };
-/**
- * Check if the response is a contains `$metadata` property.
- *
- * @internal Amplify internal use only
- */
-var isMetadataBearer = function (response) { return typeof (response === null || response === void 0 ? void 0 : response['$metadata']) === 'object'; };
-exports.isMetadataBearer = isMetadataBearer;
-var updateMetadataAttempts = function (nextHandlerOutput, attempts) {
-    if ((0, exports.isMetadataBearer)(nextHandlerOutput)) {
-        nextHandlerOutput.$metadata.attempts = attempts;
+var addOrIncrementMetadataAttempts = function (nextHandlerOutput, attempts) {
+    var _a;
+    if (Object.prototype.toString.call(nextHandlerOutput) !== '[object Object]') {
+        return;
     }
-    nextHandlerOutput['$metadata'] = { attempts: attempts };
+    nextHandlerOutput['$metadata'] = __assign(__assign({}, ((_a = nextHandlerOutput['$metadata']) !== null && _a !== void 0 ? _a : {})), { attempts: attempts });
 };

package/lib/clients/middleware/signing/middleware.d.ts

@@ -3,12 +3,19 @@ import { Credentials, HttpRequest, HttpResponse, MiddlewareHandler } from '../..
  * Configuration of the signing middleware
  */
 export interface SigningOptions {
-    credentials: Credentials;
+    credentials: Credentials | (() => Promise<Credentials>);
     region: string;
     service: string;
+    /**
+     * Whether to uri encode the path as part of canonical uri. It's used for S3 only where the pathname
+     * is already uri encoded, and the signing process is not expected to uri encode it again.
+     *
+     * @default true
+     */
+    uriEscapePath?: boolean;
 }
 /**
  * Middleware that SigV4 signs request with AWS credentials, and correct system clock offset.
  * This middleware is expected to be placed after retry middleware.
  */
-export declare const signingMiddleware: ({ credentials, region, service, }: SigningOptions) => (next: MiddlewareHandler<HttpRequest, HttpResponse>) => (request: HttpRequest) => Promise<HttpResponse>;
+export declare const signingMiddleware: ({ credentials, region, service, uriEscapePath, }: SigningOptions) => (next: MiddlewareHandler<HttpRequest, HttpResponse>) => (request: HttpRequest) => Promise<HttpResponse>;

package/lib/clients/middleware/signing/middleware.js

@@ -47,28 +47,39 @@ var getUpdatedSystemClockOffset_1 = require("./utils/getUpdatedSystemClockOffset
  * This middleware is expected to be placed after retry middleware.
  */
 var signingMiddleware = function (_a) {
-    var credentials = _a.credentials, region = _a.region, service = _a.service;
+    var credentials = _a.credentials, region = _a.region, service = _a.service, _b = _a.uriEscapePath, uriEscapePath = _b === void 0 ? true : _b;
     var currentSystemClockOffset;
     return function (next) {
         return function signingMiddleware(request) {
             return __awaiter(this, void 0, void 0, function () {
-                var signRequestOptions, signedRequest, response, dateString;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                var signRequestOptions, _a, signedRequest, response, dateString;
+                var _b;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
                             currentSystemClockOffset = currentSystemClockOffset !== null && currentSystemClockOffset !== void 0 ? currentSystemClockOffset : 0;
-                            signRequestOptions = {
-                                credentials: credentials,
-                                signingDate: (0, getSkewCorrectedDate_1.getSkewCorrectedDate)(currentSystemClockOffset),
-                                signingRegion: region,
-                                signingService: service,
-                            };
-                            return [4 /*yield*/, (0, signatureV4_1.signRequest)(request, signRequestOptions)];
+                            _b = {};
+                            if (!(typeof credentials === 'function')) return [3 /*break*/, 2];
+                            return [4 /*yield*/, credentials()];
                         case 1:
-                            signedRequest = _a.sent();
-                            return [4 /*yield*/, next(signedRequest)];
+                            _a = _c.sent();
+                            return [3 /*break*/, 3];
                         case 2:
-                            response = _a.sent();
+                            _a = credentials;
+                            _c.label = 3;
+                        case 3:
+                            signRequestOptions = (_b.credentials = _a,
+                                _b.signingDate = (0, getSkewCorrectedDate_1.getSkewCorrectedDate)(currentSystemClockOffset),
+                                _b.signingRegion = region,
+                                _b.signingService = service,
+                                _b.uriEscapePath = uriEscapePath,
+                                _b);
+                            return [4 /*yield*/, (0, signatureV4_1.signRequest)(request, signRequestOptions)];
+                        case 4:
+                            signedRequest = _c.sent();
+                            return [4 /*yield*/, next(signedRequest)];
+                        case 5:
+                            response = _c.sent();
                             dateString = getDateHeader(response);
                             if (dateString) {
                                 currentSystemClockOffset = (0, getUpdatedSystemClockOffset_1.getUpdatedSystemClockOffset)(Date.parse(dateString), currentSystemClockOffset);

package/lib/clients/middleware/signing/signer/signatureV4/index.d.ts

@@ -1,3 +1,5 @@
 export { signRequest } from './signRequest';
 export { presignUrl } from './presignUrl';
 export { TOKEN_QUERY_PARAM } from './constants';
+export { getHashedPayload } from './utils/getHashedPayload';
+export type { SignRequestOptions, PresignUrlOptions } from './types';

package/lib/clients/middleware/signing/signer/signatureV4/index.js

@@ -2,7 +2,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TOKEN_QUERY_PARAM = exports.presignUrl = exports.signRequest = void 0;
+exports.getHashedPayload = exports.TOKEN_QUERY_PARAM = exports.presignUrl = exports.signRequest = void 0;
 // TODO: V6 replace Signer
 var signRequest_1 = require("./signRequest");
 Object.defineProperty(exports, "signRequest", { enumerable: true, get: function () { return signRequest_1.signRequest; } });
@@ -10,3 +10,5 @@ var presignUrl_1 = require("./presignUrl");
 Object.defineProperty(exports, "presignUrl", { enumerable: true, get: function () { return presignUrl_1.presignUrl; } });
 var constants_1 = require("./constants");
 Object.defineProperty(exports, "TOKEN_QUERY_PARAM", { enumerable: true, get: function () { return constants_1.TOKEN_QUERY_PARAM; } });
+var getHashedPayload_1 = require("./utils/getHashedPayload");
+Object.defineProperty(exports, "getHashedPayload", { enumerable: true, get: function () { return getHashedPayload_1.getHashedPayload; } });

package/lib/clients/middleware/signing/signer/signatureV4/index.native.d.ts

@@ -2,3 +2,4 @@ import '@aws-amplify/core/polyfills/URL';
 export { signRequest } from './signRequest';
 export { presignUrl } from './presignUrl';
 export { TOKEN_QUERY_PARAM } from './constants';
+export { getHashedPayload } from './utils/getHashedPayload';

package/lib/clients/middleware/signing/signer/signatureV4/index.native.js

@@ -2,7 +2,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TOKEN_QUERY_PARAM = exports.presignUrl = exports.signRequest = void 0;
+exports.getHashedPayload = exports.TOKEN_QUERY_PARAM = exports.presignUrl = exports.signRequest = void 0;
 require("@aws-amplify/core/polyfills/URL");
 // TODO: V6 replace Signer
 var signRequest_1 = require("./signRequest");
@@ -11,3 +11,5 @@ var presignUrl_1 = require("./presignUrl");
 Object.defineProperty(exports, "presignUrl", { enumerable: true, get: function () { return presignUrl_1.presignUrl; } });
 var constants_1 = require("./constants");
 Object.defineProperty(exports, "TOKEN_QUERY_PARAM", { enumerable: true, get: function () { return constants_1.TOKEN_QUERY_PARAM; } });
+var getHashedPayload_1 = require("./utils/getHashedPayload");
+Object.defineProperty(exports, "getHashedPayload", { enumerable: true, get: function () { return getHashedPayload_1.getHashedPayload; } });