reorder methods, update interface

Author: dominikzogg

README.md

@@ -103,13 +103,13 @@ $user = $userSchema->parse([
 All schemas support these methods:
 
 ```php
-$schema->nullable();       // Allow null values
-$schema->default($value);  // Provide default when input is null
-$schema->preParse($fn);    // Transform input before parsing
-$schema->postParse($fn);   // Transform output after parsing
-$schema->catch($fn);       // Handle errors and provide fallback
-$schema->parse($input);    // Parse and throw on error
-$schema->safeParse($input); // Parse and return Result object
+$schema->nullable();              // Allow null values
+$schema->default($value);         // Provide default when input is null
+$schema->preParse($fn);           // Transform input before parsing
+$schema->postParse($fn);          // Transform output after parsing
+$schema->parse($input);           // Parse and throw on error
+$schema->safeParse($input);       // Parse and return Result object
+$schema->catch($fn);              // Handle errors and provide fallback
 ```
 
 ## Error Handling

src/Schema/AbstractSchema.php

@@ -34,6 +34,11 @@ final public function nullable(bool $nullable = true): static
         return $clone;
     }
 
+    final public function default(mixed $default): static
+    {
+        return $this->preParse(static fn (mixed $input) => $input ?? $default);
+    }
+
     /**
      * @param \Closure(mixed $input): mixed $preParse
      */
@@ -73,11 +78,6 @@ final public function catch(\Closure $catch): static
         return $clone;
     }
 
-    final public function default(mixed $default): static
-    {
-        return $this->preParse(static fn (mixed $input) => $input ?? $default);
-    }
-
     final protected function dispatchPreParses(mixed $data): mixed
     {
         return array_reduce(

src/Schema/LazySchema.php

@@ -4,12 +4,8 @@
 
 namespace Chubbyphp\Parsing\Schema;
 
-use Chubbyphp\Parsing\ErrorsException;
 use Chubbyphp\Parsing\Result;
 
-/**
- * @phpstan-type Call array{name: string, arguments: array<mixed>}
- */
 final class LazySchema implements SchemaInterface
 {
     private ?SchemaInterface $schema = null;
@@ -19,38 +15,44 @@ final class LazySchema implements SchemaInterface
      */
     public function __construct(private \Closure $lazy) {}
 
+    /**
+     * @internal
+     *
+     * @infection-ignore-all
+     */
     public function nullable(bool $nullable = true): static
     {
-        throw new \BadMethodCallException(
-            \sprintf(
-                'LazySchema does not support any modification, "nullable" called with %s.',
-                $nullable ? 'true' : 'false'
-            )
-        );
+        throw new \BadMethodCallException('LazySchema does not support any modification, "nullable" called.');
     }
 
     /**
-     * @param \Closure(mixed $input): mixed $preParse
+     * @internal
+     *
+     * @infection-ignore-all
      */
-    public function preParse(\Closure $preParse): static
+    public function default(mixed $default): static
     {
-        throw new \BadMethodCallException('LazySchema does not support any modification, "preParse" called.');
+        throw new \BadMethodCallException('LazySchema does not support any modification, "default" called.');
     }
 
     /**
-     * @param \Closure(mixed $input): mixed $postParse
+     * @internal
+     *
+     * @infection-ignore-all
      */
-    public function postParse(\Closure $postParse): static
+    public function preParse(\Closure $preParse): static
     {
-        throw new \BadMethodCallException('LazySchema does not support any modification, "postParse" called.');
+        throw new \BadMethodCallException('LazySchema does not support any modification, "preParse" called.');
     }
 
     /**
-     * @param \Closure(mixed $input, ErrorsException $e): mixed $catch
+     * @internal
+     *
+     * @infection-ignore-all
      */
-    public function catch(\Closure $catch): static
+    public function postParse(\Closure $postParse): static
     {
-        throw new \BadMethodCallException('LazySchema does not support any modification, "catch" called.');
+        throw new \BadMethodCallException('LazySchema does not support any modification, "postParse" called.');
     }
 
     public function parse(mixed $input): mixed
@@ -67,6 +69,14 @@ public function safeParse(mixed $input): Result
         return $schema->safeParse($input);
     }
 
+    /**
+     * @internal
+     */
+    public function catch(\Closure $catch): static
+    {
+        throw new \BadMethodCallException('LazySchema does not support any modification, "catch" called.');
+    }
+
     private function resolveSchema(): SchemaInterface
     {
         if (!$this->schema) {

src/Schema/SchemaInterface.php

@@ -7,10 +7,15 @@
 use Chubbyphp\Parsing\ErrorsException;
 use Chubbyphp\Parsing\Result;
 
+/**
+ * @method static default(mixed $default)
+ */
 interface SchemaInterface
 {
     public function nullable(bool $nullable = true): static;
 
+    // public function default(mixed $default): static;
+
     /**
      * @param \Closure(mixed $input): mixed $preParse
      */

tests/Unit/ParserTest.php

@@ -138,22 +138,22 @@ public function testObject(): void
         self::assertInstanceOf(ObjectSchema::class, $objectSchema);
     }
 
-    public function testString(): void
+    public function testRecord(): void
     {
         $p = new Parser();
 
-        $stringSchema = $p->string();
+        $recordSchema = $p->record($p->string());
 
-        self::assertInstanceOf(StringSchema::class, $stringSchema);
+        self::assertInstanceOf(RecordSchema::class, $recordSchema);
     }
 
-    public function testRecord(): void
+    public function testString(): void
     {
         $p = new Parser();
 
-        $recordSchema = $p->record($p->string());
+        $stringSchema = $p->string();
 
-        self::assertInstanceOf(RecordSchema::class, $recordSchema);
+        self::assertInstanceOf(StringSchema::class, $stringSchema);
     }
 
     public function testTuple(): void

tests/Unit/Schema/IntSchemaTest.php

@@ -501,22 +501,6 @@ public function testParseWithInvalidNonPositive(): void
         }
     }
 
-    public function testParseWithValidToDateTime(): void
-    {
-        $input = 1705742100;
-
-        $schema = (new IntSchema())->toDateTime()->from(new \DateTimeImmutable('2024-01-20T09:15:00+00:00'));
-
-        self::assertEquals(new \DateTimeImmutable('@'.$input), $schema->parse($input));
-    }
-
-    public function testParseWithToDateTimeNullable(): void
-    {
-        $schema = (new IntSchema())->nullable()->toDateTime();
-
-        self::assertNull($schema->parse(null));
-    }
-
     public function testParseWithToFloat(): void
     {
         $input = 42;
@@ -548,4 +532,20 @@ public function testParseWithToStringNullable(): void
 
         self::assertNull($schema->parse(null));
     }
+
+    public function testParseWithValidToDateTime(): void
+    {
+        $input = 1705742100;
+
+        $schema = (new IntSchema())->toDateTime()->from(new \DateTimeImmutable('2024-01-20T09:15:00+00:00'));
+
+        self::assertEquals(new \DateTimeImmutable('@'.$input), $schema->parse($input));
+    }
+
+    public function testParseWithToDateTimeNullable(): void
+    {
+        $schema = (new IntSchema())->nullable()->toDateTime();
+
+        self::assertNull($schema->parse(null));
+    }
 }