Types validator

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Logs/XList.php

@@ -10,6 +10,7 @@ use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Deprecated;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Database\Validator\Queries\Types;
 use Appwrite\Utopia\Response as UtopiaResponse;
 use MaxMind\Db\Reader;
 use Utopia\Audit\Audit;
@@ -67,7 +68,7 @@ class XList extends Action
             ->param('databaseId', '', new UID(), 'Database ID.')
             ->param('collectionId', '', new UID(), 'Collection ID.')
             ->param('documentId', '', new UID(), 'Document ID.')
-            ->param('queries', [], new Queries([new Limit(), new Offset()]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
+            ->param('queries', [], new Types([Query::TYPE_LIMIT, Query::TYPE_OFFSET]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
             ->inject('response')
             ->inject('dbForProject')
             ->inject('locale')

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Logs/XList.php

@@ -9,6 +9,7 @@ use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Deprecated;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Database\Validator\Queries\Types;
 use Appwrite\Utopia\Response as UtopiaResponse;
 use DeviceDetector\DeviceDetector as Detector;
 use MaxMind\Db\Reader;
@@ -66,7 +67,7 @@ class XList extends Action
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
             ->param('collectionId', '', new UID(), 'Collection ID.')
-            ->param('queries', [], new Queries([new Limit(), new Offset()]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
+            ->param('queries', [], new Types([Query::TYPE_LIMIT, Query::TYPE_OFFSET]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
             ->inject('response')
             ->inject('dbForProject')
             ->inject('locale')

src/Appwrite/Platform/Modules/Databases/Http/Databases/Logs/XList.php

@@ -8,6 +8,7 @@ use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Deprecated;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Database\Validator\Queries\Types;
 use Appwrite\Utopia\Response as UtopiaResponse;
 use DeviceDetector\DeviceDetector as Detector;
 use MaxMind\Db\Reader;
@@ -62,7 +63,7 @@ class XList extends Action
                 ),
             ])
             ->param('databaseId', '', new UID(), 'Database ID.')
-            ->param('queries', [], new Queries([new Limit(), new Offset()]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
+            ->param('queries', [], new Types([Query::TYPE_LIMIT, Query::TYPE_OFFSET]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
             ->inject('response')
             ->inject('dbForProject')
             ->inject('locale')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Logs/XList.php

@@ -7,6 +7,7 @@ use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Database\Validator\Queries\Types;
 use Appwrite\Utopia\Response as UtopiaResponse;
 use DeviceDetector\DeviceDetector as Detector;
 use MaxMind\Db\Reader;
@@ -57,7 +58,7 @@ class XList extends Action
                 ),
             ])
             ->param('databaseId', '', new UID(), 'Database ID.')
-            ->param('queries', [], new Queries([new Limit(), new Offset()]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
+            ->param('queries', [], new Types([Query::TYPE_LIMIT, Query::TYPE_OFFSET]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
             ->inject('response')
             ->inject('dbForProject')
             ->inject('locale')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Logs/XList.php

@@ -7,6 +7,8 @@ use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Database\Validator\Queries\Types;
+use Utopia\Database\Query;
 use Utopia\Database\Validator\Queries;
 use Utopia\Database\Validator\Query\Limit;
 use Utopia\Database\Validator\Query\Offset;
@@ -45,7 +47,7 @@ class XList extends CollectionLogXList
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
             ->param('tableId', '', new UID(), 'Table ID.')
-            ->param('queries', [], new Queries([new Limit(), new Offset()]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
+            ->param('queries', [], new Types([Query::TYPE_LIMIT, Query::TYPE_OFFSET]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
             ->inject('response')
             ->inject('dbForProject')
             ->inject('locale')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Logs/XList.php

@@ -7,6 +7,8 @@ use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Database\Validator\Queries\Types;
+use Utopia\Database\Query;
 use Utopia\Database\Validator\Queries;
 use Utopia\Database\Validator\Query\Limit;
 use Utopia\Database\Validator\Query\Offset;
@@ -46,7 +48,7 @@ class XList extends DocumentLogXList
             ->param('databaseId', '', new UID(), 'Database ID.')
             ->param('tableId', '', new UID(), 'Table ID.')
             ->param('rowId', '', new UID(), 'Row ID.')
-            ->param('queries', [], new Queries([new Limit(), new Offset()]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
+            ->param('queries', [], new Types([Query::TYPE_LIMIT, Query::TYPE_OFFSET]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
             ->inject('response')
             ->inject('dbForProject')
             ->inject('locale')

src/Appwrite/Utopia/Database/Validator/Queries/Base.php

@@ -5,15 +5,16 @@ namespace Appwrite\Utopia\Database\Validator\Queries;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
+use Utopia\Database\Query;
 use Utopia\Database\Validator\Queries;
 use Utopia\Database\Validator\Query\Cursor;
-use Utopia\Database\Validator\Query\Filter;
+//use Utopia\Database\Validator\Query\Filter;
 use Utopia\Database\Validator\Query\Limit;
 use Utopia\Database\Validator\Query\Offset;
-use Utopia\Database\Validator\Query\Order;
-use Utopia\Database\Validator\Query\Select;
+//use Utopia\Database\Validator\Query\Order;
+//use Utopia\Database\Validator\Query\Select;
 
-class Base extends Queries
+class Base extends Types
 {
     /**
      * Expression constructor
@@ -24,6 +25,51 @@ class Base extends Queries
      */
     public function __construct(string $collection, array $allowedAttributes)
     {
+        $types = [
+            Query::TYPE_LIMIT,
+            Query::TYPE_OFFSET,
+            Query::TYPE_CURSOR_AFTER,
+            Query::TYPE_CURSOR_BEFORE,
+            Query::TYPE_ORDER_ASC,
+            Query::TYPE_ORDER_DESC,
+            Query::TYPE_ORDER_RANDOM,
+            Query::TYPE_EQUAL,
+            Query::TYPE_NOT_EQUAL,
+            Query::TYPE_LESSER,
+            Query::TYPE_LESSER_EQUAL,
+            Query::TYPE_GREATER,
+            Query::TYPE_GREATER_EQUAL,
+            Query::TYPE_SEARCH,
+            Query::TYPE_NOT_SEARCH,
+            Query::TYPE_IS_NULL,
+            Query::TYPE_IS_NOT_NULL,
+            Query::TYPE_BETWEEN,
+            Query::TYPE_NOT_BETWEEN,
+            Query::TYPE_STARTS_WITH,
+            Query::TYPE_NOT_STARTS_WITH,
+            Query::TYPE_ENDS_WITH,
+            Query::TYPE_NOT_ENDS_WITH,
+            Query::TYPE_CONTAINS,
+            Query::TYPE_NOT_CONTAINS,
+            Query::TYPE_AND,
+            Query::TYPE_OR,
+            Query::TYPE_CROSSES,
+            Query::TYPE_NOT_CROSSES,
+            Query::TYPE_DISTANCE_EQUAL,
+            Query::TYPE_DISTANCE_NOT_EQUAL,
+            Query::TYPE_DISTANCE_GREATER_THAN,
+            Query::TYPE_DISTANCE_LESS_THAN,
+            Query::TYPE_INTERSECTS,
+            Query::TYPE_NOT_INTERSECTS,
+            Query::TYPE_OVERLAPS,
+            Query::TYPE_NOT_OVERLAPS,
+            Query::TYPE_TOUCHES,
+            Query::TYPE_NOT_TOUCHES,
+            Query::TYPE_VECTOR_DOT,
+            Query::TYPE_VECTOR_COSINE,
+            Query::TYPE_VECTOR_EUCLIDEAN
+        ];
+
         $config = Config::getParam('collections', []);
 
         $collections = \array_merge(
@@ -87,19 +133,11 @@ class Base extends Queries
             $allAttributes[] = $attribute;
         }
 
-        $validators = [
-            new Limit(),
-            new Offset(),
-            new Cursor(),
-            new Filter($attributes, APP_DATABASE_QUERY_MAX_VALUES),
-            new Order($attributes),
-        ];
-
         if ($this->isSelectQueryAllowed()) {
-            $validators[] = new Select($allAttributes);
+            $types[] = Query::TYPE_SELECT;
         }
 
-        parent::__construct($validators);
+        parent::__construct($types);
     }
 
     public function isSelectQueryAllowed(): bool

src/Appwrite/Utopia/Database/Validator/Queries/Types.php

@@ -0,0 +1,117 @@
+<?php
+
+namespace Appwrite\Utopia\Database\Validator\Queries;
+
+use Utopia\Database\Database;
+use Utopia\Database\Query;
+use Utopia\Database\QueryContext;
+use Utopia\Database\Validator\Queries\V2 as DocumentsValidator;
+use Utopia\Validator;
+
+class Types extends Validator
+{
+    protected string $message = 'Invalid queries';
+
+    /**
+     * @var array<string>
+     */
+    protected array $types;
+
+    /**
+     * @var array<Query>
+     */
+    protected array $queries;
+
+    /**
+     * @param array<string> $types
+     */
+    public function __construct(array $types = [])
+    {
+        $this->types = $types;
+    }
+
+    /**
+     * Get Description.
+     *
+     * Returns validator description
+     *
+     * @return string
+     */
+    public function getDescription(): string
+    {
+        return $this->message;
+    }
+
+    /**
+     * @param array<Query|string> $value
+     * @return bool
+     */
+    public function isValid($value): bool
+    {
+        try {
+            if (!is_array($value)) {
+                throw new \Exception('Queries must be an array');
+            }
+
+            var_dump($value);
+
+            foreach ($value as $query) {
+                if (!$query instanceof Query) {
+                    $query = Query::parse($query);
+                }
+
+                if ($query->isNested()) {
+                    if (!self::isValid($query->getValues())) {
+                        throw new \Exception('Invalid queries');
+                    }
+                }
+
+                if (!in_array($query->getMethod(), $this->types)) {
+                    throw new \Exception("Query method {$query->getMethod()} not allowed");
+                }
+            }
+
+            $context = new QueryContext();
+
+            $validator = new DocumentsValidator($context, Database::VAR_INTEGER);
+
+            if (!$validator->isValid($value)) {
+                throw new \Exception($validator->getDescription());
+            }
+
+        } catch (\Throwable $e) {
+            var_dump($e->getMessage());
+            var_dump($e->getFile());
+            var_dump($e->getLine());
+
+            $this->message = 'Invalid query: ' . $e->getMessage();
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Is array
+     *
+     * Function will return true if object is array.
+     *
+     * @return bool
+     */
+    public function isArray(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get Type
+     *
+     * Returns validator type.
+     *
+     * @return string
+     */
+    public function getType(): string
+    {
+        return self::TYPE_OBJECT;
+    }
+}