Custom action support

Author: DRaichev

src/Turbo/src/Helper/TurboStream.php

@@ -61,15 +61,15 @@ public static function remove(string $target): string
      */
     public static function before(string $target, string $html): string
     {
-        return self::wrap('before', $target, $html);
+        return self::custom('before', $target, $html);
     }
 
     /**
      * Inserts after the element(s) designated by the target CSS selector.
      */
     public static function after(string $target, string $html): string
     {
-        return self::wrap('after', $target, $html);
+        return self::custom('after', $target, $html);
     }
 
     /**
@@ -86,12 +86,45 @@ public static function refresh(?string $requestId = null): string
         return \sprintf('<turbo-stream action="refresh" request-id="%s"></turbo-stream>', htmlspecialchars($requestId));
     }
 
+    /**
+     * Custom action and attributes.
+     * When passing attributes use null value to for boolean attributes (e.g. disabled).
+     *
+     * @param array<string, string|int|float|null> $attr
+     */
+    public static function custom(string $action, string $target, string $html, array $attr = []): string
+    {
+        if (\array_key_exists('action', $attr) || \array_key_exists('targets', $attr)) {
+            throw new \InvalidArgumentException('The "action" and "targets" attributes are reserved and cannot be used.');
+        }
+
+        $attrString = '';
+        foreach ($attr as $key => $value) {
+            $key = htmlspecialchars($key);
+            if (null === $value) {
+                $attrString .= \sprintf(' %s', $key);
+            } elseif (\is_int($value) || \is_float($value)) {
+                $attrString .= \sprintf(' %s="%s"', $key, $value);
+            } else {
+                $attrString .= \sprintf(' %s="%s"', $key, htmlspecialchars($value));
+            }
+        }
+
+        return self::wrap(htmlspecialchars($action), $target, $html, $attrString);
+    }
+
     private static function wrap(string $action, string $target, string $html, string $attr = ''): string
     {
-        return \sprintf(<<<EOHTML
+        return \sprintf(
+            <<<EOHTML
             <turbo-stream action="%s" targets="%s"%s>
                 <template>%s</template>
             </turbo-stream>
-            EOHTML, $action, htmlspecialchars($target), $attr, $html);
+            EOHTML,
+            $action,
+            htmlspecialchars($target),
+            $attr,
+            $html
+        );
     }
 }

src/Turbo/src/TurboStreamResponse.php

@@ -104,4 +104,16 @@ public function refresh(?string $requestId = null): static
 
         return $this;
     }
+
+    /**
+     * @param array<string, string|int|float|null> $attr
+     *
+     * @return $this
+     */
+    public function action(string $action, string $target, string $html, array $attr = []): static
+    {
+        $this->setContent($this->getContent().TurboStream::custom($action, $target, $html, $attr));
+
+        return $this;
+    }
 }

src/Turbo/tests/Helper/TurboStreamTest.php

@@ -11,6 +11,8 @@
 
 namespace Symfony\UX\Turbo\Tests\Helper;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\TestCase;
 use Symfony\UX\Turbo\Helper\TurboStream;
 
@@ -76,4 +78,32 @@ public function testRefreshWithId(): void
             TurboStream::refresh('a"b')
         );
     }
+
+    public function testCustom(): void
+    {
+        $this->assertSame(<<<EOHTML
+            <turbo-stream action="customAction" targets="some[&quot;selector&quot;]" someAttr="someValue" boolAttr intAttr="0" floatAttr="3.14">
+                <template><div>content</div></template>
+            </turbo-stream>
+            EOHTML,
+            TurboStream::custom('customAction', 'some["selector"]', '<div>content</div>', ['someAttr' => 'someValue', 'boolAttr' => null, 'intAttr' => 0, 'floatAttr' => 3.14])
+        );
+    }
+
+    /**
+     * @dataProvider customThrowsExceptionDataProvider
+     *
+     * @param array<string, string|int|null> $attr
+     */
+    public function testCustomThrowsException(string $action, string $target, string $html, array $attr): void
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        TurboStream::custom($action, $target, $html, $attr);
+    }
+
+    public static function customThrowsExceptionDataProvider(): \Generator
+    {
+        yield ['customAction', 'some["selector"]', '<div>content</div>', ['action' => 'someAction']];
+        yield ['customAction', 'some["selector"]', '<div>content</div>', ['targets' => 'someTargets']];
+    }
 }