From b1c64f07f4e53cde177720830cb04f337cd0f59c Mon Sep 17 00:00:00 2001 From: Edvin Eriksson Date: Sat, 17 Jun 2023 10:22:37 +0200 Subject: [PATCH] update fixtures --- .../relay-compiler-config-schema.json | 12 +++++++++ ...ragment-on-node-and-fetchable-arg.expected | 15 ----------- ...le-fragment-on-node-and-fetchable.expected | 15 ----------- .../tests/refetchable_fragment.rs | 20 +++++++++----- ...e-fetchable-type-with-token-field.expected | 1 + ...terface-but-no-implementing-types.expected | 1 - .../tests/refetchable_fragment/mod.rs | 27 ------------------- .../tests/refetchable_fragment_test.rs | 4 +++ 8 files changed, 30 insertions(+), 65 deletions(-) delete mode 100644 compiler/crates/relay-transforms/tests/refetchable_fragment/mod.rs diff --git a/compiler/crates/relay-compiler/relay-compiler-config-schema.json b/compiler/crates/relay-compiler/relay-compiler-config-schema.json index fdeff5cdd788c..2c0a9aad69038 100644 --- a/compiler/crates/relay-compiler/relay-compiler-config-schema.json +++ b/compiler/crates/relay-compiler/relay-compiler-config-schema.json @@ -1845,6 +1845,7 @@ "streamName": "stream", "useCustomizedBatchArg": "useCustomizedBatch" }, + "enableTokenField": false, "nodeInterfaceIdField": "id", "nodeInterfaceIdVariableName": "id", "nonNodeIdFields": null, @@ -1946,6 +1947,11 @@ }, "additionalProperties": false }, + "enableTokenField": { + "description": "If we should select __token field on fetchable types", + "default": false, + "type": "boolean" + }, "nodeInterfaceIdField": { "description": "The name of the `id` field that exists on the `Node` interface.", "default": "id", @@ -5486,6 +5492,7 @@ "streamName": "stream", "useCustomizedBatchArg": "useCustomizedBatch" }, + "enableTokenField": false, "nodeInterfaceIdField": "id", "nodeInterfaceIdVariableName": "id", "nonNodeIdFields": null, @@ -5587,6 +5594,11 @@ }, "additionalProperties": false }, + "enableTokenField": { + "description": "If we should select __token field on fetchable types", + "default": false, + "type": "boolean" + }, "nodeInterfaceIdField": { "description": "The name of the `id` field that exists on the `Node` interface.", "default": "id", diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-on-node-and-fetchable-arg.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-on-node-and-fetchable-arg.expected index 4e8fe2c933413..120dd981e118d 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-on-node-and-fetchable-arg.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-on-node-and-fetchable-arg.expected @@ -82,13 +82,6 @@ fragment refetchableFragmentOnNodeAndFetchableArg_RefetchableFragment on Fetchab "kind": "ScalarField", "name": "fetch_id", "storageKey": null - }, - { - "alias": null, - "args": null, - "kind": "ScalarField", - "name": "__token", - "storageKey": null } ], "storageKey": null @@ -119,7 +112,6 @@ query RefetchableFragmentQuery( fragment refetchableFragmentOnNodeAndFetchableArg_RefetchableFragment on FetchableType { id fetch_id - __token } @@ -154,13 +146,6 @@ fragment refetchableFragmentOnNodeAndFetchableArg_RefetchableFragment on Fetchab "kind": "ScalarField", "name": "fetch_id", "storageKey": null - }, - { - "alias": null, - "args": null, - "kind": "ScalarField", - "name": "__token", - "storageKey": null } ], "type": "FetchableType", diff --git a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-on-node-and-fetchable.expected b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-on-node-and-fetchable.expected index 460c33e7373dc..6b06a9dd96626 100644 --- a/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-on-node-and-fetchable.expected +++ b/compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-on-node-and-fetchable.expected @@ -84,13 +84,6 @@ fragment refetchableFragmentOnNodeAndFetchable_RefetchableFragment on FetchableT "kind": "ScalarField", "name": "fetch_id", "storageKey": null - }, - { - "alias": null, - "args": null, - "kind": "ScalarField", - "name": "__token", - "storageKey": null } ], "storageKey": null @@ -121,7 +114,6 @@ query RefetchableFragmentQuery( fragment refetchableFragmentOnNodeAndFetchable_RefetchableFragment on FetchableType { id fetch_id - __token } @@ -156,13 +148,6 @@ fragment refetchableFragmentOnNodeAndFetchable_RefetchableFragment on FetchableT "kind": "ScalarField", "name": "fetch_id", "storageKey": null - }, - { - "alias": null, - "args": null, - "kind": "ScalarField", - "name": "__token", - "storageKey": null } ], "type": "FetchableType", diff --git a/compiler/crates/relay-transforms/tests/refetchable_fragment.rs b/compiler/crates/relay-transforms/tests/refetchable_fragment.rs index 1bf80be1b247c..1e5a35968985e 100644 --- a/compiler/crates/relay-transforms/tests/refetchable_fragment.rs +++ b/compiler/crates/relay-transforms/tests/refetchable_fragment.rs @@ -8,6 +8,7 @@ use fixture_tests::Fixture; use graphql_test_helpers::apply_transform_for_test; use relay_config::DeferStreamInterface; +use relay_config::ProjectConfig; use relay_transforms::transform_connections; use relay_transforms::transform_refetchable_fragment; use relay_transforms::ConnectionInterface; @@ -21,12 +22,17 @@ pub async fn transform_fixture(fixture: &Fixture<'_>) -> Result false, ); let base_fragments = Default::default(); - transform_refetchable_fragment( - &program, - &Default::default(), - &base_fragments, - false, - vec![], - ) + let schema_config = if fixture.content.contains("// enable-token-field: true") { + let mut schema_config: relay_config::SchemaConfig = Default::default(); + schema_config.enable_token_field = true; + schema_config + } else { + Default::default() + }; + let project_config = ProjectConfig { + schema_config, + ..Default::default() + }; + transform_refetchable_fragment(&program, &project_config, &base_fragments, false, vec![]) }) } diff --git a/compiler/crates/relay-transforms/tests/refetchable_fragment/fixtures/fragment-on-non-node-fetchable-type-with-token-field.expected b/compiler/crates/relay-transforms/tests/refetchable_fragment/fixtures/fragment-on-non-node-fetchable-type-with-token-field.expected index d1678106443b3..33797b14a293b 100644 --- a/compiler/crates/relay-transforms/tests/refetchable_fragment/fixtures/fragment-on-non-node-fetchable-type-with-token-field.expected +++ b/compiler/crates/relay-transforms/tests/refetchable_fragment/fixtures/fragment-on-non-node-fetchable-type-with-token-field.expected @@ -49,6 +49,7 @@ fragment RefetchableFragment on NonNodeStory @refetchable(queryName: "Refetchabl # identifier_query_variable_name: "id", # }, # ), +# is_prefetchable_pagination: false, # } { actor { diff --git a/compiler/crates/relay-transforms/tests/refetchable_fragment/fixtures/refetchable-interface-but-no-implementing-types.expected b/compiler/crates/relay-transforms/tests/refetchable_fragment/fixtures/refetchable-interface-but-no-implementing-types.expected index b8974e7f3b0ed..a2f057ebf52ba 100644 --- a/compiler/crates/relay-transforms/tests/refetchable_fragment/fixtures/refetchable-interface-but-no-implementing-types.expected +++ b/compiler/crates/relay-transforms/tests/refetchable_fragment/fixtures/refetchable-interface-but-no-implementing-types.expected @@ -47,5 +47,4 @@ fragment RefetchableFragmentFoo on RefetchableInterfaceFoo @refetchable(queryNam # } { id - __token } diff --git a/compiler/crates/relay-transforms/tests/refetchable_fragment/mod.rs b/compiler/crates/relay-transforms/tests/refetchable_fragment/mod.rs deleted file mode 100644 index 721b97487402b..0000000000000 --- a/compiler/crates/relay-transforms/tests/refetchable_fragment/mod.rs +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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 fixture_tests::Fixture; -use graphql_test_helpers::apply_transform_for_test; -use relay_transforms::transform_connections; -use relay_transforms::transform_refetchable_fragment; -use relay_transforms::ConnectionInterface; - -pub fn transform_fixture(fixture: &Fixture<'_>) -> Result { - apply_transform_for_test(fixture, |program| { - let program = transform_connections(program, &ConnectionInterface::default()); - let base_fragments = Default::default(); - let schema_config = if fixture.content.contains("// enable-token-field: true") { - let mut schema_config: relay_config::SchemaConfig = Default::default(); - schema_config.enable_token_field = true; - schema_config - } else { - Default::default() - }; - transform_refetchable_fragment(&program, &schema_config, &base_fragments, false) - }) -} diff --git a/compiler/crates/relay-transforms/tests/refetchable_fragment_test.rs b/compiler/crates/relay-transforms/tests/refetchable_fragment_test.rs index ade8bd191fe97..37361a535d108 100644 --- a/compiler/crates/relay-transforms/tests/refetchable_fragment_test.rs +++ b/compiler/crates/relay-transforms/tests/refetchable_fragment_test.rs @@ -4,7 +4,11 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * +<<<<<<< HEAD * @generated SignedSource<<733f08cd406c19e1403b12a718566e81>> +======= + * @generated SignedSource<> +>>>>>>> 7e5452881068 (update fixtures) */ mod refetchable_fragment;