dexie 3.2.0-rc.2 → 3.2.1-beta.2

package/dist/modern/dexie.mjs

@@ -4,9 +4,9 @@
  *
  * By David Fahlander, david.fahlander@gmail.com
  *
- * Version 3.2.0-rc.2, Wed Sep 29 2021
+ * Version 3.2.1-beta.2, Wed Jan 05 2022
  *
- * http://dexie.org
+ * https://dexie.org
  *
  * Apache License Version 2.0, January 2004, http://www.apache.org/licenses/
  */
@@ -1221,8 +1221,14 @@ function tempTransaction(db, mode, storeNames, fn) {
         var trans = db._createTransaction(mode, storeNames, db._dbSchema);
         try {
             trans.create();
+            db._state.PR1398_maxLoop = 3;
         }
         catch (ex) {
+            if (ex.name === errnames.InvalidState && db.isOpen() && --db._state.PR1398_maxLoop > 0) {
+                console.warn('Dexie: Need to reopen db');
+                db._close();
+                return db.open().then(() => tempTransaction(db, mode, storeNames, fn));
+            }
             return rejection(ex);
         }
         return trans._promise(mode, (resolve, reject) => {
@@ -1236,7 +1242,7 @@ function tempTransaction(db, mode, storeNames, fn) {
     }
 }
 
-const DEXIE_VERSION = '3.2.0-rc.2';
+const DEXIE_VERSION = '3.2.1-beta.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>.";
@@ -1258,37 +1264,11 @@ function combine(filter1, filter2) {
         filter2;
 }
 
-let domDeps;
-try {
-    domDeps = {
-        indexedDB: _global.indexedDB || _global.mozIndexedDB || _global.webkitIndexedDB || _global.msIndexedDB,
-        IDBKeyRange: _global.IDBKeyRange || _global.webkitIDBKeyRange
-    };
-}
-catch (e) {
-    domDeps = { indexedDB: null, IDBKeyRange: null };
-}
-
-function safariMultiStoreFix(storeNames) {
-    return storeNames.length === 1 ? storeNames[0] : storeNames;
-}
-let getMaxKey = (IdbKeyRange) => {
-    try {
-        IdbKeyRange.only([[]]);
-        getMaxKey = () => [[]];
-        return [[]];
-    }
-    catch (e) {
-        getMaxKey = () => maxString;
-        return maxString;
-    }
-};
-
 const AnyRange = {
     type: 3 ,
     lower: -Infinity,
     lowerOpen: false,
-    get upper() { return getMaxKey(domDeps.IDBKeyRange); },
+    upper: [[]],
     upperOpen: false
 };
 
@@ -1738,6 +1718,82 @@ function iterate(cursorPromise, filter, fn, valueMapper) {
     });
 }
 
+function cmp(a, b) {
+    try {
+        const ta = type(a);
+        const tb = type(b);
+        if (ta !== tb) {
+            if (ta === 'Array')
+                return 1;
+            if (tb === 'Array')
+                return -1;
+            if (ta === 'binary')
+                return 1;
+            if (tb === 'binary')
+                return -1;
+            if (ta === 'string')
+                return 1;
+            if (tb === 'string')
+                return -1;
+            if (ta === 'Date')
+                return 1;
+            if (tb !== 'Date')
+                return NaN;
+            return -1;
+        }
+        switch (ta) {
+            case 'number':
+            case 'Date':
+            case 'string':
+                return a > b ? 1 : a < b ? -1 : 0;
+            case 'binary': {
+                return compareUint8Arrays(getUint8Array(a), getUint8Array(b));
+            }
+            case 'Array':
+                return compareArrays(a, b);
+        }
+    }
+    catch (_a) { }
+    return NaN;
+}
+function compareArrays(a, b) {
+    const al = a.length;
+    const bl = b.length;
+    const l = al < bl ? al : bl;
+    for (let i = 0; i < l; ++i) {
+        const res = cmp(a[i], b[i]);
+        if (res !== 0)
+            return res;
+    }
+    return al === bl ? 0 : al < bl ? -1 : 1;
+}
+function compareUint8Arrays(a, b) {
+    const al = a.length;
+    const bl = b.length;
+    const l = al < bl ? al : bl;
+    for (let i = 0; i < l; ++i) {
+        if (a[i] !== b[i])
+            return a[i] < b[i] ? -1 : 1;
+    }
+    return al === bl ? 0 : al < bl ? -1 : 1;
+}
+function type(x) {
+    const t = typeof x;
+    if (t !== 'object')
+        return t;
+    if (ArrayBuffer.isView(x))
+        return 'binary';
+    const tsTag = toStringTag(x);
+    return tsTag === 'ArrayBuffer' ? 'binary' : tsTag;
+}
+function getUint8Array(a) {
+    if (a instanceof Uint8Array)
+        return a;
+    if (ArrayBuffer.isView(a))
+        return new Uint8Array(a.buffer, a.byteOffset, a.byteLength);
+    return new Uint8Array(a);
+}
+
 class Collection {
     _read(fn, cb) {
         var ctx = this._ctx;
@@ -2010,7 +2066,6 @@ class Collection {
             const coreTable = ctx.table.core;
             const { outbound, extractKey } = coreTable.schema.primaryKey;
             const limit = this.db._options.modifyChunkSize || 200;
-            const { cmp } = this.db.core;
             const totalFailures = [];
             let successCount = 0;
             const failedKeys = [];
@@ -2752,6 +2807,21 @@ function createTableSchema(name, primKey, indexes) {
     };
 }
 
+function safariMultiStoreFix(storeNames) {
+    return storeNames.length === 1 ? storeNames[0] : storeNames;
+}
+let getMaxKey = (IdbKeyRange) => {
+    try {
+        IdbKeyRange.only([[]]);
+        getMaxKey = () => [[]];
+        return [[]];
+    }
+    catch (e) {
+        getMaxKey = () => maxString;
+        return maxString;
+    }
+};
+
 function getKeyExtractor(keyPath) {
     if (keyPath == null) {
         return () => undefined;
@@ -2784,8 +2854,7 @@ function getKeyPathAlias(keyPath) {
             keyPath :
             `[${keyPath.join('+')}]`;
 }
-function createDBCore(db, indexedDB, IdbKeyRange, tmpTrans) {
-    const cmp = indexedDB.cmp.bind(indexedDB);
+function createDBCore(db, IdbKeyRange, tmpTrans) {
     function extractSchema(db, trans) {
         const tables = arrayify(db.objectStoreNames);
         return {
@@ -3114,7 +3183,6 @@ function createDBCore(db, indexedDB, IdbKeyRange, tmpTrans) {
                 throw new Error(`Table '${name}' not found`);
             return tableMap[name];
         },
-        cmp,
         MIN_KEY: -Infinity,
         MAX_KEY: getMaxKey(IdbKeyRange),
         schema
@@ -3125,7 +3193,7 @@ function createMiddlewareStack(stackImpl, middlewares) {
     return middlewares.reduce((down, { create }) => ({ ...down, ...create(down) }), stackImpl);
 }
 function createMiddlewareStacks(middlewares, idbdb, { IDBKeyRange, indexedDB }, tmpTrans) {
-    const dbcore = createMiddlewareStack(createDBCore(idbdb, indexedDB, IDBKeyRange, tmpTrans), middlewares.dbcore);
+    const dbcore = createMiddlewareStack(createDBCore(idbdb, IDBKeyRange, tmpTrans), middlewares.dbcore);
     return {
         dbcore
     };
@@ -3347,12 +3415,7 @@ function createMissingTables(newSchema, idbtrans) {
     });
 }
 function deleteRemovedTables(newSchema, idbtrans) {
-    for (var i = 0; i < idbtrans.db.objectStoreNames.length; ++i) {
-        var storeName = idbtrans.db.objectStoreNames[i];
-        if (newSchema[storeName] == null) {
-            idbtrans.db.deleteObjectStore(storeName);
-        }
-    }
+    [].slice.call(idbtrans.db.objectStoreNames).forEach(storeName => newSchema[storeName] == null && idbtrans.db.deleteObjectStore(storeName));
 }
 function addIndex(store, idx) {
     store.createIndex(idx.name, idx.keyPath, { unique: idx.unique, multiEntry: idx.multi });
@@ -3680,7 +3743,18 @@ function enterTransactionScope(db, mode, storeNames, parentTransaction, scopeFun
             trans.idbtrans = parentTransaction.idbtrans;
         }
         else {
-            trans.create();
+            try {
+                trans.create();
+                db._state.PR1398_maxLoop = 3;
+            }
+            catch (ex) {
+                if (ex.name === errnames.InvalidState && db.isOpen() && --db._state.PR1398_maxLoop > 0) {
+                    console.warn('Dexie: Need to reopen db');
+                    db._close();
+                    return db.open().then(() => enterTransactionScope(db, mode, storeNames, null, scopeFunc));
+                }
+                return rejection(ex);
+            }
         }
         const scopeFuncIsAsync = isAsyncFunction(scopeFunc);
         if (scopeFuncIsAsync) {
@@ -4026,24 +4100,6 @@ function getExistingValues(table, req, effectiveKeys) {
         : table.getMany({ trans: req.trans, keys: effectiveKeys, cache: "immutable" });
 }
 
-let _cmp;
-function cmp(a, b) {
-    if (_cmp)
-        return _cmp(a, b);
-    const { indexedDB } = domDeps;
-    if (!indexedDB)
-        throw new exceptions.MissingAPI();
-    _cmp = (a, b) => {
-        try {
-            return a == null || b == null ? NaN : indexedDB.cmp(a, b);
-        }
-        catch (_a) {
-            return NaN;
-        }
-    };
-    return _cmp(a, b);
-}
-
 function getFromTransactionCache(keys, cache, clone) {
     try {
         if (!cache)
@@ -4468,7 +4524,8 @@ class Dexie$1 {
             dbReadyPromise: null,
             cancelOpen: nop,
             openCanceller: null,
-            autoSchema: true
+            autoSchema: true,
+            PR1398_maxLoop: 3
         };
         state.dbReadyPromise = new DexiePromise(resolve => {
             state.dbReadyResolve = resolve;
@@ -4731,7 +4788,7 @@ class Dexie$1 {
 }
 
 const symbolObservable = typeof Symbol !== "undefined" && "observable" in Symbol
-    ? Symbol["observable"]
+    ? Symbol.observable
     : "@@observable";
 class Observable {
     constructor(subscribe) {
@@ -4827,6 +4884,17 @@ function liveQuery(querier) {
     });
 }
 
+let domDeps;
+try {
+    domDeps = {
+        indexedDB: _global.indexedDB || _global.mozIndexedDB || _global.webkitIndexedDB || _global.msIndexedDB,
+        IDBKeyRange: _global.IDBKeyRange || _global.webkitIDBKeyRange
+    };
+}
+catch (e) {
+    domDeps = { indexedDB: null, IDBKeyRange: null };
+}
+
 const Dexie = Dexie$1;
 props(Dexie, {
     ...fullNameExceptions,
@@ -4917,6 +4985,7 @@ props(Dexie, {
     shallowClone: shallowClone,
     deepClone: deepClone,
     getObjectDiff: getObjectDiff,
+    cmp,
     asap: asap$1,
     minKey: minKey,
     addons: [],
@@ -5019,6 +5088,5 @@ function propagateMessageLocally({ data }) {
 DexiePromise.rejectionMapper = mapError;
 setDebug(debug, dexieStackFrameFilter);
 
-export default Dexie$1;
-export { Dexie$1 as Dexie, RangeSet, liveQuery, mergeRanges, rangesOverlap };
+export { Dexie$1 as Dexie, RangeSet, Dexie$1 as default, liveQuery, mergeRanges, rangesOverlap };
 //# sourceMappingURL=dexie.mjs.map