dexie 3.2.1-beta.2 → 4.0.0-alpha.2

package/dist/modern/dexie.mjs

@@ -4,7 +4,7 @@
  *
  * By David Fahlander, david.fahlander@gmail.com
  *
- * Version 3.2.1-beta.2, Wed Jan 05 2022
+ * Version 4.0.0-alpha.2, Sun Apr 10 2022
  *
  * https://dexie.org
  *
@@ -1242,7 +1242,7 @@ function tempTransaction(db, mode, storeNames, fn) {
     }
 }
 
-const DEXIE_VERSION = '3.2.1-beta.2';
+const DEXIE_VERSION = '4.0.0-alpha.2';
 const maxString = String.fromCharCode(65535);
 const minKey = -Infinity;
 const INVALID_KEY_ARGUMENT = "Invalid key provided. Keys must be of type string, number, Date or Array<string | number | Date>.";
@@ -1284,6 +1284,10 @@ function workaroundForUndefinedPrimKey(keyPath) {
         : (obj) => obj;
 }
 
+function Entity() {
+    throw exceptions.Type();
+}
+
 class Table {
     _trans(mode, fn, writeLocked) {
         const trans = this._tx || PSD.trans;
@@ -1395,13 +1399,24 @@ class Table {
         return this.toCollection().reverse();
     }
     mapToClass(constructor) {
+        const { db, name: tableName } = this;
         this.schema.mappedClass = constructor;
-        const readHook = obj => {
+        if (constructor.prototype instanceof Entity) {
+            constructor = class extends constructor {
+                get db() { return db; }
+                table() { return tableName; }
+            };
+        }
+        const inheritedProps = new Set();
+        for (let proto = constructor.prototype; proto; proto = getProto(proto)) {
+            Object.getOwnPropertyNames(proto).forEach(propName => inheritedProps.add(propName));
+        }
+        const readHook = (obj) => {
             if (!obj)
                 return obj;
             const res = Object.create(constructor.prototype);
-            for (var m in obj)
-                if (hasOwn(obj, m))
+            for (let m in obj)
+                if (!inheritedProps.has(m))
                     try {
                         res[m] = obj[m];
                     }
@@ -3207,19 +3222,19 @@ function generateMiddlewareStacks({ _novip: db }, tmpTrans) {
         if (db.core.schema.tables.some(tbl => tbl.name === tableName)) {
             table.core = db.core.table(tableName);
             if (db[tableName] instanceof db.Table) {
-                db[tableName].core = table.core;
+                db[tableName].core = db.vip[tableName].core = table.core;
             }
         }
     });
 }
 
-function setApiOnPlace({ _novip: db }, objs, tableNames, dbschema) {
+function setApiOnPlace(objs, tableNames, dbschema) {
     tableNames.forEach(tableName => {
         const schema = dbschema[tableName];
         objs.forEach(obj => {
             const propDesc = getPropertyDescriptor(obj, tableName);
-            if (!propDesc || ("value" in propDesc && propDesc.value === undefined)) {
-                if (obj === db.Transaction.prototype || obj instanceof db.Transaction) {
+            if (!propDesc || ("value" in propDesc && (propDesc.value === undefined || propDesc.value instanceof Table))) {
+                if (obj instanceof Transaction) {
                     setProp(obj, tableName, {
                         get() { return this.table(tableName); },
                         set(value) {
@@ -3227,19 +3242,22 @@ function setApiOnPlace({ _novip: db }, objs, tableNames, dbschema) {
                         }
                     });
                 }
-                else {
-                    obj[tableName] = new db.Table(tableName, schema);
+                else if (obj instanceof Dexie$1) {
+                    obj._allTables[tableName] = obj[tableName] = new obj.Table(tableName, schema);
                 }
             }
         });
     });
 }
-function removeTablesApi({ _novip: db }, objs) {
+function removeTablesApi(objs) {
     objs.forEach(obj => {
-        for (let key in obj) {
-            if (obj[key] instanceof db.Table)
-                delete obj[key];
-        }
+        (obj instanceof Dexie$1 ? [obj, obj._allTables] : [obj]).forEach((obj) => {
+            for (let key in obj) {
+                if (obj[key] instanceof Table) {
+                    delete obj[key];
+                }
+            }
+        });
     });
 }
 function lowerVersionFirst(a, b) {
@@ -3306,8 +3324,8 @@ function updateTablesAndIndexes({ _novip: db }, oldVersion, trans, idbUpgradeTra
                 diff.del.forEach(table => {
                     upgradeSchema[table] = oldSchema[table];
                 });
-                removeTablesApi(db, [db.Transaction.prototype]);
-                setApiOnPlace(db, [db.Transaction.prototype], keys(upgradeSchema), upgradeSchema);
+                removeTablesApi([db.Transaction.prototype]);
+                setApiOnPlace([db.Transaction.prototype], keys(upgradeSchema), upgradeSchema);
                 trans.schema = upgradeSchema;
                 const contentUpgradeIsAsync = isAsyncFunction(contentUpgrade);
                 if (contentUpgradeIsAsync) {
@@ -3332,8 +3350,8 @@ function updateTablesAndIndexes({ _novip: db }, oldVersion, trans, idbUpgradeTra
                 const newSchema = version._cfg.dbschema;
                 deleteRemovedTables(newSchema, idbtrans);
             }
-            removeTablesApi(db, [db.Transaction.prototype]);
-            setApiOnPlace(db, [db.Transaction.prototype], db._storeNames, db._dbSchema);
+            removeTablesApi([db.Transaction.prototype]);
+            setApiOnPlace([db.Transaction.prototype], db._storeNames, db._dbSchema);
             trans.schema = db._dbSchema;
         });
     });
@@ -3442,7 +3460,7 @@ function readGlobalSchema({ _novip: db }, idbdb, tmpTrans) {
     db.verno = idbdb.version / 10;
     const globalSchema = db._dbSchema = buildGlobalSchema(db, idbdb, tmpTrans);
     db._storeNames = slice(idbdb.objectStoreNames, 0);
-    setApiOnPlace(db, [db._allTables], keys(globalSchema), globalSchema);
+    setApiOnPlace([db, db.vip], keys(globalSchema), globalSchema);
 }
 function verifyInstalledSchema(db, tmpTrans) {
     const installedSchema = buildGlobalSchema(db, db.idbdb, tmpTrans);
@@ -3504,7 +3522,7 @@ class Version {
         });
     }
     stores(stores) {
-        const db = this.db;
+        const db = this.db._novip;
         this._cfg.storesSource = this._cfg.storesSource ?
             extend(this._cfg.storesSource, stores) :
             stores;
@@ -3517,8 +3535,8 @@ class Version {
             version._parseStoresSpec(storesSpec, dbschema);
         });
         db._dbSchema = dbschema;
-        removeTablesApi(db, [db._allTables, db, db.Transaction.prototype]);
-        setApiOnPlace(db, [db._allTables, db, db.Transaction.prototype, this._cfg.tables], keys(dbschema), dbschema);
+        removeTablesApi([db, db.vip, db.Transaction.prototype]);
+        setApiOnPlace([db, db.vip, db.Transaction.prototype], keys(dbschema), dbschema);
         db._storeNames = keys(dbschema);
         return this;
     }
@@ -3535,7 +3553,6 @@ function createVersionConstructor(db) {
             version: versionNumber,
             storesSource: null,
             dbschema: {},
-            tables: {},
             contentUpgrade: null
         };
     });
@@ -4593,7 +4610,11 @@ class Dexie$1 {
         this.use(hooksMiddleware);
         this.use(observabilityMiddleware);
         this.use(cacheExistingValuesMiddleware);
-        this.vip = Object.create(this, { _vip: { value: true } });
+        const vipDexie = Object.create(this);
+        vipDexie._vip = true;
+        vipDexie.Table = createTableConstructor(vipDexie);
+        vipDexie._allTables = {};
+        this.vip = vipDexie;
         addons.forEach(addon => addon(this));
     }
     version(versionNumber) {
@@ -4851,8 +4872,9 @@ function liveQuery(querier) {
             }
         };
         const doQuery = () => {
-            if (querying || closed)
+            if (querying || closed) {
                 return;
+            }
             accumMuts = {};
             const subscr = {};
             const ret = execute(subscr);
@@ -4863,8 +4885,9 @@ function liveQuery(querier) {
             querying = true;
             Promise.resolve(ret).then((result) => {
                 querying = false;
-                if (closed)
+                if (closed) {
                     return;
+                }
                 if (shouldNotify()) {
                     doQuery();
                 }
@@ -4874,9 +4897,11 @@ function liveQuery(querier) {
                     observer.next && observer.next(result);
                 }
             }, (err) => {
-                querying = false;
-                observer.error && observer.error(err);
-                subscription.unsubscribe();
+                if (!['DatabaseClosedError', 'AbortError'].includes(err === null || err === void 0 ? void 0 : err.name)) {
+                    querying = false;
+                    observer.error && observer.error(err);
+                    subscription.unsubscribe();
+                }
             });
         };
         doQuery();
@@ -5088,5 +5113,5 @@ function propagateMessageLocally({ data }) {
 DexiePromise.rejectionMapper = mapError;
 setDebug(debug, dexieStackFrameFilter);
 
-export { Dexie$1 as Dexie, RangeSet, Dexie$1 as default, liveQuery, mergeRanges, rangesOverlap };
+export { Dexie$1 as Dexie, Entity, RangeSet, cmp, Dexie$1 as default, liveQuery, mergeRanges, rangesOverlap };
 //# sourceMappingURL=dexie.mjs.map