Replace getOperator with Operator::NAME constant

mongodb · Nov 28, 2024 · c83e779 · c83e779
1 parent 1074e23
commit c83e779
Show file tree

Hide file tree

Showing 278 changed files with 292 additions and 1,368 deletions.
diff --git a/generator/config/expression/case.yaml b/generator/config/expression/case.yaml
@@ -3,7 +3,8 @@ name: $case
 link: 'https://www.mongodb.com/docs/manual/reference/operator/aggregation/switch/'
 type:
     - switchBranch
-encode: flat_object
+encode: object
+noName: true
 description: |
     Represents a single case in a $switch expression
 arguments:

diff --git a/generator/config/schema.json b/generator/config/schema.json
@@ -60,7 +60,6 @@
                     "enum": [
                         "array",
                         "object",
-                        "flat_object",
                         "dollar_object",
                         "single",
                         "group"
@@ -70,6 +69,11 @@
                     "$comment": "The description of the argument from MongoDB's documentation.",
                     "type": "string"
                 },
+                "noName": {
+                    "$comment": "Don't wrap the properties in an object with the operator name",
+                    "type": "boolean",
+                    "default": false
+                },
                 "arguments": {
                     "$comment": "An optional list of arguments for the operator.",
                     "type": "array",

diff --git a/generator/src/Definition/OperatorDefinition.php b/generator/src/Definition/OperatorDefinition.php
@@ -32,14 +32,14 @@ public function __construct(
         /** @var list<string> */
         public array $type,
         public string|null $description = null,
+        public bool $noName = false,
         array $arguments = [],
         array $tests = [],
     ) {
         $this->encode = match ($encode) {
             'single' => Encode::Single,
             'array' => Encode::Array,
             'object' => Encode::Object,
-            'flat_object' => Encode::FlatObject,
             'dollar_object' => Encode::DollarObject,
             'group' => Encode::Group,
             default => throw new UnexpectedValueException(sprintf('Unexpected "encode" value for operator "%s". Got "%s"', $name, $encode)),

diff --git a/generator/src/OperatorClassGenerator.php b/generator/src/OperatorClassGenerator.php
@@ -60,6 +60,7 @@ public function createClass(GeneratorDefinition $definition, OperatorDefinition
         $class->addComment('@see ' . $operator->link);
         $namespace->addUse(Encode::class);
         $class->addConstant('ENCODE', new Literal('Encode::' . $operator->encode->name));
+        $class->addConstant('NAME', $operator->noName ? null : $operator->name);
 
         $constuctor = $class->addMethod('__construct');
         foreach ($operator->arguments as $argument) {
@@ -170,10 +171,6 @@ public function createClass(GeneratorDefinition $definition, OperatorDefinition
             $constuctor->addBody('$this->' . $argument->name . ' = $' . $argument->name . ';');
         }
 
-        $class->addMethod('getOperator')
-            ->setReturnType('string')
-            ->setBody('return ' . var_export($operator->name, true) . ';');
-
         return $namespace;
     }
 

diff --git a/src/Builder/Accumulator/AccumulatorAccumulator.php b/src/Builder/Accumulator/AccumulatorAccumulator.php
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/CountAccumulator.php b/src/Builder/Accumulator/CountAccumulator.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/DenseRankAccumulator.php b/src/Builder/Accumulator/DenseRankAccumulator.php
diff --git a/src/Builder/Accumulator/DerivativeAccumulator.php b/src/Builder/Accumulator/DerivativeAccumulator.php
diff --git a/src/Builder/Accumulator/DocumentNumberAccumulator.php b/src/Builder/Accumulator/DocumentNumberAccumulator.php
diff --git a/src/Builder/Accumulator/ExpMovingAvgAccumulator.php b/src/Builder/Accumulator/ExpMovingAvgAccumulator.php
diff --git a/src/Builder/Accumulator/FirstAccumulator.php b/src/Builder/Accumulator/FirstAccumulator.php
diff --git a/src/Builder/Accumulator/FirstNAccumulator.php b/src/Builder/Accumulator/FirstNAccumulator.php
diff --git a/src/Builder/Accumulator/IntegralAccumulator.php b/src/Builder/Accumulator/IntegralAccumulator.php
diff --git a/src/Builder/Accumulator/LastAccumulator.php b/src/Builder/Accumulator/LastAccumulator.php
diff --git a/src/Builder/Accumulator/LastNAccumulator.php b/src/Builder/Accumulator/LastNAccumulator.php
diff --git a/src/Builder/Accumulator/LinearFillAccumulator.php b/src/Builder/Accumulator/LinearFillAccumulator.php
diff --git a/src/Builder/Accumulator/LocfAccumulator.php b/src/Builder/Accumulator/LocfAccumulator.php