fix(graphcache): Improve Graphcache resolver consistency

.changeset/hungry-experts-admire.md

@@ -0,0 +1,5 @@
+---
+'@urql/exchange-graphcache': minor
+---
+
+Allow scalar values on the parent to be accessed from `parent[info.fieldName]` consistently. Prior to this change `parent[fieldAlias]` would get populated, which wouldn’t always result in a field that’s consistently accessible.

.changeset/tame-ways-obey.md

@@ -0,0 +1,5 @@
+---
+'@urql/exchange-graphcache': patch
+---
+
+Fix cases where `ResolveInfo`’s `parentFieldKey` was incorrectly populated with a key that isn’t a field key (allowing for `cache.resolve(info.parentKey, info.parentFieldKey)` to be possible) but was instead set to `info.parentKey` combined with the field key.

exchanges/graphcache/src/operations/query.ts

@@ -421,18 +421,25 @@ const readSelection = (
       // The field is a scalar and can be retrieved directly from the result
       dataFieldValue = resultValue;
     } else if (InMemoryData.currentOperation === 'read' && resolver) {
-      // We have to update the information in context to reflect the info
-      // that the resolver will receive
-      updateContext(ctx, output, typename, entityKey, key, fieldName);
-
       // We have a resolver for this field.
-      // Prepare the actual fieldValue, so that the resolver can use it
-      if (fieldValue !== undefined) {
-        output[fieldAlias] = fieldValue;
+      // Prepare the actual fieldValue, so that the resolver can use it,
+      // as to avoid the user having to do `cache.resolve(parent, info.fieldKey)`
+      // only to get a scalar value.
+      let parent = output;
+      if (node.selectionSet === undefined && fieldValue !== undefined) {
+        parent = {
+          ...output,
+          [fieldAlias]: fieldValue,
+          [fieldName]: fieldValue,
+        };
       }
 
+      // We have to update the information in context to reflect the info
+      // that the resolver will receive
+      updateContext(ctx, parent, typename, entityKey, fieldKey, fieldName);
+
       dataFieldValue = resolver(
-        output,
+        parent,
         fieldArgs || ({} as Variables),
         store,
         ctx

exchanges/graphcache/src/operations/write.ts

@@ -354,7 +354,7 @@ const writeSelection = (
         data,
         typename,
         entityKey || typename,
-        joinKeys(typename, fieldKey),
+        fieldKey,
         fieldName
       );
 

exchanges/graphcache/src/store/data.ts

@@ -19,7 +19,6 @@ import {
   joinKeys,
 } from './keys';
 
-import { makeDict } from '../helpers/dict';
 import { invariant, currentDebugStack } from '../helpers/help';
 
 type Dict<T> = Record<string, T>;
@@ -283,7 +282,7 @@ const setNode = <T>(
   // On the map itself we get or create the entity as a dict
   let entity = keymap.get(entityKey) as Dict<T | undefined>;
   if (entity === undefined) {
-    keymap.set(entityKey, (entity = makeDict()));
+    keymap.set(entityKey, (entity = Object.create(null)));
   }
 
   // If we're setting undefined we delete the node's entry
@@ -614,7 +613,7 @@ export const persistData = () => {
   if (currentData!.storage) {
     currentOptimistic = true;
     currentOperation = 'read';
-    const entries: SerializedEntries = makeDict();
+    const entries: SerializedEntries = {};
     for (const key of currentData!.persist.keys()) {
       const { entityKey, fieldKey } = deserializeKeyInfo(key);
       let x: void | Link | EntityField;

exchanges/graphcache/src/store/store.test.ts

@@ -425,7 +425,7 @@ describe('Store with OptimisticMutationConfig', () => {
       randomData,
       'Todo',
       'Todo:1',
-      'Todo:1.createdAt',
+      'createdAt',
       'createdAt'
     );