Merge branch 'release/v0.2.5' into main

CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.2.5 (2023-01-25)
+* Added normalize() method to Elements
+
 ## v0.2.4 (2023-01-04)
 * Improved :attr binding support
 

src/Element.php

@@ -25,6 +25,11 @@ interface Element extends
      */
     public function setBody(mixed $body): static;
 
+    /**
+     * @return $this
+     */
+    public function normalize(): static;
+
     public function render(bool $pretty = false): ?Buffer;
     public function renderContent(bool $pretty = false): ?Buffer;
 }

src/ElementTrait.php

@@ -40,6 +40,28 @@ public function __construct(
         $this->merge($content);
     }
 
+
+    /**
+     * Normalize body content to individual items
+     *
+     * @return $this
+     */
+    public function normalize(): static
+    {
+        $items = [];
+
+        foreach ($this->items as $item) {
+            foreach ($this->normalizeChild($item, true) as $child) {
+                $items[] = $child;
+            }
+        }
+
+        $this->items = $items;
+        return $this;
+    }
+
+
+
     /**
      * Render to more readable string (for dump)
      */

src/Markup/ChildRendererTrait.php

@@ -10,6 +10,7 @@
 namespace DecodeLabs\Elementary\Markup;
 
 use DecodeLabs\Coercion;
+use DecodeLabs\Elementary\Buffer;
 use DecodeLabs\Elementary\Element;
 use DecodeLabs\Elementary\Markup;
 
@@ -68,6 +69,50 @@ protected function renderChild(
         return (string)$output;
     }
 
+    /**
+     * Normalize child elements
+     *
+     * @return Generator<mixed>
+     */
+    protected function normalizeChild(
+        mixed $value,
+        bool $pretty = false
+    ): Generator {
+        if (
+            is_callable($value) &&
+            is_object($value)
+        ) {
+            yield from $this->normalizeChild($value($this), $pretty);
+            return;
+        }
+
+        if ($value instanceof Proxy) {
+            $value = $value->toMarkup();
+        }
+
+        if (
+            is_iterable($value) &&
+            !$value instanceof Markup
+        ) {
+            foreach ($value as $part) {
+                yield $this->newBuffer($this->renderChild($part, $pretty));
+            }
+
+            if (
+                $value instanceof Generator &&
+                null !== ($part = $value->getReturn())
+            ) {
+                yield $this->newBuffer($this->renderChild($part, $pretty));
+            }
+
+            return;
+        }
+
+        yield $value;
+    }
+
+    abstract protected function newBuffer(?string $value): Buffer;
+
     /**
      * Escape HTML
      */