ando como dia monday

.vscode/templates.code-snippets

@@ -38,7 +38,7 @@
             "",
             "namespace Chevere\\Parameter;",
             "",
-            "use Chevere\\Exceptions\\Core\\Exception;",
+            "use Exception;",
             "",
             "/**",
             " * Exception thrown when ${1:description}.",
@@ -101,7 +101,7 @@
             "",
             "namespace Chevere\\Parameter\\\\${TM_DIRECTORY/.*src\\/(([^\\/]*)(\\/)?)|(\\/)([^\\/]*)/$2${3:+.}${5:+.}$5/g};",
             "",
-            "use Chevere\\Exceptions\\Core\\Exception;",
+            "use Exception;",
             "",
             "/**",
             " * Exception thrown when ${1:description}.",

src/Attributes/functions.php

@@ -15,6 +15,7 @@
 
 use Chevere\Parameter\Interfaces\ArgumentsInterface;
 use LogicException;
+use ReflectionAttribute;
 use ReflectionFunction;
 use ReflectionMethod;
 use function Chevere\Parameter\parameterAttr;

src/FloatParameter.php

@@ -35,7 +35,9 @@ final class FloatParameter implements FloatParameterInterface
 
     public function __invoke(float $value): float
     {
-        return assertFloat($this, $value);
+        $this->assert($value);
+
+        return $value;
     }
 
     public function withDefault(float $value): FloatParameterInterface

src/IntParameter.php

@@ -40,7 +40,9 @@ final class IntParameter implements IntParameterInterface
 
     public function __invoke(int $value): int
     {
-        return assertInt($this, $value);
+        $this->assert($value);
+
+        return $value;
     }
 
     public function withDefault(int $value): IntParameterInterface

src/NullParameter.php

@@ -18,6 +18,8 @@
 use Chevere\Parameter\Traits\ParameterDefaultNullTrait;
 use Chevere\Parameter\Traits\ParameterTrait;
 use Chevere\Parameter\Traits\SchemaTrait;
+use TypeError;
+use function Chevere\Message\message;
 
 final class NullParameter implements NullParameterInterface
 {
@@ -27,7 +29,13 @@ final class NullParameter implements NullParameterInterface
 
     public function __invoke(mixed $value): mixed
     {
-        return assertNull($this, $value);
+        if ($value === null) {
+            return $value;
+        }
+
+        throw new TypeError(
+            (string) message('Argument value provided is not of type null')
+        );
     }
 
     /**

src/ObjectParameter.php

@@ -33,7 +33,16 @@ final class ObjectParameter implements ObjectParameterInterface
 
     public function __invoke(object $value): object
     {
-        return assertObject($this, $value);
+        if ($this->type->validate($value)) {
+            return $value;
+        }
+
+        throw new TypeError(
+            (string) message(
+                'Argument value provided is not of type `%type%`',
+                type: $this->className()
+            )
+        );
     }
 
     public function setUp(): void

src/StringParameter.php

@@ -32,7 +32,18 @@ final class StringParameter implements StringParameterInterface
 
     public function __invoke(string|Stringable $value): string
     {
-        return assertString($this, $value);
+        $value = strval($value);
+        if ($this->regex->match($value) !== []) {
+            return $value;
+        }
+
+        throw new InvalidArgumentException(
+            (string) message(
+                "Argument value provided `%provided%` doesn't match the regex `%regex%`",
+                provided: $value,
+                regex: strval($this->regex),
+            )
+        );
     }
 
     public function setUp(): void

src/Traits/NumericParameterTrait.php

@@ -235,4 +235,60 @@ private function assertNumericLimit(
             );
         }
     }
+
+    /**
+     * @return TValue
+     */
+    private function assert(
+        int|float $argument
+    ): int|float {
+        if ($this->accept !== []) {
+            if (in_array($argument, $this->accept, true)) {
+                return $argument;
+            }
+            $values = implode(',', $this->accept);
+
+            throw new InvalidArgumentException(
+                (string) message(
+                    'Argument value provided `%provided%` is not an accepted value in `%value%`',
+                    provided: strval($argument),
+                    value: "[{$values}]"
+                )
+            );
+        }
+        if ($this->reject !== []) {
+            if (! in_array($argument, $this->reject, true)) {
+                return $argument;
+            }
+            $values = implode(',', $this->reject);
+
+            throw new InvalidArgumentException(
+                (string) message(
+                    'Argument value provided `%provided%` is on rejected list `%value%`',
+                    provided: strval($argument),
+                    value: "[{$values}]"
+                )
+            );
+        }
+        if ($this->min() !== null && $argument < $this->min()) {
+            throw new InvalidArgumentException(
+                (string) message(
+                    'Argument value provided `%provided%` is less than `%min%`',
+                    provided: strval($argument),
+                    min: strval($this->min())
+                )
+            );
+        }
+        if ($this->max !== null && $argument > $this->max) {
+            throw new InvalidArgumentException(
+                (string) message(
+                    'Argument value provided `%provided%` is greater than `%max%`',
+                    provided: strval($argument),
+                    max: strval($this->max)
+                )
+            );
+        }
+
+        return $argument;
+    }
 }

src/functions-array.php

@@ -106,18 +106,6 @@ function assertArrayString(
     return assertArray($parameter, $argument);
 }
 
-function assertNotEmpty(ParameterInterface $expected, mixed $value): void
-{
-    if ($expected instanceof ArrayTypeParameterInterface
-        && empty($value)
-        && count($expected->parameters()->requiredKeys()) > 0
-    ) {
-        throw new InvalidArgumentException(
-            (string) message('Argument value provided is empty')
-        );
-    }
-}
-
 // @phpstan-ignore-next-line
 function assertGeneric(
     GenericParameterInterface $parameter,
@@ -131,8 +119,6 @@ function assertGeneric(
     $generic = ' *generic';
     $genericKey = '_K' . $generic;
     $genericValue = '_V' . $generic;
-    $expected = $parameter->value();
-    // assertNotEmpty($expected, $argument);
 
     try {
         foreach ($argument as $key => $value) {

src/functions-numeric.php

@@ -15,8 +15,6 @@
 
 use Chevere\Parameter\Interfaces\FloatParameterInterface;
 use Chevere\Parameter\Interfaces\IntParameterInterface;
-use InvalidArgumentException;
-use function Chevere\Message\message;
 
 /**
  * @param float[] $accept
@@ -31,20 +29,20 @@ function float(
     array $reject = [],
 ): FloatParameterInterface {
     $parameter = new FloatParameter($description);
-    if ($default !== null) {
-        $parameter = $parameter->withDefault($default);
+    if ($accept !== []) {
+        $parameter = $parameter->withAccept(...$accept);
+    }
+    if ($reject !== []) {
+        $parameter = $parameter->withReject(...$reject);
     }
     if ($min !== null) {
         $parameter = $parameter->withMin($min);
     }
     if ($max !== null) {
         $parameter = $parameter->withMax($max);
     }
-    if ($accept !== []) {
-        $parameter = $parameter->withAccept(...$accept);
-    }
-    if ($reject !== []) {
-        $parameter = $parameter->withReject(...$reject);
+    if ($default !== null) {
+        $parameter = $parameter->withDefault($default);
     }
 
     return $parameter;
@@ -69,89 +67,15 @@ function int(
     if ($reject !== []) {
         $parameter = $parameter->withReject(...$reject);
     }
-    if ($default !== null) {
-        $parameter = $parameter->withDefault($default);
-    }
     if ($min !== null) {
         $parameter = $parameter->withMin($min);
     }
     if ($max !== null) {
         $parameter = $parameter->withMax($max);
     }
-
-    return $parameter;
-}
-
-function assertNumeric(
-    IntParameterInterface|FloatParameterInterface $parameter,
-    int|float $argument,
-): int|float {
-    if ($parameter->accept() !== []) {
-        if (in_array($argument, $parameter->accept(), true)) {
-            return $argument;
-        }
-        $values = implode(',', $parameter->accept());
-
-        throw new InvalidArgumentException(
-            (string) message(
-                'Argument value provided `%provided%` is not an accepted value in `%value%`',
-                provided: strval($argument),
-                value: "[{$values}]"
-            )
-        );
-    }
-    if ($parameter->reject() !== []) {
-        if (! in_array($argument, $parameter->reject(), true)) {
-            return $argument;
-        }
-        $values = implode(',', $parameter->reject());
-
-        throw new InvalidArgumentException(
-            (string) message(
-                'Argument value provided `%provided%` is on rejected list `%value%`',
-                provided: strval($argument),
-                value: "[{$values}]"
-            )
-        );
-    }
-    $min = $parameter->min();
-    if ($min !== null && $argument < $min) {
-        throw new InvalidArgumentException(
-            (string) message(
-                'Argument value provided `%provided%` is less than `%min%`',
-                provided: strval($argument),
-                min: strval($min)
-            )
-        );
-    }
-    $max = $parameter->max();
-    if ($max !== null && $argument > $max) {
-        throw new InvalidArgumentException(
-            (string) message(
-                'Argument value provided `%provided%` is greater than `%max%`',
-                provided: strval($argument),
-                max: strval($max)
-            )
-        );
+    if ($default !== null) {
+        $parameter = $parameter->withDefault($default);
     }
 
-    return $argument;
-}
-
-function assertInt(
-    IntParameterInterface $parameter,
-    int $argument,
-): int {
-    assertNumeric($parameter, $argument);
-
-    return $argument;
-}
-
-function assertFloat(
-    FloatParameterInterface $parameter,
-    float $argument
-): float {
-    assertNumeric($parameter, $argument);
-
-    return $argument;
+    return $parameter;
 }

src/functions-string.php

@@ -15,9 +15,6 @@
 
 use Chevere\Parameter\Interfaces\StringParameterInterface;
 use Chevere\Regex\Regex;
-use InvalidArgumentException;
-use Stringable;
-use function Chevere\Message\message;
 
 function string(
     string $regex = '',
@@ -46,14 +43,10 @@ function intString(
     );
 }
 
-function enum(string ...$string): StringParameterInterface
+function enum(string $string, string ...$strings): StringParameterInterface
 {
-    if ($string === []) {
-        throw new InvalidArgumentException(
-            (string) message('At least one string must be provided')
-        );
-    }
-    $cases = implode('|', $string);
+    array_unshift($strings, $string);
+    $cases = implode('|', $strings);
     $regex = "/\b({$cases})\b/";
 
     return string($regex);
@@ -94,22 +87,3 @@ function datetime(
 
     return string($regex, $description, $default);
 }
-
-function assertString(
-    StringParameterInterface $parameter,
-    Stringable|string $argument,
-): string {
-    $regex = $parameter->regex();
-    $argument = strval($argument);
-    if ($regex->match($argument) !== []) {
-        return $argument;
-    }
-
-    throw new InvalidArgumentException(
-        (string) message(
-            "Argument value provided `%provided%` doesn't match the regex `%regex%`",
-            provided: $argument,
-            regex: strval($regex),
-        )
-    );
-}