Add tokens to blocks

Author: Neol3108

src/BlockParser.php

@@ -58,6 +58,7 @@ public function getIterator(): Generator
                     namespace: $token->namespace,
                     name: $token->name,
                     attributes: $token->attributes,
+                    token: $token,
                 );
             } elseif ($token instanceof BlockOpening && $this->stackDepth++ === 0) {
                 $opening = $token;
@@ -77,6 +78,8 @@ public function getIterator(): Generator
                         $openedAt,
                         $token->startsAt - $openedAt,
                     ),
+                    opening: $opening,
+                    closing: $token,
                 );
             }
         }

src/Blocks/Block.php

@@ -2,6 +2,9 @@
 
 namespace Recoded\WordPressBlockParser\Blocks;
 
+use Recoded\WordPressBlockParser\Tokens\BlockClosing;
+use Recoded\WordPressBlockParser\Tokens\BlockOpening;
+
 final class Block
 {
     /**
@@ -11,13 +14,17 @@ final class Block
      * @param string $name
      * @param array<string, mixed> $attributes
      * @param string $content
+     * @param \Recoded\WordPressBlockParser\Tokens\BlockOpening $opening
+     * @param \Recoded\WordPressBlockParser\Tokens\BlockClosing $closing
      * @return void
      */
     public function __construct(
         public readonly string $namespace,
         public readonly string $name,
         public readonly array $attributes,
         public readonly string $content,
+        public readonly BlockOpening $opening,
+        public readonly BlockClosing $closing,
     ) {
         //
     }

src/Blocks/SelfClosingBlock.php

@@ -2,6 +2,8 @@
 
 namespace Recoded\WordPressBlockParser\Blocks;
 
+use Recoded\WordPressBlockParser\Tokens\SelfClosingBlock as SelfClosingBlockToken;
+
 final class SelfClosingBlock
 {
     /**
@@ -10,12 +12,14 @@ final class SelfClosingBlock
      * @param string $namespace
      * @param string $name
      * @param array<string, mixed> $attributes
+     * @param \Recoded\WordPressBlockParser\Tokens\SelfClosingBlock $token
      * @return void
      */
     public function __construct(
         public readonly string $namespace,
         public readonly string $name,
         public readonly array $attributes,
+        public readonly SelfClosingBlockToken $token,
     ) {
         //
     }

tests/BlockParserTest.php

@@ -6,6 +6,9 @@
 use Recoded\WordPressBlockParser\BlockParser;
 use Recoded\WordPressBlockParser\Blocks\Block;
 use Recoded\WordPressBlockParser\Blocks\SelfClosingBlock;
+use Recoded\WordPressBlockParser\Tokens\BlockClosing;
+use Recoded\WordPressBlockParser\Tokens\BlockOpening;
+use Recoded\WordPressBlockParser\Tokens\SelfClosingBlock as SelfClosingBlockToken;
 
 final class BlockParserTest extends TestCase
 {
@@ -30,11 +33,31 @@ public function test_it_parses_blocks(): void
     Test
     <!-- /wp:paragraph -->
 ',
+                opening: new BlockOpening(
+                    namespace: 'core/',
+                    name: 'paragraph',
+                    attributes: [],
+                    startsAt: 0,
+                    length: 21,
+                ),
+                closing: new BlockClosing(
+                    namespace: 'core/',
+                    name: 'paragraph',
+                    startsAt: 84,
+                    length: 22,
+                ),
             ),
             new SelfClosingBlock(
                 namespace: 'core/',
                 name: 'paragraph',
                 attributes: [],
+                token: new SelfClosingBlockToken(
+                    namespace: 'core/',
+                    name: 'paragraph',
+                    attributes: [],
+                    startsAt: 107,
+                    length: 22,
+                ),
             ),
         ], iterator_to_array($parser));
     }