@aws-amplify/datastore 5.0.32 → 5.0.33-s-auth.30d0cd2.0

package/src/storage/adapter/AsyncStorageDatabase.ts

@@ -1,6 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { ULID } from 'ulid';
+
 import {
 	ModelInstanceMetadata,
 	OpType,
@@ -13,6 +14,7 @@ import {
 	indexNameFromKeys,
 	monotonicUlidFactory,
 } from '../../util';
+
 import { createInMemoryStore } from './InMemoryStore';
 
 const DB_NAME = '@AmplifyDatastore';
@@ -72,12 +74,12 @@ class AsyncStorageDatabase {
 					if (id === undefined) {
 						// It is an old entry (without ulid). Need to migrate to new key format
 
-						const id = ulidOrId;
+						const resolvedId = ulidOrId;
 
 						const newUlid = this.getMonotonicFactory(storeName)();
 
-						const oldKey = this.getLegacyKeyForItem(storeName, id);
-						const newKey = this.getKeyForItem(storeName, id, newUlid);
+						const oldKey = this.getLegacyKeyForItem(storeName, resolvedId);
+						const newKey = this.getKeyForItem(storeName, resolvedId, newUlid);
 
 						const item = await this.storage.getItem(oldKey);
 
@@ -161,7 +163,7 @@ class AsyncStorageDatabase {
 			);
 
 			allItemsKeys.push(key);
-			itemsMap[key] = { ulid, model: <T>(<unknown>item) };
+			itemsMap[key] = { ulid, model: item as unknown as T };
 
 			if (_deleted) {
 				keysToDelete.add(key);
@@ -180,6 +182,7 @@ class AsyncStorageDatabase {
 		await new Promise<void>((resolve, reject) => {
 			if (keysToDelete.size === 0) {
 				resolve();
+
 				return;
 			}
 
@@ -208,6 +211,7 @@ class AsyncStorageDatabase {
 		await new Promise<void>((resolve, reject) => {
 			if (keysToSave.size === 0) {
 				resolve();
+
 				return;
 			}
 
@@ -258,6 +262,7 @@ class AsyncStorageDatabase {
 		const itemKey = this.getKeyForItem(storeName, keyValuePath, ulid);
 		const recordAsString = await this.storage.getItem(itemKey);
 		const record = recordAsString && JSON.parse(recordAsString);
+
 		return record;
 	}
 
@@ -267,14 +272,17 @@ class AsyncStorageDatabase {
 		const [itemId, ulid] =
 			firstOrLast === QueryOne.FIRST
 				? (() => {
-						let id: string, ulid: string;
-						for ([id, ulid] of collection) break; // Get first element of the set
-						return [id!, ulid!];
+						let resolvedId: string, resolvedUlid: string;
+						// eslint-disable-next-line no-unreachable-loop
+						for ([resolvedId, resolvedUlid] of collection) break; // Get first element of the set
+
+						return [resolvedId!, resolvedUlid!];
 					})()
 				: (() => {
-						let id: string, ulid: string;
-						for ([id, ulid] of collection); // Get last element of the set
-						return [id!, ulid!];
+						let resolvedId: string, resolvedUlid: string;
+						for ([resolvedId, resolvedUlid] of collection); // Get last element of the set
+
+						return [resolvedId!, resolvedUlid!];
 					})();
 		const itemKey = this.getKeyForItem(storeName, itemId, ulid);
 

package/src/storage/adapter/InMemoryStore.ts

@@ -9,7 +9,11 @@ export class InMemoryStore {
 
 	multiGet = async (keys: string[]) => {
 		return keys.reduce(
-			(res, k) => (res.push([k, this.db.get(k)!]), res),
+			(res, k) => {
+				res.push([k, this.db.get(k)!]);
+
+				return res;
+			},
 			[] as [string, string][],
 		);
 	};

package/src/storage/adapter/IndexedDBAdapter.ts

@@ -1,9 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import * as idb from 'idb';
+import { ConsoleLogger } from '@aws-amplify/core';
+
 import {
-	isPredicateObj,
-	isPredicateGroup,
 	ModelInstanceMetadata,
 	ModelPredicate,
 	OpType,
@@ -13,18 +13,20 @@ import {
 	PredicateObject,
 	PredicatesGroup,
 	QueryOne,
+	isPredicateGroup,
+	isPredicateObj,
 } from '../../types';
 import {
+	getStorename,
+	inMemoryPagination,
 	isPrivateMode,
+	isSafariCompatabilityMode,
+	keysEqual,
 	traverseModel,
 	validatePredicate,
-	inMemoryPagination,
-	keysEqual,
-	getStorename,
-	isSafariCompatabilityMode,
 } from '../../util';
+
 import { StorageAdapterBase } from './StorageAdapterBase';
-import { ConsoleLogger } from '@aws-amplify/core';
 
 const logger = new ConsoleLogger('DataStore');
 
@@ -55,7 +57,7 @@ const DB_VERSION = 3;
 
 class IndexedDBAdapter extends StorageAdapterBase {
 	protected db!: idb.IDBPDatabase;
-	private safariCompatabilityMode: boolean = false;
+	private safariCompatabilityMode = false;
 
 	// checks are called by StorageAdapterBase class
 	protected async preSetUpChecks() {
@@ -77,7 +79,7 @@ class IndexedDBAdapter extends StorageAdapterBase {
 	 * @returns IDB Database instance
 	 */
 	protected async initDb(): Promise<idb.IDBPDatabase> {
-		return await idb.openDB(this.dbName, DB_VERSION, {
+		return idb.openDB(this.dbName, DB_VERSION, {
 			upgrade: async (db, oldVersion, newVersion, txn) => {
 				// create new database
 				if (oldVersion === 0) {
@@ -171,8 +173,6 @@ class IndexedDBAdapter extends StorageAdapterBase {
 						txn.abort();
 						throw error;
 					}
-
-					return;
 				}
 			},
 		});
@@ -194,7 +194,7 @@ class IndexedDBAdapter extends StorageAdapterBase {
 
 		const result = await index.get(this.canonicalKeyPath(keyArr));
 
-		return <T>result;
+		return result as T;
 	}
 
 	async clear(): Promise<void> {
@@ -228,22 +228,25 @@ class IndexedDBAdapter extends StorageAdapterBase {
 
 		const result: [T, OpType.INSERT | OpType.UPDATE][] = [];
 		for await (const resItem of connectionStoreNames) {
-			const { storeName, item, instance, keys } = resItem;
-			const store = tx.objectStore(storeName);
+			const { storeName: storeNameForRestItem, item, instance, keys } = resItem;
+			const storeForRestItem = tx.objectStore(storeNameForRestItem);
 
 			const itemKeyValues: string[] = keys.map(key => item[key]);
 
-			const fromDB = <T>await this._get(store, itemKeyValues);
-			const opType: OpType = fromDB ? OpType.UPDATE : OpType.INSERT;
+			const fromDBForRestItem = (await this._get(
+				storeForRestItem,
+				itemKeyValues,
+			)) as T;
+			const opType: OpType = fromDBForRestItem ? OpType.UPDATE : OpType.INSERT;
 
 			if (
 				keysEqual(itemKeyValues, modelKeyValues) ||
 				opType === OpType.INSERT
 			) {
-				const key = await store
+				const key = await storeForRestItem
 					.index('byPk')
 					.getKey(this.canonicalKeyPath(itemKeyValues));
-				await store.put(item, key);
+				await storeForRestItem.put(item, key);
 				result.push([instance, opType]);
 			}
 		}
@@ -281,16 +284,19 @@ class IndexedDBAdapter extends StorageAdapterBase {
 			//
 			if (queryByKey) {
 				const record = await this.getByKey(storeName, queryByKey);
+
 				return record ? [record] : [];
 			}
 
 			if (predicates) {
 				const filtered = await this.filterOnPredicate(storeName, predicates);
+
 				return this.inMemoryPagination(filtered, pagination);
 			}
 
 			if (hasSort) {
 				const all = await this.getAll(storeName);
+
 				return this.inMemoryPagination(all, pagination);
 			}
 
@@ -301,7 +307,7 @@ class IndexedDBAdapter extends StorageAdapterBase {
 			return this.getAll(storeName);
 		})()) as T[];
 
-		return await this.load(namespaceName, modelConstructor.name, records);
+		return this.load(namespaceName, modelConstructor.name, records);
 	}
 
 	async queryOne<T extends PersistentModel>(
@@ -316,7 +322,7 @@ class IndexedDBAdapter extends StorageAdapterBase {
 			.objectStore(storeName)
 			.openCursor(undefined, firstOrLast === QueryOne.FIRST ? 'next' : 'prev');
 
-		const result = cursor ? <T>cursor.value : undefined;
+		const result = cursor ? (cursor.value as T) : undefined;
 
 		return result && this.modelInstanceCreator(modelConstructor, result);
 	}
@@ -337,7 +343,7 @@ class IndexedDBAdapter extends StorageAdapterBase {
 		const result: [T, OpType][] = [];
 
 		const txn = this.db.transaction(storeName, 'readwrite');
-		const store = txn.store;
+		const { store } = txn;
 
 		for (const item of items) {
 			const model = this.modelInstanceCreator(modelConstructor, item);
@@ -358,18 +364,23 @@ class IndexedDBAdapter extends StorageAdapterBase {
 			const key = await index.getKey(this.canonicalKeyPath(keyValues));
 
 			if (!_deleted) {
-				const { instance } = connectedModels.find(({ instance }) => {
-					const instanceKeyValues = this.getIndexKeyValuesFromModel(instance);
-					return keysEqual(instanceKeyValues, keyValues);
-				})!;
+				const { instance } = connectedModels.find(
+					({ instance: connectedModelInstance }) => {
+						const instanceKeyValues = this.getIndexKeyValuesFromModel(
+							connectedModelInstance,
+						);
+
+						return keysEqual(instanceKeyValues, keyValues);
+					},
+				)!;
 
 				result.push([
-					<T>(<unknown>instance),
+					instance as unknown as T,
 					key ? OpType.UPDATE : OpType.INSERT,
 				]);
 				await store.put(instance, key);
 			} else {
-				result.push([<T>(<unknown>item), OpType.DELETE]);
+				result.push([item as unknown as T, OpType.DELETE]);
 
 				if (key) {
 					await store.delete(key);
@@ -419,14 +430,14 @@ class IndexedDBAdapter extends StorageAdapterBase {
 		}
 	}
 
-	//#region platform-specific helper methods
+	// #region platform-specific helper methods
 
 	private async checkPrivate() {
-		const isPrivate = await isPrivateMode().then(isPrivate => {
-			return isPrivate;
-		});
+		const isPrivate = await isPrivateMode();
 		if (isPrivate) {
 			logger.error("IndexedDB not supported in this browser's private mode");
+
+			// eslint-disable-next-line prefer-promise-reject-errors
 			return Promise.reject(
 				"IndexedDB not supported in this browser's private mode",
 			);
@@ -455,6 +466,7 @@ class IndexedDBAdapter extends StorageAdapterBase {
 
 	private getNamespaceAndModelFromStorename(storeName: string) {
 		const [namespaceName, ...modelNameArr] = storeName.split('_');
+
 		return {
 			namespaceName,
 			modelName: modelNameArr.join('_'),
@@ -485,13 +497,13 @@ class IndexedDBAdapter extends StorageAdapterBase {
 		storeName: string,
 		keyValue: string[],
 	): Promise<T> {
-		return <T>await this._get(storeName, keyValue);
+		return (await this._get(storeName, keyValue)) as T;
 	}
 
 	private async getAll<T extends PersistentModel>(
 		storeName: string,
 	): Promise<T[]> {
-		return await this.db.getAll(storeName);
+		return this.db.getAll(storeName);
 	}
 
 	/**
@@ -565,7 +577,7 @@ class IndexedDBAdapter extends StorageAdapterBase {
 			isPredicateGroup(predicateObjs[0]) &&
 			(predicateObjs[0] as PredicatesGroup<T>).type !== 'not'
 		) {
-			type = (predicateObjs[0] as PredicatesGroup<T>).type;
+			({ type } = predicateObjs[0] as PredicatesGroup<T>);
 			predicateObjs = (predicateObjs[0] as PredicatesGroup<T>).predicates;
 		}
 
@@ -702,7 +714,7 @@ class IndexedDBAdapter extends StorageAdapterBase {
 			// nothing intelligent we can do with `not` groups unless or until we start
 			// smashing comparison operators against indexes -- at which point we could
 			// perform some reversal here.
-			candidateResults = <T[]>await this.getAll(storeName);
+			candidateResults = (await this.getAll(storeName)) as T[];
 		}
 
 		const filtered = predicateObjs
@@ -753,7 +765,7 @@ class IndexedDBAdapter extends StorageAdapterBase {
 
 			result = pageResults;
 		} else {
-			result = <T[]>await this.db.getAll(storeName);
+			result = (await this.db.getAll(storeName)) as T[];
 		}
 
 		return result;
@@ -771,9 +783,10 @@ class IndexedDBAdapter extends StorageAdapterBase {
 		if (this.safariCompatabilityMode) {
 			return keyArr.length > 1 ? keyArr : keyArr[0];
 		}
+
 		return keyArr;
 	};
-	//#endregion
+	// #endregion
 }
 
 export default new IndexedDBAdapter();

package/src/storage/adapter/StorageAdapterBase.ts

@@ -1,11 +1,12 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { Adapter } from './index';
+import type { IDBPDatabase, IDBPObjectStore } from 'idb';
+import { ConsoleLogger } from '@aws-amplify/core';
+
 import { ModelInstanceCreator } from '../../datastore/datastore';
 import { ModelPredicateCreator } from '../../predicates';
 import {
 	InternalSchema,
-	isPredicateObj,
 	ModelInstanceMetadata,
 	ModelPredicate,
 	NamespaceResolver,
@@ -16,21 +17,23 @@ import {
 	PredicateObject,
 	PredicatesGroup,
 	QueryOne,
+	isPredicateObj,
 } from '../../types';
 import {
 	NAMESPACES,
-	getStorename,
-	getIndexKeys,
+	extractPrimaryKeyFieldNames,
 	extractPrimaryKeyValues,
+	getIndexKeys,
+	getStorename,
+	isModelConstructor,
 	traverseModel,
 	validatePredicate,
-	isModelConstructor,
-	extractPrimaryKeyFieldNames,
 } from '../../util';
-import type { IDBPDatabase, IDBPObjectStore } from 'idb';
-import type AsyncStorageDatabase from './AsyncStorageDatabase';
 import { ModelRelationship } from '../relationship';
-import { ConsoleLogger } from '@aws-amplify/core';
+
+import type AsyncStorageDatabase from './AsyncStorageDatabase';
+
+import { Adapter } from './index';
 
 const logger = new ConsoleLogger('DataStore');
 const DB_NAME = 'amplify-datastore';
@@ -46,6 +49,7 @@ export abstract class StorageAdapterBase implements Adapter {
 		namsespaceName: NAMESPACES,
 		modelName: string,
 	) => PersistentModelConstructor<any>;
+
 	protected initPromise!: Promise<void>;
 	protected resolve!: (value?: any) => void;
 	protected reject!: (value?: any) => void;
@@ -78,12 +82,13 @@ export abstract class StorageAdapterBase implements Adapter {
 		await this.preSetUpChecks();
 
 		if (!this.initPromise) {
-			this.initPromise = new Promise((res, rej) => {
-				this.resolve = res;
-				this.reject = rej;
+			this.initPromise = new Promise((resolve, reject) => {
+				this.resolve = resolve;
+				this.reject = reject;
 			});
 		} else {
 			await this.initPromise;
+
 			return;
 		}
 		if (sessionId) {
@@ -195,13 +200,14 @@ export abstract class StorageAdapterBase implements Adapter {
 		const set = new Set<string>();
 		const connectionStoreNames = Object.values(connectedModels).map(
 			({ modelName, item, instance }) => {
-				const storeName = getStorename(namespaceName, modelName);
-				set.add(storeName);
+				const resolvedStoreName = getStorename(namespaceName, modelName);
+				set.add(resolvedStoreName);
 				const keys = getIndexKeys(
 					this.schema.namespaces[namespaceName],
 					modelName,
 				);
-				return { storeName, item, instance, keys };
+
+				return { storeName: resolvedStoreName, item, instance, keys };
 			},
 		);
 
@@ -397,7 +403,7 @@ export abstract class StorageAdapterBase implements Adapter {
 
 				const deletedModels = deleteQueue.reduce(
 					(acc, { items }) => acc.concat(items),
-					<T[]>[],
+					[] as T[],
 				);
 
 				return [models, deletedModels];
@@ -413,7 +419,7 @@ export abstract class StorageAdapterBase implements Adapter {
 
 				const deletedModels = deleteQueue.reduce(
 					(acc, { items }) => acc.concat(items),
-					<T[]>[],
+					[] as T[],
 				);
 
 				return [models, deletedModels];
@@ -471,7 +477,7 @@ export abstract class StorageAdapterBase implements Adapter {
 
 			const deletedModels = deleteQueue.reduce(
 				(acc, { items }) => acc.concat(items),
-				<T[]>[],
+				[] as T[],
 			);
 
 			return [[model], deletedModels];

package/src/storage/adapter/getDefaultAdapter/index.native.ts

@@ -1,6 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { Adapter } from '..';
+// eslint-disable-next-line import/no-named-as-default
 import AsyncStorageAdapter from '../AsyncStorageAdapter';
 
 const getDefaultAdapter: () => Adapter = () => {

package/src/storage/adapter/getDefaultAdapter/index.ts

@@ -1,9 +1,12 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+import { isBrowser, isWebWorker } from '@aws-amplify/core/internals/utils';
+
 import { Adapter } from '..';
 import IndexedDBAdapter from '../IndexedDBAdapter';
+// eslint-disable-next-line import/no-named-as-default
 import AsyncStorageAdapter from '../AsyncStorageAdapter';
-import { isWebWorker, isBrowser } from '@aws-amplify/core/internals/utils';
+
 const getDefaultAdapter: () => Adapter = () => {
 	if ((isBrowser && window.indexedDB) || (isWebWorker() && self.indexedDB)) {
 		return IndexedDBAdapter as Adapter;

package/src/storage/adapter/index.ts

@@ -17,10 +17,10 @@ export interface Adapter extends SystemComponent {
 		model: T,
 		condition?: ModelPredicate<T>,
 	): Promise<[T, OpType.INSERT | OpType.UPDATE][]>;
-	delete: <T extends PersistentModel>(
+	delete<T extends PersistentModel>(
 		modelOrModelConstructor: T | PersistentModelConstructor<T>,
 		condition?: ModelPredicate<T>,
-	) => Promise<[T[], T[]]>;
+	): Promise<[T[], T[]]>;
 	query<T extends PersistentModel>(
 		modelConstructor: PersistentModelConstructor<T>,
 		predicate?: ModelPredicate<T>,

package/src/storage/relationship.ts

@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { isFieldAssociation, ModelFieldType, ModelMeta } from '../types';
+import { ModelFieldType, ModelMeta, isFieldAssociation } from '../types';
 
 /**
  * Defines a relationship from a LOCAL model.field to a REMOTE model.field and helps
@@ -52,6 +52,7 @@ export class ModelRelationship<T> {
 			const relationship = ModelRelationship.from(model, field);
 			relationship && relationships.push(relationship);
 		}
+
 		return relationships;
 	}
 
@@ -212,6 +213,7 @@ export class ModelRelationship<T> {
 			// This case is theoretically unnecessary going forward.
 			return [this.explicitRemoteAssociation.targetName!];
 		} else if (this.explicitRemoteAssociation?.targetNames) {
+			// eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
 			return this.explicitRemoteAssociation?.targetNames!;
 		} else if (this.localAssociatedWith) {
 			return this.localAssociatedWith;
@@ -249,6 +251,7 @@ export class ModelRelationship<T> {
 		for (let i = 0; i < this.localJoinFields.length; i++) {
 			fk[this.localJoinFields[i]] = remote[this.remoteJoinFields[i]];
 		}
+
 		return fk;
 	}
 
@@ -278,6 +281,7 @@ export class ModelRelationship<T> {
 			if (localValue === null || localValue === undefined) return null;
 			query[this.remoteJoinFields[i]] = local[this.localJoinFields[i]];
 		}
+
 		return query;
 	}
 }