Use BSON\Type and BSON\Javascript classes, remove duplicate resolveToInt

mongodb · Oct 16, 2023 · ad48be4 · ad48be4
1 parent fee0df6
commit ad48be4
Show file tree

Hide file tree

Showing 128 changed files with 1,077 additions and 1,741 deletions.
diff --git a/generator/config/expressions.php b/generator/config/expressions.php
@@ -11,9 +11,6 @@
 use MongoDB\Model\BSONArray;
 use stdClass;
 
-use function array_merge;
-use function array_unique;
-use function array_values;
 use function ucfirst;
 
 $bsonTypes = [
@@ -30,18 +27,18 @@
     'date' => [BSON\UTCDateTime::class],
     'null' => ['null'],
     'regex' => [BSON\Regex::class],
-    'javascript' => ['string'],
+    'javascript' => ['string', BSON\Javascript::class],
     'int' => ['int'],
     'timestamp' => ['int', BSON\Timestamp::class],
-    'long' => ['int', BSON\Int64::class, ResolvesToInt::class],
+    'long' => ['int', BSON\Int64::class],
     'decimal' => ['int', BSON\Int64::class, 'float', BSON\Decimal128::class],
 ];
 
 // "any" accepts all the BSON types. No generic "object" or "mixed"
-$bsonTypes['any'] = array_unique(array_merge(...array_values($bsonTypes)));
+$bsonTypes['any'] = ['bool', 'int', 'float', 'string', 'array', 'null', stdClass::class, BSON\Type::class];
 
 // "number" accepts all the numeric types
-$bsonTypes['number'] = array_unique(array_merge($bsonTypes['int'], $bsonTypes['double'], $bsonTypes['long'], $bsonTypes['decimal']));
+$bsonTypes['number'] = ['int', 'float', BSON\Int64::class, BSON\Decimal128::class];
 
 $expressions = [];
 $resolvesToInterfaces = [];

diff --git a/generator/src/ExpressionClassGenerator.php b/generator/src/ExpressionClassGenerator.php
@@ -12,6 +12,7 @@
 use Throwable;
 
 use function array_map;
+use function ucfirst;
 use function var_export;
 
 /**
@@ -64,8 +65,15 @@ public function createClassOrInterface(ExpressionDefinition $definition): PhpNam
             $constructor->addParameter('name')->setType($propertyType);
             $constructor->addBody('$this->name = $name;');
         } elseif ($definition->generate === PhpObject::PhpInterface) {
-            $class = $namespace->addInterface($className);
-            $class->setExtends($definition->implements);
+            $interface = $namespace->addInterface($className);
+            $interface->setExtends($definition->implements);
+        } elseif ($definition->generate === PhpObject::PhpEnum) {
+            $enum = $namespace->addEnum($className);
+            $enum->setType('string');
+            array_map(
+                fn (string $case) => $enum->addCase(ucfirst($case), $case),
+                $definition->values,
+            );
         } else {
             throw new LogicException('Unknown generate type: ' . var_export($definition->generate, true));
         }

diff --git a/src/Builder/Accumulator.php b/src/Builder/Accumulator.php
@@ -9,6 +9,12 @@
 use MongoDB\Builder\Type\WindowInterface;
 use stdClass;
 
+/**
+ * Factories for Aggregation Pipeline Accumulator and Window Operators
+ *
+ * @see https://www.mongodb.com/docs/v3.4/reference/operator/aggregation-group/
+ * @see https://www.mongodb.com/docs/manual/reference/operator/aggregation/setWindowFields/
+ */
 enum Accumulator
 {
     use Accumulator\FactoryTrait;

diff --git a/src/Builder/Accumulator/AddToSetAccumulator.php b/src/Builder/Accumulator/AddToSetAccumulator.php
diff --git a/src/Builder/Accumulator/AvgAccumulator.php b/src/Builder/Accumulator/AvgAccumulator.php
diff --git a/src/Builder/Accumulator/BottomAccumulator.php b/src/Builder/Accumulator/BottomAccumulator.php
diff --git a/src/Builder/Accumulator/BottomNAccumulator.php b/src/Builder/Accumulator/BottomNAccumulator.php
diff --git a/src/Builder/Accumulator/CovariancePopAccumulator.php b/src/Builder/Accumulator/CovariancePopAccumulator.php
diff --git a/src/Builder/Accumulator/CovarianceSampAccumulator.php b/src/Builder/Accumulator/CovarianceSampAccumulator.php
diff --git a/src/Builder/Accumulator/DerivativeAccumulator.php b/src/Builder/Accumulator/DerivativeAccumulator.php
diff --git a/src/Builder/Accumulator/ExpMovingAvgAccumulator.php b/src/Builder/Accumulator/ExpMovingAvgAccumulator.php