[Icons] Ensure prefix exists before fetching icons from iconify

Author: kbond

src/Icons/config/iconify.php

@@ -25,6 +25,7 @@
 
         ->set('.ux_icons.iconify', Iconify::class)
             ->args([
+                service('cache.system'),
                 abstract_arg('endpoint'),
                 service('http_client')->nullOnInvalid(),
             ])

src/Icons/src/DependencyInjection/UXIconsExtension.php

@@ -91,7 +91,7 @@ protected function loadInternal(array $mergedConfig, ContainerBuilder $container
             $loader->load('iconify.php');
 
             $container->getDefinition('.ux_icons.iconify')
-                ->setArgument(0, $mergedConfig['iconify']['endpoint'])
+                ->setArgument(1, $mergedConfig['iconify']['endpoint'])
             ;
         }
 

src/Icons/src/Iconify.php

@@ -14,6 +14,7 @@
 use Symfony\Component\HttpClient\Exception\JsonException;
 use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Component\HttpClient\ScopingHttpClient;
+use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\UX\Icons\Exception\IconNotFoundException;
 use Symfony\UX\Icons\Svg\Icon;
@@ -26,8 +27,10 @@
 final class Iconify
 {
     private HttpClientInterface $http;
+    private \ArrayObject $sets;
 
     public function __construct(
+        private CacheInterface $cache,
         string $endpoint = 'https://api.iconify.design',
         ?HttpClientInterface $http = null,
     ) {
@@ -40,13 +43,15 @@ public function __construct(
 
     public function metadataFor(string $prefix): array
     {
-        $response = $this->http->request('GET', sprintf('/collections?prefix=%s', $prefix));
-
-        return $response->toArray()[$prefix] ?? throw new \RuntimeException(sprintf('The icon prefix "%s" does not exist on iconify.design.', $prefix));
+        return $this->sets()[$prefix] ?? throw new \RuntimeException(sprintf('The icon prefix "%s" does not exist on iconify.design.', $prefix));
     }
 
     public function fetchIcon(string $prefix, string $name): Icon
     {
+        if (!isset($this->sets()[$prefix])) {
+            throw new IconNotFoundException(sprintf('The icon "%s:%s" does not exist on iconify.design.', $prefix, $name));
+        }
+
         $response = $this->http->request('GET', sprintf('/%s.json?icons=%s', $prefix, $name));
 
         try {
@@ -66,6 +71,10 @@ public function fetchIcon(string $prefix, string $name): Icon
 
     public function fetchSvg(string $prefix, string $name): string
     {
+        if (!isset($this->sets()[$prefix])) {
+            throw new IconNotFoundException(sprintf('The icon "%s:%s" does not exist on iconify.design.', $prefix, $name));
+        }
+
         $content = $this->http
             ->request('GET', sprintf('/%s/%s.svg', $prefix, $name))
             ->getContent()
@@ -77,4 +86,13 @@ public function fetchSvg(string $prefix, string $name): string
 
         return $content;
     }
+
+    private function sets(): \ArrayObject
+    {
+        return $this->sets ??= $this->cache->get('ux-iconify-sets', function () {
+            $response = $this->http->request('GET', '/collections');
+
+            return new \ArrayObject($response->toArray());
+        });
+    }
 }