Add artifact with schema resolvers

Reviewed By: alunyov Differential Revision: D50118100 fbshipit-source-id: 6e7b79b3445ef51de9cb9cc0d4a5533c85310dda
facebook · Oct 17, 2023 · 3d66ad8 · 3d66ad8
1 parent c4618c6
commit 3d66ad8
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 13 deletions.
diff --git a/compiler/crates/common/src/feature_flags.rs b/compiler/crates/common/src/feature_flags.rs
@@ -68,6 +68,10 @@ pub struct FeatureFlags {
     /// Fully build the normalization AST for Resolvers
     #[serde(default)]
     pub enable_resolver_normalization_ast: bool,
+
+    /// Fully build the schema resolvers artifact
+    #[serde(default)]
+    pub enable_schema_resolvers: bool,
 }
 
 #[derive(Debug, Deserialize, Clone, Serialize)]

diff --git a/compiler/crates/relay-compiler/src/artifact_content/content.rs b/compiler/crates/relay-compiler/src/artifact_content/content.rs
@@ -821,7 +821,7 @@ fn write_import_type_from(
     }
 }
 
-fn write_export_generated_node(
+pub fn write_export_generated_node(
     typegen_config: &TypegenConfig,
     section: &mut dyn Write,
     variable_node: &str,
@@ -846,7 +846,7 @@ fn write_export_generated_node(
     }
 }
 
-fn generate_docblock_section(
+pub fn generate_docblock_section(
     config: &Config,
     project_config: &ProjectConfig,
     extra_annotations: Vec<String>,

diff --git a/compiler/crates/relay-compiler/src/artifact_content/mod.rs b/compiler/crates/relay-compiler/src/artifact_content/mod.rs
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-mod content;
-mod content_section;
+pub mod content;
+pub mod content_section;
 
 use std::sync::Arc;
 

diff --git a/compiler/crates/relay-compiler/src/build_project/generate_extra_artifacts.rs b/compiler/crates/relay-compiler/src/build_project/generate_extra_artifacts.rs
@@ -8,8 +8,12 @@
 use schema::SDLSchema;
 
 use super::Artifact;
+use super::Config;
 use super::Programs;
 use super::ProjectConfig;
 
-pub type GenerateExtraArtifactsFn =
-    Box<dyn Fn(&ProjectConfig, &SDLSchema, &Programs, &[Artifact]) -> Vec<Artifact> + Send + Sync>;
+pub type GenerateExtraArtifactsFn = Box<
+    dyn Fn(&Config, &ProjectConfig, &SDLSchema, &Programs, &[Artifact]) -> Vec<Artifact>
+        + Send
+        + Sync,
+>;
diff --git a/compiler/crates/relay-compiler/src/build_project/mod.rs b/compiler/crates/relay-compiler/src/build_project/mod.rs
@@ -357,6 +357,7 @@ pub async fn commit_project(
     if let Some(generate_extra_artifacts_fn) = &config.generate_extra_artifacts {
         log_event.time("generate_extra_artifacts_time", || {
             artifacts.extend(generate_extra_artifacts_fn(
+                config,
                 project_config,
                 schema,
                 &programs,

diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/mod.rs b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/mod.rs
@@ -118,6 +118,7 @@ pub async fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String>
         enable_resolver_normalization_ast: fixture
             .content
             .contains("# enable_resolver_normalization_ast"),
+        enable_schema_resolvers: false,
     };
 
     let default_project_config = ProjectConfig {

diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts_with_custom_id/mod.rs b/compiler/crates/relay-compiler/tests/compile_relay_artifacts_with_custom_id/mod.rs
@@ -96,6 +96,7 @@ pub async fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String>
         relay_resolver_enable_output_type: FeatureFlag::Disabled,
         relay_resolver_enable_interface_output_type: FeatureFlag::Disabled,
         enable_resolver_normalization_ast: false,
+        enable_schema_resolvers: false,
     };
 
     let default_schema_config = SchemaConfig::default();

diff --git a/compiler/crates/relay-transforms/src/generate_relay_resolvers_model_fragments.rs b/compiler/crates/relay-transforms/src/generate_relay_resolvers_model_fragments.rs
@@ -134,7 +134,7 @@ pub fn generate_relay_resolvers_model_fragments(
     next_program
 }
 
-fn get_resolver_source_hash(field: &schema::Field) -> Option<ResolverSourceHash> {
+pub fn get_resolver_source_hash(field: &schema::Field) -> Option<ResolverSourceHash> {
     field
         .directives
         .named(*RELAY_RESOLVER_SOURCE_HASH)

diff --git a/compiler/crates/relay-transforms/src/lib.rs b/compiler/crates/relay-transforms/src/lib.rs
@@ -29,7 +29,7 @@ mod fragment_alias_directive;
 mod generate_data_driven_dependency_metadata;
 mod generate_id_field;
 mod generate_live_query_metadata;
-mod generate_relay_resolvers_model_fragments;
+pub mod generate_relay_resolvers_model_fragments;
 mod generate_relay_resolvers_operations_for_nested_objects;
 mod generate_typename;
 mod handle_fields;
@@ -47,7 +47,7 @@ mod refetchable_fragment;
 mod relay_actor_change;
 mod relay_directive;
 mod relay_node_identifier;
-mod relay_resolvers;
+pub mod relay_resolvers;
 mod remove_base_fragments;
 mod required_directive;
 mod root_variables;

diff --git a/compiler/crates/relay-transforms/src/relay_resolvers.rs b/compiler/crates/relay-transforms/src/relay_resolvers.rs
@@ -617,16 +617,17 @@ impl Transformer for RelayResolverFieldTransform<'_> {
     }
 }
 
-struct ResolverInfo {
+#[derive(Debug)]
+pub struct ResolverInfo {
     fragment_name: Option<FragmentDefinitionName>,
     fragment_data_injection_mode: Option<FragmentDataInjectionMode>,
-    import_path: StringKey,
-    import_name: Option<StringKey>,
+    pub import_path: StringKey,
+    pub import_name: Option<StringKey>,
     live: bool,
     has_output_type: bool,
 }
 
-fn get_resolver_info(
+pub fn get_resolver_info(
     schema: &SDLSchema,
     resolver_field: &Field,
     error_location: Location,