[AssetMapper] Fix wiring resolvers, send requests in parallel and use readonly properties in MappedAsset

Author: nicolas-grekas

DependencyInjection/Compiler/UnusedTagsPass.php

@@ -25,6 +25,7 @@ class UnusedTagsPass implements CompilerPassInterface
         'annotations.cached_reader',
         'assets.package',
         'asset_mapper.compiler',
+        'asset_mapper.importmap.resolver',
         'auto_alias',
         'cache.pool',
         'cache.pool.clearer',

DependencyInjection/Configuration.php

@@ -902,7 +902,7 @@ private function addAssetMapperSection(ArrayNodeDefinition $rootNode, callable $
                             ->defaultValue('%kernel.project_dir%/assets/vendor')
                         ->end()
                         ->scalarNode('provider')
-                            ->info('The provider (CDN) to use'.class_exists(ImportMapManager::class) ? sprintf(' (e.g.: "%s").', implode('", "', ImportMapManager::PROVIDERS)) : '.')
+                            ->info('The provider (CDN) to use'.(class_exists(ImportMapManager::class) ? sprintf(' (e.g.: "%s").', implode('", "', ImportMapManager::PROVIDERS)) : '.'))
                             ->defaultValue('jsdelivr.esm')
                         ->end()
                     ->end()

DependencyInjection/FrameworkExtension.php

@@ -34,6 +34,7 @@
 use Symfony\Component\AssetMapper\AssetMapper;
 use Symfony\Component\AssetMapper\Compiler\AssetCompilerInterface;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
+use Symfony\Component\AssetMapper\ImportMap\Resolver\PackageResolverInterface;
 use Symfony\Component\BrowserKit\AbstractBrowser;
 use Symfony\Component\Cache\Adapter\AdapterInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
@@ -1316,14 +1317,8 @@ private function registerAssetMapperConfiguration(array $config, ContainerBuilde
             ->replaceArgument(3, $config['vendor_dir'])
         ;
 
-        $importMapProviderId = 'asset_mapper.importmap.provider.jspm_provider';
-        if (ImportMapManager::PROVIDER_JSDELIVR_ESM === $config['provider']) {
-            $importMapProviderId = 'asset_mapper.importmap.provider.js_delivr_esm_provider';
-        }
-        $container->setAlias('asset_mapper.importmap.provider', new Alias($importMapProviderId));
-
         $container
-            ->getDefinition('asset_mapper.importmap.provider.jspm_provider')
+            ->getDefinition('asset_mapper.importmap.resolver')
             ->replaceArgument(0, $config['provider'])
         ;
 
@@ -1332,6 +1327,9 @@ private function registerAssetMapperConfiguration(array $config, ContainerBuilde
             ->replaceArgument(2, $config['importmap_polyfill'] ?? ImportMapManager::POLYFILL_URL)
             ->replaceArgument(3, $config['importmap_script_attributes'])
         ;
+
+        $container->registerForAutoconfiguration(PackageResolverInterface::class)
+            ->addTag('asset_mapper.importmap.resolver');
     }
 
     /**

Resources/config/asset_mapper.php

@@ -29,8 +29,9 @@
 use Symfony\Component\AssetMapper\Factory\MappedAssetFactory;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapManager;
 use Symfony\Component\AssetMapper\ImportMap\ImportMapRenderer;
-use Symfony\Component\AssetMapper\ImportMap\Providers\JsDelivrEsmImportMapProvider;
-use Symfony\Component\AssetMapper\ImportMap\Providers\JspmImportMapProvider;
+use Symfony\Component\AssetMapper\ImportMap\Resolver\JsDelivrEsmResolver;
+use Symfony\Component\AssetMapper\ImportMap\Resolver\JspmResolver;
+use Symfony\Component\AssetMapper\ImportMap\Resolver\PackageResolver;
 use Symfony\Component\AssetMapper\MapperAwareAssetPackage;
 use Symfony\Component\AssetMapper\Path\PublicAssetsPathResolver;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
@@ -138,17 +139,39 @@
                 service('asset_mapper.public_assets_path_resolver'),
                 abstract_arg('importmap.php path'),
                 abstract_arg('vendor directory'),
-                // dynamic alias to the chosen provider
-                service('asset_mapper.importmap.provider'),
+                service('asset_mapper.importmap.resolver'),
             ])
         ->alias(ImportMapManager::class, 'asset_mapper.importmap.manager')
 
-        ->set('asset_mapper.importmap.provider.jspm_provider', JspmImportMapProvider::class)
+        ->set('asset_mapper.importmap.resolver', PackageResolver::class)
             ->args([
                 abstract_arg('provider'),
+                tagged_locator('asset_mapper.importmap.resolver'),
             ])
 
-        ->set('asset_mapper.importmap.provider.js_delivr_esm_provider', JsDelivrEsmImportMapProvider::class)
+        ->set('asset_mapper.importmap.resolver.jsdelivr_esm', JsDelivrEsmResolver::class)
+            ->args([service('http_client')])
+            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_JSDELIVR_ESM])
+
+        ->set('asset_mapper.importmap.resolver.jspm', JspmResolver::class)
+            ->args([service('http_client'), ImportMapManager::PROVIDER_JSPM])
+            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_JSPM])
+
+        ->set('asset_mapper.importmap.resolver.jspm_system', JspmResolver::class)
+            ->args([service('http_client'), ImportMapManager::PROVIDER_JSPM_SYSTEM])
+            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_JSPM_SYSTEM])
+
+        ->set('asset_mapper.importmap.resolver.skypack', JspmResolver::class)
+            ->args([service('http_client'), ImportMapManager::PROVIDER_SKYPACK])
+            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_SKYPACK])
+
+        ->set('asset_mapper.importmap.resolver.jsdelivr', JspmResolver::class)
+            ->args([service('http_client'), ImportMapManager::PROVIDER_JSDELIVR])
+            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_JSDELIVR])
+
+        ->set('asset_mapper.importmap.resolver.unpkg', JspmResolver::class)
+            ->args([service('http_client'), ImportMapManager::PROVIDER_UNPKG])
+            ->tag('asset_mapper.importmap.resolver', ['resolver' => ImportMapManager::PROVIDER_UNPKG])
 
         ->set('asset_mapper.importmap.renderer', ImportMapRenderer::class)
             ->args([