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

package/dist/esm/utils/sessionListener/types.d.ts

@@ -1,6 +1,6 @@
 export type SessionState = 'started' | 'ended';
 export type SessionStateChangeListener = (state: SessionState) => void;
 export interface SessionListenerInterface {
-    addStateChangeListener: (listener: SessionStateChangeListener) => void;
-    removeStateChangeListener: (listener: SessionStateChangeListener) => void;
+    addStateChangeListener(listener: SessionStateChangeListener): void;
+    removeStateChangeListener(listener: SessionStateChangeListener): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/core",
-	"version": "6.0.16",
+	"version": "6.0.17-unstable.3d2803e.0+3d2803e",
 	"description": "Core category of aws-amplify",
 	"main": "./dist/cjs/index.js",
 	"module": "./dist/esm/index.mjs",
@@ -27,7 +27,8 @@
 		"clean": "npm run clean:size && rimraf dist lib lib-esm",
 		"clean:size": "rimraf dual-publish-tmp tmp*",
 		"format": "echo \"Not implemented\"",
-		"lint": "tslint 'src/**/*.ts' && npm run ts-coverage",
+		"lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage",
+		"lint:fix": "eslint '**/*.{ts,tsx}' --fix",
 		"prepublishOnly": "npm run build",
 		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 92.36"
 	},
@@ -59,7 +60,7 @@
 		"uuid": "^9.0.0"
 	},
 	"devDependencies": {
-		"@aws-amplify/react-native": "1.0.16",
+		"@aws-amplify/react-native": "1.0.17-unstable.3d2803e.0+3d2803e",
 		"@types/js-cookie": "3.0.2",
 		"genversion": "^2.2.0",
 		"typescript": "5.0.2"
@@ -191,5 +192,5 @@
 			]
 		}
 	},
-	"gitHead": "0e919f6e759cb94d03e119162b530b32d48f1357"
+	"gitHead": "3d2803eb859c37e52f1dc9459b79d628e0377d2e"
 }

package/src/BackgroundProcessManager/BackgroundProcessManager.ts

@@ -29,13 +29,6 @@ export class BackgroundProcessManager {
 	 */
 	private jobs = new Set<JobEntry>();
 
-	/**
-	 * Creates a new manager for promises, observables, and other types
-	 * of work that may be running in the background. This manager provides
-	 * a centralized mechanism to request termination and await completion.
-	 */
-	constructor() {}
-
 	/**
 	 * Executes an async `job` function, passing the return value through to
 	 * the caller, registering it as a running job in the manager. When the
@@ -61,7 +54,7 @@ export class BackgroundProcessManager {
 	 */
 	add<T>(
 		job: (onTerminate: Promise<void>) => Promise<T>,
-		description?: string
+		description?: string,
 	): Promise<T>;
 
 	/**
@@ -76,8 +69,8 @@ export class BackgroundProcessManager {
 	 * @returns Job promise hooks + onTerminate signaling promise
 	 */
 	add(description?: string): {
-		resolve: (value?: unknown) => void;
-		reject: (reason?: any) => void;
+		resolve(value?: unknown): void;
+		reject(reason?: any): void;
 		onTerminate: Promise<void>;
 	};
 
@@ -96,7 +89,7 @@ export class BackgroundProcessManager {
 			| string
 			| BackgroundProcessManager
 			| ((...args: any) => Promise<T>),
-		optionalDescription?: string
+		optionalDescription?: string,
 	) {
 		let job:
 			| BackgroundProcessManager
@@ -120,10 +113,10 @@ export class BackgroundProcessManager {
 		} else if (typeof job === 'function') {
 			return this.addFunction(job, description);
 		} else if (job instanceof BackgroundProcessManager) {
-			return this.addManager(job, description);
+			this.addManager(job, description);
 		} else {
 			throw new Error(
-				'If `job` is provided, it must be an Observable, Function, or BackgroundProcessManager.'
+				'If `job` is provided, it must be an Observable, Function, or BackgroundProcessManager.',
 			);
 		}
 	}
@@ -140,7 +133,7 @@ export class BackgroundProcessManager {
 	 */
 	addCleaner<T>(
 		clean: () => Promise<T>,
-		description?: string
+		description?: string,
 	): () => Promise<void> {
 		const { resolve, onTerminate } = this.addHook(description);
 
@@ -156,15 +149,17 @@ export class BackgroundProcessManager {
 
 	private addFunction<T>(
 		job: () => Promise<T>,
-		description?: string
+		description?: string,
 	): Promise<T>;
+
 	private addFunction<T>(
 		job: (onTerminate: Promise<void>) => Promise<T>,
-		description?: string
+		description?: string,
 	): Promise<T>;
+
 	private addFunction<T>(
 		job: (() => Promise<T>) | ((onTerminate: Promise<void>) => Promise<T>),
-		description?: string
+		description?: string,
 	) {
 		// the function we call when we want to try to terminate this job.
 		let terminate;
@@ -183,7 +178,7 @@ export class BackgroundProcessManager {
 			this.registerPromise(
 				jobResult,
 				terminate as unknown as () => void,
-				description
+				description,
 			);
 		}
 
@@ -194,7 +189,7 @@ export class BackgroundProcessManager {
 	}
 
 	private addManager(manager: BackgroundProcessManager, description?: string) {
-		this.addCleaner(async () => await manager.close(), description);
+		this.addCleaner(async () => manager.close(), description);
 	}
 
 	/**
@@ -210,33 +205,33 @@ export class BackgroundProcessManager {
 	private addHook(description?: string) {
 		// the resolve/reject functions we'll provide to the caller to signal
 		// the state of the job.
-		let resolve!: (value?: unknown) => void;
-		let reject!: (reason?: any) => void;
+		let promiseResolve!: (value?: unknown) => void;
+		let promiseReject!: (reason?: any) => void;
 
 		// the underlying promise we'll use to manage it, pretty much like
 		// any other promise.
-		const promise = new Promise((res, rej) => {
-			resolve = res;
-			reject = rej;
+		const promise = new Promise((resolve, reject) => {
+			promiseResolve = resolve;
+			promiseReject = reject;
 		});
 
 		// the function we call when we want to try to terminate this job.
 		let terminate;
 
 		// the promise the job can opt into listening to for termination.
-		const onTerminate = new Promise(resolveTerminate => {
-			terminate = resolveTerminate;
+		const onTerminate = new Promise(resolve => {
+			terminate = resolve;
 		});
 
 		this.registerPromise(
 			promise,
 			terminate as unknown as () => void,
-			description
+			description,
 		);
 
 		return {
-			resolve,
-			reject,
+			resolve: promiseResolve,
+			reject: promiseReject,
 			onTerminate,
 		};
 	}
@@ -255,7 +250,7 @@ export class BackgroundProcessManager {
 	private registerPromise<T extends Promise<any>>(
 		promise: T,
 		terminate: () => void,
-		description?: string
+		description?: string,
 	) {
 		const jobEntry = { promise, terminate, description };
 		this.jobs.add(jobEntry);
@@ -345,8 +340,8 @@ export class BackgroundProcessManager {
 						`Pending jobs: [\n${this.pending
 							.map(t => '    ' + t)
 							.join(',\n')}\n]`,
-					].join('\n')
-				)
+					].join('\n'),
+				),
 			);
 		}
 	}
@@ -382,7 +377,7 @@ export class BackgroundProcessManager {
 						`Failed to send termination signal to job. Error: ${
 							(error as Error).message
 						}`,
-						job
+						job,
 					);
 				}
 			}
@@ -390,7 +385,7 @@ export class BackgroundProcessManager {
 			// Use `allSettled()` because we want to wait for all to finish. We do
 			// not want to stop waiting if there is a failure.
 			this._closingPromise = Promise.allSettled(
-				Array.from(this.jobs).map(j => j.promise)
+				Array.from(this.jobs).map(j => j.promise),
 			);
 
 			await this._closingPromise;

package/src/BackgroundProcessManager/types.ts

@@ -25,7 +25,7 @@ export enum BackgroundProcessManagerState {
  * Completely internal to `BackgroundProcessManager`, and describes the structure of
  * an entry in the jobs registry.
  */
-export type JobEntry = {
+export interface JobEntry {
 	/**
 	 * The underlying promise provided by the job function to wait for.
 	 */
@@ -34,7 +34,7 @@ export type JobEntry = {
 	/**
 	 * Request the termination of the job.
 	 */
-	terminate: () => void;
+	terminate(): void;
 
 	/**
 	 * An object provided by the caller that can be used to identify the description
@@ -46,4 +46,4 @@ export type JobEntry = {
 	 * on `close()`.
 	 */
 	description?: string;
-};
+}

package/src/Cache/StorageCache.native.ts

@@ -2,7 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { loadAsyncStorage } from '@aws-amplify/react-native';
+
 import { ConsoleLogger } from '../Logger';
+
 import { defaultConfig } from './constants';
 import { StorageCacheCommon } from './StorageCacheCommon';
 import { Cache, CacheConfig } from './types';
@@ -38,6 +40,7 @@ export class StorageCache extends StorageCacheCommon implements Cache {
 				keys.push(key.substring(this.config.keyPrefix.length));
 			}
 		}
+
 		return keys;
 	}
 
@@ -46,6 +49,7 @@ export class StorageCache extends StorageCacheCommon implements Cache {
 			return AsyncStorage.getAllKeys();
 		} catch (e) {
 			logger.warn(`getAllKeys failed! ${e}`);
+
 			return [];
 		}
 	}
@@ -60,6 +64,7 @@ export class StorageCache extends StorageCacheCommon implements Cache {
 			logger.error('invalid keyPrefix, setting keyPrefix with timeStamp');
 			config.keyPrefix = getCurrentTime.toString();
 		}
+
 		return new StorageCache(config);
 	}
 }

package/src/Cache/StorageCache.ts

@@ -4,6 +4,7 @@
 import { ConsoleLogger } from '../Logger';
 import { KeyValueStorage } from '../storage/KeyValueStorage';
 import { getLocalStorageWithFallback } from '../storage/utils';
+
 import { defaultConfig } from './constants';
 import { StorageCacheCommon } from './StorageCacheCommon';
 import { Cache, CacheConfig } from './types';
@@ -42,6 +43,7 @@ export class StorageCache extends StorageCacheCommon implements Cache {
 				keys.push(key.substring(this.config.keyPrefix.length));
 			}
 		}
+
 		return keys;
 	}
 

package/src/Cache/StorageCacheCommon.ts

@@ -3,10 +3,11 @@
 
 import { ConsoleLogger } from '../Logger';
 import { KeyValueStorageInterface } from '../types';
+
 import { currentSizeKey, defaultConfig } from './constants';
 import { CacheConfig, CacheItem, CacheItemOptions } from './types';
-import { getCurrentSizeKey, getCurrentTime, getByteLength } from './utils';
-import { assert, CacheErrorCode } from './utils/errorHelpers';
+import { getByteLength, getCurrentSizeKey, getCurrentTime } from './utils';
+import { CacheErrorCode, assert } from './utils/errorHelpers';
 
 const logger = new ConsoleLogger('StorageCache');
 
@@ -58,7 +59,7 @@ export abstract class StorageCacheCommon {
 		if (config) {
 			if ((config as CacheConfig).keyPrefix) {
 				logger.warn(
-					'keyPrefix can not be re-configured on an existing Cache instance.'
+					'keyPrefix can not be re-configured on an existing Cache instance.',
 				);
 			}
 
@@ -79,15 +80,16 @@ export abstract class StorageCacheCommon {
 	 */
 	public async getCurrentCacheSize() {
 		let size = await this.getStorage().getItem(
-			getCurrentSizeKey(this.config.keyPrefix)
+			getCurrentSizeKey(this.config.keyPrefix),
 		);
 		if (!size) {
 			await this.getStorage().setItem(
 				getCurrentSizeKey(this.config.keyPrefix),
-				'0'
+				'0',
 			);
 			size = '0';
 		}
+
 		return Number(size);
 	}
 
@@ -112,21 +114,23 @@ export abstract class StorageCacheCommon {
 	public async setItem(
 		key: string,
 		value: any,
-		options?: Record<string, any>
+		options?: Record<string, any>,
 	): Promise<void> {
 		logger.debug(
-			`Set item: key is ${key}, value is ${value} with options: ${options}`
+			`Set item: key is ${key}, value is ${value} with options: ${options}`,
 		);
 
 		if (!key || key === currentSizeKey) {
 			logger.warn(
-				`Invalid key: should not be empty or reserved key: '${currentSizeKey}'`
+				`Invalid key: should not be empty or reserved key: '${currentSizeKey}'`,
 			);
+
 			return;
 		}
 
 		if (typeof value === 'undefined') {
 			logger.warn(`The value of item should not be undefined!`);
+
 			return;
 		}
 
@@ -143,8 +147,9 @@ export abstract class StorageCacheCommon {
 
 		if (cacheItemOptions.priority < 1 || cacheItemOptions.priority > 5) {
 			logger.warn(
-				`Invalid parameter: priority due to out or range. It should be within 1 and 5.`
+				`Invalid parameter: priority due to out or range. It should be within 1 and 5.`,
 			);
+
 			return;
 		}
 
@@ -154,8 +159,9 @@ export abstract class StorageCacheCommon {
 		// check whether this item is too big;
 		if (item.byteSize > this.config.itemMaxSize) {
 			logger.warn(
-				`Item with key: ${key} you are trying to put into is too big!`
+				`Item with key: ${key} you are trying to put into is too big!`,
 			);
+
 			return;
 		}
 
@@ -174,6 +180,7 @@ export abstract class StorageCacheCommon {
 					await this.popOutItems(validKeys, sizeToPop);
 				}
 			}
+
 			// put item in the cache
 			return this.setCacheItem(prefixedKey, item);
 		} catch (e) {
@@ -198,15 +205,16 @@ export abstract class StorageCacheCommon {
 	 */
 	public async getItem(
 		key: string,
-		options?: CacheItemOptions
+		options?: CacheItemOptions,
 	): Promise<CacheItem['data']> {
 		logger.debug(`Get item: key is ${key} with options ${options}`);
 		let cached;
 
 		if (!key || key === currentSizeKey) {
 			logger.warn(
-				`Invalid key: should not be empty or reserved key: '${currentSizeKey}'`
+				`Invalid key: should not be empty or reserved key: '${currentSizeKey}'`,
 			);
+
 			return null;
 		}
 
@@ -222,8 +230,9 @@ export abstract class StorageCacheCommon {
 					// if not expired, update its visitedTime and return the value
 					const item = await this.updateVisitedTime(
 						JSON.parse(cached),
-						prefixedKey
+						prefixedKey,
 					);
+
 					return item.data;
 				}
 			}
@@ -233,11 +242,14 @@ export abstract class StorageCacheCommon {
 				if (val !== null) {
 					await this.setItem(key, val, options);
 				}
+
 				return val;
 			}
+
 			return null;
 		} catch (e) {
 			logger.warn(`getItem failed! ${e}`);
+
 			return null;
 		}
 	}
@@ -254,8 +266,9 @@ export abstract class StorageCacheCommon {
 
 		if (!key || key === currentSizeKey) {
 			logger.warn(
-				`Invalid key: should not be empty or reserved key: '${currentSizeKey}'`
+				`Invalid key: should not be empty or reserved key: '${currentSizeKey}'`,
 			);
+
 			return;
 		}
 
@@ -282,6 +295,7 @@ export abstract class StorageCacheCommon {
 			return await this.getAllCacheKeys();
 		} catch (e) {
 			logger.warn(`getAllkeys failed! ${e}`);
+
 			return [];
 		}
 	}
@@ -304,6 +318,7 @@ export abstract class StorageCacheCommon {
 		if (getCurrentTime() >= item.expires) {
 			return true;
 		}
+
 		return false;
 	}
 
@@ -315,7 +330,7 @@ export abstract class StorageCacheCommon {
 	 */
 	protected async removeCacheItem(
 		prefixedKey: string,
-		size?: number
+		size?: number,
 	): Promise<void> {
 		const item = await this.getStorage().getItem(prefixedKey);
 		assert(item !== null, CacheErrorCode.NoCacheItem, `Key: ${prefixedKey}`);
@@ -343,7 +358,7 @@ export abstract class StorageCacheCommon {
 	protected fillCacheItem(
 		key: string,
 		value: object | number | string | boolean,
-		options: CacheItemOptions
+		options: CacheItemOptions,
 	): CacheItem {
 		const item: CacheItem = {
 			key,
@@ -359,20 +374,21 @@ export abstract class StorageCacheCommon {
 		item.byteSize = getByteLength(JSON.stringify(item));
 		// re-calculate using cache item with updated byteSize property
 		item.byteSize = getByteLength(JSON.stringify(item));
+
 		return item;
 	}
 
 	private sanitizeConfig(): void {
 		if (this.config.itemMaxSize > this.config.capacityInBytes) {
 			logger.error(
-				'Invalid parameter: itemMaxSize. It should be smaller than capacityInBytes. Setting back to default.'
+				'Invalid parameter: itemMaxSize. It should be smaller than capacityInBytes. Setting back to default.',
 			);
 			this.config.itemMaxSize = defaultConfig.itemMaxSize;
 		}
 
 		if (this.config.defaultPriority > 5 || this.config.defaultPriority < 1) {
 			logger.error(
-				'Invalid parameter: defaultPriority. It should be between 1 and 5. Setting back to default.'
+				'Invalid parameter: defaultPriority. It should be between 1 and 5. Setting back to default.',
 			);
 			this.config.defaultPriority = defaultConfig.defaultPriority;
 		}
@@ -382,7 +398,7 @@ export abstract class StorageCacheCommon {
 			Number(this.config.warningThreshold) < 0
 		) {
 			logger.error(
-				'Invalid parameter: warningThreshold. It should be between 0 and 1. Setting back to default.'
+				'Invalid parameter: warningThreshold. It should be between 0 and 1. Setting back to default.',
 			);
 			this.config.warningThreshold = defaultConfig.warningThreshold;
 		}
@@ -391,7 +407,7 @@ export abstract class StorageCacheCommon {
 		const cacheLimit: number = 5 * 1024 * 1024;
 		if (this.config.capacityInBytes > cacheLimit) {
 			logger.error(
-				'Cache Capacity should be less than 5MB. Setting back to default. Setting back to default.'
+				'Cache Capacity should be less than 5MB. Setting back to default. Setting back to default.',
 			);
 			this.config.capacityInBytes = defaultConfig.capacityInBytes;
 		}
@@ -406,7 +422,7 @@ export abstract class StorageCacheCommon {
 		const size = await this.getCurrentCacheSize();
 		await this.getStorage().setItem(
 			getCurrentSizeKey(this.config.keyPrefix),
-			(size + amount).toString()
+			(size + amount).toString(),
 		);
 	}
 
@@ -419,7 +435,7 @@ export abstract class StorageCacheCommon {
 		const size = await this.getCurrentCacheSize();
 		await this.getStorage().setItem(
 			getCurrentSizeKey(this.config.keyPrefix),
-			(size - amount).toString()
+			(size - amount).toString(),
 		);
 	}
 
@@ -433,10 +449,11 @@ export abstract class StorageCacheCommon {
 	 */
 	private async updateVisitedTime(
 		item: CacheItem,
-		prefixedKey: string
+		prefixedKey: string,
 	): Promise<CacheItem> {
 		item.visitedTime = getCurrentTime();
 		await this.getStorage().setItem(prefixedKey, JSON.stringify(item));
+
 		return item;
 	}
 
@@ -449,7 +466,7 @@ export abstract class StorageCacheCommon {
 	 */
 	private async setCacheItem(
 		prefixedKey: string,
-		item: CacheItem
+		item: CacheItem,
 	): Promise<void> {
 		// first try to update the current size of the cache.
 		await this.increaseCurrentSizeInBytes(item.byteSize);
@@ -476,6 +493,7 @@ export abstract class StorageCacheCommon {
 		const spaceItemNeed = cur + itemSize - this.config.capacityInBytes;
 		const cacheThresholdSpace =
 			(1 - this.config.warningThreshold) * this.config.capacityInBytes;
+
 		return spaceItemNeed > cacheThresholdSpace
 			? spaceItemNeed
 			: cacheThresholdSpace;
@@ -490,6 +508,7 @@ export abstract class StorageCacheCommon {
 	 */
 	private async isCacheFull(itemSize: number): Promise<boolean> {
 		const cur = await this.getCurrentCacheSize();
+
 		return itemSize + cur > this.config.capacityInBytes;
 	}
 
@@ -504,8 +523,8 @@ export abstract class StorageCacheCommon {
 	private async popOutItems(keys: string[], sizeToPop: number): Promise<void> {
 		const items: any[] = [];
 		let remainedSize = sizeToPop;
-		for (let i = 0; i < keys.length; i += 1) {
-			const val = await this.getStorage().getItem(keys[i]);
+		for (const key of keys) {
+			const val = await this.getStorage().getItem(key);
 			if (val != null) {
 				const item = JSON.parse(val);
 				items.push(item);
@@ -526,10 +545,10 @@ export abstract class StorageCacheCommon {
 			}
 		});
 
-		for (let i = 0; i < items.length; i += 1) {
+		for (const item of items) {
 			// pop out items until we have enough room for new item
-			await this.removeCacheItem(items[i].key, items[i].byteSize);
-			remainedSize -= items[i].byteSize;
+			await this.removeCacheItem(item.key, item.byteSize);
+			remainedSize -= item.byteSize;
 			if (remainedSize <= 0) {
 				return;
 			}
@@ -555,6 +574,7 @@ export abstract class StorageCacheCommon {
 				remainingKeys.push(key);
 			}
 		}
+
 		return remainingKeys;
 	}
 

package/src/Cache/types/cache.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { CacheConfig } from '../../singleton/Cache/types';
+
 export { CacheConfig };
 
 /**
@@ -47,5 +48,5 @@ export interface CacheItem {
 export interface CacheItemOptions {
 	priority?: number;
 	expires?: number;
-	callback?: Function;
+	callback?(): unknown;
 }

package/src/Cache/utils/CacheList.ts

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { assert, CacheErrorCode } from './errorHelpers';
+import { CacheErrorCode, assert } from './errorHelpers';
 
 class DoubleLinkedNode {
 	key: string;
@@ -9,7 +9,7 @@ class DoubleLinkedNode {
 	nextNode: DoubleLinkedNode | null;
 
 	constructor(keyVal?: string) {
-		this.key = keyVal ? keyVal : '';
+		this.key = keyVal || '';
 		this.prevNode = null;
 		this.nextNode = null;
 	}
@@ -112,6 +112,7 @@ export class CacheList {
 	 */
 	public getLastItem(): string {
 		assert(this.tail.prevNode !== null, CacheErrorCode.NullPreviousNode);
+
 		return this.tail.prevNode.key;
 	}
 
@@ -145,7 +146,7 @@ export class CacheList {
 	 */
 	public clearList(): void {
 		for (const key of Object.keys(this.hashtable)) {
-			if (this.hashtable.hasOwnProperty(key)) {
+			if (Object.prototype.hasOwnProperty.call(this.hashtable, key)) {
 				delete this.hashtable[key];
 			}
 		}
@@ -169,6 +170,7 @@ export class CacheList {
 	 */
 	public isHeadNode(key: string): boolean {
 		const node = this.hashtable[key];
+
 		return node.prevNode === this.head;
 	}
 
@@ -180,6 +182,7 @@ export class CacheList {
 	 */
 	public isTailNode(key: string): boolean {
 		const node = this.hashtable[key];
+
 		return node.nextNode === this.tail;
 	}
 }

package/src/Cache/utils/cacheHelpers.ts

@@ -8,7 +8,7 @@ import { currentSizeKey } from '../constants';
  * @param str
  */
 export function getByteLength(str: string): number {
-	let ret: number = 0;
+	let ret = 0;
 	ret = str.length;
 
 	for (let i = str.length; i >= 0; i -= 1) {
@@ -32,6 +32,7 @@ export function getByteLength(str: string): number {
  */
 export function getCurrentTime(): number {
 	const currentTime = new Date();
+
 	return currentTime.getTime();
 }