modify _readClientSideDirectiveField in RelayReader to work for exec time resolvers

Reviewed By: tyao1

Differential Revision: D69620498

fbshipit-source-id: 619c92ef0b05f72fdb784bc39c10fc916a35f266

Author: lynnshaoyu

packages/relay-runtime/store/RelayReader.js

@@ -661,12 +661,31 @@ class RelayReader {
         } else {
           return this._readLink(selection.field, record, data);
         }
+
       case 'RelayResolver':
-      case 'RelayLiveResolver':
-        return this._readResolverField(selection.field, record, data);
+      case 'RelayLiveResolver': {
+        if (this._useExecTimeResolvers) {
+          return this._readScalar(selection.field, record, data);
+        } else {
+          return this._readResolverField(selection.field, record, data);
+        }
+      }
       case 'ClientEdgeToClientObject':
       case 'ClientEdgeToServerObject':
-        return this._readClientEdge(selection.field, record, data);
+        if (
+          this._useExecTimeResolvers &&
+          (selection.field.backingField.kind === 'RelayResolver' ||
+            selection.field.backingField.kind === 'RelayLiveResolver')
+        ) {
+          const {field} = selection;
+          if (field.linkedField.plural) {
+            return this._readPluralLink(field.linkedField, record, data);
+          } else {
+            return this._readLink(field.linkedField, record, data);
+          }
+        } else {
+          return this._readClientEdge(selection.field, record, data);
+        }
       case 'AliasedInlineFragmentSpread':
         return this._readAliasedInlineFragment(selection.field, record, data);
       default:

packages/relay-runtime/store/__tests__/RelayReader-ExecResolvers-test.js

@@ -36,7 +36,12 @@ export type TReaderTestUser = {
   name: ?string,
 };
 
-const modelMock = jest.fn();
+let modelMock;
+let nameMock;
+let bestFriendMock;
+let friendsMock;
+let user_oneMock;
+
 /**
  * @RelayResolver RelayReaderExecResolversTestUser
  */
@@ -47,7 +52,6 @@ export function RelayReaderExecResolversTestUser(id: DataID): TReaderTestUser {
   };
 }
 
-const nameMock = jest.fn();
 /**
  * @RelayResolver RelayReaderExecResolversTestUser.name: String
  */
@@ -56,7 +60,6 @@ export function name(user: TReaderTestUser): ?string {
   return user.name;
 }
 
-const bestFriendMock = jest.fn();
 /**
  * @RelayResolver RelayReaderExecResolversTestUser.best_friend: RelayReaderExecResolversTestUser
  */
@@ -67,7 +70,6 @@ export function best_friend(
   return {id: '2'};
 }
 
-const friendsMock = jest.fn();
 /**
  * @RelayResolver RelayReaderExecResolversTestUser.friends: [RelayReaderExecResolversTestUser]
  */
@@ -78,7 +80,6 @@ export function friends(
   return [{id: '2'}, {id: '3'}, {id: '4'}];
 }
 
-const user_oneMock = jest.fn();
 /**
  * @RelayResolver Query.RelayReaderExecResolversTest_user_one: RelayReaderExecResolversTestUser
  */
@@ -87,6 +88,14 @@ export function RelayReaderExecResolversTest_user_one(): IdOf<'RelayReaderExecRe
   return {id: '1'};
 }
 
+beforeEach(() => {
+  modelMock = jest.fn();
+  nameMock = jest.fn();
+  bestFriendMock = jest.fn();
+  friendsMock = jest.fn();
+  user_oneMock = jest.fn();
+});
+
 /**
  * Note that the reading of exec time resolvers is expected to be the same as
  * the reading of standard server queries. The main purpose of testing is to ensure
@@ -96,7 +105,7 @@ export function RelayReaderExecResolversTest_user_one(): IdOf<'RelayReaderExecRe
 describe('RelayReaderExecResolvers', () => {
   it('reads exec_time_resolvers without calling the resolvers when provider returns true', () => {
     const Query = graphql`
-      query RelayReaderExecResolversTestRunsQuery
+      query RelayReaderExecResolversTestQuery
       @exec_time_resolvers(
         enabledProvider: "relayReaderTestExecTimeResolversTrueProvider"
       ) {
@@ -157,7 +166,7 @@ describe('RelayReaderExecResolvers', () => {
 
   it('reads read time resolvers when exec time resolvers provider returns false', () => {
     const Query = graphql`
-      query RelayReaderExecResolversTestRunsNoProviderQuery
+      query RelayReaderExecResolversTestFalseProviderQuery
       @exec_time_resolvers(
         enabledProvider: "relayReaderTestExecTimeResolversFalseProvider"
       ) {
@@ -228,4 +237,65 @@ describe('RelayReaderExecResolvers', () => {
       },
     });
   });
+
+  it('reads exec time resolvers data correctly when client side directives are present, like @required', () => {
+    const Query = graphql`
+      query RelayReaderExecResolversTestClientDirectiveQuery
+      @exec_time_resolvers(
+        enabledProvider: "relayReaderTestExecTimeResolversTrueProvider"
+      ) {
+        RelayReaderExecResolversTest_user_one {
+          name @required(action: THROW)
+          best_friend {
+            name
+          }
+          friends {
+            name
+          }
+        }
+      }
+    `;
+    const operation = createOperationDescriptor(Query, {});
+    const source = new RelayRecordSource({
+      'client:root': {
+        __id: 'client:root',
+        __typename: '__Root',
+        RelayReaderExecResolversTest_user_one: {__ref: '1'},
+      },
+      '1': {
+        __id: '1',
+        name: 'Alice',
+        friends: {__refs: ['2', '3', '4']},
+      },
+      '2': {
+        __id: '2',
+        name: 'Bob',
+      },
+      '3': {
+        __id: '3',
+        name: 'Claire',
+      },
+      '4': {
+        __id: '4',
+        name: 'Dennis',
+      },
+    });
+    const resolverStore = new RelayModernStore(source);
+    const {data} = read(
+      source,
+      operation.fragment,
+      new LiveResolverCache(() => source, resolverStore),
+    );
+
+    expect(modelMock).not.toBeCalled();
+    expect(nameMock).not.toBeCalled();
+    expect(user_oneMock).not.toBeCalled();
+    expect(friendsMock).not.toBeCalled();
+    expect(data).toEqual({
+      RelayReaderExecResolversTest_user_one: {
+        name: 'Alice',
+        friends: [{name: 'Bob'}, {name: 'Claire'}, {name: 'Dennis'}],
+      },
+    });
+  });
 });