Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit911e083

Browse files
captbaritonefacebook-github-bot
authored andcommitted
Run requried transform on IR before validating@required on semantic non null fields in LSP
Reviewed By: gordyfDifferential Revision: D67414659fbshipit-source-id: 15eb3ea99729355cd7d00996c8e1c68ad6cc2230
1 parentf115017 commit911e083

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

‎compiler/crates/relay-codemod/src/codemod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ pub async fn run_codemod(
5757
}
5858
}
5959
AvailableCodemod::RemoveUnnecessaryRequiredDirectives =>{
60-
disallow_required_on_non_null_field(&programs.source.schema,&programs.source)
61-
.unwrap_or_default()
60+
disallow_required_on_non_null_field(&programs.source).unwrap_or_default()
6261
}
6362
})
6463
.collect::<Vec<_>>();

‎compiler/crates/relay-transforms/src/validations/disallow_required_on_non_null_field.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,14 @@ lazy_static! {
4545
// refactor the places that run this transform to pre-apply all required
4646
// transforms.
4747
pubfndisallow_required_on_non_null_field(
48-
schema:&Arc<SDLSchema>,
4948
program:&Program,
5049
) ->DiagnosticsResult<Vec<Diagnostic>>{
5150
// This validation depends on metadata directives added by the
5251
// required_directive transform. This validation is run on untransformed
5352
// versions of IR both in the LSP and as a codemod, so we apply the transform
5453
// ourselves locally.
5554
let program =required_directive(program)?;
56-
letmut validator =DisallowRequiredOnNonNullField::new(schema);
55+
letmut validator =DisallowRequiredOnNonNullField::new(&program.schema);
5756
validator.validate_program(&program)?;
5857
Ok(validator.warnings)
5958
}
@@ -62,13 +61,8 @@ pub fn disallow_required_on_non_null_field_for_executable_definition(
6261
schema:&Arc<SDLSchema>,
6362
definition:&ExecutableDefinition,
6463
) ->DiagnosticsResult<Vec<Diagnostic>>{
65-
letmut validator =DisallowRequiredOnNonNullField::new(schema);
66-
67-
match definition{
68-
ExecutableDefinition::Fragment(fragment) => validator.validate_fragment(fragment),
69-
ExecutableDefinition::Operation(operation) => validator.validate_operation(operation),
70-
}?;
71-
Ok(validator.warnings)
64+
let program =Program::from_definitions(Arc::clone(schema),vec![definition.clone()]);
65+
disallow_required_on_non_null_field(&program)
7266
}
7367

7468
structDisallowRequiredOnNonNullField<'a>{

‎compiler/crates/relay-transforms/tests/disallow_required_on_non_null_field.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pub async fn transform_fixture(fixture: &Fixture<'_>) -> Result<String, String>
2828
let ir =build(&schema,&ast.definitions)
2929
.map_err(|diagnostics|diagnostics_to_sorted_string(fixture.content,&diagnostics))?;
3030
let program =Program::from_definitions(Arc::clone(&schema), ir);
31-
let results =disallow_required_on_non_null_field(&Arc::clone(&schema),&program)
31+
let results =disallow_required_on_non_null_field(&program)
3232
.map_err(|diagnostics|diagnostics_to_sorted_string(fixture.content,&diagnostics))?;
3333

3434
Ok(format!(

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp