fix(data): change cache.clear()

Author: atellmer

packages/data/src/cache/cache.spec.tsx

@@ -122,17 +122,6 @@ describe('@data/cache', () => {
     });
   });
 
-  test('clears all cache correctly', () => {
-    const cache = new InMemoryCache();
-
-    cache.write('x', 10, { id: 1 });
-    cache.write('y', 100, { id: 1 });
-    cache.clear();
-
-    expect(cache.read('x', { id: 1 })).toBe(null);
-    expect(cache.read('y', { id: 1 })).toBe(null);
-  });
-
   test('returns the state correctly', () => {
     const cache = new InMemoryCache();
 

packages/data/src/cache/cache.ts

@@ -68,13 +68,9 @@ class InMemoryCache<K extends string = string> {
     this.emitter1.emit('change', { type: 'delete', key, id });
   }
 
-  clear(key?: K) {
-    if (detectIsUndefined(key)) {
-      this.state = {};
-    } else {
-      this.state[key] = {};
-    }
-
+  clear(key: K) {
+    if (!this.state[key]) return;
+    this.state[key] = {};
     this.emitter1.emit('change', { type: 'clear', key });
   }
 

packages/data/src/use-query/use-query.ts

@@ -220,11 +220,14 @@ function useQuery<T, V extends Variables>(key: string, query: Query<T, V>, optio
     const $initiator = initiator;
     const offs = [
       cache.subscribe(({ type, key, id }) => {
-        if (key === $key && id === state.cacheId) {
-          if (type === 'invalidate' || type === 'optimistic') {
-            if (cache.__canUpdate(key)) {
-              refetch();
-            }
+        if (key === $key) {
+          const shouldRefetch = (type === 'invalidate' || type === 'optimistic') && id === state.cacheId;
+          const shouldForceRefetch = type === 'clear';
+
+          if (shouldRefetch) {
+            cache.__canUpdate(key) && refetch();
+          } else if (shouldForceRefetch) {
+            refetch();
           }
         }
       }),