From 28672b8179ad8099d87642dc56625482ac163491 Mon Sep 17 00:00:00 2001 From: Andrey Lunyov Date: Tue, 29 Aug 2023 17:05:11 -0400 Subject: [PATCH 1/2] Update tests --- .../src/file_source/file_categorizer.rs | 2 +- .../fixtures/relay-model-resolver.expected | 16 ++-- .../fixtures/relay-model-resolver.graphql | 4 +- .../relay-resolver-live-weak-object.expected | 6 +- ...relay-resolver-weak-object-plural.expected | 6 +- .../relay-resolver-weak-object.expected | 6 +- ...er-with-output-type-client-object.expected | 4 +- ...-with-root-fragment-on-model-type.expected | 10 +- ...r-with-root-fragment-on-model-type.graphql | 2 +- compiler/crates/relay-config/src/lib.rs | 3 +- .../crates/relay-config/src/project_config.rs | 28 +----- .../crates/relay-config/src/project_name.rs | 95 +++++++++++++++++++ .../crates/relay-docblock/src/docblock_ir.rs | 11 +-- compiler/crates/relay-docblock/src/ir.rs | 13 ++- ...ver-strong-object-with-implements.expected | 2 +- .../relay-resolver-strong-object.expected | 2 +- ...olver-with-root-fragment-on-model.expected | 2 +- ...ver-strong-object-with-implements.expected | 2 +- ...g-object-with-multiple-implements.expected | 2 +- .../relay-resolver-strong-object.expected | 2 +- ...olver-with-root-fragment-on-model.expected | 2 +- ...enerate_relay_resolvers_model_fragments.rs | 22 +++-- ...resolvers_operations_for_nested_objects.rs | 14 +-- .../fixtures/output-type.expected | 2 +- .../fixtures/output-type-client-type.expected | 2 +- ...output-type-with-client-interface.expected | 2 +- ...e-recursion-but-lying-client-type.expected | 2 +- ...t-type-with-relay-resolver-fields.expected | 2 +- ...with-output-type-client-interface.expected | 24 ++--- ...-output-type-client-object-plural.expected | 14 +-- ...er-with-output-type-client-object.expected | 14 +-- ...with-output-type-client-interface.expected | 20 ++-- ...er-with-output-type-client-object.expected | 10 +- .../src/__generated__/AppQuery.graphql.js | 27 +----- .../__generated__/Component_node.graphql.js | 27 +----- 35 files changed, 213 insertions(+), 189 deletions(-) create mode 100644 compiler/crates/relay-config/src/project_name.rs diff --git a/compiler/crates/relay-compiler/src/file_source/file_categorizer.rs b/compiler/crates/relay-compiler/src/file_source/file_categorizer.rs index 2d8cb4d2d6f48..ee7fffa2a5c54 100644 --- a/compiler/crates/relay-compiler/src/file_source/file_categorizer.rs +++ b/compiler/crates/relay-compiler/src/file_source/file_categorizer.rs @@ -540,7 +540,7 @@ mod tests { assert_eq!( categorizer.categorize(&PathBuf::from("src/custom_overlapping/__generated__/c.js")), Err(Cow::Borrowed( - "Overlapping input sources are incompatible with relative generated directories. Got file in a relative generated directory with source set ProjectSet([ProjectName(\"with_custom_generated_dir\"), ProjectName(\"overlapping_generated_dir\")])." + "Overlapping input sources are incompatible with relative generated directories. Got file in a relative generated directory with source set ProjectSet([Named(\"with_custom_generated_dir\"), Named(\"overlapping_generated_dir\")])." )), ); } diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-model-resolver.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-model-resolver.expected index 1b8a334541709..df0fd0740ae27 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-model-resolver.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-model-resolver.expected @@ -11,7 +11,7 @@ type ClientUser @__RelayResolverModel { id: ID! __relay_model_instance: RelayResolverValue @relay_resolver( - fragment_name: "default_ClientUser__id" + fragment_name: "ClientUser__id" import_path: "./path/to/UserModelResolver.js" inject_fragment_data: "id" ) @@ -20,7 +20,7 @@ type ClientUser @__RelayResolverModel { extend type ClientUser { name: RelayResolverValue @relay_resolver( - fragment_name: "default_ClientUser____relay_model_instance" + fragment_name: "ClientUser____relay_model_instance" import_path: "./path/to/UserNameResolver.js" inject_fragment_data: "__relay_model_instance" ) @@ -54,11 +54,11 @@ extend type Query { "fragment": { "args": null, "kind": "FragmentSpread", - "name": "default_ClientUser____relay_model_instance" + "name": "ClientUser____relay_model_instance" }, "kind": "RelayResolver", "name": "name", - "resolverModule": require('relay-runtime/experimental').resolverDataInjector(require('default_ClientUser____relay_model_instance.graphql'), require('UserNameResolver'), '__relay_model_instance', false), + "resolverModule": require('relay-runtime/experimental').resolverDataInjector(require('ClientUser____relay_model_instance.graphql'), require('UserNameResolver'), '__relay_model_instance', false), "path": "client_user.name" } ], @@ -154,7 +154,7 @@ Query Text is Empty. "argumentDefinitions": [], "kind": "Fragment", "metadata": null, - "name": "default_ClientUser____relay_model_instance", + "name": "ClientUser____relay_model_instance", "selections": [ { "alias": null, @@ -162,11 +162,11 @@ Query Text is Empty. "fragment": { "args": null, "kind": "FragmentSpread", - "name": "default_ClientUser__id" + "name": "ClientUser__id" }, "kind": "RelayResolver", "name": "__relay_model_instance", - "resolverModule": require('relay-runtime/experimental').resolverDataInjector(require('default_ClientUser__id.graphql'), require('UserModelResolver'), 'id', true), + "resolverModule": require('relay-runtime/experimental').resolverDataInjector(require('ClientUser__id.graphql'), require('UserModelResolver'), 'id', true), "path": "__relay_model_instance" } ], @@ -178,7 +178,7 @@ Query Text is Empty. "argumentDefinitions": [], "kind": "Fragment", "metadata": null, - "name": "default_ClientUser__id", + "name": "ClientUser__id", "selections": [ { "kind": "ClientExtension", diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-model-resolver.graphql b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-model-resolver.graphql index 6cf7b76fcccc4..f09394173dc28 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-model-resolver.graphql +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-model-resolver.graphql @@ -10,7 +10,7 @@ type ClientUser @__RelayResolverModel { id: ID! __relay_model_instance: RelayResolverValue @relay_resolver( - fragment_name: "default_ClientUser__id" + fragment_name: "ClientUser__id" import_path: "./path/to/UserModelResolver.js" inject_fragment_data: "id" ) @@ -19,7 +19,7 @@ type ClientUser @__RelayResolverModel { extend type ClientUser { name: RelayResolverValue @relay_resolver( - fragment_name: "default_ClientUser____relay_model_instance" + fragment_name: "ClientUser____relay_model_instance" import_path: "./path/to/UserNameResolver.js" inject_fragment_data: "__relay_model_instance" ) diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-resolver-live-weak-object.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-resolver-live-weak-object.expected index 307b74eae5f76..393146f2fa571 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-resolver-live-weak-object.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-resolver-live-weak-object.expected @@ -24,7 +24,7 @@ extend type Query { { "kind": "SplitOperation", "metadata": {}, - "name": "default_Query__client_types$normalization", + "name": "Query__client_types$normalization", "selections": [ { "kind": "ClientExtension", @@ -64,7 +64,7 @@ extend type Query { "normalizationInfo": { "concreteType": "MyClientType", "plural": false, - "normalizationNode": require('default_Query__client_types$normalization.graphql') + "normalizationNode": require('Query__client_types$normalization.graphql') } }, "linkedField": { @@ -145,7 +145,7 @@ Query Text is Empty. "argumentDefinitions": [], "kind": "Fragment", "metadata": null, - "name": "default_MyClientType____relay_model_instance", + "name": "MyClientType____relay_model_instance", "selections": [ { "kind": "ClientExtension", diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-resolver-weak-object-plural.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-resolver-weak-object-plural.expected index 62a7f69664bd8..3f1bd3caf3563 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-resolver-weak-object-plural.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-resolver-weak-object-plural.expected @@ -23,7 +23,7 @@ extend type Query { { "kind": "SplitOperation", "metadata": {}, - "name": "default_Query__client_types$normalization", + "name": "Query__client_types$normalization", "selections": [ { "kind": "ClientExtension", @@ -63,7 +63,7 @@ extend type Query { "normalizationInfo": { "concreteType": "MyClientType", "plural": true, - "normalizationNode": require('default_Query__client_types$normalization.graphql') + "normalizationNode": require('Query__client_types$normalization.graphql') } }, "linkedField": { @@ -144,7 +144,7 @@ Query Text is Empty. "argumentDefinitions": [], "kind": "Fragment", "metadata": null, - "name": "default_MyClientType____relay_model_instance", + "name": "MyClientType____relay_model_instance", "selections": [ { "kind": "ClientExtension", diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-resolver-weak-object.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-resolver-weak-object.expected index c0394dd987198..b98eaadfd8cca 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-resolver-weak-object.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-resolver-weak-object.expected @@ -23,7 +23,7 @@ extend type Query { { "kind": "SplitOperation", "metadata": {}, - "name": "default_Query__client_type$normalization", + "name": "Query__client_type$normalization", "selections": [ { "kind": "ClientExtension", @@ -63,7 +63,7 @@ extend type Query { "normalizationInfo": { "concreteType": "MyClientType", "plural": false, - "normalizationNode": require('default_Query__client_type$normalization.graphql') + "normalizationNode": require('Query__client_type$normalization.graphql') } }, "linkedField": { @@ -144,7 +144,7 @@ Query Text is Empty. "argumentDefinitions": [], "kind": "Fragment", "metadata": null, - "name": "default_MyClientType____relay_model_instance", + "name": "MyClientType____relay_model_instance", "selections": [ { "kind": "ClientExtension", diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-resolver-with-output-type-client-object.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-resolver-with-output-type-client-object.expected index 512009fd27d42..9e73ca70c54de 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-resolver-with-output-type-client-object.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-resolver-with-output-type-client-object.expected @@ -28,7 +28,7 @@ extend type User { { "kind": "SplitOperation", "metadata": {}, - "name": "default_User__pop_star_name$normalization", + "name": "User__pop_star_name$normalization", "selections": [ { "kind": "ClientExtension", @@ -125,7 +125,7 @@ extend type User { "normalizationInfo": { "concreteType": "ClientUser", "plural": false, - "normalizationNode": require('default_User__pop_star_name$normalization.graphql') + "normalizationNode": require('User__pop_star_name$normalization.graphql') } }, "linkedField": { diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/resolver-with-root-fragment-on-model-type.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/resolver-with-root-fragment-on-model-type.expected index b8a4d8cca1aff..f4c2a4f38c0ce 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/resolver-with-root-fragment-on-model-type.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/resolver-with-root-fragment-on-model-type.expected @@ -16,7 +16,7 @@ type MyType @__RelayResolverModel { __relay_model_instance: Int @relay_resolver( import_path: "/path/to/test/fixture/terse-relay-resolver-with-root-fragment-on-model.js" - fragment_name: "default_MyType__id" + fragment_name: "MyType__id" inject_fragment_data: "id" import_name: "MyType" ) @@ -149,7 +149,7 @@ Query Text is Empty. "argumentDefinitions": [], "kind": "Fragment", "metadata": null, - "name": "default_MyType____relay_model_instance", + "name": "MyType____relay_model_instance", "selections": [ { "alias": null, @@ -157,11 +157,11 @@ Query Text is Empty. "fragment": { "args": null, "kind": "FragmentSpread", - "name": "default_MyType__id" + "name": "MyType__id" }, "kind": "RelayResolver", "name": "__relay_model_instance", - "resolverModule": require('relay-runtime/experimental').resolverDataInjector(require('default_MyType__id.graphql'), require('terse-relay-resolver-with-root-fragment-on-model').MyType, 'id', true), + "resolverModule": require('relay-runtime/experimental').resolverDataInjector(require('MyType__id.graphql'), require('terse-relay-resolver-with-root-fragment-on-model').MyType, 'id', true), "path": "__relay_model_instance" } ], @@ -173,7 +173,7 @@ Query Text is Empty. "argumentDefinitions": [], "kind": "Fragment", "metadata": null, - "name": "default_MyType__id", + "name": "MyType__id", "selections": [ { "kind": "ClientExtension", diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/resolver-with-root-fragment-on-model-type.graphql b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/resolver-with-root-fragment-on-model-type.graphql index 7dbd3e0d2603c..cc8b26e22c84e 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/resolver-with-root-fragment-on-model-type.graphql +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/resolver-with-root-fragment-on-model-type.graphql @@ -15,7 +15,7 @@ type MyType @__RelayResolverModel { __relay_model_instance: Int @relay_resolver( import_path: "/path/to/test/fixture/terse-relay-resolver-with-root-fragment-on-model.js" - fragment_name: "default_MyType__id" + fragment_name: "MyType__id" inject_fragment_data: "id" import_name: "MyType" ) diff --git a/compiler/crates/relay-config/src/lib.rs b/compiler/crates/relay-config/src/lib.rs index 90409ed10ff16..a64a1fdecddb1 100644 --- a/compiler/crates/relay-config/src/lib.rs +++ b/compiler/crates/relay-config/src/lib.rs @@ -15,6 +15,7 @@ mod js_module_format; mod module_import_config; mod non_node_id_fields_config; mod project_config; +mod project_name; mod typegen_config; pub use connection_interface::ConnectionInterface; @@ -28,10 +29,10 @@ pub use project_config::LocalPersistAlgorithm; pub use project_config::LocalPersistConfig; pub use project_config::PersistConfig; pub use project_config::ProjectConfig; -pub use project_config::ProjectName; pub use project_config::RemotePersistConfig; pub use project_config::SchemaConfig; pub use project_config::SchemaLocation; +pub use project_name::ProjectName; pub use typegen_config::CustomScalarType; pub use typegen_config::CustomScalarTypeImport; pub use typegen_config::FlowTypegenConfig; diff --git a/compiler/crates/relay-config/src/project_config.rs b/compiler/crates/relay-config/src/project_config.rs index d442ad0a0e12b..8c5cdeb39c204 100644 --- a/compiler/crates/relay-config/src/project_config.rs +++ b/compiler/crates/relay-config/src/project_config.rs @@ -35,38 +35,12 @@ use crate::diagnostic_report_config::DiagnosticReportConfig; use crate::module_import_config::ModuleImportConfig; use crate::non_node_id_fields_config::NonNodeIdFieldsConfig; use crate::JsModuleFormat; +use crate::ProjectName; use crate::TypegenConfig; use crate::TypegenLanguage; type FnvIndexMap = IndexMap; -#[derive(Debug, Clone, Copy, Serialize, Deserialize, Hash, PartialEq, Eq)] -pub struct ProjectName(StringKey); - -impl Default for ProjectName { - fn default() -> Self { - Self("default".intern()) - } -} - -impl fmt::Display for ProjectName { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - write!(f, "{}", self.0) - } -} - -impl From for ProjectName { - fn from(key: StringKey) -> Self { - Self(key) - } -} - -impl From for StringKey { - fn from(project_name: ProjectName) -> Self { - project_name.0 - } -} - #[derive(Clone, Debug, Serialize, Deserialize)] #[serde(deny_unknown_fields, rename_all = "camelCase")] pub struct RemotePersistConfig { diff --git a/compiler/crates/relay-config/src/project_name.rs b/compiler/crates/relay-config/src/project_name.rs new file mode 100644 index 0000000000000..7902d1a347b01 --- /dev/null +++ b/compiler/crates/relay-config/src/project_name.rs @@ -0,0 +1,95 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +use std::fmt; + +use intern::string_key::Intern; +use intern::string_key::StringKey; +use intern::Lookup; +use serde::Deserialize; +use serde::Deserializer; +use serde::Serialize; +use serde::Serializer; + +#[derive(Debug, Clone, Copy, Hash, PartialEq, Eq)] +pub enum ProjectName { + Default, + Named(StringKey), +} + +impl ProjectName { + pub fn generate_name_for_object_and_field( + &self, + object_name: StringKey, + field_name: StringKey, + ) -> String { + match self { + ProjectName::Named(project_name) => { + format!("{}_{}__{}", project_name, object_name, field_name) + } + ProjectName::Default => format!("{}__{}", object_name, field_name), + } + } +} + +impl Default for ProjectName { + fn default() -> Self { + Self::Default + } +} + +impl fmt::Display for ProjectName { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + if let Self::Named(value) = self { + write!(f, "{}", value) + } else { + write!(f, "default") + } + } +} + +impl From for ProjectName { + fn from(key: StringKey) -> Self { + match key.lookup() { + "default" => Self::Default, + _ => Self::Named(key), + } + } +} + +impl From for StringKey { + fn from(project_name: ProjectName) -> Self { + match project_name { + ProjectName::Default => "default".intern(), + ProjectName::Named(name) => name, + } + } +} + +impl Serialize for ProjectName { + fn serialize(&self, serializer: S) -> Result + where + S: Serializer, + { + serializer.serialize_str(match self { + ProjectName::Default => "default", + ProjectName::Named(name) => name.lookup(), + }) + } +} + +impl<'de> Deserialize<'de> for ProjectName { + fn deserialize(deserializer: D) -> Result + where + D: Deserializer<'de>, + { + Deserialize::deserialize(deserializer).map(|s: String| match s.as_str() { + "default" => ProjectName::Default, + s => ProjectName::Named(s.intern()), + }) + } +} diff --git a/compiler/crates/relay-docblock/src/docblock_ir.rs b/compiler/crates/relay-docblock/src/docblock_ir.rs index bea5cd9dee328..308e13aae1e4f 100644 --- a/compiler/crates/relay-docblock/src/docblock_ir.rs +++ b/compiler/crates/relay-docblock/src/docblock_ir.rs @@ -20,7 +20,6 @@ use docblock_shared::ARGUMENT_TYPE; use docblock_shared::DEFAULT_VALUE; use docblock_shared::KEY_RESOLVER_ID_FIELD; use docblock_shared::PROVIDER_ARG_NAME; -use graphql_ir::reexport::Intern; use graphql_ir::reexport::StringKey; use graphql_ir::FragmentDefinitionName; use graphql_syntax::parse_field_definition; @@ -38,6 +37,7 @@ use graphql_syntax::StringNode; use graphql_syntax::Token; use graphql_syntax::TokenKind; use graphql_syntax::TypeAnnotation; +use intern::string_key::Intern; use intern::Lookup; use relay_config::ProjectName; @@ -244,13 +244,10 @@ fn parse_strong_object_ir( )?; let fragment_name = FragmentDefinitionName( - format!( - "{}_{}__{}", - project_name, identifier.value, *KEY_RESOLVER_ID_FIELD - ) - .intern(), + project_name + .generate_name_for_object_and_field(identifier.value, *KEY_RESOLVER_ID_FIELD) + .intern(), ); - Ok(StrongObjectIr { type_name: identifier, rhs_location: relay_resolver_field.value.location, diff --git a/compiler/crates/relay-docblock/src/ir.rs b/compiler/crates/relay-docblock/src/ir.rs index 2391e0202fe0a..ed26e7a70698b 100644 --- a/compiler/crates/relay-docblock/src/ir.rs +++ b/compiler/crates/relay-docblock/src/ir.rs @@ -1398,13 +1398,12 @@ fn get_root_fragment_for_object( { Some(RootFragment { fragment: WithLocation::generated(FragmentDefinitionName( - format!( - "{}_{}__{}", - project_name, - object.unwrap().name.item, - *RESOLVER_MODEL_INSTANCE_FIELD_NAME - ) - .intern(), + project_name + .generate_name_for_object_and_field( + object.unwrap().name.item.0, + *RESOLVER_MODEL_INSTANCE_FIELD_NAME, + ) + .intern(), )), generated: true, inject_fragment_data: Some(FragmentDataInjectionMode::Field( diff --git a/compiler/crates/relay-docblock/tests/parse/fixtures/relay-resolver-strong-object-with-implements.expected b/compiler/crates/relay-docblock/tests/parse/fixtures/relay-resolver-strong-object-with-implements.expected index 1f4477fd37668..a26893113d67d 100644 --- a/compiler/crates/relay-docblock/tests/parse/fixtures/relay-resolver-strong-object-with-implements.expected +++ b/compiler/crates/relay-docblock/tests/parse/fixtures/relay-resolver-strong-object-with-implements.expected @@ -24,7 +24,7 @@ StrongObjectResolver( root_fragment: WithLocation { location: :0:0, item: FragmentDefinitionName( - "default_ClientUser__id", + "ClientUser__id", ), }, description: None, diff --git a/compiler/crates/relay-docblock/tests/parse/fixtures/relay-resolver-strong-object.expected b/compiler/crates/relay-docblock/tests/parse/fixtures/relay-resolver-strong-object.expected index d32d0b824e512..c1446279afaaa 100644 --- a/compiler/crates/relay-docblock/tests/parse/fixtures/relay-resolver-strong-object.expected +++ b/compiler/crates/relay-docblock/tests/parse/fixtures/relay-resolver-strong-object.expected @@ -24,7 +24,7 @@ StrongObjectResolver( root_fragment: WithLocation { location: :0:0, item: FragmentDefinitionName( - "default_ClientUser__id", + "ClientUser__id", ), }, description: None, diff --git a/compiler/crates/relay-docblock/tests/to_schema/fixtures/legacy-relay-resolver-with-root-fragment-on-model.expected b/compiler/crates/relay-docblock/tests/to_schema/fixtures/legacy-relay-resolver-with-root-fragment-on-model.expected index e15a0857323e1..310a6b05cfc9d 100644 --- a/compiler/crates/relay-docblock/tests/to_schema/fixtures/legacy-relay-resolver-with-root-fragment-on-model.expected +++ b/compiler/crates/relay-docblock/tests/to_schema/fixtures/legacy-relay-resolver-with-root-fragment-on-model.expected @@ -25,7 +25,7 @@ graphql` ==================================== OUTPUT =================================== type MyType @__RelayResolverModel { id: ID! - __relay_model_instance: RelayResolverValue! @relay_resolver(import_path: "/path/to/test/fixture/legacy-relay-resolver-with-root-fragment-on-model.js", fragment_name: "default_MyType__id", generated_fragment: true, inject_fragment_data: "id", import_name: "MyType") @resolver_source_hash(value: "b81f253a757aaba36955be6d8e224c2a") @unselectable(reason: "This field is intended only for Relay's internal use") + __relay_model_instance: RelayResolverValue! @relay_resolver(import_path: "/path/to/test/fixture/legacy-relay-resolver-with-root-fragment-on-model.js", fragment_name: "MyType__id", generated_fragment: true, inject_fragment_data: "id", import_name: "MyType") @resolver_source_hash(value: "b81f253a757aaba36955be6d8e224c2a") @unselectable(reason: "This field is intended only for Relay's internal use") } diff --git a/compiler/crates/relay-docblock/tests/to_schema/fixtures/relay-resolver-strong-object-with-implements.expected b/compiler/crates/relay-docblock/tests/to_schema/fixtures/relay-resolver-strong-object-with-implements.expected index c86038410cd00..7fee08c02694a 100644 --- a/compiler/crates/relay-docblock/tests/to_schema/fixtures/relay-resolver-strong-object-with-implements.expected +++ b/compiler/crates/relay-docblock/tests/to_schema/fixtures/relay-resolver-strong-object-with-implements.expected @@ -21,5 +21,5 @@ interface IFoo { ==================================== OUTPUT =================================== type ClientUser implements IFoo @__RelayResolverModel { id: ID! - __relay_model_instance: RelayResolverValue! @relay_resolver(import_path: "/path/to/test/fixture/relay-resolver-strong-object-with-implements.js", fragment_name: "default_ClientUser__id", generated_fragment: true, inject_fragment_data: "id", import_name: "ClientUser") @resolver_source_hash(value: "76be3b85f11135352a0d3a5726418956") @unselectable(reason: "This field is intended only for Relay's internal use") + __relay_model_instance: RelayResolverValue! @relay_resolver(import_path: "/path/to/test/fixture/relay-resolver-strong-object-with-implements.js", fragment_name: "ClientUser__id", generated_fragment: true, inject_fragment_data: "id", import_name: "ClientUser") @resolver_source_hash(value: "76be3b85f11135352a0d3a5726418956") @unselectable(reason: "This field is intended only for Relay's internal use") } diff --git a/compiler/crates/relay-docblock/tests/to_schema/fixtures/relay-resolver-strong-object-with-multiple-implements.expected b/compiler/crates/relay-docblock/tests/to_schema/fixtures/relay-resolver-strong-object-with-multiple-implements.expected index f25e7a743879c..9f84f327614b1 100644 --- a/compiler/crates/relay-docblock/tests/to_schema/fixtures/relay-resolver-strong-object-with-multiple-implements.expected +++ b/compiler/crates/relay-docblock/tests/to_schema/fixtures/relay-resolver-strong-object-with-multiple-implements.expected @@ -27,5 +27,5 @@ interface IBar { ==================================== OUTPUT =================================== type ClientUser implements IFoo & IBar @__RelayResolverModel { id: ID! - __relay_model_instance: RelayResolverValue! @relay_resolver(import_path: "/path/to/test/fixture/relay-resolver-strong-object-with-multiple-implements.js", fragment_name: "default_ClientUser__id", generated_fragment: true, inject_fragment_data: "id", import_name: "ClientUser") @resolver_source_hash(value: "1b7346b6155a43514be2946721ff59fb") @unselectable(reason: "This field is intended only for Relay's internal use") + __relay_model_instance: RelayResolverValue! @relay_resolver(import_path: "/path/to/test/fixture/relay-resolver-strong-object-with-multiple-implements.js", fragment_name: "ClientUser__id", generated_fragment: true, inject_fragment_data: "id", import_name: "ClientUser") @resolver_source_hash(value: "1b7346b6155a43514be2946721ff59fb") @unselectable(reason: "This field is intended only for Relay's internal use") } diff --git a/compiler/crates/relay-docblock/tests/to_schema/fixtures/relay-resolver-strong-object.expected b/compiler/crates/relay-docblock/tests/to_schema/fixtures/relay-resolver-strong-object.expected index 52734292b8dd8..cf9e7d59aa132 100644 --- a/compiler/crates/relay-docblock/tests/to_schema/fixtures/relay-resolver-strong-object.expected +++ b/compiler/crates/relay-docblock/tests/to_schema/fixtures/relay-resolver-strong-object.expected @@ -12,5 +12,5 @@ ==================================== OUTPUT =================================== type ClientUser @__RelayResolverModel { id: ID! - __relay_model_instance: RelayResolverValue! @relay_resolver(import_path: "/path/to/test/fixture/relay-resolver-strong-object.js", fragment_name: "default_ClientUser__id", generated_fragment: true, inject_fragment_data: "id", import_name: "ClientUser") @resolver_source_hash(value: "b1c8ae1937aed7425f5a87a4762ad83d") @unselectable(reason: "This field is intended only for Relay's internal use") + __relay_model_instance: RelayResolverValue! @relay_resolver(import_path: "/path/to/test/fixture/relay-resolver-strong-object.js", fragment_name: "ClientUser__id", generated_fragment: true, inject_fragment_data: "id", import_name: "ClientUser") @resolver_source_hash(value: "b1c8ae1937aed7425f5a87a4762ad83d") @unselectable(reason: "This field is intended only for Relay's internal use") } diff --git a/compiler/crates/relay-docblock/tests/to_schema/fixtures/terse-relay-resolver-with-root-fragment-on-model.expected b/compiler/crates/relay-docblock/tests/to_schema/fixtures/terse-relay-resolver-with-root-fragment-on-model.expected index e19ba82f83a2c..70c689e43a1b1 100644 --- a/compiler/crates/relay-docblock/tests/to_schema/fixtures/terse-relay-resolver-with-root-fragment-on-model.expected +++ b/compiler/crates/relay-docblock/tests/to_schema/fixtures/terse-relay-resolver-with-root-fragment-on-model.expected @@ -23,7 +23,7 @@ graphql` ==================================== OUTPUT =================================== type MyType @__RelayResolverModel { id: ID! - __relay_model_instance: RelayResolverValue! @relay_resolver(import_path: "/path/to/test/fixture/terse-relay-resolver-with-root-fragment-on-model.js", fragment_name: "default_MyType__id", generated_fragment: true, inject_fragment_data: "id", import_name: "MyType") @resolver_source_hash(value: "b81f253a757aaba36955be6d8e224c2a") @unselectable(reason: "This field is intended only for Relay's internal use") + __relay_model_instance: RelayResolverValue! @relay_resolver(import_path: "/path/to/test/fixture/terse-relay-resolver-with-root-fragment-on-model.js", fragment_name: "MyType__id", generated_fragment: true, inject_fragment_data: "id", import_name: "MyType") @resolver_source_hash(value: "b81f253a757aaba36955be6d8e224c2a") @unselectable(reason: "This field is intended only for Relay's internal use") } diff --git a/compiler/crates/relay-transforms/src/generate_relay_resolvers_model_fragments.rs b/compiler/crates/relay-transforms/src/generate_relay_resolvers_model_fragments.rs index 012f95e18a6a6..aec0382d987d9 100644 --- a/compiler/crates/relay-transforms/src/generate_relay_resolvers_model_fragments.rs +++ b/compiler/crates/relay-transforms/src/generate_relay_resolvers_model_fragments.rs @@ -71,11 +71,12 @@ pub fn generate_relay_resolvers_model_fragments( }); let model_fragment_name = FragmentDefinitionName( - format!( - "{}_{}__{}", - project_name, object.name.item.0, *RESOLVER_MODEL_INSTANCE_FIELD_NAME - ) - .intern(), + project_name + .generate_name_for_object_and_field( + object.name.item.0, + *RESOLVER_MODEL_INSTANCE_FIELD_NAME, + ) + .intern(), ); let resolver_field = program.schema.field(model_instance_field_id); @@ -104,11 +105,12 @@ pub fn generate_relay_resolvers_model_fragments( .named_field(object_type, schema_config.node_interface_id_field) { let id_fragment_name = FragmentDefinitionName( - format!( - "{}_{}__{}", - project_name, object.name.item.0, schema_config.node_interface_id_field - ) - .intern(), + project_name + .generate_name_for_object_and_field( + object.name.item.0, + schema_config.node_interface_id_field, + ) + .intern(), ); let id_fragment = FragmentDefinition { diff --git a/compiler/crates/relay-transforms/src/generate_relay_resolvers_operations_for_nested_objects.rs b/compiler/crates/relay-transforms/src/generate_relay_resolvers_operations_for_nested_objects.rs index 5001bf06f4fc4..fa2892bd8d10e 100644 --- a/compiler/crates/relay-transforms/src/generate_relay_resolvers_operations_for_nested_objects.rs +++ b/compiler/crates/relay-transforms/src/generate_relay_resolvers_operations_for_nested_objects.rs @@ -449,16 +449,10 @@ pub(crate) fn generate_name_for_nested_object_operation( .parent_type .unwrap_or_else(|| panic!("Expected parent type for field {:?}.", field)); - let normalization_name = get_normalization_operation_name( - format!( - "{}_{}__{}", - project_name, - schema.get_type_name(parent_type), - field.name.item - ) - .intern(), - ) - .intern(); + let name = project_name + .generate_name_for_object_and_field(schema.get_type_name(parent_type), field.name.item); + + let normalization_name = get_normalization_operation_name(name.intern()).intern(); field .name diff --git a/compiler/crates/relay-transforms/tests/client_edges/fixtures/output-type.expected b/compiler/crates/relay-transforms/tests/client_edges/fixtures/output-type.expected index caddf0c313a68..3fe8752b46517 100644 --- a/compiler/crates/relay-transforms/tests/client_edges/fixtures/output-type.expected +++ b/compiler/crates/relay-transforms/tests/client_edges/fixtures/output-type.expected @@ -50,7 +50,7 @@ fragment Foo_user on User { # normalization_operation: WithLocation { # location: :59:70, # item: OperationDefinitionName( - # "default_User__best_friend$normalization", + # "User__best_friend$normalization", # ), # }, # weak_object_instance_field: None, diff --git a/compiler/crates/relay-transforms/tests/generate_relay_resolvers_operations_for_nested_objects/fixtures/output-type-client-type.expected b/compiler/crates/relay-transforms/tests/generate_relay_resolvers_operations_for_nested_objects/fixtures/output-type-client-type.expected index ecb191e61a2a7..91bc14c7263b8 100644 --- a/compiler/crates/relay-transforms/tests/generate_relay_resolvers_operations_for_nested_objects/fixtures/output-type-client-type.expected +++ b/compiler/crates/relay-transforms/tests/generate_relay_resolvers_operations_for_nested_objects/fixtures/output-type-client-type.expected @@ -26,7 +26,7 @@ extend type User { pop_star_name: PopStarName @relay_resolver(fragment_name: "PopStarNameResolverFragment_name", import_path: "PopStarNameResolver", has_output_type: true) } ==================================== OUTPUT =================================== -query default_User__pop_star_name$normalization @__SplitOperationMetadata +query User__pop_star_name$normalization @__SplitOperationMetadata # SplitOperationMetadata { # derived_from: None, # location: output-type-client-type.graphql:81:94, diff --git a/compiler/crates/relay-transforms/tests/generate_relay_resolvers_operations_for_nested_objects/fixtures/output-type-with-client-interface.expected b/compiler/crates/relay-transforms/tests/generate_relay_resolvers_operations_for_nested_objects/fixtures/output-type-with-client-interface.expected index 9afc8265dccf9..7b2a45485c51f 100644 --- a/compiler/crates/relay-transforms/tests/generate_relay_resolvers_operations_for_nested_objects/fixtures/output-type-with-client-interface.expected +++ b/compiler/crates/relay-transforms/tests/generate_relay_resolvers_operations_for_nested_objects/fixtures/output-type-with-client-interface.expected @@ -33,7 +33,7 @@ extend type User { pop_star_name: PopStarName @relay_resolver(fragment_name: "PopStarNameResolverFragment_name", import_path: "PopStarNameResolver", has_output_type: true) } ==================================== OUTPUT =================================== -query default_User__pop_star_name$normalization @__SplitOperationMetadata +query User__pop_star_name$normalization @__SplitOperationMetadata # SplitOperationMetadata { # derived_from: None, # location: output-type-with-client-interface.graphql:195:208, diff --git a/compiler/crates/relay-transforms/tests/generate_relay_resolvers_operations_for_nested_objects/fixtures/output-type-with-interface-recursion-but-lying-client-type.expected b/compiler/crates/relay-transforms/tests/generate_relay_resolvers_operations_for_nested_objects/fixtures/output-type-with-interface-recursion-but-lying-client-type.expected index 5e35da5f9ea5a..b091b7e66b201 100644 --- a/compiler/crates/relay-transforms/tests/generate_relay_resolvers_operations_for_nested_objects/fixtures/output-type-with-interface-recursion-but-lying-client-type.expected +++ b/compiler/crates/relay-transforms/tests/generate_relay_resolvers_operations_for_nested_objects/fixtures/output-type-with-interface-recursion-but-lying-client-type.expected @@ -39,7 +39,7 @@ extend type User { pop_star_name: PopStarName @relay_resolver(fragment_name: "PopStarNameResolverFragment_name", import_path: "PopStarNameResolver", has_output_type: true) } ==================================== OUTPUT =================================== -query default_User__pop_star_name$normalization @__SplitOperationMetadata +query User__pop_star_name$normalization @__SplitOperationMetadata # SplitOperationMetadata { # derived_from: None, # location: output-type-with-interface-recursion-but-lying-client-type.graphql:547:560, diff --git a/compiler/crates/relay-transforms/tests/generate_relay_resolvers_operations_for_nested_objects/fixtures/output-type-with-relay-resolver-fields.expected b/compiler/crates/relay-transforms/tests/generate_relay_resolvers_operations_for_nested_objects/fixtures/output-type-with-relay-resolver-fields.expected index 43be21fe9e39c..512132c9c86c4 100644 --- a/compiler/crates/relay-transforms/tests/generate_relay_resolvers_operations_for_nested_objects/fixtures/output-type-with-relay-resolver-fields.expected +++ b/compiler/crates/relay-transforms/tests/generate_relay_resolvers_operations_for_nested_objects/fixtures/output-type-with-relay-resolver-fields.expected @@ -36,7 +36,7 @@ extend type User { ) } ==================================== OUTPUT =================================== -query default_User__pop_star_name$normalization @__SplitOperationMetadata +query User__pop_star_name$normalization @__SplitOperationMetadata # SplitOperationMetadata { # derived_from: None, # location: output-type-with-relay-resolver-fields.graphql:204:217, diff --git a/compiler/crates/relay-typegen/tests/generate_flow/fixtures/relay-resolver-with-output-type-client-interface.expected b/compiler/crates/relay-typegen/tests/generate_flow/fixtures/relay-resolver-with-output-type-client-interface.expected index 169ddf72ff73c..ecf652835730d 100644 --- a/compiler/crates/relay-typegen/tests/generate_flow/fixtures/relay-resolver-with-output-type-client-interface.expected +++ b/compiler/crates/relay-typegen/tests/generate_flow/fixtures/relay-resolver-with-output-type-client-interface.expected @@ -46,8 +46,8 @@ extend type User { ) } ==================================== OUTPUT =================================== -export type default_User__pop_star_game$normalization$variables = {||}; -export type default_User__pop_star_game$normalization$data = {| +export type User__pop_star_game$normalization$variables = {||}; +export type User__pop_star_game$normalization$data = {| +client_interface: {| +__typename: "ClientType", +name: ?string, @@ -57,13 +57,13 @@ export type default_User__pop_star_game$normalization$data = {| +__typename: "%other", |}, |}; -export type default_User__pop_star_game$normalization = {| - response: default_User__pop_star_game$normalization$data, - variables: default_User__pop_star_game$normalization$variables, +export type User__pop_star_game$normalization = {| + response: User__pop_star_game$normalization$data, + variables: User__pop_star_game$normalization$variables, |}; ------------------------------------------------------------------------------- -export type default_User__pop_star_name$normalization$variables = {||}; -export type default_User__pop_star_name$normalization$data = {| +export type User__pop_star_name$normalization$variables = {||}; +export type User__pop_star_name$normalization$data = {| +__typename: "ClientType", +name: ?string, |} | {| @@ -71,20 +71,20 @@ export type default_User__pop_star_name$normalization$data = {| // value in case none of the concrete values match. +__typename: "%other", |}; -export type default_User__pop_star_name$normalization = {| - response: default_User__pop_star_name$normalization$data, - variables: default_User__pop_star_name$normalization$variables, +export type User__pop_star_name$normalization = {| + response: User__pop_star_name$normalization$data, + variables: User__pop_star_name$normalization$variables, |}; ------------------------------------------------------------------------------- import type { PopStarNameResolverFragment_name$key } from "PopStarNameResolverFragment_name.graphql"; -import type { default_User__pop_star_name$normalization } from "default_User__pop_star_name$normalization.graphql"; +import type { User__pop_star_name$normalization } from "User__pop_star_name$normalization.graphql"; import type { FragmentType } from "relay-runtime"; import userPopStarNameResolverType from "PopStarNameResolver"; // Type assertion validating that `userPopStarNameResolverType` resolver is correctly implemented. // A type error here indicates that the type signature of the resolver module is incorrect. (userPopStarNameResolverType: ( rootKey: PopStarNameResolverFragment_name$key, -) => ?default_User__pop_star_name$normalization); +) => ?User__pop_star_name$normalization); declare export opaque type Foo_user$fragmentType: FragmentType; export type Foo_user$data = {| +poppy: ?{| diff --git a/compiler/crates/relay-typegen/tests/generate_flow/fixtures/relay-resolver-with-output-type-client-object-plural.expected b/compiler/crates/relay-typegen/tests/generate_flow/fixtures/relay-resolver-with-output-type-client-object-plural.expected index 5145c523af4de..0a3c8df2fd92b 100644 --- a/compiler/crates/relay-typegen/tests/generate_flow/fixtures/relay-resolver-with-output-type-client-object-plural.expected +++ b/compiler/crates/relay-typegen/tests/generate_flow/fixtures/relay-resolver-with-output-type-client-object-plural.expected @@ -30,24 +30,24 @@ extend type User { ) } ==================================== OUTPUT =================================== -export type default_User__pop_star_name$normalization$variables = {||}; -export type default_User__pop_star_name$normalization$data = {| +export type User__pop_star_name$normalization$variables = {||}; +export type User__pop_star_name$normalization$data = {| +name: ?string, |}; -export type default_User__pop_star_name$normalization = {| - response: default_User__pop_star_name$normalization$data, - variables: default_User__pop_star_name$normalization$variables, +export type User__pop_star_name$normalization = {| + response: User__pop_star_name$normalization$data, + variables: User__pop_star_name$normalization$variables, |}; ------------------------------------------------------------------------------- import type { PopStarNameResolverFragment_name$key } from "PopStarNameResolverFragment_name.graphql"; -import type { default_User__pop_star_name$normalization } from "default_User__pop_star_name$normalization.graphql"; +import type { User__pop_star_name$normalization } from "User__pop_star_name$normalization.graphql"; import type { FragmentType } from "relay-runtime"; import userPopStarNameResolverType from "PopStarNameResolver"; // Type assertion validating that `userPopStarNameResolverType` resolver is correctly implemented. // A type error here indicates that the type signature of the resolver module is incorrect. (userPopStarNameResolverType: ( rootKey: PopStarNameResolverFragment_name$key, -) => ?$ReadOnlyArray); +) => ?$ReadOnlyArray); declare export opaque type Foo_user$fragmentType: FragmentType; export type Foo_user$data = {| +poppy: ?$ReadOnlyArray ?default_User__pop_star_name$normalization); +) => ?User__pop_star_name$normalization); declare export opaque type Foo_user$fragmentType: FragmentType; export type Foo_user$data = {| +poppy: ?{| 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 32d3761d3d738..18d7d97b6e360 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,8 +36,8 @@ extend type User { pop_star_game: ClientTypeWithNestedInterface @relay_resolver(fragment_name: "PopStarNameResolverFragment_name", import_path: "PopStarNameResolver", has_output_type: true) } ==================================== OUTPUT =================================== -export type default_User__pop_star_game$normalization$variables = {}; -export type default_User__pop_star_game$normalization$data = { +export type User__pop_star_game$normalization$variables = {}; +export type User__pop_star_game$normalization$data = { readonly client_interface: { readonly __typename: "ClientType"; readonly name: string | null; @@ -47,13 +47,13 @@ export type default_User__pop_star_game$normalization$data = { readonly __typename: "%other"; } | null; }; -export type default_User__pop_star_game$normalization = { - response: default_User__pop_star_game$normalization$data; - variables: default_User__pop_star_game$normalization$variables; +export type User__pop_star_game$normalization = { + response: User__pop_star_game$normalization$data; + variables: User__pop_star_game$normalization$variables; }; ------------------------------------------------------------------------------- -export type default_User__pop_star_name$normalization$variables = {}; -export type default_User__pop_star_name$normalization$data = { +export type User__pop_star_name$normalization$variables = {}; +export type User__pop_star_name$normalization$data = { readonly __typename: "ClientType"; readonly name: string | null; } | { @@ -61,9 +61,9 @@ export type default_User__pop_star_name$normalization$data = { // value in case none of the concrete values match. readonly __typename: "%other"; }; -export type default_User__pop_star_name$normalization = { - response: default_User__pop_star_name$normalization$data; - variables: default_User__pop_star_name$normalization$variables; +export type User__pop_star_name$normalization = { + response: User__pop_star_name$normalization$data; + variables: User__pop_star_name$normalization$variables; }; ------------------------------------------------------------------------------- import type { FragmentRefs } from "relay-runtime"; 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 297ac552a29a7..273def7834516 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,13 +27,13 @@ extend type User { pop_star_name: ClientUser @relay_resolver(fragment_name: "PopStarNameResolverFragment_name", import_path: "PopStarNameResolver", has_output_type: true) } ==================================== OUTPUT =================================== -export type default_User__pop_star_name$normalization$variables = {}; -export type default_User__pop_star_name$normalization$data = { +export type User__pop_star_name$normalization$variables = {}; +export type User__pop_star_name$normalization$data = { readonly name: string | null; }; -export type default_User__pop_star_name$normalization = { - response: default_User__pop_star_name$normalization$data; - variables: default_User__pop_star_name$normalization$variables; +export type User__pop_star_name$normalization = { + response: User__pop_star_name$normalization$data; + variables: User__pop_star_name$normalization$variables; }; ------------------------------------------------------------------------------- import type { FragmentRefs } from "relay-runtime"; diff --git a/compiler/test-project/src/__generated__/AppQuery.graphql.js b/compiler/test-project/src/__generated__/AppQuery.graphql.js index 0d80e43d1b4cf..5bbe3daa33018 100644 --- a/compiler/test-project/src/__generated__/AppQuery.graphql.js +++ b/compiler/test-project/src/__generated__/AppQuery.graphql.js @@ -4,8 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<> - * @flow + * @generated SignedSource<> * @lightSyntaxTransform * @nogrep */ @@ -14,22 +13,7 @@ 'use strict'; -/*:: -import type { ConcreteRequest, Query } from 'relay-runtime'; -import type { Component_node$fragmentType } from "./Component_node.graphql"; -export type AppQuery$variables = {||}; -export type AppQuery$data = {| - +node: ?{| - +$fragmentSpreads: Component_node$fragmentType, - |}, -|}; -export type AppQuery = {| - response: AppQuery$data, - variables: AppQuery$variables, -|}; -*/ - -var node/*: ConcreteRequest*/ = (function(){ +var node = (function(){ var v0 = [ { "kind": "Literal", @@ -112,9 +96,6 @@ return { }; })(); -(node/*: any*/).hash = "942e72826c882d3a02cb0cfbf267dd83"; +node.hash = "942e72826c882d3a02cb0cfbf267dd83"; -module.exports = ((node/*: any*/)/*: Query< - AppQuery$variables, - AppQuery$data, ->*/); +module.exports = node; diff --git a/compiler/test-project/src/__generated__/Component_node.graphql.js b/compiler/test-project/src/__generated__/Component_node.graphql.js index 1519ba6c835c3..961f909f02891 100644 --- a/compiler/test-project/src/__generated__/Component_node.graphql.js +++ b/compiler/test-project/src/__generated__/Component_node.graphql.js @@ -4,8 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<<264e4b506272789ae9a0f07604de0334>> - * @flow + * @generated SignedSource<> * @lightSyntaxTransform * @nogrep */ @@ -14,22 +13,7 @@ 'use strict'; -/*:: -import type { Fragment, ReaderFragment } from 'relay-runtime'; -import type { FragmentType } from "relay-runtime"; -declare export opaque type Component_node$fragmentType: FragmentType; -export type Component_node$data = {| - +id: string, - +$fragmentType: Component_node$fragmentType, -|}; -export type Component_node$key = { - +$data?: Component_node$data, - +$fragmentSpreads: Component_node$fragmentType, - ... -}; -*/ - -var node/*: ReaderFragment*/ = { +var node = { "argumentDefinitions": [], "kind": "Fragment", "metadata": null, @@ -47,9 +31,6 @@ var node/*: ReaderFragment*/ = { "abstractKey": "__isNode" }; -(node/*: any*/).hash = "c1076fdf6414be9f597194edf35d01a0"; +node.hash = "c1076fdf6414be9f597194edf35d01a0"; -module.exports = ((node/*: any*/)/*: Fragment< - Component_node$fragmentType, - Component_node$data, ->*/); +module.exports = node; From ccbc1fb76698afab7d7f2e1c7e8d4970769c584a Mon Sep 17 00:00:00 2001 From: Andrey Lunyov Date: Tue, 29 Aug 2023 17:10:02 -0400 Subject: [PATCH 2/2] happy cargo build --- compiler/crates/relay-lsp/src/server/lsp_state_resources.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/crates/relay-lsp/src/server/lsp_state_resources.rs b/compiler/crates/relay-lsp/src/server/lsp_state_resources.rs index 8d0af71ceaf61..a54cba956d505 100644 --- a/compiler/crates/relay-lsp/src/server/lsp_state_resources.rs +++ b/compiler/crates/relay-lsp/src/server/lsp_state_resources.rs @@ -435,7 +435,7 @@ impl>() }); - program.merge_program(&base_program, removed_definition_names); + program.merge_program(&base_program, removed_definition_names.as_deref()); } }