@verdant-web/store 4.1.2 → 4.1.4

package/dist/esm/sync/FileSync.js

@@ -8,7 +8,6 @@ export class FileSync extends Disposable {
             this.ctx.log('debug', 'Uploading file', data.id, data.name);
             try {
                 await this.uploadFile(data);
-                this.ctx.internalEvents.emit(`fileUploaded:${data.id}`, data);
             }
             catch (e) {
                 this.ctx.log('error', 'File upload failed', e);
@@ -37,6 +36,8 @@ export class FileSync extends Disposable {
                     },
                 });
                 if (response.ok) {
+                    this.ctx.internalEvents.emit(`fileUploaded:${data.id}`, data);
+                    this.ctx.internalEvents.emit('fileUploaded', data);
                     this.ctx.log('info', 'File upload successful');
                     return {
                         success: true,

package/dist/esm/sync/FileSync.js.map

@@ -1 +1 @@
-{"version":3,"file":"FileSync.js","sourceRoot":"","sources":["../../../src/sync/FileSync.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FileSync.js","sourceRoot":"","sources":["../../../src/sync/FileSync.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verdant-web/store",
-  "version": "4.1.2",
+  "version": "4.1.4",
   "access": "public",
   "type": "module",
   "main": "dist/esm/index.js",
@@ -34,7 +34,7 @@
     "jszip": "^3.10.1",
     "jwt-decode": "^3.1.2",
     "weak-event": "^2.0.5",
-    "@verdant-web/common": "2.7.0"
+    "@verdant-web/common": "2.7.1"
   },
   "devDependencies": {
     "@types/node": "20.10.5",

package/src/__tests__/fixtures/testStorage.ts

@@ -2,11 +2,17 @@ import { createMigration, schema } from '@verdant-web/common';
 // @ts-ignore
 import { IDBFactory } from 'fake-indexeddb';
 import {
-	ClientWithCollections,
 	ClientDescriptor,
+	ClientWithCollections,
 	IdbPersistence,
 } from '../../index.js';
 
+const test = schema.fields.object({
+	fields: {
+		foo: schema.fields.string(),
+	},
+});
+
 export const todoCollection = schema.collection({
 	name: 'todo',
 	primaryKey: 'id',

package/src/__tests__/queries.test.ts

@@ -1,7 +1,7 @@
-import { describe, it, expect } from 'vitest';
-import { createTestStorage } from './fixtures/testStorage.js';
-import type { ClientWithCollections } from '../index.js';
 import { assert } from '@verdant-web/common';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import type { ClientWithCollections } from '../index.js';
+import { createTestStorage } from './fixtures/testStorage.js';
 
 async function addTestingItems(storage: ClientWithCollections) {
 	let items = [];
@@ -55,6 +55,10 @@ async function addTestingItems(storage: ClientWithCollections) {
 	return items;
 }
 
+afterEach(() => {
+	vi.useRealTimers();
+});
+
 describe('storage queries', () => {
 	it('can query synthetic indexes', async () => {
 		const storage = await createTestStorage();
@@ -255,6 +259,69 @@ describe('storage queries', () => {
 			items[5].get('id'),
 		]);
 	});
+
+	it('disposes of unsubscribed queries after a period', async () => {
+		const storage = await createTestStorage();
+		const items = await addTestingItems(storage);
+
+		vi.useFakeTimers();
+
+		const query = storage.todos.findAll({
+			index: {
+				where: 'categorySortedByDone',
+				match: {
+					category: 'general',
+				},
+				order: 'asc',
+			},
+		});
+
+		expect(storage.queries.activeKeys).toContain(query.key);
+
+		// since the query is not subscribed, it should be disposed after a period (defaults 5s)
+		vi.advanceTimersByTime(5001);
+
+		expect(storage.queries.activeKeys).not.toContain(query.key);
+
+		vi.useRealTimers();
+	});
+
+	it('keeps unsubscribed queries alive when told to', async () => {
+		const storage = await createTestStorage();
+		const items = await addTestingItems(storage);
+
+		vi.useFakeTimers();
+
+		const query = storage.todos.findAll({
+			index: {
+				where: 'categorySortedByDone',
+				match: {
+					category: 'general',
+				},
+				order: 'asc',
+			},
+		});
+
+		expect(storage.queries.activeKeys).toContain(query.key);
+		storage.queries.keepAlive(query.key);
+
+		// since the query is not subscribed, it should be disposed after a period (defaults 5s)
+		// overshoot that to be sure
+		vi.advanceTimersByTime(10 * 1000);
+
+		expect(storage.queries.activeKeys).toContain(query.key);
+
+		// remove hold
+		storage.queries.dropKeepAlive(query.key);
+
+		// doesn't get disposed immediately
+		expect(storage.queries.activeKeys).toContain(query.key);
+
+		// should be disposed after the normal period
+		vi.advanceTimersByTime(5001);
+
+		expect(storage.queries.activeKeys).not.toContain(query.key);
+	});
 });
 
 describe('query reactivity', () => {

package/src/__tests__/schema.test.ts

@@ -0,0 +1,85 @@
+import {
+	createMigration,
+	schema,
+	StorageMapFieldSchema,
+	StorageObjectFieldSchema,
+	StorageStringFieldSchema,
+} from '@verdant-web/common';
+import { describe, expect, it } from 'vitest';
+import { ClientDescriptor } from '../client/ClientDescriptor.js';
+import { ClientWithCollections } from '../index.js';
+import { IdbPersistence } from '../persistence/idb/idbPersistence.js';
+
+describe('schema', () => {
+	it('supports recursive nested fields without breaking', async () => {
+		type NestedField = StorageObjectFieldSchema<{
+			foo: StorageStringFieldSchema;
+			bar: StorageMapFieldSchema<NestedField>;
+		}>;
+		const baseField = schema.fields.object({
+			fields: {
+				foo: schema.fields.string(),
+			},
+		});
+		const nestedField: NestedField = schema.fields.replaceObjectFields(
+			baseField,
+			{
+				foo: schema.fields.string(),
+				bar: schema.fields.map({
+					values: baseField,
+				}),
+			},
+		);
+
+		const tests = schema.collection({
+			name: 'tests',
+			primaryKey: 'id',
+			fields: {
+				id: schema.fields.string(),
+				nested: nestedField,
+			},
+			indexes: {
+				testLevel3: {
+					type: 'string',
+					compute: (doc) => doc.nested.bar?.baz?.bar?.baz?.foo ?? '',
+				},
+			},
+		});
+
+		const testSchema = schema({
+			version: 1,
+			collections: {
+				tests,
+			},
+		});
+
+		const storage: ClientWithCollections = (await new ClientDescriptor({
+			schema: testSchema,
+			migrations: [createMigration<{}>(testSchema)],
+			namespace: 'schematest',
+			oldSchemas: [testSchema],
+			persistence: new IdbPersistence(new IDBFactory()),
+		}).open()) as any;
+
+		const doc = await storage.tests.put({
+			id: 'test',
+			nested: {
+				foo: 'foo',
+				bar: {
+					baz: {
+						foo: 'bar',
+						bar: {
+							baz: {
+								foo: 'bar',
+							},
+						},
+					},
+				},
+			},
+		});
+
+		expect(
+			doc.get('nested').get('bar').get('baz').get('bar').get('baz').get('foo'),
+		).toBe('bar');
+	});
+});

package/src/client/Client.ts

@@ -10,12 +10,12 @@ import { DocumentManager } from '../entities/DocumentManager.js';
 import { EntityStore } from '../entities/EntityStore.js';
 import { FileManager } from '../files/FileManager.js';
 import { deleteAllDatabases } from '../persistence/idb/util.js';
+import { ExportedData } from '../persistence/interfaces.js';
+import { importPersistence } from '../persistence/persistence.js';
 import { CollectionQueries } from '../queries/CollectionQueries.js';
-import { QueryCache } from '../queries/QueryCache.js';
+import { PublicQueryCacheAPI, QueryCache } from '../queries/QueryCache.js';
 import { NoSync, ServerSync, Sync } from '../sync/Sync.js';
 import { getLatestVersion } from '../utils/versions.js';
-import { ExportedData } from '../persistence/interfaces.js';
-import { importPersistence } from '../persistence/persistence.js';
 
 // not actually used below, but helpful for internal code which
 // might rely on this stuff...
@@ -91,7 +91,7 @@ export class Client<Presence = any, Profile = any> extends EventSubscriber<{
 				? new ServerSync<Presence, Profile>(this.context.config.sync, {
 						onData: this.addData,
 						ctx: this.context,
-				  })
+					})
 				: new NoSync<Presence, Profile>(this.context);
 		if (context.schema.wip && this.context.config.sync) {
 			context.log(
@@ -114,6 +114,7 @@ export class Client<Presence = any, Profile = any> extends EventSubscriber<{
 		// FIXME: make this less fragile
 		this._queryCache = new QueryCache({
 			context,
+			evictionTime: context.config.queries?.evictionTime,
 		});
 		this._documentManager = new DocumentManager(this.schema, this._entities);
 
@@ -226,6 +227,10 @@ export class Client<Presence = any, Profile = any> extends EventSubscriber<{
 		return this.context.undoHistory;
 	}
 
+	get queries(): PublicQueryCacheAPI {
+		return this._queryCache;
+	}
+
 	/**
 	 * Batch multiple operations together to be executed in a single transaction.
 	 * The changes made will not be included in the same undo history step as
@@ -294,6 +299,8 @@ export class Client<Presence = any, Profile = any> extends EventSubscriber<{
 		await this._entities.destroy();
 
 		this.context.persistenceShutdownHandler.shutdown();
+		this.context.internalEvents.disable();
+		this.context.entityEvents.disable();
 
 		// the idea here is to flush the microtask queue -
 		// we may have queued tasks related to queries that
@@ -318,9 +325,8 @@ export class Client<Presence = any, Profile = any> extends EventSubscriber<{
 	): Promise<ExportedData> => {
 		this.context.log('info', 'Exporting data...');
 		const metaExport = await this.context.meta.export();
-		const { fileData, files } = await this.context.files.export(
-			downloadRemoteFiles,
-		);
+		const { fileData, files } =
+			await this.context.files.export(downloadRemoteFiles);
 		return {
 			data: metaExport,
 			fileData,

package/src/client/ClientDescriptor.ts

@@ -6,17 +6,17 @@ import {
 	StorageSchema,
 	noop,
 } from '@verdant-web/common';
-import { FileConfig, InitialContext } from '../context/context.js';
+import { FileConfig, InitialContext, QueryConfig } from '../context/context.js';
+import { ShutdownHandler } from '../context/ShutdownHandler.js';
+import { Time } from '../context/Time.js';
+import { FakeWeakRef } from '../FakeWeakRef.js';
+import { IdbPersistence } from '../persistence/idb/idbPersistence.js';
+import { deleteAllDatabases } from '../persistence/idb/util.js';
+import { PersistenceImplementation } from '../persistence/interfaces.js';
+import { initializePersistence } from '../persistence/persistence.js';
 import { ServerSyncOptions } from '../sync/Sync.js';
 import { UndoHistory } from '../UndoHistory.js';
 import { Client } from './Client.js';
-import { deleteAllDatabases } from '../persistence/idb/util.js';
-import { FakeWeakRef } from '../FakeWeakRef.js';
-import { Time } from '../context/Time.js';
-import { initializePersistence } from '../persistence/persistence.js';
-import { PersistenceImplementation } from '../persistence/interfaces.js';
-import { IdbPersistence } from '../persistence/idb/idbPersistence.js';
-import { ShutdownHandler } from '../context/ShutdownHandler.js';
 
 export interface ClientDescriptorOptions<Presence = any, Profile = any> {
 	/** The schema used to create this client */
@@ -76,6 +76,11 @@ export interface ClientDescriptorOptions<Presence = any, Profile = any> {
 	 * before turning it on.
 	 */
 	EXPERIMENTAL_weakRefs?: boolean;
+
+	/**
+	 * Customize querying behavior.
+	 */
+	queries?: QueryConfig;
 }
 
 /**
@@ -155,6 +160,7 @@ export class ClientDescriptor<
 						disableRebasing: init.disableRebasing,
 						rebaseTimeout: init.rebaseTimeout,
 					},
+					queries: init.queries,
 				},
 				persistence:
 					init.persistence || new IdbPersistence(environment.indexedDB),

package/src/context/context.ts

@@ -10,15 +10,15 @@ import {
 	StorageSchema,
 } from '@verdant-web/common';
 import { UndoHistory } from '../UndoHistory.js';
-import { Time } from './Time.js';
-import type { PersistenceDocuments } from '../persistence/PersistenceQueries.js';
-import type { PersistenceMetadata } from '../persistence/PersistenceMetadata.js';
 import { PersistenceFiles } from '../persistence/PersistenceFiles.js';
+import type { PersistenceMetadata } from '../persistence/PersistenceMetadata.js';
+import type { PersistenceDocuments } from '../persistence/PersistenceQueries.js';
 import {
 	PersistedFileData,
 	PersistenceImplementation,
 } from '../persistence/interfaces.js';
 import { ShutdownHandler } from './ShutdownHandler.js';
+import { Time } from './Time.js';
 
 /**
  * Common components utilized across various client
@@ -57,6 +57,7 @@ export interface Context {
 		filesDeleted: (files: FileRef[]) => void;
 		fileAdded: (file: FileData) => void;
 		[ev: `fileUploaded:${string}`]: (file: FileData) => void;
+		fileUploaded: (file: FileData) => void;
 	}>;
 	globalEvents: EventSubscriber<{
 		/**
@@ -99,6 +100,7 @@ export interface Context {
 		files?: FileConfig;
 		sync?: SyncConfig;
 		persistence?: PersistenceConfig;
+		queries?: QueryConfig;
 	};
 
 	environment: {
@@ -209,4 +211,17 @@ export interface PersistenceConfig {
 	rebaseTimeout?: number;
 }
 
+export interface QueryConfig {
+	/**
+	 * Milliseconds to hold a query in memory after it is unsubscribed before
+	 * disposing of it. Once a query is disposed, it must be loaded fresh again
+	 * on next use. Queries are cached based on their `key`, which you can
+	 * manually override. By default keys are determined by the parameters
+	 * passed to the query.
+	 *
+	 * Defaults to 5 seconds.
+	 */
+	evictionTime?: number;
+}
+
 export type InitialContext = Omit<Context, 'documents' | 'meta' | 'files'>;

package/src/entities/Entity.ts

@@ -13,8 +13,8 @@ import {
 	getChildFieldSchema,
 	getDefault,
 	hasDefault,
-	isFileRef,
 	isFile,
+	isFileRef,
 	isNullable,
 	isObject,
 	isRef,
@@ -29,6 +29,8 @@ import { processValueFiles } from '../files/utils.js';
 import { EntityFile } from '../index.js';
 import { EntityCache } from './EntityCache.js';
 import { EntityFamilyMetadata, EntityMetadataView } from './EntityMetadata.js';
+import { EntityStoreEventData, EntityStoreEvents } from './EntityStore.js';
+import { entityFieldSubscriber } from './entityFieldSubscriber.js';
 import {
 	BaseEntityValue,
 	DataFromInit,
@@ -39,8 +41,6 @@ import {
 	ListItemValue,
 	ObjectEntity,
 } from './types.js';
-import { EntityStoreEventData, EntityStoreEvents } from './EntityStore.js';
-import { entityFieldSubscriber } from './entityFieldSubscriber.js';
 
 export interface EntityInit {
 	oid: ObjectIdentifier;
@@ -73,7 +73,7 @@ export class Entity<
 	private entityFamily: EntityCache;
 	private metadataFamily;
 
-	private schema;
+	readonly schema;
 	private parent: Entity | undefined;
 	private ctx;
 	private files;
@@ -657,6 +657,10 @@ export class Entity<
 				})
 			) {
 				if (hasDefault(fieldSchema)) {
+					// FIXME: this returns []/{} for arrays and objects, but the contract
+					// of this method should return an Entity for such object fields.
+					// I want to write a test case for this one before attempting to fix
+					// just to be sure the fix works.
 					return getDefault(fieldSchema);
 				}
 				if (isNullable(fieldSchema)) {

package/src/entities/types.ts

@@ -1,19 +1,16 @@
 import { ObjectIdentifier, StorageFieldSchema } from '@verdant-web/common';
 import type { Entity } from './Entity.js';
 
-export type AccessibleEntityProperty<T> = T extends Array<any>
-	? number
-	: T extends object
-	? keyof T
-	: never;
+export type AccessibleEntityProperty<T> =
+	T extends Array<any> ? number : T extends object ? keyof T : never;
 
 export type DataFromInit<Init> = Init extends { [key: string]: any }
 	? {
 			[Key in keyof Init]: Init[Key];
-	  }
+		}
 	: Init extends Array<any>
-	? Init
-	: any;
+		? Init
+		: any;
 
 // reduces keys of an object to only ones with an optional
 // value
@@ -23,15 +20,11 @@ export type DeletableKeys<T> = keyof {
 type IfNullableThen<T, Out> = undefined extends T
 	? Out
 	: null extends T
-	? Out
-	: never;
+		? Out
+		: never;
 
-export type EntityShape<E extends Entity<any, any>> = E extends Entity<
-	infer Value,
-	any
->
-	? Value
-	: never;
+export type EntityShape<E extends Entity<any, any>> =
+	E extends Entity<infer Value, any> ? Value : never;
 
 export type BaseEntityValue = { [Key: string]: any } | any[];
 
@@ -73,21 +66,62 @@ export interface BaseEntity<
 		) => void,
 	): () => void;
 	get<Key extends keyof Value>(key: Key): Value[Key];
+	/**
+	 * Returns a plain object or array containing sub-Entities and their data.
+	 * Equivalent to "destructuring" the entity. Unlike getSnapshot, sub-level
+	 * data is still reactive.
+	 */
 	getAll(): Readonly<Value>;
+	/**
+	 * Returns a plain Javascript object representing the current state of the entity.
+	 */
 	getSnapshot(): Snapshot;
+	/**
+	 * Returns the schema for the entity as specified in your Verdant schema.
+	 * For root Documents, this will be an Object schema with properties
+	 * representing each field in the document.
+	 */
+	readonly schema: StorageFieldSchema;
+	/**
+	 * Returns the schema for a field in the entity as specified in
+	 * your Verdant schema.
+	 */
 	getFieldSchema<FieldName extends keyof Value>(
 		key: FieldName,
 	): StorageFieldSchema;
+	/**
+	 * Will be marked true after an entity has been deleted. Any attempt to
+	 * access the entity's data will result in an error.
+	 */
 	readonly deleted: boolean;
+	/**
+	 * A Unix Epoch timestamp representing the last time this entity was updated.
+	 */
 	readonly updatedAt: number;
+	/**
+	 * A Unix Epoch timestamp representing the last time this entity or any of its
+	 * sub-entities were updated.
+	 *
+	 * NOTE: reading this property requires a bit of computation, but the result
+	 * is cached. If an entity is being frequently updated and this is frequently
+	 * read, it may result in mild performance degradation.
+	 */
+	readonly deepUpdatedAt: number;
+	/** A unique, opaque key for this Entity in the system. */
 	readonly uid: string;
+	/** If true, this Entity has authorization rules applied to it. */
 	readonly isAuthorized: boolean;
+	/** The authorization configuration string applied to this entity. */
+	readonly access: string | undefined;
+	readonly invalid: boolean;
+	/** The Verdant store namespace which contains this object */
+	readonly namespace: string;
 }
 
 export type DeepPartial<T> = T extends object
 	? {
 			[P in keyof T]?: DeepPartial<T[P]>;
-	  }
+		}
 	: T;
 
 export interface ObjectEntity<
@@ -200,22 +234,21 @@ export type AnyEntity<
 	| ListEntity<Init, KeyValue, Snapshot>
 	| ObjectEntity<Init, KeyValue, Snapshot>;
 
-export type ListItemValue<KeyValue> = KeyValue extends Array<infer T>
-	? T
-	: never;
+export type ListItemValue<KeyValue> =
+	KeyValue extends Array<infer T> ? T : never;
 export type ListItemInit<Init> = Init extends Array<infer T> ? T : never;
 
 export type EntityDestructured<T extends AnyEntity<any, any, any> | null> =
 	| (T extends ListEntity<any, infer KeyValue, any>
 			? KeyValue
 			: T extends ObjectEntity<any, infer KeyValue, any>
-			? KeyValue
-			: never)
+				? KeyValue
+				: never)
 	| (T extends null ? null : never);
 
 export type EntityInit<T extends AnyEntity<any, any, any>> =
 	T extends ListEntity<infer Init, any, any>
 		? Init
 		: T extends ObjectEntity<infer Init, any, any>
-		? Init
-		: never;
+			? Init
+			: never;

package/src/files/FileManager.ts

@@ -1,17 +1,25 @@
 import { FileData } from '@verdant-web/common';
 import { Context } from '../context/context.js';
+import { Disposable } from '../internal.js';
 import { Sync } from '../sync/Sync.js';
 import { EntityFile, MARK_FAILED, UPDATE } from './EntityFile.js';
 
-export class FileManager {
+export class FileManager extends Disposable {
 	private sync;
 	private context;
 
 	private cache = new Map<string, EntityFile>();
 
 	constructor({ sync, context }: { sync: Sync; context: Context }) {
+		super();
 		this.sync = sync;
 		this.context = context;
+		this.addDispose(
+			this.context.internalEvents.subscribe(
+				'fileUploaded',
+				this.onFileUploaded,
+			),
+		);
 	}
 
 	add = async (file: FileData) => {
@@ -72,8 +80,8 @@ export class FileManager {
 
 				const result = await this.sync.getFile(file.id);
 				if (result.success) {
-					file[UPDATE](result.data);
 					await this.context.files.add(result.data);
+					file[UPDATE](result.data);
 				} else {
 					this.context.log('error', 'Failed to load file', result);
 					file[MARK_FAILED]();
@@ -84,4 +92,9 @@ export class FileManager {
 			}
 		}
 	};
+
+	private onFileUploaded = (data: FileData) => {
+		this.context.log('debug', 'Marking file as uploaded', data.id);
+		this.context.files.onUploaded(data.id);
+	};
 }