wip

Author: brendt

src/Tempest/View/src/Components/Icon.php

@@ -15,10 +15,16 @@
 use Tempest\View\Elements\ViewComponentElement;
 use Tempest\View\IconConfig;
 use Tempest\View\ViewComponent;
-use function Tempest\get;
 
 final readonly class Icon implements ViewComponent
 {
+    public function __construct(
+        private AppConfig $appConfig,
+        private IconCache $iconCache,
+        private IconConfig $iconConfig,
+        private HttpClient $http,
+    ) {}
+
     public static function getName(): string
     {
         return 'x-icon';
@@ -30,7 +36,7 @@ public function compile(ViewComponentElement $element): string
         $class = $element->getAttribute('class');
 
         return sprintf(
-            '<?= %s::render(%s, \'%s\') ?>',
+            '<?= \Tempest\get(%s::class)->render(%s, \'%s\') ?>',
             self::class,
             // Having to replace `<?=` is a bit of a hack and should be improved
             str_replace(['<?=', '?>'], '', $name),
@@ -45,14 +51,12 @@ public function compile(ViewComponentElement $element): string
      * in the cache, it will download it on the fly and cache it for future
      * use. If the icon is already in the cache, it will be served from there.
      */
-    public static function render(string $name, ?string $class): ?string
+    public function render(string $name, ?string $class): ?string
     {
         $svg = self::svg($name);
-        // We can't use injection because we don't have an instance of this view component at runtime. Might be worth refactoring, though.
-        $appConfig = get(AppConfig::class);
 
         if (! $svg) {
-            return $appConfig->environment->isLocal()
+            return $this->appConfig->environment->isLocal()
                 ? ('<!-- unknown-icon: ' . $name . ' -->')
                 : '';
         }
@@ -64,10 +68,8 @@ public static function render(string $name, ?string $class): ?string
         return $svg;
     }
 
-    private static function svg(string $name): ?string
+    private function svg(string $name): ?string
     {
-        $iconCache = get(IconCache::class);
-
         try {
             $parts = explode(':', $name, 2);
 
@@ -77,12 +79,12 @@ private static function svg(string $name): ?string
 
             [$prefix, $name] = $parts;
 
-            return $iconCache->resolve(
+            return $this->iconCache->resolve(
                 key: "iconify-{$prefix}-{$name}",
                 cache: fn () => self::download($prefix, $name),
-                expiresAt: $iconCache->cacheDuration
+                expiresAt: $this->iconConfig->cacheDuration
                     ? new DateTimeImmutable()
-                        ->add(DateInterval::createFromDateString("{$iconCache->cacheDuration} seconds"))
+                        ->add(DateInterval::createFromDateString("{$this->iconConfig->cacheDuration} seconds"))
                     : null,
             );
         } catch (Exception) {
@@ -93,18 +95,15 @@ private static function svg(string $name): ?string
     /**
      * Downloads the icon's SVG file from the Iconify API
      */
-    private static function download(string $prefix, string $name): ?string
+    private function download(string $prefix, string $name): ?string
     {
-        $iconConfig = get(IconConfig::class);
-        $http = get(HttpClient::class);
-
         try {
-            $url = new ImmutableString($iconConfig->iconifyApiUrl)
+            $url = new ImmutableString($this->iconConfig->iconifyApiUrl)
                 ->finish('/')
                 ->append("{$prefix}/{$name}.svg")
                 ->toString();
 
-            $response = $http->get($url);
+            $response = $this->http->get($url);
 
             if ($response->status !== Status::OK) {
                 return null;
@@ -119,7 +118,7 @@ private static function download(string $prefix, string $name): ?string
     /**
      * Forwards the user-provided class attribute to the SVG element
      */
-    private static function injectClass(string $svg, string $class): string
+    private function injectClass(string $svg, string $class): string
     {
         return new ImmutableString($svg)
             ->replace(

src/Tempest/View/src/Parser/TempestViewCompiler.php

@@ -48,7 +48,7 @@ public function compile(string|View $view): string
 
         // 5. Compile to PHP
         $compiled = $this->compileElements($elements);
-lw($compiled);
+
         return $compiled;
     }