Split services based on autoloading

config/services.yaml

@@ -3,5 +3,5 @@ services:
         autowire: true
         autoconfigure: true
 
-    Ardent\PipelineBundle\Pipeline\OptionsProcessor\:
+    Ardent\PipelineBundle\Pipeline\Service\:
-        resource: '../src/Pipeline/OptionsProcessor'
+        resource: '../src/Pipeline/Service'

src/Pipeline/OptionsProcessor/Item.php

@@ -17,8 +17,7 @@ class Item
         string|int|null $id = null
     )
     {
-        $id ??= sha1(microtime());
+        $this->id = $id ?? sha1(microtime());
-        $this->id = $id;
     }
 
     public function getId(): string
@@ -125,4 +124,9 @@ class Item
         $this->parent = $parent;
         return $this;
     }
+
+    public function getKeys(): array
+    {
+        return array_keys($this->data);
+    }
 }

src/Pipeline/OptionsProcessor/ItemsOptionsPipeline.php

@@ -2,6 +2,7 @@
 
 namespace Ardent\PipelineBundle\Pipeline\OptionsProcessor;
 
+use Ardent\PipelineBundle\Pipeline\Service\OptionsStageInterface;
 use Psr\Log\LoggerInterface;
 
 class ItemsOptionsPipeline
@@ -13,7 +14,8 @@ class ItemsOptionsPipeline
 
     public function __construct(
         private readonly OptionsProcessor $processor,
-        OptionsStageInterface             ...$stages)
+        OptionsStageInterface             ...$stages
+    )
     {
         $this->stages = $stages;
     }
@@ -28,9 +30,11 @@ class ItemsOptionsPipeline
     /**
      * @param Item[]|ItemCollection $items
      */
-    public function process(array|ItemCollection $items): ItemCollection
+    public function process(array|ItemCollection|Item $items): ItemCollection
     {
-        if (is_array($items)) {
+        if ($items instanceof Item) {
+            $itemBag = new ItemCollection()->add($items);
+        } elseif (is_array($items)) {
             $itemBag = new ItemCollection();
             foreach ($items as $item) {
                 $itemBag->add($item);
@@ -40,4 +44,4 @@ class ItemsOptionsPipeline
         }
         return $this->processor->process($itemBag, ...$this->stages);
     }
-}
+}

src/Pipeline/OptionsProcessor/Options.php

@@ -2,11 +2,9 @@
 
 namespace Ardent\PipelineBundle\Pipeline\OptionsProcessor;
 
-class Options
+readonly class Options
 {
-    public function __construct(private readonly array $options)
+    public function __construct(private array $options) {}
-    {
-    }
 
     public function get(string $key, $default = null): mixed
     {

src/Pipeline/OptionsProcessor/OptionsProcessor.php

@@ -2,6 +2,8 @@
 
 namespace Ardent\PipelineBundle\Pipeline\OptionsProcessor;
 
+use Ardent\PipelineBundle\Pipeline\Service\OptionsStageInterface;
+
 class OptionsProcessor
 {
     private Options $options;

src/Pipeline/OptionsProcessor/OptionsStageBuilder.php

@@ -2,6 +2,11 @@
 
 namespace Ardent\PipelineBundle\Pipeline\OptionsProcessor;
 
+use Ardent\PipelineBundle\Pipeline\Service\OptionsStageBag;
+use Ardent\PipelineBundle\Pipeline\Service\OptionsStageInterface;
+use Ardent\PipelineBundle\Pipeline\Service\SubItemStage;
+use Psr\Log\LoggerInterface;
+
 class OptionsStageBuilder
 {
     /**
@@ -11,10 +16,7 @@ class OptionsStageBuilder
 
     public function __construct(
         private readonly OptionsStageBag $bag,
-        private readonly ?Options        $options = null,
+    ) {}
-    )
-    {
-    }
 
     /**
      * @param string|OptionsStageInterface $stageClass Can either be the classFQN of an OptionsStageInterface or one directly
@@ -26,7 +28,7 @@ class OptionsStageBuilder
                 $this->stages[] = $this->bag->get($stageClass);
             } else {
                 throw new \InvalidArgumentException(
-                    sprintf('Stage must be an instance of OptionsStageInterface, %s given', get_debug_type($stage))
+                    sprintf('Stage must be an instance of OptionsStageInterface, %s given', get_debug_type($stageClass))
                 );
             }
         } else {
@@ -43,8 +45,13 @@ class OptionsStageBuilder
         return $this;
     }
 
-    public function build(): ItemsOptionsPipeline
+    public function build(?Options $options = null): ItemsOptionsPipeline
     {
-        return new ItemsOptionsPipeline(new OptionsProcessor($this->options), ...$this->stages);
+        $pipeline = new ItemsOptionsPipeline(new OptionsProcessor($options), ...$this->stages);
+        $logger = $options?->get(LoggerInterface::class);
+        if ($logger !== null) {
+            $pipeline->setLogger($logger);
+        }
+        return $pipeline;
     }
 }

src/Pipeline/Service/AbstractOptionsStage.php

@@ -1,7 +1,9 @@
 <?php
 
-namespace Ardent\PipelineBundle\Pipeline\OptionsProcessor;
+namespace Ardent\PipelineBundle\Pipeline\Service;
 
+use Ardent\PipelineBundle\Pipeline\OptionsProcessor\ItemCollection;
+use Ardent\PipelineBundle\Pipeline\OptionsProcessor\Options;
 use Psr\Log\LoggerInterface;
 use Symfony\Contracts\Service\Attribute\Required;
 

src/Pipeline/Service/OptionsStageBag.php

@@ -1,7 +1,8 @@
 <?php
 
-namespace Ardent\PipelineBundle\Pipeline\OptionsProcessor;
+namespace Ardent\PipelineBundle\Pipeline\Service;
 
+use Ardent\PipelineBundle\Pipeline\Service\OptionsStageInterface as T;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\DependencyInjection\Attribute\AutowireLocator;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
@@ -12,7 +13,7 @@ class OptionsStageBag implements ContainerInterface
     private readonly ServiceLocator $locator;
 
     public function __construct(
-        #[AutowireLocator(OptionsStageInterface::class, indexAttribute: 'name')]
+        #[AutowireLocator(T::class, indexAttribute: 'name')]
         ServiceLocator $locator
     )
     {
@@ -20,14 +21,14 @@ class OptionsStageBag implements ContainerInterface
     }
 
     /**
-     * @template T of OptionsStageInterface
+     * @template T of T
      *
      * @param class-string<T> $id
      *
      * @return T
      * @throws ServiceNotFoundException
      */
-    public function get(string $id): OptionsStageInterface
+    public function get(string $id): T
     {
         return $this->locator->get($id);
     }

src/Pipeline/Service/OptionsStageInterface.php

@@ -1,11 +1,13 @@
 <?php
 
-namespace Ardent\PipelineBundle\Pipeline\OptionsProcessor;
+namespace Ardent\PipelineBundle\Pipeline\Service;
 
+use Ardent\PipelineBundle\Pipeline\OptionsProcessor\Item;
+use Ardent\PipelineBundle\Pipeline\OptionsProcessor\ItemCollection;
+use Ardent\PipelineBundle\Pipeline\OptionsProcessor\Options;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
 
-//#[AutoconfigureTag('ardent.pipeline.optionsProcessor')]
 #[AutoconfigureTag]
 interface OptionsStageInterface
 {
@@ -21,4 +23,4 @@ interface OptionsStageInterface
     public function after(ItemCollection $items): void;
 
     public function setOptions(Options $options): void;
-}
+}

src/Pipeline/Service/SubItemStage.php

@@ -1,7 +1,9 @@
 <?php
 
-namespace Ardent\PipelineBundle\Pipeline\OptionsProcessor;
+namespace Ardent\PipelineBundle\Pipeline\Service;
 
+use Ardent\PipelineBundle\Pipeline\OptionsProcessor\Item;
+use Ardent\PipelineBundle\Pipeline\OptionsProcessor\ItemsOptionsPipeline;
 use Exception;
 
 class SubItemStage extends AbstractOptionsStage