Fixed expressions prefix management

php-etl · Dec 3, 2024 · 978bea0 · 978bea0
1 parent 56d57c5
commit 978bea0
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/src/CompositeBuilder.php b/src/CompositeBuilder.php
@@ -81,13 +81,26 @@ public function constant(string $outputPath, $value): self
         return $this;
     }
 
+    private function buildExpressionInstance(string|Expression $expression): Expression
+    {
+        if ($expression instanceof Expression) {
+            return $expression;
+        }
+
+        if (strpos($expression, '@=') === 0) {
+            $expression = substr($expression, 2);
+        }
+
+        return new Expression($expression);
+    }
+
     public function expression(string $outputPath, string|Expression $expression, array $additionalVariables = []): self
     {
         $this->fields[] = fn () => new FastMap\Mapping\Field(
             new PropertyPath($outputPath),
             new FastMap\Mapping\Field\ExpressionLanguageValueMapper(
                 $this->interpreter,
-                $expression instanceof Expression ? $expression : new Expression($expression),
+                $this->buildExpressionInstance($expression),
                 $additionalVariables,
             )
         );
@@ -102,7 +115,7 @@ public function list(string $outputPath, string|Expression $expression): ArrayBu
         $this->fields[] = fn () => new FastMap\Mapping\ListField(
             new PropertyPath($outputPath),
             $this->interpreter,
-            $expression instanceof Expression ? $expression : new Expression($expression),
+            $this->buildExpressionInstance($expression),
             $child->getMapper()
         );
 
@@ -128,7 +141,7 @@ public function object(string $outputPath, string $className, string|Expression
         $this->fields[] = fn () => new FastMap\Mapping\SingleRelation(
             new PropertyPath($outputPath),
             $this->interpreter,
-            $expression instanceof Expression ? $expression : new Expression($expression),
+            $this->buildExpressionInstance($expression),
             $child->getMapper()
         );
 
@@ -142,7 +155,7 @@ public function collection(string $outputPath, string $className, string|Express
         $this->fields[] = fn () => new FastMap\Mapping\MultipleRelation(
             new PropertyPath($outputPath),
             $this->interpreter,
-            $expression instanceof Expression ? $expression : new Expression($expression),
+            $this->buildExpressionInstance($expression),
             $child->getMapper()
         );