port Fragment.concreteType change to Rust

Reviewed By: josephsavona Differential Revision: D21319739 fbshipit-source-id: ddac044477cf12c2217ad5ff6a069407519821df
facebook · Apr 30, 2020 · e4dd883 · e4dd883
1 parent 7ad3f0c
commit e4dd883
Show file tree

Hide file tree

Showing 80 changed files with 162 additions and 159 deletions.
diff --git a/compiler/crates/relay-codegen/src/build_ast.rs b/compiler/crates/relay-codegen/src/build_ast.rs
@@ -219,6 +219,12 @@ impl<'schema, 'builder> CodegenBuilder<'schema, 'builder> {
         if plural {
             metadata.push((CODEGEN_CONSTANTS.plural, Primitive::Bool(true)))
         }
+        let concrete_type = if self.schema.is_abstract_type(fragment.type_condition) {
+            Primitive::Null
+        } else {
+            Primitive::String(self.schema.get_type_name(fragment.type_condition))
+        };
+
         // TODO: refetch metadata
 
         let object = vec![
@@ -250,10 +256,7 @@ impl<'schema, 'builder> CodegenBuilder<'schema, 'builder> {
                 CODEGEN_CONSTANTS.selections,
                 self.build_selections(&fragment.selections),
             ),
-            (
-                CODEGEN_CONSTANTS.type_,
-                Primitive::String(self.schema.get_type_name(fragment.type_condition)),
-            ),
+            (CODEGEN_CONSTANTS.concrete_type, concrete_type),
         ];
         self.object(object)
     }

diff --git a/compiler/crates/relay-codegen/tests/client_extensions/fixtures/client-conditions.expected b/compiler/crates/relay-codegen/tests/client_extensions/fixtures/client-conditions.expected
@@ -214,7 +214,7 @@ interface ClientNamed {
       ]
     }
   ],
-  "type": "User"
+  "concreteType": "User"
 }
 
 {

diff --git a/...relay-codegen/tests/client_extensions/fixtures/client-fields-in-inline-fragments.expected b/...relay-codegen/tests/client_extensions/fixtures/client-fields-in-inline-fragments.expected
@@ -108,7 +108,7 @@ extend type Page {
       "storageKey": null
     }
   ],
-  "type": "User"
+  "concreteType": "User"
 }
 
 {

diff --git a/...ler/crates/relay-codegen/tests/client_extensions/fixtures/client-fields-on-roots.expected b/...ler/crates/relay-codegen/tests/client_extensions/fixtures/client-fields-on-roots.expected
@@ -133,7 +133,7 @@ type ClientUser {
       ]
     }
   ],
-  "type": "ClientUser"
+  "concreteType": "ClientUser"
 }
 
 {

diff --git a/.../crates/relay-codegen/tests/client_extensions/fixtures/sibling-client-selections.expected b/.../crates/relay-codegen/tests/client_extensions/fixtures/sibling-client-selections.expected
@@ -80,7 +80,7 @@ interface ClientNamed {
       ]
     }
   ],
-  "type": "ClientType"
+  "concreteType": "ClientType"
 }
 
 {
@@ -221,7 +221,7 @@ interface ClientNamed {
       "storageKey": null
     }
   ],
-  "type": "User"
+  "concreteType": "User"
 }
 
 {

diff --git a/compiler/crates/relay-codegen/tests/connections/fixtures/connection-directions.expected b/compiler/crates/relay-codegen/tests/connections/fixtures/connection-directions.expected
@@ -328,7 +328,7 @@ return {
         "storageKey": null
       }
     ],
-    "type": "Query"
+    "concreteType": "Query"
   },
   "kind": "Request",
   "operation": {

diff --git a/compiler/crates/relay-codegen/tests/connections/fixtures/connection-empty-filters.expected b/compiler/crates/relay-codegen/tests/connections/fixtures/connection-empty-filters.expected
@@ -210,7 +210,7 @@ return {
         "storageKey": null
       }
     ],
-    "type": "Query"
+    "concreteType": "Query"
   },
   "kind": "Request",
   "operation": {

diff --git a/compiler/crates/relay-codegen/tests/connections/fixtures/connection-filters.expected b/compiler/crates/relay-codegen/tests/connections/fixtures/connection-filters.expected
@@ -284,7 +284,7 @@ return {
         "storageKey": null
       }
     ],
-    "type": "Query"
+    "concreteType": "Query"
   },
   "kind": "Request",
   "operation": {

diff --git a/...iler/crates/relay-codegen/tests/connections/fixtures/connection-generate-filters.expected b/...iler/crates/relay-codegen/tests/connections/fixtures/connection-generate-filters.expected
@@ -301,7 +301,7 @@ return {
         "storageKey": null
       }
     ],
-    "type": "Query"
+    "concreteType": "Query"
   },
   "kind": "Request",
   "operation": {

diff --git a/...relay-codegen/tests/connections/fixtures/connection-with-aliased-edges-page-info.expected b/...relay-codegen/tests/connections/fixtures/connection-with-aliased-edges-page-info.expected
@@ -172,7 +172,7 @@ return {
         "storageKey": null
       }
     ],
-    "type": "Query"
+    "concreteType": "Query"
   },
   "kind": "Request",
   "operation": {

diff --git a/...r/crates/relay-codegen/tests/connections/fixtures/connection-with-custom-handler.expected b/...r/crates/relay-codegen/tests/connections/fixtures/connection-with-custom-handler.expected
@@ -273,7 +273,7 @@ return {
         "storageKey": null
       }
     ],
-    "type": "Query"
+    "concreteType": "Query"
   },
   "kind": "Request",
   "operation": {

diff --git a/compiler/crates/relay-codegen/tests/connections/fixtures/connection-with-page-info.expected b/compiler/crates/relay-codegen/tests/connections/fixtures/connection-with-page-info.expected
@@ -182,6 +182,6 @@ return {
       "storageKey": null
     }
   ],
-  "type": "User"
+  "concreteType": "User"
 };
 })()
diff --git a/compiler/crates/relay-codegen/tests/connections/fixtures/connection-with-variables.expected b/compiler/crates/relay-codegen/tests/connections/fixtures/connection-with-variables.expected
@@ -176,5 +176,5 @@ fragment Example on User {
       "storageKey": null
     }
   ],
-  "type": "User"
+  "concreteType": "User"
 }
diff --git a/compiler/crates/relay-codegen/tests/connections/fixtures/connection.expected b/compiler/crates/relay-codegen/tests/connections/fixtures/connection.expected
@@ -268,7 +268,7 @@ return {
         "storageKey": null
       }
     ],
-    "type": "Query"
+    "concreteType": "Query"
   },
   "kind": "Request",
   "operation": {

diff --git a/compiler/crates/relay-codegen/tests/deduped_json_codegen/fixtures/kitchen-sink.expected b/compiler/crates/relay-codegen/tests/deduped_json_codegen/fixtures/kitchen-sink.expected
@@ -331,6 +331,6 @@ return {
       "storageKey": null
     }
   ],
-  "type": "User"
+  "concreteType": "User"
 };
 })()
diff --git a/...ates/relay-codegen/tests/defer_stream/fixtures/fragment-with-defer-default-label.expected b/...ates/relay-codegen/tests/defer_stream/fixtures/fragment-with-defer-default-label.expected
@@ -38,7 +38,7 @@ fragment DeferredFragment on User {
       "storageKey": null
     }
   ],
-  "type": "User"
+  "concreteType": "User"
 }
 
 {
@@ -72,7 +72,7 @@ fragment DeferredFragment on User {
       "storageKey": null
     }
   ],
-  "type": "User"
+  "concreteType": "User"
 }
 
 {

diff --git a/...tes/relay-codegen/tests/defer_stream/fixtures/fragment-with-stream-default-label.expected b/...tes/relay-codegen/tests/defer_stream/fixtures/fragment-with-stream-default-label.expected
@@ -94,5 +94,5 @@ fragment FeedbackFragment on Feedback {
       "storageKey": null
     }
   ],
-  "type": "Feedback"
+  "concreteType": "Feedback"
 }
diff --git a/compiler/crates/relay-codegen/tests/json_codegen/fixtures/kitchen-sink.expected b/compiler/crates/relay-codegen/tests/json_codegen/fixtures/kitchen-sink.expected
@@ -370,5 +370,5 @@ fragment UserFragment on User
       "storageKey": null
     }
   ],
-  "type": "User"
+  "concreteType": "User"
 }
diff --git a/...r/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-conditions.expected b/...r/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-conditions.expected
@@ -177,5 +177,5 @@ interface ClientNamed {
       ]
     }
   ],
-  "type": "User"
+  "concreteType": "User"
 }
diff --git a/...ompiler/tests/compile_relay_artifacts/fixtures/client-fields-in-inline-fragments.expected b/...ompiler/tests/compile_relay_artifacts/fixtures/client-fields-in-inline-fragments.expected
@@ -97,5 +97,5 @@ extend type Page {
       ]
     }
   ],
-  "type": "User"
+  "concreteType": "User"
 }
diff --git a/...lay-compiler/tests/compile_relay_artifacts/fixtures/client-fields-of-client-type.expected b/...lay-compiler/tests/compile_relay_artifacts/fixtures/client-fields-of-client-type.expected
@@ -82,5 +82,5 @@ type Foo {
       ]
     }
   ],
-  "type": "User"
+  "concreteType": "User"
 }
diff --git a/...tes/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fields-on-roots.expected b/...tes/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fields-on-roots.expected
@@ -86,7 +86,7 @@ extend type Subscription {
         ]
       }
     ],
-    "type": "Mutation"
+    "concreteType": "Mutation"
   },
   "kind": "Request",
   "operation": {
@@ -210,7 +210,7 @@ mutation FooMutation(
         ]
       }
     ],
-    "type": "Query"
+    "concreteType": "Query"
   },
   "kind": "Request",
   "operation": {
@@ -342,7 +342,7 @@ query FooQuery(
         ]
       }
     ],
-    "type": "Subscription"
+    "concreteType": "Subscription"
   },
   "kind": "Request",
   "operation": {

diff --git a/...compiler/tests/compile_relay_artifacts/fixtures/client-fragment-spreads-in-query.expected b/...compiler/tests/compile_relay_artifacts/fixtures/client-fragment-spreads-in-query.expected
@@ -63,7 +63,7 @@ type ClientType {
         "storageKey": null
       }
     ],
-    "type": "Query"
+    "concreteType": "Query"
   },
   "kind": "Request",
   "operation": {
@@ -185,7 +185,7 @@ fragment Foo_user on User {
       ]
     }
   ],
-  "type": "ClientType"
+  "concreteType": "ClientType"
 }
 
 {
@@ -223,5 +223,5 @@ fragment Foo_user on User {
       ]
     }
   ],
-  "type": "User"
+  "concreteType": "User"
 }
diff --git a/...es/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fragment-spreads.expected b/...es/relay-compiler/tests/compile_relay_artifacts/fixtures/client-fragment-spreads.expected
@@ -39,7 +39,7 @@ type ClientType {
       ]
     }
   ],
-  "type": "ClientType"
+  "concreteType": "ClientType"
 }
 
 {
@@ -77,5 +77,5 @@ type ClientType {
       ]
     }
   ],
-  "type": "User"
+  "concreteType": "User"
 }
diff --git a/...compiler/tests/compile_relay_artifacts/fixtures/client-inline-fragments-in-query.expected b/...compiler/tests/compile_relay_artifacts/fixtures/client-inline-fragments-in-query.expected
@@ -61,7 +61,7 @@ interface ClientNamed {
         "storageKey": null
       }
     ],
-    "type": "Query"
+    "concreteType": "Query"
   },
   "kind": "Request",
   "operation": {
@@ -208,5 +208,5 @@ fragment Foo_user on User {
       ]
     }
   ],
-  "type": "User"
+  "concreteType": "User"
 }
diff --git a/...es/relay-compiler/tests/compile_relay_artifacts/fixtures/client-inline-fragments.expected b/...es/relay-compiler/tests/compile_relay_artifacts/fixtures/client-inline-fragments.expected
@@ -55,5 +55,5 @@ interface ClientNamed {
       ]
     }
   ],
-  "type": "User"
+  "concreteType": "User"
 }
diff --git a/...rates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-linked-fields.expected b/...rates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-linked-fields.expected
@@ -109,5 +109,5 @@ extend type FriendsEdge {
       ]
     }
   ],
-  "type": "User"
+  "concreteType": "User"
 }
diff --git a/...rates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-scalar-fields.expected b/...rates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-scalar-fields.expected
@@ -75,5 +75,5 @@ extend type FriendsConnection {
       ]
     }
   ],
-  "type": "User"
+  "concreteType": "User"
 }
diff --git a/.../relay-compiler/tests/compile_relay_artifacts/fixtures/complex-arguments-in-list.expected b/.../relay-compiler/tests/compile_relay_artifacts/fixtures/complex-arguments-in-list.expected
@@ -106,7 +106,7 @@ query CheckinSearchQuery(
         "storageKey": null
       }
     ],
-    "type": "Query"
+    "concreteType": "Query"
   },
   "kind": "Request",
   "operation": {

diff --git a/...tests/compile_relay_artifacts/fixtures/complex-arguments-with-mutliple-variables.expected b/...tests/compile_relay_artifacts/fixtures/complex-arguments-with-mutliple-variables.expected
@@ -105,7 +105,7 @@ query TestQueryWithLiteral($latArg: String, $lonArg: String) {
         "storageKey": null
       }
     ],
-    "type": "Query"
+    "concreteType": "Query"
   },
   "kind": "Request",
   "operation": {

diff --git a/...r/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/complex-arguments.expected b/...r/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/complex-arguments.expected
@@ -50,7 +50,7 @@ query TestQuery($date: String) {
         "storageKey": null
       }
     ],
-    "type": "Query"
+    "concreteType": "Query"
   },
   "kind": "Request",
   "operation": {

diff --git a/...r/tests/compile_relay_artifacts/fixtures/connection-with-aliased-edges-page_info.expected b/...r/tests/compile_relay_artifacts/fixtures/connection-with-aliased-edges-page_info.expected
@@ -148,7 +148,7 @@ query NodeQuery($id: ID!) {
         "storageKey": null
       }
     ],
-    "type": "Query"
+    "concreteType": "Query"
   },
   "kind": "Request",
   "operation": {

diff --git a/...elay-compiler/tests/compile_relay_artifacts/fixtures/connection-with-dynamic-key.expected b/...elay-compiler/tests/compile_relay_artifacts/fixtures/connection-with-dynamic-key.expected
@@ -79,7 +79,7 @@ fragment FeedbackFragment on Feedback
         "storageKey": null
       }
     ],
-    "type": "Query"
+    "concreteType": "Query"
   },
   "kind": "Request",
   "operation": {
@@ -362,7 +362,7 @@ fragment FeedbackFragment on Feedback {
         "storageKey": null
       }
     ],
-    "type": "Query"
+    "concreteType": "Query"
   },
   "kind": "Request",
   "operation": {
@@ -736,5 +736,5 @@ fragment FeedbackFragment_1G22uz on Feedback {
       "storageKey": null
     }
   ],
-  "type": "Feedback"
+  "concreteType": "Feedback"
 }
diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/connection.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/connection.expected
@@ -255,7 +255,7 @@ query NodeQuery($id: ID!) {
         "storageKey": null
       }
     ],
-    "type": "Query"
+    "concreteType": "Query"
   },
   "kind": "Request",
   "operation": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -214,7 +214,7 @@ interface ClientNamed { @@
           ]
         }
       ],
-      "type": "User"
+      "concreteType": "User"
     }
     {
@@ Expand Down @@