@verdant-web/store 2.5.8 → 2.7.0

package/src/queries/BaseQuery.ts

@@ -182,7 +182,20 @@ export abstract class BaseQuery<T> extends Disposable {
 		}
 		// no status change needed if already in a 'running' status.
 
-		this._executionPromise = this.run().then(() => this._value);
+		this._executionPromise = this.run()
+			.then(() => this._value)
+			.catch((err) => {
+				if (err instanceof Error) {
+					if (
+						err.name === 'InvalidStateError' ||
+						err.name === 'InvalidAccessError'
+					) {
+						// possibly accessing db while it's closed. not much we can do.
+						return this._value;
+					}
+				}
+				throw err;
+			});
 		return this._executionPromise;
 	};
 	protected abstract run(): Promise<void>;

package/src/sync/Sync.ts

@@ -48,15 +48,19 @@ export interface SyncTransport {
 	readonly status: 'active' | 'paused';
 }
 
-export interface Sync extends SyncTransport {
+export interface Sync<Presence = any, Profile = any> extends SyncTransport {
 	setMode(mode: SyncTransportMode): void;
 	setPullInterval(interval: number): void;
 	readonly pullInterval: number;
 	uploadFile(data: FileData): Promise<FileUploadResult>;
 	getFile(fileId: string): Promise<FilePullResult>;
+	readonly presence: PresenceManager<Profile, Presence>;
 }
 
-export class NoSync extends EventSubscriber<SyncEvents> implements Sync {
+export class NoSync<Presence = any, Profile = any>
+	extends EventSubscriber<SyncEvents>
+	implements Sync<Presence, Profile>
+{
 	readonly mode = 'pull';
 
 	public send(): void {}
@@ -76,9 +80,9 @@ export class NoSync extends EventSubscriber<SyncEvents> implements Sync {
 	public readonly status = 'paused';
 	public readonly pullInterval = 0;
 
-	public readonly presence = new PresenceManager({
-		initialPresence: {},
-		defaultProfile: {},
+	public readonly presence = new PresenceManager<Profile, Presence>({
+		initialPresence: {} as any,
+		defaultProfile: {} as any,
 	});
 
 	uploadFile = async () => {
@@ -152,11 +156,11 @@ export interface ServerSyncOptions<Profile = any, Presence = any>
 	useBroadcastChannel?: boolean;
 }
 
-export class ServerSync<Profile = any, Presence = any>
+export class ServerSync<Presence = any, Profile = any>
 	extends EventSubscriber<
 		SyncEvents & { syncingChange: (syncing: boolean) => void }
 	>
-	implements Sync
+	implements Sync<Presence, Profile>
 {
 	private webSocketSync: WebSocketSync;
 	private pushPullSync: PushPullSync;
@@ -173,7 +177,7 @@ export class ServerSync<Profile = any, Presence = any>
 
 	private meta: Metadata;
 
-	readonly presence;
+	readonly presence: PresenceManager<Profile, Presence>;
 
 	private log;
 
@@ -208,7 +212,7 @@ export class ServerSync<Profile = any, Presence = any>
 		this.meta = meta;
 		this.onData = onData;
 		this.log = log || (() => {});
-		this.presence = new PresenceManager<Profile, Presence>({
+		this.presence = new PresenceManager({
 			initialPresence,
 			defaultProfile,
 			updateBatchTimeout: presenceUpdateBatchTimeout,

package/src/sync/WebSocketSync.ts

@@ -216,6 +216,7 @@ export class WebSocketSync
 	};
 
 	dispose = () => {
+		this.socket?.removeEventListener('message', this.onMessage);
 		this.socket?.removeEventListener('close', this.onClose);
 		this.socket?.close();
 	};

package/dist/cjs/entities/FakeWeakRef.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"FakeWeakRef.js","sourceRoot":"","sources":["../../../src/entities/FakeWeakRef.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,MAAa,OAAO;IACnB,YAAY,KAAQ;QACnB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACpB,CAAC;IAID,KAAK;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;CACD;AAVD,0BAUC"}

package/dist/cjs/indexes.d.ts

@@ -1,3 +0,0 @@
-import { StorageCollectionSchema } from '@verdant-web/common';
-export declare function computeSynthetics(schema: StorageCollectionSchema, obj: any): Record<string, any>;
-export declare function computeCompoundIndices(schema: StorageCollectionSchema<any, any, any>, doc: any): any;

package/dist/cjs/indexes.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.computeCompoundIndices = exports.computeSynthetics = void 0;
-const common_1 = require("@verdant-web/common");
-function computeSynthetics(schema, obj) {
-    const result = {};
-    for (const [name, property] of Object.entries(schema.synthetics || {})) {
-        result[name] = property.compute(obj);
-    }
-    return result;
-}
-exports.computeSynthetics = computeSynthetics;
-function computeCompoundIndices(schema, doc) {
-    return Object.entries(schema.compounds || {}).reduce((acc, [indexKey, index]) => {
-        acc[indexKey] = (0, common_1.createCompoundIndexValue)(...index.of.map((key) => doc[key]));
-        return acc;
-    }, {});
-}
-exports.computeCompoundIndices = computeCompoundIndices;
-//# sourceMappingURL=indexes.js.map

package/dist/cjs/indexes.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"indexes.js","sourceRoot":"","sources":["../../src/indexes.ts"],"names":[],"mappings":";;;AAAA,gDAM6B;AAE7B,SAAgB,iBAAiB,CAAC,MAA+B,EAAE,GAAQ;IAC1E,MAAM,MAAM,GAAwB,EAAE,CAAC;IACvC,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE;QACvE,MAAM,CAAC,IAAI,CAAC,GAAI,QAA6C,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;KAC3E;IACD,OAAO,MAAM,CAAC;AACf,CAAC;AAND,8CAMC;AAED,SAAgB,sBAAsB,CACrC,MAA8C,EAC9C,GAAQ;IAER,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,CAElD,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE;QAC5B,GAAG,CAAC,QAAQ,CAAC,GAAG,IAAA,iCAAwB,EACvC,GAAI,KAA2C,CAAC,EAAE,CAAC,GAAG,CACrD,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAoB,CACpC,CACD,CAAC;QACF,OAAO,GAAG,CAAC;IACZ,CAAC,EAAE,EAAwC,CAAC,CAAC;AAC9C,CAAC;AAdD,wDAcC"}

package/dist/esm/entities/FakeWeakRef.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"FakeWeakRef.js","sourceRoot":"","sources":["../../../src/entities/FakeWeakRef.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,OAAO,OAAO;IACnB,YAAY,KAAQ;QACnB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACpB,CAAC;IAID,KAAK;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;CACD"}

package/dist/esm/indexes.d.ts

@@ -1,3 +0,0 @@
-import { StorageCollectionSchema } from '@verdant-web/common';
-export declare function computeSynthetics(schema: StorageCollectionSchema, obj: any): Record<string, any>;
-export declare function computeCompoundIndices(schema: StorageCollectionSchema<any, any, any>, doc: any): any;

package/dist/esm/indexes.js

@@ -1,15 +0,0 @@
-import { createCompoundIndexValue, } from '@verdant-web/common';
-export function computeSynthetics(schema, obj) {
-    const result = {};
-    for (const [name, property] of Object.entries(schema.synthetics || {})) {
-        result[name] = property.compute(obj);
-    }
-    return result;
-}
-export function computeCompoundIndices(schema, doc) {
-    return Object.entries(schema.compounds || {}).reduce((acc, [indexKey, index]) => {
-        acc[indexKey] = createCompoundIndexValue(...index.of.map((key) => doc[key]));
-        return acc;
-    }, {});
-}
-//# sourceMappingURL=indexes.js.map

package/dist/esm/indexes.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"indexes.js","sourceRoot":"","sources":["../../src/indexes.ts"],"names":[],"mappings":"AAAA,OAAO,EAGN,wBAAwB,GAGxB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,UAAU,iBAAiB,CAAC,MAA+B,EAAE,GAAQ;IAC1E,MAAM,MAAM,GAAwB,EAAE,CAAC;IACvC,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE;QACvE,MAAM,CAAC,IAAI,CAAC,GAAI,QAA6C,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;KAC3E;IACD,OAAO,MAAM,CAAC;AACf,CAAC;AAED,MAAM,UAAU,sBAAsB,CACrC,MAA8C,EAC9C,GAAQ;IAER,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,CAElD,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE;QAC5B,GAAG,CAAC,QAAQ,CAAC,GAAG,wBAAwB,CACvC,GAAI,KAA2C,CAAC,EAAE,CAAC,GAAG,CACrD,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAoB,CACpC,CACD,CAAC;QACF,OAAO,GAAG,CAAC;IACZ,CAAC,EAAE,EAAwC,CAAC,CAAC;AAC9C,CAAC"}

package/src/indexes.ts

@@ -1,31 +0,0 @@
-import {
-	CollectionCompoundIndex,
-	CompoundIndexValue,
-	createCompoundIndexValue,
-	StorageCollectionSchema,
-	StorageSyntheticIndexSchema,
-} from '@verdant-web/common';
-
-export function computeSynthetics(schema: StorageCollectionSchema, obj: any) {
-	const result: Record<string, any> = {};
-	for (const [name, property] of Object.entries(schema.synthetics || {})) {
-		result[name] = (property as StorageSyntheticIndexSchema<any>).compute(obj);
-	}
-	return result;
-}
-
-export function computeCompoundIndices(
-	schema: StorageCollectionSchema<any, any, any>,
-	doc: any,
-): any {
-	return Object.entries(schema.compounds || {}).reduce<
-		Record<string, CompoundIndexValue>
-	>((acc, [indexKey, index]) => {
-		acc[indexKey] = createCompoundIndexValue(
-			...(index as CollectionCompoundIndex<any, any>).of.map(
-				(key) => doc[key] as string | number,
-			),
-		);
-		return acc;
-	}, {} as Record<string, CompoundIndexValue>);
-}