Skip to content

Commit

Permalink
Merge branch 'main' into streams-editorial-suggestions
Browse files Browse the repository at this point in the history
  • Loading branch information
benjie authored Dec 5, 2024
2 parents f49aab7 + c37a4a4 commit 1951969
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[![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)

# GraphQL

<img alt="GraphQL Logo" align="right" src="https://graphql.org/img/logo.svg" width="15%" />
Expand Down
6 changes: 4 additions & 2 deletions spec/Section 3 -- Type System.md
Original file line number Diff line number Diff line change
Expand Up @@ -1780,7 +1780,9 @@ Following are examples of input coercion with various list types and values:
| `[Int]` | `1` | `[1]` |
| `[Int]` | `null` | `null` |
| `[[Int]]` | `[[1], [2, 3]]` | `[[1], [2, 3]]` |
| `[[Int]]` | `[1, 2, 3]` | Error: Incorrect item value |
| `[[Int]]` | `[1, 2, 3]` | `[[1], [2], [3]]` |
| `[[Int]]` | `[1, null, 3]` | `[[1], null, [3]]` |
| `[[Int]]` | `[[1], ["b"]]` | Error: Incorrect item value |
| `[[Int]]` | `1` | `[[1]]` |
| `[[Int]]` | `null` | `null` |

Expand Down Expand Up @@ -2099,7 +2101,7 @@ condition is false.

```graphql
directive @deprecated(
reason: String = "No longer supported"
reason: String! = "No longer supported"
) on FIELD_DEFINITION | ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION | ENUM_VALUE
```

Expand Down
13 changes: 7 additions & 6 deletions spec/Section 4 -- Introspection.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ CommonMark-compliant Markdown renderer.

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

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

### The \_\_InputValue Type

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

### The \_\_EnumValue Type

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

### The \_\_Directive Type

Expand Down
3 changes: 2 additions & 1 deletion spec/Section 6 -- Execution.md
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,8 @@ ResolveFieldValue(objectType, objectValue, fieldName, argumentValues):
Note: It is common for {resolver} to be asynchronous due to relying on reading
an underlying database or networked service to produce a value. This
necessitates the rest of a GraphQL executor to handle an asynchronous execution
flow.
flow. If the field is of a list type, each value in the collection of values
returned by {resolver} may itself be retrieved asynchronously.

### Value Completion

Expand Down

0 comments on commit 1951969

Please sign in to comment.