Skip to content
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

Jump to bottom

Add validation to check schema definitions are compatible with the bundled ones #5444

Merged
merged 12 commits into from
Dec 12, 2023
Merged

Add validation to check schema definitions are compatible with the bundled ones #5444

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7c84d42
Fix an NPE when a non-imported @catch directive is used
BoD Dec 6, 2023
c503433
Validation: check that directives/enums with the same name as those i…
BoD Dec 11, 2023
af1ae42
Update API dump
BoD Dec 11, 2023
079bd01
Merge IncompatibleDirectiveDefinition and IncompatibleEnumDefinition
BoD Dec 11, 2023
8b74204
Directives are order sensitive
BoD Dec 11, 2023
4152f04
Simplify semanticEquals
BoD Dec 11, 2023
5349007
Make KOTLIN_LABS_VERSION and NULLABILITY_VERSION internal
BoD Dec 11, 2023
eddcccc
Update libraries/apollo-ast/src/commonMain/kotlin/com/apollographql/a…
BoD Dec 11, 2023
e152504
Improve semanticEquals following review
BoD Dec 11, 2023
8ae0337
Add support for GQLInputObjectTypeDefinition and GQLScalarTypeDefinit…
BoD Dec 11, 2023
feb420c
Remove useless and failing test
BoD Dec 11, 2023
b0a6291
Revert isDefinedAndMatchesOriginalName
BoD Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 17 additions & 14 deletions ...apollo-ast/src/commonMain/kotlin/com/apollographql/apollo3/ast/internal/semanticEquals.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import com.apollographql.apollo3.ast.GQLDirective
import com.apollographql.apollo3.ast.GQLDirectiveDefinition
import com.apollographql.apollo3.ast.GQLEnumTypeDefinition
import com.apollographql.apollo3.ast.GQLEnumValue
import com.apollographql.apollo3.ast.GQLEnumValueDefinition
import com.apollographql.apollo3.ast.GQLFloatValue
import com.apollographql.apollo3.ast.GQLInputValueDefinition
import com.apollographql.apollo3.ast.GQLIntValue
Expand All @@ -21,7 +22,13 @@ import com.apollographql.apollo3.ast.GQLStringValue
import com.apollographql.apollo3.ast.GQLVariableValue
import com.apollographql.apollo3.ast.toUtf8

internal fun GQLNode.semanticEquals(other: GQLNode): Boolean {
/**
* Returns true if the two nodes are semantically equal, which ignores the source location and the description.
* Note that not all cases are implemented - currently [GQLEnumTypeDefinition] and [GQLDirectiveDefinition] are fully supported, and
martinbonnin marked this conversation as resolved.
Show resolved Hide resolved
* unsupported types will throw.
*/
internal fun GQLNode.semanticEquals(other: GQLNode?): Boolean {
if (other == null) return false
when (this) {
is GQLDirectiveDefinition -> {
if (other !is GQLDirectiveDefinition) {
Expand All @@ -46,11 +53,11 @@ internal fun GQLNode.semanticEquals(other: GQLNode): Boolean {
return false
}

if (defaultValue != null && other.defaultValue != null) {
if (defaultValue != null) {
if (!defaultValue.semanticEquals(other.defaultValue)) {
return false
}
} else if (defaultValue != null || other.defaultValue != null) {
} else if (other.defaultValue != null) {
return false
}
}
Expand Down Expand Up @@ -140,39 +147,35 @@ internal fun GQLNode.semanticEquals(other: GQLNode): Boolean {
if (other !is GQLVariableValue) {
return false
}
if (name != other.name) {
return false
}
}

is GQLEnumTypeDefinition -> {
if (other !is GQLEnumTypeDefinition) {
return false
}
if (name != other.name) {
return false
}
}

is GQLDirective -> {
if (other !is GQLDirective) {
return false
}
if (name != other.name) {
return false
}
}

is GQLArgument -> {
if (other !is GQLArgument) {
return false
}
if (name != other.name) {
}

is GQLEnumValueDefinition -> {
if (other !is GQLEnumValueDefinition) {
return false
}
}

else -> {}
else -> {
TODO("semanticEquals not supported for ${this::class.simpleName}")
}
}

if (this is GQLNamed) {
Expand Down