Prefix Yaml tags with !bson_

generator/README.md

@@ -22,13 +22,13 @@ The `generator/config/*.yaml` files contains the list of operators and stages th
 Each operator can contain a `tests` section with a list if pipelines. To represent specific BSON objects,
 it is necessary to use Yaml tags:
 
-| BSON Type   | Example                                      |
-|-------------|----------------------------------------------|
-| Regex       | `!regex '^abc'` <br/> `!regex ['^abc', 'i']` |
-| Int64       | `!long '123456789'`                          |
-| Decimal128  | `!double '0.9'`                              |
-| UTCDateTime | `!date 0`                                    |
-| Binary      | `!binary 'IA=='`                             |
+| BSON Type   | Example                                                |
+|-------------|--------------------------------------------------------|
+| Regex       | `!bson_regex '^abc'` <br/> `!bson_regex ['^abc', 'i']` |
+| Int64       | `!bson_int64 '123456789'`                              |
+| Decimal128  | `!bson_decimal128 '0.9'`                               |
+| UTCDateTime | `!bson_utcdatetime 0`                                  |
+| Binary      | `!bson_binary 'IA=='`                                  |
 
 To add new test cases to operators, you can get inspiration from the official MongoDB documentation and use
 the `generator/js2yaml.html` web page to manually convert a pipeline array from JS to Yaml.

generator/config/expression/dateFromString.yaml

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

generator/config/query/bitsAllClear.yaml

@@ -35,4 +35,4 @@ tests:
         pipeline:
             - $match:
                   a:
-                      $bitsAllClear: !binary 'IA=='
+                      $bitsAllClear: !bson_binary 'IA=='

generator/config/query/bitsAllSet.yaml

@@ -35,4 +35,4 @@ tests:
         pipeline:
             - $match:
                   a:
-                      $bitsAllSet: !binary 'MA=='
+                      $bitsAllSet: !bson_binary 'MA=='

generator/config/query/bitsAnyClear.yaml

@@ -35,4 +35,4 @@ tests:
         pipeline:
             - $match:
                   a:
-                      $bitsAnyClear: !binary 'MA=='
+                      $bitsAnyClear: !bson_binary 'MA=='

generator/config/query/bitsAnySet.yaml

@@ -35,4 +35,4 @@ tests:
         pipeline:
             - $match:
                   a:
-                      $bitsAnySet: !binary 'MA=='
+                      $bitsAnySet: !bson_binary 'MA=='

generator/config/query/eq.yaml

@@ -53,9 +53,9 @@ tests:
             -
                 $match:
                     company:
-                        !regex '^MongoDB'
+                        !bson_regex '^MongoDB'
             -
                 $match:
                     company:
                         $eq:
-                            !regex '^MongoDB'
+                            !bson_regex '^MongoDB'

generator/config/query/in.yaml

@@ -28,5 +28,5 @@ tests:
                 $match:
                     tags:
                         $in:
-                            - !regex '^be'
-                            - !regex '^st'
+                            - !bson_regex '^be'
+                            - !bson_regex '^st'

generator/config/query/not.yaml

@@ -28,4 +28,4 @@ tests:
             -
                 $match:
                     price:
-                        $not: !regex '^p.*'
+                        $not: !bson_regex '^p.*'

generator/config/query/regex.yaml

@@ -21,7 +21,7 @@ tests:
                 $match:
                     sku:
                         $regex:
-                            !regex '789$'
+                            !bson_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'
@@ -30,4 +30,4 @@ tests:
                 $match:
                     sku:
                         $regex:
-                            !regex ['^ABC', 'i']
+                            !bson_regex ['^ABC', 'i']

generator/js2yaml.html

@@ -69,7 +69,7 @@ <h1>Convert JS examples into Yaml</h1>
     }
 
     function BinData(type, value) {
-        return new TaggedValue('binary', value);
+        return new TaggedValue('bson_binary', value);
     }
 
     function convert(jsString) {
@@ -91,11 +91,11 @@ <h1>Convert JS examples into Yaml</h1>
         }
 
         if (object instanceof RegExp) {
-            return ' !regex ' + (object.flags ? "['" + object.source + "', '" + object.flags + "']" : "'" + object.source + "'");
+            return ' !bson_regex ' + (object.flags ? "['" + object.source + "', '" + object.flags + "']" : "'" + object.source + "'");
         }
 
         if (object instanceof Date) {
-            return ' !date ' + object.getTime();
+            return ' !bson_utcdatetime ' + object.getTime();
         }
 
         if (object instanceof TaggedValue) {

generator/src/OperatorTestGenerator.php

@@ -138,11 +138,11 @@ private function convertYamlTaggedValues(mixed $object): mixed
             $value = $object->getValue();
 
             return match ($object->getTag()) {
-                'regex' => new Regex(...(array) $value),
-                'long' => new Int64($value),
-                'double' => new Decimal128($value),
-                'date' => new UTCDateTime($value),
-                'binary' => new Binary(base64_decode($value)),
+                'bson_regex' => new Regex(...(array) $value),
+                'bson_int128' => new Int64($value),
+                'bson_decimal128' => new Decimal128($value),
+                'bson_utcdatetime' => new UTCDateTime($value),
+                'bson_binary' => new Binary(base64_decode($value)),
                 default => throw new InvalidArgumentException(sprintf('Yaml tag "%s" is not supported.', $object->getTag())),
             };
         }