Skip to content

Commit dd0091a

Browse files
alunyovalunyov
committed
fix tests
1 parent 23694f8 commit dd0091a

18 files changed

+55
-56
lines changed

‎compiler/crates/relay-codegen/src/printer.rs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,15 @@ pub fn print_request(
7575
request_parameters: RequestParameters<'_>,
7676
project_config: &ProjectConfig,
7777
top_level_statements: &mut TopLevelStatements,
78-
maybe_provided_variables: Option<AstKey>,
7978
) -> String {
79+
let mut builder: AstBuilder = AstBuilder::default();
80+
let maybe_provided_variables = build_provided_variables(
81+
schema,
82+
&mut builder,
83+
operation,
84+
operation.name.map(|x| x.0),
85+
project_config,
86+
);
8087
Printer::without_dedupe(project_config).print_request(
8188
schema,
8289
operation,
@@ -96,7 +103,7 @@ pub fn print_request_params(
96103
) -> String {
97104
let mut request_parameters = build_request_params(operation);
98105
request_parameters.id = query_id;
99-
let mut builder = AstBuilder::default();
106+
let mut builder: AstBuilder = AstBuilder::default();
100107
let maybe_provided_variables = build_provided_variables(
101108
schema,
102109
&mut builder,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
6666
&operation_fragment,
6767
request_parameters,
6868
&mut import_statements,
69+
None,
6970
);
7071
format!("{}{}", import_statements, request)
7172
})

‎compiler/crates/relay-compiler-playground/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ use graphql_text_printer::PrinterOptions;
1818
use intern::string_key::Intern;
1919
use relay_codegen::print_fragment;
2020
use relay_codegen::print_operation;
21+
use relay_codegen::print_provided_variables;
2122
use relay_config::ProjectConfig;
2223
use relay_schema::build_schema_with_extensions;
2324
use relay_transforms::apply_transforms;
@@ -254,6 +255,7 @@ pub fn parse_to_types_impl(
254255
&schema,
255256
&project_config,
256257
&fragment_locations,
258+
print_provided_variables(&schema, normalization_operation, &project_config),
257259
)
258260
}))
259261
.collect::<Vec<_>>()

‎compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/provided-variable-directive.expected

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,7 @@ fragment providedVariableDirective_DeferredFragment on Image {
115115
"name": "providedVariableDirectiveQuery",
116116
"operationKind": "query",
117117
"text": null,
118-
"providedVariables": {
119-
"__relay_internal__pv__jsProvider": require('jsProvider')
120-
}
118+
"providedVariables": {}
121119
}
122120
}
123121

‎compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/provided-variable-in-fragment.expected

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,7 @@ fragment providedVariableInFragment_Fragment2 on User
181181
"name": "providedVariableInFragment_Query",
182182
"operationKind": "query",
183183
"text": null,
184-
"providedVariables": {
185-
"__relay_internal__pv__fooGKProvider": require('fooGKProvider'),
186-
"__relay_internal__pv__foobarGKProvider": require('foobarGKProvider'),
187-
"__relay_internal__pv__barGKProvider": require('barGKProvider')
188-
}
184+
"providedVariables": {}
189185
}
190186
}
191187

‎compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/provided-variable-multiple-queries.expected

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,7 @@ fragment providedVariableMultipleQueries_MultiProvidedVar on User
217217
"name": "providedVariableMultipleQueries_MultiFragmentQuery",
218218
"operationKind": "query",
219219
"text": null,
220-
"providedVariables": {
221-
"__relay_internal__pv__includeNameProvider": require('includeNameProvider'),
222-
"__relay_internal__pv__numberOfFriendsProvider": require('numberOfFriendsProvider')
223-
}
220+
"providedVariables": {}
224221
}
225222
}
226223

@@ -361,9 +358,7 @@ fragment providedVariableMultipleQueries_OneProvidedVar on User {
361358
"name": "providedVariableMultipleQueries_OneFragmentQuery",
362359
"operationKind": "query",
363360
"text": null,
364-
"providedVariables": {
365-
"__relay_internal__pv__includeNameProvider": require('includeNameProvider')
366-
}
361+
"providedVariables": {}
367362
}
368363
}
369364

‎compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/provided-variable-nested-split-operation.expected

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,7 @@ fragment providedVariableNestedSplitOperation_Plain2 on PlainUserNameRenderer
466466
"name": "providedVariableNestedSplitOperation_Query",
467467
"operationKind": "query",
468468
"text": null,
469-
"providedVariables": {
470-
"__relay_internal__pv__shouldIncludeMarkdown_RelayProvider": require('shouldIncludeMarkdown_RelayProvider'),
471-
"__relay_internal__pv__shouldIncludeData_RelayProvider": require('shouldIncludeData_RelayProvider')
472-
}
469+
"providedVariables": {}
473470
}
474471
}
475472

‎compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/provided-variable-no-inline-fragment.expected

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,7 @@ fragment providedVariableNoInlineFragment on User
118118
"name": "providedVariableNoInlineFragment_Query",
119119
"operationKind": "query",
120120
"text": null,
121-
"providedVariables": {
122-
"__relay_internal__pv__jsScaleProvider": require('jsScaleProvider')
123-
}
121+
"providedVariables": {}
124122
}
125123
}
126124

‎compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/provided-variable-refetchable-fragment.expected

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,7 @@ fragment providedVariableRefetchableFragment_providedVariableFragment on User
129129
"name": "providedVariableRefetchableFragmentQuery",
130130
"operationKind": "query",
131131
"text": null,
132-
"providedVariables": {
133-
"__relay_internal__pv__includeName_RelayProvider": require('includeName_RelayProvider')
134-
}
132+
"providedVariables": {}
135133
}
136134
}
137135

@@ -280,9 +278,7 @@ fragment providedVariableRefetchableFragment_providedVariableFragment on User {
280278
"name": "refetchableQuery",
281279
"operationKind": "query",
282280
"text": null,
283-
"providedVariables": {
284-
"__relay_internal__pv__includeName_RelayProvider": require('includeName_RelayProvider')
285-
}
281+
"providedVariables": {}
286282
}
287283
}
288284

‎compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/provided-variable-reused-nested-fragment.expected

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,7 @@ fragment providedVariableReusedNestedFragment_FragmentWithProvider on User
152152
"name": "providedVariableReusedNestedFragment_1Query",
153153
"operationKind": "query",
154154
"text": null,
155-
"providedVariables": {
156-
"__relay_internal__pv__barGKProvider": require('barGKProvider')
157-
}
155+
"providedVariables": {}
158156
}
159157
}
160158

@@ -305,9 +303,7 @@ fragment providedVariableReusedNestedFragment_FragmentWithProvider on User {
305303
"name": "providedVariableReusedNestedFragment_2Query",
306304
"operationKind": "query",
307305
"text": null,
308-
"providedVariables": {
309-
"__relay_internal__pv__barGKProvider": require('barGKProvider')
310-
}
306+
"providedVariables": {}
311307
}
312308
}
313309

‎compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/provided-variable-reused-nested-linked-fragment.expected

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,7 @@ fragment providedVariableReusedNestedLinkedFragment_FragmentWithProvider on User
125125
"name": "providedVariableReusedNestedLinkedFragment_1Query",
126126
"operationKind": "query",
127127
"text": null,
128-
"providedVariables": {
129-
"__relay_internal__pv__barGKProvider": require('barGKProvider')
130-
}
128+
"providedVariables": {}
131129
}
132130
}
133131

@@ -253,9 +251,7 @@ fragment providedVariableReusedNestedLinkedFragment_FragmentWithProvider on User
253251
"name": "providedVariableReusedNestedLinkedFragment_2Query",
254252
"operationKind": "query",
255253
"text": null,
256-
"providedVariables": {
257-
"__relay_internal__pv__barGKProvider": require('barGKProvider')
258-
}
254+
"providedVariables": {}
259255
}
260256
}
261257

‎compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/provided-variable-split-operation.expected

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,7 @@ fragment providedVariableSplitOperation_PlainUserNameRenderer_name on PlainUserN
277277
"name": "providedVariableSplitOperation_Query",
278278
"operationKind": "query",
279279
"text": null,
280-
"providedVariables": {
281-
"__relay_internal__pv__shouldIncludeData_RelayProvider": require('shouldIncludeData_RelayProvider')
282-
}
280+
"providedVariables": {}
283281
}
284282
}
285283

‎compiler/crates/relay-typegen/tests/generate_flow/fixtures/query-mixed-provided-variables.expected

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,11 @@ export type queryMixedProvidedVar_MultiFragment = {|
6363
response: queryMixedProvidedVar_MultiFragment$data,
6464
variables: queryMixedProvidedVar_MultiFragment$variables,
6565
|};
66-
type ProvidedVariablesType = {|
66+
({
67+
"__relay_internal__pv__includeNameProvider": require('includeNameProvider'),
68+
"__relay_internal__pv__numberOfFriendsProvider": require('numberOfFriendsProvider'),
69+
"__relay_internal__pv__skipFirstnameProvider": require('skipFirstnameProvider')
70+
}: {|
6771
+__relay_internal__pv__includeNameProvider: {|
6872
+get: () => CustomBoolean,
6973
|},
@@ -73,7 +77,7 @@ type ProvidedVariablesType = {|
7377
+__relay_internal__pv__skipFirstnameProvider: {|
7478
+get: () => CustomBoolean,
7579
|},
76-
|};
80+
|});
7781
-------------------------------------------------------------------------------
7882
import type { FragmentOneProvidedVar$fragmentType } from "FragmentOneProvidedVar.graphql";
7983
export type queryMixedProvidedVar_OneFragment$variables = {|
@@ -88,11 +92,13 @@ export type queryMixedProvidedVar_OneFragment = {|
8892
response: queryMixedProvidedVar_OneFragment$data,
8993
variables: queryMixedProvidedVar_OneFragment$variables,
9094
|};
91-
type ProvidedVariablesType = {|
95+
({
96+
"__relay_internal__pv__includeNameProvider": require('includeNameProvider')
97+
}: {|
9298
+__relay_internal__pv__includeNameProvider: {|
9399
+get: () => CustomBoolean,
94100
|},
95-
|};
101+
|});
96102
-------------------------------------------------------------------------------
97103
import type { FragmentType } from "relay-runtime";
98104
declare export opaque type FragmentMultiProvidedVar$fragmentType: FragmentType;

‎compiler/crates/relay-typegen/tests/generate_flow/fixtures/query-only-provided-variables.expected

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,17 @@ export type queryOnlyProvidedVar_MultiFragment = {|
4646
response: queryOnlyProvidedVar_MultiFragment$data,
4747
variables: queryOnlyProvidedVar_MultiFragment$variables,
4848
|};
49-
type ProvidedVariablesType = {|
49+
({
50+
"__relay_internal__pv__includeNameProvider": require('includeNameProvider'),
51+
"__relay_internal__pv__numberOfFriendsProvider": require('numberOfFriendsProvider')
52+
}: {|
5053
+__relay_internal__pv__includeNameProvider: {|
5154
+get: () => CustomBoolean,
5255
|},
5356
+__relay_internal__pv__numberOfFriendsProvider: {|
5457
+get: () => number,
5558
|},
56-
|};
59+
|});
5760
-------------------------------------------------------------------------------
5861
import type { FragmentOneProvidedVar$fragmentType } from "FragmentOneProvidedVar.graphql";
5962
export type queryOnlyProvidedVar_OneFragment$variables = {||};
@@ -66,11 +69,13 @@ export type queryOnlyProvidedVar_OneFragment = {|
6669
response: queryOnlyProvidedVar_OneFragment$data,
6770
variables: queryOnlyProvidedVar_OneFragment$variables,
6871
|};
69-
type ProvidedVariablesType = {|
72+
({
73+
"__relay_internal__pv__includeNameProvider": require('includeNameProvider')
74+
}: {|
7075
+__relay_internal__pv__includeNameProvider: {|
7176
+get: () => CustomBoolean,
7277
|},
73-
|};
78+
|});
7479
-------------------------------------------------------------------------------
7580
import type { FragmentType } from "relay-runtime";
7681
declare export opaque type FragmentMultiProvidedVar$fragmentType: FragmentType;

‎compiler/crates/relay-typegen/tests/generate_flow/fixtures/query-provided-variables-custom-scalar.expected

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@ export type testQuery = {|
2626
response: testQuery$data,
2727
variables: testQuery$variables,
2828
|};
29-
type ProvidedVariablesType = {|
29+
({
30+
"__relay_internal__pv__includeNameProvider": require('includeNameProvider')
31+
}: {|
3032
+__relay_internal__pv__includeNameProvider: {|
3133
+get: () => ?JSON,
3234
|},
33-
|};
35+
|});
3436
-------------------------------------------------------------------------------
3537
import type { FragmentType } from "relay-runtime";
3638
declare export opaque type FragmentWithJSONProvidedVar$fragmentType: FragmentType;

‎compiler/crates/relay-typegen/tests/generate_flow/mod.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ use graphql_syntax::parse_executable;
2222
use graphql_test_helpers::diagnostics_to_sorted_string;
2323
use indexmap::IndexMap;
2424
use intern::string_key::Intern;
25+
use relay_codegen::print_provided_variables;
2526
use relay_codegen::JsModuleFormat;
2627
use relay_config::CustomScalarType;
2728
use relay_config::CustomScalarTypeImport;
@@ -112,7 +113,7 @@ pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
112113
let operation_strings = operations.into_iter().map(|typegen_operation| {
113114
// `normalization` ASTs are present unless we are processing an updatable query
114115
// In that case, `reader` ASTs are present.
115-
let op = programs
116+
let op: &Arc<graphql_ir::OperationDefinition> = programs
116117
.normalization
117118
.operation(OperationDefinitionName(typegen_operation.name.item.0))
118119
.unwrap_or_else(|| {
@@ -133,6 +134,7 @@ pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
133134
&schema,
134135
&project_config,
135136
&fragment_locations,
137+
print_provided_variables(&schema, op, &project_config),
136138
)
137139
});
138140

‎compiler/crates/relay-typegen/tests/generate_flow_with_custom_id/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ use graphql_ir::Program;
2121
use graphql_syntax::parse_executable;
2222
use indexmap::IndexMap;
2323
use intern::string_key::Intern;
24+
use relay_codegen::print_provided_variables;
2425
use relay_codegen::JsModuleFormat;
2526
use relay_config::ProjectConfig;
2627
use relay_config::ProjectName;
@@ -109,6 +110,7 @@ pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
109110
&schema,
110111
&project_config,
111112
&fragment_locations,
113+
print_provided_variables(&schema, normalization_operation, &project_config),
112114
)
113115
});
114116

‎compiler/crates/relay-typegen/tests/generate_typescript/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ use graphql_ir::Program;
2020
use graphql_syntax::parse_executable;
2121
use indexmap::IndexMap;
2222
use intern::string_key::Intern;
23+
use relay_codegen::print_provided_variables;
2324
use relay_codegen::JsModuleFormat;
2425
use relay_config::CustomScalarType;
2526
use relay_config::CustomScalarTypeImport;
@@ -103,6 +104,7 @@ pub fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String> {
103104
&schema,
104105
&project_config,
105106
&fragment_locations,
107+
print_provided_variables(&schema, normalization_operation, &project_config),
106108
)
107109
});
108110

0 commit comments

Comments
 (0)