Skip to content

fix(provided-variables): import provided variable before type section #5028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+386 −136
Open

fix(provided-variables): import provided variable before type section #5028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions compiler/crates/relay-compiler/src/artifact_content/content.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,15 +361,32 @@ pub fn generate_operation(
content_sections.push(ContentSection::CommentAnnotations(section));
// -- End Metadata Annotations Section --

// -- Begin Types Section --
let mut section = GenericSection::default();
let generated_types = ArtifactGeneratedTypes::from_operation(
typegen_operation,
skip_types,
request_parameters.is_client_request(),
project_config.typegen_config.language,
);

let mut top_level_statements = Default::default();
// -- Begin Query Node Section --
let request = printer.print_request(
schema,
normalization_operation,
&operation_fragment,
request_parameters,
&mut top_level_statements,
);

// -- Begin Top Level Statements Section --
let mut section: GenericSection = GenericSection::default();
write!(section, "{}", &top_level_statements)?;
content_sections.push(ContentSection::Generic(section));
// -- End Top Level Statements Section --

// -- Begin Types Section --
let mut section = GenericSection::default();

if project_config.typegen_config.language == TypegenLanguage::Flow {
writeln!(section, "/*::")?;
}
Expand Down Expand Up @@ -404,22 +421,6 @@ pub fn generate_operation(
content_sections.push(ContentSection::Generic(section));
// -- End Types Section --

let mut top_level_statements = Default::default();
// -- Begin Query Node Section --
let request = printer.print_request(
schema,
normalization_operation,
&operation_fragment,
request_parameters,
&mut top_level_statements,
);

// -- Begin Top Level Statements Section --
let mut section: GenericSection = GenericSection::default();
write!(section, "{}", &top_level_statements)?;
content_sections.push(ContentSection::Generic(section));
// -- End Top Level Statements Section --

let mut section = GenericSection::default();
write_variable_value_with_type(
&project_config.typegen_config.language,
Expand Down
6 changes: 3 additions & 3 deletions ...elay-compiler/tests/relay_compiler_integration/fixtures/client_mutation_resolver.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ type Query {
==================================== OUTPUT ===================================
//- __generated__/barMutation.graphql.js
/**
* <auto-generated> SignedSource<<9c253a512cbd9b531ef5c5c5feb60982>>
* <auto-generated> SignedSource<<e2956199e2553fdcfa041c41e686056e>>
* @flow
* @lightSyntaxTransform
* @nogrep
Expand All @@ -40,6 +40,8 @@ type Query {

'use strict';

import {foo_mutation as mutationFooMutationResolver} from '../foo';

/*::
import type { ClientRequest, Mutation } from 'relay-runtime';
import {foo_mutation as mutationFooMutationResolverType} from "../foo.js";
Expand All @@ -56,8 +58,6 @@ export type barMutation = {|
|};
*/

import {foo_mutation as mutationFooMutationResolver} from '../foo';

var node/*: ClientRequest*/ = {
"fragment": {
"argumentDefinitions": [],
Expand Down
6 changes: 3 additions & 3 deletions ...lay_compiler_integration/fixtures/client_mutation_resolver_different_mutation_ok.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export default node;

//- __generated__/barMutation.graphql.js
/**
* <auto-generated> SignedSource<<e3b0a17c6085284ff8900e05b13dad99>>
* <auto-generated> SignedSource<<f0ac5ea52e11a073652cab7259022fb2>>
* @flow
* @lightSyntaxTransform
* @nogrep
Expand All @@ -117,6 +117,8 @@ export default node;

'use strict';

import {baz_mutation as notCalledMutationBazMutationResolver} from '../foo';

/*::
import type { ClientRequest, Mutation } from 'relay-runtime';
import {baz_mutation as notCalledMutationBazMutationResolverType} from "../foo.js";
Expand All @@ -133,8 +135,6 @@ export type barMutation = {|
|};
*/

import {baz_mutation as notCalledMutationBazMutationResolver} from '../foo';

var node/*: ClientRequest*/ = {
"fragment": {
"argumentDefinitions": [],
Expand Down
16 changes: 8 additions & 8 deletions ...mpiler_integration/fixtures/client_schema_extension_interface_uses_resolver_type.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ export default ((node/*: any*/)/*: Fragment<

//- __generated__/PersonComponentQuery.graphql.js
/**
* <auto-generated> SignedSource<<2d07c1150de22f2bad1b3141700c5cc0>>
* <auto-generated> SignedSource<<124c24d113c605bce4a96989129257a4>>
* @flow
* @lightSyntaxTransform
* @nogrep
Expand All @@ -186,6 +186,13 @@ export default ((node/*: any*/)/*: Fragment<

'use strict';

import {Admin as adminRelayModelInstanceResolver} from 'Admin';
import {admin as adminAdminResolver} from 'Admin';
import {boss as queryBossResolver} from 'Admin';
import Admin____relay_model_instance_graphql from 'Admin____relay_model_instance.graphql';
import Admin__id_graphql from 'Admin__id.graphql';
import {resolverDataInjector} from 'relay-runtime/experimental';

/*::
import type { ClientRequest, ClientQuery } from 'relay-runtime';
import type { DataID } from "relay-runtime";
Expand Down Expand Up @@ -218,13 +225,6 @@ export type PersonComponentQuery = {|
|};
*/

import {Admin as adminRelayModelInstanceResolver} from 'Admin';
import {admin as adminAdminResolver} from 'Admin';
import {boss as queryBossResolver} from 'Admin';
import Admin____relay_model_instance_graphql from 'Admin____relay_model_instance.graphql';
import Admin__id_graphql from 'Admin__id.graphql';
import {resolverDataInjector} from 'relay-runtime/experimental';

var node/*: ClientRequest*/ = (function(){
var v0 = {
"args": null,
Expand Down
18 changes: 9 additions & 9 deletions ...er_integration/fixtures/multiple_resolvers_on_interface_of_all_strong_model_type.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ export default ((node/*: any*/)/*: Fragment<

//- __generated__/PersonComponentQuery.graphql.js
/**
* <auto-generated> SignedSource<<e0022cdfb92fda66bd256d91ed716cdc>>
* <auto-generated> SignedSource<<63eed724432f1c9c48a557c49e7612f0>>
* @flow
* @lightSyntaxTransform
* @nogrep
Expand All @@ -193,6 +193,14 @@ export default ((node/*: any*/)/*: Fragment<

'use strict';

import Admin____relay_model_instance_graphql from 'Admin____relay_model_instance.graphql';
import {description as adminDescriptionResolver} from 'IActorResolvers';
import {description as userDescriptionResolver} from 'IActorResolvers';
import {name as adminNameResolver} from 'IPersonResolvers';
import {name as userNameResolver} from 'IPersonResolvers';
import User____relay_model_instance_graphql from 'User____relay_model_instance.graphql';
import {resolverDataInjector} from 'relay-runtime/experimental';

/*::
import type { ClientRequest, ClientQuery } from 'relay-runtime';
import type { Admin____relay_model_instance$data } from "Admin____relay_model_instance.graphql";
Expand Down Expand Up @@ -224,14 +232,6 @@ export type PersonComponentQuery = {|
|};
*/

import Admin____relay_model_instance_graphql from 'Admin____relay_model_instance.graphql';
import {description as adminDescriptionResolver} from 'IActorResolvers';
import {description as userDescriptionResolver} from 'IActorResolvers';
import {name as adminNameResolver} from 'IPersonResolvers';
import {name as userNameResolver} from 'IPersonResolvers';
import User____relay_model_instance_graphql from 'User____relay_model_instance.graphql';
import {resolverDataInjector} from 'relay-runtime/experimental';

var node/*: ClientRequest*/ = (function(){
var v0 = {
"args": null,
Expand Down
18 changes: 9 additions & 9 deletions ...egration/fixtures/multiple_resolvers_returns_interfaces_of_all_strong_model_type.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ export default ((node/*: any*/)/*: Fragment<

//- __generated__/PersonComponentQuery.graphql.js
/**
* <auto-generated> SignedSource<<412e97e1ab4e0e6ee91f6302ee11a247>>
* <auto-generated> SignedSource<<eb5902cfcc0de4c81d031c4f9634542f>>
* @flow
* @lightSyntaxTransform
* @nogrep
Expand All @@ -202,6 +202,14 @@ export default ((node/*: any*/)/*: Fragment<

'use strict';

import {description as adminDescriptionResolver} from 'AdminTypeResolvers';
import {name as adminNameResolver} from 'AdminTypeResolvers';
import Admin____relay_model_instance_graphql from 'Admin____relay_model_instance.graphql';
import {description as userDescriptionResolver} from 'UserTypeResolvers';
import {name as userNameResolver} from 'UserTypeResolvers';
import User____relay_model_instance_graphql from 'User____relay_model_instance.graphql';
import {resolverDataInjector} from 'relay-runtime/experimental';

/*::
import type { ClientRequest, ClientQuery } from 'relay-runtime';
export type PersonComponentQuery$variables = {||};
Expand All @@ -219,14 +227,6 @@ export type PersonComponentQuery = {|
|};
*/

import {description as adminDescriptionResolver} from 'AdminTypeResolvers';
import {name as adminNameResolver} from 'AdminTypeResolvers';
import Admin____relay_model_instance_graphql from 'Admin____relay_model_instance.graphql';
import {description as userDescriptionResolver} from 'UserTypeResolvers';
import {name as userNameResolver} from 'UserTypeResolvers';
import User____relay_model_instance_graphql from 'User____relay_model_instance.graphql';
import {resolverDataInjector} from 'relay-runtime/experimental';

var node/*: ClientRequest*/ = (function(){
var v0 = {
"args": null,
Expand Down
Loading