Assert can initiate to use #1200

Author: asika32764

packages/utilities/src/Assert/Assert.php

@@ -11,6 +11,8 @@
 use Windwalker\Utilities\Str;
 
 /**
+ * @psalm-type  MessageClosure = Closure(string $caller, mixed $value, string $type): string
+ *
  * The Assert class.
  */
 class Assert
@@ -34,16 +36,27 @@ public function __construct(callable $exceptionHandler, ?string $caller = null)
         $this->exceptionHandler = $exceptionHandler;
     }
 
+    public static function create(
+        string $exceptionClass = \RuntimeException::class,
+        int $code = 500,
+        ?string $caller = null,
+    ): static {
+        return new static(
+            fn($message) => new $exceptionClass($message, $code),
+            $caller
+        );
+    }
+
     /**
-     * @param  bool|callable  $assertion
-     * @param  string         $message
-     * @param  mixed          $value
+     * @template T of mixed
      *
-     * @return  void
+     * @param  T  $assertion
+     * @param  string|MessageClosure  $message
+     * @param  mixed  $value
      *
-     * @throws Throwable
+     * @return  T
      */
-    public function assert(mixed $assertion, string $message, mixed $value = null): void
+    public function assert(mixed $assertion, string|Closure $message, mixed $value = null): mixed
     {
         if (is_callable($assertion)) {
             $result = $assertion();
@@ -54,22 +67,46 @@ public function assert(mixed $assertion, string $message, mixed $value = null):
         if (!$result) {
             $this->throwException($message, $value);
         }
+
+        return $assertion;
+    }
+
+    /**
+     * @template T of mixed
+     *
+     * @param  T  $assertion
+     * @param  string|MessageClosure  $message
+     * @param  mixed  $value
+     *
+     * @return  T
+     */
+    public function __invoke(mixed $assertion, string|Closure $message, mixed $value = null): mixed
+    {
+        return $this->assert($assertion, $message, $value);
     }
 
-    public function throwException(string $message, $value = null): void
+    public function throwException(string|Closure $message, $value = null): void
     {
         throw $this->exception($message, $value);
     }
 
-    public function exception(string $message, $value = null)
+    public function exception(string|Closure $message, $value = null)
     {
         return ($this->exceptionHandler)($this->createMessage($message, $value));
     }
 
-    protected function createMessage(string $message, $value): string
+    protected function createMessage(string|Closure $message, $value): string
     {
         $described = static::describeValue($value);
 
+        if ($message instanceof Closure) {
+            try {
+                $message = $message($this->caller, $value, $described);
+            } catch (Throwable $e) {
+                $message = 'Error when generating assert message: ' . $e->getMessage();
+            }
+        }
+
         if (str_contains($message, '%')) {
             $message = sprintf($message, $described);
         }
@@ -80,6 +117,7 @@ protected function createMessage(string $message, $value): string
                 [
                     'caller' => $this->caller,
                     'value' => $value,
+                    'type' => $described,
                 ],
                 '.',
                 ['{', '}']

packages/utilities/src/Assert/TypeAssert.php

@@ -12,18 +12,18 @@
 class TypeAssert
 {
     /**
-     * @template T
+     * @template T of mixed
      *
-     * @param  T              $assertion
-     * @param  string         $message
-     * @param  mixed          $value
-     * @param  callable|null  $exception
+     * @param  T                $assertion
+     * @param  string|\Closure  $message
+     * @param  mixed            $value
+     * @param  callable|null    $exception
      *
-     * @return  T
+     * @return T
      */
     public static function assert(
         mixed $assertion,
-        string $message,
+        string|\Closure $message,
         mixed $value = null,
         ?callable $exception = null
     ): mixed {