refactor: callHandlers fix #108

Author: Guillaume Chau

src/smart-apollo.js

@@ -138,23 +138,28 @@ export default class SmartApollo {
     throw new Error('Not implemented')
   }
 
-  errorHandler (...args) {
+  callHandlers (handlers, ...args) {
     let catched = false
-    if (this.options.error) {
-      this.options.error.call(this.vm, ...args)
-      catched = true
-    }
-    if (this.vm.$apollo.error) {
-      this.vm.$apollo.error.call(this.vm, ...args)
-      catched = true
-    }
-    if (this.vm.$apollo.provider.errorHandler) {
-      this.vm.$apollo.provider.errorHandler.call(this.vm, ...args)
-      catched = true
+    for (const handler of handlers) {
+      if (handler) {
+        catched = true
+        let result = handler.call(this.vm, ...args)
+        if (typeof result !== 'undefined' && !result) {
+          break
+        }
+      }
     }
     return catched
   }
 
+  errorHandler (...args) {
+    return this.callHandlers([
+      this.options.error,
+      this.vm.$apollo.error,
+      this.vm.$apollo.provider.errorHandler,
+    ], ...args)
+  }
+
   catchError (error) {
     const catched = this.errorHandler(error)
 

src/smart-query.js

@@ -151,9 +151,11 @@ export default class SmartQuery extends SmartApollo {
   }
 
   watchLoading (...args) {
-    this.options.watchLoading && this.options.watchLoading.call(this.vm, ...args)
-    this.vm.$apollo.watchLoading && this.vm.$apollo.watchLoading.call(this.vm, ...args)
-    this.vm.$apollo.provider.watchLoading && this.vm.$apollo.provider.watchLoading.call(this.vm, ...args)
+    return this.callHandlers([
+      this.options.watchLoading,
+      this.vm.$apollo.watchLoading,
+      this.vm.$apollo.provider.watchLoading,
+    ], ...args)
   }
 
   applyLoadingModifier (value) {