@verdant-web/store 2.5.8 → 2.7.0

package/dist/cjs/migration/db.js

@@ -82,13 +82,16 @@ async function acquireLock(namespace, procedure) {
     }
 }
 exports.acquireLock = acquireLock;
-async function openDatabase(indexedDb, namespace, version) {
+async function openDatabase(indexedDb, namespace, version, log) {
+    log === null || log === void 0 ? void 0 : log('debug', 'Opening database', namespace, 'at version', version);
     const db = await new Promise((resolve, reject) => {
         const request = indexedDb.open([namespace, 'collections'].join('_'), version);
         request.onupgradeneeded = async (event) => {
             const transaction = request.transaction;
             transaction.abort();
-            reject(new Error('Migration error: database version changed while migrating'));
+            log === null || log === void 0 ? void 0 : log('error', 'Database upgrade needed, but not expected', 'Expected', version, 'Got', request.result.version);
+            reject(request.error ||
+                new Error(`Migration error: database version changed unexpectedly when reading current data. Expected ${version}, got ${request.result.version}`));
         };
         request.onsuccess = (event) => {
             resolve(request.result);

package/dist/cjs/migration/db.js.map

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

package/dist/cjs/migration/openDatabase.d.ts

@@ -9,4 +9,12 @@ export declare function openDocumentDatabase({ version, indexedDB, migrations, m
     meta: Metadata;
     context: OpenDocumentDbContext;
 }): Promise<IDBDatabase>;
+export declare function openWIPDocumentDatabase({ version, indexedDB, migrations, meta, context, wipNamespace, }: {
+    version: number;
+    migrations: Migration<any>[];
+    indexedDB?: IDBFactory;
+    meta: Metadata;
+    context: OpenDocumentDbContext;
+    wipNamespace: string;
+}): Promise<IDBDatabase>;
 export {};

package/dist/cjs/migration/openDatabase.js

@@ -1,182 +1,246 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.openDocumentDatabase = void 0;
+exports.openWIPDocumentDatabase = exports.openDocumentDatabase = void 0;
 const common_1 = require("@verdant-web/common");
+const idb_js_1 = require("../idb.js");
 const dbQueries_js_1 = require("../queries/dbQueries.js");
 const db_js_1 = require("./db.js");
 const paths_js_1 = require("./paths.js");
 const globalIDB = typeof window !== 'undefined' ? window.indexedDB : undefined;
 async function openDocumentDatabase({ version, indexedDB = globalIDB, migrations, meta, context, }) {
+    if (context.schema.wip) {
+        throw new Error('Cannot open a production client with a WIP schema!');
+    }
     const currentVersion = await (0, db_js_1.getDatabaseVersion)(indexedDB, context.namespace, version, context.log);
-    context.log('Current database version:', currentVersion, 'target version:', version);
+    context.log('debug', 'Current database version:', currentVersion, 'target version:', version);
     const toRun = (0, paths_js_1.getMigrationPath)({
         currentVersion,
         targetVersion: version,
         migrations,
     });
     if (toRun.length > 0) {
-        await (0, db_js_1.acquireLock)(context.namespace, async () => {
-            // now the fun part
-            for (const migration of toRun) {
-                // special case: if this is the version 1 migration, we have no pre-existing database
-                // to use for the migration.
-                let engine;
-                // migrations from 0 (i.e. initial migrations) don't attempt to open an existing db
-                if (migration.oldSchema.version === 0) {
-                    engine = getInitialMigrationEngine({
-                        meta,
-                        migration,
-                        context,
-                    });
+        context.log('debug', 'Migrations to run:', toRun.map((m) => m.version));
+        await runMigrations({ context, toRun, meta, indexedDB });
+    }
+    return (0, db_js_1.openDatabase)(indexedDB, context.namespace, version, context.log);
+}
+exports.openDocumentDatabase = openDocumentDatabase;
+async function openWIPDocumentDatabase({ version, indexedDB = globalIDB, migrations, meta, context, wipNamespace, }) {
+    context.log('debug', 'Opening WIP database', wipNamespace);
+    const currentWIPVersion = await (0, db_js_1.getDatabaseVersion)(indexedDB, wipNamespace, version, context.log);
+    if (currentWIPVersion === version) {
+        context.log('info', `WIP schema is up-to-date; not refreshing database`);
+    }
+    else {
+        context.log('info', `WIP schema is out-of-date; refreshing database`);
+        // first we need to copy the data from the production database to the WIP database
+        // at the current (non-wip) version.
+        const initialToRun = (0, paths_js_1.getMigrationPath)({
+            currentVersion: currentWIPVersion,
+            targetVersion: version - 1,
+            migrations,
+        });
+        if (initialToRun.length > 0) {
+            await runMigrations({
+                context,
+                toRun: initialToRun,
+                meta,
+                indexedDB,
+                namespace: wipNamespace,
+            });
+            // now, we copy the data from the main database.
+            const mainDatabase = await (0, db_js_1.openDatabase)(indexedDB, context.namespace, version - 1, context.log);
+            const wipDatabase = await (0, db_js_1.openDatabase)(indexedDB, wipNamespace, version - 1, context.log);
+            // DOMStringList... doesn't have iterable... why
+            const mainDatabaseStoreNames = new Array();
+            for (let i = 0; i < mainDatabase.objectStoreNames.length; i++) {
+                mainDatabaseStoreNames.push(mainDatabase.objectStoreNames[i]);
+            }
+            const copyFromTransaction = mainDatabase.transaction(mainDatabaseStoreNames, 'readonly');
+            const copyFromStores = mainDatabaseStoreNames.map((name) => copyFromTransaction.objectStore(name));
+            const allObjects = await Promise.all(copyFromStores.map((store) => (0, idb_js_1.storeRequestPromise)(store.getAll())));
+            const copyToTransaction = wipDatabase.transaction(mainDatabaseStoreNames, 'readwrite');
+            const copyToStores = mainDatabaseStoreNames.map((name) => copyToTransaction.objectStore(name));
+            for (let i = 0; i < copyToStores.length; i++) {
+                await Promise.all(allObjects[i].map((obj) => {
+                    return (0, idb_js_1.storeRequestPromise)(copyToStores[i].put(obj));
+                }));
+            }
+        }
+        const toRun = (0, paths_js_1.getMigrationPath)({
+            currentVersion: version - 1,
+            targetVersion: version,
+            migrations,
+        });
+        if (toRun.length > 0) {
+            await runMigrations({
+                context,
+                toRun,
+                meta,
+                indexedDB,
+                namespace: wipNamespace,
+            });
+        }
+    }
+    return (0, db_js_1.openDatabase)(indexedDB, wipNamespace, version, context.log);
+}
+exports.openWIPDocumentDatabase = openWIPDocumentDatabase;
+async function runMigrations({ context, toRun, meta, indexedDB = globalIDB, namespace = context.namespace, }) {
+    await (0, db_js_1.acquireLock)(namespace, async () => {
+        // now the fun part
+        for (const migration of toRun) {
+            // special case: if this is the version 1 migration, we have no pre-existing database
+            // to use for the migration.
+            let engine;
+            // migrations from 0 (i.e. initial migrations) don't attempt to open an existing db
+            if (migration.oldSchema.version === 0) {
+                engine = getInitialMigrationEngine({
+                    meta,
+                    migration,
+                    context,
+                });
+                await migration.migrate(engine);
+            }
+            else {
+                // open the database with the current (old) version for this migration. this should
+                // align with the database's current version.
+                const originalDatabase = await (0, db_js_1.openDatabase)(indexedDB, namespace, migration.oldSchema.version, context.log);
+                // this will only write to our metadata store via operations!
+                engine = getMigrationEngine({
+                    meta,
+                    migration,
+                    context: Object.assign(Object.assign({}, context), { documentDb: originalDatabase }),
+                });
+                try {
                     await migration.migrate(engine);
+                    // wait on any out-of-band async operations to complete
+                    await Promise.all(engine.awaitables);
                 }
-                else {
-                    // open the database with the current (old) version for this migration. this should
-                    // align with the database's current version.
-                    const originalDatabase = await (0, db_js_1.openDatabase)(indexedDB, context.namespace, migration.oldSchema.version);
-                    // this will only write to our metadata store via operations!
-                    engine = getMigrationEngine({
-                        meta,
-                        migration,
-                        context: Object.assign(Object.assign({}, context), { documentDb: originalDatabase }),
+                catch (err) {
+                    context.log('critical', `Migration failed (${migration.oldSchema.version} -> ${migration.newSchema.version})`, err);
+                    throw err;
+                }
+                // now we have to open the database again with the next version and
+                // make the appropriate schema changes during the upgrade.
+                await (0, db_js_1.closeDatabase)(originalDatabase);
+            }
+            context.log('debug', 'Upgrading database', namespace, 'to version', migration.newSchema.version);
+            await (0, db_js_1.upgradeDatabase)(indexedDB, namespace, migration.newSchema.version, (transaction, db) => {
+                for (const newCollection of migration.addedCollections) {
+                    db.createObjectStore(newCollection, {
+                        keyPath: migration.newSchema.collections[newCollection].primaryKey,
+                        autoIncrement: false,
                     });
-                    try {
-                        await migration.migrate(engine);
-                        // wait on any out-of-band async operations to complete
-                        await Promise.all(engine.awaitables);
-                    }
-                    catch (err) {
-                        context.log('critical', `Migration failed (${migration.oldSchema.version} -> ${migration.newSchema.version})`, err);
-                        throw err;
-                    }
-                    // now we have to open the database again with the next version and
-                    // make the appropriate schema changes during the upgrade.
-                    await (0, db_js_1.closeDatabase)(originalDatabase);
                 }
-                await (0, db_js_1.upgradeDatabase)(indexedDB, context.namespace, migration.newSchema.version, (transaction, db) => {
-                    for (const newCollection of migration.addedCollections) {
-                        db.createObjectStore(newCollection, {
-                            keyPath: migration.newSchema.collections[newCollection].primaryKey,
-                            autoIncrement: false,
+                for (const collection of migration.allCollections) {
+                    const store = transaction.objectStore(collection);
+                    // apply new indexes
+                    for (const newIndex of migration.addedIndexes[collection] || []) {
+                        store.createIndex(newIndex.name, newIndex.name, {
+                            multiEntry: newIndex.multiEntry,
                         });
                     }
-                    for (const collection of migration.allCollections) {
-                        const store = transaction.objectStore(collection);
-                        // apply new indexes
-                        for (const newIndex of migration.addedIndexes[collection] || []) {
-                            store.createIndex(newIndex.name, newIndex.name, {
-                                multiEntry: newIndex.multiEntry,
-                            });
-                        }
-                        // remove old indexes
-                        for (const oldIndex of migration.removedIndexes[collection] ||
-                            []) {
-                            store.deleteIndex(oldIndex.name);
-                        }
+                    // remove old indexes
+                    for (const oldIndex of migration.removedIndexes[collection] || []) {
+                        store.deleteIndex(oldIndex.name);
                     }
-                    for (const removedCollection of migration.removedCollections) {
-                        // !! can't delete the store, because old operations that relate to
-                        // this store may still exist in history. instead, we can clear it out
-                        // and leave it in place
-                        transaction.objectStore(removedCollection).clear();
+                }
+                for (const removedCollection of migration.removedCollections) {
+                    // !! can't delete the store, because old operations that relate to
+                    // this store may still exist in history. instead, we can clear it out
+                    // and leave it in place
+                    transaction.objectStore(removedCollection).clear();
+                }
+            }, context.log);
+            /**
+             * In cases where operations from the future have been
+             * received by this client, we may have created entire
+             * documents in metadata which were not written to storage
+             * because all of their operations were in the future (
+             * i.e. in the next version). We have to find those documents
+             * and also write their snapshots to storage, because they
+             * won't be present in storage already to 'refresh,' so
+             * if we don't analyze metadata for 'future' operations like
+             * this, we won't know they exist.
+             *
+             * This led to behavior where the metadata would be properly
+             * synced, but after upgrading the app and migrating, items
+             * would be missing from findAll and findOne queries.
+             */
+            const docsWithUnappliedMigrations = await getDocsWithUnappliedMigrations({
+                meta,
+                currentVersion: migration.oldSchema.version,
+                newVersion: migration.newSchema.version,
+            });
+            // once the schema is ready, we can write back the migrated documents
+            const upgradedDatabase = await (0, db_js_1.openDatabase)(indexedDB, namespace, migration.newSchema.version, context.log);
+            for (const collection of migration.allCollections) {
+                // first step is to read in all the keys we need to rewrite
+                const documentReadTransaction = upgradedDatabase.transaction(collection, 'readwrite');
+                const readStore = documentReadTransaction.objectStore(collection);
+                const keys = await getAllKeys(readStore);
+                // map the keys to OIDs
+                const oids = keys.map((key) => (0, common_1.createOid)(collection, `${key}`));
+                oids.push(...engine.newOids.filter((oid) => {
+                    return (0, common_1.decomposeOid)(oid).collection === collection;
+                }), ...docsWithUnappliedMigrations.filter((oid) => {
+                    return (0, common_1.decomposeOid)(oid).collection === collection;
+                }));
+                const snapshots = await Promise.all(oids.map(async (oid) => {
+                    try {
+                        const snap = await meta.getDocumentSnapshot(oid);
+                        return [oid, snap];
                     }
-                }, context.log);
-                /**
-                 * In cases where operations from the future have been
-                 * received by this client, we may have created entire
-                 * documents in metadata which were not written to storage
-                 * because all of their operations were in the future (
-                 * i.e. in the next version). We have to find those documents
-                 * and also write their snapshots to storage, because they
-                 * won't be present in storage already to 'refresh,' so
-                 * if we don't analyze metadata for 'future' operations like
-                 * this, we won't know they exist.
-                 *
-                 * This led to behavior where the metadata would be properly
-                 * synced, but after upgrading the app and migrating, items
-                 * would be missing from findAll and findOne queries.
-                 */
-                const docsWithUnappliedMigrations = await getDocsWithUnappliedMigrations({
-                    meta,
-                    currentVersion: migration.oldSchema.version,
-                    newVersion: migration.newSchema.version,
+                    catch (e) {
+                        // this seems to happen with baselines/ops which are not fully
+                        // cleaned up after deletion?
+                        context.log('error', 'Could not regenerate snapshot during migration for oid', oid, 'this document will not be preserved', e);
+                        return null;
+                    }
+                }));
+                const views = snapshots
+                    .filter((s) => !!s)
+                    .map(([oid, snapshot]) => {
+                    if (!snapshot)
+                        return [oid, undefined];
+                    const view = (0, common_1.getIndexValues)(migration.newSchema.collections[collection], snapshot);
+                    return [oid, view];
                 });
-                // once the schema is ready, we can write back the migrated documents
-                const upgradedDatabase = await (0, db_js_1.openDatabase)(indexedDB, context.namespace, migration.newSchema.version);
-                for (const collection of migration.allCollections) {
-                    // first step is to read in all the keys we need to rewrite
-                    const documentReadTransaction = upgradedDatabase.transaction(collection, 'readwrite');
-                    const readStore = documentReadTransaction.objectStore(collection);
-                    const keys = await getAllKeys(readStore);
-                    // map the keys to OIDs
-                    const oids = keys.map((key) => (0, common_1.createOid)(collection, `${key}`));
-                    oids.push(...engine.newOids.filter((oid) => {
-                        return (0, common_1.decomposeOid)(oid).collection === collection;
-                    }), ...docsWithUnappliedMigrations.filter((oid) => {
-                        return (0, common_1.decomposeOid)(oid).collection === collection;
-                    }));
-                    const snapshots = await Promise.all(oids.map(async (oid) => {
-                        try {
-                            const snap = await meta.getDocumentSnapshot(oid, {
-                                to: meta.time.now(migration.newSchema.version),
-                            });
-                            return [oid, snap];
-                        }
-                        catch (e) {
-                            // this seems to happen with baselines/ops which are not fully
-                            // cleaned up after deletion?
-                            context.log('error', 'Could not regenerate snapshot during migration for oid', oid, 'this document will not be preserved', e);
-                            return null;
-                        }
-                    }));
-                    const views = snapshots
-                        .filter((s) => !!s)
-                        .map(([oid, snapshot]) => {
-                        if (!snapshot)
-                            return [oid, undefined];
-                        const view = (0, common_1.assignIndexValues)(migration.newSchema.collections[collection], snapshot);
-                        // TODO: remove the need for this by only storing index values!
-                        (0, common_1.assignOidPropertiesToAllSubObjects)(view);
-                        return [oid, view];
-                    });
-                    // now we can write the documents back
-                    const documentWriteTransaction = upgradedDatabase.transaction(collection, 'readwrite');
-                    const writeStore = documentWriteTransaction.objectStore(collection);
-                    await Promise.all(views.map(([oid, view]) => {
-                        if (view) {
-                            return putView(writeStore, view);
-                        }
-                        else {
-                            const { id } = (0, common_1.decomposeOid)(oid);
-                            return deleteView(writeStore, id);
-                        }
-                    }));
-                }
-                await (0, db_js_1.closeDatabase)(upgradedDatabase);
-                context.log(`
-					⬆️ v${migration.newSchema.version} Migration complete. Here's the rundown:
-						- Added collections: ${migration.addedCollections.join(', ')}
-						- Removed collections: ${migration.removedCollections.join(', ')}
-						- Changed collections: ${migration.changedCollections.join(', ')}
-						- New indexes: ${Object.keys(migration.addedIndexes)
-                    .map((col) => migration.addedIndexes[col].map((i) => `${col}.${i.name}`))
-                    .flatMap((i) => i)
-                    .join(', ')}
-						- Removed indexes: ${Object.keys(migration.removedIndexes)
-                    .map((col) => migration.removedIndexes[col].map((i) => `${col}.${i.name}`))
-                    .flatMap((i) => i)
-                    .join(', ')}
-				`);
+                // now we can write the documents back
+                const documentWriteTransaction = upgradedDatabase.transaction(collection, 'readwrite');
+                const writeStore = documentWriteTransaction.objectStore(collection);
+                await Promise.all(views.map(([oid, view]) => {
+                    if (view) {
+                        return putView(writeStore, view).catch((err) => {
+                            view;
+                            throw err;
+                        });
+                    }
+                    else {
+                        const { id } = (0, common_1.decomposeOid)(oid);
+                        return deleteView(writeStore, id);
+                    }
+                }));
             }
-        });
-        return (0, db_js_1.openDatabase)(indexedDB, context.namespace, version);
-    }
-    else {
-        // just open the database
-        return (0, db_js_1.openDatabase)(indexedDB, context.namespace, version);
-    }
+            await (0, db_js_1.closeDatabase)(upgradedDatabase);
+            context.log('debug', `Migration of ${namespace} complete.`);
+            context.log(`
+				⬆️ v${migration.newSchema.version} Migration complete. Here's the rundown:
+					- Added collections: ${migration.addedCollections.join(', ')}
+					- Removed collections: ${migration.removedCollections.join(', ')}
+					- Changed collections: ${migration.changedCollections.join(', ')}
+					- New indexes: ${Object.keys(migration.addedIndexes)
+                .map((col) => migration.addedIndexes[col].map((i) => `${col}.${i.name}`))
+                .flatMap((i) => i)
+                .join(', ')}
+					- Removed indexes: ${Object.keys(migration.removedIndexes)
+                .map((col) => migration.removedIndexes[col].map((i) => `${col}.${i.name}`))
+                .flatMap((i) => i)
+                .join(', ')}
+			`);
+        }
+    });
 }
-exports.openDocumentDatabase = openDocumentDatabase;
 function getMigrationMutations({ migration, meta, getMigrationNow, newOids, }) {
     return migration.allCollections.reduce((acc, collectionName) => {
         acc[collectionName] = {
@@ -212,7 +276,6 @@ function getMigrationQueries({ migration, context, meta, }) {
                     // only get the snapshot up to the previous version (newer operations may have synced)
                     to: meta.time.now(migration.oldSchema.version),
                 });
-                // removeOidsFromAllSubObjects(doc);
                 return doc;
             },
             findOne: async (filter) => {
@@ -227,7 +290,6 @@ function getMigrationQueries({ migration, context, meta, }) {
                     // only get the snapshot up to the previous version (newer operations may have synced)
                     to: meta.time.now(migration.oldSchema.version),
                 });
-                // removeOidsFromAllSubObjects(doc);
                 return doc;
             },
             findAll: async (filter) => {
@@ -240,7 +302,6 @@ function getMigrationQueries({ migration, context, meta, }) {
                     // only get the snapshot up to the previous version (newer operations may have synced)
                     to: meta.time.now(migration.oldSchema.version),
                 })));
-                // docs.forEach((doc) => removeOidsFromAllSubObjects(doc));
                 return docs;
             },
         };
@@ -272,15 +333,6 @@ function getMigrationEngine({ meta, migration, context, }) {
             await Promise.all(docs.filter(Boolean).map(async (doc) => {
                 (0, common_1.assert)((0, common_1.hasOid)(doc), `Document is missing an OID: ${JSON.stringify(doc)}`);
                 const original = (0, common_1.cloneDeep)(doc);
-                // remove any indexes before computing the diff
-                // const collectionSpec = migration.oldSchema.collections[collection];
-                // const indexKeys = [
-                // 	...Object.keys(collectionSpec.synthetics || {}),
-                // 	...Object.keys(collectionSpec.compounds || {}),
-                // ];
-                // indexKeys.forEach((key) => {
-                // 	delete doc[key];
-                // });
                 // @ts-ignore - excessive type resolution
                 const newValue = await strategy(doc);
                 if (newValue) {

package/dist/cjs/migration/openDatabase.js.map

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

package/dist/cjs/queries/BaseQuery.js

@@ -59,7 +59,18 @@ class BaseQuery extends Disposable_js_1.Disposable {
                 this._status = 'revalidating';
             }
             // no status change needed if already in a 'running' status.
-            this._executionPromise = this.run().then(() => this._value);
+            this._executionPromise = this.run()
+                .then(() => this._value)
+                .catch((err) => {
+                if (err instanceof Error) {
+                    if (err.name === 'InvalidStateError' ||
+                        err.name === 'InvalidAccessError') {
+                        // possibly accessing db while it's closed. not much we can do.
+                        return this._value;
+                    }
+                }
+                throw err;
+            });
             return this._executionPromise;
         };
         this[_a] = (handler) => {

package/dist/cjs/queries/BaseQuery.js.map

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