change printer to take tokens in constructor

sinnbeck · sinnbeck · commit 004c6ce951f0 · 2025-04-14T12:34:23.000+02:00
diff --git a/README.md b/README.md
@@ -95,7 +95,7 @@ The printer takes an HTML input or the resulting AST and renders it as neatly fo
 use Sinnbeck\HtmlAst\Printer;
 
 // Create a Printer instance and render the HTML string
-echo Printer::make()->render($nodeTree);
+echo Printer::make($nodeTree)->render();
 ```
 
 ## Testing
diff --git a/src/Printer.php b/src/Printer.php
@@ -7,6 +7,7 @@
 
 class Printer
 {
+    protected array $nodes;
     protected string $indentStr = "    ";
     protected string $newline = "\n";
     protected array $voidElements = [
@@ -27,15 +28,20 @@ class Printer
         'wbr',
     ];
 
-    public static function make(): self
+    public function __construct(array $nodes)
     {
-        return new self();
+        $this->nodes = $nodes;
     }
 
-    public function render(array $nodes, int $level = 0): string
+    public static function make(array $nodes): self
+    {
+        return new self($nodes);
+    }
+
+    public function render(int $level = 0): string
     {
         $html = '';
-        foreach ($nodes as $node) {
+        foreach ($this->nodes as $node) {
             $html .= $this->renderNode($node, $level);
         }
 
diff --git a/tests/Feature/PrintTest.php b/tests/Feature/PrintTest.php
@@ -12,8 +12,8 @@
 
     $nodes = $ast->parse();
 
-    $printer = new Printer();
-    expect($printer->render($nodes))->toEqual($html);
+    $printer = new Printer($nodes);
+    expect($printer->render())->toEqual($html);
 });
 
 it('can fix basic-scrambled', function () {
@@ -24,9 +24,9 @@
 
     $nodes = $ast->parse();
 
-    $printer = new Printer();
+    $printer = new Printer($nodes);
     $html = getFixture('basic.html');
-    expect($printer->render($nodes))->toEqual($html);
+    expect($printer->render())->toEqual($html);
 });
 
 it('can print complex', function () {
@@ -37,8 +37,8 @@
 
     $nodes = $ast->parse();
 
-    $printer = new Printer();
-    expect($printer->render($nodes))->toEqual($html);
+    $printer = new Printer($nodes);
+    expect($printer->render())->toEqual($html);
 });
 
 it('can print fragments', function () {
@@ -49,8 +49,8 @@
 
     $nodes = $ast->parse();
 
-    $printer = new Printer();
-    expect($printer->render($nodes))->toEqual($html);
+    $printer = new Printer($nodes);
+    expect($printer->render())->toEqual($html);
 });
 
 it('can print comments', function () {
@@ -61,15 +61,15 @@
 
     $nodes = $ast->parse();
 
-    $printer = new Printer();
-    expect($printer->render($nodes))->toEqual($html);
+    $printer = new Printer($nodes);
+    expect($printer->render())->toEqual($html);
 });
 
 it('can handle all inline tags', function () {
     $html = getFixture('inline-tags.html');
     $lexer = new Lexer($html);
     $nodes = Parser::make($lexer->lex())->parse();
-    expect(Printer::make()->render($nodes))->toEqual(
+    expect(Printer::make($nodes)->render())->toEqual(
         <<<HTML
 <img src="logo.png" alt="logo" />
 <img src="logo.png" alt="logo" />

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`class Printer`
`9`	`9`	`{`
	`10`	`+ protected array $nodes;`
`10`	`11`	`protected string $indentStr = " ";`
`11`	`12`	`protected string $newline = "\n";`
`12`	`13`	`protected array $voidElements = [`
`@@ -27,15 +28,20 @@ class Printer`
`27`	`28`	`'wbr',`
`28`	`29`	`];`
`29`	`30`
`30`		`- public static function make(): self`
	`31`	`+ public function __construct(array $nodes)`
`31`	`32`	`{`
`32`		`- return new self();`
	`33`	`+ $this->nodes = $nodes;`
`33`	`34`	`}`
`34`	`35`
`35`		`- public function render(array $nodes, int $level = 0): string`
	`36`	`+ public static function make(array $nodes): self`
	`37`	`+ {`
	`38`	`+ return new self($nodes);`
	`39`	`+ }`
	`40`	`+`
	`41`	`+ public function render(int $level = 0): string`
`36`	`42`	`{`
`37`	`43`	`$html = '';`
`38`		`- foreach ($nodes as $node) {`
	`44`	`+ foreach ($this->nodes as $node) {`
`39`	`45`	`$html .= $this->renderNode($node, $level);`
`40`	`46`	`}`
`41`	`47`