wip support wildcards

Author: NeoIsRecursive

packages/http/src/IsRequest.php

@@ -10,6 +10,7 @@
 use Tempest\Validation\SkipValidation;
 
 use function Tempest\get;
+use function Tempest\Support\Arr\every;
 use function Tempest\Support\Arr\get_by_key;
 use function Tempest\Support\Arr\has_key;
 use function Tempest\Support\str;
@@ -137,24 +138,46 @@ public function hasQuery(string $key): bool
         return has_key($this->query, $key);
     }
 
-    public function accepts(ContentType $contentType): bool
+    public function accepts(ContentType ...$contentTypes): bool
     {
-        $header = $this->headers->get(name: 'accept');
+        $header = $this->headers->get(name: 'accept') ?? '';
 
-        if ($header === null) {
-            return true;
+        /** @var array{mediaType:string,subType:string} */
+        $mediaTypes = [];
+
+        foreach (str($header)->explode(separator: ',') as $acceptedType) {
+            $acceptedType = str($acceptedType)->trim();
+
+            if ($acceptedType->isEmpty()) {
+                continue;
+            }
+
+            $mediaTypes[] = [
+                'mediaType' => $acceptedType->before('/')->toString(),
+                'subType' => $acceptedType->afterFirst('/')->toString(),
+            ];
         }
 
-        $accepts = str($header)
-            ->explode(separator: ',')
-            ->map(static fn (string $item) => trim($item))
-            ->filter(static fn (string $item) => $item !== '');
+        /** @var array<string, bool> */
+        $supported = [];
 
-        if ($accepts->isEmpty() || $accepts->contains(search: '*/*')) {
-            return true;
+        foreach ($contentTypes as $contentType) {
+            [$mediaType, $subType] = explode('/', $contentType->value);
+
+            foreach ($mediaTypes as $acceptedType) {
+                if (
+                    ($acceptedType['mediaType'] === '*' || $acceptedType['mediaType'] === $mediaType)
+                    && ($acceptedType['subType'] === '*' || $acceptedType['subType'] === $subType)
+                ) {
+                    $supported[$contentType->value] = true;
+                    break;
+                }
+
+                $supported[$contentType->value] = false;
+            }
         }
 
-        return $accepts->contains(search: $contentType->value);
+        return every($supported, static fn (bool $isSupported) => $isSupported);
     }
 
     public function withMethod(Method $method): self

packages/http/src/Request.php

@@ -58,5 +58,10 @@ public function getSessionValue(string $name): mixed;
 
     public function getCookie(string $name): ?Cookie;
 
-    public function accepts(ContentType $contentType): bool;
+    /**
+     * Determines if the request's "Content-Type" header matches the given content type.
+     *
+     * If multiple content types are provided, the method returns true if all are matched.
+     */
+    public function accepts(ContentType ...$contentType): bool;
 }

packages/http/tests/GenericRequestTest.php

@@ -90,6 +90,21 @@ public function test_accepts_with_no_accept_header(): void
         $this->assertTrue($request->accepts(ContentType::XML));
     }
 
+    public function test_accepts_with_empty_accept_header(): void
+    {
+        $request = new GenericRequest(
+            method: Method::GET,
+            uri: '/',
+            headers: [
+                'Accept' => '',
+            ],
+        );
+
+        $this->assertTrue($request->accepts(ContentType::JSON));
+        $this->assertTrue($request->accepts(ContentType::HTML));
+        $this->assertTrue($request->accepts(ContentType::XML));
+    }
+
     public function test_accepts_with_wildcard(): void
     {
         $request = new GenericRequest(
@@ -119,4 +134,35 @@ public function test_accepts_with_multiple_values(): void
         $this->assertTrue($request->accepts(ContentType::HTML));
         $this->assertFalse($request->accepts(ContentType::XML));
     }
+
+    public function test_accepts_with_wildcard_subtype(): void
+    {
+        $request = new GenericRequest(
+            method: Method::GET,
+            uri: '/',
+            headers: [
+                'Accept' => 'application/*',
+            ],
+        );
+
+        $this->assertTrue($request->accepts(ContentType::JSON));
+        $this->assertFalse($request->accepts(ContentType::HTML));
+        $this->assertTrue($request->accepts(ContentType::XML));
+    }
+
+    public function test_accepts_evaluates_all_content_types(): void
+    {
+        $request = new GenericRequest(
+            method: Method::GET,
+            uri: '/',
+            headers: [
+                'Accept' => 'application/*, image/avif',
+            ],
+        );
+
+        $this->assertFalse($request->accepts(ContentType::JSON, ContentType::HTML));
+        $this->assertTrue($request->accepts(ContentType::JSON, ContentType::XML));
+        $this->assertTrue($request->accepts(ContentType::JSON, ContentType::AVIF));
+        $this->assertFalse($request->accepts(ContentType::AVIF, ContentType::PNG));
+    }
 }