wip

helpers/eventify.js

@@ -7,28 +7,23 @@ module.exports = eventify
  * API on purpose, because of the timeing the events would get triggered.
  * See https://github.com/hoodiehq/pouchdb-hoodie-api/issues/54
  **/
-function eventify (db, state, method) {
+function eventify (db, state, method, eventName) {
   return function () {
     return method.apply(db, arguments).then(function (result) {
-      console.log('result')
-      console.log(result)
       if (Array.isArray(result)) {
-        result.forEach(triggerEvent.bind(null, state))
+        result.forEach(triggerEvent.bind(null, state, eventName))
       } else {
-        triggerEvent(state, result)
+        triggerEvent(state, eventName, result)
       }
 
       return result
     })
   }
 }
 
-function triggerEvent (state, object) {
-  var eventName = 'add'
-  if (object._deleted) {
-    eventName = 'remove'
-  } else if (parseInt(object._rev, 10) > 1) {
-    eventName = 'update'
+function triggerEvent (state, eventName, object) {
+  if (!eventName) {
+    eventName = parseInt(object._rev, 10) > 1 ? 'update' : 'add'
   }
 
   state.emitter.emit(eventName, object)

index.js

@@ -20,8 +20,8 @@ function hoodieApi (options) {
     update: eventify(this, state, require('./update')),
     updateOrAdd: eventify(this, state, require('./update-or-add')),
     updateAll: eventify(this, state, require('./update-all')),
-    remove: eventify(this, state, require('./remove')),
-    removeAll: eventify(this, state, require('./remove-all')),
+    remove: eventify(this, state, require('./remove'), 'remove'),
+    removeAll: eventify(this, state, require('./remove-all'), 'remove'),
     on: require('./lib/on').bind(this, state),
     one: require('./lib/one').bind(this, state),
     off: require('./lib/off').bind(this, state),

tests/specs/events.js

@@ -884,6 +884,8 @@ test('store.off returns store', function (t) {
 })
 
 function addEventToArray (array, object) {
+  console.log('addEventToArray')
+  console.log(arguments)
   if (arguments.length > 2) {
     arguments[0].push({
       eventName: arguments[1],