Simplify Value validation

Author: nyamsprod

src/Item.php

@@ -124,22 +124,26 @@ public static function fromPair(array $pair): self
      */
     public static function new(mixed $value): self
     {
+        if ($value instanceof Item) {
+            return new self(new Value($value->value()), $value->parameters());
+        }
+
         if (is_array($value)) {
             return self::fromPair($value);
         }
 
-        return self::fromValue(new Value($value));
+        return self::fromValue(new Value($value)); /* @phpstan-ignore-line */
     }
 
     /**
      * Returns a new bare instance from value or null on error.
      *
-     * @param SfItemInput|array{0:SfItemInput, 1:Parameters|iterable<array{0:string, 1:SfItemInput}>} $value
+     * @param SfTypeInput|Item|array{0:SfTypeInput, 1:Parameters|iterable<array{0:string, 1:SfTypeInput}>} $value
      */
-    public static function tryNew(mixed $value): ?self
+    public static function tryNew(StructuredFieldProvider|Item|DateTimeInterface|Bytes|DisplayString|Token|array|int|float|string|bool  $value): ?self
     {
         try {
-            return self::fromValue(new Value($value));
+            return self::new($value);
         } catch (SyntaxError) {
             return null;
         }

src/Value.php

@@ -11,13 +11,10 @@
 use Stringable;
 use Throwable;
 
-use function abs;
 use function date_default_timezone_get;
-use function floor;
 use function is_float;
 use function is_int;
 use function json_encode;
-use function preg_match;
 use function preg_replace;
 use function round;
 
@@ -34,9 +31,9 @@ final class Value
     public readonly Type $type;
 
     /**
-     * @throws InvalidArgument
+     * @throws SyntaxError
      */
-    public function __construct(mixed $value)
+    public function __construct(Item|Token|Bytes|DisplayString|DateTimeInterface|int|float|string|bool $value)
     {
         [$this->value, $this->type] = match (true) {
             $value instanceof Item => [$value->value(), $value->type()],
@@ -46,49 +43,7 @@ public function __construct(mixed $value)
             false === $value,
             $value => [$value, Type::Boolean],
             $value instanceof DateTimeInterface => [self::filterDate($value), Type::Date],
-            is_int($value) => [self::filterIntegerRange($value, 'Integer'), Type::Integer],
-            is_float($value) => [self::filterDecimal($value), Type::Decimal],
-            is_string($value) => [self::filterString($value), Type::String],
-            default => throw new InvalidArgument('Unknown or unsupported type.')
-        };
-    }
-
-    /**
-     * Filter a decimal according to RFC8941.
-     *
-     * @see https://www.rfc-editor.org/rfc/rfc9651.html#section-3.3.1
-     */
-    private static function filterIntegerRange(int $value, string $type): int
-    {
-        return match (true) {
-            Type::MAXIMUM_INT < abs($value) => throw new SyntaxError($type.' are limited to 15 digits.'),
-            default => $value,
-        };
-    }
-
-    /**
-     * Filter a decimal according to RFC8941.
-     *
-     * @see https://www.rfc-editor.org/rfc/rfc9651.html#section-3.3.2
-     */
-    private static function filterDecimal(float $value): float
-    {
-        return match (true) {
-            Type::MAXIMUM_FLOAT < abs(floor($value)) => throw new SyntaxError('The integer portion of decimals is limited to 12 digits.'),
-            default => $value,
-        };
-    }
-
-    /**
-     * Filter a decimal according to RFC8941.
-     *
-     * @see https://www.rfc-editor.org/rfc/rfc9651.html#section-3.3.3
-     */
-    private static function filterString(string $value): string
-    {
-        return match (true) {
-            1 === preg_match('/[^\x20-\x7E]/i', $value) => throw new SyntaxError('The string contains invalid characters.'),
-            default => $value,
+            default => [$value, Type::fromVariable($value)],
         };
     }
 
@@ -99,9 +54,11 @@ private static function filterString(string $value): string
      */
     private static function filterDate(DateTimeInterface $value): DateTimeImmutable
     {
-        self::filterIntegerRange($value->getTimestamp(), 'Date timestamp');
-
-        return $value instanceof DateTimeImmutable ? $value : DateTimeImmutable::createFromInterface($value);
+        return match (true) {
+            !Type::Integer->supports($value->getTimestamp()) => throw new SyntaxError('Date timestamp are limited to 15 digits.'),
+            !$value instanceof DateTimeImmutable => DateTimeImmutable::createFromInterface($value),
+            default => $value,
+        };
     }
 
     /**

tests/ParametersTest.php

@@ -7,6 +7,7 @@
 use LogicException;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
+use TypeError;
 
 final class ParametersTest extends StructuredFieldTestCase
 {
@@ -363,7 +364,7 @@ public function it_can_delete_a_member_via_array_access(): void
     #[Test]
     public function it_throws_if_the_structured_field_is_not_supported(): void
     {
-        $this->expectException(InvalidArgument::class);
+        $this->expectException(TypeError::class);
 
         Parameters::fromPairs([['foo', InnerList::new(42)]]);
     }