dexie 4.0.1-alpha.8 → 4.0.1-beta.1

package/README.md

@@ -1,7 +1,7 @@
 Dexie.js
 ========
 
-[![NPM Version][npm-image]][npm-url] [![Build Status](https://travis-ci.com/dexie/Dexie.js.svg?branch=master)](https://travis-ci.com/dexie/Dexie.js)[![Tested with Browserstack](https://dexie.org/assets/images/tested-with-browserstack2.png)](https://www.browserstack.com)
+[![NPM Version][npm-image]][npm-url] ![Build Status](https://github.com/dexie/Dexie.js/actions/workflows/main.yml/badge.svg)
 
 Dexie.js is a wrapper library for indexedDB - the standard database in the browser. https://dexie.org
 

package/dist/dexie.d.ts

@@ -4,7 +4,7 @@
  *
  * By David Fahlander, david.fahlander@gmail.com
  *
- * Version 4.0.1-alpha.8, Fri Feb 17 2023
+ * Version 4.0.1-beta.1, Wed Oct 18 2023
  *
  * https://dexie.org
  *
@@ -65,6 +65,7 @@ export interface Transaction {
 	mode: IDBTransactionMode;
 	//tables: { [type: string]: Table<any, any> }; Deprecated since 2.0. Obsolete from v3.0.
 	storeNames: Array<string>;
+	explicit?: boolean;
 	parent?: Transaction;
 	on: TransactionEvents;
 	abort(): void;
@@ -357,7 +358,8 @@ export interface PromiseExtended<T = any> extends Promise<T> {
 	timeout(ms: number, msg?: string): PromiseExtended<T>;
 }
 export type KeyPaths<T> = {
-	[P in keyof T]: P extends string ? T[P] extends any[] ? P | `${P}.${number}` | `${P}.${number}.${KeyPaths<T[P][number]>}` : T[P] extends (...args: any[]) => any // Method
+	[P in keyof T]: P extends string ? T[P] extends Array<infer K> ? K extends object // only drill into the array element if it's an object
+	 ? P | `${P}.${number}` | `${P}.${number}.${KeyPaths<K>}` : P | `${P}.${number}` : T[P] extends (...args: any[]) => any // Method
 	 ? never : T[P] extends object ? P | `${P}.${KeyPaths<T[P]>}` : P : never;
 }[keyof T];
 export type KeyPathValue<T, PATH> = PATH extends `${infer R}.${infer S}` ? R extends keyof T ? KeyPathValue<T[R], S> : T extends any[] ? PATH extends `${number}.${infer S}` ? KeyPathValue<T[number], S> : void : void : PATH extends `${number}` ? T extends any[] ? T[number] : void : PATH extends keyof T ? T[PATH] : void;
@@ -416,6 +418,88 @@ export interface Collection<T = any, TKey = IndexableType> {
 	}) => void | boolean): PromiseExtended<number>;
 	modify(changes: UpdateSpec<T>): PromiseExtended<number>;
 }
+export type IntervalTree = IntervalTreeNode | EmptyRange;
+export interface IntervalTreeNode {
+	from: IndexableType; // lower bound
+	to: IndexableType; // upper bound
+	l: IntervalTreeNode | null; // left
+	r: IntervalTreeNode | null; // right
+	d: number; // depth
+}
+export interface EmptyRange {
+	d: 0;
+}
+export interface DexieOnReadyEvent {
+	subscribe(fn: (vipDb: Dexie) => any, bSticky: boolean): void;
+	unsubscribe(fn: (vipDb: Dexie) => any): void;
+	fire(vipDb: Dexie): any;
+}
+export interface DexieVersionChangeEvent {
+	subscribe(fn: (event: IDBVersionChangeEvent) => any): void;
+	unsubscribe(fn: (event: IDBVersionChangeEvent) => any): void;
+	fire(event: IDBVersionChangeEvent): any;
+}
+export interface DexiePopulateEvent {
+	subscribe(fn: (trans: Transaction) => any): void;
+	unsubscribe(fn: (trans: Transaction) => any): void;
+	fire(trans: Transaction): any;
+}
+export interface DexieCloseEvent {
+	subscribe(fn: (event: Event) => any): void;
+	unsubscribe(fn: (event: Event) => any): void;
+	fire(event: Event): any;
+}
+export interface DbEvents extends DexieEventSet {
+	(eventName: "ready", subscriber: (vipDb: Dexie) => any, bSticky?: boolean): void;
+	(eventName: "populate", subscriber: (trans: Transaction) => any): void;
+	(eventName: "blocked", subscriber: (event: IDBVersionChangeEvent) => any): void;
+	(eventName: "versionchange", subscriber: (event: IDBVersionChangeEvent) => any): void;
+	(eventName: "close", subscriber: (event: Event) => any): void;
+	ready: DexieOnReadyEvent;
+	populate: DexiePopulateEvent;
+	blocked: DexieEvent;
+	versionchange: DexieVersionChangeEvent;
+	close: DexieCloseEvent;
+}
+/** Set of mutated parts of the database
+ */
+export type ObservabilitySet = {
+	/** Database part having been mutated.
+	 *
+	 * This structure is produced in observability-middleware.ts
+	 * and consumed in live-query.ts.
+	 *
+	 * Format of 'part':
+	 *
+	 *   `idb://${dbName}/${tableName}/${indexName}`
+	 *
+	 * * dbName is the database name
+	 * * tableName is the table name
+	 * * indexName is any of:
+	 *    1. An empty string - represents the primary keys of the affected objs
+	 *    2. ":dels" - represents primary keys of deleted objects in the table
+	 *    3. The keyPath of an index, such as "name", "age" or "address.city" -
+	 *       represents indexes that, if used in a query, might affect the
+	 *       result of that query.
+	 *
+	 * IntervalTree
+	 *    * See definition of IntervalTree type in rangeset.d.ts
+	 *    * See rangesOverlap() in rangeset.ts that can be used to compare two
+	 *      IntervalTrees and detect collissions.
+	 *    * See RangeSet class that can be used to create an IntervalTree and add
+	 *      ranges to it.
+	 */
+	[part: string]: IntervalTree;
+};
+export interface DexieOnStorageMutatedEvent {
+	subscribe(fn: (parts: ObservabilitySet) => any): void;
+	unsubscribe(fn: (parts: ObservabilitySet) => any): void;
+	fire(parts: ObservabilitySet): any;
+}
+export interface GlobalDexieEvents extends DexieEventSet {
+	(eventName: "storagemutated", subscriber: (parts: ObservabilitySet) => any): void;
+	storagemutated: DexieOnStorageMutatedEvent;
+}
 export const enum DBCoreRangeType {
 	Equal = 1,
 	Range = 2,
@@ -449,6 +533,7 @@ export interface DBCoreAddRequest {
 	trans: DBCoreTransaction;
 	values: readonly any[];
 	keys?: any[];
+	mutatedParts?: ObservabilitySet;
 	/** @deprecated Will always get results since 3.1.0-alpha.5 */
 	wantResults?: boolean;
 }
@@ -457,6 +542,7 @@ export interface DBCorePutRequest {
 	trans: DBCoreTransaction;
 	values: readonly any[];
 	keys?: any[];
+	mutatedParts?: ObservabilitySet;
 	criteria?: {
 		index: string | null;
 		range: DBCoreKeyRange;
@@ -477,6 +563,7 @@ export interface DBCoreDeleteRequest {
 	type: "delete";
 	trans: DBCoreTransaction;
 	keys: any[];
+	mutatedParts?: ObservabilitySet;
 	criteria?: {
 		index: string | null;
 		range: DBCoreKeyRange;
@@ -486,15 +573,18 @@ export interface DBCoreDeleteRangeRequest {
 	type: "deleteRange";
 	trans: DBCoreTransaction;
 	range: DBCoreKeyRange;
+	mutatedParts?: ObservabilitySet;
 }
 export interface DBCoreGetManyRequest {
 	trans: DBCoreTransaction;
 	keys: any[];
 	cache?: "immutable" | "clone";
+	obsSet?: ObservabilitySet;
 }
 export interface DBCoreGetRequest {
 	trans: DBCoreTransaction;
 	key: any;
+	obsSet?: ObservabilitySet;
 }
 export interface DBCoreQuery {
 	index: DBCoreIndex; //keyPath: null | string | string[]; // null represents primary key. string a property, string[] several properties.
@@ -505,6 +595,7 @@ export interface DBCoreQueryRequest {
 	values?: boolean;
 	limit?: number;
 	query: DBCoreQuery;
+	obsSet?: ObservabilitySet;
 }
 export interface DBCoreQueryResponse {
 	result: any[];
@@ -515,10 +606,12 @@ export interface DBCoreOpenCursorRequest {
 	unique?: boolean;
 	reverse?: boolean;
 	query: DBCoreQuery;
+	obsSet?: ObservabilitySet;
 }
 export interface DBCoreCountRequest {
 	trans: DBCoreTransaction;
 	query: DBCoreQuery;
+	obsSet?: ObservabilitySet;
 }
 export interface DBCoreCursor {
 	readonly trans: DBCoreTransaction;
@@ -563,6 +656,8 @@ export interface DBCoreIndex {
 	readonly multiEntry?: boolean;
 	/** Extract (using keyPath) a key from given value (object). Null for outbound primary keys */
 	readonly extractKey: ((value: any) => any) | null;
+	/** If this index is a virtual index, lowLevelIndex represents the actual IndexedDB index behind it */
+	readonly lowLevelIndex?: DBCoreIndex;
 }
 export interface DBCore {
 	stack: "dbcore";
@@ -584,7 +679,7 @@ export interface DBCoreTable {
 	openCursor(req: DBCoreOpenCursorRequest): Promise<DBCoreCursor | null>;
 	count(req: DBCoreCountRequest): Promise<number>;
 }
-export interface Table<T = any, TKey = IndexableType, TInsertType = T> {
+export interface Table<T = any, TKey = any, TInsertType = T> {
 	db: Dexie;
 	name: string;
 	schema: TableSchema;
@@ -656,88 +751,6 @@ export interface Version {
 	}): Version;
 	upgrade(fn: (trans: Transaction) => PromiseLike<any> | void): Version;
 }
-export type IntervalTree = IntervalTreeNode | EmptyRange;
-export interface IntervalTreeNode {
-	from: IndexableType; // lower bound
-	to: IndexableType; // upper bound
-	l: IntervalTreeNode | null; // left
-	r: IntervalTreeNode | null; // right
-	d: number; // depth
-}
-export interface EmptyRange {
-	d: 0;
-}
-export interface DexieOnReadyEvent {
-	subscribe(fn: (vipDb: Dexie) => any, bSticky: boolean): void;
-	unsubscribe(fn: (vipDb: Dexie) => any): void;
-	fire(vipDb: Dexie): any;
-}
-export interface DexieVersionChangeEvent {
-	subscribe(fn: (event: IDBVersionChangeEvent) => any): void;
-	unsubscribe(fn: (event: IDBVersionChangeEvent) => any): void;
-	fire(event: IDBVersionChangeEvent): any;
-}
-export interface DexiePopulateEvent {
-	subscribe(fn: (trans: Transaction) => any): void;
-	unsubscribe(fn: (trans: Transaction) => any): void;
-	fire(trans: Transaction): any;
-}
-export interface DexieCloseEvent {
-	subscribe(fn: (event: Event) => any): void;
-	unsubscribe(fn: (event: Event) => any): void;
-	fire(event: Event): any;
-}
-export interface DbEvents extends DexieEventSet {
-	(eventName: "ready", subscriber: (vipDb: Dexie) => any, bSticky?: boolean): void;
-	(eventName: "populate", subscriber: (trans: Transaction) => any): void;
-	(eventName: "blocked", subscriber: (event: IDBVersionChangeEvent) => any): void;
-	(eventName: "versionchange", subscriber: (event: IDBVersionChangeEvent) => any): void;
-	(eventName: "close", subscriber: (event: Event) => any): void;
-	ready: DexieOnReadyEvent;
-	populate: DexiePopulateEvent;
-	blocked: DexieEvent;
-	versionchange: DexieVersionChangeEvent;
-	close: DexieCloseEvent;
-}
-/** Set of mutated parts of the database
- */
-export type ObservabilitySet = {
-	/** Database part having been mutated.
-	 *
-	 * This structure is produced in observability-middleware.ts
-	 * and consumed in live-query.ts.
-	 *
-	 * Format of 'part':
-	 *
-	 *   `idb://${dbName}/${tableName}/${indexName}`
-	 *
-	 * * dbName is the database name
-	 * * tableName is the table name
-	 * * indexName is any of:
-	 *    1. An empty string - represents the primary keys of the affected objs
-	 *    2. ":dels" - represents primary keys of deleted objects in the table
-	 *    3. The keyPath of an index, such as "name", "age" or "address.city" -
-	 *       represents indexes that, if used in a query, might affect the
-	 *       result of that query.
-	 *
-	 * IntervalTree
-	 *    * See definition of IntervalTree type in rangeset.d.ts
-	 *    * See rangesOverlap() in rangeset.ts that can be used to compare two
-	 *      IntervalTrees and detect collissions.
-	 *    * See RangeSet class that can be used to create an IntervalTree and add
-	 *      ranges to it.
-	 */
-	[part: string]: IntervalTree;
-};
-export interface DexieOnStorageMutatedEvent {
-	subscribe(fn: (parts: ObservabilitySet) => any): void;
-	unsubscribe(fn: (parts: ObservabilitySet) => any): void;
-	fire(parts: ObservabilitySet): any;
-}
-export interface GlobalDexieEvents extends DexieEventSet {
-	(eventName: "storagemutated", subscriber: (parts: ObservabilitySet) => any): void;
-	storagemutated: DexieOnStorageMutatedEvent;
-}
 export type TransactionMode = "readonly" | "readwrite" | "r" | "r!" | "r?" | "rw" | "rw!" | "rw?";
 export type DbSchema = {
 	[tableName: string]: TableSchema;
@@ -788,7 +801,9 @@ export interface Dexie {
 	transaction<U>(mode: TransactionMode, table: string | Table, table2: string | Table, table3: string | Table, scope: (trans: TXWithTables<this>) => PromiseLike<U> | U): PromiseExtended<U>;
 	transaction<U>(mode: TransactionMode, table: string | Table, table2: string | Table, table3: string | Table, table4: string | Table, scope: (trans: TXWithTables<this>) => PromiseLike<U> | U): PromiseExtended<U>;
 	transaction<U>(mode: TransactionMode, table: string | Table, table2: string | Table, table3: string | Table, table5: string | Table, scope: (trans: TXWithTables<this>) => PromiseLike<U> | U): PromiseExtended<U>;
-	close(): void;
+	close(closeOptions?: {
+		disableAutoOpen: boolean;
+	}): void;
 	delete(): PromiseExtended<void>;
 	isOpen(): boolean;
 	hasBeenClosed(): boolean;
@@ -967,10 +982,18 @@ declare global {
 		readonly observable: symbol;
 	}
 }
+export interface Subscribable<T> {
+	subscribe(observer: Partial<Observer<T>>): Unsubscribable;
+}
+export interface Unsubscribable {
+	unsubscribe(): void;
+}
 export interface Observable<T = any> {
-	subscribe(onNext?: ((value: T) => void) | null, onError?: ((error: any) => void) | null, onComplete?: (() => void) | null): Subscription;
-	subscribe(observer?: Observer<T> | null): Subscription;
-	[Symbol.observable]: () => Observable<T>;
+	subscribe(observerOrNext?: Observer<T> | ((value: T) => void)): Subscription;
+	subscribe(next?: ((value: T) => void) | null, error?: ((error: any) => void) | null, complete?: (() => void) | null): Subscription;
+	getValue?(): T;
+	hasValue?(): boolean;
+	[Symbol.observable]: () => Subscribable<T>;
 }
 export interface Subscription {
 	unsubscribe(): void;
@@ -982,6 +1005,41 @@ export interface Observer<T = any> {
 	error?: (error: any) => void;
 	complete?: () => void;
 }
+export type GlobalQueryCache = {
+	// TODO: Change to parts: {[part: string]: TblQueryCache}
+	//       och unsignaledParts: ObservabilitySet;
+	[part: string]: TblQueryCache; // part is `idb://${dbName}/${tableName}`
+};
+export interface TblQueryCache {
+	queries: {
+		query: {
+			[indexName: string]: CacheEntry[];
+		};
+		count: {
+			[indexName: string]: CacheEntry[];
+		};
+	};
+	objs: Map<string | number, object>;
+	optimisticOps: DBCoreMutateRequest[];
+	unsignaledParts: ObservabilitySet;
+	signalTimer?: number;
+}
+export interface CacheEntryCommon {
+	subscribers: Set<() => void>;
+	obsSet: ObservabilitySet;
+	//txObsSet: ObservabilitySet;
+	promise: Promise<any>;
+	dirty: boolean;
+}
+export type CacheEntry = CacheEntryCommon & ({
+	type: "query";
+	req: DBCoreQueryRequest;
+	res?: readonly any[];
+} | {
+	type: "count";
+	req: DBCoreCountRequest;
+	res?: number;
+});
 export type ChromeTransactionDurability = "default" | "strict" | "relaxed";
 export interface DexieOptions {
 	addons?: Array<(db: Dexie) => void>;
@@ -997,6 +1055,7 @@ export interface DexieOptions {
 	allowEmptyDB?: boolean;
 	modifyChunkSize?: number;
 	chromeTransactionDurability?: ChromeTransactionDurability;
+	cache?: "immutable" | "cloned" | "disabled";
 }
 export interface DexieConstructor extends DexieExceptionClasses {
 	new (databaseName: string, options?: DexieOptions): Dexie;
@@ -1025,6 +1084,8 @@ export interface DexieConstructor extends DexieExceptionClasses {
 	delete(dbName: string): Promise<void>;
 	dependencies: DexieDOMDependencies;
 	default: Dexie; // Work-around for different build tools handling default imports differently.
+	cache: GlobalQueryCache;
+	debug: false | true | "dexie";
 	Promise: PromiseExtendedConstructor;
 	//TableSchema: {}; // Deprecate!
 	//IndexSpec: {new():IndexSpec}; //? Deprecate