dexie 1.5.0 → 1.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dexie",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "A Minimalistic Wrapper for IndexedDB",
   "main": "dist/dexie.js",
   "jsnext:main": "dist/dexie.es6.js",

package/src/Dexie.js

@@ -1400,8 +1400,8 @@ export default function Dexie(dbName, options) {
             if (--this._reculock === 0) {
                 if (!PSD.global) PSD.lockOwnerFor = null;
                 while (this._blockedFuncs.length > 0 && !this._locked()) {
-                    var fn = this._blockedFuncs.shift();
-                    try { fn(); } catch (e) { }
+                    var fnAndPSD = this._blockedFuncs.shift();
+                    try { usePSD(fnAndPSD[1], fnAndPSD[0]); } catch (e) { }
                 }
             }
             return this;
@@ -1456,31 +1456,29 @@ export default function Dexie(dbName, options) {
         },
         _promise: function (mode, fn, bWriteLock) {
             var self = this;
-            return newScope(function() {
-                var p;
-                // Read lock always
-                if (!self._locked()) {
-                    p = self.active ? new Promise(function (resolve, reject) {
+            var p = self._locked() ?
+                // Read lock always. Transaction is write-locked. Wait for mutex.
+                new Promise(function (resolve, reject) {
+                    self._blockedFuncs.push([function () {
+                        self._promise(mode, fn, bWriteLock).then(resolve, reject);
+                    }, PSD]);
+                }) :
+                newScope(function() {
+                    var p_ = self.active ? new Promise(function (resolve, reject) {
                         if (mode === READWRITE && self.mode !== READWRITE)
                             throw new exceptions.ReadOnly("Transaction is readonly");
                         if (!self.idbtrans && mode) self.create();
                         if (bWriteLock) self._lock(); // Write lock if write operation is requested
                         fn(resolve, reject, self);
                     }) : rejection(new exceptions.TransactionInactive());
-                    if (self.active && bWriteLock) p.finally(function () {
+                    if (self.active && bWriteLock) p_.finally(function () {
                         self._unlock();
                     });
-                } else {
-                    // Transaction is write-locked. Wait for mutex.
-                    p = new Promise(function (resolve, reject) {
-                        self._blockedFuncs.push(function () {
-                            self._promise(mode, fn, bWriteLock).then(resolve, reject);
-                        });
-                    });
-                }
-                p._lib = true;
-                return p.uncaught(dbUncaught);
-            });
+                    return p_;
+                });
+
+            p._lib = true;
+            return p.uncaught(dbUncaught);
         },
 
         //

package/test/tests-misc.js

@@ -180,3 +180,15 @@ asyncTest ("#323 @gitawego's post. Should not fail unexpectedly on readonly prop
     }).finally(start);
     
 });
+
+spawnedTest ("#360 DB unresponsive after multiple Table.update() or Collection.modify()", function* () {
+    const NUM_UPDATES = 2000;
+    let result = yield db.transaction('rw', db.foo, function* () {
+        yield db.foo.put({id: 1, value: 0});
+        for (var i=0;i<NUM_UPDATES;++i) {
+            db.foo.where('id').equals(1).modify(item => ++item.value);
+        }
+        return yield db.foo.get(1);
+    });
+    equal(result.value, NUM_UPDATES, `Should have updated id 1 a ${NUM_UPDATES} times`);
+});