diff --git a/compiler/crates/relay-typegen/src/typescript.rs b/compiler/crates/relay-typegen/src/typescript.rs index 6c9514604fc4b..7d58aa0c9835a 100644 --- a/compiler/crates/relay-typegen/src/typescript.rs +++ b/compiler/crates/relay-typegen/src/typescript.rs @@ -236,7 +236,7 @@ impl TypeScriptPrinter { fn write_object(&mut self, props: &[Prop]) -> FmtResult { if props.is_empty() { - write!(&mut self.result, "{{}}")?; + write!(&mut self.result, "Record")?; return Ok(()); } @@ -244,7 +244,7 @@ impl TypeScriptPrinter { // are missing a newline. if props.len() == 1 { if let Prop::Spread(_) = props[0] { - write!(&mut self.result, "{{}}")?; + write!(&mut self.result, "Record")?; return Ok(()); } } @@ -413,7 +413,7 @@ mod tests { fn exact_object() { assert_eq!( print_type(&AST::ExactObject(ExactObject::new(Vec::new()))), - r"{}".to_string() + r"Record".to_string() ); assert_eq!( @@ -498,7 +498,7 @@ mod tests { fn inexact_object() { assert_eq!( print_type(&AST::InexactObject(InexactObject::new(Vec::new()))), - "{}".to_string() + "Record".to_string() ); assert_eq!( diff --git a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-fragment-raw-response-type.expected b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-fragment-raw-response-type.expected index 2cc5f5fbff81d..48ef816877c9a 100644 --- a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-fragment-raw-response-type.expected +++ b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-fragment-raw-response-type.expected @@ -13,7 +13,7 @@ fragment MyUserFragment on User { } ==================================== OUTPUT =================================== import { FragmentRefs } from "relay-runtime"; -export type MyQuery$variables = {}; +export type MyQuery$variables = Record; export type MyQuery$data = { readonly me: { readonly my_inline_fragment: { diff --git a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-fragment-spread-in-abstract-selection.expected b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-fragment-spread-in-abstract-selection.expected index 803aeef10bf97..ee52ca1cce108 100644 --- a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-fragment-spread-in-abstract-selection.expected +++ b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-fragment-spread-in-abstract-selection.expected @@ -10,7 +10,7 @@ query RelayReaderNamedFragmentsTest2Query { } ==================================== OUTPUT =================================== import { FragmentRefs } from "relay-runtime"; -export type RelayReaderNamedFragmentsTest2Query$variables = {}; +export type RelayReaderNamedFragmentsTest2Query$variables = Record; export type RelayReaderNamedFragmentsTest2Query$data = { readonly node: { readonly named_fragment: { diff --git a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-fragment-spread.expected b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-fragment-spread.expected index 8a5213550e70c..419d4570d69fc 100644 --- a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-fragment-spread.expected +++ b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-fragment-spread.expected @@ -10,7 +10,7 @@ query RelayReaderNamedFragmentsTest2Query { } ==================================== OUTPUT =================================== import { FragmentRefs } from "relay-runtime"; -export type RelayReaderNamedFragmentsTest2Query$variables = {}; +export type RelayReaderNamedFragmentsTest2Query$variables = Record; export type RelayReaderNamedFragmentsTest2Query$data = { readonly me: { readonly named_fragment: { diff --git a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-inline-fragment-spread-without-type-condition-linked-field.expected b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-inline-fragment-spread-without-type-condition-linked-field.expected index 3fb05a5ba12c7..22e008871c98e 100644 --- a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-inline-fragment-spread-without-type-condition-linked-field.expected +++ b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-inline-fragment-spread-without-type-condition-linked-field.expected @@ -8,7 +8,7 @@ query RelayReaderNamedFragmentsTest2Query { } } ==================================== OUTPUT =================================== -export type RelayReaderNamedFragmentsTest2Query$variables = {}; +export type RelayReaderNamedFragmentsTest2Query$variables = Record; export type RelayReaderNamedFragmentsTest2Query$data = { readonly me: { readonly id: string; diff --git a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-inline-fragment-spread-without-type-condition-query-root.expected b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-inline-fragment-spread-without-type-condition-query-root.expected index 83d040e7623c2..ef156ce48ff4c 100644 --- a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-inline-fragment-spread-without-type-condition-query-root.expected +++ b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-inline-fragment-spread-without-type-condition-query-root.expected @@ -8,7 +8,7 @@ query RelayReaderNamedFragmentsTest2Query { } } ==================================== OUTPUT =================================== -export type RelayReaderNamedFragmentsTest2Query$variables = {}; +export type RelayReaderNamedFragmentsTest2Query$variables = Record; export type RelayReaderNamedFragmentsTest2Query$data = { readonly named_fragment: { readonly me: { diff --git a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-inline-fragment-spread.expected b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-inline-fragment-spread.expected index 6926a95ae7fe9..62aef4ca173ce 100644 --- a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-inline-fragment-spread.expected +++ b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/aliased-inline-fragment-spread.expected @@ -8,7 +8,7 @@ query RelayReaderNamedFragmentsTest2Query { } } ==================================== OUTPUT =================================== -export type RelayReaderNamedFragmentsTest2Query$variables = {}; +export type RelayReaderNamedFragmentsTest2Query$variables = Record; export type RelayReaderNamedFragmentsTest2Query$data = { readonly me: { readonly id: string; diff --git a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/linked-field.expected b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/linked-field.expected index 85f21bec715f2..a66a53fe7bd4d 100644 --- a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/linked-field.expected +++ b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/linked-field.expected @@ -27,7 +27,7 @@ query UnionTypeTest { } } ==================================== OUTPUT =================================== -export type UnionTypeTest$variables = {}; +export type UnionTypeTest$variables = Record; export type UnionTypeTest$data = { readonly neverNode: { readonly __typename: "FakeNode"; diff --git a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/match-field-in-query.expected b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/match-field-in-query.expected index aa2d501f3b330..16ef10bb16b0c 100644 --- a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/match-field-in-query.expected +++ b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/match-field-in-query.expected @@ -24,7 +24,7 @@ fragment MarkdownUserNameRenderer_name on MarkdownUserNameRenderer { } ==================================== OUTPUT =================================== import { FragmentRefs } from "relay-runtime"; -export type NameRendererQuery$variables = {}; +export type NameRendererQuery$variables = Record; export type NameRendererQuery$data = { readonly me: { readonly nameRenderer: { diff --git a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/query-with-match-fields.expected b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/query-with-match-fields.expected index 9150a978fbdea..3bb12107e067e 100644 --- a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/query-with-match-fields.expected +++ b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/query-with-match-fields.expected @@ -29,7 +29,7 @@ fragment MarkdownUserNameRenderer_name on MarkdownUserNameRenderer { } ==================================== OUTPUT =================================== import { FragmentRefs, Local3DPayload } from "relay-runtime"; -export type Test$variables = {}; +export type Test$variables = Record; export type Test$data = { readonly node: { readonly " $fragmentSpreads": FragmentRefs<"NameRendererFragment">; diff --git a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/query-with-module-field.expected b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/query-with-module-field.expected index cc17380eeaf69..16fbb971d33aa 100644 --- a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/query-with-module-field.expected +++ b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/query-with-module-field.expected @@ -18,7 +18,7 @@ fragment Test_userRenderer on PlainUserRenderer { } ==================================== OUTPUT =================================== import { FragmentRefs, Local3DPayload } from "relay-runtime"; -export type Test$variables = {}; +export type Test$variables = Record; export type Test$data = { readonly node: { readonly " $fragmentSpreads": FragmentRefs<"Test_user">; @@ -34,7 +34,7 @@ export type Test$rawResponse = { readonly node: { readonly __typename: "User"; readonly id: string; - readonly plainUserRenderer: Local3DPayload<"Test_user", {}> | { + readonly plainUserRenderer: Local3DPayload<"Test_user", Record> | { readonly __module_component_Test_user: any | null | undefined; readonly __module_operation_Test_user: any | null | undefined; } | null | undefined; diff --git a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/query-with-multiple-match-fields.expected b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/query-with-multiple-match-fields.expected index bbdc10054a834..7b8c387cf7ae1 100644 --- a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/query-with-multiple-match-fields.expected +++ b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/query-with-multiple-match-fields.expected @@ -49,7 +49,7 @@ fragment MarkdownUserNameRenderer_name on MarkdownUserNameRenderer { } ==================================== OUTPUT =================================== import { FragmentRefs, Local3DPayload } from "relay-runtime"; -export type Test$variables = {}; +export type Test$variables = Record; export type Test$data = { readonly node: { readonly username?: string | null | undefined; diff --git a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/query-with-stream-connection.expected b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/query-with-stream-connection.expected index ed91405092eef..3bcc711ec9bff 100644 --- a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/query-with-stream-connection.expected +++ b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/query-with-stream-connection.expected @@ -17,7 +17,7 @@ query TestDefer @raw_response_type { } } ==================================== OUTPUT =================================== -export type TestDefer$variables = {}; +export type TestDefer$variables = Record; export type TestDefer$data = { readonly node: { readonly friends?: { diff --git a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/query-with-stream.expected b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/query-with-stream.expected index e26a473f68eb5..a5e8c9d8fab04 100644 --- a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/query-with-stream.expected +++ b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/query-with-stream.expected @@ -18,7 +18,7 @@ query TestStream @raw_response_type { } } ==================================== OUTPUT =================================== -export type TestStream$variables = {}; +export type TestStream$variables = Record; export type TestStream$data = { readonly node: { readonly friends?: { diff --git a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/relay-resolver-with-output-type-client-interface.expected b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/relay-resolver-with-output-type-client-interface.expected index d97544a70b19b..ae982be10d641 100644 --- a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/relay-resolver-with-output-type-client-interface.expected +++ b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/relay-resolver-with-output-type-client-interface.expected @@ -36,7 +36,7 @@ extend type User { pop_star_game: ClientTypeWithNestedInterface @relay_resolver(fragment_name: "PopStarNameResolverFragment_name", import_path: "PopStarNameResolver", has_output_type: true) } ==================================== OUTPUT =================================== -export type User__pop_star_game$normalization$variables = {}; +export type User__pop_star_game$normalization$variables = Record; export type User__pop_star_game$normalization$data = { readonly client_interface: { readonly __typename: "ClientType"; @@ -52,7 +52,7 @@ export type User__pop_star_game$normalization = { variables: User__pop_star_game$normalization$variables; }; ------------------------------------------------------------------------------- -export type User__pop_star_name$normalization$variables = {}; +export type User__pop_star_name$normalization$variables = Record; export type User__pop_star_name$normalization$data = { readonly __typename: "ClientType"; readonly name: string | null | undefined; diff --git a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/relay-resolver-with-output-type-client-object.expected b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/relay-resolver-with-output-type-client-object.expected index e1d4aff1d578f..472b39c2d551e 100644 --- a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/relay-resolver-with-output-type-client-object.expected +++ b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/relay-resolver-with-output-type-client-object.expected @@ -27,7 +27,7 @@ extend type User { pop_star_name: ClientUser @relay_resolver(fragment_name: "PopStarNameResolverFragment_name", import_path: "PopStarNameResolver", has_output_type: true) } ==================================== OUTPUT =================================== -export type User__pop_star_name$normalization$variables = {}; +export type User__pop_star_name$normalization$variables = Record; export type User__pop_star_name$normalization$data = { readonly name: string | null | undefined; }; diff --git a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-bubbles-to-query.expected b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-bubbles-to-query.expected index b2548d7d9dced..7e87d44a2bb26 100644 --- a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-bubbles-to-query.expected +++ b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-bubbles-to-query.expected @@ -6,7 +6,7 @@ query FooQuery { } } ==================================== OUTPUT =================================== -export type FooQuery$variables = {}; +export type FooQuery$variables = Record; export type FooQuery$data = { readonly me: { readonly firstName: string | null | undefined; diff --git a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-raw-response-type.expected b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-raw-response-type.expected index c18f6a4bf39cd..bfc7f43eb5fcc 100644 --- a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-raw-response-type.expected +++ b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-raw-response-type.expected @@ -6,7 +6,7 @@ query MyQuery @raw_response_type { } } ==================================== OUTPUT =================================== -export type MyQuery$variables = {}; +export type MyQuery$variables = Record; export type MyQuery$data = { readonly me: { readonly id: string; diff --git a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-throw-doesnt-bubbles-to-query.expected b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-throw-doesnt-bubbles-to-query.expected index f80fa1061552a..1e3c0589dea99 100644 --- a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-throw-doesnt-bubbles-to-query.expected +++ b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-throw-doesnt-bubbles-to-query.expected @@ -6,7 +6,7 @@ query FooQuery { } } ==================================== OUTPUT =================================== -export type FooQuery$variables = {}; +export type FooQuery$variables = Record; export type FooQuery$data = { readonly me: { readonly firstName: string | null | undefined; diff --git a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-throws-nested.expected b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-throws-nested.expected index d2cf2db0fd997..e38bb23d3fd26 100644 --- a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-throws-nested.expected +++ b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-throws-nested.expected @@ -6,7 +6,7 @@ query FooQuery { } } ==================================== OUTPUT =================================== -export type FooQuery$variables = {}; +export type FooQuery$variables = Record; export type FooQuery$data = { readonly me: { readonly firstName: string | null | undefined; diff --git a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-within-aliased-inline-fragment-on-abstract.expected b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-within-aliased-inline-fragment-on-abstract.expected index 8fa23d930c246..54a12ddf89693 100644 --- a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-within-aliased-inline-fragment-on-abstract.expected +++ b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-within-aliased-inline-fragment-on-abstract.expected @@ -7,7 +7,7 @@ query RelayReaderNamedFragmentsTest2Query { } } ==================================== OUTPUT =================================== -export type RelayReaderNamedFragmentsTest2Query$variables = {}; +export type RelayReaderNamedFragmentsTest2Query$variables = Record; export type RelayReaderNamedFragmentsTest2Query$data = { readonly node: { readonly named_fragment: { diff --git a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-within-aliased-inline-fragment.expected b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-within-aliased-inline-fragment.expected index 109c844ecae58..b41b0bfd41d23 100644 --- a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-within-aliased-inline-fragment.expected +++ b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required-within-aliased-inline-fragment.expected @@ -8,7 +8,7 @@ query RelayReaderNamedFragmentsTest2Query { } } ==================================== OUTPUT =================================== -export type RelayReaderNamedFragmentsTest2Query$variables = {}; +export type RelayReaderNamedFragmentsTest2Query$variables = Record; export type RelayReaderNamedFragmentsTest2Query$data = { readonly me: { readonly id: string; diff --git a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required.expected b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required.expected index 94de5a4a74107..37a1332b4cb72 100644 --- a/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required.expected +++ b/compiler/crates/relay-typegen/tests/generate_typescript/fixtures/required.expected @@ -6,7 +6,7 @@ query FooQuery { } } ==================================== OUTPUT =================================== -export type FooQuery$variables = {}; +export type FooQuery$variables = Record; export type FooQuery$data = { readonly me: { readonly firstName: string | null | undefined;