Simplify String Field

Author: nyamsprod

src/Schema/DateField.php

@@ -154,7 +154,7 @@ public function type(): FieldType
 
     public function name(): string
     {
-        return FieldType::Date->value;
+        return FieldType::Date->value.'(format='.$this->format.',timezone='.$this->timezone->getName().')';
     }
 
     public function parse(mixed $value): ?DateTimeInterface

src/Schema/DateFieldTest.php

@@ -75,6 +75,7 @@ public function test_it_can_return_another_implementing_datetime_interface(): vo
         self::assertSame(MyDate::class, $field->metadata()->get('class'));
         self::assertSame('Y-m-d', $field->metadata()->get('format'));
         self::assertSame('UTC', $field->metadata()->get('timezone'));
+        self::assertSame('date(format=Y-m-d,timezone=UTC)', $field->name());
     }
 }
 

src/Schema/EnumField.php

@@ -70,7 +70,7 @@ public function type(): FieldType
 
     public function name(): string
     {
-        return FieldType::Enum->value;
+        return FieldType::Enum->value.'('.$this->enumClass.')';
     }
 
     public function parse(mixed $value): ?UnitEnum

src/Schema/EnumFieldTest.php

@@ -52,7 +52,7 @@ public function testItParsesEnumByInstance(): void
         self::assertSame($value, $result);
         self::assertSame(FieldType::Enum, $this->field->type());
         self::assertSame(TestEnum::class, $this->field->enumClass);
-        self::assertSame('enum', $this->field->name());
+        self::assertSame('enum(League\Csv\Schema\TestEnum)', $this->field->name());
     }
 
     public function testItParsesEnumByName(): void

src/Schema/FieldEvaluator.php

@@ -59,6 +59,9 @@ public function score(iterable $values): float
         return 0 < $counted ? $valid / $counted : 0.0;
     }
 
+    /**
+     * @return int<-1, 1>
+     */
     public function evaluate(mixed $value): int
     {
         if (null === $value) {

src/Schema/FieldType.php

@@ -22,6 +22,5 @@ enum FieldType: string
     case Json = 'json';
     case Numeric = 'numeric';
     case String  = 'string';
-    case StructuredString = 'structured_string';
     case Set = 'set';
 }

src/Schema/NumericField.php

@@ -24,38 +24,100 @@
 
 final class NumericField extends FieldEvaluator implements Field
 {
+    public function __construct(
+        public readonly int|float|null $min = null,
+        public readonly int|float|null $max = null,
+        float $confidenceThreshold = 0.8
+    ) {
+        if (null !== $min && null !== $max && $min > $max) {
+            throw new \ValueError('Minimum length can not be greater than maximum length.');
+        }
+
+        parent::__construct($confidenceThreshold);
+    }
+
+    public static function min(int $value, float $confidenceThreshold = 0.8): self
+    {
+        return new self(min: $value, max: null, confidenceThreshold: $confidenceThreshold);
+    }
+
+    public static function max(int $value, float $confidenceThreshold = 0.8): self
+    {
+        return new self(min: null, max: $value, confidenceThreshold: $confidenceThreshold);
+    }
+
+    public static function fixed(int $value, float $confidenceThreshold = 0.8): self
+    {
+        return new self(min: $value, max: $value, confidenceThreshold: $confidenceThreshold);
+    }
+
+    public static function between(int $min, int $max, float $confidenceThreshold = 0.8): self
+    {
+        return new self(min: $min, max: $max, confidenceThreshold: $confidenceThreshold);
+    }
+
+    public static function positive(float $confidenceThreshold = 0.8): self
+    {
+        return new self(min: 0, confidenceThreshold: $confidenceThreshold);
+    }
+
+    public static function negative(float $confidenceThreshold = 0.8): self
+    {
+        return new self(max: 0, confidenceThreshold: $confidenceThreshold);
+    }
+
     public function type(): FieldType
     {
         return FieldType::Numeric;
     }
 
     public function name(): string
     {
-        return FieldType::Numeric->value;
+        $range = (null === $this->min && null === $this->max)
+            ? '' :
+            (
+                $this->min === $this->max
+                ? '['.$this->min.']'
+                : '['.$this->min.','.$this->max.']'
+            );
+
+        return FieldType::Numeric->value.$range;
     }
 
     public function parse(mixed $value): int|float|null
     {
-        if (is_float($value) || is_int($value)) {
-            return $value;
+        if (is_string($value)) {
+            $value = trim($value);
+            if ('' === $value || !is_numeric($value)) {
+                return null;
+            }
+
+            $filterValue = filter_var($value, FILTER_VALIDATE_INT);
+            $value = false === $filterValue ? (float) $value : $filterValue;
         }
 
-        if (!is_string($value)) {
+        if (!is_float($value) && !is_int($value)) {
             return null;
         }
 
-        $value = trim($value);
-        if ('' === $value || !is_numeric($value)) {
+        if (null !== $this->min && $value < $this->min) {
             return null;
         }
 
-        $filterValue = filter_var($value, FILTER_VALIDATE_INT);
+        if (null !== $this->max && $value > $this->max) {
+            return null;
+        }
 
-        return false === $filterValue ? (float) $value : $filterValue;
+        return $value;
     }
 
     public function metadata(): FieldMetadata
     {
-        return new FieldMetadata();
+        return new FieldMetadata([
+            'constraints' => [
+                'min_value' => $this->min,
+                'max_value' => $this->max,
+            ],
+        ]);
     }
 }

src/Schema/NumericFieldTest.php

@@ -83,6 +83,6 @@ public function testParseInvalidValues(mixed $input): void
 
     public function test_metadata_contains_expected_structure(): void
     {
-        self::assertTrue($this->field->metadata()->isEmpty());
+        self::assertFalse($this->field->metadata()->isEmpty());
     }
 }

src/Schema/SetField.php

@@ -67,7 +67,7 @@ public function type(): FieldType
 
     public function name(): string
     {
-        return FieldType::Set->value;
+        return FieldType::Set->value.'('.$this->enumField->name().')';
     }
 
     /**

src/Schema/SetFieldTest.php

@@ -59,7 +59,7 @@ public function test_it_returns_the_correct_name(): void
     {
         $field = SetField::fromEnum(TestSetEnum::class);
 
-        self::assertSame(FieldType::Set->value, $field->name());
+        self::assertSame('set(enum(League\Csv\Schema\Tests\TestSetEnum))', $field->name());
     }
 
     public function test_it_returns_null_for_non_string_values(): void