Fix Append option

Author: nicolas43000

src/Builder/ArrayMapper.php

@@ -2,13 +2,13 @@
 
 namespace Kiboko\Plugin\FastMap\Builder;
 
-use Kiboko\Component\FastMapConfig\ArrayBuilder;
+use Kiboko\Component\FastMapConfig\ArrayBuilderInterface;
 use PhpParser\Builder;
 use PhpParser\Node;
 
 final class ArrayMapper implements Builder
 {
-    public function __construct(private ArrayBuilder $mapper)
+    public function __construct(private ArrayBuilderInterface $mapper)
     {
     }
 

src/Builder/ConditionalMapper.php

@@ -71,7 +71,7 @@ private function compileConditions(array $alternatives): Node
                                                     ),
                                                     ...array_map(
                                                         function ($alternative) use ($parser) {
-                                                            [$condition, $repository] = $alternative;
+                                                            [$condition, $builder] = $alternative;
 
                                                             return new Node\Expr\ArrayItem(
                                                                 $builder->getNode()
@@ -164,7 +164,7 @@ function ($alternative, $index) use ($parser) {
                                             'else' => new Node\Stmt\Else_(
                                                 stmts: [
                                                     new Node\Stmt\Return_(
-                                                        new Node\Expr\Variable('output'),
+                                                        new Node\Expr\Variable('input'),
                                                     )
                                                 ]
                                             )

src/Builder/ObjectMapper.php

@@ -2,13 +2,13 @@
 
 namespace Kiboko\Plugin\FastMap\Builder;
 
-use Kiboko\Component\FastMapConfig\ObjectBuilder;
+use Kiboko\Component\FastMapConfig\ObjectBuilderInterface;
 use PhpParser\Builder;
 use PhpParser\Node;
 
 final class ObjectMapper implements Builder
 {
-    public function __construct(private ObjectBuilder $mapper)
+    public function __construct(private ObjectBuilderInterface $mapper)
     {
     }
 

src/Configuration.php

@@ -341,6 +341,7 @@ public function getConditionalTreeBuilder(): TreeBuilder
                 ->end()
                 ->children()
                     ->scalarNode('condition')->end()
+                    ->booleanNode('append')->end()
                     ->append($this->getMapTreeBuilder()->getRootNode())
                     ->append($this->getListTreeBuilder()->getRootNode())
                     ->append($this->getObjectTreeBuilder()->getRootNode())

src/Factory/ConditionalMapper.php

@@ -2,7 +2,11 @@
 
 namespace Kiboko\Plugin\FastMap\Factory;
 
+use Kiboko\Component\FastMap\Mapping\Composite\ArrayAppendMapper;
+use Kiboko\Component\FastMapConfig\ArrayAppendBuilder;
 use Kiboko\Component\FastMapConfig\ArrayBuilder;
+use Kiboko\Component\FastMapConfig\ObjectAppendBuilder;
+use Kiboko\Component\FastMapConfig\ObjectBuilder;
 use Kiboko\Contract\Configurator\InvalidConfigurationException;
 use Kiboko\Contract\Configurator\RepositoryInterface;
 use Kiboko\Plugin\FastMap;
@@ -61,9 +65,17 @@ public function compile(array $config): RepositoryInterface
         foreach ($config as $alternative) {
             try {
                 if (array_key_exists('map', $alternative)) {
-                    $mapper = new ArrayBuilder(
-                        interpreter: $this->interpreter,
-                    );
+                    if (array_key_exists('append', $alternative)
+                        && $alternative['append'] === true
+                    ) {
+                        $mapper = new ArrayAppendBuilder(
+                            interpreter: $this->interpreter,
+                        );
+                    } else {
+                        $mapper = new ArrayBuilder(
+                            interpreter: $this->interpreter,
+                        );
+                    }
 
                     $mapperBuilder = new FastMap\Builder\ArrayMapper($mapper);
 
@@ -81,11 +93,19 @@ public function compile(array $config): RepositoryInterface
                         );
                     }
                 } elseif (array_key_exists('object', $alternative)) {
-                    $mapper = new ArrayBuilder(
-                        interpreter: $this->interpreter,
-                    );
+                    if (array_key_exists('append', $alternative)
+                        && $alternative['append'] === true
+                    ) {
+                        $mapper = new ObjectAppendBuilder(
+                            interpreter: $this->interpreter,
+                        );
+                    } else {
+                        $mapper = new ObjectBuilder(
+                            interpreter: $this->interpreter,
+                        );
+                    }
 
-                    $mapperBuilder = new FastMap\Builder\ArrayMapper($mapper);
+                    $mapperBuilder = new FastMap\Builder\ObjectMapper($mapper);
 
                     (new FastMap\Configuration\ConfigurationApplier())($mapper->children(), $alternative['object']);