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

package/dist/esm/files/FileManager.js

@@ -2,17 +2,21 @@ import { EntityFile, MARK_FAILED, UPDATE } from './EntityFile.js';
 export class FileManager {
     constructor({ sync, context }) {
         this.cache = new Map();
-        this.add = async (file, options) => {
+        this.add = async (file) => {
             // 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);
+            if (!file.remote) {
+                // immediately update local files.
+                entityFile[UPDATE](file);
             }
-            await this.context.files.add(file, options);
+            // 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);
         };
         /**
          * Immediately returns an EntityFile to use, then either loads
@@ -49,9 +53,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);

package/dist/esm/files/FileManager.js.map

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

package/dist/esm/index.d.ts

@@ -12,11 +12,8 @@ export type { ObjectEntity, ListEntity, EntityShape, AccessibleEntityProperty, A
 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 type { StorageDocument, StorageSchema, StorageCollectionSchema, StorageAnyFieldSchema, StorageArrayFieldSchema, StorageObjectFieldSchema, StorageBooleanFieldSchema, StorageFieldSchema, StorageFileFieldSchema, StorageMapFieldSchema, StorageNumberFieldSchema, StorageStringFieldSchema, StorageFieldsSchema, IndexValueTag, Migration, VerdantError, VerdantErrorCode, } from '@verdant-web/common';
-export type { UserInfo } from '@verdant-web/common';
+export { schema, createMigration } from '@verdant-web/common';
+export type { StorageDocument, StorageSchema, StorageCollectionSchema, StorageAnyFieldSchema, StorageArrayFieldSchema, StorageObjectFieldSchema, StorageBooleanFieldSchema, StorageFieldSchema, StorageFileFieldSchema, StorageMapFieldSchema, StorageNumberFieldSchema, StorageStringFieldSchema, StorageFieldsSchema, IndexValueTag, Migration, VerdantError, VerdantErrorCode, ObjectIdentifier, CollectionFilter, FileData, DocumentBaseline, 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';
@@ -24,3 +21,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/dist/esm/index.js

@@ -8,11 +8,10 @@ export { Client as Storage };
 export { Entity } from './entities/Entity.js';
 export { ServerSync } from './sync/Sync.js';
 export { EntityFile } 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 * from './utils/id.js';
 export { UndoHistory } from './UndoHistory.js';
 export * from './authorization.js';
 export * from './sync/cliSync.js';
+export { IdbPersistence } from './persistence/idb/idbPersistence.js';
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,gBAAgB,GAEhB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,CAAC;AAClB,kBAAkB;AAClB,OAAO,EAAE,gBAAgB,IAAI,iBAAiB,EAAE,CAAC;AACjD,OAAO,EAAE,MAAM,IAAI,OAAO,EAAE,CAAC;AAG7B,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAU9C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,UAAU,EAA2B,MAAM,uBAAuB,CAAC;AAC5E,OAAO;AACN,0CAA0C;AAC1C,UAAU,EACV,MAAM,EACN,sBAAsB,EACtB,OAAO,EACP,eAAe,GACf,MAAM,qBAAqB,CAAC;AAwB7B,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,gBAAgB,GAEhB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,CAAC;AAClB,kBAAkB;AAClB,OAAO,EAAE,gBAAgB,IAAI,iBAAiB,EAAE,CAAC;AACjD,OAAO,EAAE,MAAM,IAAI,OAAO,EAAE,CAAC;AAG7B,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAU9C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,UAAU,EAA2B,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AA4B9D,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAElC,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC"}

package/dist/esm/internal.d.ts

@@ -0,0 +1,6 @@
+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';

package/dist/esm/internal.js

@@ -0,0 +1,5 @@
+export { decomposeOid, createOid, generateId, isRangeIndexFilter, isCompoundIndexFilter, isDirectSynthetic, isMatchIndexFilter, isSortIndexFilter, isStartsWithIndexFilter, isMultiValueIndex, assert, createCompoundIndexValue, createLowerBoundIndexValue, createUpperBoundIndexValue, getIndexValues, } from '@verdant-web/common';
+export * from './persistence/migration/paths.js';
+export * from './persistence/migration/types.js';
+export { Disposable } from './utils/Disposable.js';
+//# sourceMappingURL=internal.js.map

package/dist/esm/internal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../src/internal.ts"],"names":[],"mappings":"AACA,OAAO,EACN,YAAY,EACZ,SAAS,EACT,UAAU,EACV,kBAAkB,EAClB,qBAAqB,EACrB,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,EACjB,uBAAuB,EACvB,iBAAiB,EACjB,MAAM,EACN,wBAAwB,EACxB,0BAA0B,EAC1B,0BAA0B,EAC1B,cAAc,GACd,MAAM,qBAAqB,CAAC;AAO7B,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/esm/persistence/MessageCreator.d.ts

@@ -1,10 +1,12 @@
 import { AckMessage, HeartbeatMessage, OperationMessage, PresenceUpdateMessage, SyncMessage, VerdantInternalPresence } from '@verdant-web/common';
 import { Context } from '../context/context.js';
 import { PersistenceMetadataDb } from './interfaces.js';
+import type { PersistenceMetadata } from './PersistenceMetadata.js';
 export declare class MessageCreator {
     private db;
+    private meta;
     private ctx;
-    constructor(db: PersistenceMetadataDb, ctx: Pick<Context, 'time' | 'schema' | 'log'>);
+    constructor(db: PersistenceMetadataDb, meta: PersistenceMetadata, ctx: Pick<Context, 'time' | 'schema' | 'log'>);
     createOperation: (init: Pick<OperationMessage, 'operations'> & {
         timestamp?: string;
     }) => Promise<OperationMessage>;

package/dist/esm/persistence/MessageCreator.js

@@ -1,10 +1,12 @@
 import { getOidRoot, pickValidOperationKeys, } from '@verdant-web/common';
 export class MessageCreator {
-    constructor(db, ctx) {
+    constructor(db, meta, ctx) {
         this.db = db;
+        this.meta = meta;
         this.ctx = ctx;
         this.createOperation = async (init) => {
-            const localInfo = await this.db.getLocalReplica();
+            const localInfo = await this.meta.getLocalReplica();
+            this.ctx.log('debug', 'Creating operation message', init.operations.length);
             return {
                 type: 'op',
                 timestamp: this.ctx.time.now,
@@ -16,67 +18,68 @@ export class MessageCreator {
          * @param since - override local understanding of last sync time
          */
         this.createSyncStep1 = async (since) => {
-            const localReplicaInfo = await this.db.getLocalReplica();
+            const localReplicaInfo = await this.meta.getLocalReplica();
             const provideChangesSince = since === null ? null : localReplicaInfo.lastSyncedLogicalTime;
             // collect all of our operations that are newer than the server's last operation
             // if server replica isn't stored, we're syncing for the first time.
             const operations = [];
             const affectedDocs = new Set();
-            const tx = await this.db.transaction({
+            return this.db.transaction({
                 mode: 'readwrite',
                 storeNames: ['operations', 'baselines'],
+            }, async (tx) => {
+                // FIXME: this branch gives bad vibes. should we always
+                // send all operations from other replicas too? is there
+                // ever a case where we have a "since" timestamp and there
+                // are foreign ops that match it?
+                if (provideChangesSince) {
+                    this.ctx.log('debug', 'Syncing local operations since', provideChangesSince);
+                    await this.db.iterateLocalOperations((patch) => {
+                        operations.push(pickValidOperationKeys(patch));
+                        affectedDocs.add(getOidRoot(patch.oid));
+                    }, {
+                        after: provideChangesSince,
+                        // block on writes to prevent race conditions
+                        transaction: tx,
+                    });
+                }
+                else {
+                    this.ctx.log('debug', 'Syncing all operations');
+                    // if providing the whole history, don't limit to only local
+                    // operations
+                    await this.db.iterateAllOperations((patch) => {
+                        operations.push(pickValidOperationKeys(patch));
+                        affectedDocs.add(getOidRoot(patch.oid));
+                    }, {
+                        transaction: tx,
+                    });
+                }
+                // we only need to send baselines if we've never synced before
+                let baselines = [];
+                if (!provideChangesSince) {
+                    await this.db.iterateAllBaselines((b) => {
+                        baselines.push(b);
+                    }, {
+                        transaction: tx,
+                    });
+                }
+                if (operations.length > 0) {
+                    this.ctx.log('debug', `Syncing ${operations.length} operations since ${provideChangesSince}`);
+                }
+                return {
+                    type: 'sync',
+                    schemaVersion: this.ctx.schema.version,
+                    timestamp: this.ctx.time.now,
+                    replicaId: localReplicaInfo.id,
+                    resyncAll: !localReplicaInfo.lastSyncedLogicalTime,
+                    operations,
+                    baselines,
+                    since: provideChangesSince,
+                };
             });
-            // FIXME: this branch gives bad vibes. should we always
-            // send all operations from other replicas too? is there
-            // ever a case where we have a "since" timestamp and there
-            // are foreign ops that match it?
-            if (provideChangesSince) {
-                this.ctx.log('debug', 'Syncing local operations since', provideChangesSince);
-                await this.db.iterateLocalOperations((patch) => {
-                    operations.push(pickValidOperationKeys(patch));
-                    affectedDocs.add(getOidRoot(patch.oid));
-                }, {
-                    after: provideChangesSince,
-                    // block on writes to prevent race conditions
-                    transaction: tx,
-                });
-            }
-            else {
-                this.ctx.log('debug', 'Syncing all operations');
-                // if providing the whole history, don't limit to only local
-                // operations
-                await this.db.iterateAllOperations((patch) => {
-                    operations.push(pickValidOperationKeys(patch));
-                    affectedDocs.add(getOidRoot(patch.oid));
-                }, {
-                    transaction: tx,
-                });
-            }
-            // we only need to send baselines if we've never synced before
-            let baselines = [];
-            if (!provideChangesSince) {
-                await this.db.iterateAllBaselines((b) => {
-                    baselines.push(b);
-                }, {
-                    transaction: tx,
-                });
-            }
-            if (operations.length > 0) {
-                this.ctx.log('debug', `Syncing ${operations.length} operations since ${provideChangesSince}`);
-            }
-            return {
-                type: 'sync',
-                schemaVersion: this.ctx.schema.version,
-                timestamp: this.ctx.time.now,
-                replicaId: localReplicaInfo.id,
-                resyncAll: !localReplicaInfo.lastSyncedLogicalTime,
-                operations,
-                baselines,
-                since: provideChangesSince,
-            };
         };
         this.createPresenceUpdate = async (data) => {
-            const localReplicaInfo = await this.db.getLocalReplica();
+            const localReplicaInfo = await this.meta.getLocalReplica();
             return {
                 type: 'presence-update',
                 presence: data.presence,
@@ -85,7 +88,7 @@ export class MessageCreator {
             };
         };
         this.createHeartbeat = async () => {
-            const localReplicaInfo = await this.db.getLocalReplica();
+            const localReplicaInfo = await this.meta.getLocalReplica();
             return {
                 type: 'heartbeat',
                 timestamp: this.ctx.time.now,
@@ -93,7 +96,7 @@ export class MessageCreator {
             };
         };
         this.createAck = async (nonce) => {
-            const localReplicaInfo = await this.db.getLocalReplica();
+            const localReplicaInfo = await this.meta.getLocalReplica();
             return {
                 type: 'ack',
                 timestamp: this.ctx.time.now,

package/dist/esm/persistence/MessageCreator.js.map

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

package/dist/esm/persistence/PersistenceFiles.d.ts

@@ -1,31 +1,18 @@
 import { FileData } from '@verdant-web/common';
 import { Context } from '../context/context.js';
 import { PersistedFileData, PersistenceFileDb } from './interfaces.js';
-import { Disposable } from '../utils/Disposable.js';
-export declare class PersistenceFiles extends Disposable {
+export declare class PersistenceFiles {
     private db;
     private context;
     constructor(db: PersistenceFileDb, context: Omit<Context, 'queries'>);
     private get config();
     onServerReset: (since: string | null) => Promise<void>;
-    add: (file: FileData, options?: {
-        downloadRemote?: boolean;
-    }) => Promise<void>;
-    onUploaded: (fileId: string, options?: {
-        transaction?: unknown;
-    } | undefined) => Promise<void>;
-    get: (fileId: string, options?: {
-        transaction?: unknown;
-    } | undefined) => Promise<PersistedFileData | null>;
-    getAll: (options?: {
-        transaction?: unknown;
-    } | undefined) => Promise<PersistedFileData[]>;
-    listUnsynced: (options?: {
-        transaction?: unknown;
-    } | undefined) => Promise<PersistedFileData[]>;
-    iterateOverPendingDelete: (iterator: (file: PersistedFileData, store: IDBObjectStore) => void, options?: {
-        transaction?: IDBTransaction | undefined;
-    } | undefined) => Promise<void>;
+    add: (file: FileData) => Promise<FileData>;
+    onUploaded: (fileId: string) => Promise<void>;
+    get: (fileId: string) => Promise<PersistedFileData | null>;
+    getAll: () => Promise<PersistedFileData[]>;
+    listUnsynced: () => Promise<PersistedFileData[]>;
+    iterateOverPendingDelete: (iterator: (file: PersistedFileData) => void) => Promise<void>;
     stats: () => Promise<{
         size: {
             count: number;
@@ -42,7 +29,7 @@ export declare class PersistenceFiles extends Disposable {
         files: File[];
     }) => Promise<void>;
     private parseFileExportname;
-    downloadRemoteFile: (url: string, retries?: number, maxRetries?: number) => Promise<Blob>;
+    private loadFileContents;
     cleanupDeletedFiles: () => Promise<void>;
     private onFileRefsDeleted;
 }

package/dist/esm/persistence/PersistenceFiles.js

@@ -1,11 +1,9 @@
-import { Disposable } from '../utils/Disposable.js';
-export class PersistenceFiles extends Disposable {
+export class PersistenceFiles {
     constructor(db, context) {
-        super();
         this.db = db;
         this.context = context;
         this.onServerReset = (since) => this.db.resetSyncedStatusSince(since);
-        this.add = async (file, options) => {
+        this.add = async (file) => {
             // this method accepts a FileData which refers to a remote
             // file, as well as local files. in the case of a remote file,
             // we actually re-download and upload the file again. this powers
@@ -13,21 +11,35 @@ export class PersistenceFiles extends Disposable {
             // and re-upload to a new file ID. otherwise, when the cloned
             // filedata was marked deleted, the original file would be deleted
             // and the clone would refer to a missing file.
-            if (file.url && !file.file) {
+            if (file.url && !(file.localPath || file.file)) {
                 this.context.log('debug', 'Remote file added to an entity. This usually means an entity was cloned. Downloading remote file...', file.id);
-                const blob = await this.context.files.downloadRemoteFile(file.url, 0, 3);
+                const blob = await this.loadFileContents(file, 0, 3);
                 // convert blob to file with name and type
                 file.file = new File([blob], file.name, { type: file.type });
+                // remove the URL - it points to the original file's uploaded server version,
+                // but this file is a clone
+                delete file.url;
+                this.context.log('debug', 'Downloaded remote file', file.id, file.name, '. Cleared its remote URL.');
             }
-            else if (!file.file) {
+            else if (!file.url && !file.file && !file.localPath) {
                 this.context.log('warn', 'File added without a file or URL. This file will not be available for use.', file.id);
             }
+            // always reset remote status to false, this is a new file just created
+            // and must be uploaded, even if it is cloned from an uploaded file.
             file.remote = false;
             // fire event for processing immediately
             this.context.internalEvents.emit('fileAdded', file);
             // store in persistence db
-            await this.db.add(file, options);
-            this.context.log('debug', 'File added', file.id, file.name, file.type, file.file ? 'with binary file' : file.url ? 'with url' : 'with no data');
+            await this.db.add(file);
+            this.context.globalEvents.emit('fileSaved', file);
+            this.context.log('debug', 'File added', file.id, file.name, file.type, file.file
+                ? 'with binary file'
+                : file.url
+                    ? 'with url'
+                    : file.localPath
+                        ? 'with local path'
+                        : 'with no data');
+            return file;
         };
         this.onUploaded = this.db.markUploaded.bind(this.db);
         this.get = this.db.get.bind(this.db);
@@ -38,20 +50,23 @@ export class PersistenceFiles extends Disposable {
         this.getFileExportName = (originalFileName, id) => {
             return `${id}___${originalFileName}`;
         };
-        this.export = async (downloadRemote = false) => {
+        this.export = async (downloadRemote = true) => {
             const storedFiles = await this.getAll();
             if (downloadRemote) {
                 for (const storedFile of storedFiles) {
                     // if it doesn't have a buffer, we need to read one from the server
-                    if (!storedFile.file && storedFile.url) {
+                    if (!storedFile.file && (storedFile.url || storedFile.localPath)) {
                         try {
-                            const blob = await this.downloadRemoteFile(storedFile.url);
+                            const blob = await this.loadFileContents(storedFile);
                             storedFile.file = blob;
                         }
                         catch (err) {
-                            this.context.log('error', "Failed to download file to cache it locally. The file will still be available using its URL. Check the file server's CORS configuration.", err);
+                            this.context.log('error', "Failed to download file to cache it locally. The file will still be available using its URL. Check the file server's CORS configuration.", storedFile, err);
                         }
                     }
+                    else if (!storedFile.file) {
+                        this.context.log('warn', `File ${storedFile.id} has no file or URL. It will be missing in the export.`, storedFile);
+                    }
                 }
             }
             // split files into data and files
@@ -97,47 +112,47 @@ export class PersistenceFiles extends Disposable {
             const [id, originalFileName] = name.split('___');
             return { id, originalFileName };
         };
-        this.downloadRemoteFile = async (url, retries = 0, maxRetries = 0) => {
-            const resp = await fetch(url, {
-                method: 'GET',
-                credentials: 'include',
-            });
-            if (!resp.ok) {
+        this.loadFileContents = async (file, retries = 0, maxRetries = 0) => {
+            try {
+                return await this.db.loadFileContents(file, this.context);
+            }
+            catch (err) {
                 if (retries < maxRetries) {
                     return new Promise((resolve, reject) => {
                         setTimeout(() => {
-                            this.downloadRemoteFile(url, retries + 1, maxRetries).then(resolve, reject);
+                            this.loadFileContents(file, retries + 1, maxRetries).then(resolve, reject);
                         }, 1000);
                     });
                 }
                 else {
-                    throw new Error(`Failed to download file after ${maxRetries} retries (status: ${resp.status})`);
+                    throw new Error(`Failed to download file after ${maxRetries} retries`, {
+                        cause: err,
+                    });
                 }
             }
-            return await resp.blob();
         };
         this.cleanupDeletedFiles = async () => {
             let count = 0;
             let skipCount = 0;
-            await this.iterateOverPendingDelete((fileData, store) => {
+            const deletable = [];
+            await this.iterateOverPendingDelete((fileData) => {
                 if (this.config.canCleanupDeletedFile(fileData)) {
                     count++;
-                    store.delete(fileData.id);
+                    deletable.push(fileData.id);
                 }
                 else {
                     skipCount++;
                 }
             });
+            for (const id of deletable) {
+                await this.db.delete(id);
+            }
             this.context.log('info', `Cleaned up ${count} files, skipped ${skipCount} files`);
         };
         this.onFileRefsDeleted = async (fileRefs) => {
-            const tx = this.db.transaction({
-                mode: 'readwrite',
-                storeNames: ['files'],
-            });
             await Promise.all(fileRefs.map(async (fileRef) => {
                 try {
-                    await this.db.markPendingDelete(fileRef.id, { transaction: tx });
+                    await this.db.markPendingDelete(fileRef.id);
                 }
                 catch (err) {
                     this.context.log('error', 'Failed to mark file for deletion', err);
@@ -146,7 +161,6 @@ export class PersistenceFiles extends Disposable {
             this.context.log('info', `Marked ${fileRefs.length} files as pending delete`);
         };
         context.internalEvents.subscribe('filesDeleted', this.onFileRefsDeleted);
-        this.compose(this.db);
         // on startup, try deleting old files.
         this.cleanupDeletedFiles();
     }

package/dist/esm/persistence/PersistenceFiles.js.map

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

package/dist/esm/persistence/PersistenceMetadata.d.ts

@@ -1,9 +1,8 @@
 import { ClientMessage, DocumentBaseline, EventSubscriber, ObjectIdentifier, Operation } from '@verdant-web/common';
-import { ClientOperation, CommonQueryOptions, MetadataExport, PersistenceMetadataDb } from './interfaces.js';
+import { AbstractTransaction, ClientOperation, CommonQueryOptions, LocalReplicaInfo, MetadataExport, PersistenceMetadataDb } from './interfaces.js';
 import { InitialContext } from '../context/context.js';
 import { MessageCreator } from './MessageCreator.js';
-import { Disposable } from '../utils/Disposable.js';
-export declare class PersistenceMetadata extends Disposable {
+export declare class PersistenceMetadata {
     private db;
     private ctx;
     private rebaser;
@@ -38,20 +37,22 @@ export declare class PersistenceMetadata extends Disposable {
     }) => Promise<void>;
     updateLastSynced: (timestamp: string) => Promise<void>;
     setGlobalAck: (ack: string) => Promise<void>;
-    getLocalReplica: (options?: CommonQueryOptions) => Promise<import("./interfaces.js").LocalReplicaInfo>;
-    iterateLocalOperations: (iterator: import("./interfaces.js").Iterator<ClientOperation>, opts?: (CommonQueryOptions & {
+    private _cachedLocalReplica;
+    private _creatingLocalReplica;
+    getLocalReplica: (options?: CommonQueryOptions) => Promise<LocalReplicaInfo>;
+    updateLocalReplica: (data: Partial<LocalReplicaInfo>, opts?: {
+        transaction?: AbstractTransaction;
+    }) => Promise<void>;
+    iterateLocalOperations: (iterator: import("./interfaces.js").Iterator<ClientOperation>, opts?: (CommonQueryOptions<any> & {
         before?: string | null | undefined;
         after?: string | null | undefined;
     }) | undefined) => Promise<void>;
-    iterateAllOperations: (iterator: import("./interfaces.js").Iterator<ClientOperation>, opts?: (CommonQueryOptions & {
+    iterateAllOperations: (iterator: import("./interfaces.js").Iterator<ClientOperation>, opts?: (CommonQueryOptions<any> & {
         before?: string | null | undefined;
         from?: string | null | undefined;
     }) | undefined) => Promise<void>;
-    iterateAllBaselines: (iterator: import("./interfaces.js").Iterator<DocumentBaseline>, opts?: CommonQueryOptions | undefined) => Promise<void>;
-    reset: (opts?: {
-        clearReplica?: boolean | undefined;
-        transaction?: unknown;
-    } | undefined) => Promise<void>;
+    iterateAllBaselines: (iterator: import("./interfaces.js").Iterator<DocumentBaseline>, opts?: CommonQueryOptions<any> | undefined) => Promise<void>;
+    reset: () => Promise<void>;
     stats: () => Promise<{
         operationsSize: {
             count: number;