Fix __typename detection in EntityStore#delete.

apollographql · May 18, 2020 · ca8123e · ca8123e
1 parent 66bb709
commit ca8123e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/cache/inmemory/entityStore.ts b/src/cache/inmemory/entityStore.ts
@@ -185,12 +185,17 @@ export abstract class EntityStore implements NormalizedCache {
     fieldName?: string,
     args?: Record<string, any>,
   ) {
-    const storeFieldName = fieldName && args
-      ? this.policies.getStoreFieldName(dataId, fieldName, args)
-      : fieldName;
-    return this.modify(dataId, storeFieldName ? {
-      [storeFieldName]: delModifier,
-    } : delModifier);
+    const storeObject = this.lookup(dataId);
+    if (storeObject) {
+      const typename = this.getFieldValue<string>(storeObject, "__typename");
+      const storeFieldName = fieldName && args
+        ? this.policies.getStoreFieldName(typename, fieldName, args)
+        : fieldName;
+      return this.modify(dataId, storeFieldName ? {
+        [storeFieldName]: delModifier,
+      } : delModifier);
+    }
+    return false;
   }
 
   public evict(options: Cache.EvictOptions): boolean {

diff --git a/src/cache/inmemory/types.ts b/src/cache/inmemory/types.ts
@@ -26,7 +26,6 @@ export interface NormalizedCache {
   get(dataId: string, fieldName: string): StoreValue;
   merge(dataId: string, incoming: StoreObject): void;
   modify(dataId: string, modifiers: Modifier<any> | Modifiers): boolean;
-  delete(dataId: string, fieldName?: string): boolean;
   clear(): void;
 
   // non-Map elements: