@aws-amplify/api-rest 4.0.17-unstable.e316a2e.0 → 4.0.17

package/src/utils/createCancellableOperation.ts

@@ -2,8 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { HttpResponse } from '@aws-amplify/core/internals/aws-client-utils';
+
 import { CanceledError } from '../errors';
 import { Operation } from '../types';
+
 import { parseRestApiServiceError } from './serviceError';
 import { logger } from './logger';
 
@@ -13,7 +15,7 @@ import { logger } from './logger';
  */
 export function createCancellableOperation(
 	handler: () => Promise<HttpResponse>,
-	abortController: AbortController
+	abortController: AbortController,
 ): Promise<HttpResponse>;
 
 /**
@@ -21,7 +23,7 @@ export function createCancellableOperation(
  * @internal
  */
 export function createCancellableOperation(
-	handler: (signal: AbortSignal) => Promise<HttpResponse>
+	handler: (signal: AbortSignal) => Promise<HttpResponse>,
 ): Operation<HttpResponse>;
 
 /**
@@ -31,13 +33,13 @@ export function createCancellableOperation(
 	handler:
 		| ((signal: AbortSignal) => Promise<HttpResponse>)
 		| (() => Promise<HttpResponse>),
-	abortController?: AbortController
+	abortController?: AbortController,
 ): Operation<HttpResponse> | Promise<HttpResponse> {
 	const isInternalPost = (
-		handler:
+		targetHandler:
 			| ((signal: AbortSignal) => Promise<HttpResponse>)
-			| (() => Promise<HttpResponse>)
-	): handler is () => Promise<HttpResponse> => !!abortController;
+			| (() => Promise<HttpResponse>),
+	): targetHandler is () => Promise<HttpResponse> => !!abortController;
 
 	// For creating a cancellable operation for public REST APIs, we need to create an AbortController
 	// internally. Whereas for internal POST APIs, we need to accept in the AbortController from the
@@ -56,6 +58,7 @@ export function createCancellableOperation(
 			if (response.statusCode >= 300) {
 				throw await parseRestApiServiceError(response)!;
 			}
+
 			return response;
 		} catch (error: any) {
 			const abortSignal = internalPostAbortSignal ?? publicApisAbortSignal;
@@ -87,6 +90,7 @@ export function createCancellableOperation(
 				abortReason = abortMessage;
 			}
 		};
+
 		return { response: job(), cancel };
 	}
 }

package/src/utils/parseSigningInfo.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { AmplifyClassV6 } from '@aws-amplify/core';
+
 import {
 	APIG_HOSTNAME_PATTERN,
 	DEFAULT_IAM_SIGNING_REGION,
@@ -19,7 +20,7 @@ export const parseSigningInfo = (
 	restApiOptions?: {
 		amplify: AmplifyClassV6;
 		apiName: string;
-	}
+	},
 ) => {
 	const {
 		service: signingService = DEFAULT_REST_IAM_SIGNING_SERVICE,

package/src/utils/resolveApiUrl.ts

@@ -6,6 +6,7 @@ import {
 	AmplifyUrl,
 	AmplifyUrlSearchParams,
 } from '@aws-amplify/core/internals/utils';
+
 import {
 	RestApiError,
 	RestApiValidationErrorCode,
@@ -27,7 +28,7 @@ export const resolveApiUrl = (
 	amplify: AmplifyClassV6,
 	apiName: string,
 	path: string,
-	queryParams?: Record<string, string>
+	queryParams?: Record<string, string>,
 ): URL => {
 	const urlStr = amplify.getConfig()?.API?.REST?.[apiName]?.endpoint;
 	assertValidationError(!!urlStr, RestApiValidationErrorCode.InvalidApiName);
@@ -40,6 +41,7 @@ export const resolveApiUrl = (
 			});
 			url.search = new AmplifyUrlSearchParams(mergedQueryParams).toString();
 		}
+
 		return url;
 	} catch (error) {
 		throw new RestApiError({

package/src/utils/resolveHeaders.ts

@@ -3,10 +3,9 @@
 
 export const resolveHeaders = (
 	headers?: Record<string, string>,
-	body?: unknown
+	body?: unknown,
 ) => {
 	const normalizedHeaders: Record<string, string> = {};
-	const isFormData = body instanceof FormData;
 	for (const key in headers) {
 		normalizedHeaders[key.toLowerCase()] = headers[key];
 	}
@@ -22,5 +21,6 @@ export const resolveHeaders = (
 			delete normalizedHeaders['content-type'];
 		}
 	}
+
 	return normalizedHeaders;
 };

package/src/utils/serviceError.ts

@@ -19,7 +19,7 @@ import { RestApiError } from '../errors';
  *   be `UnknownError` and `Unknown error` respectively.
  */
 export const parseRestApiServiceError = async (
-	response?: HttpResponse
+	response?: HttpResponse,
 ): Promise<(RestApiError & MetadataBearer) | undefined> => {
 	if (!response) {
 		// Response is not considered an error.
@@ -28,9 +28,9 @@ export const parseRestApiServiceError = async (
 	const parsedAwsError = await parseAwsJsonError(stubErrorResponse(response));
 	if (!parsedAwsError) {
 		// Response is not considered an error.
-		return;
 	} else {
 		const bodyText = await response.body?.text();
+
 		return buildRestApiError(parsedAwsError, {
 			statusCode: response.statusCode,
 			headers: response.headers,
@@ -46,7 +46,7 @@ export const parseRestApiServiceError = async (
  * make sure we can read the error response body as a JSON, and may fall back to read as text if it is not a valid JSON.
  */
 const stubErrorResponse = (response: HttpResponse): HttpResponse => {
-	let bodyTextPromise: Promise<string> | undefined = undefined;
+	let bodyTextPromise: Promise<string> | undefined;
 	const bodyProxy = new Proxy(response.body, {
 		get(target, prop, receiver) {
 			if (prop === 'json') {
@@ -69,6 +69,7 @@ const stubErrorResponse = (response: HttpResponse): HttpResponse => {
 					if (!bodyTextPromise) {
 						bodyTextPromise = target.text();
 					}
+
 					return bodyTextPromise;
 				};
 			} else {
@@ -85,6 +86,7 @@ const stubErrorResponse = (response: HttpResponse): HttpResponse => {
 			}
 		},
 	});
+
 	return responseProxy;
 };
 
@@ -93,7 +95,7 @@ const stubErrorResponse = (response: HttpResponse): HttpResponse => {
  */
 const buildRestApiError = (
 	error: Error & MetadataBearer,
-	response?: ApiErrorResponse
+	response?: ApiErrorResponse,
 ): RestApiError & MetadataBearer => {
 	const restApiError = new RestApiError({
 		name: error?.name,
@@ -101,6 +103,7 @@ const buildRestApiError = (
 		underlyingError: error,
 		response,
 	});
+
 	// $metadata is only required for backwards compatibility.
 	return Object.assign(restApiError, { $metadata: error.$metadata });
 };