Add fragment name to warning

apollographql · Aug 14, 2024 · fd66d42 · fd66d42
1 parent 885be47
commit fd66d42
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/__tests__/dataMasking.ts b/src/__tests__/dataMasking.ts
@@ -1212,7 +1212,8 @@ test("warns when passing parent object to `from` when id is masked", async () =>
 
   expect(console.warn).toHaveBeenCalledTimes(1);
   expect(console.warn).toHaveBeenCalledWith(
-    "Could not identify object passed to `from` either because the object is non-normalized or the key fields are missing. If you are masking this object, please ensure the key fields are requested by the parent object."
+    "Could not identify object passed to `from` for '%s' fragment, either because the object is non-normalized or the key fields are missing. If you are masking this object, please ensure the key fields are requested by the parent object.",
+    "UserFields"
   );
 
   const fragmentStream = new ObservableStream(fragmentObservable);
@@ -1288,7 +1289,8 @@ test("warns when passing parent object to `from` that is non-normalized", async
 
   expect(console.warn).toHaveBeenCalledTimes(1);
   expect(console.warn).toHaveBeenCalledWith(
-    "Could not identify object passed to `from` either because the object is non-normalized or the key fields are missing. If you are masking this object, please ensure the key fields are requested by the parent object."
+    "Could not identify object passed to `from` for '%s' fragment, either because the object is non-normalized or the key fields are missing. If you are masking this object, please ensure the key fields are requested by the parent object.",
+    "UserFields"
   );
 
   const fragmentStream = new ObservableStream(fragmentObservable);

diff --git a/src/cache/core/cache.ts b/src/cache/core/cache.ts
@@ -10,6 +10,7 @@ import {
   Observable,
   cacheSizes,
   defaultCacheSizes,
+  getFragmentDefinition,
   getFragmentQueryDocument,
   mergeDeepArray,
 } from "../../utilities/index.js";
@@ -248,9 +249,13 @@ export abstract class ApolloCache<TSerialized> implements DataProxy {
     const id = typeof from === "string" ? from : this.identify(from);
 
     if (__DEV__) {
+      const actuaFragmentName =
+        fragmentName || getFragmentDefinition(fragment).name.value;
+
       if (!id) {
         invariant.warn(
-          "Could not identify object passed to `from` either because the object is non-normalized or the key fields are missing. If you are masking this object, please ensure the key fields are requested by the parent object."
+          "Could not identify object passed to `from` for '%s' fragment, either because the object is non-normalized or the key fields are missing. If you are masking this object, please ensure the key fields are requested by the parent object.",
+          actuaFragmentName
         );
       }
     }

diff --git a/src/react/hooks/__tests__/useFragment.test.tsx b/src/react/hooks/__tests__/useFragment.test.tsx
@@ -1585,7 +1585,8 @@ describe("useFragment", () => {
 
     expect(console.warn).toHaveBeenCalledTimes(1);
     expect(console.warn).toHaveBeenCalledWith(
-      "Could not identify object passed to `from` either because the object is non-normalized or the key fields are missing. If you are masking this object, please ensure the key fields are requested by the parent object."
+      "Could not identify object passed to `from` for '%s' fragment, either because the object is non-normalized or the key fields are missing. If you are masking this object, please ensure the key fields are requested by the parent object.",
+      "UserFields"
     );
 
     {