Expand accepted types for field queries (mongodb#11)

Author: GromNaN

generator/config/expressions.php

@@ -83,7 +83,7 @@
     ],
     'fieldQuery' => [
         'returnType' => Type\FieldQueryInterface::class,
-        'acceptedTypes' => [Type\FieldQueryInterface::class, BSON\Regex::class, 'bool', 'string', 'array', 'null', stdClass::class, ...$bsonTypes['number']],
+        'acceptedTypes' => [Type\FieldQueryInterface::class, ...$bsonTypes['any']],
     ],
     'query' => [
         'returnType' => Type\QueryInterface::class,

src/Builder/Query.php

@@ -4,9 +4,8 @@
 
 namespace MongoDB\Builder;
 
-use MongoDB\BSON\Decimal128;
-use MongoDB\BSON\Int64;
 use MongoDB\BSON\Regex;
+use MongoDB\BSON\Type;
 use MongoDB\Builder\Query\RegexOperator;
 use MongoDB\Builder\Type\FieldQueryInterface;
 use MongoDB\Builder\Type\QueryInterface;
@@ -41,7 +40,7 @@ public static function regex(Regex|string $regex, string|null $flags = null): Re
         return self::generatedRegex($regex);
     }
 
-    public static function query(QueryInterface|FieldQueryInterface|Decimal128|Int64|Regex|stdClass|array|bool|float|int|string|null ...$query): QueryInterface
+    public static function query(QueryInterface|FieldQueryInterface|Type|stdClass|array|bool|float|int|string|null ...$query): QueryInterface
     {
         return QueryObject::create($query);
     }

src/Builder/Query/FactoryTrait.php

@@ -4,9 +4,7 @@
 
 namespace MongoDB\Builder;
 
-use MongoDB\BSON\Decimal128;
-use MongoDB\BSON\Int64;
-use MongoDB\BSON\Regex;
+use MongoDB\BSON\Type;
 use MongoDB\Builder\Stage\MatchStage;
 use MongoDB\Builder\Type\FieldQueryInterface;
 use MongoDB\Builder\Type\QueryInterface;
@@ -23,9 +21,9 @@ final class Stage
      *
      * @see https://www.mongodb.com/docs/manual/reference/operator/aggregation/match/
      *
-     * @param QueryInterface|FieldQueryInterface|Decimal128|Int64|Regex|stdClass|array<array-key,mixed>|bool|float|int|string|null ...$queries The query predicates to match
+     * @param QueryInterface|FieldQueryInterface|Type|stdClass|array<array-key,mixed>|bool|float|int|string|null ...$queries The query predicates to match
      */
-    public static function match(QueryInterface|FieldQueryInterface|Decimal128|Int64|Regex|stdClass|array|bool|float|int|string|null ...$queries): MatchStage
+    public static function match(QueryInterface|FieldQueryInterface|Type|stdClass|array|bool|float|int|string|null ...$queries): MatchStage
     {
         // Override the generated method to allow variadic arguments
         return self::generatedMatch($queries);

src/Builder/Query/NotOperator.php

@@ -4,9 +4,7 @@
 
 namespace MongoDB\Builder\Type;
 
-use MongoDB\BSON\Decimal128;
-use MongoDB\BSON\Int64;
-use MongoDB\BSON\Regex;
+use MongoDB\BSON\Type;
 use MongoDB\Exception\InvalidArgumentException;
 use stdClass;
 
@@ -28,18 +26,18 @@
  */
 class CombinedFieldQuery implements FieldQueryInterface
 {
-    /** @var list<QueryInterface|FieldQueryInterface|Decimal128|Int64|Regex|stdClass|array|bool|float|int|string|null> $fieldQueries */
+    /** @var list<QueryInterface|FieldQueryInterface|Type|stdClass|array|bool|float|int|string|null> $fieldQueries */
     public readonly array $fieldQueries;
 
-    /** @param list<QueryInterface|FieldQueryInterface|Decimal128|Int64|Regex|stdClass|array|bool|float|int|string|null> $fieldQueries */
+    /** @param list<QueryInterface|FieldQueryInterface|Type|stdClass|array|bool|float|int|string|null> $fieldQueries */
     public function __construct(array $fieldQueries)
     {
         if (! array_is_list($fieldQueries)) {
             throw new InvalidArgumentException('Expected filters to be a list, invalid array given.');
         }
 
         // Flatten nested CombinedFieldQuery
-        $this->fieldQueries = array_reduce($fieldQueries, static function (array $fieldQueries, QueryInterface|FieldQueryInterface|Decimal128|Int64|Regex|stdClass|array|bool|float|int|string|null $fieldQuery): array {
+        $this->fieldQueries = array_reduce($fieldQueries, static function (array $fieldQueries, QueryInterface|FieldQueryInterface|Type|stdClass|array|bool|float|int|string|null $fieldQuery): array {
             if ($fieldQuery instanceof CombinedFieldQuery) {
                 return array_merge($fieldQueries, $fieldQuery->fieldQueries);
             }

src/Builder/Stage.php

@@ -84,7 +84,7 @@ private function __construct(array $queriesOrArrayOfQueries)
         $this->queries = $queries;
     }
 
-    /** @psalm-assert-if-true list<mixed> $values */
+    /** @psalm-assert-if-true list<FieldQueryInterface> $values */
     private static function isListOfFilters(mixed $values): bool
     {
         if (! is_array($values) || ! array_is_list($values)) {

src/Builder/Type/CombinedFieldQuery.php

@@ -5,9 +5,7 @@
 namespace MongoDB\Tests\Builder\Type;
 
 use Generator;
-use MongoDB\BSON\Decimal128;
-use MongoDB\BSON\Int64;
-use MongoDB\BSON\Regex;
+use MongoDB\BSON;
 use MongoDB\Builder\Query\CommentOperator;
 use MongoDB\Builder\Query\EqOperator;
 use MongoDB\Builder\Query\GtOperator;
@@ -66,9 +64,15 @@ public function provideQueryObjectValue(): Generator
         yield 'string' => [['foo' => 'bar']];
         yield 'bool' => [['foo' => true]];
         yield 'null' => [['foo' => null]];
-        yield 'decimal128' => [['foo' => new Decimal128('1.1')]];
-        yield 'int64' => [[1 => new Int64(1)]];
-        yield 'regex' => [['foo' => new Regex('foo')]];
+        yield 'decimal128' => [['foo' => new BSON\Decimal128('1.1')]];
+        yield 'int64' => [[1 => new BSON\Int64(1)]];
+        yield 'objectId' => [['foo' => new BSON\ObjectId()]];
+        yield 'binary' => [['foo' => new BSON\Binary('foo')]];
+        yield 'regex' => [['foo' => new BSON\Regex('foo')]];
+        yield 'datetime' => [['foo' => new BSON\UTCDateTime()]];
+        yield 'timestamp' => [['foo' => new BSON\Timestamp(1234, 5678)]];
+        yield 'bson document' => [['foo' => BSON\Document::fromPHP(['bar' => 'baz'])]];
+        yield 'bson array' => [['foo' => BSON\PackedArray::fromPHP(['bar', 'baz'])]];
         yield 'object' => [['foo' => (object) ['bar' => 'baz']]];
         yield 'list' => [['foo' => ['bar', 'baz']]];
         yield 'operator as array' => [['foo' => ['$eq' => 1]]];