fix(view)!: properly handle scoped view-components (#1435)

Author: brendt

packages/http/src/Session/CsrfTokenComponent.php

@@ -83,6 +83,17 @@ public function get(string $key, mixed $default = null): mixed
         return $value;
     }
 
+    /** @return \Tempest\Validation\Rule[] */
+    public function getErrorsFor(string $name): array
+    {
+        return $this->get(self::VALIDATION_ERRORS)[$name] ?? [];
+    }
+
+    public function getOriginalValueFor(string $name, mixed $default = ''): mixed
+    {
+        return $this->get(self::ORIGINAL_VALUES)[$name] ?? $default;
+    }
+
     public function getPreviousUrl(): string
     {
         return $this->get(self::PREVIOUS_URL, default: '');

packages/http/src/Session/Session.php

@@ -0,0 +1,11 @@
+<?php
+
+use Tempest\Http\Session\Session;
+
+use function Tempest\Http\csrf_token;
+
+$name = Session::CSRF_TOKEN_KEY;
+$value = csrf_token();
+?>
+
+<input type="hidden" :name="$name" :value="$value">

packages/http/src/Session/x-csrf-token.view.php

@@ -7,7 +7,6 @@
 use Tempest\Http\HttpRequestFailed;
 use Tempest\Http\Status;
 use Tempest\HttpClient\HttpClient;
-use Tempest\Icon\IconCache;
 use Tempest\Support\Str;
 use Tempest\Support\Str\ImmutableString;
 

packages/icon/src/Icon.php

@@ -12,7 +12,8 @@
         "tempest/support": "dev-main"
     },
     "suggest": {
-        "tempest/datetime": "In order to use the `datetime` function"
+        "tempest/datetime": "In order to use the `datetime` function",
+        "tempest/icon": "In order to use the `icon` function"
     },
     "autoload": {
         "files": [

packages/intl/composer.json

@@ -3,10 +3,9 @@
 namespace Tempest\Intl\MessageFormat\Markup;
 
 use Tempest\Container\Container;
+use Tempest\Icon\Icon;
 use Tempest\Intl\MessageFormat\StandaloneMarkupFormatter;
-use Tempest\Support\Arr;
 use Tempest\Support\Str;
-use Tempest\View\Components\Icon;
 
 final readonly class IconMarkupFormatter implements StandaloneMarkupFormatter
 {
@@ -22,12 +21,11 @@ public function supportsTag(string $tag): bool
     public function format(string $tag, array $options): string
     {
         if (! class_exists(Icon::class)) {
-            throw new \RuntimeException('The `tempest\view` package is required to use the `icon` tag inside a translation string.');
+            throw new \RuntimeException('The `tempest\icon` package is required to use the `icon` tag inside a translation string.');
         }
 
-        return $this->container->get(Icon::class)->render(
-            name: Str\after_first($tag, 'icon-'),
-            class: Arr\get_by_key($options, 'class'),
-        );
+        $icon = Str\after_first($tag, 'icon-');
+
+        return $this->container->get(Icon::class)->render($icon);
     }
 }

packages/intl/src/MessageFormat/Markup/IconMarkupFormatter.php

@@ -6,5 +6,5 @@
 
 interface Attribute
 {
-    public function apply(Element $element): ?Element;
+    public function apply(Element $element): Element;
 }

packages/view/src/Attribute.php

@@ -28,21 +28,10 @@ public function apply(Element $element): Element
 
         $element->setAttribute($this->name, $value);
 
-        // Data attributes should only be parsed for view components
-        if ($element->unwrap(ViewComponentElement::class) === null) {
-            return $element;
-        }
-
-        $value = $element->getAttribute($this->name);
-
-        if (str($value)->startsWith(TempestViewCompiler::PHP_TOKENS)) {
+        if ($element->unwrap(ViewComponentElement::class) && str($value)->startsWith(TempestViewCompiler::PHP_TOKENS)) {
             throw new DataAttributeWasInvalid($this->name, $value);
         }
 
-        return new PhpDataElement(
-            name: $this->name,
-            value: $element->getAttribute($this->name),
-            wrappingElement: $element,
-        );
+        return $element;
     }
 }

packages/view/src/Attributes/DataAttribute.php

@@ -8,10 +8,11 @@
 use Tempest\View\Element;
 use Tempest\View\Elements\PhpIfElement;
 use Tempest\View\Exceptions\ElementWasInvalid;
+use Tempest\View\ShouldBeRemoved;
 
-final readonly class ElseAttribute implements Attribute
+final readonly class ElseAttribute implements Attribute, ShouldBeRemoved
 {
-    public function apply(Element $element): ?Element
+    public function apply(Element $element): Element
     {
         $previous = $element->getPrevious()?->unwrap(PhpIfElement::class);
 
@@ -21,6 +22,6 @@ public function apply(Element $element): ?Element
 
         $previous->setElse($element);
 
-        return null;
+        return $element;
     }
 }

packages/view/src/Attributes/ElseAttribute.php

@@ -10,10 +10,11 @@
 use Tempest\View\Element;
 use Tempest\View\Elements\PhpIfElement;
 use Tempest\View\Exceptions\ElementWasInvalid;
+use Tempest\View\ShouldBeRemoved;
 
-final readonly class ElseIfAttribute implements Attribute
+final readonly class ElseIfAttribute implements Attribute, ShouldBeRemoved
 {
-    public function apply(Element $element): ?Element
+    public function apply(Element $element): Element
     {
         $previous = $element->getPrevious()?->unwrap(PhpIfElement::class);
 
@@ -23,6 +24,6 @@ public function apply(Element $element): ?Element
 
         $previous->addElseif($element);
 
-        return null;
+        return $element;
     }
 }