sharedb 2.2.4 → 2.2.5

package/lib/client/doc.js

@@ -624,6 +624,8 @@ Doc.prototype._otApply = function(op, source) {
       for (var i = 0; i < op.op.length; i++) {
         var component = op.op[i];
         var componentOp = {op: [component]};
+        // Apply the individual op component
+        this.emit('before op', componentOp.op, source, op.src);
         // Transform componentOp against any ops that have been submitted
         // sychronously inside of an op event handler since we began apply of
         // our operation
@@ -631,8 +633,6 @@ Doc.prototype._otApply = function(op, source) {
           var transformErr = transformX(this.applyStack[j], componentOp);
           if (transformErr) return this._hardRollback(transformErr);
         }
-        // Apply the individual op component
-        this.emit('before op', componentOp.op, source, op.src);
         this._setData(this.type.apply(this.data, componentOp.op));
         this.emit('op', componentOp.op, source, op.src);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sharedb",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "description": "JSON OT database backend",
   "main": "lib/index.js",
   "dependencies": {

package/test/client/doc.js

@@ -214,6 +214,36 @@ describe('Doc', function() {
       });
     });
 
+    it('remote ops are transformed by ops submitted in `before op` event handlers', function(done) {
+      var doc = this.doc;
+      var doc2 = this.doc2;
+      var doc3 = this.doc3;
+      function beforeOpHandler(op, source) {
+        if (source) {
+          return;
+        }
+        doc.off('before op', beforeOpHandler);
+        doc.submitOp({p: ['list', 0], li: 2}, {source: true});
+      }
+      function opHandler(op, source) {
+        if (source) {
+          return;
+        }
+        doc.off('op', opHandler);
+        doc.submitOp({p: ['list', 0], li: 3}, {source: true});
+      }
+      doc2.submitOp({p: ['list'], oi: []}, function() {
+        doc.fetch(function() {
+          doc.on('before op', beforeOpHandler);
+          doc.on('op', opHandler);
+          doc2.submitOp([{p: ['list', 0], li: 1}, {p: ['list', 1], li: 42}], function() {
+            doc.fetch();
+            verifyConsistency(doc, doc2, doc3, [], done);
+          });
+        });
+      });
+    });
+
     it('remote multi component ops are transformed by ops submitted in `op` event handlers', function(done) {
       var doc = this.doc;
       var doc2 = this.doc2;