feat(assert): Add CompositeRecord;

roxblnfk · roxblnfk · commit 498b50bc2c19 · 2025-12-08T00:24:50.000+04:00
All chained assertions are nested now
diff --git a/src/Assert/Internal/Assertion/AssertArray.php b/src/Assert/Internal/Assertion/AssertArray.php
@@ -8,6 +8,7 @@
 use Testo\Assert\Internal\Assertion\Traits\IterableTrait;
 use Testo\Assert\State\AssertException;
 use Testo\Assert\State\AssertTypeFailure;
+use Testo\Assert\State\AssertTypeSuccess;
 use Testo\Assert\StaticState;
 use Testo\Assert\Support;
 
@@ -22,6 +23,7 @@ class AssertArray implements ArrayType
 
     public function __construct(
         private readonly array $value,
+        private readonly AssertTypeSuccess $parent,
     ) {}
 
     /**
@@ -35,8 +37,8 @@ public static function validateAndCreate(mixed $value): self
     {
         \is_array($value) or StaticState::fail(AssertTypeFailure::create('array', $value));
 
-        StaticState::log('Assert array: ' . Support::stringify($value));
-        return new self($value);
+        $parent = StaticState::typeSuccess('array', $value);
+        return new self($value, $parent);
     }
 
     /**
diff --git a/src/Assert/Internal/Assertion/AssertFloat.php b/src/Assert/Internal/Assertion/AssertFloat.php
@@ -7,6 +7,7 @@
 use Testo\Assert\Api\Builtin\FloatType;
 use Testo\Assert\Internal\Assertion\Traits\NumericTrait;
 use Testo\Assert\State\AssertTypeFailure;
+use Testo\Assert\State\AssertTypeSuccess;
 use Testo\Assert\StaticState;
 use Testo\Assert\Support;
 
@@ -21,6 +22,7 @@ class AssertFloat implements FloatType
 
     public function __construct(
         private readonly float $value,
+        private readonly AssertTypeSuccess $parent,
     ) {}
 
     /**
@@ -34,7 +36,7 @@ public static function validateAndCreate(mixed $value): self
     {
         \is_float($value) or StaticState::fail(AssertTypeFailure::create('float', $value));
 
-        StaticState::log('Assert float: ' . Support::stringify($value));
-        return new self($value);
+        $parent = StaticState::typeSuccess('float', $value);
+        return new self($value, $parent);
     }
 }
diff --git a/src/Assert/Internal/Assertion/AssertInt.php b/src/Assert/Internal/Assertion/AssertInt.php
@@ -7,6 +7,7 @@
 use Testo\Assert\Api\Builtin\IntType;
 use Testo\Assert\Internal\Assertion\Traits\NumericTrait;
 use Testo\Assert\State\AssertTypeFailure;
+use Testo\Assert\State\AssertTypeSuccess;
 use Testo\Assert\StaticState;
 use Testo\Assert\Support;
 
@@ -21,6 +22,7 @@ class AssertInt implements IntType
 
     public function __construct(
         private readonly int $value,
+        private readonly AssertTypeSuccess $parent,
     ) {}
 
     /**
@@ -34,7 +36,7 @@ public static function validateAndCreate(mixed $value): self
     {
         \is_int($value) or StaticState::fail(AssertTypeFailure::create('int', $value));
 
-        StaticState::log('Assert int: ' . Support::stringify($value));
-        return new self($value);
+        $parent = StaticState::typeSuccess('int', $value);
+        return new self($value, $parent);
     }
 }
diff --git a/src/Assert/Internal/Assertion/AssertIterable.php b/src/Assert/Internal/Assertion/AssertIterable.php
@@ -7,6 +7,7 @@
 use Testo\Assert\Api\Builtin\IterableType;
 use Testo\Assert\Internal\Assertion\Traits\IterableTrait;
 use Testo\Assert\State\AssertTypeFailure;
+use Testo\Assert\State\AssertTypeSuccess;
 use Testo\Assert\StaticState;
 use Testo\Assert\Support;
 
@@ -21,6 +22,7 @@ class AssertIterable implements IterableType
 
     public function __construct(
         private readonly iterable $value,
+        private readonly AssertTypeSuccess $parent,
     ) {}
 
     /**
@@ -34,7 +36,7 @@ public static function validateAndCreate(mixed $value): self
     {
         \is_iterable($value) or StaticState::fail(AssertTypeFailure::create('iterable', $value));
 
-        StaticState::log('Assert iterable: ' . Support::stringify($value));
-        return new self($value);
+        $parent = StaticState::typeSuccess('iterable', $value);
+        return new self($value, $parent);
     }
 }
diff --git a/src/Assert/Internal/Assertion/AssertJson.php b/src/Assert/Internal/Assertion/AssertJson.php
@@ -9,6 +9,7 @@
 use Testo\Assert\Api\Json\JsonCommon;
 use Testo\Assert\Api\Json\JsonObject;
 use Testo\Assert\Api\Json\JsonStructure;
+use Testo\Assert\State\AssertTypeSuccess;
 
 /**
  * Implementation of JSON assertions.
@@ -19,6 +20,7 @@ class AssertJson implements JsonAbstract
 {
     public function __construct(
         private mixed $value,
+        private readonly AssertTypeSuccess $parent,
     ) {}
 
     /**
diff --git a/src/Assert/Internal/Assertion/AssertNumeric.php b/src/Assert/Internal/Assertion/AssertNumeric.php
@@ -6,6 +6,7 @@
 
 use Testo\Assert\Api\Builtin\IntType;
 use Testo\Assert\Internal\Assertion\Traits\NumericTrait;
+use Testo\Assert\State\AssertTypeSuccess;
 
 /**
  * Assertion utilities for numeric data type.
@@ -18,5 +19,6 @@ class AssertNumeric implements IntType
 
     public function __construct(
         public int|float $value,
+        private readonly AssertTypeSuccess $parent,
     ) {}
 }
diff --git a/src/Assert/Internal/Assertion/AssertObject.php b/src/Assert/Internal/Assertion/AssertObject.php
@@ -7,6 +7,7 @@
 use Testo\Assert\Api\Builtin\ObjectType;
 use Testo\Assert\State\AssertException;
 use Testo\Assert\State\AssertTypeFailure;
+use Testo\Assert\State\AssertTypeSuccess;
 use Testo\Assert\StaticState;
 use Testo\Assert\Support;
 
@@ -19,6 +20,7 @@ final class AssertObject implements ObjectType
 {
     public function __construct(
         private readonly object $value,
+        private readonly AssertTypeSuccess $parent,
     ) {}
 
     /**
@@ -34,8 +36,8 @@ public static function validateAndCreate(mixed $value): self
     {
         \is_object($value) or StaticState::fail(AssertTypeFailure::create('object', $value));
 
-        StaticState::log('Assert object: ' . Support::stringify($value));
-        return new self($value);
+        $parent = StaticState::typeSuccess('object', $value);
+        return new self($value, $parent);
     }
 
     #[\Override]
diff --git a/src/Assert/Internal/Assertion/AssertString.php b/src/Assert/Internal/Assertion/AssertString.php
@@ -7,6 +7,7 @@
 use Testo\Assert\Api\Builtin\StringType;
 use Testo\Assert\State\AssertException;
 use Testo\Assert\State\AssertTypeFailure;
+use Testo\Assert\State\AssertTypeSuccess;
 use Testo\Assert\StaticState;
 use Testo\Assert\Support;
 
@@ -19,6 +20,7 @@ class AssertString implements StringType
 {
     public function __construct(
         private readonly string $value,
+        private readonly AssertTypeSuccess $parent,
     ) {}
 
     /**
@@ -33,8 +35,8 @@ public static function validateAndCreate(mixed $value): self
     {
         \is_string($value) or StaticState::fail(AssertTypeFailure::create('string', $value));
 
-        StaticState::log('Assert string: ' . Support::stringify($value));
-        return new self($value);
+        $parent = StaticState::typeSuccess('string', $value);
+        return new self($value, $parent);
     }
 
     /**
diff --git a/src/Assert/Internal/Assertion/Traits/IterableTrait.php b/src/Assert/Internal/Assertion/Traits/IterableTrait.php
@@ -5,13 +5,14 @@
 namespace Testo\Assert\Internal\Assertion\Traits;
 
 use Testo\Assert\State\AssertException;
-use Testo\Assert\StaticState;
+use Testo\Assert\State\AssertTypeSuccess;
 use Testo\Assert\Support;
 
 /**
  * Contains assertion methods for iterable values.
  *
  * @property iterable $value
+ * @property AssertTypeSuccess $parent
  */
 trait IterableTrait
 {
@@ -20,12 +21,12 @@ public function contains(mixed $needle, string $message = ''): self
     {
         foreach ($this->value as $item) {
             if ($item === $needle) {
-                StaticState::log('Assert contains: ' . Support::stringify($needle) . '.');
-                return new self($this->value);
+                $this->parent->log('Assert contains: ' . Support::stringify($needle) . '.');
+                return $this;
             }
         }
 
-        StaticState::fail(
+        $this->parent->fail(
             AssertException::fail(
                 \sprintf(
                     'Failed to assert that %s contains %s.',
@@ -40,11 +41,11 @@ public function contains(mixed $needle, string $message = ''): self
     public function sameSizeAs(iterable $expected, string $message = ''): self
     {
         if (self::countIterable($this->value) === self::countIterable($expected)) {
-            StaticState::log('Assert same size as: ' . Support::stringify($expected) . '.');
-            return new self($this->value);
+            $this->parent->log('Assert same size as: ' . Support::stringify($expected) . '.');
+            return $this;
         }
 
-        StaticState::fail(
+        $this->parent->fail(
             AssertException::fail(
                 \sprintf(
                     'Failed to assert that iterable %s has the same number of elements as %s.',
@@ -67,7 +68,7 @@ public function allOf(string $type, string $message = ''): self
         };
         foreach ($this->value as $element) {
             $actualType = \strtolower(\get_debug_type($element));
-            $actualType === $type or StaticState::fail(
+            $actualType === $type or $this->parent->fail(
                 AssertException::fail(
                     \sprintf(
                         'Failed to assert that all elements of iterable %s have type %s (found %s instead).',
@@ -79,25 +80,25 @@ public function allOf(string $type, string $message = ''): self
             );
         }
 
-        StaticState::log(
+        $this->parent->log(
             \sprintf(
                 'Assert all elements are of type %s.',
                 Support::stringify($type),
             ),
         );
-        return new self($this->value);
+        return $this;
     }
 
     #[\Override]
     public function hasCount(int $expected): self
     {
         $count = self::countIterable($this->value);
         if ($count === $expected) {
-            StaticState::log("Assert count: {$count}.");
-            return new self($this->value);
+            $this->parent->log("Assert count: {$count}.");
+            return $this;
         }
 
-        StaticState::fail(
+        $this->parent->fail(
             AssertException::fail(
                 \sprintf(
                     'Failed to assert that %s has %d elements (found %d instead).',
diff --git a/src/Assert/Internal/Assertion/Traits/NumericTrait.php b/src/Assert/Internal/Assertion/Traits/NumericTrait.php
@@ -5,11 +5,12 @@
 namespace Testo\Assert\Internal\Assertion\Traits;
 
 use Testo\Assert\State\AssertException;
-use Testo\Assert\StaticState;
+use Testo\Assert\State\AssertTypeSuccess;
 
 /**
  * Contains methods for comparing numeric values
  * @property int|float $value
+ * @property AssertTypeSuccess $parent
  */
 trait NumericTrait
 {
@@ -23,11 +24,11 @@ trait NumericTrait
     public function greaterThan(int|float $min, string $message = ''): self
     {
         if ($this->value > $min) {
-            StaticState::log('Assert `' . $this->value . ' > ' . $min . '`', $message);
+            $this->parent->log('Assert `' . $this->value . ' > ' . $min . '`', $message);
             return $this;
         }
 
-        StaticState::fail(AssertException::compare(
+        $this->parent->fail(AssertException::compare(
             $min,
             $this->value,
             $message,
@@ -46,11 +47,11 @@ public function greaterThan(int|float $min, string $message = ''): self
     public function greaterThanOrEqual(int|float $min, string $message = ''): self
     {
         if ($this->value >= $min) {
-            StaticState::log('Assert `' . $this->value . ' >= ' . $min . '`', $message);
+            $this->parent->log('Assert `' . $this->value . ' >= ' . $min . '`', $message);
             return $this;
         }
 
-        StaticState::fail(AssertException::compare(
+        $this->parent->fail(AssertException::compare(
             $min,
             $this->value,
             $message,
@@ -69,11 +70,11 @@ public function greaterThanOrEqual(int|float $min, string $message = ''): self
     public function lessThan(int|float $max, string $message = ''): self
     {
         if ($this->value < $max) {
-            StaticState::log('Assert `' . $this->value . ' < ' . $max . '`', $message);
+            $this->parent->log('Assert `' . $this->value . ' < ' . $max . '`', $message);
             return $this;
         }
 
-        StaticState::fail(AssertException::compare(
+        $this->parent->fail(AssertException::compare(
             $max,
             $this->value,
             $message,
@@ -92,11 +93,11 @@ public function lessThan(int|float $max, string $message = ''): self
     public function lessThanOrEqual(int|float $max, string $message = ''): self
     {
         if ($this->value <= $max) {
-            StaticState::log('Assert `' . $this->value . ' <= ' . $max . '`', $message);
+            $this->parent->log('Assert `' . $this->value . ' <= ' . $max . '`', $message);
             return $this;
         }
 
-        StaticState::fail(AssertException::compare(
+        $this->parent->fail(AssertException::compare(
             $max,
             $this->value,
             $message,
diff --git a/src/Assert/State/AssertTypeSuccess.php b/src/Assert/State/AssertTypeSuccess.php
diff --git a/src/Assert/State/CompositeRecord.php b/src/Assert/State/CompositeRecord.php
diff --git a/src/Assert/State/Success.php b/src/Assert/State/Success.php
diff --git a/src/Assert/StaticState.php b/src/Assert/StaticState.php
diff --git a/src/Render/Terminal/Formatter.php b/src/Render/Terminal/Formatter.php
