@verdant-web/store 4.0.0 → 4.1.0-alpha.1

package/dist/esm/sync/WebSocketSync.js

@@ -39,6 +39,8 @@ export class WebSocketSync extends EventSubscriber {
             if (this.disposed) {
                 return;
             }
+            if (this.ctx.closing)
+                return;
             if (!online) {
                 this.hasStartedSync = false;
                 this.synced = false;
@@ -125,7 +127,10 @@ export class WebSocketSync extends EventSubscriber {
         this.initializeSocket = async () => {
             const endpoint = await this.endpointProvider.getEndpoints();
             // abusing protocols to pass the auth token
-            this.socket = new WebSocket(endpoint.websocket, ['Bearer', endpoint.token]);
+            this.socket = new this.ctx.environment.WebSocket(endpoint.websocket, [
+                'Bearer',
+                endpoint.token,
+            ]);
             this.socket.addEventListener('message', this.onMessage);
             this.socket.addEventListener('open', this.onOpen);
             this.socket.addEventListener('error', this.onError);
@@ -155,7 +160,7 @@ export class WebSocketSync extends EventSubscriber {
                 return;
             }
             if (this.canSkipSyncWait(message)) {
-                if (((_a = this.socket) === null || _a === void 0 ? void 0 : _a.readyState) === WebSocket.OPEN) {
+                if (((_a = this.socket) === null || _a === void 0 ? void 0 : _a.readyState) === WEBSOCKET_OPEN) {
                     this.ctx.log('debug', 'Sending message', JSON.stringify(message, null, 2));
                     this.socket.send(JSON.stringify(message));
                 }
@@ -165,7 +170,7 @@ export class WebSocketSync extends EventSubscriber {
                 }
             }
             else if (this.synced) {
-                if (((_b = this.socket) === null || _b === void 0 ? void 0 : _b.readyState) === WebSocket.OPEN) {
+                if (((_b = this.socket) === null || _b === void 0 ? void 0 : _b.readyState) === WEBSOCKET_OPEN) {
                     this.ctx.log('debug', 'Sending message', JSON.stringify(message, null, 2));
                     this.socket.send(JSON.stringify(message));
                 }
@@ -209,10 +214,11 @@ export class WebSocketSync extends EventSubscriber {
     }
     get isConnected() {
         var _a;
-        return ((_a = this.socket) === null || _a === void 0 ? void 0 : _a.readyState) === WebSocket.OPEN;
+        return ((_a = this.socket) === null || _a === void 0 ? void 0 : _a.readyState) === WEBSOCKET_OPEN;
     }
     get status() {
         return this._status;
     }
 }
+const WEBSOCKET_OPEN = 1;
 //# sourceMappingURL=WebSocketSync.js.map

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

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

package/dist/esm/utils/wip.js

@@ -1,5 +1,5 @@
 import { hashObject } from '@verdant-web/common';
 export function getWipNamespace(namespace, schema) {
-    return `@@wip_${namespace}_${hashObject(schema)}`;
+    return `@@wip-${namespace}-${hashObject(schema)}`;
 }
 //# sourceMappingURL=wip.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verdant-web/store",
-  "version": "4.0.0",
+  "version": "4.1.0-alpha.1",
   "access": "public",
   "type": "module",
   "exports": {
@@ -15,6 +15,10 @@
     "./serviceWorker": {
       "import": "./dist/esm/sync/serviceWorker.js",
       "types": "./dist/esm/sync/serviceWorker.d.ts"
+    },
+    "./internal": {
+      "import": "./dist/esm/internal.js",
+      "types": "./dist/esm/internal.d.ts"
     }
   },
   "publishConfig": {
@@ -31,7 +35,7 @@
     "jwt-decode": "^3.1.2",
     "kysely": "^0.27.3",
     "weak-event": "^2.0.5",
-    "@verdant-web/common": "2.6.0"
+    "@verdant-web/common": "2.7.0-alpha.0"
   },
   "devDependencies": {
     "@types/node": "20.10.5",

package/src/__tests__/fixtures/testStorage.ts

@@ -1,8 +1,11 @@
 import { createMigration, schema } from '@verdant-web/common';
 // @ts-ignore
 import { IDBFactory } from 'fake-indexeddb';
-import { ClientWithCollections, ClientDescriptor } from '../../index.js';
-import { METADATA_VERSION_KEY } from '../../client/constants.js';
+import {
+	ClientWithCollections,
+	ClientDescriptor,
+	IdbPersistence,
+} from '../../index.js';
 
 export const todoCollection = schema.collection({
 	name: 'todo',
@@ -94,23 +97,20 @@ const testSchema = schema({
 export function createTestStorage({
 	idb = new IDBFactory(),
 	disableRebasing = false,
-	metadataVersion,
 	log,
 }: {
 	idb?: IDBFactory;
 	disableRebasing?: boolean;
-	metadataVersion?: number;
 	log?: (...args: any[]) => void;
 } = {}) {
 	const storage = new ClientDescriptor({
 		schema: testSchema,
 		migrations: [createMigration<{}>(testSchema)],
-		indexedDb: idb,
 		namespace: 'test',
 		disableRebasing,
 		oldSchemas: [testSchema],
 		log,
-		[METADATA_VERSION_KEY]: metadataVersion,
+		persistence: new IdbPersistence(idb),
 	}).open();
 	return storage as Promise<ClientWithCollections>;
 }

package/src/client/Client.ts

@@ -2,6 +2,7 @@ import {
 	debounce,
 	DocumentBaseline,
 	EventSubscriber,
+	FileData,
 	Operation,
 } from '@verdant-web/common';
 import { Context } from '../context/context.js';
@@ -56,6 +57,10 @@ export class Client<Presence = any, Profile = any> extends EventSubscriber<{
 	 * or stored data, but is useful for debugging and testing.
 	 */
 	rebase: () => void;
+	/**
+	 * Emitted when a file is stored locally. Used for test coordination right now.
+	 */
+	fileSaved: (fileData: FileData) => void;
 }> {
 	private _entities: EntityStore;
 	private _queryCache: QueryCache;
@@ -125,6 +130,9 @@ export class Client<Presence = any, Profile = any> extends EventSubscriber<{
 		this.context.globalEvents.subscribe('rebase', () => {
 			this.emit('rebase');
 		});
+		this.context.globalEvents.subscribe('fileSaved', (file) => {
+			this.emit('fileSaved', file);
+		});
 
 		// self-assign collection shortcuts. these are not typed
 		// here but are typed in the generated code...
@@ -236,7 +244,7 @@ export class Client<Presence = any, Profile = any> extends EventSubscriber<{
 		if (this.disposed) {
 			return {} as any;
 		}
-		const collections = await this.context.queries.stats();
+		const collections = await this.context.documents.stats();
 		const meta = await this.context.meta.stats();
 		const storage =
 			typeof navigator !== 'undefined' &&
@@ -276,15 +284,16 @@ export class Client<Presence = any, Profile = any> extends EventSubscriber<{
 		// NOTE: this happens after flushing or else flushed data
 		// won't be written to storage or synced.
 		this.context.closing = true;
-		this.context.files.dispose();
+		if (this.context.closeLock) {
+			await this.context.closeLock;
+		}
 		this.sync.stop();
 		this.sync.destroy();
 		// this step does have the potential to flush
 		// changes to storage, so don't close metadata db yet
 		await this._entities.destroy();
 
-		this.context.queries.dispose();
-		this.context.meta.dispose();
+		this.context.persistenceShutdownHandler.shutdown();
 
 		// the idea here is to flush the microtask queue -
 		// we may have queued tasks related to queries that
@@ -309,8 +318,9 @@ 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,
@@ -387,7 +397,15 @@ export class Client<Presence = any, Profile = any> extends EventSubscriber<{
 	 * rebasing rules. Rebases already happen automatically
 	 * during normal operation, so you probably don't need this.
 	 */
-	__manualRebase = () => this.context.meta.manualRebase();
+	__manualRebase = () => {
+		this.context.meta.manualRebase();
+		return new Promise<void>((resolve) => {
+			const unsub = this.subscribe('rebase', () => {
+				unsub();
+				resolve();
+			});
+		});
+	};
 
 	/**
 	 * WARNING: the internal functions of the persistence layer
@@ -397,7 +415,7 @@ export class Client<Presence = any, Profile = any> extends EventSubscriber<{
 	get __persistence() {
 		return {
 			meta: this.context.meta,
-			queries: this.context.queries,
+			queries: this.context.documents,
 			files: this.context.files,
 		};
 	}

package/src/client/ClientDescriptor.ts

@@ -12,11 +12,11 @@ import { UndoHistory } from '../UndoHistory.js';
 import { Client } from './Client.js';
 import { deleteAllDatabases } from '../persistence/idb/util.js';
 import { FakeWeakRef } from '../FakeWeakRef.js';
-import { METADATA_VERSION_KEY } from './constants.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 */
@@ -26,8 +26,6 @@ export interface ClientDescriptorOptions<Presence = any, Profile = any> {
 	migrations: Migration<any>[];
 	/** Provide a sync config to turn on synchronization with a server */
 	sync?: ServerSyncOptions<Profile, Presence>;
-	/** Optionally override the IndexedDB implementation */
-	indexedDb?: IDBFactory;
 	/**
 	 * Namespaces are used to separate data from different clients in IndexedDB.
 	 */
@@ -63,6 +61,13 @@ export interface ClientDescriptorOptions<Presence = any, Profile = any> {
 	 */
 	persistence?: PersistenceImplementation;
 
+	/**
+	 * Specify the environment dependencies needed for the client.
+	 * Normally these are provided by the browser, but in other
+	 * runtimes you may need to provide your own.
+	 */
+	environment?: InitialContext['environment'];
+
 	/**
 	 * Enables experimental WeakRef usage to cull documents
 	 * from cache that aren't being used. This is a performance
@@ -71,9 +76,6 @@ export interface ClientDescriptorOptions<Presence = any, Profile = any> {
 	 * before turning it on.
 	 */
 	EXPERIMENTAL_weakRefs?: boolean;
-
-	// not for public use
-	[METADATA_VERSION_KEY]?: number;
 }
 
 /**
@@ -112,9 +114,9 @@ export class ClientDescriptor<
 	private initialize = async (init: ClientDescriptorOptions) => {
 		// if server-side and no alternative IndexedDB implementation was provided,
 		// we can't initialize the storage
-		if (typeof window === 'undefined' && !init.indexedDb) {
+		if (typeof window === 'undefined' && !init.environment) {
 			throw new Error(
-				'A Verdant client was initialized in an environment without IndexedDB. If you are using verdant in a server-rendered framework, you must enforce that all clients are initialized on the client-side, or you must provide some mock interface of IDBFactory to the ClientDescriptor options.',
+				'A Verdant client was initialized in an environment without a global Window or `environment` configuration. If you are using verdant in a server-rendered framework, you must enforce that all clients are initialized on the client-side, or you must provide some mock interface of the environment to the ClientDescriptor options.',
 			);
 		}
 
@@ -127,6 +129,7 @@ export class ClientDescriptor<
 				new HybridLogicalClockTimestampProvider(),
 				init.schema.version,
 			);
+			const environment = init.environment || defaultBrowserEnvironment;
 			let ctx: InitialContext = {
 				closing: false,
 				entityEvents: new EventSubscriber(),
@@ -153,8 +156,17 @@ export class ClientDescriptor<
 						rebaseTimeout: init.rebaseTimeout,
 					},
 				},
-				persistence: init.persistence || new IdbPersistence(init.indexedDb),
+				persistence:
+					init.persistence || new IdbPersistence(environment.indexedDB),
+				environment,
+				persistenceShutdownHandler: new ShutdownHandler(),
+				pauseRebasing: false,
 			};
+			ctx.log('info', 'Initializing client', {
+				namespace: ctx.namespace,
+				version: init.schema.version,
+				persistence: ctx.persistence.name,
+			});
 			const context = await initializePersistence(ctx);
 			const client = new Client(context) as ClientImpl;
 			this.resolveReady(client);
@@ -202,3 +214,9 @@ export class ClientDescriptor<
 		await deleteAllDatabases(this.namespace);
 	};
 }
+
+const defaultBrowserEnvironment = {
+	WebSocket: typeof WebSocket !== 'undefined' ? WebSocket : (undefined as any),
+	fetch: typeof window !== 'undefined' ? window.fetch.bind(window) : fetch!,
+	indexedDB: typeof indexedDB !== 'undefined' ? indexedDB : (undefined as any),
+};

package/src/context/ShutdownHandler.ts

@@ -0,0 +1,26 @@
+export class ShutdownHandler {
+	private consumed = false;
+	private readonly handlers: (() => Promise<void>)[] = [];
+
+	register(handler: () => Promise<void>) {
+		this.handlers.push(handler);
+	}
+
+	async shutdown() {
+		if (this.consumed) {
+			console.warn('ShutdownHandler already consumed');
+		}
+
+		this.consumed = true;
+		await Promise.all(this.handlers.map((handler) => handler()));
+		this.handlers.length = 0;
+	}
+
+	get isShuttingDown() {
+		return this.consumed;
+	}
+
+	reset = () => {
+		this.consumed = false;
+	};
+}

package/src/context/context.ts

@@ -11,13 +11,14 @@ import {
 } from '@verdant-web/common';
 import { UndoHistory } from '../UndoHistory.js';
 import { Time } from './Time.js';
-import type { PersistenceQueries } from '../persistence/PersistenceQueries.js';
+import type { PersistenceDocuments } from '../persistence/PersistenceQueries.js';
 import type { PersistenceMetadata } from '../persistence/PersistenceMetadata.js';
 import { PersistenceFiles } from '../persistence/PersistenceFiles.js';
 import {
 	PersistedFileData,
 	PersistenceImplementation,
 } from '../persistence/interfaces.js';
+import { ShutdownHandler } from './ShutdownHandler.js';
 
 /**
  * Common components utilized across various client
@@ -33,7 +34,7 @@ export interface Context {
 	time: Time;
 
 	meta: PersistenceMetadata;
-	queries: PersistenceQueries;
+	documents: PersistenceDocuments;
 	files: PersistenceFiles;
 
 	undoHistory: UndoHistory;
@@ -55,7 +56,7 @@ export interface Context {
 		persistenceReset: () => void;
 		filesDeleted: (files: FileRef[]) => void;
 		fileAdded: (file: FileData) => void;
-		[ev: `fileUploaded:${string}`]: () => void;
+		[ev: `fileUploaded:${string}`]: (file: FileData) => void;
 	}>;
 	globalEvents: EventSubscriber<{
 		/**
@@ -83,11 +84,16 @@ export interface Context {
 		 * or stored data, but is useful for debugging and testing.
 		 */
 		rebase: () => void;
+		fileSaved: (file: FileData) => void;
 	}>;
 	weakRef<T extends object>(value: T): WeakRef<T>;
 	migrations: Migration<any>[];
 	closing: boolean;
+	/** If this is present, any attempt to close the client should await it first. */
+	closeLock?: Promise<void>;
+	pauseRebasing: boolean;
 	patchCreator: PatchCreator;
+	persistenceShutdownHandler: ShutdownHandler;
 
 	config: {
 		files?: FileConfig;
@@ -95,6 +101,12 @@ export interface Context {
 		persistence?: PersistenceConfig;
 	};
 
+	environment: {
+		WebSocket: typeof WebSocket;
+		fetch: typeof fetch;
+		indexedDB: typeof indexedDB;
+	};
+
 	persistence: PersistenceImplementation;
 }
 
@@ -197,4 +209,4 @@ export interface PersistenceConfig {
 	rebaseTimeout?: number;
 }
 
-export type InitialContext = Omit<Context, 'queries' | 'meta' | 'files'>;
+export type InitialContext = Omit<Context, 'documents' | 'meta' | 'files'>;

package/src/entities/EntityStore.ts

@@ -132,7 +132,7 @@ export class EntityStore extends Disposable {
 	};
 
 	empty = async () => {
-		await this.ctx.queries.reset();
+		await this.ctx.documents.reset();
 		this.events.resetAll.invoke(this);
 		this.cache.clear();
 	};
@@ -143,7 +143,7 @@ export class EntityStore extends Disposable {
 			return;
 		}
 		await this.ctx.meta.reset();
-		await this.ctx.queries.reset();
+		await this.ctx.documents.reset();
 		this.events.resetAll.invoke(this);
 	};
 
@@ -222,6 +222,10 @@ export class EntityStore extends Disposable {
 		// so that realtime is lower latency? What would happen
 		// if the storage failed?
 		await this.ctx.meta.insertData(data, abortOptions);
+		this.ctx.log(
+			'debug',
+			'Data processing complete, all data saved to metadata db.',
+		);
 
 		// recompute all affected documents for querying
 		const entities = await Promise.all(
@@ -240,7 +244,8 @@ export class EntityStore extends Disposable {
 			}),
 		);
 		try {
-			await this.ctx.queries.saveEntities(entities, abortOptions);
+			this.ctx.log('debug', 'Saving entities to queryable storage');
+			await this.ctx.documents.saveEntities(entities, abortOptions);
 		} catch (err) {
 			if (this.disposed) {
 				this.ctx.log(
@@ -439,6 +444,7 @@ export class EntityStore extends Disposable {
 	 * Constructs an entity from an OID, but does not load it.
 	 */
 	private constructEntity = (oid: string): Entity | null => {
+		assert(!!oid, 'Cannot construct entity without OID');
 		const { collection } = decomposeOid(oid);
 		const { schema, readonlyKeys } = this.getCollectionSchema(collection);
 

package/src/files/EntityFile.ts

@@ -24,6 +24,7 @@ export class EntityFile extends EventSubscriber<EntityFileEvents> {
 	private _loading = true;
 	private _failed = false;
 	private _downloadRemote = false;
+	private _uploaded = false;
 	private ctx: Context;
 	private unsubscribes: (() => void)[] = [];
 
@@ -53,7 +54,7 @@ export class EntityFile extends EventSubscriber<EntityFileEvents> {
 		return true;
 	}
 	get isUploaded() {
-		return this._fileData?.remote ?? false;
+		return this._uploaded || this._fileData?.remote || false;
 	}
 
 	[UPDATE] = (fileData: FileData) => {
@@ -62,7 +63,7 @@ export class EntityFile extends EventSubscriber<EntityFileEvents> {
 		this._failed = false;
 		this._fileData = fileData;
 		if (fileData.file) {
-			if (this._objectUrl) {
+			if (this._objectUrl && 'revokeObjectURL' in URL) {
 				URL.revokeObjectURL(this._objectUrl);
 			}
 			this.ctx.log('debug', 'Creating object URL for file', this.id);
@@ -77,15 +78,19 @@ export class EntityFile extends EventSubscriber<EntityFileEvents> {
 		this.emit('change');
 	};
 
-	private onUploaded = () => {
-		if (!this._fileData) return;
-		this._fileData!.remote = true;
+	private onUploaded = (data: FileData) => {
+		// TODO: cleanup all this uploaded flagging junk
+		this._fileData ??= data;
+		this._uploaded = true;
+		this.ctx.log('debug', 'File marked uploaded', this.id, this._fileData);
 		this.emit('change');
 	};
 
 	get url(): string | null {
+		// prefer local file representations.
 		if (this.loading) return null;
 		if (this._objectUrl) return this._objectUrl;
+		// TODO: use localPath here?
 		return this._fileData?.url ?? null;
 	}
 
@@ -117,7 +122,7 @@ export class EntityFile extends EventSubscriber<EntityFileEvents> {
 			id: this.id,
 			url: this._objectUrl ?? this._fileData?.url ?? undefined,
 			name: this.name ?? 'unknown-file',
-			remote: false,
+			remote: this._fileData?.remote ?? false,
 			type: this.type ?? '',
 			file: this._fileData?.file,
 		};

package/src/files/FileManager.ts

@@ -14,17 +14,22 @@ export class FileManager {
 		this.context = context;
 	}
 
-	add = async (file: FileData, options?: { downloadRemote: boolean }) => {
+	add = async (file: FileData) => {
 		// immediately cache the file
-		if (!this.cache.has(file.id)) {
-			const entityFile = new EntityFile(file.id, { ctx: this.context });
-			entityFile[UPDATE](file);
+		let entityFile = this.cache.get(file.id);
+		if (!entityFile) {
+			entityFile = new EntityFile(file.id, { ctx: this.context });
 			this.cache.set(file.id, entityFile);
-		} else {
-			this.cache.get(file.id)![UPDATE](file);
 		}
 
-		await this.context.files.add(file, options);
+		if (!file.remote) {
+			// immediately update local files.
+			entityFile[UPDATE](file);
+		}
+		// this will download any original remote file and trigger a re-upload to the
+		// new file's identity, in addition to storing it on disk
+		const processedFile = await this.context.files.add(file);
+		entityFile[UPDATE](processedFile);
 	};
 
 	/**
@@ -68,9 +73,7 @@ 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, {
-						downloadRemote: file.downloadRemote,
-					});
+					await this.context.files.add(result.data);
 				} else {
 					this.context.log('error', 'Failed to load file', result);
 					file[MARK_FAILED]();

package/src/index.ts

@@ -24,14 +24,7 @@ export type {
 export { ServerSync } from './sync/Sync.js';
 export type { SyncTransportMode } from './sync/Sync.js';
 export { EntityFile, type EntityFileSnapshot } from './files/EntityFile.js';
-export {
-	/** @deprecated - use schema.collection */
-	collection,
-	schema,
-	createDefaultMigration,
-	migrate,
-	createMigration,
-} from '@verdant-web/common';
+export { schema, createMigration } from '@verdant-web/common';
 export type {
 	StorageDocument,
 	StorageSchema,
@@ -50,8 +43,12 @@ export type {
 	Migration,
 	VerdantError,
 	VerdantErrorCode,
+	ObjectIdentifier,
+	CollectionFilter,
+	FileData,
+	DocumentBaseline,
+	UserInfo,
 } from '@verdant-web/common';
-export type { UserInfo } from '@verdant-web/common';
 export type { Query } from './queries/types.js';
 export type { QueryStatus } from './queries/BaseQuery.js';
 export type { CollectionQueries } from './queries/CollectionQueries.js';
@@ -59,3 +56,5 @@ export * from './utils/id.js';
 export { UndoHistory } from './UndoHistory.js';
 export * from './authorization.js';
 export * from './sync/cliSync.js';
+export type * from './persistence/interfaces.js';
+export { IdbPersistence } from './persistence/idb/idbPersistence.js';

package/src/internal.ts

@@ -0,0 +1,27 @@
+export type { Context, InitialContext } from './context/context.js';
+export {
+	decomposeOid,
+	createOid,
+	generateId,
+	isRangeIndexFilter,
+	isCompoundIndexFilter,
+	isDirectSynthetic,
+	isMatchIndexFilter,
+	isSortIndexFilter,
+	isStartsWithIndexFilter,
+	isMultiValueIndex,
+	assert,
+	createCompoundIndexValue,
+	createLowerBoundIndexValue,
+	createUpperBoundIndexValue,
+	getIndexValues,
+} from '@verdant-web/common';
+export type {
+	CollectionCompoundIndexFilter,
+	MatchCollectionIndexFilter,
+	RangeCollectionIndexFilter,
+	CollectionIndexFilter,
+} from '@verdant-web/common';
+export * from './persistence/migration/paths.js';
+export * from './persistence/migration/types.js';
+export { Disposable } from './utils/Disposable.js';