Skip to content

Align schema formatting closer to prettier #9613

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

Merged
tobias-tengler merged 5 commits into from
Apr 28, 2026
Merged

Align schema formatting closer to prettier #9613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9269b0d
Align schema formatting closer to prettier
tobias-tengler Apr 28, 2026
2d7fd7b
Fix snapshots
tobias-tengler Apr 28, 2026
a7f256c
Address Copilot feedback
tobias-tengler Apr 28, 2026
d3d014f
Cleanup
tobias-tengler Apr 28, 2026
3a518a3
Keep not printing explicit null default value
tobias-tengler Apr 28, 2026
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: 7 additions & 2 deletions ...tificationSchema/AnnotationBased/__snapshots__/CertificationTests.Schema_Snapshot.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
schema
@link(url: "https://specs.apollo.dev/federation/v2.6", import: ["@external", "@key", "@provides", "@tag", "FieldSet"]) {
@link(
url: "https://specs.apollo.dev/federation/v2.6"
import: ["@external", "@key", "@provides", "@tag", "FieldSet"]
) {
query: Query
}

Expand Down Expand Up @@ -53,7 +56,9 @@ scalar FieldSet
directive @external on OBJECT | FIELD_DEFINITION

"Used to indicate a combination of fields that can be used to uniquely identify and fetch an object or interface."
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on
| OBJECT
| INTERFACE

"Links definitions within the document to external schemas."
directive @link(
Expand Down
9 changes: 7 additions & 2 deletions ...ts/CertificationSchema/AnnotationBased/__snapshots__/CertificationTests.Subgraph_SDL.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
schema
@link(url: "https://specs.apollo.dev/federation/v2.6", import: ["@external", "@key", "@provides", "@tag", "FieldSet"]) {
@link(
url: "https://specs.apollo.dev/federation/v2.6"
import: ["@external", "@key", "@provides", "@tag", "FieldSet"]
) {
query: Query
}

Expand Down Expand Up @@ -53,7 +56,9 @@ scalar FieldSet
directive @external on OBJECT | FIELD_DEFINITION

"Used to indicate a combination of fields that can be used to uniquely identify and fetch an object or interface."
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on
| OBJECT
| INTERFACE

"Links definitions within the document to external schemas."
directive @link(
Expand Down
9 changes: 7 additions & 2 deletions ...ts/CertificationSchema/CodeFirst/__snapshots__/CertificationTests.Schema_Snapshot.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
schema
@link(url: "https://specs.apollo.dev/federation/v2.6", import: ["@external", "@key", "@provides", "@tag", "FieldSet"]) {
@link(
url: "https://specs.apollo.dev/federation/v2.6"
import: ["@external", "@key", "@provides", "@tag", "FieldSet"]
) {
query: Query
}

Expand Down Expand Up @@ -53,7 +56,9 @@ scalar FieldSet
directive @external on OBJECT | FIELD_DEFINITION

"Used to indicate a combination of fields that can be used to uniquely identify and fetch an object or interface."
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on
| OBJECT
| INTERFACE

"Links definitions within the document to external schemas."
directive @link(
Expand Down
9 changes: 7 additions & 2 deletions ...on.Tests/CertificationSchema/CodeFirst/__snapshots__/CertificationTests.Subgraph_SDL.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
schema
@link(url: "https://specs.apollo.dev/federation/v2.6", import: ["@external", "@key", "@provides", "@tag", "FieldSet"]) {
@link(
url: "https://specs.apollo.dev/federation/v2.6"
import: ["@external", "@key", "@provides", "@tag", "FieldSet"]
) {
query: Query
}

Expand Down Expand Up @@ -53,7 +56,9 @@ scalar FieldSet
directive @external on OBJECT | FIELD_DEFINITION

"Used to indicate a combination of fields that can be used to uniquely identify and fetch an object or interface."
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on
| OBJECT
| INTERFACE

"Links definitions within the document to external schemas."
directive @link(
Expand Down
9 changes: 7 additions & 2 deletions .../Directives/__snapshots__/ComposeDirectiveTests.ExportDirectiveUsingNameCodeFirst.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
schema
@composeDirective(name: "@custom")
@link(url: "https://specs.apollo.dev/federation/v2.6", import: ["@composeDirective", "@key", "@tag", "FieldSet"])
@link(
url: "https://specs.apollo.dev/federation/v2.6"
import: ["@composeDirective", "@key", "@tag", "FieldSet"]
)
@link(url: "https://specs.custom.dev/custom/v1.0", import: ["@custom"]) {
query: Query
}
Expand Down Expand Up @@ -34,7 +37,9 @@ directive @composeDirective(name: String!) repeatable on SCHEMA
directive @custom on FIELD_DEFINITION

"Used to indicate a combination of fields that can be used to uniquely identify and fetch an object or interface."
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on
| OBJECT
| INTERFACE

"Links definitions within the document to external schemas."
directive @link(
Expand Down
9 changes: 7 additions & 2 deletions .../Directives/__snapshots__/ComposeDirectiveTests.ExportDirectiveUsingTypeCodeFirst.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
schema
@composeDirective(name: "@custom")
@link(url: "https://specs.apollo.dev/federation/v2.6", import: ["@composeDirective", "@key", "@tag", "FieldSet"])
@link(
url: "https://specs.apollo.dev/federation/v2.6"
import: ["@composeDirective", "@key", "@tag", "FieldSet"]
)
@link(url: "https://specs.custom.dev/custom/v1.0", import: ["@custom"]) {
query: Query
}
Expand Down Expand Up @@ -34,7 +37,9 @@ directive @composeDirective(name: String!) repeatable on SCHEMA
directive @custom on FIELD_DEFINITION

"Used to indicate a combination of fields that can be used to uniquely identify and fetch an object or interface."
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on
| OBJECT
| INTERFACE

"Links definitions within the document to external schemas."
directive @link(
Expand Down
9 changes: 7 additions & 2 deletions ...s/__snapshots__/ExternalDirectiveTests.AnnotateExternalToTypeFieldAnnotationBased.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
schema
@link(url: "https://specs.apollo.dev/federation/v2.6", import: ["@external", "@key", "@tag", "FieldSet"]) {
@link(
url: "https://specs.apollo.dev/federation/v2.6"
import: ["@external", "@key", "@tag", "FieldSet"]
) {
query: Query
}

Expand Down Expand Up @@ -38,7 +41,9 @@ scalar FieldSet
directive @external on OBJECT | FIELD_DEFINITION

"Used to indicate a combination of fields that can be used to uniquely identify and fetch an object or interface."
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on
| OBJECT
| INTERFACE

"Links definitions within the document to external schemas."
directive @link(
Expand Down
9 changes: 7 additions & 2 deletions ...ectives/__snapshots__/ExternalDirectiveTests.AnnotateExternalToTypeFieldCodeFirst.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
schema
@link(url: "https://specs.apollo.dev/federation/v2.6", import: ["@external", "@key", "@tag", "FieldSet"]) {
@link(
url: "https://specs.apollo.dev/federation/v2.6"
import: ["@external", "@key", "@tag", "FieldSet"]
) {
query: Query
}

Expand Down Expand Up @@ -38,7 +41,9 @@ scalar FieldSet
directive @external on OBJECT | FIELD_DEFINITION

"Used to indicate a combination of fields that can be used to uniquely identify and fetch an object or interface."
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on
| OBJECT
| INTERFACE

"Links definitions within the document to external schemas."
directive @link(
Expand Down
9 changes: 7 additions & 2 deletions ...ctives/__snapshots__/KeyDirectiveTests.AnnotateKeyToClassAttributeAnnotationBased.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
schema
@link(url: "https://specs.apollo.dev/federation/v2.6", import: ["@key", "@tag", "FieldSet"]) {
@link(
url: "https://specs.apollo.dev/federation/v2.6"
import: ["@key", "@tag", "FieldSet"]
) {
query: QueryOfTestTypePropertyDirective
}

Expand Down Expand Up @@ -28,7 +31,9 @@ scalar _Any
scalar FieldSet

"Used to indicate a combination of fields that can be used to uniquely identify and fetch an object or interface."
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on
| OBJECT
| INTERFACE

"Links definitions within the document to external schemas."
directive @link(
Expand Down
9 changes: 7 additions & 2 deletions ...tives/__snapshots__/KeyDirectiveTests.AnnotateKeyToClassAttributesAnnotationBased.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
schema
@link(url: "https://specs.apollo.dev/federation/v2.6", import: ["@key", "@tag", "FieldSet"]) {
@link(
url: "https://specs.apollo.dev/federation/v2.6"
import: ["@key", "@tag", "FieldSet"]
) {
query: QueryOfTestTypePropertyDirectives
}

Expand Down Expand Up @@ -29,7 +32,9 @@ scalar _Any
scalar FieldSet

"Used to indicate a combination of fields that can be used to uniquely identify and fetch an object or interface."
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on
| OBJECT
| INTERFACE

"Links definitions within the document to external schemas."
directive @link(
Expand Down
9 changes: 7 additions & 2 deletions ...s/__snapshots__/KeyDirectiveTests.AnnotateKeyToInterfaceAttributesAnnotationBased.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
schema
@link(url: "https://specs.apollo.dev/federation/v2.6", import: ["@key", "@tag", "FieldSet"]) {
@link(
url: "https://specs.apollo.dev/federation/v2.6"
import: ["@key", "@tag", "FieldSet"]
) {
query: QueryOfTestTypeClassDirective
}

Expand Down Expand Up @@ -33,7 +36,9 @@ scalar _Any
scalar FieldSet

"Used to indicate a combination of fields that can be used to uniquely identify and fetch an object or interface."
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on
| OBJECT
| INTERFACE

"Links definitions within the document to external schemas."
directive @link(
Expand Down
9 changes: 7 additions & 2 deletions ...ts/Directives/__snapshots__/KeyDirectiveTests.AnnotateKeyToInterfaceTypeCodeFirst.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
schema
@link(url: "https://specs.apollo.dev/federation/v2.6", import: ["@key", "@tag", "FieldSet"]) {
@link(
url: "https://specs.apollo.dev/federation/v2.6"
import: ["@key", "@tag", "FieldSet"]
) {
query: Query
}

Expand Down Expand Up @@ -34,7 +37,9 @@ scalar _Any
scalar FieldSet

"Used to indicate a combination of fields that can be used to uniquely identify and fetch an object or interface."
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on
| OBJECT
| INTERFACE

"Links definitions within the document to external schemas."
directive @link(
Expand Down
9 changes: 7 additions & 2 deletions ...Directives/__snapshots__/KeyDirectiveTests.AnnotateKeyToObjectTypeAnnotationBased.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
schema
@link(url: "https://specs.apollo.dev/federation/v2.6", import: ["@key", "@tag", "FieldSet"]) {
@link(
url: "https://specs.apollo.dev/federation/v2.6"
import: ["@key", "@tag", "FieldSet"]
) {
query: QueryOfTestTypeClassDirective
}

Expand Down Expand Up @@ -28,7 +31,9 @@ scalar _Any
scalar FieldSet

"Used to indicate a combination of fields that can be used to uniquely identify and fetch an object or interface."
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on
| OBJECT
| INTERFACE

"Links definitions within the document to external schemas."
directive @link(
Expand Down
9 changes: 7 additions & 2 deletions ...Tests/Directives/__snapshots__/KeyDirectiveTests.AnnotateKeyToObjectTypeCodeFirst.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
schema
@link(url: "https://specs.apollo.dev/federation/v2.6", import: ["@key", "@tag", "FieldSet"]) {
@link(
url: "https://specs.apollo.dev/federation/v2.6"
import: ["@key", "@tag", "FieldSet"]
) {
query: Query
}

Expand Down Expand Up @@ -29,7 +32,9 @@ scalar _Any
scalar FieldSet

"Used to indicate a combination of fields that can be used to uniquely identify and fetch an object or interface."
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on
| OBJECT
| INTERFACE

"Links definitions within the document to external schemas."
directive @link(
Expand Down
9 changes: 7 additions & 2 deletions ...shots__/NonResolvableKeyDirectiveTests.AnnotateKeyToClassAttributeAnnotationBased.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
schema
@link(url: "https://specs.apollo.dev/federation/v2.6", import: ["@key", "@tag", "FieldSet"]) {
@link(
url: "https://specs.apollo.dev/federation/v2.6"
import: ["@key", "@tag", "FieldSet"]
) {
query: QueryOfTestTypePropertyDirective
}

Expand All @@ -24,7 +27,9 @@ scalar _Any
scalar FieldSet

"Used to indicate a combination of fields that can be used to uniquely identify and fetch an object or interface."
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on
| OBJECT
| INTERFACE

"Links definitions within the document to external schemas."
directive @link(
Expand Down
9 changes: 7 additions & 2 deletions ...hots__/NonResolvableKeyDirectiveTests.AnnotateKeyToClassAttributesAnnotationBased.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
schema
@link(url: "https://specs.apollo.dev/federation/v2.6", import: ["@key", "@tag", "FieldSet"]) {
@link(
url: "https://specs.apollo.dev/federation/v2.6"
import: ["@key", "@tag", "FieldSet"]
) {
query: QueryOfTestTypePropertyDirectives
}

Expand All @@ -25,7 +28,9 @@ scalar _Any
scalar FieldSet

"Used to indicate a combination of fields that can be used to uniquely identify and fetch an object or interface."
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on
| OBJECT
| INTERFACE

"Links definitions within the document to external schemas."
directive @link(
Expand Down
9 changes: 7 additions & 2 deletions ...__/NonResolvableKeyDirectiveTests.AnnotateKeyToInterfaceAttributesAnnotationBased.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
schema
@link(url: "https://specs.apollo.dev/federation/v2.6", import: ["@key", "@tag", "FieldSet"]) {
@link(
url: "https://specs.apollo.dev/federation/v2.6"
import: ["@key", "@tag", "FieldSet"]
) {
query: QueryOfTestTypeClassDirective
}

Expand Down Expand Up @@ -29,7 +32,9 @@ scalar _Any
scalar FieldSet

"Used to indicate a combination of fields that can be used to uniquely identify and fetch an object or interface."
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on
| OBJECT
| INTERFACE

"Links definitions within the document to external schemas."
directive @link(
Expand Down
9 changes: 7 additions & 2 deletions .../__snapshots__/NonResolvableKeyDirectiveTests.AnnotateKeyToInterfaceTypeCodeFirst.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
schema
@link(url: "https://specs.apollo.dev/federation/v2.6", import: ["@key", "@tag", "FieldSet"]) {
@link(
url: "https://specs.apollo.dev/federation/v2.6"
import: ["@key", "@tag", "FieldSet"]
) {
query: Query
}

Expand Down Expand Up @@ -39,7 +42,9 @@ scalar _Any
scalar FieldSet

"Used to indicate a combination of fields that can be used to uniquely identify and fetch an object or interface."
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on OBJECT | INTERFACE
directive @key(fields: FieldSet!, resolvable: Boolean = true) repeatable on
| OBJECT
| INTERFACE

"Links definitions within the document to external schemas."
directive @link(
Expand Down
Loading
Loading