Compiler: added new state HtmlRawText

Author: dg

src/Latte/Compiler/Escaper.php

@@ -33,10 +33,9 @@ final class Escaper
 		HtmlText = 'html',
 		HtmlComment = 'html/comment',
 		HtmlBogusTag = 'html/bogus',
-		HtmlCss = 'html/css',
-		HtmlJavaScript = 'html/js',
 		HtmlTag = 'html/tag',
-		HtmlAttribute = 'html/attr';
+		HtmlAttribute = 'html/attr',
+		HtmlRawText = 'html/rawtext';
 
 	private string $state = '';
 	private string $tag = '';
@@ -78,18 +77,19 @@ public function enterContentType(string $type): void
 
 	public function enterHtmlText(?ElementNode $node): void
 	{
-		$this->state = self::HtmlText;
-		if ($this->contentType === ContentType::Html && $node) {
-			$name = strtolower($node->name);
-			if (
-				($name === 'script' || $name === 'style')
-				&& is_string($attr = $node->getAttribute('type') ?? 'css')
-				&& preg_match('#(java|j|ecma|live)script|module|json|css|plain#i', $attr)
-			) {
-				$this->state = $name === 'script'
-					? self::HtmlJavaScript
-					: self::HtmlCss;
-			}
+		$name = strtolower($node->name ?? '');
+		if ($this->contentType === ContentType::Html && in_array($name, ['script', 'style'], true)) {
+			$attr = $node->getAttribute('type');
+			$this->state = self::HtmlRawText;
+			$this->subType = match (true) {
+				$name === 'style' => self::Css,
+				!is_string($attr) || preg_match('#(java|j|ecma|live)script|module|json|plain#i', $attr) => self::JavaScript,
+				$attr === 'text/html' => self::HtmlText,
+				default => '',
+			};
+		} else {
+			$this->state = self::HtmlText;
+			$this->subType = '';
 		}
 	}
 
@@ -155,8 +155,12 @@ public function escape(string $str): string
 				},
 				self::HtmlComment => 'LR\Filters::escapeHtmlComment(' . $str . ')',
 				self::HtmlBogusTag => 'LR\Filters::escapeHtml(' . $str . ')',
-				self::HtmlJavaScript => 'LR\Filters::escapeJs(' . $str . ')',
-				self::HtmlCss => 'LR\Filters::escapeCss(' . $str . ')',
+				self::HtmlRawText => match ($this->subType) {
+					'' => 'LR\Filters::escapeHtmlRawText(' . $str . ')',
+					self::HtmlText => 'LR\Filters::escapeHtmlText(' . $str . ')',
+					self::JavaScript => 'LR\Filters::escapeJs(' . $str . ')',
+					self::Css => 'LR\Filters::escapeCss(' . $str . ')',
+				},
 				default => throw new \LogicException("Unknown context $this->contentType, $this->state."),
 			},
 			ContentType::Xml => match ($this->state) {
@@ -202,14 +206,14 @@ public static function getConvertor(string $source, string $dest): ?callable
 				'html' => 'escapeHtmlText',
 				'html/attr' => 'escapeHtmlAttr',
 				'html/attr/js' => 'escapeHtmlAttr',
-				'html/js' => 'escapeHtmlRawText',
+				'html/rawtext/js' => 'escapeHtmlRawText',
 				'html/comment' => 'escapeHtmlComment',
 			],
 			self::Css => [
 				'html' => 'escapeHtmlText',
 				'html/attr' => 'escapeHtmlAttr',
 				'html/attr/css' => 'escapeHtmlAttr',
-				'html/css' => 'escapeHtmlRawText',
+				'html/rawtext/css' => 'escapeHtmlRawText',
 				'html/comment' => 'escapeHtmlComment',
 			],
 			'html' => [

tests/common/contentType.compatibility.phpt

@@ -180,7 +180,7 @@ test('', function () {
 	Assert::exception(
 		fn() => $latte->renderToString('<div>{include style}</div> <STYLE n:inner-block=style>...</STYLE>'),
 		Latte\RuntimeException::class,
-		'Including block style with content type HTML/CSS into incompatible type HTML.',
+		'Including block style with content type HTML/RAWTEXT/CSS into incompatible type HTML.',
 	);
 
 	Assert::match(
@@ -191,7 +191,7 @@ test('', function () {
 	Assert::exception(
 		fn() => $latte->renderToString('<div>{include script}</div> <script n:inner-block=script>...</script>'),
 		Latte\RuntimeException::class,
-		'Including block script with content type HTML/JS into incompatible type HTML.',
+		'Including block script with content type HTML/RAWTEXT/JS into incompatible type HTML.',
 	);
 });
 
@@ -268,7 +268,7 @@ Assert::same('<script> <\/script></script>', $latte->renderToString('context4'))
 Assert::exception(
 	fn() => $latte->renderToString('context5'),
 	Latte\RuntimeException::class,
-	"Including 'js.latte' with content type JS into incompatible type HTML/CSS.",
+	"Including 'js.latte' with content type JS into incompatible type HTML/RAWTEXT/CSS.",
 );
 
 Assert::same('<!-- </script>-->', $latte->renderToString('context6'));
@@ -310,13 +310,13 @@ Assert::same('<p title="&lt;hr&gt; &quot; &quot; &lt;"></p>', $latte->renderToSt
 Assert::exception(
 	fn() => $latte->renderToString('context4'),
 	Latte\RuntimeException::class,
-	"Including 'html.latte' with content type HTML into incompatible type HTML/JS.",
+	"Including 'html.latte' with content type HTML into incompatible type HTML/RAWTEXT/JS.",
 );
 
 Assert::exception(
 	fn() => $latte->renderToString('context5'),
 	Latte\RuntimeException::class,
-	"Including 'html.latte' with content type HTML into incompatible type HTML/CSS.",
+	"Including 'html.latte' with content type HTML into incompatible type HTML/RAWTEXT/CSS.",
 );
 
 Assert::same('<!--<hr> " &quot; &lt;-->', $latte->renderToString('context6'));

tests/common/contentType.html.css.phpt

@@ -45,13 +45,8 @@ Assert::match(
 	$latte->renderToString('<style type="TEXT/CSS">{="<>"}</style>'),
 );
 
-Assert::match(
-	'<style type="text/html">&lt;&gt;</style>',
-	$latte->renderToString('<style type="text/html">{="<>"}</style>'),
-);
-
-Assert::match(
-	'<style type="text/html">&lt;&gt;</style>',
+Assert::match( // type is ignored
+	'<style type="text/html">\<\></style>',
 	$latte->renderToString('<style type="text/html">{="<>"}</style>'),
 );
 

tests/common/contentType.html.javascript.phpt

@@ -88,6 +88,11 @@ Assert::match(
 	$latte->renderToString('<script type="text/html">{="<>"}</script>'),
 );
 
+Assert::match(
+	'<script type="unknown"><> <\/script></script>',
+	$latte->renderToString('<script type="unknown">{="<> </script>"}</script>'),
+);
+
 // content of <script> is RAWTEXT
 Assert::match(
 	<<<'XX'