emit combined reader AST when flag is enabled

Reviewed By: Snowshine-afk Differential Revision: D49609423 fbshipit-source-id: b2db210bd327b747de796bc04232adb598f7e0ee
facebook · Oct 9, 2023 · 5427d69 · 5427d69
1 parent 9311248
commit 5427d69
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 34 deletions.
diff --git a/...ts/compile_relay_artifacts/fixtures/relay-resolver-weak-object-normalization-ast.expected b/...ts/compile_relay_artifacts/fixtures/relay-resolver-weak-object-normalization-ast.expected
@@ -46,31 +46,46 @@ extend type Query {
   "fragment": {
     "argumentDefinitions": [],
     "kind": "Fragment",
-    "metadata": null,
+    "metadata": {
+      "hasClientEdges": true
+    },
     "name": "relayResolverWeakObjectNormalizationAstQuery",
     "selections": [
       {
-        "kind": "ClientExtension",
-        "selections": [
-          {
-            "alias": null,
-            "args": null,
+        "kind": "ClientEdgeToClientObject",
+        "concreteType": "MyClientType",
+        "backingField": {
+          "alias": null,
+          "args": null,
+          "fragment": null,
+          "kind": "RelayResolver",
+          "name": "client_type",
+          "resolverModule": require('relay-runtime/experimental').weakObjectWrapper(require('ClientTypeResolver'), '__relay_model_instance', false),
+          "path": "client_type",
+          "normalizationInfo": {
             "concreteType": "MyClientType",
-            "kind": "LinkedField",
-            "name": "client_type",
             "plural": false,
-            "selections": [
-              {
-                "alias": null,
-                "args": null,
-                "kind": "ScalarField",
-                "name": "__typename",
-                "storageKey": null
-              }
-            ],
-            "storageKey": null
+            "normalizationNode": require('Query__client_type$normalization.graphql')
           }
-        ]
+        },
+        "linkedField": {
+          "alias": null,
+          "args": null,
+          "concreteType": "MyClientType",
+          "kind": "LinkedField",
+          "name": "client_type",
+          "plural": false,
+          "selections": [
+            {
+              "alias": null,
+              "args": null,
+              "kind": "ScalarField",
+              "name": "__typename",
+              "storageKey": null
+            }
+          ],
+          "storageKey": null
+        }
       }
     ],
     "type": "Query",

diff --git a/compiler/crates/relay-transforms/src/apply_transforms.rs b/compiler/crates/relay-transforms/src/apply_transforms.rs
@@ -252,22 +252,17 @@ fn apply_reader_transforms(
 
     program = log_event.time("required_directive", || required_directive(&program))?;
 
-    if !project_config
-        .feature_flags
-        .enable_resolver_normalization_ast
-    {
-        program = log_event.time("client_edges", || {
-            client_edges(&program, project_config, &base_fragment_names)
-        })?;
+    program = log_event.time("client_edges", || {
+        client_edges(&program, project_config, &base_fragment_names)
+    })?;
 
-        program = log_event.time("relay_resolvers", || {
-            relay_resolvers(
-                project_config.name,
-                &program,
-                project_config.feature_flags.enable_relay_resolver_transform,
-            )
-        })?;
-    }
+    program = log_event.time("relay_resolvers", || {
+        relay_resolvers(
+            project_config.name,
+            &program,
+            project_config.feature_flags.enable_relay_resolver_transform,
+        )
+    })?;
 
     program = log_event.time("client_extensions", || client_extensions(&program));
     program = log_event.time("handle_field_transform", || {