@aws-amplify/storage 6.6.10 → 6.6.11-storage-browser-integrity.2a9053f.0

package/dist/esm/providers/s3/utils/crc32.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"crc32.mjs","sources":["../../../../../src/providers/s3/utils/crc32.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport crc32 from 'crc-32';\nexport const calculateContentCRC32 = async (content, seed = 0) => {\n    let internalSeed = seed;\n    let blob;\n    if (content instanceof Blob) {\n        blob = content;\n    }\n    else {\n        blob = new Blob([content]);\n    }\n    await blob.stream().pipeTo(new WritableStream({\n        write(chunk) {\n            internalSeed = crc32.buf(chunk, internalSeed) >>> 0;\n        },\n    }));\n    const hex = internalSeed.toString(16).padStart(8, '0');\n    return {\n        checksumArrayBuffer: hexToArrayBuffer(hex),\n        checksum: hexToBase64(hex),\n        seed: internalSeed,\n    };\n};\nconst hexToArrayBuffer = (hexString) => new Uint8Array((hexString.match(/\\w{2}/g) ?? []).map(h => parseInt(h, 16)))\n    .buffer;\nconst hexToBase64 = (hexString) => btoa(hexString\n    .match(/\\w{2}/g)\n    .map((a) => String.fromCharCode(parseInt(a, 16)))\n    .join(''));\n"],"names":[],"mappings":";;AAAA;AACA;AAEY,MAAC,qBAAqB,GAAG,OAAO,OAAO,EAAE,IAAI,GAAG,CAAC,KAAK;AAClE,IAAI,IAAI,YAAY,GAAG,IAAI,CAAC;AAC5B,IAAI,IAAI,IAAI,CAAC;AACb,IAAI,IAAI,OAAO,YAAY,IAAI,EAAE;AACjC,QAAQ,IAAI,GAAG,OAAO,CAAC;AACvB,KAAK;AACL,SAAS;AACT,QAAQ,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;AACnC,KAAK;AACL,IAAI,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,cAAc,CAAC;AAClD,QAAQ,KAAK,CAAC,KAAK,EAAE;AACrB,YAAY,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;AAChE,SAAS;AACT,KAAK,CAAC,CAAC,CAAC;AACR,IAAI,MAAM,GAAG,GAAG,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AAC3D,IAAI,OAAO;AACX,QAAQ,mBAAmB,EAAE,gBAAgB,CAAC,GAAG,CAAC;AAClD,QAAQ,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC;AAClC,QAAQ,IAAI,EAAE,YAAY;AAC1B,KAAK,CAAC;AACN,EAAE;AACF,MAAM,gBAAgB,GAAG,CAAC,SAAS,KAAK,IAAI,UAAU,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AACnH,KAAK,MAAM,CAAC;AACZ,MAAM,WAAW,GAAG,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS;AACjD,KAAK,KAAK,CAAC,QAAQ,CAAC;AACpB,KAAK,GAAG,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AACrD,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC;;;;"}

package/dist/esm/providers/s3/utils/crc32.native.d.ts

@@ -0,0 +1,2 @@
+import { CRC32Checksum } from './crc32';
+export declare const calculateContentCRC32: (content: Blob | string | ArrayBuffer | ArrayBufferView, _seed?: number) => Promise<CRC32Checksum | undefined>;

package/dist/esm/providers/s3/utils/crc32.native.mjs

@@ -0,0 +1,8 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+const calculateContentCRC32 = async (content, _seed = 0) => {
+    return undefined;
+};
+
+export { calculateContentCRC32 };
+//# sourceMappingURL=crc32.native.mjs.map

package/dist/esm/providers/s3/utils/crc32.native.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"crc32.native.mjs","sources":["../../../../../src/providers/s3/utils/crc32.native.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nexport const calculateContentCRC32 = async (content, _seed = 0) => {\n    return undefined;\n};\n"],"names":[],"mappings":"AAAA;AACA;AACY,MAAC,qBAAqB,GAAG,OAAO,OAAO,EAAE,KAAK,GAAG,CAAC,KAAK;AACnE,IAAI,OAAO,SAAS,CAAC;AACrB;;;;"}

package/dist/esm/providers/s3/utils/index.d.ts

@@ -1,6 +1,7 @@
 export { calculateContentMd5 } from './md5';
 export { resolveS3ConfigAndInput } from './resolveS3ConfigAndInput';
 export { createDownloadTask, createUploadTask } from './transferTask';
+export { validateBucketOwnerID } from './validateBucketOwnerID';
 export { validateStorageOperationInput } from './validateStorageOperationInput';
 export { validateStorageOperationInputWithPrefix } from './validateStorageOperationInputWithPrefix';
 export { isInputWithPath } from './isInputWithPath';

package/dist/esm/providers/s3/utils/index.mjs

@@ -1,6 +1,7 @@
 export { calculateContentMd5 } from './md5.mjs';
 export { resolveS3ConfigAndInput } from './resolveS3ConfigAndInput.mjs';
 export { createDownloadTask, createUploadTask } from './transferTask.mjs';
+export { validateBucketOwnerID } from './validateBucketOwnerID.mjs';
 export { validateStorageOperationInput } from './validateStorageOperationInput.mjs';
 export { validateStorageOperationInputWithPrefix } from './validateStorageOperationInputWithPrefix.mjs';
 export { isInputWithPath } from './isInputWithPath.mjs';

package/dist/esm/providers/s3/utils/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;"}
+{"version":3,"file":"index.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;"}

package/dist/esm/providers/s3/utils/resolveIdentityId.d.ts

@@ -0,0 +1 @@
+export declare const resolveIdentityId: (identityId?: string) => string;

package/dist/esm/providers/s3/utils/resolveIdentityId.mjs

@@ -0,0 +1,12 @@
+import { StorageValidationErrorCode } from '../../../errors/types/validation.mjs';
+import { assertValidationError } from '../../../errors/utils/assertValidationError.mjs';
+
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+const resolveIdentityId = (identityId) => {
+    assertValidationError(!!identityId, StorageValidationErrorCode.NoIdentityId);
+    return identityId;
+};
+
+export { resolveIdentityId };
+//# sourceMappingURL=resolveIdentityId.mjs.map

package/dist/esm/providers/s3/utils/resolveIdentityId.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveIdentityId.mjs","sources":["../../../../../src/providers/s3/utils/resolveIdentityId.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { StorageValidationErrorCode } from '../../../errors/types/validation';\nimport { assertValidationError } from '../../../errors/utils/assertValidationError';\nexport const resolveIdentityId = (identityId) => {\n    assertValidationError(!!identityId, StorageValidationErrorCode.NoIdentityId);\n    return identityId;\n};\n"],"names":[],"mappings":";;;AAAA;AACA;AAGY,MAAC,iBAAiB,GAAG,CAAC,UAAU,KAAK;AACjD,IAAI,qBAAqB,CAAC,CAAC,CAAC,UAAU,EAAE,0BAA0B,CAAC,YAAY,CAAC,CAAC;AACjF,IAAI,OAAO,UAAU,CAAC;AACtB;;;;"}

package/dist/esm/providers/s3/utils/resolveS3ConfigAndInput.d.ts

@@ -1,9 +1,12 @@
 import { AmplifyClassV6, StorageAccessLevel } from '@aws-amplify/core';
-import { ResolvedS3Config, StorageBucket } from '../types/options';
+import { StorageOperationInputWithKey, StorageOperationInputWithPath, StorageOperationInputWithPrefix } from '../../../types/inputs';
+import { CopyInput, CopyWithPathInput } from '../types';
+import { LocationCredentialsProvider, ResolvedS3Config, StorageBucket } from '../types/options';
 interface S3ApiOptions {
     accessLevel?: StorageAccessLevel;
     targetIdentityId?: string;
     useAccelerateEndpoint?: boolean;
+    locationCredentialsProvider?: LocationCredentialsProvider;
     bucket?: StorageBucket;
 }
 interface ResolvedS3ConfigAndInput {
@@ -13,6 +16,9 @@ interface ResolvedS3ConfigAndInput {
     isObjectLockEnabled?: boolean;
     identityId?: string;
 }
+export type DeprecatedStorageInput = StorageOperationInputWithKey | StorageOperationInputWithPrefix | CopyInput;
+export type CallbackPathStorageInput = StorageOperationInputWithPath | CopyWithPathInput;
+type StorageInput = DeprecatedStorageInput | CallbackPathStorageInput;
 /**
  * resolve the common input options for S3 API handlers from Amplify configuration and library options.
  *
@@ -24,5 +30,7 @@ interface ResolvedS3ConfigAndInput {
  *
  * @internal
  */
-export declare const resolveS3ConfigAndInput: (amplify: AmplifyClassV6, apiOptions?: S3ApiOptions) => Promise<ResolvedS3ConfigAndInput>;
+export declare const resolveS3ConfigAndInput: (amplify: AmplifyClassV6, apiInput?: StorageInput & {
+    options?: S3ApiOptions;
+}) => Promise<ResolvedS3ConfigAndInput>;
 export {};

package/dist/esm/providers/s3/utils/resolveS3ConfigAndInput.mjs

@@ -1,6 +1,8 @@
 import { assertValidationError } from '../../../errors/utils/assertValidationError.mjs';
 import { StorageValidationErrorCode } from '../../../errors/types/validation.mjs';
 import { resolvePrefix } from '../../../utils/resolvePrefix.mjs';
+import { StorageError } from '../../../errors/StorageError.mjs';
+import { INVALID_STORAGE_INPUT } from '../../../errors/constants.mjs';
 import { DEFAULT_ACCESS_LEVEL, LOCAL_TESTING_S3_ENDPOINT } from './constants.mjs';
 
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
@@ -16,21 +18,32 @@ import { DEFAULT_ACCESS_LEVEL, LOCAL_TESTING_S3_ENDPOINT } from './constants.mjs
  *
  * @internal
  */
-const resolveS3ConfigAndInput = async (amplify, apiOptions) => {
+const resolveS3ConfigAndInput = async (amplify, apiInput) => {
+    const { options: apiOptions } = apiInput ?? {};
     /**
      * IdentityId is always cached in memory so we can safely make calls here. It
      * should be stable even for unauthenticated users, regardless of credentials.
      */
     const { identityId } = await amplify.Auth.fetchAuthSession();
-    assertValidationError(!!identityId, StorageValidationErrorCode.NoIdentityId);
     /**
      * A credentials provider function instead of a static credentials object is
      * used because the long-running tasks like multipart upload may span over the
      * credentials expiry. Auth.fetchAuthSession() automatically refreshes the
      * credentials if they are expired.
+     *
+     * The optional forceRefresh option is set when the S3 service returns expired
+     * tokens error in the previous API call attempt.
      */
-    const credentialsProvider = async () => {
-        const { credentials } = await amplify.Auth.fetchAuthSession();
+    const credentialsProvider = async (options) => {
+        if (isLocationCredentialsProvider(apiOptions)) {
+            assertStorageInput(apiInput);
+        }
+        // TODO: forceRefresh option of fetchAuthSession would refresh both tokens and
+        // AWS credentials. So we do not support forceRefreshing from the Auth until
+        // we support refreshing only the credentials.
+        const { credentials } = isLocationCredentialsProvider(apiOptions)
+            ? await apiOptions.locationCredentialsProvider(options)
+            : await amplify.Auth.fetchAuthSession();
         assertValidationError(!!credentials, StorageValidationErrorCode.NoCredentials);
         return credentials;
     };
@@ -39,13 +52,11 @@ const resolveS3ConfigAndInput = async (amplify, apiOptions) => {
     assertValidationError(!!bucket, StorageValidationErrorCode.NoBucket);
     assertValidationError(!!region, StorageValidationErrorCode.NoRegion);
     const { defaultAccessLevel, prefixResolver = resolvePrefix, isObjectLockEnabled, } = amplify.libraryOptions?.Storage?.S3 ?? {};
-    const keyPrefix = await prefixResolver({
-        accessLevel: apiOptions?.accessLevel ?? defaultAccessLevel ?? DEFAULT_ACCESS_LEVEL,
-        // use conditional assign to make tsc happy because StorageOptions is a union type that may not have targetIdentityId
-        targetIdentityId: apiOptions?.accessLevel === 'protected'
-            ? (apiOptions?.targetIdentityId ?? identityId)
-            : identityId,
-    });
+    const accessLevel = apiOptions?.accessLevel ?? defaultAccessLevel ?? DEFAULT_ACCESS_LEVEL;
+    const targetIdentityId = accessLevel === 'protected'
+        ? (apiOptions?.targetIdentityId ?? identityId)
+        : identityId;
+    const keyPrefix = await prefixResolver({ accessLevel, targetIdentityId });
     return {
         s3Config: {
             credentials: credentialsProvider,
@@ -64,6 +75,41 @@ const resolveS3ConfigAndInput = async (amplify, apiOptions) => {
         isObjectLockEnabled,
     };
 };
+const isLocationCredentialsProvider = (options) => {
+    return !!options?.locationCredentialsProvider;
+};
+const isInputWithCallbackPath = (input) => {
+    return ((input?.path &&
+        typeof input.path === 'function') ||
+        (input?.destination?.path &&
+            typeof input.destination?.path === 'function') ||
+        (input?.source?.path &&
+            typeof input.source?.path === 'function'));
+};
+const isDeprecatedInput = (input) => {
+    return (isInputWithKey(input) ||
+        isInputWithPrefix(input) ||
+        isInputWithCopySourceOrDestination(input));
+};
+const assertStorageInput = (input) => {
+    if (isDeprecatedInput(input) || isInputWithCallbackPath(input)) {
+        throw new StorageError({
+            name: INVALID_STORAGE_INPUT,
+            message: 'The input needs to have a path as a string value.',
+            recoverySuggestion: 'Please provide a valid path as a string value for the input.',
+        });
+    }
+};
+const isInputWithKey = (input) => {
+    return !!(typeof input.key === 'string');
+};
+const isInputWithPrefix = (input) => {
+    return !!(typeof input.prefix === 'string');
+};
+const isInputWithCopySourceOrDestination = (input) => {
+    return !!(typeof input.source?.key === 'string' ||
+        typeof input.destination?.key === 'string');
+};
 const resolveBucketConfig = (apiOptions, buckets) => {
     if (typeof apiOptions.bucket === 'string') {
         const bucketConfig = buckets?.[apiOptions.bucket];

package/dist/esm/providers/s3/utils/resolveS3ConfigAndInput.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"resolveS3ConfigAndInput.mjs","sources":["../../../../../src/providers/s3/utils/resolveS3ConfigAndInput.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { assertValidationError } from '../../../errors/utils/assertValidationError';\nimport { StorageValidationErrorCode } from '../../../errors/types/validation';\nimport { resolvePrefix as defaultPrefixResolver } from '../../../utils/resolvePrefix';\nimport { DEFAULT_ACCESS_LEVEL, LOCAL_TESTING_S3_ENDPOINT } from './constants';\n/**\n * resolve the common input options for S3 API handlers from Amplify configuration and library options.\n *\n * @param {AmplifyClassV6} amplify The Amplify instance.\n * @param {S3ApiOptions} apiOptions The input options for S3 provider.\n * @returns {Promise<ResolvedS3ConfigAndInput>} The resolved common input options for S3 API handlers.\n * @throws A `StorageError` with `error.name` from `StorageValidationErrorCode` indicating invalid\n *   configurations or Amplify library options.\n *\n * @internal\n */\nexport const resolveS3ConfigAndInput = async (amplify, apiOptions) => {\n    /**\n     * IdentityId is always cached in memory so we can safely make calls here. It\n     * should be stable even for unauthenticated users, regardless of credentials.\n     */\n    const { identityId } = await amplify.Auth.fetchAuthSession();\n    assertValidationError(!!identityId, StorageValidationErrorCode.NoIdentityId);\n    /**\n     * A credentials provider function instead of a static credentials object is\n     * used because the long-running tasks like multipart upload may span over the\n     * credentials expiry. Auth.fetchAuthSession() automatically refreshes the\n     * credentials if they are expired.\n     */\n    const credentialsProvider = async () => {\n        const { credentials } = await amplify.Auth.fetchAuthSession();\n        assertValidationError(!!credentials, StorageValidationErrorCode.NoCredentials);\n        return credentials;\n    };\n    const { bucket: defaultBucket, region: defaultRegion, dangerouslyConnectToHttpEndpointForTesting, buckets, } = amplify.getConfig()?.Storage?.S3 ?? {};\n    const { bucket = defaultBucket, region = defaultRegion } = (apiOptions?.bucket && resolveBucketConfig(apiOptions, buckets)) || {};\n    assertValidationError(!!bucket, StorageValidationErrorCode.NoBucket);\n    assertValidationError(!!region, StorageValidationErrorCode.NoRegion);\n    const { defaultAccessLevel, prefixResolver = defaultPrefixResolver, isObjectLockEnabled, } = amplify.libraryOptions?.Storage?.S3 ?? {};\n    const keyPrefix = await prefixResolver({\n        accessLevel: apiOptions?.accessLevel ?? defaultAccessLevel ?? DEFAULT_ACCESS_LEVEL,\n        // use conditional assign to make tsc happy because StorageOptions is a union type that may not have targetIdentityId\n        targetIdentityId: apiOptions?.accessLevel === 'protected'\n            ? (apiOptions?.targetIdentityId ?? identityId)\n            : identityId,\n    });\n    return {\n        s3Config: {\n            credentials: credentialsProvider,\n            region,\n            useAccelerateEndpoint: apiOptions?.useAccelerateEndpoint,\n            ...(dangerouslyConnectToHttpEndpointForTesting\n                ? {\n                    customEndpoint: LOCAL_TESTING_S3_ENDPOINT,\n                    forcePathStyle: true,\n                }\n                : {}),\n        },\n        bucket,\n        keyPrefix,\n        identityId,\n        isObjectLockEnabled,\n    };\n};\nconst resolveBucketConfig = (apiOptions, buckets) => {\n    if (typeof apiOptions.bucket === 'string') {\n        const bucketConfig = buckets?.[apiOptions.bucket];\n        assertValidationError(!!bucketConfig, StorageValidationErrorCode.InvalidStorageBucket);\n        return { bucket: bucketConfig.bucketName, region: bucketConfig.region };\n    }\n    if (typeof apiOptions.bucket === 'object') {\n        return {\n            bucket: apiOptions.bucket.bucketName,\n            region: apiOptions.bucket.region,\n        };\n    }\n};\n"],"names":["defaultPrefixResolver"],"mappings":"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"}
+{"version":3,"file":"resolveS3ConfigAndInput.mjs","sources":["../../../../../src/providers/s3/utils/resolveS3ConfigAndInput.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { assertValidationError } from '../../../errors/utils/assertValidationError';\nimport { StorageValidationErrorCode } from '../../../errors/types/validation';\nimport { resolvePrefix as defaultPrefixResolver } from '../../../utils/resolvePrefix';\nimport { StorageError } from '../../../errors/StorageError';\nimport { INVALID_STORAGE_INPUT } from '../../../errors/constants';\nimport { DEFAULT_ACCESS_LEVEL, LOCAL_TESTING_S3_ENDPOINT } from './constants';\n/**\n * resolve the common input options for S3 API handlers from Amplify configuration and library options.\n *\n * @param {AmplifyClassV6} amplify The Amplify instance.\n * @param {S3ApiOptions} apiOptions The input options for S3 provider.\n * @returns {Promise<ResolvedS3ConfigAndInput>} The resolved common input options for S3 API handlers.\n * @throws A `StorageError` with `error.name` from `StorageValidationErrorCode` indicating invalid\n *   configurations or Amplify library options.\n *\n * @internal\n */\nexport const resolveS3ConfigAndInput = async (amplify, apiInput) => {\n    const { options: apiOptions } = apiInput ?? {};\n    /**\n     * IdentityId is always cached in memory so we can safely make calls here. It\n     * should be stable even for unauthenticated users, regardless of credentials.\n     */\n    const { identityId } = await amplify.Auth.fetchAuthSession();\n    /**\n     * A credentials provider function instead of a static credentials object is\n     * used because the long-running tasks like multipart upload may span over the\n     * credentials expiry. Auth.fetchAuthSession() automatically refreshes the\n     * credentials if they are expired.\n     *\n     * The optional forceRefresh option is set when the S3 service returns expired\n     * tokens error in the previous API call attempt.\n     */\n    const credentialsProvider = async (options) => {\n        if (isLocationCredentialsProvider(apiOptions)) {\n            assertStorageInput(apiInput);\n        }\n        // TODO: forceRefresh option of fetchAuthSession would refresh both tokens and\n        // AWS credentials. So we do not support forceRefreshing from the Auth until\n        // we support refreshing only the credentials.\n        const { credentials } = isLocationCredentialsProvider(apiOptions)\n            ? await apiOptions.locationCredentialsProvider(options)\n            : await amplify.Auth.fetchAuthSession();\n        assertValidationError(!!credentials, StorageValidationErrorCode.NoCredentials);\n        return credentials;\n    };\n    const { bucket: defaultBucket, region: defaultRegion, dangerouslyConnectToHttpEndpointForTesting, buckets, } = amplify.getConfig()?.Storage?.S3 ?? {};\n    const { bucket = defaultBucket, region = defaultRegion } = (apiOptions?.bucket && resolveBucketConfig(apiOptions, buckets)) || {};\n    assertValidationError(!!bucket, StorageValidationErrorCode.NoBucket);\n    assertValidationError(!!region, StorageValidationErrorCode.NoRegion);\n    const { defaultAccessLevel, prefixResolver = defaultPrefixResolver, isObjectLockEnabled, } = amplify.libraryOptions?.Storage?.S3 ?? {};\n    const accessLevel = apiOptions?.accessLevel ?? defaultAccessLevel ?? DEFAULT_ACCESS_LEVEL;\n    const targetIdentityId = accessLevel === 'protected'\n        ? (apiOptions?.targetIdentityId ?? identityId)\n        : identityId;\n    const keyPrefix = await prefixResolver({ accessLevel, targetIdentityId });\n    return {\n        s3Config: {\n            credentials: credentialsProvider,\n            region,\n            useAccelerateEndpoint: apiOptions?.useAccelerateEndpoint,\n            ...(dangerouslyConnectToHttpEndpointForTesting\n                ? {\n                    customEndpoint: LOCAL_TESTING_S3_ENDPOINT,\n                    forcePathStyle: true,\n                }\n                : {}),\n        },\n        bucket,\n        keyPrefix,\n        identityId,\n        isObjectLockEnabled,\n    };\n};\nconst isLocationCredentialsProvider = (options) => {\n    return !!options?.locationCredentialsProvider;\n};\nconst isInputWithCallbackPath = (input) => {\n    return ((input?.path &&\n        typeof input.path === 'function') ||\n        (input?.destination?.path &&\n            typeof input.destination?.path === 'function') ||\n        (input?.source?.path &&\n            typeof input.source?.path === 'function'));\n};\nconst isDeprecatedInput = (input) => {\n    return (isInputWithKey(input) ||\n        isInputWithPrefix(input) ||\n        isInputWithCopySourceOrDestination(input));\n};\nconst assertStorageInput = (input) => {\n    if (isDeprecatedInput(input) || isInputWithCallbackPath(input)) {\n        throw new StorageError({\n            name: INVALID_STORAGE_INPUT,\n            message: 'The input needs to have a path as a string value.',\n            recoverySuggestion: 'Please provide a valid path as a string value for the input.',\n        });\n    }\n};\nconst isInputWithKey = (input) => {\n    return !!(typeof input.key === 'string');\n};\nconst isInputWithPrefix = (input) => {\n    return !!(typeof input.prefix === 'string');\n};\nconst isInputWithCopySourceOrDestination = (input) => {\n    return !!(typeof input.source?.key === 'string' ||\n        typeof input.destination?.key === 'string');\n};\nconst resolveBucketConfig = (apiOptions, buckets) => {\n    if (typeof apiOptions.bucket === 'string') {\n        const bucketConfig = buckets?.[apiOptions.bucket];\n        assertValidationError(!!bucketConfig, StorageValidationErrorCode.InvalidStorageBucket);\n        return { bucket: bucketConfig.bucketName, region: bucketConfig.region };\n    }\n    if (typeof apiOptions.bucket === 'object') {\n        return {\n            bucket: apiOptions.bucket.bucketName,\n            region: apiOptions.bucket.region,\n        };\n    }\n};\n"],"names":["defaultPrefixResolver"],"mappings":"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"}

package/dist/esm/providers/s3/utils/validateBucketOwnerID.d.ts

@@ -0,0 +1 @@
+export declare const validateBucketOwnerID: (accountID?: string) => void;

package/dist/esm/providers/s3/utils/validateBucketOwnerID.mjs

@@ -0,0 +1,15 @@
+import { StorageValidationErrorCode } from '../../../errors/types/validation.mjs';
+import { assertValidationError } from '../../../errors/utils/assertValidationError.mjs';
+
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+const VALID_AWS_ACCOUNT_ID_PATTERN = /^\d{12}/;
+const validateBucketOwnerID = (accountID) => {
+    if (accountID === undefined) {
+        return;
+    }
+    assertValidationError(VALID_AWS_ACCOUNT_ID_PATTERN.test(accountID), StorageValidationErrorCode.InvalidAWSAccountID);
+};
+
+export { validateBucketOwnerID };
+//# sourceMappingURL=validateBucketOwnerID.mjs.map

package/dist/esm/providers/s3/utils/validateBucketOwnerID.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"validateBucketOwnerID.mjs","sources":["../../../../../src/providers/s3/utils/validateBucketOwnerID.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { StorageValidationErrorCode } from '../../../errors/types/validation';\nimport { assertValidationError } from '../../../errors/utils/assertValidationError';\nconst VALID_AWS_ACCOUNT_ID_PATTERN = /^\\d{12}/;\nexport const validateBucketOwnerID = (accountID) => {\n    if (accountID === undefined) {\n        return;\n    }\n    assertValidationError(VALID_AWS_ACCOUNT_ID_PATTERN.test(accountID), StorageValidationErrorCode.InvalidAWSAccountID);\n};\n"],"names":[],"mappings":";;;AAAA;AACA;AAGA,MAAM,4BAA4B,GAAG,SAAS,CAAC;AACnC,MAAC,qBAAqB,GAAG,CAAC,SAAS,KAAK;AACpD,IAAI,IAAI,SAAS,KAAK,SAAS,EAAE;AACjC,QAAQ,OAAO;AACf,KAAK;AACL,IAAI,qBAAqB,CAAC,4BAA4B,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,0BAA0B,CAAC,mBAAmB,CAAC,CAAC;AACxH;;;;"}

package/dist/esm/providers/s3/utils/validateMultipartUploadXML.d.ts

@@ -0,0 +1,2 @@
+import { CompletedMultipartUpload } from './client/s3data/types';
+export declare function validateMultipartUploadXML(input: CompletedMultipartUpload, xml: string): void;

package/dist/esm/providers/s3/utils/validateMultipartUploadXML.mjs

@@ -0,0 +1,30 @@
+import { IntegrityError } from '../../../errors/IntegrityError.mjs';
+import './client/runtime/s3TransferHandler/fetch.mjs';
+import { parser } from './client/runtime/xmlParser/pureJs.mjs';
+import './client/runtime/s3TransferHandler/xhr.mjs';
+import 'buffer';
+import '@aws-amplify/core/internals/aws-client-utils';
+import { map, emptyArrayGuard, deserializeCompletedPartList } from './client/utils/deserializeHelpers.mjs';
+import '@aws-amplify/core/internals/utils';
+import { isEqual } from './client/utils/integrityHelpers.mjs';
+
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+function validateMultipartUploadXML(input, xml) {
+    if (!input.Parts) {
+        throw new IntegrityError();
+    }
+    const parsedXML = parser.parse(xml);
+    const mappedCompletedMultipartUpload = map(parsedXML, {
+        Parts: [
+            'Part',
+            value => emptyArrayGuard(value, deserializeCompletedPartList),
+        ],
+    });
+    if (!isEqual(input, mappedCompletedMultipartUpload)) {
+        throw new IntegrityError();
+    }
+}
+
+export { validateMultipartUploadXML };
+//# sourceMappingURL=validateMultipartUploadXML.mjs.map

package/dist/esm/providers/s3/utils/validateMultipartUploadXML.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"validateMultipartUploadXML.mjs","sources":["../../../../../src/providers/s3/utils/validateMultipartUploadXML.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { IntegrityError } from '../../../errors/IntegrityError';\nimport { parser } from './client/runtime';\nimport { deserializeCompletedPartList, emptyArrayGuard, map, } from './client/utils';\nimport { isEqual } from './client/utils/integrityHelpers';\nexport function validateMultipartUploadXML(input, xml) {\n    if (!input.Parts) {\n        throw new IntegrityError();\n    }\n    const parsedXML = parser.parse(xml);\n    const mappedCompletedMultipartUpload = map(parsedXML, {\n        Parts: [\n            'Part',\n            value => emptyArrayGuard(value, deserializeCompletedPartList),\n        ],\n    });\n    if (!isEqual(input, mappedCompletedMultipartUpload)) {\n        throw new IntegrityError();\n    }\n}\n"],"names":[],"mappings":";;;;;;;;;;AAAA;AACA;AAKO,SAAS,0BAA0B,CAAC,KAAK,EAAE,GAAG,EAAE;AACvD,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;AACtB,QAAQ,MAAM,IAAI,cAAc,EAAE,CAAC;AACnC,KAAK;AACL,IAAI,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACxC,IAAI,MAAM,8BAA8B,GAAG,GAAG,CAAC,SAAS,EAAE;AAC1D,QAAQ,KAAK,EAAE;AACf,YAAY,MAAM;AAClB,YAAY,KAAK,IAAI,eAAe,CAAC,KAAK,EAAE,4BAA4B,CAAC;AACzE,SAAS;AACT,KAAK,CAAC,CAAC;AACP,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,8BAA8B,CAAC,EAAE;AACzD,QAAQ,MAAM,IAAI,cAAc,EAAE,CAAC;AACnC,KAAK;AACL;;;;"}

package/dist/esm/providers/s3/utils/validateObjectUrl.d.ts

@@ -0,0 +1,5 @@
+export declare function validateObjectUrl({ bucketName, key, objectURL, }: {
+    bucketName?: string;
+    key?: string;
+    objectURL?: URL;
+}): void;

package/dist/esm/providers/s3/utils/validateObjectUrl.mjs

@@ -0,0 +1,22 @@
+import { extendedEncodeURIComponent } from '@aws-amplify/core/internals/aws-client-utils';
+import { IntegrityError } from '../../../errors/IntegrityError.mjs';
+
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+function validateObjectUrl({ bucketName, key, objectURL, }) {
+    if (!bucketName || !key || !objectURL) {
+        throw new IntegrityError();
+    }
+    const bucketWithDots = bucketName.includes('.');
+    const encodedBucketName = extendedEncodeURIComponent(bucketName);
+    const encodedKey = key.split('/').map(extendedEncodeURIComponent).join('/');
+    const isPathStyleUrl = objectURL.pathname === `/${encodedBucketName}/${encodedKey}`;
+    const isSubdomainUrl = objectURL.hostname.startsWith(`${encodedBucketName}.`) &&
+        objectURL.pathname === `/${encodedKey}`;
+    if (!(isPathStyleUrl || (!bucketWithDots && isSubdomainUrl))) {
+        throw new IntegrityError();
+    }
+}
+
+export { validateObjectUrl };
+//# sourceMappingURL=validateObjectUrl.mjs.map

package/dist/esm/providers/s3/utils/validateObjectUrl.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"validateObjectUrl.mjs","sources":["../../../../../src/providers/s3/utils/validateObjectUrl.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { extendedEncodeURIComponent } from '@aws-amplify/core/internals/aws-client-utils';\nimport { IntegrityError } from '../../../errors/IntegrityError';\nexport function validateObjectUrl({ bucketName, key, objectURL, }) {\n    if (!bucketName || !key || !objectURL) {\n        throw new IntegrityError();\n    }\n    const bucketWithDots = bucketName.includes('.');\n    const encodedBucketName = extendedEncodeURIComponent(bucketName);\n    const encodedKey = key.split('/').map(extendedEncodeURIComponent).join('/');\n    const isPathStyleUrl = objectURL.pathname === `/${encodedBucketName}/${encodedKey}`;\n    const isSubdomainUrl = objectURL.hostname.startsWith(`${encodedBucketName}.`) &&\n        objectURL.pathname === `/${encodedKey}`;\n    if (!(isPathStyleUrl || (!bucketWithDots && isSubdomainUrl))) {\n        throw new IntegrityError();\n    }\n}\n"],"names":[],"mappings":";;;AAAA;AACA;AAGO,SAAS,iBAAiB,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,SAAS,GAAG,EAAE;AACnE,IAAI,IAAI,CAAC,UAAU,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,EAAE;AAC3C,QAAQ,MAAM,IAAI,cAAc,EAAE,CAAC;AACnC,KAAK;AACL,IAAI,MAAM,cAAc,GAAG,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;AACpD,IAAI,MAAM,iBAAiB,GAAG,0BAA0B,CAAC,UAAU,CAAC,CAAC;AACrE,IAAI,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAChF,IAAI,MAAM,cAAc,GAAG,SAAS,CAAC,QAAQ,KAAK,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;AACxF,IAAI,MAAM,cAAc,GAAG,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC;AACjF,QAAQ,SAAS,CAAC,QAAQ,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;AAChD,IAAI,IAAI,EAAE,cAAc,KAAK,CAAC,cAAc,IAAI,cAAc,CAAC,CAAC,EAAE;AAClE,QAAQ,MAAM,IAAI,cAAc,EAAE,CAAC;AACnC,KAAK;AACL;;;;"}

package/dist/esm/providers/s3/utils/validateStorageOperationInput.mjs

@@ -2,6 +2,7 @@ import { assertValidationError } from '../../../errors/utils/assertValidationErr
 import { StorageValidationErrorCode } from '../../../errors/types/validation.mjs';
 import { isInputWithPath } from './isInputWithPath.mjs';
 import { STORAGE_INPUT_PATH, STORAGE_INPUT_KEY } from './constants.mjs';
+import { resolveIdentityId } from './resolveIdentityId.mjs';
 
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
@@ -13,7 +14,9 @@ const validateStorageOperationInput = (input, identityId) => {
         (!input.key && !!input.path), StorageValidationErrorCode.InvalidStorageOperationInput);
     if (isInputWithPath(input)) {
         const { path } = input;
-        const objectKey = typeof path === 'string' ? path : path({ identityId });
+        const objectKey = typeof path === 'string'
+            ? path
+            : path({ identityId: resolveIdentityId(identityId) });
         assertValidationError(!objectKey.startsWith('/'), StorageValidationErrorCode.InvalidStoragePathInput);
         return {
             inputType: STORAGE_INPUT_PATH,

package/dist/esm/providers/s3/utils/validateStorageOperationInput.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"validateStorageOperationInput.mjs","sources":["../../../../../src/providers/s3/utils/validateStorageOperationInput.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { assertValidationError } from '../../../errors/utils/assertValidationError';\nimport { StorageValidationErrorCode } from '../../../errors/types/validation';\nimport { isInputWithPath } from './isInputWithPath';\nimport { STORAGE_INPUT_KEY, STORAGE_INPUT_PATH } from './constants';\nexport const validateStorageOperationInput = (input, identityId) => {\n    assertValidationError(\n    // Key present without a path\n    (!!input.key && !input.path) ||\n        // Path present without a key\n        (!input.key && !!input.path), StorageValidationErrorCode.InvalidStorageOperationInput);\n    if (isInputWithPath(input)) {\n        const { path } = input;\n        const objectKey = typeof path === 'string' ? path : path({ identityId });\n        assertValidationError(!objectKey.startsWith('/'), StorageValidationErrorCode.InvalidStoragePathInput);\n        return {\n            inputType: STORAGE_INPUT_PATH,\n            objectKey,\n        };\n    }\n    else {\n        return { inputType: STORAGE_INPUT_KEY, objectKey: input.key };\n    }\n};\n"],"names":[],"mappings":";;;;;AAAA;AACA;AAKY,MAAC,6BAA6B,GAAG,CAAC,KAAK,EAAE,UAAU,KAAK;AACpE,IAAI,qBAAqB;AACzB;AACA,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI;AAC/B;AACA,SAAS,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,0BAA0B,CAAC,4BAA4B,CAAC,CAAC;AAC/F,IAAI,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE;AAChC,QAAQ,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;AAC/B,QAAQ,MAAM,SAAS,GAAG,OAAO,IAAI,KAAK,QAAQ,GAAG,IAAI,GAAG,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;AACjF,QAAQ,qBAAqB,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,0BAA0B,CAAC,uBAAuB,CAAC,CAAC;AAC9G,QAAQ,OAAO;AACf,YAAY,SAAS,EAAE,kBAAkB;AACzC,YAAY,SAAS;AACrB,SAAS,CAAC;AACV,KAAK;AACL,SAAS;AACT,QAAQ,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,SAAS,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC;AACtE,KAAK;AACL;;;;"}
+{"version":3,"file":"validateStorageOperationInput.mjs","sources":["../../../../../src/providers/s3/utils/validateStorageOperationInput.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { assertValidationError } from '../../../errors/utils/assertValidationError';\nimport { StorageValidationErrorCode } from '../../../errors/types/validation';\nimport { isInputWithPath } from './isInputWithPath';\nimport { STORAGE_INPUT_KEY, STORAGE_INPUT_PATH } from './constants';\nimport { resolveIdentityId } from './resolveIdentityId';\nexport const validateStorageOperationInput = (input, identityId) => {\n    assertValidationError(\n    // Key present without a path\n    (!!input.key && !input.path) ||\n        // Path present without a key\n        (!input.key && !!input.path), StorageValidationErrorCode.InvalidStorageOperationInput);\n    if (isInputWithPath(input)) {\n        const { path } = input;\n        const objectKey = typeof path === 'string'\n            ? path\n            : path({ identityId: resolveIdentityId(identityId) });\n        assertValidationError(!objectKey.startsWith('/'), StorageValidationErrorCode.InvalidStoragePathInput);\n        return {\n            inputType: STORAGE_INPUT_PATH,\n            objectKey,\n        };\n    }\n    else {\n        return { inputType: STORAGE_INPUT_KEY, objectKey: input.key };\n    }\n};\n"],"names":[],"mappings":";;;;;;AAAA;AACA;AAMY,MAAC,6BAA6B,GAAG,CAAC,KAAK,EAAE,UAAU,KAAK;AACpE,IAAI,qBAAqB;AACzB;AACA,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI;AAC/B;AACA,SAAS,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,0BAA0B,CAAC,4BAA4B,CAAC,CAAC;AAC/F,IAAI,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE;AAChC,QAAQ,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;AAC/B,QAAQ,MAAM,SAAS,GAAG,OAAO,IAAI,KAAK,QAAQ;AAClD,cAAc,IAAI;AAClB,cAAc,IAAI,CAAC,EAAE,UAAU,EAAE,iBAAiB,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;AAClE,QAAQ,qBAAqB,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,0BAA0B,CAAC,uBAAuB,CAAC,CAAC;AAC9G,QAAQ,OAAO;AACf,YAAY,SAAS,EAAE,kBAAkB;AACzC,YAAY,SAAS;AACrB,SAAS,CAAC;AACV,KAAK;AACL,SAAS;AACT,QAAQ,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,SAAS,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC;AACtE,KAAK;AACL;;;;"}

package/dist/esm/providers/s3/utils/validateStorageOperationInputWithPrefix.mjs

@@ -1,6 +1,7 @@
 import { assertValidationError } from '../../../errors/utils/assertValidationError.mjs';
 import { StorageValidationErrorCode } from '../../../errors/types/validation.mjs';
 import { STORAGE_INPUT_PATH, STORAGE_INPUT_PREFIX } from './constants.mjs';
+import { resolveIdentityId } from './resolveIdentityId.mjs';
 
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
@@ -13,7 +14,9 @@ const validateStorageOperationInputWithPrefix = (input, identityId) => {
     assertValidationError(!(input.prefix && input.path), StorageValidationErrorCode.InvalidStorageOperationPrefixInput);
     if (_isInputWithPath(input)) {
         const { path } = input;
-        const objectKey = typeof path === 'string' ? path : path({ identityId });
+        const objectKey = typeof path === 'string'
+            ? path
+            : path({ identityId: resolveIdentityId(identityId) });
         // Assert on no leading slash in the path parameter
         assertValidationError(!objectKey.startsWith('/'), StorageValidationErrorCode.InvalidStoragePathInput);
         return {

package/dist/esm/providers/s3/utils/validateStorageOperationInputWithPrefix.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"validateStorageOperationInputWithPrefix.mjs","sources":["../../../../../src/providers/s3/utils/validateStorageOperationInputWithPrefix.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { assertValidationError } from '../../../errors/utils/assertValidationError';\nimport { StorageValidationErrorCode } from '../../../errors/types/validation';\nimport { STORAGE_INPUT_PATH, STORAGE_INPUT_PREFIX } from './constants';\n// Local assertion function with StorageOperationInputWithPrefixPath as Input\nconst _isInputWithPath = (input) => {\n    return input.path !== undefined;\n};\nexport const validateStorageOperationInputWithPrefix = (input, identityId) => {\n    // Validate prefix & path not present at the same time\n    assertValidationError(!(input.prefix && input.path), StorageValidationErrorCode.InvalidStorageOperationPrefixInput);\n    if (_isInputWithPath(input)) {\n        const { path } = input;\n        const objectKey = typeof path === 'string' ? path : path({ identityId });\n        // Assert on no leading slash in the path parameter\n        assertValidationError(!objectKey.startsWith('/'), StorageValidationErrorCode.InvalidStoragePathInput);\n        return {\n            inputType: STORAGE_INPUT_PATH,\n            objectKey,\n        };\n    }\n    else {\n        return { inputType: STORAGE_INPUT_PREFIX, objectKey: input.prefix ?? '' };\n    }\n};\n"],"names":[],"mappings":";;;;AAAA;AACA;AAIA;AACA,MAAM,gBAAgB,GAAG,CAAC,KAAK,KAAK;AACpC,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC;AACpC,CAAC,CAAC;AACU,MAAC,uCAAuC,GAAG,CAAC,KAAK,EAAE,UAAU,KAAK;AAC9E;AACA,IAAI,qBAAqB,CAAC,EAAE,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,0BAA0B,CAAC,kCAAkC,CAAC,CAAC;AACxH,IAAI,IAAI,gBAAgB,CAAC,KAAK,CAAC,EAAE;AACjC,QAAQ,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;AAC/B,QAAQ,MAAM,SAAS,GAAG,OAAO,IAAI,KAAK,QAAQ,GAAG,IAAI,GAAG,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;AACjF;AACA,QAAQ,qBAAqB,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,0BAA0B,CAAC,uBAAuB,CAAC,CAAC;AAC9G,QAAQ,OAAO;AACf,YAAY,SAAS,EAAE,kBAAkB;AACzC,YAAY,SAAS;AACrB,SAAS,CAAC;AACV,KAAK;AACL,SAAS;AACT,QAAQ,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,SAAS,EAAE,KAAK,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;AAClF,KAAK;AACL;;;;"}
+{"version":3,"file":"validateStorageOperationInputWithPrefix.mjs","sources":["../../../../../src/providers/s3/utils/validateStorageOperationInputWithPrefix.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { assertValidationError } from '../../../errors/utils/assertValidationError';\nimport { StorageValidationErrorCode } from '../../../errors/types/validation';\nimport { STORAGE_INPUT_PATH, STORAGE_INPUT_PREFIX } from './constants';\nimport { resolveIdentityId } from './resolveIdentityId';\n// Local assertion function with StorageOperationInputWithPrefixPath as Input\nconst _isInputWithPath = (input) => {\n    return input.path !== undefined;\n};\nexport const validateStorageOperationInputWithPrefix = (input, identityId) => {\n    // Validate prefix & path not present at the same time\n    assertValidationError(!(input.prefix && input.path), StorageValidationErrorCode.InvalidStorageOperationPrefixInput);\n    if (_isInputWithPath(input)) {\n        const { path } = input;\n        const objectKey = typeof path === 'string'\n            ? path\n            : path({ identityId: resolveIdentityId(identityId) });\n        // Assert on no leading slash in the path parameter\n        assertValidationError(!objectKey.startsWith('/'), StorageValidationErrorCode.InvalidStoragePathInput);\n        return {\n            inputType: STORAGE_INPUT_PATH,\n            objectKey,\n        };\n    }\n    else {\n        return { inputType: STORAGE_INPUT_PREFIX, objectKey: input.prefix ?? '' };\n    }\n};\n"],"names":[],"mappings":";;;;;AAAA;AACA;AAKA;AACA,MAAM,gBAAgB,GAAG,CAAC,KAAK,KAAK;AACpC,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC;AACpC,CAAC,CAAC;AACU,MAAC,uCAAuC,GAAG,CAAC,KAAK,EAAE,UAAU,KAAK;AAC9E;AACA,IAAI,qBAAqB,CAAC,EAAE,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,0BAA0B,CAAC,kCAAkC,CAAC,CAAC;AACxH,IAAI,IAAI,gBAAgB,CAAC,KAAK,CAAC,EAAE;AACjC,QAAQ,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;AAC/B,QAAQ,MAAM,SAAS,GAAG,OAAO,IAAI,KAAK,QAAQ;AAClD,cAAc,IAAI;AAClB,cAAc,IAAI,CAAC,EAAE,UAAU,EAAE,iBAAiB,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;AAClE;AACA,QAAQ,qBAAqB,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,0BAA0B,CAAC,uBAAuB,CAAC,CAAC;AAC9G,QAAQ,OAAO;AACf,YAAY,SAAS,EAAE,kBAAkB;AACzC,YAAY,SAAS;AACrB,SAAS,CAAC;AACV,KAAK;AACL,SAAS;AACT,QAAQ,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,SAAS,EAAE,KAAK,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;AAClF,KAAK;AACL;;;;"}

package/dist/esm/types/inputs.d.ts

@@ -1,5 +1,5 @@
 import { StrictUnion } from '@aws-amplify/core/internals/utils';
-import { StorageBucket } from '../providers/s3/types/options';
+import { CopyWithPathDestinationOptions, CopyWithPathSourceOptions } from '../providers/s3/types/options';
 import { StorageListAllOptions, StorageListPaginateOptions, StorageOptions } from './options';
 export type StorageOperationInput = StrictUnion<StorageOperationInputWithKey | StorageOperationInputWithPath>;
 export type StorageOperationInputWithPrefixPath = StrictUnion<StorageOperationInputWithPath | StorageOperationInputWithPrefix>;
@@ -44,12 +44,8 @@ export interface StorageCopyInputWithKey<SourceOptions extends StorageOptions, D
     destination: DestinationOptions;
 }
 export interface StorageCopyInputWithPath {
-    source: StorageOperationInputWithPath & {
-        bucket?: StorageBucket;
-    };
-    destination: StorageOperationInputWithPath & {
-        bucket?: StorageBucket;
-    };
+    source: StorageOperationInputWithPath & CopyWithPathSourceOptions;
+    destination: StorageOperationInputWithPath & CopyWithPathDestinationOptions;
 }
 /**
  * The data payload type for upload operation.

package/internals/package.json

@@ -0,0 +1,7 @@
+{
+	"name": "@aws-amplify/storage/internals",
+	"types": "../dist/esm/internals/index.d.ts",
+	"main": "../dist/cjs/internals/index.js",
+	"module": "../dist/esm/internals/index.mjs",
+	"sideEffects": false
+}