@aws-amplify/core 6.0.15 → 6.0.16-eslint-test.319d1b3.0

package/src/providers/pinpoint/utils/PinpointEventBuffer.ts

@@ -4,17 +4,18 @@
 import { ConsoleLogger } from '../../../Logger';
 import {
 	EventsBatch,
-	putEvents,
 	PutEventsInput,
 	PutEventsOutput,
+	putEvents,
 } from '../../../awsClients/pinpoint';
 import {
-	PinpointEventBufferConfig,
 	BufferedEvent,
 	BufferedEventMap,
 	EventBuffer,
+	PinpointEventBufferConfig,
 } from '../types/buffer';
 import { AuthSession } from '../../../singleton/Auth/types';
+
 import { isAppInForeground } from './isAppInForeground';
 
 const logger = new ConsoleLogger('PinpointEventBuffer');
@@ -110,16 +111,16 @@ export class PinpointEventBuffer {
 					region,
 					userAgentValue,
 				},
-				batchEventParams
+				batchEventParams,
 			);
 			this._processPutEventsSuccessResponse(data, eventMap);
 		} catch (err) {
-			return this._handlePutEventsFailure(err, eventMap);
+			this._handlePutEventsFailure(err, eventMap);
 		}
 	}
 
 	private _generateBatchEventParams(
-		eventMap: BufferedEventMap
+		eventMap: BufferedEventMap,
 	): PutEventsInput {
 		const batchItem: Record<string, EventsBatch> = {};
 
@@ -159,18 +160,17 @@ export class PinpointEventBuffer {
 		if (RETRYABLE_CODES.includes(statusCode)) {
 			const retryableEvents = Object.values(eventMap);
 			this._retry(retryableEvents);
-			return;
 		}
 	}
 
 	private _processPutEventsSuccessResponse(
 		data: PutEventsOutput,
-		eventMap: BufferedEventMap
+		eventMap: BufferedEventMap,
 	) {
 		const { Results = {} } = data.EventsResponse ?? {};
 		const retryableEvents: BufferedEvent[] = [];
 
-		Object.entries(Results).forEach(([endpointId, endpointValues]) => {
+		Object.entries(Results).forEach(([_, endpointValues]) => {
 			const responses = endpointValues.EventsItemResponse ?? {};
 
 			Object.entries(responses).forEach(([eventId, eventValues]) => {
@@ -181,25 +181,13 @@ export class PinpointEventBuffer {
 
 				const { StatusCode, Message } = eventValues ?? {};
 
-				// manually crafting handlers response to keep API consistant
-				const response = {
-					EventsResponse: {
-						Results: {
-							[endpointId]: {
-								EventsItemResponse: {
-									[eventId]: { StatusCode, Message },
-								},
-							},
-						},
-					},
-				};
-
 				if (StatusCode && ACCEPTED_CODES.includes(StatusCode)) {
 					return;
 				}
 
 				if (StatusCode && RETRYABLE_CODES.includes(StatusCode)) {
 					retryableEvents.push(eventObject);
+
 					return;
 				}
 
@@ -233,6 +221,7 @@ export class PinpointEventBuffer {
 					remainingAttempts: bufferedEvent.resendLimit,
 				});
 				eligibleEvents.push({ [eventId!]: bufferedEvent });
+
 				return;
 			}
 
@@ -250,6 +239,7 @@ export class PinpointEventBuffer {
 		return buffer.reduce((acc, curVal) => {
 			const [[key, value]] = Object.entries(curVal);
 			acc[key] = value;
+
 			return acc;
 		}, {});
 	}

package/src/providers/pinpoint/utils/cacheEndpointId.ts

@@ -3,6 +3,7 @@
 
 import { Cache } from '../../../Cache';
 import { SupportedCategory } from '../types';
+
 import { getCacheKey } from './getCacheKey';
 
 /**
@@ -13,13 +14,14 @@ import { getCacheKey } from './getCacheKey';
 export const cacheEndpointId = async (
 	appId: string,
 	category: SupportedCategory,
-	endpointId: string
+	endpointId: string,
 ): Promise<void> => {
 	const cacheKey = getCacheKey(appId, category);
 	// Set a longer TTL to avoid endpoint id being deleted after the default TTL (3 days)
 	// Also set its priority to the highest to reduce its chance of being deleted when cache is full
 	const ttl = 1000 * 60 * 60 * 24 * 365 * 100; // 100 years
 	const expiration = new Date().getTime() + ttl;
+
 	return Cache.setItem(cacheKey, endpointId, {
 		expires: expiration,
 		priority: 1,

package/src/providers/pinpoint/utils/getCacheKey.ts

@@ -12,5 +12,5 @@ const PROVIDER_NAME = 'pinpoint';
  */
 export const getCacheKey = (
 	appId: string,
-	category: SupportedCategory
+	category: SupportedCategory,
 ): string => `${category}:${PROVIDER_NAME}:${appId}`;

package/src/providers/pinpoint/utils/getEndpointId.ts

@@ -3,6 +3,7 @@
 
 import { Cache } from '../../../Cache';
 import { SupportedCategory } from '../types';
+
 import { getCacheKey } from './getCacheKey';
 
 /**
@@ -12,9 +13,10 @@ import { getCacheKey } from './getCacheKey';
  */
 export const getEndpointId = async (
 	appId: string,
-	category: SupportedCategory
+	category: SupportedCategory,
 ): Promise<string | undefined> => {
 	const cacheKey = getCacheKey(appId, category);
 	const cachedEndpointId = await Cache.getItem(cacheKey);
+
 	return cachedEndpointId ?? undefined;
 };

package/src/providers/pinpoint/utils/getEventBuffer.ts

@@ -2,9 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { EventBufferConfig } from '../types/buffer';
-import { PinpointEventBuffer } from './PinpointEventBuffer';
 import { AuthSession } from '../../../singleton/Auth/types';
 
+import { PinpointEventBuffer } from './PinpointEventBuffer';
+
 // Map of buffers by region -> appId
 const eventBufferMap: Record<string, Record<string, PinpointEventBuffer>> = {};
 

package/src/providers/pinpoint/utils/isAppInForeground.native.ts

@@ -1,7 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-// @ts-ignore: missing type definition
 import { AppState } from 'react-native';
 
 export const isAppInForeground = () => AppState.currentState === 'active';

package/src/providers/pinpoint/utils/resolveEndpointId.ts

@@ -5,6 +5,7 @@ import { assert } from '../../../errors';
 import { AmplifyErrorCode } from '../../../types';
 import { updateEndpoint } from '../apis/updateEndpoint';
 import { PinpointUpdateEndpointInput } from '../types';
+
 import { getEndpointId } from './getEndpointId';
 
 /**

package/src/singleton/Amplify.ts

@@ -1,21 +1,23 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { AuthClass } from './Auth';
-import { Hub, AMPLIFY_SYMBOL } from '../Hub';
+import { AMPLIFY_SYMBOL, Hub } from '../Hub';
+import { parseAWSExports } from '../parseAWSExports';
+import { deepFreeze } from '../utils';
+
 import {
 	AuthConfig,
 	LegacyConfig,
 	LibraryOptions,
 	ResourcesConfig,
 } from './types';
-import { parseAWSExports } from '../parseAWSExports';
-import { deepFreeze } from '../utils';
+import { AuthClass } from './Auth';
 import { ADD_OAUTH_LISTENER } from './constants';
 
 export class AmplifyClass {
 	private oAuthListener:
 		| ((authConfig: AuthConfig['Cognito']) => void)
 		| undefined = undefined;
+
 	resourcesConfig: ResourcesConfig;
 	libraryOptions: LibraryOptions;
 
@@ -47,7 +49,7 @@ export class AmplifyClass {
 	 */
 	configure(
 		resourcesConfig: ResourcesConfig | LegacyConfig,
-		libraryOptions?: LibraryOptions
+		libraryOptions?: LibraryOptions,
 	): void {
 		let resolvedResourceConfig: ResourcesConfig;
 
@@ -75,7 +77,7 @@ export class AmplifyClass {
 				data: this.resourcesConfig,
 			},
 			'Configure',
-			AMPLIFY_SYMBOL
+			AMPLIFY_SYMBOL,
 		);
 
 		this.notifyOAuthListener();

package/src/singleton/apis/fetchAuthSession.ts

@@ -1,10 +1,11 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { fetchAuthSession as fetchAuthSessionInternal } from './internal/fetchAuthSession';
 import { Amplify } from '../Amplify';
 import { FetchAuthSessionOptions } from '../Auth/types';
 
+import { fetchAuthSession as fetchAuthSessionInternal } from './internal/fetchAuthSession';
+
 export const fetchAuthSession = (options?: FetchAuthSessionOptions) => {
 	return fetchAuthSessionInternal(Amplify, options);
 };

package/src/singleton/apis/internal/fetchAuthSession.ts

@@ -6,7 +6,7 @@ import { AuthSession, FetchAuthSessionOptions } from '../../Auth/types';
 
 export const fetchAuthSession = (
 	amplify: AmplifyClass,
-	options?: FetchAuthSessionOptions
+	options?: FetchAuthSessionOptions,
 ): Promise<AuthSession> => {
 	return amplify.Auth.fetchAuthSession(options);
 };

package/src/singleton/apis/server/fetchAuthSession.ts

@@ -7,10 +7,10 @@ import { fetchAuthSession as fetchAuthSessionInternal } from '../internal/fetchA
 
 export const fetchAuthSession = (
 	contextSpec: AmplifyServer.ContextSpec,
-	options?: FetchAuthSessionOptions
+	options?: FetchAuthSessionOptions,
 ): Promise<AuthSession> => {
 	return fetchAuthSessionInternal(
 		getAmplifyServerContext(contextSpec).amplify,
-		options
+		options,
 	);
 };

package/src/singleton/types.ts

@@ -1,16 +1,20 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { APIConfig, LibraryAPIOptions } from './API/types';
+import {
+	APIConfig,
+	GraphQLProviderConfig,
+	LibraryAPIOptions,
+} from './API/types';
 import { AnalyticsConfig } from './Analytics/types';
 import {
 	AuthConfig,
-	LibraryAuthOptions,
-	AuthUserPoolConfig,
 	AuthIdentityPoolConfig,
 	AuthUserPoolAndIdentityPoolConfig,
-	GetCredentialsOptions,
+	AuthUserPoolConfig,
 	CognitoIdentityPoolConfig,
+	GetCredentialsOptions,
+	LibraryAuthOptions,
 } from './Auth/types';
 import { GeoConfig } from './Geo/types';
 import { PredictionsConfig } from './Predictions/types';
@@ -22,17 +26,17 @@ import {
 import { NotificationsConfig } from './Notifications/types';
 import { InteractionsConfig } from './Interactions/types';
 
-export type LegacyConfig = {
+export interface LegacyConfig {
 	/**
 	 * @deprecated The field should not be used.
 	 */
 	aws_project_region?: string;
-};
+}
 
 export type AtLeastOne<T, U = { [K in keyof T]: Pick<T, K> }> = Partial<T> &
 	U[keyof U];
 
-export type ResourcesConfig = {
+export interface ResourcesConfig {
 	API?: APIConfig;
 	Analytics?: AnalyticsConfig;
 	Auth?: AuthConfig;
@@ -41,14 +45,14 @@ export type ResourcesConfig = {
 	Predictions?: PredictionsConfig;
 	Storage?: StorageConfig;
 	Geo?: GeoConfig;
-};
+}
 
-export type LibraryOptions = {
+export interface LibraryOptions {
 	API?: LibraryAPIOptions;
 	Auth?: LibraryAuthOptions;
 	Storage?: LibraryStorageOptions;
 	ssr?: boolean;
-};
+}
 
 export {
 	APIConfig,
@@ -57,6 +61,7 @@ export {
 	AuthIdentityPoolConfig,
 	AuthUserPoolAndIdentityPoolConfig,
 	GetCredentialsOptions,
+	GraphQLProviderConfig,
 	InteractionsConfig,
 	PredictionsConfig,
 	StorageAccessLevel,

package/src/types/core.ts

@@ -15,7 +15,7 @@ export interface AmplifyConfig {
 	ssr?: boolean;
 }
 
-export type UserProfile = {
+export interface UserProfile {
 	customProperties?: Record<string, string[]>;
 	demographic?: {
 		appVersion?: string;
@@ -39,7 +39,7 @@ export type UserProfile = {
 	metrics?: Record<string, number>;
 	name?: string;
 	plan?: string;
-};
+}
 
 /**
  * @internal
@@ -47,5 +47,5 @@ export type UserProfile = {
 export type DelayFunction = (
 	attempt: number,
 	args?: any[],
-	error?: unknown
+	error?: unknown,
 ) => number | false;

package/src/types/errors.ts

@@ -7,12 +7,12 @@ export enum AmplifyErrorCode {
 	Unknown = 'Unknown',
 }
 
-export type AmplifyErrorParams<ErrorCode extends string = string> = {
+export interface AmplifyErrorParams<ErrorCode extends string = string> {
 	message: string;
 	name: ErrorCode;
 	recoverySuggestion?: string;
 	underlyingError?: Error | unknown;
-};
+}
 
 export type AmplifyErrorMap<ErrorCode extends string = string> = {
 	[name in ErrorCode]: {
@@ -21,13 +21,13 @@ export type AmplifyErrorMap<ErrorCode extends string = string> = {
 	};
 };
 
-export type ServiceError = {
+export interface ServiceError {
 	name: string;
 	message: string;
-};
+}
 
 export type AssertionFunction<ErrorCode extends string = string> = (
 	assertion: boolean,
 	name: ErrorCode,
-	additionalContext?: string
+	additionalContext?: string,
 ) => asserts assertion;

package/src/types/storage.ts

@@ -10,7 +10,7 @@ export interface KeyValueStorageInterface {
 
 export type SameSite = 'strict' | 'lax' | 'none';
 
-export type CookieStorageData = {
+export interface CookieStorageData {
 	domain?: string;
 	path?: string;
 
@@ -20,4 +20,4 @@ export type CookieStorageData = {
 	expires?: number;
 	secure?: boolean;
 	sameSite?: SameSite;
-};
+}

package/src/utils/WordArray.ts

@@ -12,8 +12,8 @@ import { cryptoSecureRandomInt } from './cryptoSecureRandomInt';
  */
 function hexStringify(wordArray: WordArray): string {
 	// Shortcuts
-	const words = wordArray.words;
-	const sigBytes = wordArray.sigBytes;
+	const { words } = wordArray;
+	const { sigBytes } = wordArray;
 
 	// Convert
 	const hexChars: string[] = [];

package/src/utils/convert/base64/base64Encoder.ts

@@ -3,6 +3,7 @@
 
 import { getBtoa } from '../../globalHelpers';
 import { Base64Encoder } from '../types';
+
 import { bytesToString } from './bytesToString';
 
 export const base64Encoder: Base64Encoder = {

package/src/utils/convert/types.ts

@@ -8,7 +8,7 @@ export interface Base64EncoderConvertOptions {
 export interface Base64Encoder {
 	convert(
 		input: Uint8Array | string,
-		options?: Base64EncoderConvertOptions
+		options?: Base64EncoderConvertOptions,
 	): string;
 }
 

package/src/utils/cryptoSecureRandomInt.ts

@@ -10,5 +10,6 @@ import { getCrypto } from './globalHelpers';
 export function cryptoSecureRandomInt() {
 	const crypto = getCrypto();
 	const randomResult = crypto.getRandomValues(new Uint32Array(1))[0];
+
 	return randomResult;
 }

package/src/utils/deDupeAsyncFunction.ts

@@ -1,14 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-// this will make the tsc-compliance-test to pass
-type Awaited<T> = T extends null | undefined
-	? T // special case for `null | undefined` when not in `--strictNullChecks` mode
-	: T extends object & { then(onfulfilled: infer F, ...args: infer _): any } // `await` only unwraps object types with a callable `then`. Non-object types are not unwrapped
-	  ? F extends (value: infer V, ...args: infer _) => any // if the argument to `then` is callable, extracts the first argument
-			? Awaited<V> // recursively unwrap the value
-			: never // the argument to `then` was not callable
-	  : T; //
 /**
  * returns in-flight promise if there is one
  *
@@ -16,21 +8,24 @@ type Awaited<T> = T extends null | undefined
  * @returns - the return type of the callback
  */
 export const deDupeAsyncFunction = <A extends any[], R>(
-	asyncFunction: (...args: A) => Promise<R>
+	asyncFunction: (...args: A) => Promise<R>,
 ) => {
-	let inflightPromise: Promise<Awaited<R>> | undefined;
-	return async (...args: A): Promise<Awaited<R>> => {
+	let inflightPromise: Promise<R> | undefined;
+
+	return async (...args: A): Promise<R> => {
 		if (inflightPromise) return inflightPromise;
 
-		inflightPromise = new Promise(async (resolve, reject) => {
-			try {
-				const result = await asyncFunction(...args);
-				resolve(result);
-			} catch (error) {
-				reject(error);
-			} finally {
-				inflightPromise = undefined;
-			}
+		inflightPromise = new Promise<R>((resolve, reject) => {
+			asyncFunction(...args)
+				.then(result => {
+					resolve(result);
+				})
+				.catch(error => {
+					reject(error);
+				})
+				.finally(() => {
+					inflightPromise = undefined;
+				});
 		});
 
 		return inflightPromise;

package/src/utils/generateRandomString.ts

@@ -8,7 +8,7 @@ export const generateRandomString = (length: number) => {
 
 	for (let i = 0; i < length; i++) {
 		result += STATE_CHARSET.charAt(
-			Math.floor(Math.random() * STATE_CHARSET.length)
+			Math.floor(Math.random() * STATE_CHARSET.length),
 		);
 	}
 

package/src/utils/getClientInfo/getClientInfo.android.ts

@@ -1,7 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-// @ts-ignore: missing type definition
-import { Platform, Dimensions } from 'react-native';
+
+import { Dimensions, Platform } from 'react-native';
+
 import { ConsoleLogger } from '../../Logger';
 
 const logger = new ConsoleLogger('getClientInfo');

package/src/utils/getClientInfo/getClientInfo.ios.ts

@@ -1,7 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-// @ts-ignore: missing type definition
-import { Platform, Dimensions } from 'react-native';
+
+import { Dimensions, Platform } from 'react-native';
+
 import { ConsoleLogger } from '../../Logger';
 
 const logger = new ConsoleLogger('getClientInfo');
@@ -12,6 +13,7 @@ export const getClientInfo = () => {
 	const OS = 'ios';
 	const { Version } = Platform;
 	const { make, model } = dimToMake(dim);
+
 	return {
 		platform: OS,
 		version: String(Version),

package/src/utils/getClientInfo/getClientInfo.ts

@@ -50,7 +50,7 @@ function browserTimezone() {
 function getBrowserType(userAgent: string) {
 	// The latest user agents for Opera: https://www.whatismybrowser.com/guides/the-latest-user-agent/opera
 	const operaMatch = /.+(Opera[\s[A-Z]*|OPR[\sA-Z]*)\/([0-9.]+).*/i.exec(
-		userAgent
+		userAgent,
 	);
 	if (operaMatch) {
 		return { type: operaMatch[1], version: operaMatch[2] };
@@ -58,7 +58,7 @@ function getBrowserType(userAgent: string) {
 
 	// The latest user agents for Edge: https://www.whatismybrowser.com/guides/the-latest-user-agent/edge
 	const ieMatch = /.+(Trident|Edge|Edg|EdgA|EdgiOS)\/([0-9.]+).*/i.exec(
-		userAgent
+		userAgent,
 	);
 	if (ieMatch) {
 		return { type: ieMatch[1], version: ieMatch[2] };
@@ -68,7 +68,7 @@ function getBrowserType(userAgent: string) {
 	// https://www.whatismybrowser.com/guides/the-latest-user-agent/firefox
 	// https://www.whatismybrowser.com/guides/the-latest-user-agent/chrome
 	const cfMatch = /.+(Chrome|CriOS|Firefox|FxiOS)\/([0-9.]+).*/i.exec(
-		userAgent
+		userAgent,
 	);
 	if (cfMatch) {
 		return { type: cfMatch[1], version: cfMatch[2] };

package/src/utils/globalHelpers/index.native.ts

@@ -1,7 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { loadGetRandomValues, loadBase64 } from '@aws-amplify/react-native';
+import { loadBase64, loadGetRandomValues } from '@aws-amplify/react-native';
+
 import { AmplifyError } from '../../errors';
 
 loadGetRandomValues();

package/src/utils/haveCredentialsChanged.ts

@@ -5,10 +5,13 @@ import { AWSCredentials } from '../libraryUtils';
 
 /**
  * Utility for determining if credentials have changed.
- * 
+ *
  * @internal
  */
-export const haveCredentialsChanged = (cachedCredentials: AWSCredentials, credentials: AWSCredentials) => {
+export const haveCredentialsChanged = (
+	cachedCredentials: AWSCredentials,
+	credentials: AWSCredentials,
+) => {
 	return (
 		cachedCredentials.accessKeyId !== credentials.accessKeyId ||
 		cachedCredentials.sessionToken !== credentials.sessionToken ||

package/src/utils/isWebWorker.ts

@@ -6,6 +6,7 @@ export const isWebWorker = () => {
 		return false;
 	}
 	const selfContext = self as { WorkerGlobalScope?: any };
+
 	return (
 		typeof selfContext.WorkerGlobalScope !== 'undefined' &&
 		self instanceof selfContext.WorkerGlobalScope