From af35418528761f3fde37a48d47eb5fa4bee2d9f9 Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Tue, 15 Oct 2024 12:25:13 -0700 Subject: [PATCH] Ignore @dangerously_unaliased_fixme when comparing structs Reviewed By: gordyf Differential Revision: D64410096 fbshipit-source-id: 08a5c9934477e145742086af00694f201b4b6191 --- ...ly_unaliased_changes_output_after.expected | 30 ++----------------- compiler/crates/relay-transforms/src/util.rs | 4 ++- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/compiler/crates/relay-compiler/tests/relay_compiler_integration/fixtures/repro_dangerously_unaliased_changes_output_after.expected b/compiler/crates/relay-compiler/tests/relay_compiler_integration/fixtures/repro_dangerously_unaliased_changes_output_after.expected index b322817fcfe2c..bd0ff27eb39c1 100644 --- a/compiler/crates/relay-compiler/tests/relay_compiler_integration/fixtures/repro_dangerously_unaliased_changes_output_after.expected +++ b/compiler/crates/relay-compiler/tests/relay_compiler_integration/fixtures/repro_dangerously_unaliased_changes_output_after.expected @@ -58,7 +58,7 @@ type UserSearchResult implements Node { ==================================== OUTPUT =================================== //- __generated__/ModuleNameQuery.graphql.ts /** - * SignedSource<<4f0ee5ff806a9f25428b594d432a805a>> + * SignedSource<> * @lightSyntaxTransform * @nogrep */ @@ -171,33 +171,9 @@ const node: ConcreteRequest = { "kind": "ScalarField", "name": "alias", "storageKey": null - } - ], - "type": "User", - "abstractKey": null - }, - { - "kind": "InlineFragment", - "selections": [ + }, { - "kind": "InlineFragment", - "selections": [ - { - "kind": "InlineFragment", - "selections": [ - { - "alias": null, - "args": null, - "kind": "ScalarField", - "name": "alias", - "storageKey": null - } - ], - "type": "UserSearchResult", - "abstractKey": null - } - ], - "type": "Node", + "kind": "TypeDiscriminator", "abstractKey": "__isNode" } ], diff --git a/compiler/crates/relay-transforms/src/util.rs b/compiler/crates/relay-transforms/src/util.rs index 16db0ceccdae0..2b6704c80961e 100644 --- a/compiler/crates/relay-transforms/src/util.rs +++ b/compiler/crates/relay-transforms/src/util.rs @@ -26,6 +26,7 @@ use schema::Type; use crate::catch_directive::CATCH_DIRECTIVE_NAME; use crate::client_extensions::CLIENT_EXTENSION_DIRECTIVE_NAME; use crate::connections::ConnectionMetadataDirective; +use crate::fragment_alias_directive::FRAGMENT_DANGEROUSLY_UNALIAS_DIRECTIVE_NAME; use crate::handle_fields::HANDLE_FIELD_DIRECTIVE_NAME; use crate::inline_data_fragment::InlineDirectiveMetadata; use crate::refetchable_fragment::RefetchableMetadata; @@ -107,7 +108,7 @@ lazy_static! { ProvidedVariableMetadata::directive_name(), FragmentAliasMetadata::directive_name(), ]; - static ref DIRECTIVES_SKIPPED_IN_NODE_IDENTIFIER: [DirectiveName; 9] = [ + static ref DIRECTIVES_SKIPPED_IN_NODE_IDENTIFIER: [DirectiveName; 10] = [ *CATCH_DIRECTIVE_NAME, *CLIENT_EXTENSION_DIRECTIVE_NAME, ConnectionMetadataDirective::directive_name(), @@ -117,6 +118,7 @@ lazy_static! { *INTERNAL_METADATA_DIRECTIVE, *ARGUMENT_DEFINITION, *REQUIRED_DIRECTIVE_NAME, + *FRAGMENT_DANGEROUSLY_UNALIAS_DIRECTIVE_NAME ]; static ref RELAY_CUSTOM_INLINE_FRAGMENT_DIRECTIVES: [DirectiveName; 8] = [ *CLIENT_EXTENSION_DIRECTIVE_NAME,