@aws-amplify/datastore 4.0.12 → 4.0.13-push-notification-dryrun.43

package/src/storage/adapter/IndexedDBAdapter.ts

@@ -1,14 +1,10 @@
 import { ConsoleLogger as Logger } from '@aws-amplify/core';
 import * as idb from 'idb';
-import { ModelInstanceCreator } from '../../datastore/datastore';
-import { ModelPredicateCreator } from '../../predicates';
 import {
-	InternalSchema,
 	isPredicateObj,
 	isPredicateGroup,
 	ModelInstanceMetadata,
 	ModelPredicate,
-	NamespaceResolver,
 	OpType,
 	PaginationInput,
 	PersistentModel,
@@ -16,24 +12,17 @@ import {
 	PredicateObject,
 	PredicatesGroup,
 	QueryOne,
-	RelationType,
 } from '../../types';
 import {
-	getIndex,
-	getIndexFromAssociation,
-	isModelConstructor,
 	isPrivateMode,
 	traverseModel,
 	validatePredicate,
 	inMemoryPagination,
-	NAMESPACES,
 	keysEqual,
 	getStorename,
-	getIndexKeys,
-	extractPrimaryKeyValues,
 	isSafariCompatabilityMode,
 } from '../../util';
-import { Adapter } from './index';
+import { StorageAdapterBase } from './StorageAdapterBase';
 
 const logger = new Logger('DataStore');
 
@@ -59,229 +48,135 @@ const logger = new Logger('DataStore');
  *
  */
 const MULTI_OR_CONDITION_SCAN_BREAKPOINT = 7;
+//
+const DB_VERSION = 3;
 
-const DB_NAME = 'amplify-datastore';
-class IndexedDBAdapter implements Adapter {
-	private schema!: InternalSchema;
-	private namespaceResolver!: NamespaceResolver;
-	private modelInstanceCreator!: ModelInstanceCreator;
-	private getModelConstructorByModelName?: (
-		namsespaceName: NAMESPACES,
-		modelName: string
-	) => PersistentModelConstructor<any>;
-	private db!: idb.IDBPDatabase;
-	private initPromise!: Promise<void>;
-	private resolve!: (value?: any) => void;
-	private reject!: (value?: any) => void;
-	private dbName: string = DB_NAME;
+class IndexedDBAdapter extends StorageAdapterBase {
+	protected db!: idb.IDBPDatabase;
 	private safariCompatabilityMode: boolean = false;
 
-	private getStorenameForModel(
-		modelConstructor: PersistentModelConstructor<any>
-	) {
-		const namespace = this.namespaceResolver(modelConstructor);
-		const { name: modelName } = modelConstructor;
-
-		return getStorename(namespace, modelName);
-	}
-
-	// Retrieves primary key values from a model
-	private getIndexKeyValuesFromModel<T extends PersistentModel>(
-		model: T
-	): string[] {
-		const modelConstructor = Object.getPrototypeOf(model)
-			.constructor as PersistentModelConstructor<T>;
-		const namespaceName = this.namespaceResolver(modelConstructor);
-
-		const keys = getIndexKeys(
-			this.schema.namespaces[namespaceName],
-			modelConstructor.name
-		);
-
-		return extractPrimaryKeyValues(model, keys);
+	// checks are called by StorageAdapterBase class
+	protected async preSetUpChecks() {
+		await this.checkPrivate();
+		await this.setSafariCompatabilityMode();
 	}
 
-	private async checkPrivate() {
-		const isPrivate = await isPrivateMode().then(isPrivate => {
-			return isPrivate;
-		});
-		if (isPrivate) {
-			logger.error("IndexedDB not supported in this browser's private mode");
-			return Promise.reject(
-				"IndexedDB not supported in this browser's private mode"
-			);
-		} else {
-			return Promise.resolve();
-		}
+	protected async preOpCheck() {
+		await this.checkPrivate();
 	}
 
 	/**
-	 * Whether the browser's implementation of IndexedDB is coercing single-field
-	 * indexes to a scalar key.
+	 * Initialize IndexedDB database
+	 * Create new DB if one doesn't exist
+	 * Upgrade outdated DB
 	 *
-	 * If this returns `true`, we need to treat indexes containing a single field
-	 * as scalars.
+	 * Called by `StorageAdapterBase.setUp()`
 	 *
-	 * See PR description for reference:
-	 * https://github.com/aws-amplify/amplify-js/pull/10527
+	 * @returns IDB Database instance
 	 */
-	private async setSafariCompatabilityMode() {
-		this.safariCompatabilityMode = await isSafariCompatabilityMode();
+	protected async initDb(): Promise<idb.IDBPDatabase> {
+		return await idb.openDB(this.dbName, DB_VERSION, {
+			upgrade: async (db, oldVersion, newVersion, txn) => {
+				// create new database
+				if (oldVersion === 0) {
+					Object.keys(this.schema.namespaces).forEach(namespaceName => {
+						const namespace = this.schema.namespaces[namespaceName];
+
+						Object.keys(namespace.models).forEach(modelName => {
+							const storeName = getStorename(namespaceName, modelName);
+							this.createObjectStoreForModel(
+								db,
+								namespaceName,
+								storeName,
+								modelName
+							);
+						});
+					});
 
-		if (this.safariCompatabilityMode === true) {
-			logger.debug('IndexedDB Adapter is running in Safari Compatability Mode');
-		}
-	}
+					return;
+				}
 
-	private getNamespaceAndModelFromStorename(storeName: string) {
-		const [namespaceName, ...modelNameArr] = storeName.split('_');
-		return {
-			namespaceName,
-			modelName: modelNameArr.join('_'),
-		};
-	}
+				// migrate existing database to latest schema
+				if ((oldVersion === 1 || oldVersion === 2) && newVersion === 3) {
+					try {
+						for (const storeName of txn.objectStoreNames) {
+							const origStore = txn.objectStore(storeName);
 
-	async setUp(
-		theSchema: InternalSchema,
-		namespaceResolver: NamespaceResolver,
-		modelInstanceCreator: ModelInstanceCreator,
-		getModelConstructorByModelName: (
-			namsespaceName: NAMESPACES,
-			modelName: string
-		) => PersistentModelConstructor<any>,
-		sessionId?: string
-	) {
-		await this.checkPrivate();
-		await this.setSafariCompatabilityMode();
+							// rename original store
+							const tmpName = `tmp_${storeName}`;
+							origStore.name = tmpName;
 
-		if (!this.initPromise) {
-			this.initPromise = new Promise((res, rej) => {
-				this.resolve = res;
-				this.reject = rej;
-			});
-		} else {
-			await this.initPromise;
-		}
-		if (sessionId) {
-			this.dbName = `${DB_NAME}-${sessionId}`;
-		}
-		this.schema = theSchema;
-		this.namespaceResolver = namespaceResolver;
-		this.modelInstanceCreator = modelInstanceCreator;
-		this.getModelConstructorByModelName = getModelConstructorByModelName;
-
-		try {
-			if (!this.db) {
-				const VERSION = 3;
-				this.db = await idb.openDB(this.dbName, VERSION, {
-					upgrade: async (db, oldVersion, newVersion, txn) => {
-						if (oldVersion === 0) {
-							Object.keys(theSchema.namespaces).forEach(namespaceName => {
-								const namespace = theSchema.namespaces[namespaceName];
-
-								Object.keys(namespace.models).forEach(modelName => {
-									const storeName = getStorename(namespaceName, modelName);
-									this.createObjectStoreForModel(
-										db,
-										namespaceName,
-										storeName,
-										modelName
-									);
-								});
-							});
+							const { namespaceName, modelName } =
+								this.getNamespaceAndModelFromStorename(storeName);
 
-							return;
-						}
+							const modelInCurrentSchema =
+								modelName in this.schema.namespaces[namespaceName].models;
+
+							if (!modelInCurrentSchema) {
+								// delete original
+								db.deleteObjectStore(tmpName);
+								continue;
+							}
 
-						if ((oldVersion === 1 || oldVersion === 2) && newVersion === 3) {
-							try {
-								for (const storeName of txn.objectStoreNames) {
-									const origStore = txn.objectStore(storeName);
+							const newStore = this.createObjectStoreForModel(
+								db,
+								namespaceName,
+								storeName,
+								modelName
+							);
 
-									// rename original store
-									const tmpName = `tmp_${storeName}`;
-									origStore.name = tmpName;
+							let cursor = await origStore.openCursor();
+							let count = 0;
 
-									const { namespaceName, modelName } =
-										this.getNamespaceAndModelFromStorename(storeName);
+							// Copy data from original to new
+							while (cursor && cursor.value) {
+								// we don't pass key, since they are all new entries in the new store
+								await newStore.put(cursor.value);
 
-									const modelInCurrentSchema =
-										modelName in this.schema.namespaces[namespaceName].models;
+								cursor = await cursor.continue();
+								count++;
+							}
 
-									if (!modelInCurrentSchema) {
-										// delete original
-										db.deleteObjectStore(tmpName);
-										continue;
-									}
+							// delete original
+							db.deleteObjectStore(tmpName);
 
-									const newStore = this.createObjectStoreForModel(
+							logger.debug(`${count} ${storeName} records migrated`);
+						}
+
+						// add new models created after IndexedDB, but before migration
+						// this case may happen when a user has not opened an app for
+						// some time and a new model is added during that time
+						Object.keys(this.schema.namespaces).forEach(namespaceName => {
+							const namespace = this.schema.namespaces[namespaceName];
+							const objectStoreNames = new Set(txn.objectStoreNames);
+
+							Object.keys(namespace.models)
+								.map(modelName => {
+									return [modelName, getStorename(namespaceName, modelName)];
+								})
+								.filter(([, storeName]) => !objectStoreNames.has(storeName))
+								.forEach(([modelName, storeName]) => {
+									this.createObjectStoreForModel(
 										db,
 										namespaceName,
 										storeName,
 										modelName
 									);
-
-									let cursor = await origStore.openCursor();
-									let count = 0;
-
-									// Copy data from original to new
-									while (cursor && cursor.value) {
-										// we don't pass key, since they are all new entries in the new store
-										await newStore.put(cursor.value);
-
-										cursor = await cursor.continue();
-										count++;
-									}
-
-									// delete original
-									db.deleteObjectStore(tmpName);
-
-									logger.debug(`${count} ${storeName} records migrated`);
-								}
-
-								// add new models created after IndexedDB, but before migration
-								// this case may happen when a user has not opened an app for
-								// some time and a new model is added during that time
-								Object.keys(theSchema.namespaces).forEach(namespaceName => {
-									const namespace = theSchema.namespaces[namespaceName];
-									const objectStoreNames = new Set(txn.objectStoreNames);
-
-									Object.keys(namespace.models)
-										.map(modelName => {
-											return [
-												modelName,
-												getStorename(namespaceName, modelName),
-											];
-										})
-										.filter(([, storeName]) => !objectStoreNames.has(storeName))
-										.forEach(([modelName, storeName]) => {
-											this.createObjectStoreForModel(
-												db,
-												namespaceName,
-												storeName,
-												modelName
-											);
-										});
 								});
-							} catch (error) {
-								logger.error('Error migrating IndexedDB data', error);
-								txn.abort();
-								throw error;
-							}
-
-							return;
-						}
-					},
-				});
+						});
+					} catch (error) {
+						logger.error('Error migrating IndexedDB data', error);
+						txn.abort();
+						throw error;
+					}
 
-				this.resolve();
-			}
-		} catch (error) {
-			this.reject(error);
-		}
+					return;
+				}
+			},
+		});
 	}
 
-	private async _get<T>(
+	protected async _get<T>(
 		storeOrStoreName: idb.IDBPObjectStore | string,
 		keyArr: string[]
 	): Promise<T> {
@@ -297,7 +192,17 @@ class IndexedDBAdapter implements Adapter {
 
 		const result = await index.get(this.canonicalKeyPath(keyArr));
 
-		return result;
+		return <T>result;
+	}
+
+	async clear(): Promise<void> {
+		await this.checkPrivate();
+
+		this.db?.close();
+		await idb.deleteDB(this.dbName);
+
+		this.db = undefined!;
+		this.initPromise = undefined!;
 	}
 
 	async save<T extends PersistentModel>(
@@ -305,77 +210,30 @@ class IndexedDBAdapter implements Adapter {
 		condition?: ModelPredicate<T>
 	): Promise<[T, OpType.INSERT | OpType.UPDATE][]> {
 		await this.checkPrivate();
-		const modelConstructor = Object.getPrototypeOf(model)
-			.constructor as PersistentModelConstructor<T>;
-		const storeName = this.getStorenameForModel(modelConstructor);
-		const namespaceName = this.namespaceResolver(modelConstructor);
 
-		const connectedModels = traverseModel(
-			modelConstructor.name,
-			model,
-			this.schema.namespaces[namespaceName],
-			this.modelInstanceCreator,
-			this.getModelConstructorByModelName!
-		);
-
-		const set = new Set<string>();
-		const connectionStoreNames = Object.values(connectedModels).map(
-			({ modelName, item, instance }) => {
-				const storeName = getStorename(namespaceName, modelName);
-				set.add(storeName);
-				const keys = getIndexKeys(
-					this.schema.namespaces[namespaceName],
-					modelName
-				);
-				return { storeName, item, instance, keys };
-			}
-		);
+		const { storeName, set, connectionStoreNames, modelKeyValues } =
+			this.saveMetadata(model);
 
 		const tx = this.db.transaction(
 			[storeName, ...Array.from(set.values())],
 			'readwrite'
 		);
-		const store = tx.objectStore(storeName);
-
-		const keyValues = this.getIndexKeyValuesFromModel(model);
-
-		const fromDB = await this._get(store, keyValues);
 
-		if (condition && fromDB) {
-			const predicates = ModelPredicateCreator.getPredicates(condition);
-			const { predicates: predicateObjs, type } = predicates || {};
-
-			const isValid = validatePredicate(
-				fromDB as any,
-				type as any,
-				predicateObjs as any
-			);
-
-			if (!isValid) {
-				const msg = 'Conditional update failed';
-				logger.error(msg, { model: fromDB, condition: predicateObjs });
+		const store = tx.objectStore(storeName);
+		const fromDB = await this._get(store, modelKeyValues);
 
-				throw new Error(msg);
-			}
-		}
+		this.validateSaveCondition(condition, fromDB);
 
 		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 itemKeyValues = keys.map(key => {
-				const value = item[key];
-				return value;
-			});
+			const itemKeyValues: string[] = keys.map(key => item[key]);
 
 			const fromDB = <T>await this._get(store, itemKeyValues);
-			const opType: OpType =
-				fromDB === undefined ? OpType.INSERT : OpType.UPDATE;
+			const opType: OpType = fromDB ? OpType.UPDATE : OpType.INSERT;
 
-			const modelKeyValues = this.getIndexKeyValuesFromModel(model);
-
-			// Even if the parent is an INSERT, the child might not be, so we need to get its key
 			if (
 				keysEqual(itemKeyValues, modelKeyValues) ||
 				opType === OpType.INSERT
@@ -387,62 +245,38 @@ class IndexedDBAdapter implements Adapter {
 				result.push([instance, opType]);
 			}
 		}
-
 		await tx.done;
 
 		return result;
 	}
 
-	private async load<T>(
-		namespaceName: NAMESPACES,
-		srcModelName: string,
-		records: T[]
-	): Promise<T[]> {
-		const namespace = this.schema.namespaces[namespaceName];
-		const relations = namespace.relationships![srcModelName].relationTypes;
-		const connectionStoreNames = relations.map(({ modelName }) => {
-			return getStorename(namespaceName, modelName);
-		});
-		const modelConstructor = this.getModelConstructorByModelName!(
-			namespaceName,
-			srcModelName
-		);
-
-		if (connectionStoreNames.length === 0) {
-			return records.map(record =>
-				this.modelInstanceCreator(modelConstructor, record)
-			);
-		}
-
-		return records.map(record =>
-			this.modelInstanceCreator(modelConstructor, record)
-		);
-	}
-
 	async query<T extends PersistentModel>(
 		modelConstructor: PersistentModelConstructor<T>,
 		predicate?: ModelPredicate<T>,
 		pagination?: PaginationInput<T>
 	): Promise<T[]> {
 		await this.checkPrivate();
-		const storeName = this.getStorenameForModel(modelConstructor);
-		const namespaceName = this.namespaceResolver(
-			modelConstructor
-		) as NAMESPACES;
-
-		const predicates =
-			predicate && ModelPredicateCreator.getPredicates(predicate);
-		const keyPath = getIndexKeys(
-			this.schema.namespaces[namespaceName],
-			modelConstructor.name
-		);
-		const queryByKey =
-			predicates && this.keyValueFromPredicate(predicates, keyPath);
-
-		const hasSort = pagination && pagination.sort;
-		const hasPagination = pagination && pagination.limit;
+		const {
+			storeName,
+			namespaceName,
+			queryByKey,
+			predicates,
+			hasSort,
+			hasPagination,
+		} = this.queryMetadata(modelConstructor, predicate, pagination);
 
 		const records: T[] = (await (async () => {
+			//
+			// NOTE: @svidgen explored removing this and letting query() take care of automatic
+			// index leveraging. This would eliminate some amount of very similar code.
+			// But, getAll is slightly slower than get()
+			//
+			// On Chrome:
+			//   ~700ms vs ~1175ms per 10k reads.
+			//
+			// You can (and should) check my work here:
+			// 	https://gist.github.com/svidgen/74e55d573b19c3e5432b1b5bdf0f4d96
+			//
 			if (queryByKey) {
 				const record = await this.getByKey(storeName, queryByKey);
 				return record ? [record] : [];
@@ -468,40 +302,194 @@ class IndexedDBAdapter implements Adapter {
 		return await this.load(namespaceName, modelConstructor.name, records);
 	}
 
-	private async getByKey<T extends PersistentModel>(
-		storeName: string,
-		keyValue: string[]
-	): Promise<T> {
-		return <T>await this._get(storeName, keyValue);
+	async queryOne<T extends PersistentModel>(
+		modelConstructor: PersistentModelConstructor<T>,
+		firstOrLast: QueryOne = QueryOne.FIRST
+	): Promise<T | undefined> {
+		await this.checkPrivate();
+		const storeName = this.getStorenameForModel(modelConstructor);
+
+		const cursor = await this.db
+			.transaction([storeName], 'readonly')
+			.objectStore(storeName)
+			.openCursor(undefined, firstOrLast === QueryOne.FIRST ? 'next' : 'prev');
+
+		const result = cursor ? <T>cursor.value : undefined;
+
+		return result && this.modelInstanceCreator(modelConstructor, result);
 	}
 
-	private async getAll<T extends PersistentModel>(
-		storeName: string
-	): Promise<T[]> {
-		return await this.db.getAll(storeName);
+	async batchSave<T extends PersistentModel>(
+		modelConstructor: PersistentModelConstructor<any>,
+		items: ModelInstanceMetadata[]
+	): Promise<[T, OpType][]> {
+		await this.checkPrivate();
+
+		if (items.length === 0) {
+			return [];
+		}
+
+		const modelName = modelConstructor.name;
+		const namespaceName = this.namespaceResolver(modelConstructor);
+		const storeName = this.getStorenameForModel(modelConstructor);
+		const result: [T, OpType][] = [];
+
+		const txn = this.db.transaction(storeName, 'readwrite');
+		const store = txn.store;
+
+		for (const item of items) {
+			const model = this.modelInstanceCreator(modelConstructor, item);
+
+			const connectedModels = traverseModel(
+				modelName,
+				model,
+				this.schema.namespaces[namespaceName],
+				this.modelInstanceCreator,
+				this.getModelConstructorByModelName!
+			);
+
+			const keyValues = this.getIndexKeyValuesFromModel(model);
+			const { _deleted } = item;
+
+			const index = store.index('byPk');
+
+			const key = await index.getKey(this.canonicalKeyPath(keyValues));
+
+			if (!_deleted) {
+				const { instance } = connectedModels.find(({ instance }) => {
+					const instanceKeyValues = this.getIndexKeyValuesFromModel(instance);
+					return keysEqual(instanceKeyValues, keyValues);
+				})!;
+
+				result.push([
+					<T>(<unknown>instance),
+					key ? OpType.UPDATE : OpType.INSERT,
+				]);
+				await store.put(instance, key);
+			} else {
+				result.push([<T>(<unknown>item), OpType.DELETE]);
+
+				if (key) {
+					await store.delete(key);
+				}
+			}
+		}
+
+		await txn.done;
+
+		return result;
 	}
 
-	private keyValueFromPredicate<T extends PersistentModel>(
-		predicates: PredicatesGroup<T>,
-		keyPath: string[]
-	): string[] | undefined {
-		const { predicates: predicateObjs } = predicates;
+	protected async deleteItem<T extends PersistentModel>(
+		deleteQueue: {
+			storeName: string;
+			items: T[] | IDBValidKey[];
+		}[]
+	) {
+		const connectionStoreNames = deleteQueue!.map(({ storeName }) => {
+			return storeName;
+		});
+
+		const tx = this.db.transaction([...connectionStoreNames], 'readwrite');
+		for await (const deleteItem of deleteQueue!) {
+			const { storeName, items } = deleteItem;
+			const store = tx.objectStore(storeName);
 
-		if (predicateObjs.length !== keyPath.length) {
-			return;
+			for await (const item of items) {
+				if (item) {
+					let key: IDBValidKey | undefined;
+
+					if (typeof item === 'object') {
+						const keyValues = this.getIndexKeyValuesFromModel(item as T);
+						key = await store
+							.index('byPk')
+							.getKey(this.canonicalKeyPath(keyValues));
+					} else {
+						const itemKey = item.toString();
+						key = await store.index('byPk').getKey(itemKey);
+					}
+
+					if (key !== undefined) {
+						await store.delete(key);
+					}
+				}
+			}
 		}
+	}
 
-		const keyValues = [] as any[];
+	//#region platform-specific helper methods
 
-		for (const key of keyPath) {
-			const predicateObj = predicateObjs.find(
-				p => isPredicateObj(p) && p.field === key && p.operator === 'eq'
-			) as PredicateObject<T>;
+	private async checkPrivate() {
+		const isPrivate = await isPrivateMode().then(isPrivate => {
+			return isPrivate;
+		});
+		if (isPrivate) {
+			logger.error("IndexedDB not supported in this browser's private mode");
+			return Promise.reject(
+				"IndexedDB not supported in this browser's private mode"
+			);
+		} else {
+			return Promise.resolve();
+		}
+	}
 
-			predicateObj && keyValues.push(predicateObj.operand);
+	/**
+	 * Whether the browser's implementation of IndexedDB is coercing single-field
+	 * indexes to a scalar key.
+	 *
+	 * If this returns `true`, we need to treat indexes containing a single field
+	 * as scalars.
+	 *
+	 * See PR description for reference:
+	 * https://github.com/aws-amplify/amplify-js/pull/10527
+	 */
+	private async setSafariCompatabilityMode() {
+		this.safariCompatabilityMode = await isSafariCompatabilityMode();
+
+		if (this.safariCompatabilityMode === true) {
+			logger.debug('IndexedDB Adapter is running in Safari Compatability Mode');
 		}
+	}
+
+	private getNamespaceAndModelFromStorename(storeName: string) {
+		const [namespaceName, ...modelNameArr] = storeName.split('_');
+		return {
+			namespaceName,
+			modelName: modelNameArr.join('_'),
+		};
+	}
+
+	private createObjectStoreForModel(
+		db: idb.IDBPDatabase,
+		namespaceName: string,
+		storeName: string,
+		modelName: string
+	): idb.IDBPObjectStore {
+		const store = db.createObjectStore(storeName, {
+			autoIncrement: true,
+		});
+
+		const { indexes } =
+			this.schema.namespaces[namespaceName].relationships![modelName];
+
+		indexes.forEach(([idxName, keyPath, options]) => {
+			store.createIndex(idxName, keyPath, options);
+		});
+
+		return store;
+	}
+
+	private async getByKey<T extends PersistentModel>(
+		storeName: string,
+		keyValue: string[]
+	): Promise<T> {
+		return <T>await this._get(storeName, keyValue);
+	}
 
-		return keyValues.length === keyPath.length ? keyValues : undefined;
+	private async getAll<T extends PersistentModel>(
+		storeName: string
+	): Promise<T[]> {
+		return await this.db.getAll(storeName);
 	}
 
 	/**
@@ -530,12 +518,12 @@ class IndexedDBAdapter implements Adapter {
 		for (const name of store.indexNames) {
 			const idx = store.index(name);
 			const keypath = Array.isArray(idx.keyPath) ? idx.keyPath : [idx.keyPath];
-			const matchingPredicateValues: string[] = [];
+			const matchingPredicateValues: (string | number)[] = [];
 
 			for (const field of keypath) {
 				const p = predicateIndex.get(field);
-				if (p) {
-					matchingPredicateValues.push(String(p.operand));
+				if (p && p.operand !== null && p.operand !== undefined) {
+					matchingPredicateValues.push(p.operand);
 				} else {
 					break;
 				}
@@ -769,447 +757,6 @@ class IndexedDBAdapter implements Adapter {
 		return result;
 	}
 
-	async queryOne<T extends PersistentModel>(
-		modelConstructor: PersistentModelConstructor<T>,
-		firstOrLast: QueryOne = QueryOne.FIRST
-	): Promise<T | undefined> {
-		await this.checkPrivate();
-		const storeName = this.getStorenameForModel(modelConstructor);
-
-		const cursor = await this.db
-			.transaction([storeName], 'readonly')
-			.objectStore(storeName)
-			.openCursor(undefined, firstOrLast === QueryOne.FIRST ? 'next' : 'prev');
-
-		const result = cursor ? <T>cursor.value : undefined;
-
-		return result && this.modelInstanceCreator(modelConstructor, result);
-	}
-
-	async delete<T extends PersistentModel>(
-		modelOrModelConstructor: T | PersistentModelConstructor<T>,
-		condition?: ModelPredicate<T>
-	): Promise<[T[], T[]]> {
-		await this.checkPrivate();
-		const deleteQueue: { storeName: string; items: T[] }[] = [];
-
-		if (isModelConstructor(modelOrModelConstructor)) {
-			const modelConstructor =
-				modelOrModelConstructor as PersistentModelConstructor<T>;
-			const nameSpace = this.namespaceResolver(modelConstructor) as NAMESPACES;
-
-			const storeName = this.getStorenameForModel(modelConstructor);
-
-			const models = await this.query(modelConstructor, condition);
-			const relations =
-				this.schema.namespaces![nameSpace].relationships![modelConstructor.name]
-					.relationTypes;
-
-			if (condition !== undefined) {
-				await this.deleteTraverse(
-					relations,
-					models,
-					modelConstructor.name,
-					nameSpace,
-					deleteQueue
-				);
-
-				await this.deleteItem(deleteQueue);
-
-				const deletedModels = deleteQueue.reduce(
-					(acc, { items }) => acc.concat(items),
-					<T[]>[]
-				);
-
-				return [models, deletedModels];
-			} else {
-				await this.deleteTraverse(
-					relations,
-					models,
-					modelConstructor.name,
-					nameSpace,
-					deleteQueue
-				);
-
-				// Delete all
-				await this.db
-					.transaction([storeName], 'readwrite')
-					.objectStore(storeName)
-					.clear();
-
-				const deletedModels = deleteQueue.reduce(
-					(acc, { items }) => acc.concat(items),
-					<T[]>[]
-				);
-
-				return [models, deletedModels];
-			}
-		} else {
-			const model = modelOrModelConstructor as T;
-
-			const modelConstructor = Object.getPrototypeOf(model)
-				.constructor as PersistentModelConstructor<T>;
-			const namespaceName = this.namespaceResolver(
-				modelConstructor
-			) as NAMESPACES;
-
-			const storeName = this.getStorenameForModel(modelConstructor);
-
-			if (condition) {
-				const tx = this.db.transaction([storeName], 'readwrite');
-				const store = tx.objectStore(storeName);
-				const keyValues = this.getIndexKeyValuesFromModel(model);
-
-				const fromDB = await this._get(store, keyValues);
-
-				if (fromDB === undefined) {
-					const msg = 'Model instance not found in storage';
-					logger.warn(msg, { model });
-
-					return [[model], []];
-				}
-
-				const predicates = ModelPredicateCreator.getPredicates(condition);
-				const { predicates: predicateObjs, type } =
-					predicates as PredicatesGroup<T>;
-
-				const isValid = validatePredicate(fromDB as T, type, predicateObjs);
-
-				if (!isValid) {
-					const msg = 'Conditional update failed';
-					logger.error(msg, { model: fromDB, condition: predicateObjs });
-
-					throw new Error(msg);
-				}
-				await tx.done;
-
-				const relations =
-					this.schema.namespaces[namespaceName].relationships![
-						modelConstructor.name
-					].relationTypes;
-
-				await this.deleteTraverse(
-					relations,
-					[model],
-					modelConstructor.name,
-					namespaceName,
-					deleteQueue
-				);
-			} else {
-				const relations =
-					this.schema.namespaces[namespaceName].relationships![
-						modelConstructor.name
-					].relationTypes;
-
-				await this.deleteTraverse(
-					relations,
-					[model],
-					modelConstructor.name,
-					namespaceName,
-					deleteQueue
-				);
-			}
-
-			await this.deleteItem(deleteQueue);
-
-			const deletedModels = deleteQueue.reduce(
-				(acc, { items }) => acc.concat(items),
-				<T[]>[]
-			);
-
-			return [[model], deletedModels];
-		}
-	}
-
-	private async deleteItem<T extends PersistentModel>(
-		deleteQueue?: {
-			storeName: string;
-			items: T[] | IDBValidKey[];
-		}[]
-	) {
-		const connectionStoreNames = deleteQueue!.map(({ storeName }) => {
-			return storeName;
-		});
-
-		const tx = this.db.transaction([...connectionStoreNames], 'readwrite');
-		for await (const deleteItem of deleteQueue!) {
-			const { storeName, items } = deleteItem;
-			const store = tx.objectStore(storeName);
-
-			for await (const item of items) {
-				if (item) {
-					let key: IDBValidKey | undefined;
-
-					if (typeof item === 'object') {
-						const keyValues = this.getIndexKeyValuesFromModel(item as T);
-						key = await store
-							.index('byPk')
-							.getKey(this.canonicalKeyPath(keyValues));
-					} else {
-						const itemKey = item.toString();
-						key = await store.index('byPk').getKey(itemKey);
-					}
-
-					if (key !== undefined) {
-						await store.delete(key);
-					}
-				}
-			}
-		}
-	}
-
-	private async deleteTraverse<T extends PersistentModel>(
-		relations: RelationType[],
-		models: T[],
-		srcModel: string,
-		nameSpace: NAMESPACES,
-		deleteQueue: { storeName: string; items: T[] }[]
-	): Promise<void> {
-		for await (const rel of relations) {
-			const {
-				relationType,
-				modelName,
-				targetName,
-				targetNames,
-				associatedWith,
-			} = rel;
-
-			const storeName = getStorename(nameSpace, modelName);
-
-			switch (relationType) {
-				case 'HAS_ONE':
-					for await (const model of models) {
-						const hasOneIndex = 'byPk';
-
-						if (targetNames?.length) {
-							// CPK codegen
-							const values = targetNames
-								.filter(targetName => model[targetName] ?? false)
-								.map(targetName => model[targetName]);
-
-							if (values.length === 0) break;
-
-							const recordToDelete = <T>(
-								await this.db
-									.transaction(storeName, 'readwrite')
-									.objectStore(storeName)
-									.index(hasOneIndex)
-									.get(this.canonicalKeyPath(values))
-							);
-
-							await this.deleteTraverse(
-								this.schema.namespaces[nameSpace].relationships![modelName]
-									.relationTypes,
-								recordToDelete ? [recordToDelete] : [],
-								modelName,
-								nameSpace,
-								deleteQueue
-							);
-							break;
-						} else {
-							// PRE-CPK codegen
-							let index;
-							let values: string[];
-
-							if (targetName && targetName in model) {
-								index = hasOneIndex;
-								const value = model[targetName];
-								if (value === null) break;
-								values = [value];
-							} else {
-								// backwards compatability for older versions of codegen that did not emit targetName for HAS_ONE relations
-								// TODO: can we deprecate this? it's been ~2 years since codegen started including targetName for HAS_ONE
-								// If we deprecate, we'll need to re-gen the MIPR in __tests__/schema.ts > newSchema
-								// otherwise some unit tests will fail
-								index = getIndex(
-									this.schema.namespaces[nameSpace].relationships![modelName]
-										.relationTypes,
-									srcModel
-								);
-								values = this.getIndexKeyValuesFromModel(model);
-							}
-
-							if (!values || !index) break;
-
-							const recordToDelete = <T>(
-								await this.db
-									.transaction(storeName, 'readwrite')
-									.objectStore(storeName)
-									.index(index)
-									.get(this.canonicalKeyPath(values))
-							);
-
-							// instantiate models before passing to deleteTraverse
-							// necessary for extracting PK values via getIndexKeyValuesFromModel
-							const modelsToDelete = recordToDelete
-								? await this.load(nameSpace, modelName, [recordToDelete])
-								: [];
-
-							await this.deleteTraverse(
-								this.schema.namespaces[nameSpace].relationships![modelName]
-									.relationTypes,
-								modelsToDelete,
-								modelName,
-								nameSpace,
-								deleteQueue
-							);
-						}
-					}
-					break;
-				case 'HAS_MANY':
-					for await (const model of models) {
-						const index =
-							// explicit bi-directional @hasMany and @manyToMany
-							getIndex(
-								this.schema.namespaces[nameSpace].relationships![modelName]
-									.relationTypes,
-								srcModel
-							) ||
-							// uni and/or implicit @hasMany
-							getIndexFromAssociation(
-								this.schema.namespaces[nameSpace].relationships![modelName]
-									.indexes,
-								associatedWith!
-							);
-						const keyValues = this.getIndexKeyValuesFromModel(model);
-
-						const childRecords = await this.db
-							.transaction(storeName, 'readwrite')
-							.objectStore(storeName)
-							.index(index as string)
-							.getAll(this.canonicalKeyPath(keyValues));
-
-						// instantiate models before passing to deleteTraverse
-						// necessary for extracting PK values via getIndexKeyValuesFromModel
-						const childModels = await this.load(
-							nameSpace,
-							modelName,
-							childRecords
-						);
-
-						await this.deleteTraverse(
-							this.schema.namespaces[nameSpace].relationships![modelName]
-								.relationTypes,
-							childModels,
-							modelName,
-							nameSpace,
-							deleteQueue
-						);
-					}
-					break;
-				case 'BELONGS_TO':
-					// Intentionally blank
-					break;
-				default:
-					throw new Error(`Invalid relation type ${relationType}`);
-					break;
-			}
-		}
-
-		deleteQueue.push({
-			storeName: getStorename(nameSpace, srcModel),
-			items: models.map(record =>
-				this.modelInstanceCreator(
-					this.getModelConstructorByModelName!(nameSpace, srcModel),
-					record
-				)
-			),
-		});
-	}
-
-	async clear(): Promise<void> {
-		await this.checkPrivate();
-
-		this.db?.close();
-
-		await idb.deleteDB(this.dbName);
-
-		this.db = undefined!;
-		this.initPromise = undefined!;
-	}
-
-	async batchSave<T extends PersistentModel>(
-		modelConstructor: PersistentModelConstructor<any>,
-		items: ModelInstanceMetadata[]
-	): Promise<[T, OpType][]> {
-		if (items.length === 0) {
-			return [];
-		}
-
-		await this.checkPrivate();
-
-		const result: [T, OpType][] = [];
-
-		const storeName = this.getStorenameForModel(modelConstructor);
-
-		const txn = this.db.transaction(storeName, 'readwrite');
-		const store = txn.store;
-
-		for (const item of items) {
-			const namespaceName = this.namespaceResolver(modelConstructor);
-			const modelName = modelConstructor.name;
-			const model = this.modelInstanceCreator(modelConstructor, item);
-
-			const connectedModels = traverseModel(
-				modelName,
-				model,
-				this.schema.namespaces[namespaceName],
-				this.modelInstanceCreator,
-				this.getModelConstructorByModelName!
-			);
-
-			const keyValues = this.getIndexKeyValuesFromModel(model);
-			const { _deleted } = item;
-
-			const index = store.index('byPk');
-
-			const key = await index.getKey(this.canonicalKeyPath(keyValues));
-
-			if (!_deleted) {
-				const { instance } = connectedModels.find(({ instance }) => {
-					const instanceKeyValues = this.getIndexKeyValuesFromModel(instance);
-					return keysEqual(instanceKeyValues, keyValues);
-				})!;
-
-				result.push([
-					<T>(<unknown>instance),
-					key ? OpType.UPDATE : OpType.INSERT,
-				]);
-				await store.put(instance, key);
-			} else {
-				result.push([<T>(<unknown>item), OpType.DELETE]);
-
-				if (key) {
-					await store.delete(key);
-				}
-			}
-		}
-
-		await txn.done;
-
-		return result;
-	}
-
-	private createObjectStoreForModel(
-		db: idb.IDBPDatabase,
-		namespaceName: string,
-		storeName: string,
-		modelName: string
-	) {
-		const store = db.createObjectStore(storeName, {
-			autoIncrement: true,
-		});
-
-		const { indexes } =
-			this.schema.namespaces[namespaceName].relationships![modelName];
-
-		indexes.forEach(([idxName, keyPath, options]) => {
-			store.createIndex(idxName, keyPath, options);
-		});
-
-		return store;
-	}
-
 	/**
 	 * Checks the given path against the browser's IndexedDB implementation for
 	 * necessary compatibility transformations, applying those transforms if needed.
@@ -1218,12 +765,13 @@ class IndexedDBAdapter implements Adapter {
 	 * @returns An array or string, depending on and given key,
 	 * that is ensured to be compatible with the IndexedDB implementation's nuances.
 	 */
-	private canonicalKeyPath = (keyArr: string[]) => {
+	private canonicalKeyPath = (keyArr: (string | number)[]) => {
 		if (this.safariCompatabilityMode) {
 			return keyArr.length > 1 ? keyArr : keyArr[0];
 		}
 		return keyArr;
 	};
+	//#endregion
 }
 
 export default new IndexedDBAdapter();