feat: add Query.Builder, aggregates, joins, and nested ON

example.php

@@ -82,13 +82,11 @@ function configureSDK(SDK $sdk, array $overrides = []): SDK {
             ],
         ];
 
-        // Deep-merge exclude services so overrides add to defaults rather than replacing
-        if (isset($overrides['exclude']['services']) && isset($defaults['exclude']['services'])) {
-            $overrides['exclude']['services'] = [
-                ...$defaults['exclude']['services'],
-                ...$overrides['exclude']['services'],
-            ];
+        $exclude = $defaults['exclude'];
+        foreach ($overrides['exclude'] ?? [] as $kind => $rules) {
+            $exclude[$kind] = [...($exclude[$kind] ?? []), ...$rules];
         }
+        $overrides['exclude'] = $exclude;
 
         $config = [...$defaults, ...$overrides];
 
@@ -264,11 +262,22 @@ function buildStaticSpecification(): Specification {
 
     // CLI
     if (!$requestedSdk || $requestedSdk === 'cli') {
+        // CLI go.mod replace-pins github.com/appwrite/sdk-for-go/v7 to ../go.
+        $go = new SDK(new Go(), buildSpecification($spec));
+        configureSDK($go, [
+            'platform' => 'server',
+            'gitUserName' => 'appwrite',
+            'gitRepoName' => 'sdk-for-go',
+            'version' => '7.2.0-rc.3',
+        ]);
+        $go->generate(__DIR__ . '/examples/go');
+
         $language = new CLI();
         $language->setExecutableName('appwrite');
         $language->setLogo($cliLogo);
         $language->setLogoUnescaped($cliLogoUnescaped);
         $language->setNPMPackage('appwrite-cli');
+        $language->setSdkPath('../go');
 
         $sdk = new SDK($language, buildSpecification($spec));
         $sdk->setTest(false);
@@ -332,11 +341,11 @@ function buildStaticSpecification(): Specification {
     if (!$requestedSdk || $requestedSdk === 'go') {
         $sdk  = new SDK(new Go(), buildSpecification($spec));
         // The version decides the major-version suffix Go requires from v2 on,
-        // so examples/go declares `sdk-for-go/v6` like the published module.
+        // so examples/go declares `sdk-for-go/v7` like the published module.
         configureSDK($sdk, [
             'gitUserName' => 'appwrite',
             'gitRepoName' => 'sdk-for-go',
-            'version' => '6.2.0',
+            'version' => '7.2.0-rc.3',
         ]);
         $sdk->generate(__DIR__ . '/examples/go');
     }

src/SDK/Language.php

@@ -583,17 +583,23 @@ protected function getSchemaEnumName(Schema|Parameter $value, ?Specification $sp
             return $name;
         }
 
+        $source = $this->getSchema($value);
+        $source = $source instanceof ArraySchema ? $source->items : $source;
+
         foreach ($spec?->schemas ?? [] as $modelName => $model) {
             if (!$model instanceof ObjectSchema) {
                 continue;
             }
             foreach ($model->properties as $propertyName => $property) {
-                if ($this->getEnumSchema($property) === $enumSchema) {
+                $propertySource = $this->getSchema($property);
+                $propertySource = $propertySource instanceof ArraySchema ? $propertySource->items : $propertySource;
+                if ($propertySource === $source) {
                     return \ucfirst($modelName) . \ucfirst($propertyName);
                 }
             }
         }
-        return '';
+
+        return $value instanceof Parameter ? $value->name : '';
     }
 
     protected function getSpecificationSchemaName(Schema $schema, Specification $spec): string

src/SDK/Language/Android.php

@@ -130,6 +130,11 @@ public function getFiles(): array
                 'destination'   => '/library/src/main/java/{{ sdk.namespace | caseSlash }}/Query.kt',
                 'template'      => '/android/library/src/main/java/io/package/Query.kt.twig',
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => '/library/src/test/java/{{ sdk.namespace | caseSlash }}/QueryTest.kt',
+                'template'      => '/kotlin/src/test/kotlin/io/appwrite/QueryTest.kt.twig',
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => '/library/src/main/java/{{ sdk.namespace | caseSlash }}/Operator.kt',

src/SDK/Language/Apple.php

@@ -95,6 +95,11 @@ public function getFiles(): array
                 'destination'   => '/Sources/{{ spec.info.title | caseUcfirst}}/Query.swift',
                 'template'      => 'swift/Sources/Query.swift.twig',
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => '/Sources/{{ spec.info.title | caseUcfirst}}/Query/Builder.swift',
+                'template'      => 'swift/Sources/Query/Builder.swift.twig',
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => '/Sources/{{ spec.info.title | caseUcfirst}}/Operator.swift',

src/SDK/Language/CLI.php

@@ -42,6 +42,7 @@ class CLI extends Go
         // silently break every installer if they did not.
         'npmPackage' => 'appwrite-cli',
         'sdkImportPath' => self::SDK_MODULE,
+        'sdkPath' => '',
         // ASCII art above the main help screen. Templates escape it for their
         // target syntax rather than sharing one encoded representation.
         'logo' => '',
@@ -98,6 +99,16 @@ public function setNPMPackage(string $name): self
         return $this;
     }
 
+    /**
+     * Local directory go.mod replaces the published Go SDK with. Empty keeps the published module.
+     */
+    public function setSdkPath(string $path): self
+    {
+        $this->setParam('sdkPath', $path);
+
+        return $this;
+    }
+
     /**
      * Configure the Homebrew tap (`<owner>/homebrew-<name>`) hosting the formula.
      */

src/SDK/Language/Dart.php

@@ -341,6 +341,11 @@ public function getFiles(): array
                 'destination'   => '/lib/query.dart',
                 'template'      => 'dart/lib/query.dart.twig',
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => '/lib/query/builder.dart',
+                'template'      => 'dart/lib/query/builder.dart.twig',
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => '/lib/operator.dart',

src/SDK/Language/DotNet.php

@@ -376,6 +376,11 @@ public function getFiles(): array
                 'destination'   => '{{ spec.info.title | caseUcfirst }}/Query.cs',
                 'template'      => 'dotnet/Package/Query.cs.twig',
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => '{{ spec.info.title | caseUcfirst }}/Query/Builder.cs',
+                'template'      => 'dotnet/Package/Query/Builder.cs.twig',
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => '{{ spec.info.title | caseUcfirst }}/Operator.cs',

src/SDK/Language/Flutter.php

@@ -96,6 +96,11 @@ public function getFiles(): array
                 'destination'   => '/lib/query.dart',
                 'template'      => 'dart/lib/query.dart.twig',
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => '/lib/query/builder.dart',
+                'template'      => 'dart/lib/query/builder.dart.twig',
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => '/lib/operator.dart',

src/SDK/Language/Go.php

@@ -108,6 +108,11 @@ public function getFiles(): array
                 'destination'   => 'query/query.go',
                 'template'      => 'go/query.go.twig',
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => 'query/builder.go',
+                'template'      => 'go/query/builder.go.twig',
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => 'operator/operator.go',

src/SDK/Language/Kotlin.php

@@ -532,6 +532,11 @@ public function getFiles(): array
                 'destination'   => '/src/main/kotlin/{{ sdk.namespace | caseSlash }}/Query.kt',
                 'template'      => '/kotlin/src/main/kotlin/io/appwrite/Query.kt.twig',
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => '/src/test/kotlin/{{ sdk.namespace | caseSlash }}/QueryTest.kt',
+                'template'      => '/kotlin/src/test/kotlin/io/appwrite/QueryTest.kt.twig',
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => '/src/main/kotlin/{{ sdk.namespace | caseSlash }}/Operator.kt',

src/SDK/Language/PHP.php

@@ -273,6 +273,11 @@ public function getFiles(): array
                 'destination'   => 'src/{{ namespace | caseNamespacePath }}/Query.php',
                 'template'      => 'php/src/Query.php.twig',
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => 'src/{{ namespace | caseNamespacePath }}/Query/Builder.php',
+                'template'      => 'php/src/Query/Builder.php.twig',
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => 'tests/{{ namespace | caseNamespacePath }}/QueryTest.php',

src/SDK/Language/Ruby.php

@@ -167,6 +167,11 @@ public function getFiles(): array
                 'destination'   => 'lib/{{ spec.info.title | caseDash }}/query.rb',
                 'template'      => 'ruby/lib/container/query.rb.twig',
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => 'lib/{{ spec.info.title | caseDash }}/query/builder.rb',
+                'template'      => 'ruby/lib/container/query/builder.rb.twig',
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => 'lib/{{ spec.info.title | caseDash }}/operator.rb',
@@ -283,7 +288,8 @@ public function getParamExample(Schema|Parameter $param, string $lang = ''): str
                     $output .= $this->isPermissionString($example) ? $this->getPermissionExample($example) : $example;
                     break;
                 case self::TYPE_OBJECT:
-                    $output .= $this->jsonToHash(json_decode((string) $example, true));
+                    $decoded = \is_array($example) ? $example : json_decode((string) $example, true);
+                    $output .= $this->jsonToHash(\is_array($decoded) ? $decoded : []);
                     break;
                 case self::TYPE_BOOLEAN:
                     $output .= ($example) ? 'true' : 'false';

src/SDK/Language/Rust.php

@@ -194,8 +194,13 @@ public function getFiles(): array
             ],
             [
                 "scope" => "default",
-                "destination" => "src/query.rs",
-                "template" => "rust/src/query.rs.twig",
+                "destination" => "src/query/mod.rs",
+                "template" => "rust/src/query/mod.rs.twig",
+            ],
+            [
+                "scope" => "default",
+                "destination" => "src/query/builder.rs",
+                "template" => "rust/src/query/builder.rs.twig",
             ],
             [
                 "scope" => "default",
@@ -955,4 +960,13 @@ protected function formatArrayItemExample(mixed $value, Schema $items): string
             },
         };
     }
+
+    #[Override]
+    public function postGenerate(string $target): void
+    {
+        $legacy = $target . '/src/query.rs';
+        if (\is_file($legacy) && \is_dir($target . '/src/query')) {
+            \unlink($legacy);
+        }
+    }
 }

src/SDK/Language/Swift.php

@@ -197,6 +197,11 @@ public function getFiles(): array
                 'destination'   => '/Sources/{{ spec.info.title | caseUcfirst}}/Query.swift',
                 'template'      => 'swift/Sources/Query.swift.twig',
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => '/Sources/{{ spec.info.title | caseUcfirst}}/Query/Builder.swift',
+                'template'      => 'swift/Sources/Query/Builder.swift.twig',
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => '/Sources/{{ spec.info.title | caseUcfirst}}/Operator.swift',

src/SDK/Language/Unity.php

@@ -169,6 +169,11 @@ public function getFiles(): array
                 'destination'   => 'Assets/Runtime/Core/Query.cs',
                 'template'      => 'dotnet/Package/Query.cs.twig',
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => 'Assets/Runtime/Core/Query/Builder.cs',
+                'template'      => 'dotnet/Package/Query/Builder.cs.twig',
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => 'Assets/Runtime/Core/Role.cs',

src/SDK/SDK.php

@@ -1697,13 +1697,15 @@ protected function getSchemaDependencies(Schema $schema): array
 
     protected function getEnumName(Schema|Parameter $value): string
     {
+        $original = $this->getSchema($value);
         $enumSchema = $this->language->getEnumSchema($value);
         if ($enumSchema->enum === []) {
             return '';
         }
         return (string) (($enumSchema instanceof StringSchema ? $enumSchema->enumName : null)
             ?? $enumSchema->title
             ?? $this->schemaEnumNames[\spl_object_id($enumSchema)]
+            ?? $this->schemaEnumNames[\spl_object_id($original)]
             ?? ($value instanceof Parameter ? $value->name : ''));
     }
 

templates/android/library/src/main/java/io/package/Client.kt.twig

@@ -335,7 +335,10 @@ class Client @JvmOverloads constructor(
         headers: Map<String, String> = mapOf(),
         params: Map<String, Any?> = mapOf(),
     ): Request {
-        val filteredParams = params.filterValues { it != null }
+        // flatten() resolves Query/Query.Builder values before the null filter,
+        // so a builder that renders to null is dropped like any other null.
+        val flattenedParams = params.mapValues { flatten(it.value) }
+        val filteredParams = flattenedParams.filterValues { it != null }
 
         val requestHeaders = this.headers.toHeaders().newBuilder()
             .addAll(headers.toHeaders())
@@ -398,7 +401,7 @@ class Client @JvmOverloads constructor(
             }
             builder.build()
         } else {
-            params
+            flattenedParams
                 .toJsonRequestBody()
                 .toRequestBody("application/json".toMediaType())
         }
@@ -742,4 +745,44 @@ class Client @JvmOverloads constructor(
             }
         })
     }
+
+    fun flatten(value: Any?): Any? {
+        if (value is Query.Builder) {
+            return value.build()
+        }
+        if (value is Query) {
+            return value.toString()
+        }
+
+        val items = when (value) {
+            is Array<*> -> value.asList()
+            is Collection<*> -> value
+            else -> return value
+        }
+
+        val out = ArrayList<Any?>(items.size)
+        var changed = false
+        for (item in items) {
+            val flat = flatten(item)
+            if (item is Query.Builder || item is Query) {
+                if (flat is Collection<*>) {
+                    out.addAll(flat)
+                } else {
+                    out.add(flat)
+                }
+                changed = true
+                continue
+            }
+            if ((item is Array<*> || item is Collection<*>) && flat is Collection<*> && flat.all { it is String }) {
+                out.addAll(flat)
+                changed = true
+                continue
+            }
+            if (flat !== item) {
+                changed = true
+            }
+            out.add(flat)
+        }
+        return if (changed) out else value
+    }
 }