Blueprint::printClass() rewritten (BC break)

src/Latte/Essential/Blueprint.php

@@ -9,8 +9,6 @@
 
 namespace Latte\Essential;
 
-use Latte;
-use Latte\Runtime\Template;
 use Nette\PhpGenerator as Php;
 
 
@@ -20,24 +18,49 @@
  */
 final class Blueprint
 {
-	public function printClass(Template $template, ?string $name = null): void
+	private ?\Closure $typeDetector = null;
+
+
+	public function generateTemplateClass(
+		array $params,
+		?string $name = 'Template',
+		?string $extends = null,
+	): Php\ClassType
 	{
 		if (!class_exists(Php\ClassType::class)) {
-			throw new \LogicException('Nette PhpGenerator is required to print template, install package `nette/php-generator`.');
+			throw new \LogicException('Nette PhpGenerator is required to generate blueprint, install package `nette/php-generator`.');
 		}
 
-		$name = $name ?: 'Template';
 		$namespace = new Php\PhpNamespace(Php\Helpers::extractNamespace($name));
 		$class = $namespace->addClass(Php\Helpers::extractShortName($name));
+		if ($extends) {
+			if (class_exists($extends)) {
+				if ((new \ReflectionClass($extends))->isFinal()) {
+					throw new \LogicException("Blueprint error: Unable to extend final class $extends");
+				}
+				$class->setExtends($extends);
+			} elseif (trait_exists($extends)) {
+				$class->addTrait($extends);
+			} else {
+				throw new \LogicException("Blueprint error: Class '$extends' doesn't exist.");
+			}
+			$params = array_diff_key($params, get_class_vars($extends));
+		}
+		$this->addProperties($class, $params);
+		return $class;
+	}
 
-		$this->addProperties($class, $template->getParameters());
-		$functions = array_diff_key($template->global->fn->getAll(), (new Latte\Essential\CoreExtension)->getFunctions());
-		$this->addFunctions($class, $functions);
 
-		$end = $this->printCanvas();
-		$this->printHeader('Native types');
-		$this->printCode((string) $namespace);
-		echo $end;
+	public function printClass(Php\ClassType $class): void
+	{
+		$this->printCode((string) $class->getNamespace());
+	}
+
+
+	public function clickableFile(string $file, int $line = 1): string
+	{
+		$link = 'editor://open/?file=' . rawurlencode(strtr($file, '/', DIRECTORY_SEPARATOR)) . '&line=' . $line;
+		return '<a href="' . htmlspecialchars($link) . '">' . htmlspecialchars($file) . '</a>';
 	}
 
 
@@ -46,24 +69,16 @@ public function printClass(Template $template, ?string $name = null): void
 	 */
 	public function printVars(array $vars): void
 	{
-		if (!class_exists(Php\Type::class)) {
-			throw new \LogicException('Nette PhpGenerator is required to print template, install package `nette/php-generator`.');
-		}
-
 		$res = '';
 		foreach ($vars as $name => $value) {
-			if (str_starts_with($name, 'ʟ_')) {
-				continue;
+			if (!str_starts_with($name, 'ʟ_')) {
+				$type = $this->detectType($name, $value);
+				$res .= "{varType $type $$name}\n";
 			}
-
-			$type = $this->getType($value);
-			$res .= "{varType $type $$name}\n";
 		}
 
-		$end = $this->printCanvas();
 		$this->printHeader('varPrint');
 		$this->printCode($res ?: 'No variables', 'latte');
-		echo $end;
 	}
 
 
@@ -74,7 +89,7 @@ public function addProperties(Php\ClassType $class, array $props): void
 	{
 		foreach ($props as $name => $value) {
 			$class->removeProperty($name);
-			$type = $this->getType($value);
+			$type = $this->detectType($name, $value);
 			$prop = $class->addProperty($name);
 			$prop->setType($type);
 		}
@@ -134,12 +149,17 @@ public function printParameters(
 	}
 
 
-	public function printCanvas(): string
+	public function printBegin(): void
 	{
 		echo '<script src="https://nette.github.io/resources/prism/prism.js"></script>';
 		echo '<link rel="stylesheet" href="https://nette.github.io/resources/prism/prism.css">';
 		echo "<div style='all:initial;position:fixed;overflow:auto;z-index:1000;left:0;right:0;top:0;bottom:0;color:black;background:white;padding:1em'>\n";
-		return "</div>\n";
+	}
+
+
+	public function printEnd(): void
+	{
+		echo "</div>\n";
 	}
 
 
@@ -159,8 +179,18 @@ public function printCode(string $code, string $lang = 'php'): void
 	}
 
 
-	private function getType($value): string
+	/** @param  function(string $name, mixed $value): ?string  $detector */
+	public function setTypeDetector(\Closure $detector): void
+	{
+		$this->typeDetector = $detector;
+	}
+
+
+	private function detectType(string $name, mixed $value): string
 	{
-		return $value === null ? 'mixed' : get_debug_type($value);
+		$type = $this->typeDetector
+			? ($this->typeDetector)($name, $value)
+			: null;
+		return $type ?? ($value === null ? 'mixed' : get_debug_type($value));
 	}
 }

src/Latte/Essential/Nodes/TemplatePrintNode.php

@@ -13,14 +13,13 @@
 use Latte\Compiler\Nodes;
 use Latte\Compiler\Nodes\StatementNode;
 use Latte\Compiler\NodeTraverser;
-use Latte\Compiler\PhpHelpers;
 use Latte\Compiler\PrintContext;
 use Latte\Compiler\Tag;
 use Latte\Compiler\Token;
 
 
 /**
- * {templatePrint [ClassName]}
+ * {templatePrint [ParentClass]}
  */
 class TemplatePrintNode extends StatementNode
 {
@@ -37,7 +36,13 @@ public static function create(Tag $tag): static
 
 	public function print(PrintContext $context): string
 	{
-		return '(new Latte\Essential\Blueprint)->printClass($this, ' . PhpHelpers::dump($this->template) . '); exit;';
+		return $context->format(<<<'XX'
+			$ʟ_bp = new Latte\Essential\Blueprint;
+			$ʟ_bp->printBegin();
+			$ʟ_bp->printClass($ʟ_bp->generateTemplateClass($this->getParameters(), extends: %dump));
+			$ʟ_bp->printEnd();
+			exit;
+			XX, $this->template);
 	}
 
 

src/Latte/Essential/Nodes/VarPrintNode.php

@@ -33,9 +33,16 @@ public static function create(Tag $tag): static
 
 	public function print(PrintContext $context): string
 	{
-		$vars = $this->all ? 'get_defined_vars()'
+		$vars = $this->all
+			? 'get_defined_vars()'
 			: 'array_diff_key(get_defined_vars(), $this->getParameters())';
-		return "(new Latte\\Essential\\Blueprint)->printVars($vars); exit;";
+		return <<<XX
+			\$ʟ_bp = new Latte\\Essential\\Blueprint;
+			\$ʟ_bp->printBegin();
+			\$ʟ_bp->printVars($vars);
+			\$ʟ_bp->printEnd();
+			exit;
+			XX;
 	}
 
 

tests/common/Blueprint.printClass.phpt

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$latte = new Latte\Engine;
+$latte->setLoader(new Latte\Loaders\StringLoader);
+$latte->addFunction('Abc', function (stdClass $a, $b = 132) {});
+
+
+class ParentTemplate
+{
+	public $int;
+}
+
+$params = ['int' => 123, 'unknown' => null];
+
+$blueprint = new Latte\Essential\Blueprint;
+ob_start();
+$blueprint->printClass($blueprint->generateTemplateClass($params));
+$res = ob_get_clean();
+
+Assert::match(
+	<<<'XX'
+		%A%class Template
+		{
+			public int $int;
+			public mixed $unknown;
+		}
+		%A%
+		XX,
+	$res,
+);
+
+
+ob_start();
+$blueprint->printClass($blueprint->generateTemplateClass($params, name: Foo\Template::class, extends: ParentTemplate::class));
+$res = ob_get_clean();
+
+Assert::match(
+	<<<'XX'
+		%A%namespace Foo;
+
+		class Template extends \ParentTemplate
+		{
+			public mixed $unknown;
+		}
+		%A%
+		XX,
+	$res,
+);

tests/tags/printVars.phpt → tests/common/Blueprint.printVars.phpt

@@ -7,9 +7,9 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-$printer = new Latte\Essential\Blueprint;
+$blueprint = new Latte\Essential\Blueprint;
 ob_start();
-$printer->printVars(['int' => 123, 'unknown' => null]);
+$blueprint->printVars(['int' => 123, 'unknown' => null]);
 $res = ob_get_clean();
 
 Assert::match(

tests/tags/templatePrint.phpt

@@ -22,7 +22,10 @@ Assert::match(
 			{
 				extract($this->params);
 
-				(new Latte\Essential\Blueprint)->printClass($this, null);
+				$ʟ_bp = new Latte\Essential\Blueprint;
+				$ʟ_bp->printBegin();
+				$ʟ_bp->printClass($ʟ_bp->generateTemplateClass($this->getParameters(), extends: null));
+				$ʟ_bp->printEnd();
 				exit;
 		%A%
 		XX,
@@ -37,7 +40,10 @@ Assert::match(
 			{
 				extract($this->params);
 
-				(new Latte\Essential\Blueprint)->printClass($this, 'Foo');
+				$ʟ_bp = new Latte\Essential\Blueprint;
+				$ʟ_bp->printBegin();
+				$ʟ_bp->printClass($ʟ_bp->generateTemplateClass($this->getParameters(), extends: 'Foo'));
+				$ʟ_bp->printEnd();
 				exit;
 		%A%
 		XX,