Improve type support and detection

Author: nyamsprod

CHANGELOG.md

@@ -6,11 +6,12 @@ All Notable changes to `bakame/http-strucured-fields` will be documented in this
 
 ### Added
 
-- None
+- Support for the `DisplayString` type
 
 ### Fixed
 
 - Tests file moved under the `/tests` directory
+- Fix `Type::tryFromValue` to correctly detect string type derivative.
 
 ### Deprecated
 

src/ByteSequence.php

@@ -6,6 +6,7 @@
 
 use Stringable;
 
+use Throwable;
 use function base64_decode;
 use function base64_encode;
 use function preg_match;
@@ -38,6 +39,15 @@ public static function fromEncoded(Stringable|string $encodedValue): self
         return new self($decoded);
     }
 
+    public static function tryFromEncoded(Stringable|string $encodedValue): ?self
+    {
+        try {
+            return self::fromEncoded($encodedValue);
+        } catch (Throwable) {
+            return null;
+        }
+    }
+
     /**
      * Returns a new instance from a raw decoded string.
      */

src/Type.php

@@ -5,6 +5,7 @@
 namespace Bakame\Http\StructuredFields;
 
 use DateTimeInterface;
+use Throwable;
 
 /**
  * @see https://www.rfc-editor.org/rfc/rfc8941.html#section-3.3
@@ -47,7 +48,12 @@ public static function tryFromValue(mixed $value): self|null
             is_int($value) => Type::Integer,
             is_float($value) => Type::Decimal,
             is_bool($value) => Type::Boolean,
-            is_string($value) => 1 === preg_match('/[^\x20-\x7f]/', $value) ? Type::DisplayString : Type::String,
+            is_string($value) => match (true) {
+               1 === preg_match('/[^\x20-\x7f]/', $value) => Type::DisplayString,
+               1 === preg_match("/^([a-z*][a-z\d:\/!#\$%&'*+\-.^_`|~]*)$/i", $value) => Type::Token,
+               null !== ByteSequence::tryFromEncoded($value) => Type::ByteSequence,
+               default => Type::String,
+            },
             default => null,
         };
     }