Skip to content

Commit 1951969

Browse files
authored
Merge branch 'main' into streams-editorial-suggestions
2 parents f49aab7 + c37a4a4 commit 1951969

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

README.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[![GraphQLConf 2024 Banner: September 10-12, San Francisco. Hosted by the GraphQL Foundation](https://github.com/user-attachments/assets/0203f10b-ae1e-4fe1-9222-6547fa2bbd5d)](https://graphql.org/conf/2024/?utm_source=github&utm_medium=graphql_spec&utm_campaign=readme)
2+
13
# GraphQL
24

35
<img alt="GraphQL Logo" align="right" src="https://graphql.org/img/logo.svg" width="15%" />

spec/Section 3 -- Type System.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -1780,7 +1780,9 @@ Following are examples of input coercion with various list types and values:
17801780
| `[Int]` | `1` | `[1]` |
17811781
| `[Int]` | `null` | `null` |
17821782
| `[[Int]]` | `[[1], [2, 3]]` | `[[1], [2, 3]]` |
1783-
| `[[Int]]` | `[1, 2, 3]` | Error: Incorrect item value |
1783+
| `[[Int]]` | `[1, 2, 3]` | `[[1], [2], [3]]` |
1784+
| `[[Int]]` | `[1, null, 3]` | `[[1], null, [3]]` |
1785+
| `[[Int]]` | `[[1], ["b"]]` | Error: Incorrect item value |
17841786
| `[[Int]]` | `1` | `[[1]]` |
17851787
| `[[Int]]` | `null` | `null` |
17861788

@@ -2099,7 +2101,7 @@ condition is false.
20992101

21002102
```graphql
21012103
directive @deprecated(
2102-
reason: String = "No longer supported"
2104+
reason: String! = "No longer supported"
21032105
) on FIELD_DEFINITION | ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION | ENUM_VALUE
21042106
```
21052107

spec/Section 4 -- Introspection.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ CommonMark-compliant Markdown renderer.
110110

111111
To support the management of backwards compatibility, GraphQL fields, arguments,
112112
input fields, and enum values can indicate whether or not they are deprecated
113-
(`isDeprecated: Boolean`) along with a description of why it is deprecated
113+
(`isDeprecated: Boolean!`) along with a description of why it is deprecated
114114
(`deprecationReason: String`).
115115

116116
Tools built using GraphQL introspection should respect deprecation by
@@ -424,7 +424,8 @@ Fields\:
424424
this field.
425425
- `isDeprecated` returns {true} if this field should no longer be used,
426426
otherwise {false}.
427-
- `deprecationReason` optionally provides a reason why this field is deprecated.
427+
- `deprecationReason` returns the reason why this field is deprecated, or null
428+
if this field is not deprecated.
428429

429430
### The \_\_InputValue Type
430431

@@ -442,8 +443,8 @@ Fields\:
442443
provided at runtime. If this input value has no default value, returns {null}.
443444
- `isDeprecated` returns {true} if this input field or argument should no longer
444445
be used, otherwise {false}.
445-
- `deprecationReason` optionally provides a reason why this input field or
446-
argument is deprecated.
446+
- `deprecationReason` returns the reason why this input field or argument is
447+
deprecated, or null if the input field or argument is not deprecated.
447448

448449
### The \_\_EnumValue Type
449450

@@ -455,8 +456,8 @@ Fields\:
455456
- `description` may return a String or {null}.
456457
- `isDeprecated` returns {true} if this enum value should no longer be used,
457458
otherwise {false}.
458-
- `deprecationReason` optionally provides a reason why this enum value is
459-
deprecated.
459+
- `deprecationReason` returns the reason why this enum value is deprecated, or
460+
null if the enum value is not deprecated.
460461

461462
### The \_\_Directive Type
462463

spec/Section 6 -- Execution.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,8 @@ ResolveFieldValue(objectType, objectValue, fieldName, argumentValues):
692692
Note: It is common for {resolver} to be asynchronous due to relying on reading
693693
an underlying database or networked service to produce a value. This
694694
necessitates the rest of a GraphQL executor to handle an asynchronous execution
695-
flow.
695+
flow. If the field is of a list type, each value in the collection of values
696+
returned by {resolver} may itself be retrieved asynchronously.
696697

697698
### Value Completion
698699

0 commit comments

Comments
 (0)