added constant Template::Source

nette · Aug 27, 2023 · 45cd10f · 45cd10f
1 parent 03f3baa
commit 45cd10f
Show file tree

Hide file tree

Showing 23 changed files with 50 additions and 4 deletions.
diff --git a/src/Latte/Compiler/TemplateGenerator.php b/src/Latte/Compiler/TemplateGenerator.php
@@ -36,7 +36,7 @@ final class TemplateGenerator
 	public function generate(
 		Nodes\TemplateNode $node,
 		string $className,
-		?string $comment = null,
+		?string $sourceName = null,
 		bool $strictMode = false,
 	): string
 	{
@@ -57,6 +57,10 @@ public function generate(
 			$this->addConstant('ContentType', $node->contentType);
 		}
 
+		if ($sourceName !== null) {
+			$this->addConstant('Source', $sourceName);
+		}
+
 		$this->generateBlocks($context->blocks, $context);
 
 		$members = [];
@@ -79,7 +83,7 @@ public function generate(
 		$code = "<?php\n\n"
 			. ($strictMode ? "declare(strict_types=1);\n\n" : '')
 			. "use Latte\\Runtime as LR;\n\n"
-			. ($comment === null ? '' : '/** ' . str_replace('*/', '* /', $comment) . " */\n")
+			. ($sourceName === null ? '' : '/** source: ' . str_replace('*/', '* /', $sourceName) . " */\n")
 			. "final class $className extends Latte\\Runtime\\Template\n{\n"
 			. implode("\n\n", $members)
 			. "\n}\n";

diff --git a/src/Latte/Engine.php b/src/Latte/Engine.php
@@ -180,12 +180,12 @@ public function applyPasses(TemplateNode &$node): void
 	 */
 	public function generate(TemplateNode $node, string $name): string
 	{
-		$comment = preg_match('#\n|\?#', $name) ? null : "source: $name";
+		$sourceName = preg_match('#\n|\?#', $name) ? null : $name;
 		$generator = new Compiler\TemplateGenerator;
 		return $generator->generate(
 			$node,
 			$this->getTemplateClass($name),
-			$comment,
+			$sourceName,
 			$this->strictTypes,
 		);
 	}

diff --git a/src/Latte/Runtime/Template.php b/src/Latte/Runtime/Template.php
@@ -28,6 +28,8 @@ class Template
 
 	public const ContentType = Latte\ContentType::Html;
 
+	public const Source = null;
+
 	public const Blocks = [];
 
 	/** global accumulators for intermediate results */

diff --git a/tests/common/expected/contentType.text.php b/tests/common/expected/contentType.text.php
@@ -4,6 +4,8 @@ final class Template%a% extends Latte\Runtime\Template
 {
 	public const ContentType = 'text';
 
+	public const Source = '%a%.latte';
+
 
 	public function main(array $ʟ_args): void
 	{

diff --git a/tests/common/expected/contentType.xml.php b/tests/common/expected/contentType.xml.php
@@ -4,6 +4,8 @@ final class Template%a% extends Latte\Runtime\Template
 {
 	public const ContentType = 'xml';
 
+	public const Source = '%a%.latte';
+
 
 	public function main(array $ʟ_args): void
 	{

diff --git a/tests/filters/expected/general.php b/tests/filters/expected/general.php
@@ -2,6 +2,8 @@
 %A%
 final class Template%a% extends Latte\Runtime\Template
 {
+	public const Source = '%a%.latte';
+
 
 	public function main(array $ʟ_args): void
 	{

diff --git a/tests/tags/expected/define.args4.php b/tests/tags/expected/define.args4.php
@@ -2,6 +2,8 @@
 %A%
 final class Template%a% extends Latte\Runtime\Template
 {
+	public const Source = 'main';
+
 
 	public function main(array $ʟ_args): void
 	{

diff --git a/tests/tags/expected/embed.block.php b/tests/tags/expected/embed.block.php
@@ -2,6 +2,8 @@
 %A%
 final class Template%a% extends Latte\Runtime\Template
 {
+	public const Source = 'main';
+
 	public const Blocks = [
 		1 => ['a' => 'blockA'],
 		2 => ['a' => 'blockA1'],

diff --git a/tests/tags/expected/embed.file.php b/tests/tags/expected/embed.file.php
@@ -2,6 +2,8 @@
 %A%
 final class Template%a% extends Latte\Runtime\Template
 {
+	public const Source = 'main';
+
 	public const Blocks = [
 		1 => ['a' => 'blockA'],
 		2 => ['a' => 'blockA1'],

diff --git a/tests/tags/expected/extends.1.php b/tests/tags/expected/extends.1.php
@@ -2,6 +2,8 @@
 %A%
 final class Template%a% extends Latte\Runtime\Template
 {
+	public const Source = 'main';
+
 
 	public function main(array $ʟ_args): void
 	{

diff --git a/tests/tags/expected/extends.4.php b/tests/tags/expected/extends.4.php
@@ -2,6 +2,8 @@
 %A%
 final class Template%a% extends Latte\Runtime\Template
 {
+	public const Source = 'main';
+
 	public const Blocks = [
 		['content' => 'blockContent'],
 	];

diff --git a/tests/tags/expected/general.n-attributes.php b/tests/tags/expected/general.n-attributes.php
@@ -2,6 +2,8 @@
 %A%
 final class Template%a% extends Latte\Runtime\Template
 {
+	public const Source = '%a%.latte';
+
 	public const Blocks = [
 		['bl' => 'blockBl'],
 	];

diff --git a/tests/tags/expected/general.php b/tests/tags/expected/general.php
@@ -5,6 +5,8 @@
 /** source: %A% */
 final class Template%a% extends Latte\Runtime\Template
 {
+	public const Source = '%a%.latte';
+
 	public const Blocks = [
 		['menu' => 'blockMenu'],
 	];

diff --git a/tests/tags/expected/import.php b/tests/tags/expected/import.php
@@ -2,6 +2,8 @@
 %A%
 final class Template%a% extends Latte\Runtime\Template
 {
+	public const Source = 'main';
+
 
 	public function main(array $ʟ_args): void
 	{

diff --git a/tests/tags/expected/include.inc1.php b/tests/tags/expected/include.inc1.php
@@ -2,6 +2,8 @@
 %A%
 final class Template%a% extends Latte\Runtime\Template
 {
+	public const Source = '%a%.latte';
+
 
 	public function main(array $ʟ_args): void
 	{

diff --git a/tests/tags/expected/include.inc2.php b/tests/tags/expected/include.inc2.php
@@ -2,6 +2,8 @@
 %A%
 final class Template%a% extends Latte\Runtime\Template
 {
+	public const Source = '%a%.latte';
+
 
 	public function main(array $ʟ_args): void
 	{

diff --git a/tests/tags/expected/include.inc3.php b/tests/tags/expected/include.inc3.php
@@ -2,6 +2,8 @@
 %A%
 final class Template%a% extends Latte\Runtime\Template
 {
+	public const Source = '%a%.latte';
+
 
 	public function main(array $ʟ_args): void
 	{

diff --git a/tests/tags/expected/include.php b/tests/tags/expected/include.php
@@ -2,6 +2,8 @@
 %A%
 final class Template%a% extends Latte\Runtime\Template
 {
+	public const Source = '%a%.latte';
+
 
 	public function main(array $ʟ_args): void
 	{

diff --git a/tests/tags/expected/include.with-blocks.inc.php b/tests/tags/expected/include.with-blocks.inc.php
@@ -2,6 +2,8 @@
 %A%
 final class Template%a% extends Latte\Runtime\Template
 {
+	public const Source = 'inc';
+
 	public const Blocks = [
 		['test' => 'blockTest'],
 	];

diff --git a/tests/tags/expected/include.with-blocks.php b/tests/tags/expected/include.with-blocks.php
@@ -2,6 +2,8 @@
 %A%
 final class Template%a% extends Latte\Runtime\Template
 {
+	public const Source = 'main';
+
 
 	public function main(array $ʟ_args): void
 	{

diff --git a/tests/tags/expected/inheritance.1.parent.php b/tests/tags/expected/inheritance.1.parent.php
@@ -2,6 +2,8 @@
 %A%
 final class Template%a% extends Latte\Runtime\Template
 {
+	public const Source = 'parent';
+
 	public const Blocks = [
 		['title' => 'blockTitle', 'sidebar' => 'blockSidebar'],
 	];

diff --git a/tests/tags/expected/inheritance.1.php b/tests/tags/expected/inheritance.1.php
@@ -2,6 +2,8 @@
 %A%
 final class Template%a% extends Latte\Runtime\Template
 {
+	public const Source = 'main';
+
 	public const Blocks = [
 		['title' => 'blockTitle', 'content' => 'blockContent'],
 	];

diff --git a/tests/tags/expected/inheritance.2.php b/tests/tags/expected/inheritance.2.php
@@ -2,6 +2,8 @@
 %A%
 final class Template%a% extends Latte\Runtime\Template
 {
+	public const Source = 'main';
+
 	public const Blocks = [
 		['content' => 'blockContent', 'title' => 'blockTitle', 'sidebar' => 'blockSidebar'],
 	];
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,8 @@ final class Template%a% extends Latte\Runtime\Template @@
     {
     	public const ContentType = 'text';
+    	public const Source = '%a%.latte';
     	public function main(array $ʟ_args): void
     	{
@@ Expand Down @@