Switched to Yaml tags to represent specific BSON objects

Author: GromNaN

generator/config/expression/dateFromString.yaml

@@ -77,5 +77,5 @@ tests:
                             dateString: '$date'
                             timezone: '$timezone'
                             # onNull: new Date(0)
-                            onNull: 1970-01-01T00:00:00+00:00
+                            onNull: !date 0
 

generator/config/query/eq.yaml

@@ -53,13 +53,9 @@ tests:
             -
                 $match:
                     company:
-                        $regularExpression:
-                            options: ''
-                            pattern: '^MongoDB'
+                        !regex '^MongoDB'
             -
                 $match:
                     company:
                         $eq:
-                            $regularExpression:
-                                options: ''
-                                pattern: '^MongoDB'
+                            !regex '^MongoDB'

generator/config/query/in.yaml

@@ -28,11 +28,5 @@ tests:
                 $match:
                     tags:
                         $in:
-                            -
-                                $regularExpression:
-                                    options: ''
-                                    pattern: '^be'
-                            -
-                                $regularExpression:
-                                    options: ''
-                                    pattern: '^st'
+                            - !regex '^be'
+                            - !regex '^st'

generator/config/query/not.yaml

@@ -28,7 +28,4 @@ tests:
             -
                 $match:
                     price:
-                        $not:
-                            $regularExpression:
-                                pattern: '^p.*'
-                                options: ''
+                        $not: !regex '^p.*'

generator/config/query/regex.yaml

@@ -21,9 +21,7 @@ tests:
                 $match:
                     sku:
                         $regex:
-                            $regularExpression:
-                                pattern: '789$'
-                                options: ''
+                            !regex '789$'
     -
         name: 'Perform Case-Insensitive Regular Expression Match'
         link: 'https://www.mongodb.com/docs/manual/reference/operator/query/regex/#perform-case-insensitive-regular-expression-match'
@@ -32,6 +30,4 @@ tests:
                 $match:
                     sku:
                         $regex:
-                            $regularExpression:
-                                pattern: '^ABC'
-                                options: 'i'
+                            !regex ['^ABC', 'i']

generator/src/Definition/YamlReader.php

@@ -21,7 +21,7 @@ public function read(string $dirname): array
         foreach ($finder as $file) {
             $operator = Yaml::parseFile(
                 $file->getPathname(),
-                Yaml::PARSE_OBJECT | Yaml::PARSE_OBJECT_FOR_MAP | Yaml::PARSE_DATETIME,
+                Yaml::PARSE_OBJECT | Yaml::PARSE_OBJECT_FOR_MAP | Yaml::PARSE_CUSTOM_TAGS,
             );
             $definitions[] = new OperatorDefinition(...get_object_vars($operator));
         }

generator/src/OperatorTestGenerator.php

@@ -5,7 +5,12 @@
 namespace MongoDB\CodeGenerator;
 
 use DateTimeInterface;
+use InvalidArgumentException;
+use MongoDB\BSON\Binary;
+use MongoDB\BSON\Decimal128;
 use MongoDB\BSON\Document;
+use MongoDB\BSON\Int64;
+use MongoDB\BSON\Regex;
 use MongoDB\BSON\UTCDateTime;
 use MongoDB\Builder\Pipeline;
 use MongoDB\CodeGenerator\Definition\GeneratorDefinition;
@@ -16,6 +21,7 @@
 use Nette\PhpGenerator\PhpNamespace;
 use Nette\PhpGenerator\Type;
 use RuntimeException;
+use Symfony\Component\Yaml\Tag\TaggedValue;
 use Throwable;
 
 use function basename;
@@ -89,7 +95,7 @@ public function createClass(GeneratorDefinition $definition, OperatorDefinition
             $testName = 'test' . str_replace([' ', '-'], '', ucwords(str_replace('$', '', $test->name)));
             $caseName = str_replace([' ', '-'], '', ucwords(str_replace('$', '', $operator->name . ' ' . $test->name)));
 
-            $pipeline = $this->convertTypeRecursively($test->pipeline);
+            $pipeline = $this->convertYamlTaggedValues($test->pipeline);
 
             // Wrap the pipeline array into a document
             $json = Document::fromPHP(['pipeline' => $pipeline])->toCanonicalExtendedJSON();
@@ -126,23 +132,33 @@ public function createClass(GeneratorDefinition $definition, OperatorDefinition
         return $namespace;
     }
 
-    private function convertTypeRecursively(mixed $object): mixed
+    private function convertYamlTaggedValues(mixed $object): mixed
     {
-        if ($object instanceof DateTimeInterface) {
-            return new UTCDateTime($object);
+        if ($object instanceof TaggedValue) {
+            $value = $object->getValue();
+
+            return match ($object->getTag()) {
+                // !regex 'pattern' or !regex ['pattern', 'options']
+                'regex' => new Regex(...(array) $value),
+                'long' => new Int64($value),
+                'decimal' => new Decimal128($value),
+                'date' => new UTCDateTime($value),
+                'binary' => new Binary($value),
+                default => throw new InvalidArgumentException(sprintf('Yaml tag "%s" is not supported.', $object->getTag())),
+            };
         }
 
         if (is_array($object)) {
             foreach ($object as $key => $value) {
-                $object[$key] = $this->convertTypeRecursively($value);
+                $object[$key] = $this->convertYamlTaggedValues($value);
             }
 
             return $object;
         }
 
         if (is_object($object)) {
             foreach (get_object_vars($object) as $key => $value) {
-                $object->{$key} = $this->convertTypeRecursively($value);
+                $object->{$key} = $this->convertYamlTaggedValues($value);
             }
 
             return $object;