minor fixes + README

Author: jiripudil

README.md

@@ -80,7 +80,7 @@ webpack:
 
 You might want to include the Webpack's asset hash in its file name for assets caching (and automatic cache busting in new releases) in the user agent. But how do you reference the asset files in your code if their names are dynamic?
 
-WebpackNetteAdapter comes to the rescue. You can employ the [webpack-manifest-plugin](https://www.npmjs.com/package/webpack-manifest-plugin) or some similar plugin to produce a manifest file, and then configure the adapter to use it:
+WebpackNetteAdapter comes to the rescue. You can employ the [`webpack-manifest-plugin`](https://www.npmjs.com/package/webpack-manifest-plugin) or some similar plugin (see below) to produce a manifest file, and then configure the adapter to use it:
 
 ```yaml
 webpack:
@@ -93,6 +93,20 @@ This way, you can keep using the original asset names, and they get expanded aut
 WebpackNetteAdapter automatically optimizes this in production environment by loading the manifest file in compile time.
 
 
+#### Manifest mappers
+
+By default, WebpackNetteAdapter supports the aforementioned `webpack-manifest-plugin`. If you use a different plugin that produces the manifest in a different format, you can implement and configure a mapper for it. WebpackNetteAdapter comes bundled with a mapper for the [`assets-webpack-plugin`](https://www.npmjs.com/package/assets-webpack-plugin):
+
+```yaml
+webpack:
+    manifest:
+      name: manifest.json
+      mapper: Oops\WebpackNetteAdapter\Manifest\Mapper\AssetsWebpackPluginMapper
+```
+
+You can also implement your own mapper, simply extend `Oops\WebpackNetteAdapter\Manifest\ManifestMapper` and implement its `map()` method. It takes the parsed JSON content of the manifest file and is expected to return a flat array mapping asset names to file names.
+
+
 ### Debugger
 
 In development environment, WebpackNetteAdapter registers its own debug bar panel into Tracy, giving you the overview of

src/DI/WebpackExtension.php

@@ -18,7 +18,7 @@
 use Oops\WebpackNetteAdapter\BuildDirectoryProvider;
 use Oops\WebpackNetteAdapter\Debugging\WebpackPanel;
 use Oops\WebpackNetteAdapter\DevServer;
-use Oops\WebpackNetteAdapter\Manifest\IdentityMapper;
+use Oops\WebpackNetteAdapter\Manifest\Mapper\WebpackManifestPluginMapper;
 use Oops\WebpackNetteAdapter\Manifest\ManifestLoader;
 use Oops\WebpackNetteAdapter\PublicPathProvider;
 use Tracy;
@@ -50,7 +50,7 @@ class WebpackExtension extends CompilerExtension
 		'manifest' => [
 			'name' => NULL,
 			'optimize' => NULL,
-			'mapper' => NULL,
+			'mapper' => WebpackManifestPluginMapper::class,
 		]
 	];
 
@@ -164,13 +164,11 @@ private function setupAssetResolver(array $config): ServiceDefinition
 		if ($config['manifest']['name'] !== NULL) {
 			if ( ! $config['manifest']['optimize']) {
 				$loader = $builder->addDefinition($this->prefix('manifestLoader'))
-					->setFactory(ManifestLoader::class)
+					->setFactory(ManifestLoader::class, [
+						1 => new Statement($config['manifest']['mapper']),
+					])
 					->setAutowired(FALSE);
 
-				if ($config['manifest']['mapper'] !== NULL) {
-					$loader->getFactory()->arguments[1] = new Statement($config['manifest']['mapper']);
-				}
-
 				$assetResolver->setFactory(AssetNameResolver\ManifestAssetNameResolver::class, [
 					$config['manifest']['name'],
 					$loader
@@ -181,13 +179,11 @@ private function setupAssetResolver(array $config): ServiceDefinition
 					$config['devServer']['enabled'],
 					$config['devServer']['url'] ?? '',
 					$config['devServer']['publicUrl'] ?? '',
-					$config['devServer']['timeout'] ?? 0.1,
+					$config['devServer']['timeout'],
 					new Client()
 				);
 
-				$mapperInstance = ($config['manifest']['mapper'] === NULL)
-					? NULL
-					: new $config['manifest']['mapper']();
+				$mapperInstance = new $config['manifest']['mapper']();
 
 				$directoryProviderInstance = new BuildDirectoryProvider($config['build']['directory'], $devServerInstance);
 				$loaderInstance = new ManifestLoader($directoryProviderInstance, $mapperInstance);

src/Manifest/IdentityMapper.php

@@ -25,10 +25,10 @@ class ManifestLoader
 	private $manifestMapper;
 
 
-	public function __construct(BuildDirectoryProvider $directoryProvider, ?ManifestMapper $manifestMapper = null)
+	public function __construct(BuildDirectoryProvider $directoryProvider, ManifestMapper $manifestMapper)
 	{
 		$this->directoryProvider = $directoryProvider;
-		$this->manifestMapper = $manifestMapper ?? new IdentityMapper();
+		$this->manifestMapper = $manifestMapper;
 	}
 
 

src/Manifest/ManifestLoader.php

@@ -4,14 +4,16 @@
 
 namespace Oops\WebpackNetteAdapter\Manifest;
 
-interface ManifestMapper
+abstract class ManifestMapper
 {
-	public function __construct();
+	final public function __construct()
+	{
+	}
 
 	/**
 	 * Modifies manifest contents
 	 * @param array<mixed> $manifest
 	 * @return array<string, string>
 	 */
-	public function map(array $manifest) : array;
-}
+	abstract public function map(array $manifest) : array;
+}

src/Manifest/ManifestMapper.php

@@ -2,7 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Oops\WebpackNetteAdapter\Manifest;
+namespace Oops\WebpackNetteAdapter\Manifest\Mapper;
+
+use Oops\WebpackNetteAdapter\Manifest\ManifestMapper;
+
 
 /**
  * Maps from https://github.com/ztoben/assets-webpack-plugin format to flat files
@@ -20,12 +23,8 @@
  * }
  *
  */
-class AssetsWebpackPluginMapper implements ManifestMapper
+class AssetsWebpackPluginMapper extends ManifestMapper
 {
-	public function __construct()
-	{
-	}
-
 	/**
 	 * @inheritDoc
 	 */
@@ -39,4 +38,4 @@ public function map(array $manifest): array
 		}
 		return $result;
 	}
-}
+}

…c/Manifest/AssetsWebpackPluginMapper.php …est/Mapper/AssetsWebpackPluginMapper.phpsrc/Manifest/AssetsWebpackPluginMapper.php renamed to src/Manifest/Mapper/AssetsWebpackPluginMapper.php src/Manifest/AssetsWebpackPluginMapper.php renamed to src/Manifest/Mapper/AssetsWebpackPluginMapper.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Oops\WebpackNetteAdapter\Manifest\Mapper;
+
+use Oops\WebpackNetteAdapter\Manifest\ManifestMapper;
+
+/**
+ * Default identity mapper compatible with webpack-manifest-mapper's flat structure.
+ */
+class WebpackManifestPluginMapper extends ManifestMapper
+{
+	public function map(array $manifest): array
+	{
+		return $manifest;
+	}
+}

src/Manifest/Mapper/WebpackManifestPluginMapper.php

@@ -10,4 +10,4 @@ webpack:
 	manifest:
 		name: manifest.json
 		optimize: false
-		mapper: Oops\WebpackNetteAdapter\Manifest\AssetsWebpackPluginMapper
+		mapper: Oops\WebpackNetteAdapter\Manifest\Mapper\AssetsWebpackPluginMapper

tests/WebpackNetteAdapter/DI/config/manifestWithMapper.neon

@@ -7,6 +7,7 @@ namespace OopsTests\WebpackNetteAdapter\Manifest;
 use Oops\WebpackNetteAdapter\BuildDirectoryProvider;
 use Oops\WebpackNetteAdapter\Manifest\CannotLoadManifestException;
 use Oops\WebpackNetteAdapter\Manifest\ManifestLoader;
+use Oops\WebpackNetteAdapter\Manifest\ManifestMapper;
 use Tester\Assert;
 use Tester\TestCase;
 
@@ -24,10 +25,16 @@ class ManifestLoaderTest extends TestCase
 	{
 		$buildDirProvider = \Mockery::mock(BuildDirectoryProvider::class);
 		$buildDirProvider->shouldReceive('getBuildDirectory')->andReturn(__DIR__);
-		$manifestLoader = new ManifestLoader($buildDirProvider);
+
+		$manifestMapper = \Mockery::mock(ManifestMapper::class);
+		$manifestMapper->shouldReceive('map')
+			->with(['asset.js' => 'resolved.asset.js'])
+			->andReturn(['asset.js' => 'mapped.asset.js']);
+
+		$manifestLoader = new ManifestLoader($buildDirProvider, $manifestMapper);
 
 		Assert::same(__DIR__ . '/manifest.json', $manifestLoader->getManifestPath('manifest.json'));
-		Assert::same(['asset.js' => 'resolved.asset.js'], $manifestLoader->loadManifest('manifest.json'));
+		Assert::same(['asset.js' => 'mapped.asset.js'], $manifestLoader->loadManifest('manifest.json'));
 
 		Assert::throws(function () use ($manifestLoader) {
 			$manifestLoader->loadManifest('unknown.js');