Skip to content

Commit

Permalink
Do not import resolver function types in typescript
Browse files Browse the repository at this point in the history
Reviewed By: lumapat

Differential Revision: D40677296

fbshipit-source-id: 3f877f18ff19cc9dd38ecf4936127eead36fdc13
  • Loading branch information
alunyov authored and facebook-github-bot committed Nov 2, 2022
1 parent 2c2a870 commit 0ef7043
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
14 changes: 12 additions & 2 deletions compiler/crates/relay-typegen/src/write.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ pub(crate) fn write_operation_type_exports_section(
write_import_actor_change_point(actor_change_status, writer)?;
runtime_imports.write_runtime_imports(writer)?;
write_fragment_imports(typegen_context, None, encountered_fragments, writer)?;
write_relay_resolver_imports(imported_resolvers, writer)?;
write_relay_resolver_imports(typegen_context, imported_resolvers, writer)?;
write_split_raw_response_type_imports(typegen_context, imported_raw_response_types, writer)?;

let mut input_object_types = IndexMap::default();
Expand Down Expand Up @@ -414,7 +414,7 @@ pub(crate) fn write_fragment_type_exports_section(
write_custom_scalar_imports(custom_scalars, writer)?;

runtime_imports.write_runtime_imports(writer)?;
write_relay_resolver_imports(imported_resolvers, writer)?;
write_relay_resolver_imports(typegen_context, imported_resolvers, writer)?;

let refetchable_metadata = RefetchableMetadata::find(&fragment_definition.directives);
let fragment_type_name = format!("{}$fragmentType", fragment_name);
Expand Down Expand Up @@ -539,9 +539,19 @@ fn write_import_actor_change_point(
}

fn write_relay_resolver_imports(
typegen_context: &'_ TypegenContext<'_>,
mut imported_resolvers: ImportedResolvers,
writer: &mut Box<dyn Writer>,
) -> FmtResult {
// We don't need to import resolver modules in the type-generation
// they should be imported in the codegen.
if matches!(
typegen_context.project_config.typegen_config.language,
TypegenLanguage::TypeScript
) {
return Ok(());
}

imported_resolvers.0.sort_keys();
for resolver in imported_resolvers.0.values() {
match resolver.resolver_name {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ export type User__pop_star_name$normalization = {
};
-------------------------------------------------------------------------------
import type { FragmentRefs } from "relay-runtime";
import userPopStarNameResolver from "PopStarNameResolver";
export type Foo_user$data = {
readonly poppy: {
readonly name: string | null;
Expand Down

0 comments on commit 0ef7043

Please sign in to comment.