Latte: n:snippet works with <script>

Author: dg

src/Bridges/ApplicationLatte/Nodes/SnippetNode.php

@@ -85,12 +85,32 @@ public static function create(Tag $tag, TemplateParser $parser): \Generator
 
 	public function print(PrintContext $context): string
 	{
-		$dynamic = $this->block->isDynamic();
-		if (!$dynamic) {
+		if (!$this->block->isDynamic()) {
 			$context->addBlock($this->block);
 		}
 
-		$snippetContent = $context->format(
+		if ($this->htmlElement) {
+			try {
+				$inner = $this->htmlElement->content;
+				$this->htmlElement->content = new AuxiliaryNode(fn() => $this->printContent($context, $inner));
+				return $this->content->print($context);
+			} finally {
+				$this->htmlElement->content = $inner;
+			}
+		} else {
+			return <<<XX
+				echo '<div {$this->printAttribute($context)}>';
+				{$this->printContent($context, $this->content)}
+				echo '</div>';
+				XX;
+		}
+	}
+
+
+	private function printContent(PrintContext $context, AreaNode $inner): string
+	{
+		$dynamic = $this->block->isDynamic();
+		$res = $context->format(
 			<<<'XX'
 				$this->global->snippetDriver->enter(%node, %dump) %line;
 				try {
@@ -103,34 +123,20 @@ public function print(PrintContext $context): string
 			$dynamic ? new AuxiliaryNode(fn() => '$ʟ_nm') : $this->block->name,
 			$dynamic ? SnippetDriver::TypeDynamic : SnippetDriver::TypeStatic,
 			$this->position,
-			$this->htmlElement->content ?? $this->content,
+			$inner,
 		);
 
-		if (!$dynamic) {
-			$this->block->content = $snippetContent;
-			$snippetContent = $context->format(
-				'$this->renderBlock(%node, [], null, %dump) %line;',
-				$this->block->name,
-				Template::LayerSnippet,
-				$this->position,
-			);
+		if ($dynamic) {
+			return $res;
 		}
 
-		if ($this->htmlElement) {
-			try {
-				$saved = $this->htmlElement->content;
-				$this->htmlElement->content = new AuxiliaryNode(fn() => $snippetContent);
-				return $this->content->print($context);
-			} finally {
-				$this->htmlElement->content = $saved;
-			}
-		} else {
-			return <<<XX
-				echo '<div {$this->printAttribute($context)}>';
-				{$snippetContent}
-				echo '</div>';
-				XX;
-		}
+		$this->block->content = $res;
+		return $context->format(
+			'$this->renderBlock(%node, [], null, %dump) %line;',
+			$this->block->name,
+			Template::LayerSnippet,
+			$this->position,
+		);
 	}
 
 

tests/Bridges.Latte3/expected/n-snippet.php

@@ -3,7 +3,7 @@
 final class Template%a% extends Latte\Runtime\Template
 {
 	public const Blocks = [
-		'snippet' => ['outer' => 'blockOuter', 'gallery' => 'blockGallery'],
+		'snippet' => ['outer' => 'blockOuter', 'gallery' => 'blockGallery', 'script' => 'blockScript'],
 	];
 
 
@@ -23,6 +23,12 @@ public function main(array $ʟ_args): void
 		echo '">';
 		$this->renderBlock('gallery', [], null, 'snippet') /* line %d% */;
 		echo '</div>
+
+	<script';
+		echo ' id="', htmlspecialchars($this->global->snippetDriver->getHtmlId('script')), '"';
+		echo '>';
+		$this->renderBlock('script', [], null, 'snippet') /* line %d% */;
+		echo '</script>
 ';
 	}
 
@@ -59,4 +65,21 @@ public function blockGallery(array $ʟ_args): void
 			$this->global->snippetDriver->leave();
 		}
 	}
+
+
+	/** n:snippet="script" on line %d% */
+	public function blockScript(array $ʟ_args): void
+	{
+		extract($this->params);
+		extract($ʟ_args);
+		unset($ʟ_args);
+
+		$this->global->snippetDriver->enter('script', 'static') /* line %d% */;
+		try {
+			echo LR\Filters::escapeJs('x') /* line 7 */;
+
+		} finally {
+			$this->global->snippetDriver->leave();
+		}
+	}
 }

tests/Bridges.Latte3/n-snippet.phpt

@@ -24,6 +24,8 @@ $template = <<<'EOD'
 
 		<div n:snippet="gallery" class="{=class}"></div>
 
+		<script n:snippet="script">{='x'}</script>
+
 	EOD;
 
 Assert::matchFile(