Skip to content

Commit efb0550

Browse files
robrichardrobrichard
committed
pass default DeferStreamInterface to tests
# Conflicts: # compiler/crates/relay-compiler/tests/compile_relay_artifacts/mod.rs # compiler/crates/relay-lsp/src/graphql_tools/mod.rs # compiler/crates/relay-typegen/tests/generate_flow/mod.rs # compiler/crates/relay-typegen/tests/generate_typescript/mod.rs
1 parent 2165915 commit efb0550

File tree

19 files changed

+136
-67
lines changed

19 files changed

+136
-67
lines changed

‎compiler/crates/relay-codegen/tests/client_edges/mod.rs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use fixture_tests::Fixture;
1010
use graphql_ir::{build, Program};
1111
use graphql_syntax::parse_executable;
1212
use relay_codegen::{print_fragment, print_operation, JsModuleFormat};
13+
use relay_config::DeferStreamInterface;
1314
use relay_test_schema::get_test_schema_with_extensions;
1415
use relay_transforms::{client_edges, relay_resolvers, sort_selections};
1516
use std::sync::Arc;
@@ -26,14 +27,14 @@ pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
2627
.and_then(|program| relay_resolvers(&program, true))
2728
.unwrap(),
2829
);
30+
let defer_stream_interface = DeferStreamInterface::default();
31+
2932
let mut result = next_program
3033
.fragments()
31-
.map(|def| print_fragment(&schema, def, JsModuleFormat::Haste))
32-
.chain(
33-
next_program
34-
.operations()
35-
.map(|def| print_operation(&schema, def, JsModuleFormat::Haste)),
36-
)
34+
.map(|def| print_fragment(&schema, def, JsModuleFormat::Haste, &defer_stream_interface))
35+
.chain(next_program.operations().map(|def| {
36+
print_operation(&schema, def, JsModuleFormat::Haste, &defer_stream_interface)
37+
}))
3738
.collect::<Vec<_>>();
3839
result.sort_unstable();
3940
Ok(result.join("\n\n"))

‎compiler/crates/relay-codegen/tests/client_extensions/mod.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ use fixture_tests::Fixture;
1010
use graphql_ir::{build, Program};
1111
use graphql_syntax::parse_executable;
1212
use relay_codegen::{print_fragment, print_operation, JsModuleFormat};
13+
use relay_config::DeferStreamInterface;
1314
use relay_test_schema::get_test_schema_with_extensions;
1415
use relay_transforms::{client_extensions, sort_selections};
1516
use std::sync::Arc;
1617

1718
pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
1819
let parts: Vec<_> = fixture.content.split("%extensions%").collect();
20+
let defer_stream_interface = DeferStreamInterface::default();
1921
if let [base, extensions] = parts.as_slice() {
2022
let ast = parse_executable(base, SourceLocationKey::standalone(fixture.file_name)).unwrap();
2123
let schema = get_test_schema_with_extensions(extensions);
@@ -24,12 +26,10 @@ pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
2426
let next_program = sort_selections(&client_extensions(&program));
2527
let mut result = next_program
2628
.fragments()
27-
.map(|def| print_fragment(&schema, def, JsModuleFormat::Haste))
28-
.chain(
29-
next_program
30-
.operations()
31-
.map(|def| print_operation(&schema, def, JsModuleFormat::Haste)),
32-
)
29+
.map(|def| print_fragment(&schema, def, JsModuleFormat::Haste, &defer_stream_interface))
30+
.chain(next_program.operations().map(|def| {
31+
print_operation(&schema, def, JsModuleFormat::Haste, &defer_stream_interface)
32+
}))
3333
.collect::<Vec<_>>();
3434
result.sort_unstable();
3535
Ok(result.join("\n\n"))

‎compiler/crates/relay-codegen/tests/connections/mod.rs‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use graphql_ir::{build, FragmentDefinition, Program};
1111
use graphql_syntax::parse_executable;
1212
use graphql_test_helpers::diagnostics_to_sorted_string;
1313
use relay_codegen::{build_request_params, JsModuleFormat, Printer};
14+
use relay_config::DeferStreamInterface;
1415
use relay_test_schema::get_test_schema;
1516
use relay_transforms::{transform_connections, validate_connections, ConnectionInterface};
1617
use std::sync::Arc;
@@ -32,7 +33,10 @@ pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
3233
validate_connections(&program, &connection_interface)
3334
.map_err(|diagnostics| diagnostics_to_sorted_string(fixture.content, &diagnostics))?;
3435

35-
let next_program = transform_connections(&program, &connection_interface);
36+
let defer_stream_interface = DeferStreamInterface::default();
37+
38+
let next_program =
39+
transform_connections(&program, &connection_interface, &defer_stream_interface);
3640

3741
let mut printed = next_program
3842
.operations()
@@ -46,11 +50,17 @@ pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
4650
type_condition: def.type_,
4751
};
4852
let request_parameters = build_request_params(def);
49-
printer.print_request(&schema, def, &operation_fragment, request_parameters)
53+
printer.print_request(
54+
&schema,
55+
def,
56+
&operation_fragment,
57+
request_parameters,
58+
&defer_stream_interface,
59+
)
5060
})
5161
.collect::<Vec<_>>();
5262
for def in next_program.fragments() {
53-
printed.push(printer.print_fragment(&schema, def));
63+
printed.push(printer.print_fragment(&schema, def, &defer_stream_interface));
5464
}
5565
printed.sort();
5666
Ok(printed.join("\n\n"))

‎compiler/crates/relay-codegen/tests/deduped_json_codegen/mod.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use fixture_tests::Fixture;
1010
use graphql_ir::build;
1111
use graphql_syntax::parse_executable;
1212
use relay_codegen::{JsModuleFormat, Printer};
13+
use relay_config::DeferStreamInterface;
1314
use relay_test_schema::TEST_SCHEMA;
1415

1516
pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
@@ -19,18 +20,19 @@ pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
1920
SourceLocationKey::standalone(fixture.file_name),
2021
)
2122
.unwrap();
23+
let defer_stream_interface = DeferStreamInterface::default();
2224
build(&TEST_SCHEMA, &ast.definitions)
2325
.map(|definitions| {
2426
definitions
2527
.iter()
2628
.map(|def| match def {
2729
graphql_ir::ExecutableDefinition::Operation(operation) => format!(
2830
"Operation:\n{}\n",
29-
printer.print_operation(&TEST_SCHEMA, operation)
31+
printer.print_operation(&TEST_SCHEMA, operation, &defer_stream_interface)
3032
),
3133
graphql_ir::ExecutableDefinition::Fragment(fragment) => format!(
3234
"Fragment:\n{}\n",
33-
printer.print_fragment(&TEST_SCHEMA, fragment)
35+
printer.print_fragment(&TEST_SCHEMA, fragment, &defer_stream_interface)
3436
),
3537
})
3638
.collect::<Vec<_>>()

‎compiler/crates/relay-codegen/tests/defer_stream/mod.rs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use fixture_tests::Fixture;
1010
use graphql_ir::{build, Program};
1111
use graphql_syntax::parse_executable;
1212
use relay_codegen::{print_fragment, print_operation, JsModuleFormat};
13+
use relay_config::DeferStreamInterface;
1314
use relay_test_schema::get_test_schema;
1415
use relay_transforms::{sort_selections, transform_defer_stream};
1516
use std::sync::Arc;
@@ -23,15 +24,15 @@ pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
2324
let schema = get_test_schema();
2425
let ir = build(&schema, &ast.definitions).unwrap();
2526
let program = Program::from_definitions(Arc::clone(&schema), ir);
26-
let next_program = sort_selections(&transform_defer_stream(&program).unwrap());
27+
let defer_stream_interface = DeferStreamInterface::default();
28+
let next_program =
29+
sort_selections(&transform_defer_stream(&program, &defer_stream_interface).unwrap());
2730
let mut result = next_program
2831
.fragments()
29-
.map(|def| print_fragment(&schema, def, JsModuleFormat::Haste))
30-
.chain(
31-
next_program
32-
.operations()
33-
.map(|def| print_operation(&schema, def, JsModuleFormat::Haste)),
34-
)
32+
.map(|def| print_fragment(&schema, def, JsModuleFormat::Haste, &defer_stream_interface))
33+
.chain(next_program.operations().map(|def| {
34+
print_operation(&schema, def, JsModuleFormat::Haste, &defer_stream_interface)
35+
}))
3536
.collect::<Vec<_>>();
3637
result.sort_unstable();
3738
Ok(result.join("\n\n"))

‎compiler/crates/relay-codegen/tests/json_codegen/mod.rs‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use fixture_tests::Fixture;
1010
use graphql_ir::{build, ExecutableDefinition};
1111
use graphql_syntax::parse_executable;
1212
use relay_codegen::{print_fragment, print_operation, JsModuleFormat};
13+
use relay_config::DeferStreamInterface;
1314
use relay_test_schema::TEST_SCHEMA;
1415

1516
pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
@@ -18,17 +19,24 @@ pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
1819
SourceLocationKey::standalone(fixture.file_name),
1920
)
2021
.unwrap();
22+
let defer_stream_interface = DeferStreamInterface::default();
2123
build(&TEST_SCHEMA, &ast.definitions)
2224
.map(|definitions| {
2325
definitions
2426
.iter()
2527
.map(|def| match def {
26-
ExecutableDefinition::Operation(operation) => {
27-
print_operation(&TEST_SCHEMA, operation, JsModuleFormat::Haste)
28-
}
29-
ExecutableDefinition::Fragment(fragment) => {
30-
print_fragment(&TEST_SCHEMA, fragment, JsModuleFormat::Haste)
31-
}
28+
ExecutableDefinition::Operation(operation) => print_operation(
29+
&TEST_SCHEMA,
30+
operation,
31+
JsModuleFormat::Haste,
32+
&defer_stream_interface,
33+
),
34+
ExecutableDefinition::Fragment(fragment) => print_fragment(
35+
&TEST_SCHEMA,
36+
fragment,
37+
JsModuleFormat::Haste,
38+
&defer_stream_interface,
39+
),
3240
})
3341
.collect::<Vec<_>>()
3442
.join("\n\n")

‎compiler/crates/relay-codegen/tests/react_flight_codegen/mod.rs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use graphql_ir::{build, Program};
1111
use graphql_syntax::parse_executable;
1212
use graphql_test_helpers::diagnostics_to_sorted_string;
1313
use relay_codegen::{print_fragment, print_operation, JsModuleFormat};
14+
use relay_config::DeferStreamInterface;
1415
use relay_test_schema::{get_test_schema, get_test_schema_with_extensions};
1516
use relay_transforms::react_flight;
1617
use std::sync::Arc;
@@ -27,17 +28,18 @@ pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
2728
let ir = build(&schema, &ast.definitions)
2829
.map_err(|diagnostics| diagnostics_to_sorted_string(fixture.content, &diagnostics))?;
2930
let program = Program::from_definitions(Arc::clone(&schema), ir);
31+
let defer_stream_interface = DeferStreamInterface::default();
3032

3133
react_flight(&program)
3234
.map(|next_program| {
3335
next_program
3436
.fragments()
35-
.map(|def| print_fragment(&schema, def, JsModuleFormat::Haste))
36-
.chain(
37-
next_program
38-
.operations()
39-
.map(|def| print_operation(&schema, def, JsModuleFormat::Haste)),
40-
)
37+
.map(|def| {
38+
print_fragment(&schema, def, JsModuleFormat::Haste, &defer_stream_interface)
39+
})
40+
.chain(next_program.operations().map(|def| {
41+
print_operation(&schema, def, JsModuleFormat::Haste, &defer_stream_interface)
42+
}))
4143
.collect::<Vec<_>>()
4244
.join("\n\n")
4345
})

‎compiler/crates/relay-codegen/tests/relay_actor_change/mod.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ use graphql_test_helpers::diagnostics_to_sorted_string;
1212

1313
use graphql_syntax::parse_executable;
1414
use relay_codegen::{print_fragment, print_operation, JsModuleFormat};
15+
use relay_config::DeferStreamInterface;
1516
use relay_test_schema::get_test_schema;
1617
use relay_transforms::relay_actor_change_transform;
1718
use std::sync::Arc;
@@ -27,14 +28,13 @@ pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
2728
let program = Program::from_definitions(Arc::clone(&schema), ir);
2829
let next_program = relay_actor_change_transform(&program, &FeatureFlag::Enabled)
2930
.map_err(|diagnostics| diagnostics_to_sorted_string(fixture.content, &diagnostics))?;
31+
let defer_stream_interface = DeferStreamInterface::default();
3032
let mut result = next_program
3133
.fragments()
32-
.map(|def| print_fragment(&schema, def, JsModuleFormat::Haste))
33-
.chain(
34-
next_program
35-
.operations()
36-
.map(|def| print_operation(&schema, def, JsModuleFormat::Haste)),
37-
)
34+
.map(|def| print_fragment(&schema, def, JsModuleFormat::Haste, &defer_stream_interface))
35+
.chain(next_program.operations().map(|def| {
36+
print_operation(&schema, def, JsModuleFormat::Haste, &defer_stream_interface)
37+
}))
3838
.collect::<Vec<_>>();
3939
result.sort_unstable();
4040
Ok(result.join("\n\n"))

‎compiler/crates/relay-codegen/tests/request_metadata/mod.rs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use graphql_ir::{
1414
use graphql_syntax::parse_executable;
1515
use intern::string_key::Intern;
1616
use relay_codegen::{build_request_params, print_fragment, print_request, JsModuleFormat};
17+
use relay_config::DeferStreamInterface;
1718
use relay_test_schema::TEST_SCHEMA;
1819

1920
pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
@@ -23,6 +24,7 @@ pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
2324
)
2425
.unwrap();
2526
let program = build(&TEST_SCHEMA, &ast.definitions);
27+
let defer_stream_interface = DeferStreamInterface::default();
2628
program
2729
.map(|definitions| {
2830
definitions
@@ -67,11 +69,15 @@ pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
6769
&operation_fragment,
6870
request_parameters,
6971
JsModuleFormat::Haste,
72+
&defer_stream_interface,
7073
)
7174
}
72-
ExecutableDefinition::Fragment(fragment) => {
73-
print_fragment(&TEST_SCHEMA, fragment, JsModuleFormat::Haste)
74-
}
75+
ExecutableDefinition::Fragment(fragment) => print_fragment(
76+
&TEST_SCHEMA,
77+
fragment,
78+
JsModuleFormat::Haste,
79+
&defer_stream_interface,
80+
),
7581
})
7682
.collect::<Vec<_>>()
7783
.join("\n\n")

‎compiler/crates/relay-codegen/tests/required_directive_codegen/mod.rs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use graphql_ir::{build, Program};
1111
use graphql_syntax::parse_executable;
1212
use graphql_test_helpers::diagnostics_to_sorted_string;
1313
use relay_codegen::{print_fragment, print_operation, JsModuleFormat};
14+
use relay_config::DeferStreamInterface;
1415
use relay_test_schema::{get_test_schema, get_test_schema_with_extensions};
1516
use relay_transforms::required_directive;
1617
use std::sync::Arc;
@@ -27,17 +28,17 @@ pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
2728
let ir = build(&schema, &ast.definitions)
2829
.map_err(|diagnostics| diagnostics_to_sorted_string(fixture.content, &diagnostics))?;
2930
let program = Program::from_definitions(Arc::clone(&schema), ir);
30-
31+
let defer_stream_interface = DeferStreamInterface::default();
3132
required_directive(&program)
3233
.map(|next_program| {
3334
next_program
3435
.fragments()
35-
.map(|def| print_fragment(&schema, def, JsModuleFormat::Haste))
36-
.chain(
37-
next_program
38-
.operations()
39-
.map(|def| print_operation(&schema, def, JsModuleFormat::Haste)),
40-
)
36+
.map(|def| {
37+
print_fragment(&schema, def, JsModuleFormat::Haste, &defer_stream_interface)
38+
})
39+
.chain(next_program.operations().map(|def| {
40+
print_operation(&schema, def, JsModuleFormat::Haste, &defer_stream_interface)
41+
}))
4142
.collect::<Vec<_>>()
4243
.join("\n\n")
4344
})

0 commit comments

Comments
 (0)