Skip to content

Commit 8262729

Browse files
authored
Nullability: remove @ignoreErrors, @catchField and add @catchByDefault (#6002)
* Bump to nullability v0.4 * add test for `@catch(to: NULL)` * remove @ignoreErrors * fix IJ plugin tests
1 parent 91ea98a commit 8262729

File tree

463 files changed

+552
-1762
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

463 files changed

+552
-1762
lines changed

intellij-plugin/src/main/resources/inspectionDescriptions/ApolloMissingGraphQLDefinitionImport.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<p>
55
Before being referenced, directives and types supported by Apollo Kotlin must be imported by your schema using the <code>@link</code> directive<br>.
66
For instance, to use the <code>@semanticNonNull</code> directive, import it from the
7-
<a href="https://specs.apollo.dev/nullability/v0.3"><code>nullability</code></a> definitions:
7+
<a href="https://specs.apollo.dev/nullability/v0.4"><code>nullability</code></a> definitions:
88
<pre>
99
extend schema
1010
@link(
11-
url: "https://specs.apollo.dev/nullability/v0.3",
12-
import: ["@semanticNonNull"]
11+
url: "https://specs.apollo.dev/nullability/v0.4",
12+
import: ["@semanticNonNull", "@catch", "@CatchTo", "@catchByDefault"]
1313
)
1414
</pre>
1515
</p>
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
extend schema
22
@link(
3-
url: "https://specs.apollo.dev/nullability/v0.3",
3+
url: "https://specs.apollo.dev/nullability/v0.4",
44
import: ["@catch"]
5-
)
5+
)
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
extend schema
22
@link(
3-
url: "https://specs.apollo.dev/nullability/v0.3",
3+
url: "https://specs.apollo.dev/nullability/v0.4",
44
import: ["@catch", "CatchTo"]
5-
)
5+
)
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
extend schema
22
@link(
3-
url: "https://specs.apollo.dev/nullability/v0.3",
3+
url: "https://specs.apollo.dev/nullability/v0.4",
44
import: ["@catch", "CatchTo"]
55
)
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extend schema
22
@link(
3-
url: "https://specs.apollo.dev/nullability/v0.3",
4-
import: ["@catch", "CatchTo"]
3+
url: "https://specs.apollo.dev/nullability/v0.4",
4+
import: ["@catch", "@catchByDefault", "CatchTo"]
55
)
66

7-
extend schema @catch(to: THROW)
7+
extend schema @catchByDefault(to: THROW)

intellij-plugin/src/test/testData/inspection/MissingGraphQLDefinitionImport/missing-targetName-extra_after.graphqls

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ extend schema
66

77
extend schema
88
@link(
9-
url: "https://specs.apollo.dev/nullability/v0.3",
10-
import: ["@catch", "CatchTo"]
9+
url: "https://specs.apollo.dev/nullability/v0.4",
10+
import: ["@catch", "@catchByDefault", "CatchTo"]
1111
)
1212

13-
extend schema @catch(to: THROW)
13+
extend schema @catchByDefault(to: THROW)

libraries/apollo-api/api/apollo-api.api

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,6 @@ public final class com/apollographql/apollo3/api/Error$Location {
521521

522522
public abstract interface class com/apollographql/apollo3/api/Executable {
523523
public abstract fun adapter ()Lcom/apollographql/apollo3/api/Adapter;
524-
public abstract fun getIgnoreErrors ()Z
525524
public abstract fun rootField ()Lcom/apollographql/apollo3/api/CompiledField;
526525
public abstract fun serializeVariables (Lcom/apollographql/apollo3/api/json/JsonWriter;Lcom/apollographql/apollo3/api/CustomScalarAdapters;Z)V
527526
}

libraries/apollo-api/api/apollo-api.klib.api

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ abstract interface <#A: com.apollographql.apollo3.api/Executable.Data> com.apoll
4242
abstract fun rootField(): com.apollographql.apollo3.api/CompiledField // com.apollographql.apollo3.api/Executable.rootField|rootField(){}[0]
4343
abstract fun serializeVariables(com.apollographql.apollo3.api.json/JsonWriter, com.apollographql.apollo3.api/CustomScalarAdapters, kotlin/Boolean) // com.apollographql.apollo3.api/Executable.serializeVariables|serializeVariables(com.apollographql.apollo3.api.json.JsonWriter;com.apollographql.apollo3.api.CustomScalarAdapters;kotlin.Boolean){}[0]
4444
abstract interface Data // com.apollographql.apollo3.api/Executable.Data|null[0]
45-
abstract val ignoreErrors // com.apollographql.apollo3.api/Executable.ignoreErrors|{}ignoreErrors[0]
46-
abstract fun <get-ignoreErrors>(): kotlin/Boolean // com.apollographql.apollo3.api/Executable.ignoreErrors.<get-ignoreErrors>|<get-ignoreErrors>(){}[0]
4745
final class Variables { // com.apollographql.apollo3.api/Executable.Variables|null[0]
4846
constructor <init>(kotlin.collections/Map<kotlin/String, kotlin/Any?>) // com.apollographql.apollo3.api/Executable.Variables.<init>|<init>(kotlin.collections.Map<kotlin.String,kotlin.Any?>){}[0]
4947
final val valueMap // com.apollographql.apollo3.api/Executable.Variables.valueMap|{}valueMap[0]

libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/Executable.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@ interface Executable<D: Executable.Data> {
3030
*/
3131
fun rootField(): CompiledField
3232

33-
/**
34-
* A flag to disable error checking for the whole operation.
35-
* Used for backward compatibility.
36-
*/
37-
val ignoreErrors: Boolean
38-
3933
/**
4034
* Marker interface for generated models
4135
*/

libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/Executables.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ fun <D : Executable.Data> Executable<D>.parseData(
7777
val customScalarAdapters1 = customScalarAdapters.newBuilder()
7878
.falseVariables(falseVariables)
7979
.deferredFragmentIdentifiers(deferredFragmentIds)
80-
.errors(if (ignoreErrors) emptyList() else errors)
80+
.errors(errors)
8181
.build()
8282
return adapter().nullable().fromJson(jsonReader, customScalarAdapters1)
8383
}

0 commit comments

Comments
 (0)