pouchdb#6230 Don't pollute onChange handlers

dharders · Nov 21, 2017 · 21450b3 · 21450b3
1 parent 5922ec4
commit 21450b3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/packages/node_modules/pouchdb-adapter-http/src/index.js b/packages/node_modules/pouchdb-adapter-http/src/index.js
@@ -956,11 +956,15 @@ function HttpPouch(opts, callback) {
         raw_results_length = res.results.length;
         results.last_seq = res.last_seq;
         var pending = null;
+        var lastSeq = null;
         // Attach 'pending' property if server supports it (CouchDB 2.0+)
         /* istanbul ignore if */
         if (typeof res.pending === 'number') {
           pending = res.pending;
         }
+        if (typeof results.last_seq === 'string' || typeof results.last_seq === 'number') {
+          lastSeq = results.last_seq;
+        }
         // For each change
         var req = {};
         req.query = opts.query_params;
@@ -974,14 +978,7 @@ function HttpPouch(opts, callback) {
             if (returnDocs) {
               results.results.push(c);
             }
-            /* istanbul ignore if */
-            if (typeof pending === 'number') {
-              c.pending = pending;
-            }
-            if (typeof results.last_seq === 'string' || typeof results.last_seq === 'number') {
-              c.last_seq = results.last_seq;
-            }
-            opts.onChange(c);
+            opts.onChange(c, pending, lastSeq);
           }
           return ret;
         });

diff --git a/packages/node_modules/pouchdb-core/src/changes.js b/packages/node_modules/pouchdb-core/src/changes.js
@@ -18,10 +18,10 @@ import PouchDB from './setup';
 
 inherits(Changes, EE);
 
-function tryCatchInChangeListener(self, change) {
+function tryCatchInChangeListener(self, change, pending, lastSeq) {
   // isolate try/catches to avoid V8 deoptimizations
   try {
-    self.emit('change', change);
+    self.emit('change', change, pending, lastSeq);
   } catch (e) {
     guardedConsole('error', 'Error in .on("change", function):', e);
   }
@@ -54,12 +54,12 @@ function Changes(db, opts, callback) {
   }
   db.once('destroyed', onDestroy);
 
-  opts.onChange = function (change) {
+  opts.onChange = function (change, pending, lastSeq) {
     /* istanbul ignore if */
     if (self.isCancelled) {
       return;
     }
-    tryCatchInChangeListener(self, change);
+    tryCatchInChangeListener(self, change, pending, lastSeq);
   };
 
   var promise = new Promise(function (fulfill, reject) {

diff --git a/packages/node_modules/pouchdb-replication/src/replicate.js b/packages/node_modules/pouchdb-replication/src/replicate.js
@@ -287,22 +287,17 @@ function replicate(src, target, opts, returnValue, result) {
   }
 
 
-  function onChange(change) {
+  function onChange(change, pending, lastSeq) {
     /* istanbul ignore if */
     if (returnValue.cancelled) {
       return completeReplication();
     }
     // Attach 'pending' property if server supports it (CouchDB 2.0+)
-    var pending = change.pending;
-    delete change.pending;
     /* istanbul ignore if */
     if (typeof pending === 'number') {
       pendingBatch.pending = pending;
     }
 
-    var lastSeq = change.last_seq;
-    delete change.last_seq;
-
     var filter = filterChange(opts)(change);
     if (!filter) {
       return;