@aws-amplify/core 6.0.16 → 6.0.17-unstable.3d2803e.0

package/src/storage/CookieStorage.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import JsCookie from 'js-cookie';
+
 import {
 	CookieStorageData,
 	KeyValueStorageInterface,
@@ -18,19 +19,23 @@ export class CookieStorage implements KeyValueStorageInterface {
 	constructor(data: CookieStorageData = {}) {
 		const { path, domain, expires, sameSite, secure } = data;
 		this.domain = domain;
-		this.path = path ? path : '/';
-		this.expires = data.hasOwnProperty('expires') ? expires : 365;
-		this.secure = data.hasOwnProperty('secure') ? secure : true;
+		this.path = path || '/';
+		this.expires = Object.prototype.hasOwnProperty.call(data, 'expires')
+			? expires
+			: 365;
+		this.secure = Object.prototype.hasOwnProperty.call(data, 'secure')
+			? secure
+			: true;
 
-		if (data.hasOwnProperty('sameSite')) {
+		if (Object.prototype.hasOwnProperty.call(data, 'sameSite')) {
 			if (!sameSite || !['strict', 'lax', 'none'].includes(sameSite)) {
 				throw new Error(
-					'The sameSite value of cookieStorage must be "lax", "strict" or "none".'
+					'The sameSite value of cookieStorage must be "lax", "strict" or "none".',
 				);
 			}
 			if (sameSite === 'none' && !this.secure) {
 				throw new Error(
-					'sameSite = None requires the Secure attribute in latest browser versions.'
+					'sameSite = None requires the Secure attribute in latest browser versions.',
 				);
 			}
 			this.sameSite = sameSite;
@@ -43,6 +48,7 @@ export class CookieStorage implements KeyValueStorageInterface {
 
 	async getItem(key: string) {
 		const item = JsCookie.get(key);
+
 		return item ?? null;
 	}
 

package/src/storage/DefaultStorage.native.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { loadAsyncStorage } from '@aws-amplify/react-native';
+
 import { KeyValueStorageInterface } from '../types';
 
 const MEMORY_KEY_PREFIX = '@MemoryStorage:';
@@ -51,8 +52,9 @@ export class DefaultStorage implements KeyValueStorageInterface {
 	 */
 	async clear(): Promise<void> {
 		const allKeys = await this.asyncStorage.getAllKeys();
+
 		return this.asyncStorage.multiRemove(
-			allKeys.filter(key => key.startsWith(MEMORY_KEY_PREFIX))
+			allKeys.filter(key => key.startsWith(MEMORY_KEY_PREFIX)),
 		);
 	}
 }

package/src/storage/InMemoryStorage.ts

@@ -15,6 +15,7 @@ export class InMemoryStorage implements Storage {
 		if (index > this.length - 1) {
 			return null;
 		}
+
 		return Array.from(this.storage.keys())[index];
 	}
 

package/src/storage/KeyValueStorage.ts

@@ -33,6 +33,7 @@ export class KeyValueStorage implements KeyValueStorageInterface {
 	 */
 	async getItem(key: string) {
 		if (!this.storage) throw new PlatformNotSupportedError();
+
 		return this.storage.getItem(key);
 	}
 

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

package/src/utils/queuedStorage/createQueuedStorage.native.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { loadAsyncStorage } from '@aws-amplify/react-native';
+
 import {
 	AddItemWithAuthPropertiesNative,
 	QueuedItem,
@@ -18,7 +19,7 @@ export const createQueuedStorage = (): QueuedStorage => {
 
 	const openDBPromise = new Promise<
 		ReturnType<typeof loadAsyncStorage> | undefined
-	>((resolve, _) => {
+	>((resolve, _reject) => {
 		try {
 			const asyncStorage = loadAsyncStorage();
 
@@ -28,9 +29,10 @@ export const createQueuedStorage = (): QueuedStorage => {
 					for (const item of items) {
 						currentBytesSize += item.bytesSize;
 					}
+
 					return undefined;
 				})
-				.then(_ => {
+				.then(__ => {
 					resolve(asyncStorage);
 				});
 		} catch (err) {
@@ -60,7 +62,7 @@ export const createQueuedStorage = (): QueuedStorage => {
 	return {
 		async add(
 			item,
-			{ dequeueBeforeEnqueue } = { dequeueBeforeEnqueue: false }
+			{ dequeueBeforeEnqueue } = { dequeueBeforeEnqueue: false },
 		) {
 			if (dequeueBeforeEnqueue) {
 				const itemsToDelete = await this.peek(1);
@@ -112,7 +114,7 @@ export const createQueuedStorage = (): QueuedStorage => {
 
 const getQueuedItemKeys = async (
 	as: ReturnType<typeof loadAsyncStorage>,
-	sortKeys: boolean = false
+	sortKeys = false,
 ): Promise<string[]> => {
 	const keys = (await as.getAllKeys()).filter(key => key.startsWith(keyPrefix));
 
@@ -120,6 +122,7 @@ const getQueuedItemKeys = async (
 		? keys.sort((a, b) => {
 				const timestampA = a.split('_').pop() as string;
 				const timestampB = b.split('_').pop() as string;
+
 				return parseInt(timestampA) - parseInt(timestampB);
 		  })
 		: keys;
@@ -127,7 +130,7 @@ const getQueuedItemKeys = async (
 
 const getQueuedItems = async (
 	as: ReturnType<typeof loadAsyncStorage>,
-	keys: string[]
+	keys: string[],
 ): Promise<QueuedItem[]> =>
 	(await as.multiGet(keys))
 		.filter((item): item is [string, string] => item[1] !== null)

package/src/utils/queuedStorage/createQueuedStorage.ts

@@ -46,6 +46,7 @@ export const createQueuedStorage = (): QueuedStorage => {
 		};
 	}).catch(err => {
 		error = err;
+
 		return undefined;
 	});
 
@@ -62,6 +63,7 @@ export const createQueuedStorage = (): QueuedStorage => {
 	const getStore = async (): Promise<IDBObjectStore> => {
 		const db = await getDB();
 		const transaction = db.transaction(STORE_NAME, 'readwrite');
+
 		return transaction.objectStore(STORE_NAME);
 	};
 
@@ -77,7 +79,7 @@ export const createQueuedStorage = (): QueuedStorage => {
 	return {
 		async add(
 			item,
-			{ dequeueBeforeEnqueue } = { dequeueBeforeEnqueue: false }
+			{ dequeueBeforeEnqueue } = { dequeueBeforeEnqueue: false },
 		) {
 			if (dequeueBeforeEnqueue) {
 				const itemsToDelete = await this.peek(1);
@@ -115,11 +117,13 @@ export const createQueuedStorage = (): QueuedStorage => {
 			const keyRangesToDelete = findRanges(
 				items
 					.map(item => item.id)
-					.filter((id): id is number => id !== undefined)
+					.filter((id): id is number => id !== undefined),
 			).map(([lower, upper]) => IDBKeyRange.bound(lower, upper));
 
 			await Promise.all(
-				keyRangesToDelete.map(range => promisifyIDBRequest(store.delete(range)))
+				keyRangesToDelete.map(range =>
+					promisifyIDBRequest(store.delete(range)),
+				),
 			);
 
 			for (const item of items) {

package/src/utils/queuedStorage/types.ts

@@ -35,7 +35,7 @@ export interface AddItemWithAuthPropertiesNative
 export interface QueuedStorage {
 	add(
 		item: ItemToAdd,
-		options?: { dequeueBeforeEnqueue: boolean }
+		options?: { dequeueBeforeEnqueue: boolean },
 	): Promise<void>;
 	peek(n?: number): Promise<QueuedItem[]>;
 	peekAll(): Promise<QueuedItem[]>;

package/src/utils/retry/NonRetryableError.ts

@@ -3,7 +3,4 @@
 
 export class NonRetryableError extends Error {
 	public readonly nonRetryable = true;
-	constructor(message: string) {
-		super(message);
-	}
 }

package/src/utils/retry/isNonRetryableError.ts

@@ -5,5 +5,6 @@ import { NonRetryableError } from './NonRetryableError';
 
 export const isNonRetryableError = (obj: any): obj is NonRetryableError => {
 	const key: keyof NonRetryableError = 'nonRetryable';
+
 	return obj && obj[key];
 };

package/src/utils/retry/jitteredBackoff.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { DelayFunction } from '../../types';
+
 import { MAX_DELAY_MS } from './constants';
 
 /**
@@ -9,13 +10,14 @@ import { MAX_DELAY_MS } from './constants';
  * Internal use of Amplify only
  */
 export function jitteredBackoff(
-	maxDelayMs: number = MAX_DELAY_MS
+	maxDelayMs: number = MAX_DELAY_MS,
 ): DelayFunction {
 	const BASE_TIME_MS = 100;
 	const JITTER_FACTOR = 100;
 
 	return attempt => {
 		const delay = 2 ** attempt * BASE_TIME_MS + JITTER_FACTOR * Math.random();
+
 		return delay > maxDelayMs ? false : delay;
 	};
 }

package/src/utils/retry/jitteredExponentialRetry.ts

@@ -13,6 +13,6 @@ export const jitteredExponentialRetry = <T>(
 	functionToRetry: (...args: any[]) => T,
 	args: any[],
 	maxDelayMs: number = MAX_DELAY_MS,
-	onTerminate?: Promise<void>
+	onTerminate?: Promise<void>,
 ): Promise<T> =>
 	retry(functionToRetry, args, jitteredBackoff(maxDelayMs), onTerminate);

package/src/utils/retry/retry.ts

@@ -3,6 +3,7 @@
 
 import { DelayFunction } from '../../types';
 import { ConsoleLogger } from '../../Logger/ConsoleLogger';
+
 import { isNonRetryableError } from './isNonRetryableError';
 
 const logger = new ConsoleLogger('retryUtil');
@@ -15,17 +16,21 @@ export async function retry<T>(
 	functionToRetry: (...args: any[]) => T,
 	args: any[],
 	delayFn: DelayFunction,
-	onTerminate?: Promise<void>
+	onTerminate?: Promise<void>,
 ): Promise<T> {
 	if (typeof functionToRetry !== 'function') {
 		throw Error('functionToRetry must be a function');
 	}
 
+	// TODO(eslint): remove this linter suppression with refactoring.
+	// eslint-disable-next-line no-async-promise-executor
 	return new Promise(async (resolve, reject) => {
 		let attempt = 0;
 		let terminated = false;
 		let timeout: any;
-		let wakeUp: any = () => {}; // will be replaced with a resolver()
+		let wakeUp: any = () => {
+			// no-op
+		}; // will be replaced with a resolver()
 
 		// used after the loop if terminated while waiting for a timer.
 		let lastError: unknown;
@@ -40,24 +45,31 @@ export async function retry<T>(
 				wakeUp();
 			});
 
+		// TODO(eslint): remove this linter suppression with refactoring.
+		// eslint-disable-next-line no-unmodified-loop-condition
 		while (!terminated) {
 			attempt++;
 
 			logger.debug(
 				`${
 					functionToRetry.name
-				} attempt #${attempt} with this vars: ${JSON.stringify(args)}`
+				} attempt #${attempt} with this vars: ${JSON.stringify(args)}`,
 			);
 
 			try {
-				return resolve(await functionToRetry(...args));
+				resolve(await functionToRetry(...args));
+
+				return;
 			} catch (err) {
 				lastError = err;
 				logger.debug(`error on ${functionToRetry.name}`, err);
 
 				if (isNonRetryableError(err)) {
 					logger.debug(`${functionToRetry.name} non retryable error`, err);
-					return reject(err);
+
+					reject(err);
+
+					return;
 				}
 
 				const retryIn = delayFn(attempt, args, err);
@@ -66,10 +78,12 @@ export async function retry<T>(
 				// we check `terminated` again here because it could have flipped
 				// in the time it took `functionToRetry` to return.
 				if (retryIn === false || terminated) {
-					return reject(err);
+					reject(err);
+
+					return;
 				} else {
-					await new Promise(r => {
-						wakeUp = r; // export wakeUp for onTerminate handling
+					await new Promise(_resolve => {
+						wakeUp = _resolve; // export wakeUp for onTerminate handling
 						timeout = setTimeout(wakeUp, retryIn);
 					});
 				}

package/src/utils/sessionListener/SessionListener.native.ts

@@ -2,10 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { loadAppState } from '@aws-amplify/react-native';
+
 import {
-	SessionStateChangeListener,
-	SessionState,
 	SessionListenerInterface,
+	SessionState,
+	SessionStateChangeListener,
 } from './types';
 
 const stateChangeListeners = new Set<SessionStateChangeListener>();
@@ -25,7 +26,7 @@ export class SessionListener implements SessionListenerInterface {
 
 	public addStateChangeListener(
 		listener: SessionStateChangeListener,
-		notifyOnAdd: boolean = false
+		notifyOnAdd = false,
 	) {
 		stateChangeListeners.add(listener);
 

package/src/utils/sessionListener/SessionListener.ts

@@ -2,7 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { isBrowser } from '../isBrowser';
-import { SessionStateChangeListener, SessionListenerInterface } from './types';
+
+import { SessionListenerInterface, SessionStateChangeListener } from './types';
 
 const stateChangeListeners = new Set<SessionStateChangeListener>();
 
@@ -18,7 +19,7 @@ export class SessionListener implements SessionListenerInterface {
 			document.addEventListener(
 				'visibilitychange',
 				this.handleVisibilityChange,
-				false
+				false,
 			);
 
 			this.listenerActive = true;
@@ -27,7 +28,7 @@ export class SessionListener implements SessionListenerInterface {
 
 	public addStateChangeListener(
 		listener: SessionStateChangeListener,
-		notifyOnAdd: boolean = false
+		notifyOnAdd = false,
 	) {
 		// No-op if document listener is not active
 		if (!this.listenerActive) {

package/src/utils/sessionListener/index.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { SessionListener } from './SessionListener';
+
 export { SESSION_START_EVENT, SESSION_STOP_EVENT } from './constants';
 
 export const sessionListener = new SessionListener();