Refactoring of the type generation/type assertion for provided variables to support internal use case with shared artifacts. (facebook#4429)

Summary: Pull Request resolved: facebook#4429

Differential Revision: D48801823

Pulled By: alunyov

fbshipit-source-id: bcfd9ee731f9314f46d0ccb6953d1e8015c2bda9

Author: alunyov

compiler/crates/relay-codegen/src/build_ast.rs

@@ -75,16 +75,15 @@ use crate::ast::QueryID;
 use crate::ast::RequestParameters;
 use crate::constants::CODEGEN_CONSTANTS;
 use crate::object;
-use crate::top_level_statements::TopLevelStatements;
 
 pub fn build_request_params_ast_key(
     schema: &SDLSchema,
     request_parameters: RequestParameters<'_>,
     ast_builder: &mut AstBuilder,
     operation: &OperationDefinition,
-    top_level_statements: &TopLevelStatements,
     definition_source_location: WithLocation<StringKey>,
     project_config: &ProjectConfig,
+    maybe_provided_variables: Option<AstKey>,
 ) -> AstKey {
     let mut operation_builder = CodegenBuilder::new(
         schema,
@@ -93,7 +92,11 @@ pub fn build_request_params_ast_key(
         project_config,
         definition_source_location,
     );
-    operation_builder.build_request_parameters(operation, request_parameters, top_level_statements)
+    operation_builder.build_request_parameters(
+        operation,
+        request_parameters,
+        maybe_provided_variables,
+    )
 }
 
 pub fn build_provided_variables(
@@ -1837,7 +1840,7 @@ impl<'schema, 'builder, 'config> CodegenBuilder<'schema, 'builder, 'config> {
         &mut self,
         operation: &OperationDefinition,
         request_parameters: RequestParameters<'_>,
-        top_level_statements: &TopLevelStatements,
+        maybe_provided_variables: Option<AstKey>,
     ) -> AstKey {
         let mut metadata_items: Vec<ObjectEntry> = operation
             .directives
@@ -1926,20 +1929,10 @@ impl<'schema, 'builder, 'config> CodegenBuilder<'schema, 'builder, 'config> {
             },
         });
 
-        let provided_variables = if top_level_statements
-            .contains(CODEGEN_CONSTANTS.provided_variables_definition.lookup())
-        {
-            Some(Primitive::Variable(
-                CODEGEN_CONSTANTS.provided_variables_definition,
-            ))
-        } else {
-            self.build_operation_provided_variables(operation)
-                .map(Primitive::Key)
-        };
-        if let Some(value) = provided_variables {
+        if let Some(provided_variables) = maybe_provided_variables {
             params_object.push(ObjectEntry {
                 key: CODEGEN_CONSTANTS.provided_variables,
-                value,
+                value: Primitive::Key(provided_variables),
             });
         }
 

compiler/crates/relay-codegen/src/constants.rs

@@ -90,7 +90,6 @@ pub struct CodegenConstants {
     pub passing_value: StringKey,
     pub path: StringKey,
     pub plural: StringKey,
-    pub provided_variables_definition: StringKey,
     pub provided_variables: StringKey,
     pub provider: StringKey,
     pub query: StringKey,
@@ -200,7 +199,6 @@ lazy_static! {
         passing_value: "passingValue".intern(),
         path: "path".intern(),
         plural: "plural".intern(),
-        provided_variables_definition: "providedVariablesDefinition".intern(),
         provided_variables: "providedVariables".intern(),
         provider: "provider".intern(),
         query: "query".intern(),

compiler/crates/relay-codegen/src/lib.rs

@@ -28,6 +28,7 @@ pub use build_ast::CodegenVariant;
 pub use constants::CODEGEN_CONSTANTS;
 pub use printer::print_fragment;
 pub use printer::print_operation;
+pub use printer::print_provided_variables;
 pub use printer::print_request;
 pub use printer::print_request_params;
 pub use printer::JSONPrinter;

compiler/crates/relay-codegen/src/printer.rs

@@ -76,12 +76,21 @@ pub fn print_request(
     project_config: &ProjectConfig,
     top_level_statements: &mut TopLevelStatements,
 ) -> String {
+    let mut builder: AstBuilder = AstBuilder::default();
+    let maybe_provided_variables = build_provided_variables(
+        schema,
+        &mut builder,
+        operation,
+        operation.name.map(|x| x.0),
+        project_config,
+    );
     Printer::without_dedupe(project_config).print_request(
         schema,
         operation,
         fragment,
         request_parameters,
         top_level_statements,
+        maybe_provided_variables,
     )
 }
 
@@ -94,21 +103,45 @@ pub fn print_request_params(
 ) -> String {
     let mut request_parameters = build_request_params(operation);
     request_parameters.id = query_id;
-
-    let mut builder = AstBuilder::default();
+    let mut builder: AstBuilder = AstBuilder::default();
+    let maybe_provided_variables = build_provided_variables(
+        schema,
+        &mut builder,
+        operation,
+        operation.name.map(|x| x.0),
+        project_config,
+    );
     let request_parameters_ast_key = build_request_params_ast_key(
         schema,
         request_parameters,
         &mut builder,
         operation,
-        top_level_statements,
         operation.name.map(|x| x.0),
         project_config,
+        maybe_provided_variables,
     );
     let printer = JSONPrinter::new(&builder, project_config, top_level_statements);
     printer.print(request_parameters_ast_key, false)
 }
 
+pub fn print_provided_variables(
+    schema: &SDLSchema,
+    operation: &OperationDefinition,
+    project_config: &ProjectConfig,
+) -> Option<String> {
+    let mut top_level_statements = Default::default();
+    let mut builder = AstBuilder::default();
+    let maybe_provided_variables = build_provided_variables(
+        schema,
+        &mut builder,
+        operation,
+        operation.name.map(|x| x.0),
+        project_config,
+    )?;
+    let printer = JSONPrinter::new(&builder, project_config, &mut top_level_statements);
+    Some(printer.print(maybe_provided_variables, false))
+}
+
 pub struct Printer<'p> {
     project_config: &'p ProjectConfig,
     builder: AstBuilder,
@@ -132,21 +165,27 @@ impl<'p> Printer<'p> {
         }
     }
 
-    pub fn print_provided_variables(
+    pub fn prepare_provided_variables_object(
         &mut self,
         schema: &SDLSchema,
         operation: &OperationDefinition,
-        top_level_statements: &mut TopLevelStatements,
-    ) -> Option<String> {
-        let key = build_provided_variables(
+    ) -> Option<AstKey> {
+        build_provided_variables(
             schema,
             &mut self.builder,
             operation,
             operation.name.map(|x| x.0),
             self.project_config,
-        )?;
+        )
+    }
+
+    pub fn print_provided_variables(
+        &mut self,
+        provided_variables: AstKey,
+        top_level_statements: &mut TopLevelStatements,
+    ) -> Option<String> {
         let printer = JSONPrinter::new(&self.builder, self.project_config, top_level_statements);
-        Some(printer.print(key, self.dedupe))
+        Some(printer.print(provided_variables, self.dedupe))
     }
 
     pub fn print_updatable_query(
@@ -183,15 +222,16 @@ impl<'p> Printer<'p> {
         fragment: &FragmentDefinition,
         request_parameters: RequestParameters<'_>,
         top_level_statements: &mut TopLevelStatements,
+        maybe_provided_variables: Option<AstKey>,
     ) -> String {
         let request_parameters = build_request_params_ast_key(
             schema,
             request_parameters,
             &mut self.builder,
             operation,
-            top_level_statements,
             operation.name.map(|x| x.0),
             self.project_config,
+            maybe_provided_variables,
         );
 
         let key = build_request(
@@ -247,15 +287,16 @@ impl<'p> Printer<'p> {
         request_parameters: RequestParameters<'_>,
         operation: &OperationDefinition,
         top_level_statements: &mut TopLevelStatements,
+        maybe_provided_variables: Option<AstKey>,
     ) -> String {
         let key = build_request_params_ast_key(
             schema,
             request_parameters,
             &mut self.builder,
             operation,
-            top_level_statements,
             operation.name.map(|x| x.0),
             self.project_config,
+            maybe_provided_variables,
         );
         let printer = JSONPrinter::new(&self.builder, self.project_config, top_level_statements);
         printer.print(key, self.dedupe)

compiler/crates/relay-codegen/tests/connections/mod.rs

@@ -66,6 +66,7 @@ pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
                 &operation_fragment,
                 request_parameters,
                 &mut import_statements,
+                None,
             );
             format!("{}{}", import_statements, request)
         })

compiler/crates/relay-compiler-playground/src/lib.rs

@@ -18,6 +18,7 @@ use graphql_text_printer::PrinterOptions;
 use intern::string_key::Intern;
 use relay_codegen::print_fragment;
 use relay_codegen::print_operation;
+use relay_codegen::print_provided_variables;
 use relay_config::ProjectConfig;
 use relay_schema::build_schema_with_extensions;
 use relay_transforms::apply_transforms;
@@ -254,6 +255,7 @@ pub fn parse_to_types_impl(
                 &schema,
                 &project_config,
                 &fragment_locations,
+                print_provided_variables(&schema, normalization_operation, &project_config),
             )
         }))
         .collect::<Vec<_>>()