@verdant-web/store 3.12.0 → 4.0.0-next.0

package/dist/esm/files/EntityFile.js

@@ -1,14 +1,13 @@
-var _a, _b, _c;
+var _a, _b;
 import { EventSubscriber } from '@verdant-web/common';
 export const UPDATE = Symbol('entity-file-update');
 export const MARK_FAILED = Symbol('entity-file-mark-failed');
-export const MARK_UPLOADED = Symbol('entity-file-mark-uploaded');
 /**
  * Provides a consistent interface for files used in an app via
  * Entity access.
  */
 export class EntityFile extends EventSubscriber {
-    constructor(id, { downloadRemote = false, } = {}) {
+    constructor(id, { downloadRemote = false, ctx, }) {
         super();
         this.id = id;
         // cached object URL for a local blob file, if applicable
@@ -17,7 +16,9 @@ export class EntityFile extends EventSubscriber {
         this._loading = true;
         this._failed = false;
         this._downloadRemote = false;
+        this.unsubscribes = [];
         this[_a] = (fileData) => {
+            this.ctx.log('debug', 'EntityFile updated', this.id, fileData);
             this._loading = false;
             this._failed = false;
             this._fileData = fileData;
@@ -25,6 +26,7 @@ export class EntityFile extends EventSubscriber {
                 if (this._objectUrl) {
                     URL.revokeObjectURL(this._objectUrl);
                 }
+                this.ctx.log('debug', 'Creating object URL for file', this.id);
                 this._objectUrl = URL.createObjectURL(fileData.file);
             }
             this.emit('change');
@@ -34,7 +36,7 @@ export class EntityFile extends EventSubscriber {
             this._loading = false;
             this.emit('change');
         };
-        this[_c] = () => {
+        this.onUploaded = () => {
             if (!this._fileData)
                 return;
             this._fileData.remote = true;
@@ -46,7 +48,9 @@ export class EntityFile extends EventSubscriber {
             }
             this.dispose();
         };
+        this.ctx = ctx;
         this._downloadRemote = downloadRemote;
+        this.unsubscribes.push(this.ctx.internalEvents.subscribe(`fileUploaded:${id}`, this.onUploaded));
     }
     get downloadRemote() {
         return this._downloadRemote;
@@ -55,24 +59,24 @@ export class EntityFile extends EventSubscriber {
         return true;
     }
     get isUploaded() {
-        var _d, _e;
-        return (_e = (_d = this._fileData) === null || _d === void 0 ? void 0 : _d.remote) !== null && _e !== void 0 ? _e : false;
+        var _c, _d;
+        return (_d = (_c = this._fileData) === null || _c === void 0 ? void 0 : _c.remote) !== null && _d !== void 0 ? _d : false;
     }
     get url() {
-        var _d, _e;
+        var _c, _d;
         if (this.loading)
             return null;
         if (this._objectUrl)
             return this._objectUrl;
-        return (_e = (_d = this._fileData) === null || _d === void 0 ? void 0 : _d.url) !== null && _e !== void 0 ? _e : null;
+        return (_d = (_c = this._fileData) === null || _c === void 0 ? void 0 : _c.url) !== null && _d !== void 0 ? _d : null;
     }
     get name() {
-        var _d, _e;
-        return (_e = (_d = this._fileData) === null || _d === void 0 ? void 0 : _d.name) !== null && _e !== void 0 ? _e : null;
+        var _c, _d;
+        return (_d = (_c = this._fileData) === null || _c === void 0 ? void 0 : _c.name) !== null && _d !== void 0 ? _d : null;
     }
     get type() {
-        var _d, _e;
-        return (_e = (_d = this._fileData) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : null;
+        var _c, _d;
+        return (_d = (_c = this._fileData) === null || _c === void 0 ? void 0 : _c.type) !== null && _d !== void 0 ? _d : null;
     }
     get loading() {
         return this._loading;
@@ -81,17 +85,16 @@ export class EntityFile extends EventSubscriber {
         return this._failed;
     }
     getSnapshot() {
-        var _d, _e, _f;
-        if (this._fileData)
-            return this._fileData;
+        var _c, _d, _e, _f, _g, _h;
         return {
             id: this.id,
-            url: (_d = this._objectUrl) !== null && _d !== void 0 ? _d : undefined,
-            name: (_e = this.name) !== null && _e !== void 0 ? _e : 'unknown-file',
+            url: (_e = (_c = this._objectUrl) !== null && _c !== void 0 ? _c : (_d = this._fileData) === null || _d === void 0 ? void 0 : _d.url) !== null && _e !== void 0 ? _e : undefined,
+            name: (_f = this.name) !== null && _f !== void 0 ? _f : 'unknown-file',
             remote: false,
-            type: (_f = this.type) !== null && _f !== void 0 ? _f : '',
+            type: (_g = this.type) !== null && _g !== void 0 ? _g : '',
+            file: (_h = this._fileData) === null || _h === void 0 ? void 0 : _h.file,
         };
     }
 }
-_a = UPDATE, _b = MARK_FAILED, _c = MARK_UPLOADED;
+_a = UPDATE, _b = MARK_FAILED;
 //# sourceMappingURL=EntityFile.js.map

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

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

package/dist/esm/files/FileManager.d.ts

@@ -1,56 +1,25 @@
 import { FileData } from '@verdant-web/common';
-import { Context } from '../context.js';
-import { Metadata } from '../metadata/Metadata.js';
+import { Context } from '../context/context.js';
 import { Sync } from '../sync/Sync.js';
 import { EntityFile } from './EntityFile.js';
-import { ReturnedFileData } from './FileStorage.js';
-export interface FileManagerConfig {
-    /**
-     * Override the heuristic for deciding when a deleted file can be cleaned up.
-     * By default this waits 3 days since deletion, then deletes the file data.
-     * If the file has been synchronized to a server, it could still be restored
-     * if the server has not yet deleted it.
-     */
-    canCleanupDeletedFile?: (file: ReturnedFileData) => boolean;
-}
 export declare class FileManager {
-    private storage;
     private sync;
     private context;
-    private files;
-    private config;
-    private meta;
-    private maxUploadRetries;
-    private maxDownloadRetries;
-    constructor({ db, sync, context, meta, config, }: {
-        db: IDBDatabase;
+    private cache;
+    constructor({ sync, context }: {
         sync: Sync;
         context: Context;
-        config?: FileManagerConfig;
-        meta: Metadata;
     });
-    add: (file: FileData) => Promise<void>;
-    private uploadFile;
-    private downloadRemoteFile;
+    add: (file: FileData, options?: {
+        downloadRemote: boolean;
+    }) => Promise<void>;
     /**
      * Immediately returns an EntityFile to use, then either loads
      * the file from cache, local database, or the server.
      */
-    get: (id: string, options?: {
+    get: (id: string, options: {
         downloadRemote?: boolean;
+        ctx: Context;
     }) => EntityFile;
     private load;
-    listUnsynced: () => Promise<ReturnedFileData[]>;
-    exportAll: (downloadRemote?: boolean) => Promise<ReturnedFileData[]>;
-    importAll: (files: ReturnedFileData[]) => Promise<void>;
-    private onOnlineChange;
-    tryCleanupDeletedFiles: () => Promise<void>;
-    private handleFileRefsDeleted;
-    close: () => void;
-    stats: () => Promise<{
-        size: {
-            count: number;
-            size: number;
-        };
-    }>;
 }

package/dist/esm/files/FileManager.js

@@ -1,108 +1,34 @@
-import { EntityFile, MARK_FAILED, MARK_UPLOADED, UPDATE, } from './EntityFile.js';
-import { FileStorage, } from './FileStorage.js';
-/**
- * Default: if file was deleted > 3 days ago
- */
-function defaultCanCleanup(fileData) {
-    return (fileData.deletedAt !== null &&
-        fileData.deletedAt < Date.now() - 1000 * 60 * 24 * 3);
-}
+import { EntityFile, MARK_FAILED, UPDATE } from './EntityFile.js';
 export class FileManager {
-    constructor({ db, sync, context, meta, config = {}, }) {
-        this.files = new Map();
-        this.maxUploadRetries = 3;
-        this.maxDownloadRetries = 3;
-        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
-            // the cloning of documents with files; we clone their filedata
-            // 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) {
-                const blob = await this.downloadRemoteFile(file.url);
-                // convert blob to file with name and type
-                file.file = new File([blob], file.name, { type: file.type });
-            }
-            file.remote = false;
+    constructor({ sync, context }) {
+        this.cache = new Map();
+        this.add = async (file, options) => {
             // immediately cache the file
-            if (!this.files.has(file.id)) {
-                const entityFile = new EntityFile(file.id);
+            if (!this.cache.has(file.id)) {
+                const entityFile = new EntityFile(file.id, { ctx: this.context });
                 entityFile[UPDATE](file);
-                this.files.set(file.id, entityFile);
+                this.cache.set(file.id, entityFile);
             }
             else {
-                this.files.get(file.id)[UPDATE](file);
-            }
-            // write to local storage and send to sync immediately
-            await this.storage.addFile(file);
-            // send to sync
-            if (file.file && this.sync.status === 'active') {
-                await this.uploadFile(file);
+                this.cache.get(file.id)[UPDATE](file);
             }
-        };
-        this.uploadFile = async (file, retries = 0) => {
-            const result = await this.sync.uploadFile(file);
-            if (result.success) {
-                await this.storage.markUploaded(file.id);
-                const cached = this.files.get(file.id);
-                if (cached) {
-                    cached[MARK_UPLOADED]();
-                }
-                this.context.log('info', 'File uploaded', file.id);
-            }
-            else {
-                if (result.retry && retries < this.maxUploadRetries) {
-                    this.context.log('error', `Error uploading file ${file.id}, retrying...`, result.error);
-                    // schedule a retry
-                    setTimeout(this.uploadFile, 1000, file, retries + 1);
-                }
-                else {
-                    this.context.log('error', `Failed to upload file ${file.id}. Not retrying until next sync.`, result.error);
-                }
-            }
-        };
-        this.downloadRemoteFile = async (url, retries = 0) => {
-            const resp = await fetch(url, {
-                method: 'GET',
-                credentials: 'include',
-            });
-            if (!resp.ok) {
-                if (retries < this.maxDownloadRetries) {
-                    return new Promise((resolve, reject) => {
-                        setTimeout(() => {
-                            this.downloadRemoteFile(url, retries + 1).then(resolve, reject);
-                        }, 1000);
-                    });
-                }
-                else {
-                    throw new Error(`Failed to download file: ${resp.status}`);
-                }
-            }
-            const blob = await resp.blob();
-            return blob;
+            await this.context.files.add(file, options);
         };
         /**
          * Immediately returns an EntityFile to use, then either loads
          * the file from cache, local database, or the server.
          */
         this.get = (id, options) => {
-            if (this.files.has(id)) {
-                return this.files.get(id);
+            if (this.cache.has(id)) {
+                return this.cache.get(id);
             }
             const file = new EntityFile(id, options);
-            this.files.set(id, file);
+            this.cache.set(id, file);
             this.load(file);
             return file;
         };
-        this.load = async (file, retries = 0) => {
-            if (retries > this.maxDownloadRetries) {
-                this.context.log('error', 'Failed to load file after 5 retries');
-                file[MARK_FAILED]();
-                return;
-            }
-            const fileData = await this.storage.getFile(file.id);
+        this.load = async (file) => {
+            const fileData = await this.context.files.get(file.id);
             if (fileData) {
                 file[UPDATE](fileData);
             }
@@ -112,104 +38,23 @@ export class FileManager {
                     const result = await this.sync.getFile(file.id);
                     if (result.success) {
                         file[UPDATE](result.data);
-                        await this.storage.addFile(result.data, {
+                        await this.context.files.add(result.data, {
                             downloadRemote: file.downloadRemote,
                         });
                     }
                     else {
                         this.context.log('error', 'Failed to load file', result);
                         file[MARK_FAILED]();
-                        if (result.retry) {
-                            // schedule a retry
-                            setTimeout(this.load, 1000, file, retries + 1);
-                        }
                     }
                 }
                 catch (err) {
                     this.context.log('error', 'Failed to load file', err);
                     file[MARK_FAILED]();
-                    // schedule a retry
-                    setTimeout(this.load, 1000, file, retries + 1);
                 }
             }
         };
-        this.listUnsynced = async () => {
-            return this.storage.listUnsynced();
-        };
-        this.exportAll = async (downloadRemote = false) => {
-            const storedFiles = await this.storage.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) {
-                        try {
-                            const blob = await fetch(storedFile.url, {
-                                method: 'GET',
-                                credentials: 'include',
-                            }).then((r) => r.blob());
-                            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);
-                        }
-                    }
-                }
-            }
-            return storedFiles;
-        };
-        this.importAll = async (files) => {
-            await Promise.all(files.map((file) => this.add(file)));
-        };
-        this.onOnlineChange = async (online) => {
-            // if online, try to upload any unsynced files
-            if (online) {
-                const unsynced = await this.listUnsynced();
-                await Promise.all(unsynced.map(this.uploadFile));
-            }
-        };
-        this.tryCleanupDeletedFiles = async () => {
-            let count = 0;
-            let skipCount = 0;
-            await this.storage.iterateOverPendingDelete((fileData, store) => {
-                if (this.config.canCleanupDeletedFile(fileData)) {
-                    count++;
-                    store.delete(fileData.id);
-                }
-                else {
-                    skipCount++;
-                }
-            });
-            this.context.log('info', `Cleaned up ${count} files, skipped ${skipCount} files`);
-        };
-        this.handleFileRefsDeleted = async (fileRefs) => {
-            const tx = this.storage.createTransaction(['files'], { mode: 'readwrite' });
-            await Promise.all(fileRefs.map(async (fileRef) => {
-                try {
-                    await this.storage.markPendingDelete(fileRef.id, { transaction: tx });
-                }
-                catch (err) {
-                    this.context.log('error', 'Failed to mark file for deletion', err);
-                }
-            }));
-            this.context.log('info', `Marked ${fileRefs.length} files as pending delete`);
-        };
-        this.close = () => {
-            this.storage.dispose();
-        };
-        this.stats = () => {
-            return this.storage.stats();
-        };
-        this.storage = new FileStorage(db);
         this.sync = sync;
         this.context = context;
-        this.meta = meta;
-        this.config = Object.assign({ canCleanupDeletedFile: defaultCanCleanup }, config);
-        this.sync.subscribe('onlineChange', this.onOnlineChange);
-        this.meta.subscribe('filesDeleted', this.handleFileRefsDeleted);
-        this.sync.subscribe('serverReset', this.storage.resetSyncedStatusSince);
-        // check on startup to see if files can be cleaned up
-        this.tryCleanupDeletedFiles();
     }
 }
 //# sourceMappingURL=FileManager.js.map

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/files/utils.d.ts

@@ -6,4 +6,3 @@ export declare function createFileData(file: File): FileData;
  * The list of files passed to the second argument will be populated with the files found in the value.
  */
 export declare function processValueFiles(value: any, onFileIdentified: (fileData: FileData) => void): any;
-export declare function fileToArrayBuffer(file: File | Blob): unknown;

package/dist/esm/files/utils.js

@@ -41,18 +41,4 @@ export function processValueFiles(value, onFileIdentified) {
     }
     return value;
 }
-export function fileToArrayBuffer(file) {
-    // special case for testing...
-    if ('__testReadBuffer' in file) {
-        return file.__testReadBuffer;
-    }
-    return new Promise((resolve, reject) => {
-        const reader = new FileReader();
-        reader.onload = () => {
-            resolve(reader.result);
-        };
-        reader.onerror = reject;
-        reader.readAsArrayBuffer(file);
-    });
-}
 //# sourceMappingURL=utils.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/files/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,aAAa,EAEb,MAAM,EACN,UAAU,GACV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,UAAU,cAAc,CAAC,IAAU;IACxC,OAAO;QACN,EAAE,EAAE,IAAI,EAAE;QACV,IAAI,EAAE,IAAI;QACV,GAAG,EAAE,SAAS;QACd,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,IAAI,EAAE,IAAI,CAAC,IAAI;KACf,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAChC,KAAU,EACV,gBAA8C;IAE9C,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QACnC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACvB,OAAO,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,+BAA+B;QAC/B,MAAM,MAAM,mCAAQ,KAAK,KAAE,EAAE,EAAE,IAAI,EAAE,GAAE,CAAC;QACxC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACzB,OAAO,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACvC,KAAK,CAAC,CAAC,CAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;QAC1D,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC/B,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACzB,KAAK,CAAC,GAAG,CAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,gBAAgB,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,IAAiB;IAClD,8BAA8B;IAC9B,IAAI,kBAAkB,IAAI,IAAI,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC9B,CAAC;IACD,OAAO,IAAI,OAAO,CAAc,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnD,MAAM,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAChC,MAAM,CAAC,MAAM,GAAG,GAAG,EAAE;YACpB,OAAO,CAAC,MAAM,CAAC,MAAqB,CAAC,CAAC;QACvC,CAAC,CAAC;QACF,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC;QACxB,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/files/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,aAAa,EAEb,MAAM,EACN,UAAU,GACV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,UAAU,cAAc,CAAC,IAAU;IACxC,OAAO;QACN,EAAE,EAAE,IAAI,EAAE;QACV,IAAI,EAAE,IAAI;QACV,GAAG,EAAE,SAAS;QACd,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,IAAI,EAAE,IAAI,CAAC,IAAI;KACf,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAChC,KAAU,EACV,gBAA8C;IAE9C,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QACnC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACvB,OAAO,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,+BAA+B;QAC/B,MAAM,MAAM,mCAAQ,KAAK,KAAE,EAAE,EAAE,IAAI,EAAE,GAAE,CAAC;QACxC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACzB,OAAO,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACvC,KAAK,CAAC,CAAC,CAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;QAC1D,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC/B,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACzB,KAAK,CAAC,GAAG,CAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,gBAAgB,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC"}

package/dist/esm/index.d.ts

@@ -15,12 +15,11 @@ 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, } 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 type { Query } from './queries/types.js';
 export type { QueryStatus } from './queries/BaseQuery.js';
 export type { CollectionQueries } from './queries/CollectionQueries.js';
-export { MigrationPathError } from './migration/errors.js';
 export * from './utils/id.js';
 export { UndoHistory } from './UndoHistory.js';
 export * from './authorization.js';

package/dist/esm/index.js

@@ -11,7 +11,6 @@ export { EntityFile } from './files/EntityFile.js';
 export { 
 /** @deprecated - use schema.collection */
 collection, schema, createDefaultMigration, migrate, createMigration, } from '@verdant-web/common';
-export { MigrationPathError } from './migration/errors.js';
 export * from './utils/id.js';
 export { UndoHistory } from './UndoHistory.js';
 export * from './authorization.js';

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;AAsB7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,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;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"}

package/dist/esm/{metadata → persistence}/MessageCreator.d.ts

@@ -1,14 +1,13 @@
 import { AckMessage, HeartbeatMessage, OperationMessage, PresenceUpdateMessage, SyncMessage, VerdantInternalPresence } from '@verdant-web/common';
-import { Metadata } from './Metadata.js';
+import { Context } from '../context/context.js';
+import { PersistenceMetadataDb } from './interfaces.js';
 export declare class MessageCreator {
-    private meta;
-    constructor(meta: Metadata);
+    private db;
+    private ctx;
+    constructor(db: PersistenceMetadataDb, ctx: Pick<Context, 'time' | 'schema' | 'log'>);
     createOperation: (init: Pick<OperationMessage, 'operations'> & {
         timestamp?: string;
     }) => Promise<OperationMessage>;
-    createMigrationOperation: ({ targetVersion, ...init }: Pick<OperationMessage, "operations"> & {
-        targetVersion: number;
-    }) => Promise<OperationMessage>;
     /**
      * @param since - override local understanding of last sync time
      */