Fix cache invalidation logic

Author: Ari Bouius

.size-snapshot.json

@@ -1,13 +1,13 @@
 {
   "dist/index.js": {
-    "bundled": 31464,
-    "minified": 16507,
-    "gzipped": 5069
+    "bundled": 31493,
+    "minified": 16539,
+    "gzipped": 5075
   },
   "dist/index.es.js": {
-    "bundled": 31098,
-    "minified": 16202,
-    "gzipped": 4995,
+    "bundled": 31127,
+    "minified": 16234,
+    "gzipped": 5001,
     "treeshaked": {
       "rollup": {
         "code": 75,

src/client.js

@@ -147,7 +147,7 @@ export class ApiClient {
       query.cache = await this.request(query.url, { headers })
       query.timestamp = new Date().getTime()
       query.promise = null
-      
+
       const result = this.normalize(query.cache)
 
       this.dispatch({
@@ -199,33 +199,31 @@ export class ApiClient {
     })
 
     if (!schema.error && !schema.errors) {
-      let related = invalidate
+      let invalid
 
-      if (related === undefined) {
-        related = relationships.length ? relationships : null
-      } else if (related && !Array.isArray(related)) {
-        related = [related]
+      if (invalidate) {
+        invalid = Array.isArray(invalidate) ? invalidate : [invalidate]
+      } else if (invalidate !== false) {
+        invalid = [type, ...relationships]
       }
 
       this.cache.forEach(q => {
         if (q.id && q.url === query.url && schema.data) {
           q.cache = schema
-          return query.dispatch({ result })
+          return q.dispatch({ result })
         }
 
-        if (!related) {
+        if (!invalid) {
           return
         }
 
         if (!q.type) {
           Object.assign(q, getTypeMap(q, this.schema))
         }
 
-        const invalid =
-          q.type === type ||
-          related.find(r => query.relationships.indexOf(r) >= 0)
+        const types = [q.type, ...q.relationships]
 
-        if (invalid) {
+        if (types.find(t => invalid.indexOf(t) >= 0)) {
           q.cache = null
 
           if (q.subscribers.length) {