Skip to content

prints independent operation name #393

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 2 commits into
base: main
Choose a base branch
from
Open

prints independent operation name #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ab9e58
prints independent operation name
vasilich6107 May 21, 2025
e3d6520
review fixes
vasilich6107 Jul 1, 2025
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
9 changes: 9 additions & 0 deletions packages/graphql_codegen/lib/src/printer/base/operation.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ List<Spec> printOperationSpecs(PrintContext<ContextOperation> elementContext) {
final context = elementContext.context;
final operation = context.operation;
final clients = context.config.clients;

return [
if (context.hasVariables) ...printVariableClasses(elementContext),
printContext(elementContext),
Expand All @@ -20,6 +21,14 @@ List<Spec> printOperationSpecs(PrintContext<ContextOperation> elementContext) {
elementContext,
operation,
),
if (operation?.name != null)
Field(
(b) => b
..modifier = FieldModifier.constant
..name = elementContext.namePrinter
.printOperationNameConstantName(elementContext.context.path)
..assignment = literalString(operation!.name!.value).code,
),
if (clients.contains(GraphQLCodegenConfigClient.graphql) ||
clients.contains(GraphQLCodegenConfigClient.graphqlFlutter))
...printGraphQLClientSpecs(elementContext),
Expand Down
40 changes: 26 additions & 14 deletions packages/graphql_codegen/lib/src/printer/clients/graphql.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,12 @@ Spec printQueryOptions(PrintContext<ContextOperation> c) {
'variables': refer('variables')
.nullSafeProperty('toJson')
.call([]).ifNullThen(literalMap({})),
'operationName': _printOperationName(c),
'operationName': refer('operationName').ifNullThen(
refer(
c.namePrinter
.printOperationNameConstantName(c.context.path),
),
),
'fetchPolicy': refer('fetchPolicy'),
'errorPolicy': refer('errorPolicy'),
'cacheRereadPolicy': refer('cacheRereadPolicy'),
Expand All @@ -199,16 +204,6 @@ Spec printQueryOptions(PrintContext<ContextOperation> c) {
);
}

Expression _printOperationName(PrintContext<ContextOperation> c) {
final operationName = c.context.operation?.name?.value;
if (!c.context.config.setOperationName || operationName == null) {
return refer('operationName');
}
return refer('operationName').ifNullThen(
literalString(operationName),
);
}

Spec printSubscriptionOptions(PrintContext<ContextOperation> c) {
final context = c.context;
return Class(
Expand All @@ -218,6 +213,7 @@ Spec printSubscriptionOptions(PrintContext<ContextOperation> c) {
"graphql.SubscriptionOptions",
refer(c.namePrinter.printClassName(context.path)),
)
..fields = ListBuilder([])
..constructors = ListBuilder([
Constructor(
(b) => b
Expand Down Expand Up @@ -267,7 +263,12 @@ Spec printSubscriptionOptions(PrintContext<ContextOperation> c) {
'variables': refer('variables')
.nullSafeProperty('toJson')
.call([]).ifNullThen(literalMap({})),
'operationName': _printOperationName(c),
'operationName': refer('operationName').ifNullThen(
refer(
c.namePrinter
.printOperationNameConstantName(c.context.path),
),
),
'fetchPolicy': refer('fetchPolicy'),
'errorPolicy': refer('errorPolicy'),
'cacheRereadPolicy': refer('cacheRereadPolicy'),
Expand Down Expand Up @@ -554,7 +555,12 @@ Spec printMutationOptions(
'variables': refer('variables')
.nullSafeProperty('toJson')
.call([]).ifNullThen(literalMap({})),
'operationName': _printOperationName(c),
'operationName': refer('operationName').ifNullThen(
refer(
c.namePrinter
.printOperationNameConstantName(c.context.path),
),
),
'fetchPolicy': refer('fetchPolicy'),
'errorPolicy': refer('errorPolicy'),
'cacheRereadPolicy': refer('cacheRereadPolicy'),
Expand Down Expand Up @@ -594,6 +600,7 @@ Spec printWatchOptions(
..extend = TypeReference((b) => b
..symbol = "graphql.WatchQueryOptions"
..types = ListBuilder([refer(c.namePrinter.printClassName(c.path))]))
..fields = ListBuilder([])
..constructors = ListBuilder([
Constructor(
(b) => b
Expand Down Expand Up @@ -658,7 +665,12 @@ Spec printWatchOptions(
'variables': refer('variables')
.nullSafeProperty('toJson')
.call([]).ifNullThen(literalMap({})),
'operationName': _printOperationName(c),
'operationName': refer('operationName').ifNullThen(
refer(
c.namePrinter
.printOperationNameConstantName(c.context.path),
),
),
'fetchPolicy': refer('fetchPolicy'),
'errorPolicy': refer('errorPolicy'),
'cacheRereadPolicy': refer('cacheRereadPolicy'),
Expand Down
6 changes: 6 additions & 0 deletions packages/graphql_codegen/lib/src/printer/utils.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,12 @@ class NamePrinter {
String printGraphQLFlutterClientOperationName(Name name) =>
"${printName(name)}${separator}Widget";

String printOperationNameDefinition(Name name) =>
"operationName${printName(name)}";

String printOperationNameConstantName(Name name) =>
"operationName${printName(name)}";

String printGraphQLFlutterClientMutationHookResultName(Name name) =>
"${printName(name)}${separator}HookResult";

Expand Down
1 change: 1 addition & 0 deletions packages/graphql_codegen/test/assets/add_typenames/schema.graphql.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,6 +792,7 @@ const documentNodeQueryQ = DocumentNode(definitions: [
),
fragmentDefinitionFReport,
]);
const operationNameQuery$Q = 'Q';

class Query$Q$docsWithTypename {
Query$Q$docsWithTypename({required this.$__typename});
Expand Down
1 change: 1 addition & 0 deletions packages/graphql_codegen/test/assets/condition_example/query.graphql.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,3 +176,4 @@ const documentNodeQueryFetchShouldRender = DocumentNode(definitions: [
fragmentDefinitionCondition,
fragmentDefinitionNonCompositeCondition,
]);
const operationNameQuery$FetchShouldRender = 'FetchShouldRender';
1 change: 1 addition & 0 deletions packages/graphql_codegen/test/assets/copy_with/document.graphql.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,7 @@ const documentNodeQueryFoobar = DocumentNode(definitions: [
]),
),
]);
const operationNameQuery$Foobar = 'Foobar';

class Query$Foobar$ts {
Query$Foobar$ts({
Expand Down
1 change: 1 addition & 0 deletions packages/graphql_codegen/test/assets/custom_enums/document_2.graphql.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,3 +147,4 @@ const documentNodeQueryQ = DocumentNode(definitions: [
]),
),
]);
const operationNameQuery$Q = 'Q';
1 change: 1 addition & 0 deletions packages/graphql_codegen/test/assets/deprecated/document.graphql.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,4 +366,5 @@ const documentNodeQueryQ = DocumentNode(definitions: [
]),
),
]);
const operationNameQuery$Q = 'Q';
const possibleTypesMap = <String, Set<String>>{};
1 change: 1 addition & 0 deletions packages/graphql_codegen/test/assets/disable_copy_with/document.graphql.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,7 @@ const documentNodeQueryFetchScalars = DocumentNode(definitions: [
fragmentDefinitionFA,
fragmentDefinitionFB,
]);
const operationNameQuery$FetchScalars = 'FetchScalars';

class Query$FetchScalars$data {
Query$FetchScalars$data({required this.$__typename});
Expand Down
1 change: 1 addition & 0 deletions packages/graphql_codegen/test/assets/enums/query.graphql.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,3 +156,4 @@ const documentNodeQueryFoobar = DocumentNode(definitions: [
]),
),
]);
const operationNameQuery$Foobar = 'Foobar';
2 changes: 2 additions & 0 deletions packages/graphql_codegen/test/assets/extends/document.graphql.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,7 @@ const documentNodeQueryQ = DocumentNode(definitions: [
]),
),
]);
const operationNameQuery$Q = 'Q';

class Query$Q$i {
Query$Q$i({
Expand Down Expand Up @@ -834,4 +835,5 @@ const documentNodeMutationM = DocumentNode(definitions: [
]),
),
]);
const operationNameMutation$M = 'M';
const possibleTypesMap = <String, Set<String>>{};
1 change: 1 addition & 0 deletions packages/graphql_codegen/test/assets/first_test/a.graphql.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,3 +123,4 @@ const documentNodeQueryFetchName = DocumentNode(definitions: [
),
fragmentDefinitionF,
]);
const operationNameQuery$FetchName = 'FetchName';
1 change: 1 addition & 0 deletions packages/graphql_codegen/test/assets/fragment_and_field/document.graphql.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,7 @@ const documentNodeQueryQ = DocumentNode(definitions: [
),
fragmentDefinitionFPerson,
]);
const operationNameQuery$Q = 'Q';

class Query$Q$person {
Query$Q$person({
Expand Down
1 change: 1 addition & 0 deletions packages/graphql_codegen/test/assets/fragment_imports/document2.graphql.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ const documentNodeQueryQ = DocumentNode(definitions: [
fragmentDefinitionF1,
fragmentDefinitionF2,
]);
const operationNameQuery$Q = 'Q';

class Query$Q$t implements Fragment$F1 {
Query$Q$t({this.name});
Expand Down
1 change: 1 addition & 0 deletions packages/graphql_codegen/test/assets/fragment_override/document.graphql.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,4 +1000,5 @@ const documentNodeQueryQ = DocumentNode(definitions: [
fragmentDefinitionT1,
fragmentDefinitionT2,
]);
const operationNameQuery$Q = 'Q';
const possibleTypesMap = <String, Set<String>>{};
5 changes: 3 additions & 2 deletions packages/graphql_codegen/test/assets/fragment_variables_2/schema.graphql.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,7 @@ const documentNodeQueryQ = DocumentNode(definitions: [
),
fragmentDefinitionNameNode,
]);
const operationNameQuery$Q = 'Q';
Query$Q _parserFn$Query$Q(Map<String, dynamic> data) => Query$Q.fromJson(data);
typedef OnQueryComplete$Query$Q = FutureOr<void> Function(
Map<String, dynamic>?,
Expand All @@ -770,7 +771,7 @@ class Options$Query$Q extends graphql.QueryOptions<Query$Q> {
}) : onCompleteWithParsed = onComplete,
super(
variables: variables.toJson(),
operationName: operationName,
operationName: operationName ?? operationNameQuery$Q,
fetchPolicy: fetchPolicy,
errorPolicy: errorPolicy,
cacheRereadPolicy: cacheRereadPolicy,
Expand Down Expand Up @@ -815,7 +816,7 @@ class WatchOptions$Query$Q extends graphql.WatchQueryOptions<Query$Q> {
bool fetchResults = false,
}) : super(
variables: variables.toJson(),
operationName: operationName,
operationName: operationName ?? operationNameQuery$Q,
fetchPolicy: fetchPolicy,
errorPolicy: errorPolicy,
cacheRereadPolicy: cacheRereadPolicy,
Expand Down
1 change: 1 addition & 0 deletions ...s/graphql_codegen/test/assets/fragments_and_loose_type_requirements/document.graphql.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,7 @@ const documentNodeQueryQ = DocumentNode(definitions: [
),
fragmentDefinitionF,
]);
const operationNameQuery$Q = 'Q';

class Query$Q$t implements Fragment$F$$T {
Query$Q$t({
Expand Down
1 change: 1 addition & 0 deletions packages/graphql_codegen/test/assets/fragments_inheritence/document.graphql.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2321,6 +2321,7 @@ const documentNodeQueryFetch = DocumentNode(definitions: [
fragmentDefinitionF,
fragmentDefinitionF2,
]);
const operationNameQuery$Fetch = 'Fetch';
const possibleTypesMap = <String, Set<String>>{
'Type': {'T1'}
};
1 change: 1 addition & 0 deletions packages/graphql_codegen/test/assets/fragments_nested_data/document.graphql.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,4 +782,5 @@ const documentNodeQueryFetch = DocumentNode(definitions: [
fragmentDefinitionF3,
fragmentDefinitionF4,
]);
const operationNameQuery$Fetch = 'Fetch';
const possibleTypesMap = <String, Set<String>>{};
1 change: 1 addition & 0 deletions packages/graphql_codegen/test/assets/gql_extensions/document.gql.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,4 +328,5 @@ const documentNodeQueryFetchCount = DocumentNode(definitions: [
]),
),
]);
const operationNameQuery$FetchCount = 'FetchCount';
const possibleTypesMap = <String, Set<String>>{};
Loading