Skip to content

Implement field extensions #6856

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

Merged
martinbonnin merged 5 commits into from
Jan 27, 2026
Merged

Implement field extensions #6856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ddecf4
Implement field extensions
martinbonnin Jan 26, 2026
84620d1
Keep most of the implementation in `internal` package
martinbonnin Jan 26, 2026
61abe9b
fix rename
martinbonnin Jan 26, 2026
b563526
Add a few more tests
martinbonnin Jan 26, 2026
5ba7c88
formatting
martinbonnin Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 34 additions & 4 deletions libraries/apollo-ast/api/apollo-ast.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public final class com/apollographql/apollo/ast/ApolloParser {
public static synthetic fun toSchema$default (Ljava/io/File;ZILjava/lang/Object;)Lcom/apollographql/apollo/ast/Schema;
public static final fun validateAsExecutable (Lcom/apollographql/apollo/ast/GQLDocument;Lcom/apollographql/apollo/ast/Schema;)Lcom/apollographql/apollo/ast/ExecutableValidationResult;
public static final fun validateAsSchema (Lcom/apollographql/apollo/ast/GQLDocument;)Lcom/apollographql/apollo/ast/GQLResult;
public static final fun validateAsSchema (Lcom/apollographql/apollo/ast/GQLDocument;Lcom/apollographql/apollo/ast/internal/SchemaValidationOptions;)Lcom/apollographql/apollo/ast/GQLResult;
public static final fun validateAsSchema (Lcom/apollographql/apollo/ast/GQLDocument;Lcom/apollographql/apollo/ast/SchemaValidationOptions;)Lcom/apollographql/apollo/ast/GQLResult;
Copy link
Copy Markdown
Contributor Author

@martinbonnin martinbonnin Jan 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Breaking change because SchemaValidationOptions was in an internal package. It was @ApolloExperimental so I'm hoping it's not too used.

public static final fun validateAsSchemaAndAddApolloDefinition (Lcom/apollographql/apollo/ast/GQLDocument;)Lcom/apollographql/apollo/ast/GQLResult;
}

Expand Down Expand Up @@ -1053,9 +1053,8 @@ public final class com/apollographql/apollo/ast/IssueKt {

public final class com/apollographql/apollo/ast/MergeOptions {
public static final field Companion Lcom/apollographql/apollo/ast/MergeOptions$Companion;
public fun <init> (ZZ)V
public final fun getAllowAddingDirectivesToExistingFieldDefinitions ()Z
public final fun getAllowFieldNullabilityModification ()Z
public fun <init> (Z)V
Comment thread
martinbonnin marked this conversation as resolved.
public final fun getAllowMergingFieldDefinitions ()Z
}

public final class com/apollographql/apollo/ast/MergeOptions$Companion {
Expand Down Expand Up @@ -1238,6 +1237,37 @@ public final class com/apollographql/apollo/ast/SchemaValidationException : com/
public synthetic fun <init> (Ljava/lang/String;Lcom/apollographql/apollo/ast/SourceLocation;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
}

public final class com/apollographql/apollo/ast/SchemaValidationOptions {
public fun <init> (ZLjava/util/List;)V
public fun <init> (ZLjava/util/List;Z)V
public fun <init> (ZLjava/util/List;ZZLcom/apollographql/apollo/ast/MergeOptions;)V
public final fun getAddKotlinLabsDefinitions ()Z
public final fun getComputeKeyFields ()Z
public final fun getExcludeCacheDirectives ()Z
public final fun getForeignSchemas ()Ljava/util/List;
public final fun getMergeOptions ()Lcom/apollographql/apollo/ast/MergeOptions;
}

public final class com/apollographql/apollo/ast/SchemaValidationOptions$Builder {
public fun <init> ()V
public final fun addForeignSchema (Lcom/apollographql/apollo/ast/ForeignSchema;)Lcom/apollographql/apollo/ast/SchemaValidationOptions$Builder;
public final fun addKotlinLabsDefinitions (Z)Lcom/apollographql/apollo/ast/SchemaValidationOptions$Builder;
public final fun build ()Lcom/apollographql/apollo/ast/SchemaValidationOptions;
public final fun computeKeyFields (Z)Lcom/apollographql/apollo/ast/SchemaValidationOptions$Builder;
public final fun excludeCacheDirectives (Z)Lcom/apollographql/apollo/ast/SchemaValidationOptions$Builder;
public final fun foreignSchemas (Ljava/util/List;)Lcom/apollographql/apollo/ast/SchemaValidationOptions$Builder;
public final fun getAddKotlinLabsDefinitions ()Z
public final fun getComputeKeyFields ()Z
public final fun getExcludeCacheDirectives ()Z
public final fun getForeignSchemas ()Ljava/util/List;
public final fun getMergeOptions ()Lcom/apollographql/apollo/ast/MergeOptions;
public final fun mergeOptions (Lcom/apollographql/apollo/ast/MergeOptions;)Lcom/apollographql/apollo/ast/SchemaValidationOptions$Builder;
public final fun setAddKotlinLabsDefinitions (Z)V
public final fun setComputeKeyFields (Z)V
public final fun setExcludeCacheDirectives (Z)V
public final fun setMergeOptions (Lcom/apollographql/apollo/ast/MergeOptions;)V
}

public class com/apollographql/apollo/ast/SourceAwareException : java/lang/RuntimeException {
public static final field Companion Lcom/apollographql/apollo/ast/SourceAwareException$Companion;
public fun <init> (Ljava/lang/String;Lcom/apollographql/apollo/ast/SourceLocation;)V
Expand Down
55 changes: 49 additions & 6 deletions libraries/apollo-ast/api/apollo-ast.klib.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,12 +1206,10 @@ final class com.apollographql.apollo.ast/InvalidDeferLabel : com.apollographql.a
}

final class com.apollographql.apollo.ast/MergeOptions { // com.apollographql.apollo.ast/MergeOptions|null[0]
constructor <init>(kotlin/Boolean, kotlin/Boolean) // com.apollographql.apollo.ast/MergeOptions.<init>|<init>(kotlin.Boolean;kotlin.Boolean){}[0]
constructor <init>(kotlin/Boolean) // com.apollographql.apollo.ast/MergeOptions.<init>|<init>(kotlin.Boolean){}[0]

final val allowAddingDirectivesToExistingFieldDefinitions // com.apollographql.apollo.ast/MergeOptions.allowAddingDirectivesToExistingFieldDefinitions|{}allowAddingDirectivesToExistingFieldDefinitions[0]
final fun <get-allowAddingDirectivesToExistingFieldDefinitions>(): kotlin/Boolean // com.apollographql.apollo.ast/MergeOptions.allowAddingDirectivesToExistingFieldDefinitions.<get-allowAddingDirectivesToExistingFieldDefinitions>|<get-allowAddingDirectivesToExistingFieldDefinitions>(){}[0]
final val allowFieldNullabilityModification // com.apollographql.apollo.ast/MergeOptions.allowFieldNullabilityModification|{}allowFieldNullabilityModification[0]
final fun <get-allowFieldNullabilityModification>(): kotlin/Boolean // com.apollographql.apollo.ast/MergeOptions.allowFieldNullabilityModification.<get-allowFieldNullabilityModification>|<get-allowFieldNullabilityModification>(){}[0]
final val allowMergingFieldDefinitions // com.apollographql.apollo.ast/MergeOptions.allowMergingFieldDefinitions|{}allowMergingFieldDefinitions[0]
final fun <get-allowMergingFieldDefinitions>(): kotlin/Boolean // com.apollographql.apollo.ast/MergeOptions.allowMergingFieldDefinitions.<get-allowMergingFieldDefinitions>|<get-allowMergingFieldDefinitions>(){}[0]

final object Companion { // com.apollographql.apollo.ast/MergeOptions.Companion|null[0]
final val Default // com.apollographql.apollo.ast/MergeOptions.Companion.Default|{}Default[0]
Expand Down Expand Up @@ -1443,6 +1441,51 @@ final class com.apollographql.apollo.ast/SchemaValidationException : com.apollog
constructor <init>(kotlin/String, com.apollographql.apollo.ast/SourceLocation? = ...) // com.apollographql.apollo.ast/SchemaValidationException.<init>|<init>(kotlin.String;com.apollographql.apollo.ast.SourceLocation?){}[0]
}

final class com.apollographql.apollo.ast/SchemaValidationOptions { // com.apollographql.apollo.ast/SchemaValidationOptions|null[0]
constructor <init>(kotlin/Boolean, kotlin.collections/List<com.apollographql.apollo.ast/ForeignSchema>) // com.apollographql.apollo.ast/SchemaValidationOptions.<init>|<init>(kotlin.Boolean;kotlin.collections.List<com.apollographql.apollo.ast.ForeignSchema>){}[0]
constructor <init>(kotlin/Boolean, kotlin.collections/List<com.apollographql.apollo.ast/ForeignSchema>, kotlin/Boolean) // com.apollographql.apollo.ast/SchemaValidationOptions.<init>|<init>(kotlin.Boolean;kotlin.collections.List<com.apollographql.apollo.ast.ForeignSchema>;kotlin.Boolean){}[0]
constructor <init>(kotlin/Boolean, kotlin.collections/List<com.apollographql.apollo.ast/ForeignSchema>, kotlin/Boolean, kotlin/Boolean, com.apollographql.apollo.ast/MergeOptions) // com.apollographql.apollo.ast/SchemaValidationOptions.<init>|<init>(kotlin.Boolean;kotlin.collections.List<com.apollographql.apollo.ast.ForeignSchema>;kotlin.Boolean;kotlin.Boolean;com.apollographql.apollo.ast.MergeOptions){}[0]

final val addKotlinLabsDefinitions // com.apollographql.apollo.ast/SchemaValidationOptions.addKotlinLabsDefinitions|{}addKotlinLabsDefinitions[0]
final fun <get-addKotlinLabsDefinitions>(): kotlin/Boolean // com.apollographql.apollo.ast/SchemaValidationOptions.addKotlinLabsDefinitions.<get-addKotlinLabsDefinitions>|<get-addKotlinLabsDefinitions>(){}[0]
final val computeKeyFields // com.apollographql.apollo.ast/SchemaValidationOptions.computeKeyFields|{}computeKeyFields[0]
final fun <get-computeKeyFields>(): kotlin/Boolean // com.apollographql.apollo.ast/SchemaValidationOptions.computeKeyFields.<get-computeKeyFields>|<get-computeKeyFields>(){}[0]
final val excludeCacheDirectives // com.apollographql.apollo.ast/SchemaValidationOptions.excludeCacheDirectives|{}excludeCacheDirectives[0]
final fun <get-excludeCacheDirectives>(): kotlin/Boolean // com.apollographql.apollo.ast/SchemaValidationOptions.excludeCacheDirectives.<get-excludeCacheDirectives>|<get-excludeCacheDirectives>(){}[0]
final val foreignSchemas // com.apollographql.apollo.ast/SchemaValidationOptions.foreignSchemas|{}foreignSchemas[0]
final fun <get-foreignSchemas>(): kotlin.collections/List<com.apollographql.apollo.ast/ForeignSchema> // com.apollographql.apollo.ast/SchemaValidationOptions.foreignSchemas.<get-foreignSchemas>|<get-foreignSchemas>(){}[0]
final val mergeOptions // com.apollographql.apollo.ast/SchemaValidationOptions.mergeOptions|{}mergeOptions[0]
final fun <get-mergeOptions>(): com.apollographql.apollo.ast/MergeOptions // com.apollographql.apollo.ast/SchemaValidationOptions.mergeOptions.<get-mergeOptions>|<get-mergeOptions>(){}[0]

final class Builder { // com.apollographql.apollo.ast/SchemaValidationOptions.Builder|null[0]
constructor <init>() // com.apollographql.apollo.ast/SchemaValidationOptions.Builder.<init>|<init>(){}[0]

final val foreignSchemas // com.apollographql.apollo.ast/SchemaValidationOptions.Builder.foreignSchemas|{}foreignSchemas[0]
final fun <get-foreignSchemas>(): kotlin.collections/MutableList<com.apollographql.apollo.ast/ForeignSchema> // com.apollographql.apollo.ast/SchemaValidationOptions.Builder.foreignSchemas.<get-foreignSchemas>|<get-foreignSchemas>(){}[0]

final var addKotlinLabsDefinitions // com.apollographql.apollo.ast/SchemaValidationOptions.Builder.addKotlinLabsDefinitions|{}addKotlinLabsDefinitions[0]
final fun <get-addKotlinLabsDefinitions>(): kotlin/Boolean // com.apollographql.apollo.ast/SchemaValidationOptions.Builder.addKotlinLabsDefinitions.<get-addKotlinLabsDefinitions>|<get-addKotlinLabsDefinitions>(){}[0]
final fun <set-addKotlinLabsDefinitions>(kotlin/Boolean) // com.apollographql.apollo.ast/SchemaValidationOptions.Builder.addKotlinLabsDefinitions.<set-addKotlinLabsDefinitions>|<set-addKotlinLabsDefinitions>(kotlin.Boolean){}[0]
final var computeKeyFields // com.apollographql.apollo.ast/SchemaValidationOptions.Builder.computeKeyFields|{}computeKeyFields[0]
final fun <get-computeKeyFields>(): kotlin/Boolean // com.apollographql.apollo.ast/SchemaValidationOptions.Builder.computeKeyFields.<get-computeKeyFields>|<get-computeKeyFields>(){}[0]
final fun <set-computeKeyFields>(kotlin/Boolean) // com.apollographql.apollo.ast/SchemaValidationOptions.Builder.computeKeyFields.<set-computeKeyFields>|<set-computeKeyFields>(kotlin.Boolean){}[0]
final var excludeCacheDirectives // com.apollographql.apollo.ast/SchemaValidationOptions.Builder.excludeCacheDirectives|{}excludeCacheDirectives[0]
final fun <get-excludeCacheDirectives>(): kotlin/Boolean // com.apollographql.apollo.ast/SchemaValidationOptions.Builder.excludeCacheDirectives.<get-excludeCacheDirectives>|<get-excludeCacheDirectives>(){}[0]
final fun <set-excludeCacheDirectives>(kotlin/Boolean) // com.apollographql.apollo.ast/SchemaValidationOptions.Builder.excludeCacheDirectives.<set-excludeCacheDirectives>|<set-excludeCacheDirectives>(kotlin.Boolean){}[0]
final var mergeOptions // com.apollographql.apollo.ast/SchemaValidationOptions.Builder.mergeOptions|{}mergeOptions[0]
final fun <get-mergeOptions>(): com.apollographql.apollo.ast/MergeOptions // com.apollographql.apollo.ast/SchemaValidationOptions.Builder.mergeOptions.<get-mergeOptions>|<get-mergeOptions>(){}[0]
final fun <set-mergeOptions>(com.apollographql.apollo.ast/MergeOptions) // com.apollographql.apollo.ast/SchemaValidationOptions.Builder.mergeOptions.<set-mergeOptions>|<set-mergeOptions>(com.apollographql.apollo.ast.MergeOptions){}[0]

final fun addForeignSchema(com.apollographql.apollo.ast/ForeignSchema): com.apollographql.apollo.ast/SchemaValidationOptions.Builder // com.apollographql.apollo.ast/SchemaValidationOptions.Builder.addForeignSchema|addForeignSchema(com.apollographql.apollo.ast.ForeignSchema){}[0]
final fun addKotlinLabsDefinitions(kotlin/Boolean): com.apollographql.apollo.ast/SchemaValidationOptions.Builder // com.apollographql.apollo.ast/SchemaValidationOptions.Builder.addKotlinLabsDefinitions|addKotlinLabsDefinitions(kotlin.Boolean){}[0]
final fun build(): com.apollographql.apollo.ast/SchemaValidationOptions // com.apollographql.apollo.ast/SchemaValidationOptions.Builder.build|build(){}[0]
final fun computeKeyFields(kotlin/Boolean): com.apollographql.apollo.ast/SchemaValidationOptions.Builder // com.apollographql.apollo.ast/SchemaValidationOptions.Builder.computeKeyFields|computeKeyFields(kotlin.Boolean){}[0]
final fun excludeCacheDirectives(kotlin/Boolean): com.apollographql.apollo.ast/SchemaValidationOptions.Builder // com.apollographql.apollo.ast/SchemaValidationOptions.Builder.excludeCacheDirectives|excludeCacheDirectives(kotlin.Boolean){}[0]
final fun foreignSchemas(kotlin.collections/List<com.apollographql.apollo.ast/ForeignSchema>): com.apollographql.apollo.ast/SchemaValidationOptions.Builder // com.apollographql.apollo.ast/SchemaValidationOptions.Builder.foreignSchemas|foreignSchemas(kotlin.collections.List<com.apollographql.apollo.ast.ForeignSchema>){}[0]
final fun mergeOptions(com.apollographql.apollo.ast/MergeOptions): com.apollographql.apollo.ast/SchemaValidationOptions.Builder // com.apollographql.apollo.ast/SchemaValidationOptions.Builder.mergeOptions|mergeOptions(com.apollographql.apollo.ast.MergeOptions){}[0]
}
}

final class com.apollographql.apollo.ast/SourceLocation { // com.apollographql.apollo.ast/SourceLocation|null[0]
constructor <init>(kotlin/Int, kotlin/Int, kotlin/Int, kotlin/Int, kotlin/String?) // com.apollographql.apollo.ast/SourceLocation.<init>|<init>(kotlin.Int;kotlin.Int;kotlin.Int;kotlin.Int;kotlin.String?){}[0]

Expand Down Expand Up @@ -1581,7 +1624,7 @@ final fun (com.apollographql.apollo.ast/GQLDocument).com.apollographql.apollo.as
final fun (com.apollographql.apollo.ast/GQLDocument).com.apollographql.apollo.ast/toSchema(): com.apollographql.apollo.ast/Schema // com.apollographql.apollo.ast/toSchema|toSchema@com.apollographql.apollo.ast.GQLDocument(){}[0]
final fun (com.apollographql.apollo.ast/GQLDocument).com.apollographql.apollo.ast/validateAsExecutable(com.apollographql.apollo.ast/Schema): com.apollographql.apollo.ast/ExecutableValidationResult // com.apollographql.apollo.ast/validateAsExecutable|validateAsExecutable@com.apollographql.apollo.ast.GQLDocument(com.apollographql.apollo.ast.Schema){}[0]
final fun (com.apollographql.apollo.ast/GQLDocument).com.apollographql.apollo.ast/validateAsSchema(): com.apollographql.apollo.ast/GQLResult<com.apollographql.apollo.ast/Schema> // com.apollographql.apollo.ast/validateAsSchema|validateAsSchema@com.apollographql.apollo.ast.GQLDocument(){}[0]
final fun (com.apollographql.apollo.ast/GQLDocument).com.apollographql.apollo.ast/validateAsSchema(com.apollographql.apollo.ast.internal/SchemaValidationOptions): com.apollographql.apollo.ast/GQLResult<com.apollographql.apollo.ast/Schema> // com.apollographql.apollo.ast/validateAsSchema|validateAsSchema@com.apollographql.apollo.ast.GQLDocument(com.apollographql.apollo.ast.internal.SchemaValidationOptions){}[0]
final fun (com.apollographql.apollo.ast/GQLDocument).com.apollographql.apollo.ast/validateAsSchema(com.apollographql.apollo.ast/SchemaValidationOptions): com.apollographql.apollo.ast/GQLResult<com.apollographql.apollo.ast/Schema> // com.apollographql.apollo.ast/validateAsSchema|validateAsSchema@com.apollographql.apollo.ast.GQLDocument(com.apollographql.apollo.ast.SchemaValidationOptions){}[0]
final fun (com.apollographql.apollo.ast/GQLDocument).com.apollographql.apollo.ast/validateAsSchemaAndAddApolloDefinition(): com.apollographql.apollo.ast/GQLResult<com.apollographql.apollo.ast/Schema> // com.apollographql.apollo.ast/validateAsSchemaAndAddApolloDefinition|validateAsSchemaAndAddApolloDefinition@com.apollographql.apollo.ast.GQLDocument(){}[0]
final fun (com.apollographql.apollo.ast/GQLDocument).com.apollographql.apollo.ast/withBuiltinDefinitions(): com.apollographql.apollo.ast/GQLDocument // com.apollographql.apollo.ast/withBuiltinDefinitions|withBuiltinDefinitions@com.apollographql.apollo.ast.GQLDocument(){}[0]
final fun (com.apollographql.apollo.ast/GQLDocument).com.apollographql.apollo.ast/withoutBuiltinDefinitions(): com.apollographql.apollo.ast/GQLDocument // com.apollographql.apollo.ast/withoutBuiltinDefinitions|withoutBuiltinDefinitions@com.apollographql.apollo.ast.GQLDocument(){}[0]
Expand Down
Loading
Loading