Avoid empty string as possible toReference return type.

#6350 (comment)
apollographql · May 29, 2020 · 4b1fe83 · 4b1fe83
1 parent 597dc87
commit 4b1fe83
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/cache/inmemory/entityStore.ts b/src/cache/inmemory/entityStore.ts
@@ -344,13 +344,15 @@ export abstract class EntityStore implements NormalizedCache {
   public toReference = (
     object: StoreObject,
     mergeIntoStore?: boolean,
-  ) => {
+  ): Reference | undefined => {
     const [id] = this.policies.identify(object);
-    const ref = id && makeReference(id);
-    if (ref && mergeIntoStore) {
-      this.merge(id!, object);
+    if (id) {
+      const ref = makeReference(id);
+      if (mergeIntoStore) {
+        this.merge(id, object);
+      }
+      return ref;
     }
-    return ref;
   }
 }