@aws-amplify/storage 6.0.17-unstable.e316a2e.0 → 6.0.17

package/src/providers/s3/utils/client/listParts.ts

@@ -12,20 +12,21 @@ import {
 	AmplifyUrlSearchParams,
 } from '@aws-amplify/core/internals/utils';
 import { composeServiceApi } from '@aws-amplify/core/internals/aws-client-utils/composers';
+
 import type {
+	CompletedPart,
 	ListPartsCommandInput,
 	ListPartsCommandOutput,
-	CompletedPart,
 } from './types';
 import { defaultConfig } from './base';
 import {
 	buildStorageServiceError,
+	deserializeNumber,
 	emptyArrayGuard,
 	map,
 	parseXmlBody,
 	parseXmlError,
 	s3TransferHandler,
-	deserializeNumber,
 	serializePathnameObjectKey,
 	validateS3RequiredParameter,
 } from './utils';
@@ -42,7 +43,7 @@ export type ListPartsOutput = Pick<
 
 const listPartsSerializer = async (
 	input: ListPartsInput,
-	endpoint: Endpoint
+	endpoint: Endpoint,
 ): Promise<HttpRequest> => {
 	const headers = {};
 	const url = new AmplifyUrl(endpoint.url.toString());
@@ -52,6 +53,7 @@ const listPartsSerializer = async (
 	url.search = new AmplifyUrlSearchParams({
 		uploadId: input.UploadId,
 	}).toString();
+
 	return {
 		method: 'GET',
 		headers,
@@ -60,7 +62,7 @@ const listPartsSerializer = async (
 };
 
 const listPartsDeserializer = async (
-	response: HttpResponse
+	response: HttpResponse,
 ): Promise<ListPartsOutput> => {
 	if (response.statusCode >= 300) {
 		const error = (await parseXmlError(response)) as Error;
@@ -74,6 +76,7 @@ const listPartsDeserializer = async (
 				value => emptyArrayGuard(value, deserializeCompletedPartList),
 			],
 		});
+
 		return {
 			$metadata: parseMetadata(response),
 			...contents,
@@ -87,12 +90,12 @@ const deserializeCompletedPartList = (input: any[]): CompletedPart[] =>
 			PartNumber: ['PartNumber', deserializeNumber],
 			ETag: 'ETag',
 			Size: ['Size', deserializeNumber],
-		})
+		}),
 	);
 
 export const listParts = composeServiceApi(
 	s3TransferHandler,
 	listPartsSerializer,
 	listPartsDeserializer,
-	{ ...defaultConfig, responseType: 'text' }
+	{ ...defaultConfig, responseType: 'text' },
 );

package/src/providers/s3/utils/client/putObject.ts

@@ -13,14 +13,14 @@ import { composeServiceApi } from '@aws-amplify/core/internals/aws-client-utils/
 import { defaultConfig } from './base';
 import type { PutObjectCommandInput, PutObjectCommandOutput } from './types';
 import {
-	buildStorageServiceError,
-	validateS3RequiredParameter,
 	assignStringVariables,
+	buildStorageServiceError,
 	map,
 	parseXmlError,
 	s3TransferHandler,
 	serializeObjectConfigsToHeaders,
 	serializePathnameObjectKey,
+	validateS3RequiredParameter,
 } from './utils';
 
 export type PutObjectInput = Pick<
@@ -48,7 +48,7 @@ export type PutObjectOutput = Pick<
 
 const putObjectSerializer = async (
 	input: PutObjectInput,
-	endpoint: Endpoint
+	endpoint: Endpoint,
 ): Promise<HttpRequest> => {
 	const headers = {
 		...(await serializeObjectConfigsToHeaders({
@@ -60,6 +60,7 @@ const putObjectSerializer = async (
 	const url = new AmplifyUrl(endpoint.url.toString());
 	validateS3RequiredParameter(!!input.Key, 'Key');
 	url.pathname = serializePathnameObjectKey(url, input.Key);
+
 	return {
 		method: 'PUT',
 		headers,
@@ -69,7 +70,7 @@ const putObjectSerializer = async (
 };
 
 const putObjectDeserializer = async (
-	response: HttpResponse
+	response: HttpResponse,
 ): Promise<PutObjectOutput> => {
 	if (response.statusCode >= 300) {
 		const error = (await parseXmlError(response)) as Error;
@@ -89,5 +90,5 @@ export const putObject = composeServiceApi(
 	s3TransferHandler,
 	putObjectSerializer,
 	putObjectDeserializer,
-	{ ...defaultConfig, responseType: 'text' }
+	{ ...defaultConfig, responseType: 'text' },
 );

package/src/providers/s3/utils/client/runtime/base64/index.browser.ts

@@ -3,6 +3,7 @@
 
 function bytesToBase64(bytes: Uint8Array): string {
 	const base64Str = Array.from(bytes, x => String.fromCodePoint(x)).join('');
+
 	return btoa(base64Str);
 }
 
@@ -16,6 +17,6 @@ export function toBase64(input: string | ArrayBufferView): string {
 	}
 
 	return bytesToBase64(
-		new Uint8Array(input.buffer, input.byteOffset, input.byteLength)
+		new Uint8Array(input.buffer, input.byteOffset, input.byteLength),
 	);
 }

package/src/providers/s3/utils/client/runtime/base64/index.native.ts

@@ -12,5 +12,5 @@ export function toBase64(input: string | ArrayBufferView): string {
 		return Buffer.from(input, 'utf-8').toString('base64');
 	}
 
-	return new Buffer(input.buffer).toString('base64');
+	return Buffer.from(input.buffer).toString('base64');
 }

package/src/providers/s3/utils/client/runtime/contentSha256middleware.ts

@@ -3,10 +3,11 @@
 
 import {
 	HttpRequest,
-	getHashedPayload,
-	MiddlewareHandler,
 	HttpResponse,
+	MiddlewareHandler,
+	getHashedPayload,
 } from '@aws-amplify/core/internals/aws-client-utils';
+
 import { CONTENT_SHA256_HEADER } from './constants';
 
 /**
@@ -16,14 +17,15 @@ import { CONTENT_SHA256_HEADER } from './constants';
  *
  * @internal
  */
-export const contentSha256Middleware =
-	(options: {}) => (next: MiddlewareHandler<HttpRequest, HttpResponse>) =>
+export const contentSha256MiddlewareFactory =
+	() => (next: MiddlewareHandler<HttpRequest, HttpResponse>) =>
 		async function contentSha256Middleware(request: HttpRequest) {
 			if (request.headers[CONTENT_SHA256_HEADER]) {
 				return next(request);
 			} else {
 				const hash = await getHashedPayload(request.body);
 				request.headers[CONTENT_SHA256_HEADER] = hash;
+
 				return next(request);
 			}
 		};

package/src/providers/s3/utils/client/runtime/s3TransferHandler/fetch.ts

@@ -6,9 +6,11 @@ import {
 	HttpResponse,
 	authenticatedHandler,
 } from '@aws-amplify/core/internals/aws-client-utils';
-import type { s3TransferHandler as s3BrowserTransferhandler } from './xhr';
 import { composeTransferHandler } from '@aws-amplify/core/internals/aws-client-utils/composers';
-import { contentSha256Middleware } from '../contentSha256middleware';
+
+import { contentSha256MiddlewareFactory } from '../contentSha256middleware';
+
+import type { s3TransferHandler as s3BrowserTransferHandler } from './xhr';
 
 /**
  * S3 transfer handler for node based on Node-fetch. On top of basic transfer handler, it also supports
@@ -16,10 +18,10 @@ import { contentSha256Middleware } from '../contentSha256middleware';
  *
  * @internal
  */
-export const s3TransferHandler: typeof s3BrowserTransferhandler =
+export const s3TransferHandler: typeof s3BrowserTransferHandler =
 	composeTransferHandler<
-		[{}],
+		[object],
 		HttpRequest,
 		HttpResponse,
 		typeof authenticatedHandler
-	>(authenticatedHandler, [contentSha256Middleware]);
+	>(authenticatedHandler, [contentSha256MiddlewareFactory]);

package/src/providers/s3/utils/client/runtime/s3TransferHandler/xhr.ts

@@ -2,18 +2,18 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import {
-	retryMiddleware,
+	HttpRequest,
+	HttpResponse,
 	RetryOptions,
-	signingMiddleware,
 	SigningOptions,
-	userAgentMiddleware,
 	UserAgentOptions,
-	HttpRequest,
-	HttpResponse,
+	retryMiddlewareFactory,
+	signingMiddlewareFactory,
+	userAgentMiddlewareFactory,
 } from '@aws-amplify/core/internals/aws-client-utils';
 import { composeTransferHandler } from '@aws-amplify/core/internals/aws-client-utils/composers';
 
-import { contentSha256Middleware } from '../contentSha256middleware';
+import { contentSha256MiddlewareFactory } from '../contentSha256middleware';
 import { xhrTransferHandler } from '../xhrTransferHandler';
 
 /**
@@ -23,13 +23,13 @@ import { xhrTransferHandler } from '../xhrTransferHandler';
  * @internal
  */
 export const s3TransferHandler = composeTransferHandler<
-	[{}, UserAgentOptions, RetryOptions<HttpResponse>, SigningOptions],
+	[object, UserAgentOptions, RetryOptions<HttpResponse>, SigningOptions],
 	HttpRequest,
 	HttpResponse,
 	typeof xhrTransferHandler
 >(xhrTransferHandler, [
-	contentSha256Middleware,
-	userAgentMiddleware,
-	retryMiddleware,
-	signingMiddleware,
+	contentSha256MiddlewareFactory,
+	userAgentMiddlewareFactory,
+	retryMiddlewareFactory,
+	signingMiddlewareFactory,
 ]);

package/src/providers/s3/utils/client/runtime/xhrTransferHandler.ts

@@ -4,11 +4,15 @@
 import {
 	HttpRequest,
 	HttpResponse,
-	TransferHandler,
 	ResponseBodyMixin,
+	TransferHandler,
 	withMemoization,
 } from '@aws-amplify/core/internals/aws-client-utils';
 import { ConsoleLogger } from '@aws-amplify/core';
+
+import { TransferProgressEvent } from '../../../../../types/common';
+import { CanceledError } from '../../../../../errors/CanceledError';
+
 import {
 	ABORT_ERROR_CODE,
 	ABORT_ERROR_MESSAGE,
@@ -17,8 +21,6 @@ import {
 	NETWORK_ERROR_CODE,
 	NETWORK_ERROR_MESSAGE,
 } from './constants';
-import { TransferProgressEvent } from '../../../../../types/common';
-import { CanceledError } from '../../../../../errors/CanceledError';
 
 const logger = new ConsoleLogger('xhr-http-handler');
 
@@ -30,8 +32,8 @@ export interface XhrTransferHandlerOptions {
 	// download binary data. Otherwise, use `text` to return the response as a string.
 	responseType: 'text' | 'blob';
 	abortSignal?: AbortSignal;
-	onDownloadProgress?: (event: TransferProgressEvent) => void;
-	onUploadProgress?: (event: TransferProgressEvent) => void;
+	onDownloadProgress?(event: TransferProgressEvent): void;
+	onUploadProgress?(event: TransferProgressEvent): void;
 }
 
 /**
@@ -80,7 +82,7 @@ export const xhrTransferHandler: TransferHandler<
 		xhr.addEventListener('error', () => {
 			const networkError = buildHandlerError(
 				NETWORK_ERROR_MESSAGE,
-				NETWORK_ERROR_CODE
+				NETWORK_ERROR_CODE,
 			);
 			logger.error(NETWORK_ERROR_MESSAGE);
 			reject(networkError);
@@ -111,24 +113,25 @@ export const xhrTransferHandler: TransferHandler<
 				// The load event is triggered after the error/abort/load event. So we need to check if the xhr is null.
 				if (!xhr) return;
 				const responseHeaders = convertResponseHeaders(
-					xhr.getAllResponseHeaders()
+					xhr.getAllResponseHeaders(),
 				);
-				const responseType = xhr.responseType;
+				const { responseType: loadEndResponseType } = xhr;
 				const responseBlob = xhr.response as Blob;
-				const responseText = responseType === 'text' ? xhr.responseText : '';
+				const responseText =
+					loadEndResponseType === 'text' ? xhr.responseText : '';
 				const bodyMixIn: ResponseBodyMixin = {
 					blob: () => Promise.resolve(responseBlob),
 					text: withMemoization(() =>
-						responseType === 'blob'
+						loadEndResponseType === 'blob'
 							? readBlobAsText(responseBlob)
-							: Promise.resolve(responseText)
+							: Promise.resolve(responseText),
 					),
 					json: () =>
 						Promise.reject(
 							// S3 does not support JSON response. So fail-fast here with nicer error message.
 							new Error(
-								'Parsing response to JSON is not implemented. Please use response.text() instead.'
-							)
+								'Parsing response to JSON is not implemented. Please use response.text() instead.',
+							),
 						),
 				};
 				const response: HttpResponse = {
@@ -184,7 +187,7 @@ export const xhrTransferHandler: TransferHandler<
 };
 
 const convertToTransferProgressEvent = (
-	event: ProgressEvent
+	event: ProgressEvent,
 ): TransferProgressEvent => ({
 	transferredBytes: event.loaded,
 	totalBytes: event.lengthComputable ? event.total : undefined,
@@ -193,6 +196,7 @@ const convertToTransferProgressEvent = (
 const buildHandlerError = (message: string, name: string): Error => {
 	const error = new Error(message);
 	error.name = name;
+
 	return error;
 };
 
@@ -205,6 +209,7 @@ const convertResponseHeaders = (xhrHeaders: string): Record<string, string> => {
 	if (!xhrHeaders) {
 		return {};
 	}
+
 	return xhrHeaders
 		.split('\r\n')
 		.reduce((headerMap: Record<string, string>, line: string) => {
@@ -212,12 +217,14 @@ const convertResponseHeaders = (xhrHeaders: string): Record<string, string> => {
 			const header = parts.shift()!;
 			const value = parts.join(': ');
 			headerMap[header.toLowerCase()] = value;
+
 			return headerMap;
 		}, {});
 };
 
 const readBlobAsText = (blob: Blob) => {
 	const reader = new FileReader();
+
 	return new Promise<string>((resolve, reject) => {
 		reader.onloadend = () => {
 			if (reader.readyState !== FileReader.DONE) {

package/src/providers/s3/utils/client/runtime/xmlParser/dom.ts

@@ -12,6 +12,7 @@ export const parser = {
 		const xml = domParser.parseFromString(xmlStr, 'text/xml');
 		const parsedObj = parseXmlNode(xml);
 		const rootKey = Object.keys(parsedObj)[0];
+
 		return parsedObj[rootKey];
 	},
 };
@@ -31,13 +32,12 @@ const parseXmlNode = (node: Node): any => {
 		// Node like <Location>foo</Location> will be converted to { Location: 'foo' }
 		// instead of { Location: { '#text': 'foo' } }.
 		if (isTextOnlyElementNode(node)) {
-			return node.childNodes[0]?.nodeValue!;
+			return node.childNodes[0].nodeValue!;
 		}
 
 		const nodeValue: Record<string, any> = {};
 		// convert attributes
-		for (let i = 0; i < node.attributes.length; i++) {
-			const attr = node.attributes[i];
+		for (const attr of node.attributes) {
 			if (!isNamespaceAttributeName(attr.nodeName)) {
 				nodeValue[attr.nodeName] = attr.nodeValue!;
 			}
@@ -45,8 +45,7 @@ const parseXmlNode = (node: Node): any => {
 
 		// convert child nodes
 		if (node.children.length > 0) {
-			for (let i = 0; i < node.children.length; i++) {
-				const child = node.children[i];
+			for (const child of node.children) {
 				const childValue = parseXmlNode(child);
 				if (childValue === undefined) {
 					continue;
@@ -79,12 +78,12 @@ const isTextOnlyElementNode = (node: Element): boolean =>
 	node.firstChild?.nodeType === Node.TEXT_NODE;
 
 const hasOnlyNamespaceAttributes = (node: Element): boolean => {
-	for (let i = 0; i < node.attributes.length; i++) {
-		const attr = node.attributes[i];
+	for (const attr of node.attributes) {
 		if (!isNamespaceAttributeName(attr.nodeName)) {
 			return false;
 		}
 	}
+
 	return true;
 };
 

package/src/providers/s3/utils/client/runtime/xmlParser/pureJs.ts

@@ -12,7 +12,7 @@ import { XMLParser } from 'fast-xml-parser';
  */
 export const parser = {
 	parse: (xmlStr: string): any => {
-		const parser = new XMLParser({
+		const xmlParser = new XMLParser({
 			attributeNamePrefix: '',
 			htmlEntities: true,
 			ignoreAttributes: false,
@@ -23,9 +23,9 @@ export const parser = {
 			tagValueProcessor: (_, val) =>
 				val.trim() === '' && val.includes('\n') ? '' : undefined,
 		});
-		parser.addEntity('#xD', '\r');
-		parser.addEntity('#10', '\n');
-		const parsedObj: any = parser.parse(xmlStr);
+		xmlParser.addEntity('#xD', '\r');
+		xmlParser.addEntity('#10', '\n');
+		const parsedObj: any = xmlParser.parse(xmlStr);
 		const textNodeName = '#text';
 		const key = Object.keys(parsedObj)[0];
 		const parsedObjToReturn = parsedObj[key];
@@ -33,6 +33,7 @@ export const parser = {
 			parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
 			delete parsedObjToReturn[textNodeName];
 		}
+
 		return getValueFromTextNode(parsedObjToReturn);
 	},
 };
@@ -45,11 +46,15 @@ export const parser = {
 const getValueFromTextNode = (obj: any) => {
 	const textNodeName = '#text';
 	for (const key in obj) {
-		if (obj.hasOwnProperty(key) && obj[key][textNodeName] !== undefined) {
+		if (
+			Object.prototype.hasOwnProperty.call(obj, key) &&
+			obj[key][textNodeName] !== undefined
+		) {
 			obj[key] = obj[key][textNodeName];
 		} else if (typeof obj[key] === 'object' && obj[key] !== null) {
 			obj[key] = getValueFromTextNode(obj[key]);
 		}
 	}
+
 	return obj;
 };

package/src/providers/s3/utils/client/types.ts

@@ -112,8 +112,7 @@ declare const TaggingDirective: {
  *
  * The input for {@link AbortMultipartUploadCommand}.
  */
-export interface AbortMultipartUploadCommandInput
-	extends AbortMultipartUploadRequest {}
+export type AbortMultipartUploadCommandInput = AbortMultipartUploadRequest;
 /**
  * @public
  *
@@ -183,8 +182,8 @@ export interface CommonPrefix {
  *
  * The input for {@link CompleteMultipartUploadCommand}.
  */
-export interface CompleteMultipartUploadCommandInput
-	extends CompleteMultipartUploadRequest {}
+export type CompleteMultipartUploadCommandInput =
+	CompleteMultipartUploadRequest;
 /**
  * @public
  *
@@ -429,7 +428,7 @@ export interface CompletedPart {
  *
  * The input for {@link CopyObjectCommand}.
  */
-export interface CopyObjectCommandInput extends CopyObjectRequest {}
+export type CopyObjectCommandInput = CopyObjectRequest;
 /**
  * @public
  *
@@ -787,8 +786,7 @@ export interface CopyObjectResult {
  *
  * The input for {@link CreateMultipartUploadCommand}.
  */
-export interface CreateMultipartUploadCommandInput
-	extends CreateMultipartUploadRequest {}
+export type CreateMultipartUploadCommandInput = CreateMultipartUploadRequest;
 /**
  * @public
  *
@@ -1045,7 +1043,7 @@ export interface CreateMultipartUploadRequest {
  *
  * The input for {@link DeleteObjectCommand}.
  */
-export interface DeleteObjectCommandInput extends DeleteObjectRequest {}
+export type DeleteObjectCommandInput = DeleteObjectRequest;
 /**
  * @public
  *
@@ -1124,7 +1122,7 @@ export interface DeleteObjectRequest {
  *
  * The input for {@link GetObjectCommand}.
  */
-export interface GetObjectCommandInput extends GetObjectRequest {}
+export type GetObjectCommandInput = GetObjectRequest;
 /**
  * @public
  *
@@ -1441,7 +1439,7 @@ export interface GetObjectRequest {
  *
  * The input for {@link HeadObjectCommand}.
  */
-export interface HeadObjectCommandInput extends HeadObjectRequest {}
+export type HeadObjectCommandInput = HeadObjectRequest;
 /**
  * @public
  *
@@ -1790,7 +1788,7 @@ export interface Initiator {
  *
  * The input for {@link ListObjectsV2Command}.
  */
-export interface ListObjectsV2CommandInput extends ListObjectsV2Request {}
+export type ListObjectsV2CommandInput = ListObjectsV2Request;
 /**
  * @public
  *
@@ -1948,7 +1946,7 @@ export interface ListObjectsV2Request {
  *
  * The input for {@link ListPartsCommand}.
  */
-export interface ListPartsCommandInput extends ListPartsRequest {}
+export type ListPartsCommandInput = ListPartsRequest;
 /**
  * @public
  *
@@ -2202,7 +2200,7 @@ export interface Part {
 /**
  * This interface extends from `PutObjectRequest` interface. There are more parameters than `Body` defined in {@link PutObjectRequest}
  */
-export interface PutObjectCommandInput extends PutObjectCommandInputType {}
+export type PutObjectCommandInput = PutObjectCommandInputType;
 /**
  * @public
  *
@@ -2540,7 +2538,7 @@ export interface PutObjectRequest {
 /**
  * This interface extends from `UploadPartRequest` interface. There are more parameters than `Body` defined in {@link UploadPartRequest}
  */
-export interface UploadPartCommandInput extends UploadPartCommandInputType {}
+export type UploadPartCommandInput = UploadPartCommandInputType;
 /**
  * @public
  *

package/src/providers/s3/utils/client/uploadPart.ts

@@ -16,13 +16,13 @@ import { composeServiceApi } from '@aws-amplify/core/internals/aws-client-utils/
 import { defaultConfig } from './base';
 import type { UploadPartCommandInput, UploadPartCommandOutput } from './types';
 import {
-	buildStorageServiceError,
-	validateS3RequiredParameter,
 	assignStringVariables,
+	buildStorageServiceError,
 	map,
 	parseXmlError,
 	s3TransferHandler,
 	serializePathnameObjectKey,
+	validateS3RequiredParameter,
 } from './utils';
 
 // Content-length is ignored here because it's forbidden header
@@ -39,7 +39,7 @@ export type UploadPartOutput = Pick<
 
 const uploadPartSerializer = async (
 	input: UploadPartInput,
-	endpoint: Endpoint
+	endpoint: Endpoint,
 ): Promise<HttpRequest> => {
 	const headers = {
 		...assignStringVariables({ 'content-md5': input.ContentMD5 }),
@@ -54,6 +54,7 @@ const uploadPartSerializer = async (
 		partNumber: input.PartNumber + '',
 		uploadId: input.UploadId,
 	}).toString();
+
 	return {
 		method: 'PUT',
 		headers,
@@ -63,7 +64,7 @@ const uploadPartSerializer = async (
 };
 
 const uploadPartDeserializer = async (
-	response: HttpResponse
+	response: HttpResponse,
 ): Promise<UploadPartOutput> => {
 	if (response.statusCode >= 300) {
 		const error = (await parseXmlError(response)) as Error;
@@ -82,5 +83,5 @@ export const uploadPart = composeServiceApi(
 	s3TransferHandler,
 	uploadPartSerializer,
 	uploadPartDeserializer,
-	{ ...defaultConfig, responseType: 'text' }
+	{ ...defaultConfig, responseType: 'text' },
 );