Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Relay Resolver typegen for Typescript-based projects #4274

Closed
wants to merge 12 commits into from
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
==================================== INPUT ====================================
fragment Foo_user on User {
poppy: pop_star_name @required(action: THROW)
}

fragment PopStarNameResolverFragment_name on User {
name
address {
street
}
parents {
lastName
}
}

# %extensions%

extend type User {
pop_star_name: RelayResolverValue @relay_resolver(fragment_name: "PopStarNameResolverFragment_name", import_path: "PopStarNameResolver", has_output_type: true)
}
==================================== OUTPUT ===================================
import { FragmentRefs } from "relay-runtime";
export type Foo_user$data = {
readonly poppy: NonNullable<ReturnType<typeof userPopStarNameResolverType>>;
ernieturner marked this conversation as resolved.
Show resolved Hide resolved
readonly " $fragmentType": "Foo_user";
};
export type Foo_user$key = {
readonly " $data"?: Foo_user$data;
readonly " $fragmentSpreads": FragmentRefs<"Foo_user">;
};
-------------------------------------------------------------------------------
import { FragmentRefs } from "relay-runtime";
export type PopStarNameResolverFragment_name$data = {
readonly address: {
readonly street: string | null;
} | null;
readonly name: string | null;
readonly parents: ReadonlyArray<{
readonly lastName: string | null;
}>;
readonly " $fragmentType": "PopStarNameResolverFragment_name";
};
export type PopStarNameResolverFragment_name$key = {
readonly " $data"?: PopStarNameResolverFragment_name$data;
readonly " $fragmentSpreads": FragmentRefs<"PopStarNameResolverFragment_name">;
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
fragment Foo_user on User {
poppy: pop_star_name @required(action: THROW)
}

fragment PopStarNameResolverFragment_name on User {
name
address {
street
}
parents {
lastName
}
}

# %extensions%

extend type User {
pop_star_name: RelayResolverValue @relay_resolver(fragment_name: "PopStarNameResolverFragment_name", import_path: "PopStarNameResolver", has_output_type: true)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
==================================== INPUT ====================================
fragment Foo_user on User {
poppy: pop_star_name
}

fragment PopStarNameResolverFragment_name on User {
name
address {
street
}
parents {
lastName
}
}

# %extensions%

extend type User {
pop_star_name: RelayResolverValue @relay_resolver(fragment_name: "PopStarNameResolverFragment_name", import_path: "PopStarNameResolver", has_output_type: true)
}
==================================== OUTPUT ===================================
import { FragmentRefs } from "relay-runtime";
export type Foo_user$data = {
readonly poppy: ReturnType<typeof userPopStarNameResolverType> | null;
readonly " $fragmentType": "Foo_user";
};
export type Foo_user$key = {
readonly " $data"?: Foo_user$data;
readonly " $fragmentSpreads": FragmentRefs<"Foo_user">;
};
-------------------------------------------------------------------------------
import { FragmentRefs } from "relay-runtime";
export type PopStarNameResolverFragment_name$data = {
readonly address: {
readonly street: string | null;
} | null;
readonly name: string | null;
readonly parents: ReadonlyArray<{
readonly lastName: string | null;
}>;
readonly " $fragmentType": "PopStarNameResolverFragment_name";
};
export type PopStarNameResolverFragment_name$key = {
readonly " $data"?: PopStarNameResolverFragment_name$data;
readonly " $fragmentSpreads": FragmentRefs<"PopStarNameResolverFragment_name">;
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
fragment Foo_user on User {
poppy: pop_star_name
}

fragment PopStarNameResolverFragment_name on User {
name
address {
street
}
parents {
lastName
}
}

# %extensions%

extend type User {
pop_star_name: RelayResolverValue @relay_resolver(fragment_name: "PopStarNameResolverFragment_name", import_path: "PopStarNameResolver", has_output_type: true)
}
14 changes: 14 additions & 0 deletions compiler/crates/relay-typegen/tests/generate_typescript_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,20 @@ fn relay_resolver_with_output_type_client_object() {
test_fixture(transform_fixture, "relay-resolver-with-output-type-client-object.graphql", "generate_typescript/fixtures/relay-resolver-with-output-type-client-object.expected", input, expected);
}

#[test]
fn relay_resolver_with_output_type_relay_resolver_value() {
let input = include_str!("generate_typescript/fixtures/relay-resolver-with-output-type-relay-resolver-value.graphql");
let expected = include_str!("generate_typescript/fixtures/relay-resolver-with-output-type-relay-resolver-value.expected");
test_fixture(transform_fixture, "relay-resolver-with-output-type-relay-resolver-value.graphql", "generate_typescript/fixtures/relay-resolver-with-output-type-relay-resolver-value.expected", input, expected);
}

#[test]
fn relay_resolver_with_output_type_relay_resolver_value_required() {
let input = include_str!("generate_typescript/fixtures/relay-resolver-with-output-type-relay-resolver-value-required.graphql");
let expected = include_str!("generate_typescript/fixtures/relay-resolver-with-output-type-relay-resolver-value-required.expected");
test_fixture(transform_fixture, "relay-resolver-with-output-type-relay-resolver-value-required.graphql", "generate_typescript/fixtures/relay-resolver-with-output-type-relay-resolver-value-required.expected", input, expected);
}

#[test]
fn relay_weak_client_type() {
let input = include_str!("generate_typescript/fixtures/relay-weak-client-type.graphql");
Expand Down