Skip to content

Commit

Permalink
add apply_to_normalization_ast config for resolvers_schema_module
Browse files Browse the repository at this point in the history 
Reviewed By: Snowshine-afk

Differential Revision: D52808275

fbshipit-source-id: c2a19a646fa6a777e207a1fd3e78830dacc0dc2c
  • Loading branch information
@voideanvalue @facebook-github-bot
voideanvalue authored and facebook-github-bot committed Jan 17, 2024
1 parent 12d169f commit 8dd004f
Show file tree
Hide file tree
Showing 10 changed files with 322 additions and 63 deletions.
137 changes: 83 additions & 54 deletions compiler/crates/relay-codegen/src/build_ast.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ use relay_transforms::INTERNAL_METADATA_DIRECTIVE;
use relay_transforms::RELAY_ACTOR_CHANGE_DIRECTIVE_FOR_CODEGEN;
use relay_transforms::RESOLVER_BELONGS_TO_BASE_SCHEMA_DIRECTIVE;
use relay_transforms::TYPE_DISCRIMINATOR_DIRECTIVE_NAME;
use schema::Field;
use schema::SDLSchema;
use schema::Schema;
use schema::Type;
Expand Down Expand Up @@ -241,34 +242,20 @@ pub fn build_resolvers_schema(
}
fields.push(ObjectEntry {
key: field.name.item,
value: Primitive::Key(ast_builder.intern(Ast::Object(object! {
resolver_function: Primitive::JSModuleDependency(JSModuleDependency {
path: project_config.js_module_import_identifier(
artifact_path,
&PathBuf::from(import_path.lookup()),
),
import_name: ModuleImportName::Named {
name: import_name,
import_as: Some(resolver_import_alias(object.name.item.0, field.name.item))
},
}),
root_fragment: match get_resolver_fragment_dependency_name(field) {
Some(name) => {
let definition_name = WithLocation::new(
field.name.location,
get_normalization_operation_name(name.0).intern(),
);
Primitive::JSModuleDependency(JSModuleDependency {
path: project_config.js_module_import_identifier(
artifact_path,
&project_config.artifact_path_for_definition(definition_name),
),
import_name: ModuleImportName::Default(definition_name.item),
})
},
None => Primitive::SkippableNull,
value: Primitive::Key(build_resolver_info(
ast_builder,
project_config,
artifact_path,
field,
import_path,
ModuleImportName::Named {
name: import_name,
import_as: Some(resolver_import_alias(
object.name.item.0,
field.name.item,
)),
},
}))),
)),
});
}
}
Expand All @@ -283,6 +270,41 @@ pub fn build_resolvers_schema(
ast_builder.intern(Ast::Object(map))
}

fn build_resolver_info(
ast_builder: &mut AstBuilder,
project_config: &ProjectConfig,
artifact_path: &PathBuf,
field: &Field,
import_path: StringKey,
import_name: ModuleImportName,
) -> AstKey {
ast_builder.intern(Ast::Object(object! {
resolver_function: Primitive::JSModuleDependency(JSModuleDependency {
path: project_config.js_module_import_identifier(
artifact_path,
&PathBuf::from(import_path.lookup()),
),
import_name,
}),
root_fragment: match get_resolver_fragment_dependency_name(field) {
Some(name) => {
let definition_name = WithLocation::new(
field.name.location,
get_normalization_operation_name(name.0).intern(),
);
Primitive::JSModuleDependency(JSModuleDependency {
path: project_config.js_module_import_identifier(
artifact_path,
&project_config.artifact_path_for_definition(definition_name),
),
import_name: ModuleImportName::Default(definition_name.item),
})
}
None => Primitive::SkippableNull,
},
}))
}

pub struct CodegenBuilder<'schema, 'builder, 'config> {
connection_constants: ConnectionConstants,
schema: &'schema SDLSchema,
Expand Down Expand Up @@ -742,7 +764,12 @@ impl<'schema, 'builder, 'config> CodegenBuilder<'schema, 'builder, 'config> {
resolver_metadata: &RelayResolverMetadata,
inline_fragment: Option<Primitive>,
) -> Primitive {
if self.project_config.resolvers_schema_module.is_some() {
if self
.project_config
.resolvers_schema_module
.as_ref()
.is_some_and(|config| config.apply_to_normalization_ast)
{
self.build_normalization_relay_resolver_execution_time_for_worker(resolver_metadata)
} else if self
.project_config
Expand Down Expand Up @@ -811,26 +838,29 @@ impl<'schema, 'builder, 'config> CodegenBuilder<'schema, 'builder, 'config> {
.normalization_ast_should_have_is_output_type_true();

let variable_name = resolver_metadata.generate_local_resolver_name(self.schema);
let resolver_js_module = JSModuleDependency {
path: self.project_config.js_module_import_identifier(
&self
.project_config
.artifact_path_for_definition(self.definition_source_location),
&PathBuf::from(resolver_metadata.import_path.lookup()),
),
import_name: match resolver_metadata.import_name {
let artifact_path = &self
.project_config
.artifact_path_for_definition(self.definition_source_location);
let kind = if resolver_metadata.live {
CODEGEN_CONSTANTS.relay_live_resolver
} else {
CODEGEN_CONSTANTS.relay_resolver
};
let resolver_info = build_resolver_info(
self.ast_builder,
self.project_config,
artifact_path,
self.schema.field(resolver_metadata.field_id),
resolver_metadata.import_path,
match resolver_metadata.import_name {
Some(name) => ModuleImportName::Named {
name,
import_as: Some(variable_name),
},
None => ModuleImportName::Default(variable_name),
},
};
let kind = if resolver_metadata.live {
CODEGEN_CONSTANTS.relay_live_resolver
} else {
CODEGEN_CONSTANTS.relay_resolver
};
);

Primitive::Key(self.object(object! {
name: Primitive::String(field_name),
args: match args {
Expand All @@ -849,7 +879,7 @@ impl<'schema, 'builder, 'config> CodegenBuilder<'schema, 'builder, 'config> {
}
},
is_output_type: Primitive::Bool(is_output_type),
resolver_module: Primitive::JSModuleDependency(resolver_js_module),
resolver_info: Primitive::Key(resolver_info),
}))
}

Expand All @@ -871,16 +901,6 @@ impl<'schema, 'builder, 'config> CodegenBuilder<'schema, 'builder, 'config> {
};

let variable_name = resolver_metadata.generate_local_resolver_name(self.schema);
let resolver_js_module = ResolverModuleReference {
field_type,
resolver_function_name: match resolver_metadata.import_name {
Some(name) => ModuleImportName::Named {
name,
import_as: Some(variable_name),
},
None => ModuleImportName::Default(variable_name),
},
};
let kind = if resolver_metadata.live {
CODEGEN_CONSTANTS.relay_live_resolver
} else {
Expand All @@ -904,7 +924,16 @@ impl<'schema, 'builder, 'config> CodegenBuilder<'schema, 'builder, 'config> {
}
},
is_output_type: Primitive::Bool(is_output_type),
resolver_module: Primitive::ResolverModuleReference(resolver_js_module),
resolver_reference: Primitive::ResolverModuleReference(ResolverModuleReference {
field_type,
resolver_function_name: match resolver_metadata.import_name {
Some(name) => ModuleImportName::Named {
name,
import_as: Some(variable_name),
},
None => ModuleImportName::Default(variable_name),
},
}),
}))
}

Expand Down
4 changes: 4 additions & 0 deletions compiler/crates/relay-codegen/src/constants.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ pub struct CodegenConstants {
pub request: StringKey,
pub required_field: StringKey,
pub resolver_function: StringKey,
pub resolver_info: StringKey,
pub resolver_module: StringKey,
pub resolver_reference: StringKey,
pub root_argument: StringKey,
pub root_fragment: StringKey,
pub scalar_field: StringKey,
Expand Down Expand Up @@ -215,7 +217,9 @@ lazy_static! {
request: "Request".intern(),
required_field: "RequiredField".intern(),
resolver_function: "resolverFunction".intern(),
resolver_info: "resolverInfo".intern(),
resolver_module: "resolverModule".intern(),
resolver_reference: "resolverReference".intern(),
root_argument: "RootArgument".intern(),
root_fragment: "rootFragment".intern(),
scalar_field: "ScalarField".intern(),
Expand Down
2 changes: 1 addition & 1 deletion compiler/crates/relay-compiler/src/build_project/generate_artifacts.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ pub fn generate_artifacts(
}))
.chain(
match project_config.resolvers_schema_module {
Some(ResolversSchemaModuleConfig { ref path }) =>
Some(ResolversSchemaModuleConfig { ref path , .. }) =>
vec![
generate_resolvers_schema_module_artifact(path.clone())
],
Expand Down
5 changes: 4 additions & 1 deletion ...ts/compile_relay_artifacts/fixtures/relay-resolver-weak-object-normalization-ast.expected
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,10 @@ extend type Query {
"kind": "RelayResolver",
"storageKey": null,
"isOutputType": true,
"resolverModule": require('ClientTypeResolver')
"resolverInfo": {
"resolverFunction": require('ClientTypeResolver'),
"rootFragment": null
}
},
"linkedField": {
"alias": null,
Expand Down
7 changes: 5 additions & 2 deletions ...relay-compiler/tests/relay_compiler_integration/fixtures/resolvers_schema_module.expected
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ module.exports = schema_resolvers;

//- __generated__/UserFooFragment$normalization.graphql.js
/**
* <auto-generated> SignedSource<<c7d752926e881ff31593d72de5e42cb1>>
* <auto-generated> SignedSource<<79043ca4ab6c3a1b54e21b82211b593c>>
* @flow
* @lightSyntaxTransform
* @nogrep
Expand Down Expand Up @@ -94,7 +94,10 @@ var node/*: NormalizationSplitOperation*/ = {
"kind": "RelayResolver",
"storageKey": null,
"isOutputType": true,
"resolverModule": { resolverFunctionName: "bar", fieldType: "User" }
"resolverInfo": {
"resolverFunction": require('User_bar').bar,
"rootFragment": null
}
}
]
}
Expand Down
Loading

0 comments on commit 8dd004f

Please sign in to comment.