- Added ability to strip attributes from attributed strings.

- `Context` is now provided at more places in the parser.
- Added `ItemList` component and parser for parsing `ul` and `ol` elements.

Author: petercv

CHANGELOG.md

@@ -2,11 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
-## 1.1 - 2025-07-24
+## v1.2 - 2025-07-24
+- Added ability to strip attributes from attributed strings.
+- `Context` is now provided at more places in the parser.
+- Added `ItemList` component and parser for parsing `ul` and `ol` elements.
+
+## v1.1 - 2025-07-24
 - Simplified the main parser and moved options to the `parse` method.
 - Introduced `Context` class to provide access to the options and for storing context-specific values.
 - Renamed the `Basic` implementation namespace to `Standard` to better reflect its purpose.
 - Moved node parsers into the `Core` namespace that are also usable outside the standard implementation.
 
-## 1.0 - 2025-07-23
+## v1.0 - 2025-07-23
 Initial release of PHP MarkupKit

README.md

@@ -60,7 +60,7 @@ $components = $parser->parse('<strong>Hello World!</strong> <img src="https://pi
 assert(count($components) === 2);
 
 assert($components[0] instanceof Components\Text);
-$string = $components[0]->string;
+$string = $components[0]->content;
 assert(count($string->elements) === 1);
 assert($string->elements[0] instanceof AttributedSubstring);
 assert($string->elements[0]->string === 'Hello World!');

src/MarkupKit/Core/Parsers/Flow/AttributedStringFlowNodeParser.php

@@ -25,7 +25,7 @@ public function __construct(
     ) {
     }
 
-    public function isFlowNodeSupported(DOMElement $node): bool
+    public function isFlowNodeSupported(DOMElement $node, Context $context): bool
     {
         return true;
     }

src/MarkupKit/Core/Parsers/Flow/FlowNodeParser.php

@@ -10,7 +10,10 @@
   */
 interface FlowNodeParser
 {
-    public function isFlowNodeSupported(DOMElement $node): bool;
+    /**
+     * @param Context<T> $context
+     */
+    public function isFlowNodeSupported(DOMElement $node, Context $context): bool;
 
     /**
      * @param Context<T> $context

src/MarkupKit/Core/Parsers/NodeParserBundle.php

@@ -25,10 +25,10 @@ public function __construct(
     ) {
     }
 
-    public function isFlowNodeSupported(DOMElement $node): bool
+    public function isFlowNodeSupported(DOMElement $node, Context $context): bool
     {
         foreach ($this->nodeParsers as $nodeParser) {
-            if ($nodeParser instanceof FlowNodeParser && $nodeParser->isFlowNodeSupported($node)) {
+            if ($nodeParser instanceof FlowNodeParser && $nodeParser->isFlowNodeSupported($node, $context)) {
                 return true;
             }
         }
@@ -44,18 +44,21 @@ public function isFlowNodeSupported(DOMElement $node): bool
     public function parseFlowNode(DOMElement $node, Context $context): array
     {
         foreach ($this->nodeParsers as $nodeParser) {
-            if ($nodeParser instanceof FlowNodeParser && $nodeParser->isFlowNodeSupported($node)) {
+            if ($nodeParser instanceof FlowNodeParser && $nodeParser->isFlowNodeSupported($node, $context)) {
                 return $nodeParser->parseFlowNode($node, $context);
             }
         }
 
         return [];
     }
 
-    public function isPhrasingNodeSupported(DOMElement|DOMText $node): bool
+    /**
+     * @param Context<mixed> $context
+     */
+    public function isPhrasingNodeSupported(DOMElement|DOMText $node, Context $context): bool
     {
         foreach ($this->nodeParsers as $nodeParser) {
-            if ($nodeParser instanceof PhrasingNodeParser && $nodeParser->isPhrasingNodeSupported($node)) {
+            if ($nodeParser instanceof PhrasingNodeParser && $nodeParser->isPhrasingNodeSupported($node, $context)) {
                 return true;
             }
         }
@@ -70,7 +73,7 @@ public function parsePhrasingNode(
         Context $context
     ): void {
         foreach ($this->nodeParsers as $nodeParser) {
-            if ($nodeParser instanceof PhrasingNodeParser && $nodeParser->isPhrasingNodeSupported($node)) {
+            if ($nodeParser instanceof PhrasingNodeParser && $nodeParser->isPhrasingNodeSupported($node, $context)) {
                 $nodeParser->parsePhrasingNode($node, $stringBuilder, $attributes, $context);
                 return;
             }

src/MarkupKit/Core/Parsers/Phrasing/ChildPhrasingNodeParser.php

@@ -13,7 +13,10 @@
 {
     use ParsePhrasingChildNodes;
 
-    public function isPhrasingNodeSupported(DOMElement|DOMText $node): bool
+    /**
+ * @param Context<mixed> $context
+ */
+    public function isPhrasingNodeSupported(DOMElement|DOMText $node, Context $context): bool
     {
         return $node instanceof DOMElement;
     }

src/MarkupKit/Core/Parsers/Phrasing/PhrasingNodeParser.php

@@ -10,7 +10,10 @@
 
 interface PhrasingNodeParser
 {
-    public function isPhrasingNodeSupported(DOMElement|DOMText $node): bool;
+    /**
+ * @param Context<mixed> $context
+ */
+    public function isPhrasingNodeSupported(DOMElement|DOMText $node, Context $context): bool;
 
     /**
      * @param Context<mixed> $context

src/MarkupKit/Core/Parsers/Phrasing/TextPhrasingNodeParser.php

@@ -10,7 +10,10 @@
 
 readonly class TextPhrasingNodeParser implements PhrasingNodeParser
 {
-    public function isPhrasingNodeSupported(DOMElement|DOMText $node): bool
+    /**
+ * @param Context<mixed> $context
+ */
+    public function isPhrasingNodeSupported(DOMElement|DOMText $node, Context $context): bool
     {
         return $node instanceof DOMText;
     }

src/MarkupKit/Core/String/AbstractAttributedElement.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace MarkupKit\Core\String;
+
+abstract readonly class AbstractAttributedElement implements AttributedElement
+{
+    public function __construct(
+        public AttributeContainer $attributes = new AttributeContainer()
+    ) {
+    }
+
+    public function withAttribute(Attribute $attribute): static
+    {
+        return $this->replacingAttributes(
+            $this->attributes->withAttribute($attribute)
+        );
+    }
+
+    public function withoutAttributes(): static
+    {
+        return $this->replacingAttributes(new AttributeContainer());
+    }
+
+    abstract public function replacingAttributes(AttributeContainer $attributes): static;
+}

src/MarkupKit/Core/String/Attachment.php

@@ -2,10 +2,6 @@
 
 namespace MarkupKit\Core\String;
 
-readonly abstract class Attachment implements AttributedElement
+readonly abstract class Attachment extends AbstractAttributedElement
 {
-    public function __construct(
-        public AttributeContainer $attributes = new AttributeContainer()
-    ) {
-    }
 }