"append" (true|false) for map & object

.github/workflows/phpstan-5.yaml

@@ -1,7 +1,7 @@
 name: PHPStan level 5
 on: push
 jobs:
-  phpstan:
+  phpstan5:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

.github/workflows/phpstan-6.yaml

@@ -1,7 +1,7 @@
 name: PHPStan level 6
 on: push
 jobs:
-  phpstan:
+  phpstan6:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

.github/workflows/phpstan-7.yaml

@@ -1,7 +1,7 @@
 name: PHPStan level 7
 on: push
 jobs:
-  phpstan:
+  phpstan7:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

.github/workflows/phpstan-8.yaml

@@ -1,7 +1,7 @@
 name: PHPStan level 8
 on: push
 jobs:
-  phpstan:
+  phpstan8:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

src/Builder/ArrayMapper.php

@@ -5,6 +5,7 @@
 namespace Kiboko\Plugin\FastMap\Builder;
 
 use Kiboko\Component\FastMapConfig\ArrayBuilderInterface;
+use Kiboko\Contract\Mapping\CompilableMapperInterface;
 use PhpParser\Builder;
 use PhpParser\Node;
 
@@ -16,6 +17,9 @@ public function __construct(private ArrayBuilderInterface $mapper)
 
     public function getNode(): Node
     {
+        /** @var CompilableMapperInterface $compilableMapper */
+        $compilableMapper = $this->mapper->getMapper();
+
         return new Node\Expr\New_(
             new Node\Stmt\Class_(
                 name: null,
@@ -29,7 +33,7 @@ public function getNode(): Node
                             subNodes: [
                                 'flags' => Node\Stmt\Class_::MODIFIER_PUBLIC,
                                 'stmts' => [
-                                    ...$this->mapper->getMapper()->compile(new Node\Expr\Variable('output')),
+                                    ...$compilableMapper->compile(new Node\Expr\Variable('output')),
                                     new Node\Stmt\Return_(new Node\Expr\Variable('output')),
                                 ],
                                 'params' => [

src/Builder/ConditionalMapper.php

@@ -35,6 +35,8 @@ private function compileConditions(array $alternatives): Node
 
         /** @var Builder $builder */
         [$condition, $builder] = array_shift($alternatives);
+        /** @var Node\Stmt\Expression $expression */
+        $expression = $parser->parse('<?php '.$this->interpreter->compile($condition, ['input', 'output']).';')[0];
 
         return new Node\Expr\New_(
             new Node\Stmt\Class_(
@@ -106,7 +108,7 @@ function ($alternative) {
                                 ],
                                 'stmts' => [
                                     new Node\Stmt\If_(
-                                        cond: $parser->parse('<?php '.$this->interpreter->compile($condition, ['input', 'output']).';')[0]->expr,
+                                        cond: $expression->expr,
                                         subNodes: [
                                             'stmts' => [
                                                 new Node\Stmt\Return_(
@@ -130,11 +132,11 @@ function ($alternative) {
                                                 ),
                                             ],
                                             'elseifs' => array_map(
-                                                function ($alternative, $index) use ($parser) {
+                                                function ($alternative, $index) use ($expression) {
                                                     [$condition, $repository] = $alternative;
 
                                                     return new Node\Stmt\ElseIf_(
-                                                        cond: $parser->parse('<?php '.$this->interpreter->compile($condition, ['input', 'output']).';')[0]->expr,
+                                                        cond: $expression->expr,
                                                         stmts: [
                                                             new Node\Stmt\Return_(
                                                                 new Node\Expr\FuncCall(

src/Builder/ObjectMapper.php

@@ -5,6 +5,7 @@
 namespace Kiboko\Plugin\FastMap\Builder;
 
 use Kiboko\Component\FastMapConfig\ObjectBuilderInterface;
+use Kiboko\Contract\Mapping\CompilableMapperInterface;
 use PhpParser\Builder;
 use PhpParser\Node;
 
@@ -16,6 +17,9 @@ public function __construct(private ObjectBuilderInterface $mapper)
 
     public function getNode(): Node
     {
+        /** @var CompilableMapperInterface $compilableMapper */
+        $compilableMapper = $this->mapper->getMapper();
+
         return new Node\Expr\New_(
             new Node\Stmt\Class_(
                 name: null,
@@ -29,7 +33,7 @@ public function getNode(): Node
                             subNodes: [
                                 'flags' => Node\Stmt\Class_::MODIFIER_PUBLIC,
                                 'stmts' => [
-                                    ...$this->mapper->getMapper()->compile(new Node\Expr\Variable('output')),
+                                    ...$compilableMapper->compile(new Node\Expr\Variable('output')),
                                     new Node\Stmt\Return_(new Node\Expr\Variable('output')),
                                 ],
                                 'params' => [

src/Builder/Transformer.php

@@ -97,6 +97,9 @@ class: new Node\Name\FullyQualified(
                                                             new Node\Arg(
                                                                 value: new Node\Expr\Variable('line')
                                                             ),
+                                                            new Node\Arg(
+                                                                value: new Node\Expr\Variable('line')
+                                                            ),
                                                         ]
                                                     ),
                                                 ),

src/Configuration.php

@@ -33,6 +33,7 @@ public function getConfigTreeBuilder(): TreeBuilder
             ->end()
             ->children()
                 ->scalarNode('class')->end()
+                ->booleanNode('append')->end()
                 ->scalarNode('expression')->end()
                 ->arrayNode('expression_language')
                     ->scalarPrototype()->end()
@@ -48,25 +49,22 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->thenInvalid('Your configuration should be an array.')
             ->end()
             ->validate()
-                ->always(mutuallyExclusiveFields('copy', 'constant', 'map', 'object', 'list', 'collection'))
+                ->always(mutuallyExclusiveFields('append', 'list', 'collection', 'object'))
             ->end()
             ->validate()
-                ->always(mutuallyExclusiveFields('expression', 'copy', 'constant', 'map'))
+                ->always(mutuallyExclusiveFields('expression', 'map'))
             ->end()
             ->validate()
-                ->always(mutuallyExclusiveFields('constant', 'copy', 'map', 'object', 'list', 'collection'))
+                ->always(mutuallyExclusiveFields('map', 'object', 'list', 'collection'))
             ->end()
             ->validate()
-                ->always(mutuallyExclusiveFields('map', 'copy', 'constant', 'object', 'list', 'collection'))
+                ->always(mutuallyExclusiveFields('object', 'map', 'list', 'collection'))
             ->end()
             ->validate()
-                ->always(mutuallyExclusiveFields('object', 'copy', 'constant', 'map', 'list', 'collection'))
+                ->always(mutuallyExclusiveFields('list', 'map', 'object', 'collection'))
             ->end()
             ->validate()
-                ->always(mutuallyExclusiveFields('list', 'copy', 'constant', 'map', 'object', 'collection'))
-            ->end()
-            ->validate()
-                ->always(mutuallyExclusiveFields('collection', 'copy', 'constant', 'map', 'object', 'list'))
+                ->always(mutuallyExclusiveFields('collection', 'map', 'object', 'list'))
             ->end()
             ->validate()
                 ->always(mutuallyDependentFields('object', 'class', 'expression'))

src/Factory/ArrayMapper.php

@@ -4,6 +4,7 @@
 
 namespace Kiboko\Plugin\FastMap\Factory;
 
+use Kiboko\Component\FastMapConfig\ArrayAppendBuilder;
 use Kiboko\Component\FastMapConfig\ArrayBuilder;
 use Kiboko\Contract\Configurator;
 use Kiboko\Plugin\FastMap;
@@ -17,7 +18,7 @@
     private Processor $processor;
     private ConfigurationInterface $configuration;
 
-    public function __construct(private ?ExpressionLanguage $interpreter, private array $additionalExpressionVariables = [])
+    public function __construct(private ?ExpressionLanguage $interpreter, private array $additionalExpressionVariables = [], private bool $append = false)
     {
         $this->processor = new Processor();
         $this->configuration = new FastMap\Configuration\MapMapper();
@@ -54,9 +55,15 @@ public function validate(array $config): bool
 
     public function compile(array $config): Repository\TransformerMapper
     {
-        $mapper = new ArrayBuilder(
-            interpreter: $this->interpreter,
-        );
+        if ($this->append) {
+            $mapper = new ArrayAppendBuilder(
+                interpreter: $this->interpreter,
+            );
+        } else {
+            $mapper = new ArrayBuilder(
+                interpreter: $this->interpreter,
+            );
+        }
 
         $builder = new FastMap\Builder\Transformer(
             new FastMap\Builder\ArrayMapper($mapper)

src/Service.php

@@ -91,7 +91,7 @@ public function compile(array $config): Factory\Repository\TransformerMapper
                 return $conditionalFactory->compile($config['conditional']);
             }
             if (\array_key_exists('map', $config)) {
-                $arrayFactory = new Factory\ArrayMapper($interpreter, $this->additionalExpressionVariables);
+                $arrayFactory = new Factory\ArrayMapper($interpreter, $this->additionalExpressionVariables, isset($config['append']) && $config['append']);
 
                 return $arrayFactory->compile($config['map']);
             }