From e809893ea7413aed8c7af80948405f24b7cc5d88 Mon Sep 17 00:00:00 2001 From: Ivan Maximov Date: Tue, 4 Jan 2022 22:20:55 +0300 Subject: [PATCH 1/4] Rename VariableDefinitions to VariablesDefinition --- changelogs/October2021.md | 12 ++++++------ spec/Appendix B -- Grammar Summary.md | 4 ++-- spec/Section 2 -- Language.md | 4 ++-- spec/Section 6 -- Execution.md | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/changelogs/October2021.md b/changelogs/October2021.md index b964fdc54..c12383929 100644 --- a/changelogs/October2021.md +++ b/changelogs/October2021.md @@ -740,7 +740,7 @@ git log June2018..HEAD --format="| [%h](https://github.com/graphql/graphql-spec/ ## Operations OperationDefinition : - - OperationType Name? VariableDefinitions? Directives? SelectionSet + - OperationType Name? VariablesDefinition? Directives? SelectionSet - SelectionSet OperationType : one of `query` `mutation` `subscription` @@ -1309,7 +1309,7 @@ git log June2018..HEAD --format="| [%h](https://github.com/graphql/graphql-spec/ Variable : $ Name - VariableDefinitions : ( VariableDefinition+ ) + VariablesDefinition : ( VariableDefinition+ ) -VariableDefinition : Variable : Type DefaultValue? +VariableDefinition : Variable : Type DefaultValue? Directives[Const]? @@ -5618,8 +5618,8 @@ git log June2018..HEAD --format="| [%h](https://github.com/graphql/graphql-spec/ CoerceVariableValues(schema, operation, variableValues): * Let {coercedValues} be an empty unordered Map. - * Let {variableDefinitions} be the variables defined by {operation}. - * For each {variableDefinition} in {variableDefinitions}: + * Let {variablesDefinition} be the variables defined by {operation}. + * For each {variableDefinition} in {variablesDefinition}: @@ -87,62 +87,63 @@ CoerceVariableValues(schema, operation, variableValues): * Let {hasValue} be {true} if {variableValues} provides a value for the name {variableName}. @@ -6704,7 +6704,7 @@ git log June2018..HEAD --format="| [%h](https://github.com/graphql/graphql-spec/ OperationDefinition : - - SelectionSet - - OperationType Name? VariableDefinitions? Directives? SelectionSet + - OperationType Name? VariablesDefinition? Directives? SelectionSet + - SelectionSet -OperationType : one of query mutation subscription @@ -6724,7 +6724,7 @@ git log June2018..HEAD --format="| [%h](https://github.com/graphql/graphql-spec/ ObjectField[Const] : Name : Value[?Const] - VariableDefinitions : ( VariableDefinition+ ) + VariablesDefinition : ( VariableDefinition+ ) -VariableDefinition : Variable : Type DefaultValue? +VariableDefinition : Variable : Type DefaultValue? Directives[Const]? diff --git a/spec/Appendix B -- Grammar Summary.md b/spec/Appendix B -- Grammar Summary.md index 01c900a3f..6dfe10c1d 100644 --- a/spec/Appendix B -- Grammar Summary.md +++ b/spec/Appendix B -- Grammar Summary.md @@ -128,7 +128,7 @@ ExecutableDefinition : - FragmentDefinition OperationDefinition : - - OperationType Name? VariableDefinitions? Directives? SelectionSet + - OperationType Name? VariablesDefinition? Directives? SelectionSet - SelectionSet OperationType : one of `query` `mutation` `subscription` @@ -185,7 +185,7 @@ ObjectValue[Const] : ObjectField[Const] : Name : Value[?Const] -VariableDefinitions : ( VariableDefinition+ ) +VariablesDefinition : ( VariableDefinition+ ) VariableDefinition : Variable : Type DefaultValue? Directives[Const]? diff --git a/spec/Section 2 -- Language.md b/spec/Section 2 -- Language.md index eb69f8253..883f120a8 100644 --- a/spec/Section 2 -- Language.md +++ b/spec/Section 2 -- Language.md @@ -278,7 +278,7 @@ be executed must also be provided. ## Operations OperationDefinition : - - OperationType Name? VariableDefinitions? Directives? SelectionSet + - OperationType Name? VariablesDefinition? Directives? SelectionSet - SelectionSet OperationType : one of `query` `mutation` `subscription` @@ -1092,7 +1092,7 @@ ObjectValue : { ObjectField+ } Variable : $ Name -VariableDefinitions : ( VariableDefinition+ ) +VariablesDefinition : ( VariableDefinition+ ) VariableDefinition : Variable : Type DefaultValue? Directives[Const]? diff --git a/spec/Section 6 -- Execution.md b/spec/Section 6 -- Execution.md index d1fba6a4a..305d67876 100644 --- a/spec/Section 6 -- Execution.md +++ b/spec/Section 6 -- Execution.md @@ -78,8 +78,8 @@ execution. CoerceVariableValues(schema, operation, variableValues): * Let {coercedValues} be an empty unordered Map. - * Let {variableDefinitions} be the variables defined by {operation}. - * For each {variableDefinition} in {variableDefinitions}: + * Let {variablesDefinition} be the variables defined by {operation}. + * For each {variableDefinition} in {variablesDefinition}: * Let {variableName} be the name of {variableDefinition}. * Let {variableType} be the expected type of {variableDefinition}. * Assert: {IsInputType(variableType)} must be {true}. From 8a8431ba7bd785e3047d1edd945d46b7fd3664a6 Mon Sep 17 00:00:00 2001 From: Ivan Maximov Date: Wed, 5 Jan 2022 19:21:27 +0300 Subject: [PATCH 2/4] revert --- changelogs/October2021.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/changelogs/October2021.md b/changelogs/October2021.md index c12383929..b964fdc54 100644 --- a/changelogs/October2021.md +++ b/changelogs/October2021.md @@ -740,7 +740,7 @@ git log June2018..HEAD --format="| [%h](https://github.com/graphql/graphql-spec/ ## Operations OperationDefinition : - - OperationType Name? VariablesDefinition? Directives? SelectionSet + - OperationType Name? VariableDefinitions? Directives? SelectionSet - SelectionSet OperationType : one of `query` `mutation` `subscription` @@ -1309,7 +1309,7 @@ git log June2018..HEAD --format="| [%h](https://github.com/graphql/graphql-spec/ Variable : $ Name - VariablesDefinition : ( VariableDefinition+ ) + VariableDefinitions : ( VariableDefinition+ ) -VariableDefinition : Variable : Type DefaultValue? +VariableDefinition : Variable : Type DefaultValue? Directives[Const]? @@ -5618,8 +5618,8 @@ git log June2018..HEAD --format="| [%h](https://github.com/graphql/graphql-spec/ CoerceVariableValues(schema, operation, variableValues): * Let {coercedValues} be an empty unordered Map. - * Let {variablesDefinition} be the variables defined by {operation}. - * For each {variableDefinition} in {variablesDefinition}: + * Let {variableDefinitions} be the variables defined by {operation}. + * For each {variableDefinition} in {variableDefinitions}: @@ -87,62 +87,63 @@ CoerceVariableValues(schema, operation, variableValues): * Let {hasValue} be {true} if {variableValues} provides a value for the name {variableName}. @@ -6704,7 +6704,7 @@ git log June2018..HEAD --format="| [%h](https://github.com/graphql/graphql-spec/ OperationDefinition : - - SelectionSet - - OperationType Name? VariablesDefinition? Directives? SelectionSet + - OperationType Name? VariableDefinitions? Directives? SelectionSet + - SelectionSet -OperationType : one of query mutation subscription @@ -6724,7 +6724,7 @@ git log June2018..HEAD --format="| [%h](https://github.com/graphql/graphql-spec/ ObjectField[Const] : Name : Value[?Const] - VariablesDefinition : ( VariableDefinition+ ) + VariableDefinitions : ( VariableDefinition+ ) -VariableDefinition : Variable : Type DefaultValue? +VariableDefinition : Variable : Type DefaultValue? Directives[Const]? From 4f5c1c4aead9a4d3365adda7f2d564b8f8f55057 Mon Sep 17 00:00:00 2001 From: Ivan Maximov Date: Thu, 6 Jan 2022 20:58:30 +0300 Subject: [PATCH 3/4] rollback 2 --- spec/Section 6 -- Execution.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/Section 6 -- Execution.md b/spec/Section 6 -- Execution.md index 305d67876..d1fba6a4a 100644 --- a/spec/Section 6 -- Execution.md +++ b/spec/Section 6 -- Execution.md @@ -78,8 +78,8 @@ execution. CoerceVariableValues(schema, operation, variableValues): * Let {coercedValues} be an empty unordered Map. - * Let {variablesDefinition} be the variables defined by {operation}. - * For each {variableDefinition} in {variablesDefinition}: + * Let {variableDefinitions} be the variables defined by {operation}. + * For each {variableDefinition} in {variableDefinitions}: * Let {variableName} be the name of {variableDefinition}. * Let {variableType} be the expected type of {variableDefinition}. * Assert: {IsInputType(variableType)} must be {true}. From b65328e4094b7c00bb0d714415e9c3cd4c9aa3f9 Mon Sep 17 00:00:00 2001 From: Lee Byron Date: Thu, 2 Jun 2022 14:32:39 -0700 Subject: [PATCH 4/4] Include reference in CoerceVariableValues --- spec/Section 6 -- Execution.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/Section 6 -- Execution.md b/spec/Section 6 -- Execution.md index a0f3400d4..0d7667ba0 100644 --- a/spec/Section 6 -- Execution.md +++ b/spec/Section 6 -- Execution.md @@ -77,8 +77,8 @@ the operation fails without execution. CoerceVariableValues(schema, operation, variableValues): - Let {coercedValues} be an empty unordered Map. -- Let {variableDefinitions} be the variables defined by {operation}. -- For each {variableDefinition} in {variableDefinitions}: +- Let {variablesDefinition} be the variables defined by {operation}. +- For each {variableDefinition} in {variablesDefinition}: - Let {variableName} be the name of {variableDefinition}. - Let {variableType} be the expected type of {variableDefinition}. - Assert: {IsInputType(variableType)} must be {true}.