support Latte 3 (#39)

* composer: add allow-plugins config

* support Latte 3

Author: jiripudil

.github/workflows/main.yml

@@ -16,6 +16,7 @@ jobs:
     strategy:
       matrix:
         php: [ '7.4', '8.0', '8.1' ]
+        latte: [ '', '--prefer-lowest' ]
       fail-fast: false
     steps:
       - uses: actions/checkout@v2
@@ -24,7 +25,8 @@ jobs:
           php-version: ${{ matrix.php }}
           extensions: curl, iconv, json, mbstring, tokenizer
           coverage: none
-      - run: composer install --ignore-platform-reqs --no-interaction
+      - run: composer install --no-interaction
+      - run: composer update latte/latte ${{ matrix.latte }} --no-interaction
       - run: make tests
 
   coverage:

composer.json

@@ -25,7 +25,7 @@
     "nette/di": "^3.0"
   },
   "require-dev": {
-    "latte/latte": "^2.4",
+    "latte/latte": "^2.4 || ^3.0",
     "nette/application": "^3.0",
     "nette/bootstrap": "^3.0",
     "nette/tester": "^2.0",
@@ -44,7 +44,10 @@
   },
   "prefer-stable": true,
   "config": {
-    "sort-packages": true
+    "sort-packages": true,
+    "allow-plugins": {
+      "dealerdirect/phpcodesniffer-composer-installer": true
+    }
   },
   "extra": {
     "branch-alias": {

phpstan.neon

@@ -0,0 +1,3 @@
+parameters:
+	excludePaths:
+		- src/Latte/WebpackMacros.php # latte 2 compatibility

src/DI/WebpackExtension.php

@@ -15,7 +15,8 @@
 use Contributte\Webpack\Manifest\ManifestLoader;
 use Contributte\Webpack\Manifest\Mapper\WebpackManifestPluginMapper;
 use Contributte\Webpack\PublicPathProvider;
-use Nette\Bridges\ApplicationLatte\ILatteFactory;
+use Latte\Engine;
+use Nette\Bridges\ApplicationLatte\LatteFactory;
 use Nette\DI\CompilerExtension;
 use Nette\DI\Definitions\FactoryDefinition;
 use Nette\DI\Definitions\ServiceDefinition;
@@ -44,7 +45,7 @@ public function getConfigSchema(): Schema
 	{
 		return Expect::structure([
 			'debugger' => Expect::bool($this->debugMode),
-			'macros' => Expect::bool(\interface_exists(ILatteFactory::class)),
+			'macros' => Expect::bool(\interface_exists(LatteFactory::class)),
 			'devServer' => Expect::structure([
 				'enabled' => Expect::bool($this->debugMode),
 				'url' => Expect::string()->nullable()->dynamic(),
@@ -109,15 +110,20 @@ public function loadConfiguration(): void
 		// latte macro
 		if ($this->config['macros']) {
 			try {
-				$latteFactory = $builder->getDefinitionByType(ILatteFactory::class);
+				$latteFactory = $builder->getDefinitionByType(LatteFactory::class);
 				\assert($latteFactory instanceof FactoryDefinition);
 
 				$definition = $latteFactory->getResultDefinition();
 				\assert($definition instanceof ServiceDefinition);
 
-				$definition
-					->addSetup('?->addProvider(?, ?)', ['@self', 'webpackAssetLocator', $assetLocator])
-					->addSetup('?->onCompile[] = function ($engine) { Contributte\Webpack\Latte\WebpackMacros::install($engine->getCompiler()); }', ['@self']);
+				$definition->addSetup('?->addProvider(?, ?)', ['@self', 'webpackAssetLocator', $assetLocator]);
+
+				// @phpstan-ignore-next-line latte 2 compatibility
+				if (\version_compare(Engine::VERSION, '3', '<')) {
+					$definition->addSetup('?->onCompile[] = function ($engine) { Contributte\Webpack\Latte\WebpackMacros::install($engine->getCompiler()); }', ['@self']);
+				} else {
+					$definition->addSetup('addExtension', [new Statement(\Contributte\Webpack\Latte\WebpackExtension::class)]);
+				}
 			} catch (MissingServiceException $e) {
 				// ignore
 			}

src/Latte/WebpackExtension.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Contributte\Webpack\Latte;
+
+use Latte\Extension;
+
+final class WebpackExtension extends Extension
+{
+	public function getTags(): array
+	{
+		return [
+			'webpack' => [WebpackNode::class, 'create'],
+		];
+	}
+}

src/Latte/WebpackNode.php

@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Contributte\Webpack\Latte;
+
+use Latte\Compiler\Node;
+use Latte\Compiler\Nodes\Php\ExpressionNode;
+use Latte\Compiler\Nodes\Php\ModifierNode;
+use Latte\Compiler\Nodes\StatementNode;
+use Latte\Compiler\PrintContext;
+use Latte\Compiler\Tag;
+
+/**
+ * {webpack asset.name.js}
+ */
+final class WebpackNode extends StatementNode
+{
+	public ExpressionNode $expression;
+
+	public ModifierNode $modifier;
+
+	public static function create(Tag $tag): self
+	{
+		$tag->outputMode = $tag::OutputKeepIndentation;
+		$tag->expectArguments();
+
+		$node = new self();
+		$node->expression = $tag->parser->parseUnquotedStringOrExpression();
+		$node->modifier = $tag->parser->parseModifier();
+		$node->modifier->escape = true;
+		return $node;
+	}
+
+	public function print(PrintContext $context): string
+	{
+		return $context->format(
+			"echo %modify(\$this->global->webpackAssetLocator->locateInPublicPath(%node)) %line;\n",
+			$this->modifier,
+			$this->expression,
+			$this->position,
+		);
+	}
+
+	/**
+	 * @return \Generator<Node>
+	 */
+	public function &getIterator(): \Generator
+	{
+		yield $this->expression;
+		yield $this->modifier;
+	}
+}

tests/DI/WebpackExtensionTest.phpt

@@ -14,7 +14,7 @@ use Contributte\Webpack\Debugging\WebpackPanel;
 use Contributte\Webpack\DevServer\DevServer;
 use Contributte\Webpack\PublicPathProvider;
 use Latte\Loaders\StringLoader;
-use Nette\Bridges\ApplicationLatte\ILatteFactory;
+use Nette\Bridges\ApplicationLatte\LatteFactory;
 use Nette\Configurator;
 use Nette\DI\Container;
 use Nette\DI\InvalidConfigurationException;
@@ -125,8 +125,8 @@ final class WebpackExtensionTest extends TestCase
 	{
 		$container = $this->createContainer('noDebug');
 
-		/** @var ILatteFactory $latteFactory */
-		$latteFactory = $container->getByType(ILatteFactory::class);
+		/** @var LatteFactory $latteFactory */
+		$latteFactory = $container->getByType(LatteFactory::class);
 		$latte = $latteFactory->create();
 
 		$providers = $latte->getProviders();

tests/Latte/WebpackExtensionTest.phpt

@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Contributte\Webpack\Tests\Latte;
+
+use Contributte\Webpack\AssetLocator;
+use Contributte\Webpack\Latte\WebpackExtension;
+use Latte\Engine;
+use Latte\Loaders\StringLoader;
+use Tester\Assert;
+use Tester\Environment;
+use Tester\TestCase;
+use function Contributte\Webpack\Tests\createAssetNameResolver;
+use function Contributte\Webpack\Tests\createBuildDirectoryProvider;
+use function Contributte\Webpack\Tests\createDisabledDevServer;
+use function Contributte\Webpack\Tests\createPublicPathProvider;
+
+require_once __DIR__ . '/../bootstrap.php';
+
+/**
+ * @testCase
+ */
+final class WebpackExtensionTest extends TestCase
+{
+	public function testExtension(): void
+	{
+		if (\version_compare(Engine::VERSION, '3', '<')) {
+			Environment::skip('Requires Latte 3.');
+		}
+
+		$assetLocator = new AssetLocator(
+			createBuildDirectoryProvider('/home/user'),
+			createPublicPathProvider('/dist'),
+			createAssetNameResolver(['asset.js' => 'asset.js']),
+			createDisabledDevServer(),
+			[],
+		);
+
+		$latte = new Engine();
+		$latte->addProvider('webpackAssetLocator', $assetLocator);
+		$latte->addExtension(new WebpackExtension());
+
+		$latte->setLoader(new StringLoader());
+		Assert::same('/dist/asset.js', $latte->renderToString('{webpack asset.js}'));
+	}
+}
+
+(new WebpackExtensionTest())->run();

tests/Latte/WebpackMacrosTest.phpt

@@ -9,6 +9,7 @@ use Contributte\Webpack\Latte\WebpackMacros;
 use Latte\Engine;
 use Latte\Loaders\StringLoader;
 use Tester\Assert;
+use Tester\Environment;
 use Tester\TestCase;
 use function Contributte\Webpack\Tests\createAssetNameResolver;
 use function Contributte\Webpack\Tests\createBuildDirectoryProvider;
@@ -24,6 +25,10 @@ final class WebpackMacrosTest extends TestCase
 {
 	public function testMacros(): void
 	{
+		if (\version_compare(Engine::VERSION, '3', '>')) {
+			Environment::skip('Requires Latte 2.');
+		}
+
 		$assetLocator = new AssetLocator(
 			createBuildDirectoryProvider('/home/user'),
 			createPublicPathProvider('/dist'),