remove type condition from @defer fragments

Reviewed By: alunyov Differential Revision: D21759948 fbshipit-source-id: aeaed13d67a2be2080ea7ae88270b55418e968fb
facebook · May 28, 2020 · 23300a9 · 23300a9
1 parent bc09a8e
commit 23300a9
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 24 deletions.
diff --git a/packages/relay-compiler/codegen/__tests__/__snapshots__/compileRelayArtifacts-test.js.snap b/packages/relay-compiler/codegen/__tests__/__snapshots__/compileRelayArtifacts-test.js.snap
@@ -17581,7 +17581,7 @@ fragment PaginationFragment_1G22uz on Node {
         }
         cursor
       }
-      ... on FriendsConnection @defer(label: "PaginationFragment$defer$PaginationFragment_friends$pageInfo") {
+      ... @defer(label: "PaginationFragment$defer$PaginationFragment_friends$pageInfo") {
         pageInfo {
           endCursor
           hasNextPage
@@ -18348,7 +18348,7 @@ fragment PaginationFragment on Node {
         }
         cursor
       }
-      ... on FriendsConnection @defer(label: "PaginationFragment$defer$PaginationFragment_friends$pageInfo") {
+      ... @defer(label: "PaginationFragment$defer$PaginationFragment_friends$pageInfo") {
         pageInfo {
           endCursor
           hasNextPage
@@ -19704,7 +19704,7 @@ query NodeQuery(
           }
           cursor
         }
-        ... on CommentsConnection @defer(label: "NodeQuery$defer$NodeQuery_comments$pageInfo") {
+        ... @defer(label: "NodeQuery$defer$NodeQuery_comments$pageInfo") {
           pageInfo {
             endCursor
             hasNextPage

diff --git a/packages/relay-compiler/core/IR.js b/packages/relay-compiler/core/IR.js
@@ -97,9 +97,6 @@ export type FragmentSpread = {|
 export type Defer = {|
   +kind: 'Defer',
   +loc: Location,
-  +metadata: ?{|
-    +fragmentTypeCondition: CompositeTypeID,
-  |},
   +selections: $ReadOnlyArray<Selection>,
   +label: string,
   +if: ArgumentValue | null,

diff --git a/packages/relay-compiler/core/IRPrinter.js b/packages/relay-compiler/core/IRPrinter.js
@@ -240,17 +240,7 @@ function printSelection(
       );
       str = subSelections.join('\n' + INDENT);
     } else {
-      if (
-        selection.metadata != null &&
-        selection.metadata.fragmentTypeCondition != null
-      ) {
-        str =
-          `... on ${schema.getTypeString(
-            selection.metadata.fragmentTypeCondition,
-          )}` + deferStr;
-      } else {
-        str = '...' + deferStr;
-      }
+      str = '...' + deferStr;
       str += printSelections(schema, selection, indent + INDENT, {
         isClientExtension,
       });

diff --git a/packages/relay-compiler/transforms/ConnectionTransform.js b/packages/relay-compiler/transforms/ConnectionTransform.js
@@ -605,9 +605,6 @@ function transformConnectionSelections(
       label: `${documentName}$defer$${stream.label}$${PAGE_INFO}`,
       kind: 'Defer',
       loc: derivedFieldLocation,
-      metadata: {
-        fragmentTypeCondition: nullableType,
-      },
       selections: [transformedPageInfoSelection],
     };
   }

diff --git a/packages/relay-compiler/transforms/DeferStreamTransform.js b/packages/relay-compiler/transforms/DeferStreamTransform.js
@@ -205,7 +205,6 @@ function visitFragmentSpread(
     kind: 'Defer',
     label: transformedLabel,
     loc: {kind: 'Derived', source: deferDirective.loc},
-    metadata: null,
     selections: [transformedSpread],
   };
 }

diff --git a/packages/relay-compiler/transforms/__tests__/__snapshots__/ConnectionTransform-test.js.snap b/packages/relay-compiler/transforms/__tests__/__snapshots__/ConnectionTransform-test.js.snap
@@ -1030,7 +1030,7 @@ query NodeQuery(
             }
           }
         }
-        ... on CommentsConnection @defer(label: "NodeQuery$defer$NodeQuery_comments$pageInfo") {
+        ... @defer(label: "NodeQuery$defer$NodeQuery_comments$pageInfo") {
           pageInfo {
             endCursor
             hasNextPage
@@ -1106,7 +1106,7 @@ query NodeQuery(
             }
           }
         }
-        ... on CommentsConnection @defer(label: "NodeQuery$defer$NodeQuery_comments$pageInfo") {
+        ... @defer(label: "NodeQuery$defer$NodeQuery_comments$pageInfo") {
           pageInfo {
             endCursor
             hasNextPage

diff --git a/...lay-compiler/transforms/__tests__/__snapshots__/RefetchableFragmentTransform-test.js.snap b/...lay-compiler/transforms/__tests__/__snapshots__/RefetchableFragmentTransform-test.js.snap
@@ -928,7 +928,7 @@ fragment PaginationFragment on Node @argumentDefinitions(
           }
         }
       }
-      ... on FriendsConnection @defer(label: "PaginationFragment$defer$PaginationFragment_friends$pageInfo") {
+      ... @defer(label: "PaginationFragment$defer$PaginationFragment_friends$pageInfo") {
         pageInfo {
           ... on PageInfo {
             endCursor