Builders: Set concrete builder if we skip them in configuration

[spinillos]

Fixes: grafana/grafana-foundation-sdk#1204

// TBD

[github-actions]

Note: the diff show code changes that would be introduced by this PR to the output of the Grafana Foundation SDK codegen pipeline.

See full diff.

🔎 Changes to Grafana Foundation SDK

diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/go/cloudwatch/cloudwatchannotationquery_builder_gen.go /tmp/foundation-workspace-current/foundation-sdk/go/cloudwatch/cloudwatchannotationquery_builder_gen.go
--- /tmp/foundation-workspace-main/foundation-sdk/go/cloudwatch/cloudwatchannotationquery_builder_gen.go	2026-04-29 14:49:49.419290594 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/go/cloudwatch/cloudwatchannotationquery_builder_gen.go	2026-04-29 14:49:05.954583714 +0000
@@ -4,11 +4,10 @@
 
 import (
 	cog "github.com/grafana/grafana-foundation-sdk/go/cog"
-	variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants"
 	common "github.com/grafana/grafana-foundation-sdk/go/common"
 )
 
-var _ cog.Builder[variants.Dataquery] = (*CloudWatchAnnotationQueryBuilder)(nil)
+var _ cog.Builder[CloudWatchAnnotationQuery] = (*CloudWatchAnnotationQueryBuilder)(nil)
 
 // Shape of a CloudWatch Annotation query
 // TS type is CloudWatchDefaultQuery = Omit<CloudWatchLogsQuery, 'queryMode'> & CloudWatchMetricsQuery, declared in veneer
@@ -28,7 +27,7 @@
 	return builder
 }
 
-func (builder *CloudWatchAnnotationQueryBuilder) Build() (variants.Dataquery, error) {
+func (builder *CloudWatchAnnotationQueryBuilder) Build() (CloudWatchAnnotationQuery, error) {
 	if err := builder.internal.Validate(); err != nil {
 		return CloudWatchAnnotationQuery{}, err
 	}
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/go/cloudwatch/cloudwatchlogsquery_builder_gen.go /tmp/foundation-workspace-current/foundation-sdk/go/cloudwatch/cloudwatchlogsquery_builder_gen.go
--- /tmp/foundation-workspace-main/foundation-sdk/go/cloudwatch/cloudwatchlogsquery_builder_gen.go	2026-04-29 14:49:49.419368970 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/go/cloudwatch/cloudwatchlogsquery_builder_gen.go	2026-04-29 14:49:05.954662029 +0000
@@ -4,11 +4,10 @@
 
 import (
 	cog "github.com/grafana/grafana-foundation-sdk/go/cog"
-	variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants"
 	common "github.com/grafana/grafana-foundation-sdk/go/common"
 )
 
-var _ cog.Builder[variants.Dataquery] = (*CloudWatchLogsQueryBuilder)(nil)
+var _ cog.Builder[CloudWatchLogsQuery] = (*CloudWatchLogsQueryBuilder)(nil)
 
 // Shape of a CloudWatch Logs query
 type CloudWatchLogsQueryBuilder struct {
@@ -26,7 +25,7 @@
 	return builder
 }
 
-func (builder *CloudWatchLogsQueryBuilder) Build() (variants.Dataquery, error) {
+func (builder *CloudWatchLogsQueryBuilder) Build() (CloudWatchLogsQuery, error) {
 	if err := builder.internal.Validate(); err != nil {
 		return CloudWatchLogsQuery{}, err
 	}
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/go/cloudwatch/cloudwatchmetricsquery_builder_gen.go /tmp/foundation-workspace-current/foundation-sdk/go/cloudwatch/cloudwatchmetricsquery_builder_gen.go
--- /tmp/foundation-workspace-main/foundation-sdk/go/cloudwatch/cloudwatchmetricsquery_builder_gen.go	2026-04-29 14:49:49.419434346 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/go/cloudwatch/cloudwatchmetricsquery_builder_gen.go	2026-04-29 14:49:05.954728097 +0000
@@ -4,11 +4,10 @@
 
 import (
 	cog "github.com/grafana/grafana-foundation-sdk/go/cog"
-	variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants"
 	common "github.com/grafana/grafana-foundation-sdk/go/common"
 )
 
-var _ cog.Builder[variants.Dataquery] = (*CloudWatchMetricsQueryBuilder)(nil)
+var _ cog.Builder[CloudWatchMetricsQuery] = (*CloudWatchMetricsQueryBuilder)(nil)
 
 // Shape of a CloudWatch Metrics query
 type CloudWatchMetricsQueryBuilder struct {
@@ -26,7 +25,7 @@
 	return builder
 }
 
-func (builder *CloudWatchMetricsQueryBuilder) Build() (variants.Dataquery, error) {
+func (builder *CloudWatchMetricsQueryBuilder) Build() (CloudWatchMetricsQuery, error) {
 	if err := builder.internal.Validate(); err != nil {
 		return CloudWatchMetricsQuery{}, err
 	}
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/go/expr/typeclassicconditions_builder_gen.go /tmp/foundation-workspace-current/foundation-sdk/go/expr/typeclassicconditions_builder_gen.go
--- /tmp/foundation-workspace-main/foundation-sdk/go/expr/typeclassicconditions_builder_gen.go	2026-04-29 14:49:49.511310197 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/go/expr/typeclassicconditions_builder_gen.go	2026-04-29 14:49:06.040779466 +0000
@@ -4,11 +4,10 @@
 
 import (
 	cog "github.com/grafana/grafana-foundation-sdk/go/cog"
-	variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants"
 	common "github.com/grafana/grafana-foundation-sdk/go/common"
 )
 
-var _ cog.Builder[variants.Dataquery] = (*TypeClassicConditionsBuilder)(nil)
+var _ cog.Builder[TypeClassicConditions] = (*TypeClassicConditionsBuilder)(nil)
 
 type TypeClassicConditionsBuilder struct {
 	internal *TypeClassicConditions
@@ -26,7 +25,7 @@
 	return builder
 }
 
-func (builder *TypeClassicConditionsBuilder) Build() (variants.Dataquery, error) {
+func (builder *TypeClassicConditionsBuilder) Build() (TypeClassicConditions, error) {
 	if err := builder.internal.Validate(); err != nil {
 		return TypeClassicConditions{}, err
 	}
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/go/expr/typemath_builder_gen.go /tmp/foundation-workspace-current/foundation-sdk/go/expr/typemath_builder_gen.go
--- /tmp/foundation-workspace-main/foundation-sdk/go/expr/typemath_builder_gen.go	2026-04-29 14:49:49.511415422 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/go/expr/typemath_builder_gen.go	2026-04-29 14:49:06.040850050 +0000
@@ -4,11 +4,10 @@
 
 import (
 	cog "github.com/grafana/grafana-foundation-sdk/go/cog"
-	variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants"
 	common "github.com/grafana/grafana-foundation-sdk/go/common"
 )
 
-var _ cog.Builder[variants.Dataquery] = (*TypeMathBuilder)(nil)
+var _ cog.Builder[TypeMath] = (*TypeMathBuilder)(nil)
 
 type TypeMathBuilder struct {
 	internal *TypeMath
@@ -26,7 +25,7 @@
 	return builder
 }
 
-func (builder *TypeMathBuilder) Build() (variants.Dataquery, error) {
+func (builder *TypeMathBuilder) Build() (TypeMath, error) {
 	if err := builder.internal.Validate(); err != nil {
 		return TypeMath{}, err
 	}
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/go/expr/typereduce_builder_gen.go /tmp/foundation-workspace-current/foundation-sdk/go/expr/typereduce_builder_gen.go
--- /tmp/foundation-workspace-main/foundation-sdk/go/expr/typereduce_builder_gen.go	2026-04-29 14:49:49.511484594 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/go/expr/typereduce_builder_gen.go	2026-04-29 14:49:06.040919572 +0000
@@ -4,11 +4,10 @@
 
 import (
 	cog "github.com/grafana/grafana-foundation-sdk/go/cog"
-	variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants"
 	common "github.com/grafana/grafana-foundation-sdk/go/common"
 )
 
-var _ cog.Builder[variants.Dataquery] = (*TypeReduceBuilder)(nil)
+var _ cog.Builder[TypeReduce] = (*TypeReduceBuilder)(nil)
 
 type TypeReduceBuilder struct {
 	internal *TypeReduce
@@ -26,7 +25,7 @@
 	return builder
 }
 
-func (builder *TypeReduceBuilder) Build() (variants.Dataquery, error) {
+func (builder *TypeReduceBuilder) Build() (TypeReduce, error) {
 	if err := builder.internal.Validate(); err != nil {
 		return TypeReduce{}, err
 	}
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/go/expr/typeresample_builder_gen.go /tmp/foundation-workspace-current/foundation-sdk/go/expr/typeresample_builder_gen.go
--- /tmp/foundation-workspace-main/foundation-sdk/go/expr/typeresample_builder_gen.go	2026-04-29 14:49:49.511914739 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/go/expr/typeresample_builder_gen.go	2026-04-29 14:49:06.040992400 +0000
@@ -4,11 +4,10 @@
 
 import (
 	cog "github.com/grafana/grafana-foundation-sdk/go/cog"
-	variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants"
 	common "github.com/grafana/grafana-foundation-sdk/go/common"
 )
 
-var _ cog.Builder[variants.Dataquery] = (*TypeResampleBuilder)(nil)
+var _ cog.Builder[TypeResample] = (*TypeResampleBuilder)(nil)
 
 type TypeResampleBuilder struct {
 	internal *TypeResample
@@ -26,7 +25,7 @@
 	return builder
 }
 
-func (builder *TypeResampleBuilder) Build() (variants.Dataquery, error) {
+func (builder *TypeResampleBuilder) Build() (TypeResample, error) {
 	if err := builder.internal.Validate(); err != nil {
 		return TypeResample{}, err
 	}
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/go/expr/typesql_builder_gen.go /tmp/foundation-workspace-current/foundation-sdk/go/expr/typesql_builder_gen.go
--- /tmp/foundation-workspace-main/foundation-sdk/go/expr/typesql_builder_gen.go	2026-04-29 14:49:49.511708695 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/go/expr/typesql_builder_gen.go	2026-04-29 14:49:06.041162180 +0000
@@ -4,11 +4,10 @@
 
 import (
 	cog "github.com/grafana/grafana-foundation-sdk/go/cog"
-	variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants"
 	common "github.com/grafana/grafana-foundation-sdk/go/common"
 )
 
-var _ cog.Builder[variants.Dataquery] = (*TypeSqlBuilder)(nil)
+var _ cog.Builder[TypeSql] = (*TypeSqlBuilder)(nil)
 
 type TypeSqlBuilder struct {
 	internal *TypeSql
@@ -26,7 +25,7 @@
 	return builder
 }
 
-func (builder *TypeSqlBuilder) Build() (variants.Dataquery, error) {
+func (builder *TypeSqlBuilder) Build() (TypeSql, error) {
 	if err := builder.internal.Validate(); err != nil {
 		return TypeSql{}, err
 	}
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/go/expr/typethreshold_builder_gen.go /tmp/foundation-workspace-current/foundation-sdk/go/expr/typethreshold_builder_gen.go
--- /tmp/foundation-workspace-main/foundation-sdk/go/expr/typethreshold_builder_gen.go	2026-04-29 14:49:49.511746260 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/go/expr/typethreshold_builder_gen.go	2026-04-29 14:49:06.041235819 +0000
@@ -4,11 +4,10 @@
 
 import (
 	cog "github.com/grafana/grafana-foundation-sdk/go/cog"
-	variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants"
 	common "github.com/grafana/grafana-foundation-sdk/go/common"
 )
 
-var _ cog.Builder[variants.Dataquery] = (*TypeThresholdBuilder)(nil)
+var _ cog.Builder[TypeThreshold] = (*TypeThresholdBuilder)(nil)
 
 type TypeThresholdBuilder struct {
 	internal *TypeThreshold
@@ -26,7 +25,7 @@
 	return builder
 }
 
-func (builder *TypeThresholdBuilder) Build() (variants.Dataquery, error) {
+func (builder *TypeThresholdBuilder) Build() (TypeThreshold, error) {
 	if err := builder.internal.Validate(); err != nil {
 		return TypeThreshold{}, err
 	}
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/java/src/main/java/com/grafana/foundation/cloudwatch/CloudWatchAnnotationQueryBuilder.java /tmp/foundation-workspace-current/foundation-sdk/java/src/main/java/com/grafana/foundation/cloudwatch/CloudWatchAnnotationQueryBuilder.java
--- /tmp/foundation-workspace-main/foundation-sdk/java/src/main/java/com/grafana/foundation/cloudwatch/CloudWatchAnnotationQueryBuilder.java	2026-04-29 14:49:49.586051391 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/java/src/main/java/com/grafana/foundation/cloudwatch/CloudWatchAnnotationQueryBuilder.java	2026-04-29 14:49:06.180678963 +0000
@@ -6,7 +6,7 @@
 import com.grafana.foundation.common.DataSourceRef;
 import java.util.List;
 
-public class CloudWatchAnnotationQueryBuilder implements com.grafana.foundation.cog.Builder<com.grafana.foundation.cog.variants.Dataquery> {
+public class CloudWatchAnnotationQueryBuilder implements com.grafana.foundation.cog.Builder<CloudWatchAnnotationQuery> {
     protected final CloudWatchAnnotationQuery internal;
     
     public CloudWatchAnnotationQueryBuilder() {
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/java/src/main/java/com/grafana/foundation/cloudwatch/CloudWatchLogsQueryBuilder.java /tmp/foundation-workspace-current/foundation-sdk/java/src/main/java/com/grafana/foundation/cloudwatch/CloudWatchLogsQueryBuilder.java
--- /tmp/foundation-workspace-main/foundation-sdk/java/src/main/java/com/grafana/foundation/cloudwatch/CloudWatchLogsQueryBuilder.java	2026-04-29 14:49:49.586129577 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/java/src/main/java/com/grafana/foundation/cloudwatch/CloudWatchLogsQueryBuilder.java	2026-04-29 14:49:06.180743408 +0000
@@ -6,7 +6,7 @@
 import java.util.LinkedList;
 import com.grafana.foundation.common.DataSourceRef;
 
-public class CloudWatchLogsQueryBuilder implements com.grafana.foundation.cog.Builder<com.grafana.foundation.cog.variants.Dataquery> {
+public class CloudWatchLogsQueryBuilder implements com.grafana.foundation.cog.Builder<CloudWatchLogsQuery> {
     protected final CloudWatchLogsQuery internal;
     
     public CloudWatchLogsQueryBuilder() {
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/java/src/main/java/com/grafana/foundation/cloudwatch/CloudWatchMetricsQueryBuilder.java /tmp/foundation-workspace-current/foundation-sdk/java/src/main/java/com/grafana/foundation/cloudwatch/CloudWatchMetricsQueryBuilder.java
--- /tmp/foundation-workspace-main/foundation-sdk/java/src/main/java/com/grafana/foundation/cloudwatch/CloudWatchMetricsQueryBuilder.java	2026-04-29 14:49:49.586197216 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/java/src/main/java/com/grafana/foundation/cloudwatch/CloudWatchMetricsQueryBuilder.java	2026-04-29 14:49:06.180812080 +0000
@@ -6,7 +6,7 @@
 import com.grafana.foundation.common.DataSourceRef;
 import java.util.List;
 
-public class CloudWatchMetricsQueryBuilder implements com.grafana.foundation.cog.Builder<com.grafana.foundation.cog.variants.Dataquery> {
+public class CloudWatchMetricsQueryBuilder implements com.grafana.foundation.cog.Builder<CloudWatchMetricsQuery> {
     protected final CloudWatchMetricsQuery internal;
     
     public CloudWatchMetricsQueryBuilder() {
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeClassicConditionsBuilder.java /tmp/foundation-workspace-current/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeClassicConditionsBuilder.java
--- /tmp/foundation-workspace-main/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeClassicConditionsBuilder.java	2026-04-29 14:49:49.625216965 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeClassicConditionsBuilder.java	2026-04-29 14:49:06.220003941 +0000
@@ -6,7 +6,7 @@
 import java.util.LinkedList;
 import com.grafana.foundation.common.DataSourceRef;
 
-public class TypeClassicConditionsBuilder implements com.grafana.foundation.cog.Builder<com.grafana.foundation.cog.variants.Dataquery> {
+public class TypeClassicConditionsBuilder implements com.grafana.foundation.cog.Builder<TypeClassicConditions> {
     protected final TypeClassicConditions internal;
     
     public TypeClassicConditionsBuilder() {
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeMathBuilder.java /tmp/foundation-workspace-current/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeMathBuilder.java
--- /tmp/foundation-workspace-main/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeMathBuilder.java	2026-04-29 14:49:49.625289312 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeMathBuilder.java	2026-04-29 14:49:06.220075026 +0000
@@ -4,7 +4,7 @@
 
 import com.grafana.foundation.common.DataSourceRef;
 
-public class TypeMathBuilder implements com.grafana.foundation.cog.Builder<com.grafana.foundation.cog.variants.Dataquery> {
+public class TypeMathBuilder implements com.grafana.foundation.cog.Builder<TypeMath> {
     protected final TypeMath internal;
     
     public TypeMathBuilder() {
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeReduceBuilder.java /tmp/foundation-workspace-current/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeReduceBuilder.java
--- /tmp/foundation-workspace-main/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeReduceBuilder.java	2026-04-29 14:49:49.625364493 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeReduceBuilder.java	2026-04-29 14:49:06.220161073 +0000
@@ -4,7 +4,7 @@
 
 import com.grafana.foundation.common.DataSourceRef;
 
-public class TypeReduceBuilder implements com.grafana.foundation.cog.Builder<com.grafana.foundation.cog.variants.Dataquery> {
+public class TypeReduceBuilder implements com.grafana.foundation.cog.Builder<TypeReduce> {
     protected final TypeReduce internal;
     
     public TypeReduceBuilder() {
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeResampleBuilder.java /tmp/foundation-workspace-current/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeResampleBuilder.java
--- /tmp/foundation-workspace-main/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeResampleBuilder.java	2026-04-29 14:49:49.625476247 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeResampleBuilder.java	2026-04-29 14:49:06.220272036 +0000
@@ -4,7 +4,7 @@
 
 import com.grafana.foundation.common.DataSourceRef;
 
-public class TypeResampleBuilder implements com.grafana.foundation.cog.Builder<com.grafana.foundation.cog.variants.Dataquery> {
+public class TypeResampleBuilder implements com.grafana.foundation.cog.Builder<TypeResample> {
     protected final TypeResample internal;
     
     public TypeResampleBuilder() {
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeSqlBuilder.java /tmp/foundation-workspace-current/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeSqlBuilder.java
--- /tmp/foundation-workspace-main/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeSqlBuilder.java	2026-04-29 14:49:49.625624236 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeSqlBuilder.java	2026-04-29 14:49:06.220416910 +0000
@@ -4,7 +4,7 @@
 
 import com.grafana.foundation.common.DataSourceRef;
 
-public class TypeSqlBuilder implements com.grafana.foundation.cog.Builder<com.grafana.foundation.cog.variants.Dataquery> {
+public class TypeSqlBuilder implements com.grafana.foundation.cog.Builder<TypeSql> {
     protected final TypeSql internal;
     
     public TypeSqlBuilder() {
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeThresholdBuilder.java /tmp/foundation-workspace-current/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeThresholdBuilder.java
--- /tmp/foundation-workspace-main/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeThresholdBuilder.java	2026-04-29 14:49:49.625704103 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/java/src/main/java/com/grafana/foundation/expr/TypeThresholdBuilder.java	2026-04-29 14:49:06.220493253 +0000
@@ -6,7 +6,7 @@
 import java.util.LinkedList;
 import com.grafana.foundation.common.DataSourceRef;
 
-public class TypeThresholdBuilder implements com.grafana.foundation.cog.Builder<com.grafana.foundation.cog.variants.Dataquery> {
+public class TypeThresholdBuilder implements com.grafana.foundation.cog.Builder<TypeThreshold> {
     protected final TypeThreshold internal;
     
     public TypeThresholdBuilder() {
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/typescript/src/cloudwatch/cloudWatchAnnotationQueryBuilder.gen.ts /tmp/foundation-workspace-current/foundation-sdk/typescript/src/cloudwatch/cloudWatchAnnotationQueryBuilder.gen.ts
--- /tmp/foundation-workspace-main/foundation-sdk/typescript/src/cloudwatch/cloudWatchAnnotationQueryBuilder.gen.ts	2026-04-29 14:49:49.221968622 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/typescript/src/cloudwatch/cloudWatchAnnotationQueryBuilder.gen.ts	2026-04-29 14:49:05.753081323 +0000
@@ -7,7 +7,7 @@
 // Shape of a CloudWatch Annotation query
 // TS type is CloudWatchDefaultQuery = Omit<CloudWatchLogsQuery, 'queryMode'> & CloudWatchMetricsQuery, declared in veneer
 // #CloudWatchDefaultQuery: #CloudWatchLogsQuery & #CloudWatchMetricsQuery @cuetsy(kind="type")
-export class CloudWatchAnnotationQueryBuilder implements cog.Builder<cog.Dataquery> {
+export class CloudWatchAnnotationQueryBuilder implements cog.Builder<cloudwatch.CloudWatchAnnotationQuery> {
     protected readonly internal: cloudwatch.CloudWatchAnnotationQuery;
 
     constructor() {
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/typescript/src/cloudwatch/cloudWatchLogsQueryBuilder.gen.ts /tmp/foundation-workspace-current/foundation-sdk/typescript/src/cloudwatch/cloudWatchLogsQueryBuilder.gen.ts
--- /tmp/foundation-workspace-main/foundation-sdk/typescript/src/cloudwatch/cloudWatchLogsQueryBuilder.gen.ts	2026-04-29 14:49:49.222010914 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/typescript/src/cloudwatch/cloudWatchLogsQueryBuilder.gen.ts	2026-04-29 14:49:05.753135663 +0000
@@ -5,7 +5,7 @@
 import * as common from '../common';
 
 // Shape of a CloudWatch Logs query
-export class CloudWatchLogsQueryBuilder implements cog.Builder<cog.Dataquery> {
+export class CloudWatchLogsQueryBuilder implements cog.Builder<cloudwatch.CloudWatchLogsQuery> {
     protected readonly internal: cloudwatch.CloudWatchLogsQuery;
 
     constructor() {
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/typescript/src/cloudwatch/cloudWatchMetricsQueryBuilder.gen.ts /tmp/foundation-workspace-current/foundation-sdk/typescript/src/cloudwatch/cloudWatchMetricsQueryBuilder.gen.ts
--- /tmp/foundation-workspace-main/foundation-sdk/typescript/src/cloudwatch/cloudWatchMetricsQueryBuilder.gen.ts	2026-04-29 14:49:49.222045245 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/typescript/src/cloudwatch/cloudWatchMetricsQueryBuilder.gen.ts	2026-04-29 14:49:05.753167139 +0000
@@ -5,7 +5,7 @@
 import * as common from '../common';
 
 // Shape of a CloudWatch Metrics query
-export class CloudWatchMetricsQueryBuilder implements cog.Builder<cog.Dataquery> {
+export class CloudWatchMetricsQueryBuilder implements cog.Builder<cloudwatch.CloudWatchMetricsQuery> {
     protected readonly internal: cloudwatch.CloudWatchMetricsQuery;
 
     constructor() {
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/typescript/src/expr/typeClassicConditionsBuilder.gen.ts /tmp/foundation-workspace-current/foundation-sdk/typescript/src/expr/typeClassicConditionsBuilder.gen.ts
--- /tmp/foundation-workspace-main/foundation-sdk/typescript/src/expr/typeClassicConditionsBuilder.gen.ts	2026-04-29 14:49:49.231898915 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/typescript/src/expr/typeClassicConditionsBuilder.gen.ts	2026-04-29 14:49:05.763001571 +0000
@@ -4,7 +4,7 @@
 import * as expr from '../expr';
 import * as common from '../common';
 
-export class TypeClassicConditionsBuilder implements cog.Builder<cog.Dataquery> {
+export class TypeClassicConditionsBuilder implements cog.Builder<expr.TypeClassicConditions> {
     protected readonly internal: expr.TypeClassicConditions;
 
     constructor() {
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/typescript/src/expr/typeMathBuilder.gen.ts /tmp/foundation-workspace-current/foundation-sdk/typescript/src/expr/typeMathBuilder.gen.ts
--- /tmp/foundation-workspace-main/foundation-sdk/typescript/src/expr/typeMathBuilder.gen.ts	2026-04-29 14:49:49.231929650 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/typescript/src/expr/typeMathBuilder.gen.ts	2026-04-29 14:49:05.763036002 +0000
@@ -4,7 +4,7 @@
 import * as expr from '../expr';
 import * as common from '../common';
 
-export class TypeMathBuilder implements cog.Builder<cog.Dataquery> {
+export class TypeMathBuilder implements cog.Builder<expr.TypeMath> {
     protected readonly internal: expr.TypeMath;
 
     constructor() {
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/typescript/src/expr/typeReduceBuilder.gen.ts /tmp/foundation-workspace-current/foundation-sdk/typescript/src/expr/typeReduceBuilder.gen.ts
--- /tmp/foundation-workspace-main/foundation-sdk/typescript/src/expr/typeReduceBuilder.gen.ts	2026-04-29 14:49:49.231962819 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/typescript/src/expr/typeReduceBuilder.gen.ts	2026-04-29 14:49:05.763068049 +0000
@@ -4,7 +4,7 @@
 import * as expr from '../expr';
 import * as common from '../common';
 
-export class TypeReduceBuilder implements cog.Builder<cog.Dataquery> {
+export class TypeReduceBuilder implements cog.Builder<expr.TypeReduce> {
     protected readonly internal: expr.TypeReduce;
 
     constructor() {
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/typescript/src/expr/typeResampleBuilder.gen.ts /tmp/foundation-workspace-current/foundation-sdk/typescript/src/expr/typeResampleBuilder.gen.ts
--- /tmp/foundation-workspace-main/foundation-sdk/typescript/src/expr/typeResampleBuilder.gen.ts	2026-04-29 14:49:49.232007926 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/typescript/src/expr/typeResampleBuilder.gen.ts	2026-04-29 14:49:05.763147446 +0000
@@ -4,7 +4,7 @@
 import * as expr from '../expr';
 import * as common from '../common';
 
-export class TypeResampleBuilder implements cog.Builder<cog.Dataquery> {
+export class TypeResampleBuilder implements cog.Builder<expr.TypeResample> {
     protected readonly internal: expr.TypeResample;
 
     constructor() {
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/typescript/src/expr/typeSqlBuilder.gen.ts /tmp/foundation-workspace-current/foundation-sdk/typescript/src/expr/typeSqlBuilder.gen.ts
--- /tmp/foundation-workspace-main/foundation-sdk/typescript/src/expr/typeSqlBuilder.gen.ts	2026-04-29 14:49:49.232042076 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/typescript/src/expr/typeSqlBuilder.gen.ts	2026-04-29 14:49:05.763115499 +0000
@@ -4,7 +4,7 @@
 import * as expr from '../expr';
 import * as common from '../common';
 
-export class TypeSqlBuilder implements cog.Builder<cog.Dataquery> {
+export class TypeSqlBuilder implements cog.Builder<expr.TypeSql> {
     protected readonly internal: expr.TypeSql;
 
     constructor() {
diff --new-file --unidirectional-new-file '--color=never' --unified --recursive '--exclude=.git' '--exclude=gradle.properties' '--exclude=pyproject.toml' '--exclude=package.json' '--exclude=*.md' /tmp/foundation-workspace-main/foundation-sdk/typescript/src/expr/typeThresholdBuilder.gen.ts /tmp/foundation-workspace-current/foundation-sdk/typescript/src/expr/typeThresholdBuilder.gen.ts
--- /tmp/foundation-workspace-main/foundation-sdk/typescript/src/expr/typeThresholdBuilder.gen.ts	2026-04-29 14:49:49.232073552 +0000
+++ /tmp/foundation-workspace-current/foundation-sdk/typescript/src/expr/typeThresholdBuilder.gen.ts	2026-04-29 14:49:05.763187375 +0000
@@ -4,7 +4,7 @@
 import * as expr from '../expr';
 import * as common from '../common';
 
-export class TypeThresholdBuilder implements cog.Builder<cog.Dataquery> {
+export class TypeThresholdBuilder implements cog.Builder<expr.TypeThreshold> {
     protected readonly internal: expr.TypeThreshold;
 
     constructor() {