Refactor Query API to functional types

src/SDK/Language/Web.php

@@ -204,7 +204,7 @@ public function getReadOnlyProperties(array $parameter, string $responseModel, a
         return $properties;
     }
 
-    public function getTypeName(array $parameter, array $method = []): string
+    public function getTypeName(array $parameter, array $method = [], array $spec = []): string
     {
         if (isset($parameter['enumName'])) {
             return \ucfirst($parameter['enumName']);
@@ -220,9 +220,35 @@ public function getTypeName(array $parameter, array $method = []): string
             return $parameter['type'] === self::TYPE_ARRAY ? $modelType . '[]' : $modelType;
         }
         if (isset($parameter['items'])) {
-            // Map definition nested type to parameter nested type
             $parameter['array'] = $parameter['items'];
         }
+        if (isset($parameter['name']) && $parameter['name'] === 'queries' && $parameter['type'] === self::TYPE_ARRAY) {
+            $modelName = !empty($method['responseModel']) ? ucfirst($method['responseModel']) : 'unknown';
+            // Find the array property name (buckets, documents, files, etc.)
+            $arrayProperty = 'items';
+            if (!empty($spec['definitions'][$method['responseModel']]['properties'])) {
+                $props = $spec['definitions'][$method['responseModel']]['properties'];
+                $propCount = count($props);
+                foreach ($props as $propName => $prop) {
+                    if (($prop['type'] ?? '') === self::TYPE_ARRAY) {
+                        $arrayProperty = $propName;
+                        break;
+                    }
+                    // If there's a total property and only 2 properties, the other one is the array
+                    if ($propName === 'total' && $propCount === 2) {
+                        // Find the other property
+                        $otherProps = array_keys($props);
+                        foreach ($otherProps as $otherProp) {
+                            if ($otherProp !== 'total') {
+                                $arrayProperty = $otherProp;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+            return '(q: ModelOps<Models.' . $modelName . '["' . $arrayProperty . '"][number]>) => Query[]';
+        }
         switch ($parameter['type']) {
             case self::TYPE_INTEGER:
             case self::TYPE_NUMBER:
@@ -439,8 +465,8 @@ public function getSubSchema(array $property, array $spec, string $methodName =
     public function getFilters(): array
     {
         return \array_merge(parent::getFilters(), [
-            new TwigFilter('getPropertyType', function ($value, $method = []) {
-                return $this->getTypeName($value, $method);
+            new TwigFilter('getPropertyType', function ($value, $method = [], $spec = []) {
+                return $this->getTypeName($value, $method, $spec);
             }),
             new TwigFilter('getReadOnlyProperties', function ($value, $responseModel, $spec = []) {
                 return $this->getReadOnlyProperties($value, $responseModel, $spec);

templates/web/src/client.ts.twig

@@ -796,4 +796,3 @@ export { Client, {{spec.title | caseUcfirst}}Exception };
 export { Query } from './query';
 export type { Models, Payload, UploadProgress };
 export type { RealtimeResponseEvent };
-export type { QueryTypes, QueryTypesList } from './query';

templates/web/src/index.ts.twig

@@ -11,7 +11,6 @@ export { {{service.name | caseUcfirst}} } from './services/{{service.name | case
 {% endfor %}
 export { Realtime } from './services/realtime';
 export type { Models, Payload, RealtimeResponseEvent, UploadProgress } from './client';
-export type { QueryTypes, QueryTypesList } from './query';
 export { Permission } from './permission';
 export { Role } from './role';
 export { ID } from './id';