Implement defaults

Internal/Label/Labels.php

@@ -36,7 +36,6 @@
  */
 enum Labels
 {
-    public const default = LabelDefault::key;
     public const wireType = LabelWireType::key;
     public const schemaType = LabelSchemaType::key;
     public const packed = LabelPacked::key;

Internal/Reflection/ArrayPropertyMarshaller.php

@@ -118,7 +118,6 @@ public function labels(): TypedMap
         }
 
         return $labels
-            ->with(Labels::default, [])
             ->with(Labels::isEmpty, static fn (array $values): bool => [] === $values)
             ->with(Labels::serializeTag, false)
             ;

Internal/Reflection/ArrayShapePropertyMarshaller.php

@@ -118,7 +118,6 @@ public function matchValue(mixed $value): bool
     public function labels(): TypedMap
     {
         return Labels::new(Wire\Type::BYTES)
-            ->with(Labels::default, [])
             ->with(Labels::isEmpty, static fn (array $values): bool => [] === $values)
             ->with(Labels::serializeTag, false)
             ;

Internal/Reflection/ConstantEnumPropertyMarshaller.php

@@ -101,7 +101,6 @@ public function matchValue(mixed $value): bool
     public function labels(): TypedMap
     {
         return $this->type->labels()
-            ->with(Labels::default, 0)
             ->with(Labels::isEmpty, static fn (int $variant): bool => 0 === $variant)
             ;
     }

Internal/Reflection/EnumPropertyMarshaller.php

@@ -29,7 +29,6 @@
 
 use Prototype\Byte;
 use Prototype\Serializer\Exception\EnumDoesNotContainVariant;
-use Prototype\Serializer\Exception\EnumDoesNotContainZeroVariant;
 use Prototype\Serializer\Internal\Label\Labels;
 use Prototype\Serializer\Internal\Type\TypeSerializer;
 use Prototype\Serializer\Internal\Type\VarintType;
@@ -89,7 +88,6 @@ public function matchValue(mixed $value): bool
     public function labels(): TypedMap
     {
         return $this->type->labels()
-            ->with(Labels::default, $this->enumName::tryFrom(0) ?: throw new EnumDoesNotContainZeroVariant($this->enumName))
             ->with(Labels::isEmpty, static fn (\BackedEnum $enum): bool => 0 === $enum->value)
             ;
     }

Internal/Reflection/HashTablePropertyMarshaller.php

@@ -125,7 +125,6 @@ public function matchValue(mixed $value): bool
     public function labels(): TypedMap
     {
         return Labels::new(Wire\Type::BYTES)
-            ->with(Labels::default, [])
             ->with(Labels::isEmpty, static fn (array $values): bool => [] === $values)
             ->with(Labels::serializeTag, false)
             ;

Internal/Reflection/PropertyDeserializeDescriptor.php

@@ -28,7 +28,6 @@
 namespace Prototype\Serializer\Internal\Reflection;
 
 use Prototype\Byte;
-use Prototype\Serializer\Internal\Label\Labels;
 use Prototype\Serializer\Internal\Wire\Tag;
 use Prototype\Serializer\PrototypeException;
 
@@ -41,22 +40,14 @@ final class PropertyDeserializeDescriptor
 {
     /**
      * @param PropertyMarshaller<T> $marshaller
+     * @param T $default
      */
     public function __construct(
         private readonly \ReflectionProperty $property,
         private readonly PropertyMarshaller $marshaller,
+        private readonly mixed $default = null,
     ) {}
 
-    /**
-     * @return T
-     * @throws PrototypeException
-     */
-    public function default(): mixed
-    {
-        /** @var T */
-        return $this->marshaller->labels()[Labels::default];
-    }
-
     /**
      * @return T
      * @throws \ReflectionException
@@ -80,9 +71,9 @@ public function setValue(object $object, mixed $value): void
      * @template TClass of object
      * @param TClass $object
      */
-    public function setDefault(object $object, mixed $value): void
+    public function setDefault(object $object): void
     {
-        $this->setValue($object, $this->property->getType()?->allowsNull() ? null : $value);
+        $this->setValue($object, $this->property->getType()?->allowsNull() && null === $this->default ? null : $this->default);
     }
 
     /**

Internal/Reflection/ProtobufReflector.php

@@ -35,6 +35,7 @@
 use Typhoon\DeclarationId\NamedClassId;
 use Typhoon\Reflection\AttributeReflection;
 use Typhoon\Reflection\ClassReflection;
+use Typhoon\Reflection\MethodReflection;
 use Typhoon\Reflection\PropertyReflection;
 use Typhoon\Reflection\TyphoonReflector;
 
@@ -66,17 +67,18 @@ public function propertySerializers(ClassReflection $class, TyphoonReflector $re
      */
     public function propertyDeserializers(ClassReflection $class, TyphoonReflector $reflector): array
     {
-        return self::properties($class, $reflector, static fn (\ReflectionProperty $property, PropertyMarshaller $marshaller): PropertyDeserializeDescriptor => new PropertyDeserializeDescriptor(
+        return self::properties($class, $reflector, static fn (\ReflectionProperty $property, PropertyMarshaller $marshaller, mixed $default = null): PropertyDeserializeDescriptor => new PropertyDeserializeDescriptor(
             $property,
             $marshaller,
+            $default,
         ));
     }
 
     /**
      * @template T of object
      * @template E
      * @param ClassReflection<T, NamedClassId<class-string<T>>|AnonymousClassId<class-string<T>>> $class
-     * @param callable(\ReflectionProperty, PropertyMarshaller): E $toPropertyDescriptor
+     * @param callable(\ReflectionProperty, PropertyMarshaller, mixed=): E $toPropertyDescriptor
      * @psalm-return array<positive-int, E>
      * @throws PrototypeException
      */
@@ -89,6 +91,15 @@ private static function properties(ClassReflection $class, TyphoonReflector $ref
             ->filter(static fn (PropertyReflection $property): bool => $property->isPublic() && !$property->isStatic())
         ;
 
+        $constructorProperties = $class
+            ->methods()
+            ->filter(static fn (MethodReflection $reflection): bool => $reflection->id->name === '__construct')
+            ->first()
+            ?->parameters()
+            ->toArray() ?? []
+        ;
+
+        /** @var PropertyReflection $property */
         foreach ($classProperties as $property) {
             /** @var ?Field $field */
             $field = $property
@@ -138,6 +149,7 @@ private static function properties(ClassReflection $class, TyphoonReflector $ref
                 $properties[$n] = $toPropertyDescriptor(
                     $property->toNativeReflection(),
                     $propertyMarshaller,
+                    ($constructorProperties[$property->id->name] ?? null)?->defaultValue() ?? null,
                 );
             }
         }

Internal/Reflection/StructPropertyMarshaller.php

@@ -85,7 +85,6 @@ public function matchValue(mixed $value): bool
     public function labels(): TypedMap
     {
         return Labels::new(Wire\Type::BYTES)
-            ->with(Labels::default, [])
             ->with(Labels::isEmpty, static fn (array $values): bool => [] === $values)
             ->with(Labels::serializeTag, false)
             ;

Internal/Type/BoolType.php

@@ -59,7 +59,6 @@ public function writeTo(Byte\Writer $writer, mixed $value): void
     public function labels(): TypedMap
     {
         return Labels::new(Wire\Type::VARINT)
-            ->with(Labels::default, false)
             ->with(Labels::packed, true)
             ->with(Labels::schemaType, ProtobufType::bool)
             ;

Internal/Type/DoubleType.php

@@ -59,7 +59,6 @@ public function readFrom(Byte\Reader $reader): float
     public function labels(): TypedMap
     {
         return Labels::new(Wire\Type::FIXED64)
-            ->with(Labels::default, 0.0)
             ->with(Labels::packed, true)
             ->with(Labels::schemaType, ProtobufType::double)
             ;

Internal/Type/DurationType.php

@@ -38,8 +38,8 @@ final class DurationType
      * @param int32 $nanos
      */
     private function __construct(
-        public readonly int $seconds,
-        public readonly int $nanos,
+        public readonly int $seconds = 0,
+        public readonly int $nanos = 0,
     ) {}
 
     public static function fromDateInterval(\DateInterval $interval): self

Internal/Type/Fixed32Type.php

@@ -59,7 +59,6 @@ public function readFrom(Byte\Reader $reader): int
     public function labels(): TypedMap
     {
         return Labels::new(Wire\Type::FIXED32)
-            ->with(Labels::default, 0)
             ->with(Labels::packed, true)
             ->with(Labels::schemaType, ProtobufType::fixed32)
             ;

Internal/Type/Fixed64Type.php

@@ -59,7 +59,6 @@ public function readFrom(Byte\Reader $reader): int
     public function labels(): TypedMap
     {
         return Labels::new(Wire\Type::FIXED64)
-            ->with(Labels::default, 0)
             ->with(Labels::packed, true)
             ->with(Labels::schemaType, ProtobufType::fixed64)
             ;

Internal/Type/FloatType.php

@@ -59,7 +59,6 @@ public function readFrom(Byte\Reader $reader): float
     public function labels(): TypedMap
     {
         return Labels::new(Wire\Type::FIXED32)
-            ->with(Labels::default, 0.0)
             ->with(Labels::packed, true)
             ->with(Labels::schemaType, ProtobufType::float)
             ;

Internal/Type/SFixed32Type.php

@@ -59,7 +59,6 @@ public function readFrom(Byte\Reader $reader): int
     public function labels(): TypedMap
     {
         return Labels::new(Wire\Type::FIXED32)
-            ->with(Labels::default, 0)
             ->with(Labels::packed, true)
             ->with(Labels::schemaType, ProtobufType::sfixed32)
             ;

Internal/Type/SFixed64Type.php

@@ -59,7 +59,6 @@ public function readFrom(Byte\Reader $reader): int
     public function labels(): TypedMap
     {
         return Labels::new(Wire\Type::FIXED64)
-            ->with(Labels::default, 0)
             ->with(Labels::packed, true)
             ->with(Labels::schemaType, ProtobufType::sfixed64)
             ;

Internal/Type/SInt32Type.php

@@ -59,7 +59,6 @@ public function readFrom(Byte\Reader $reader): int
     public function labels(): TypedMap
     {
         return Labels::new(Wire\Type::VARINT)
-            ->with(Labels::default, 0)
             ->with(Labels::packed, true)
             ->with(Labels::schemaType, ProtobufType::sint32)
             ;

Internal/Type/SInt64Type.php

@@ -59,7 +59,6 @@ public function readFrom(Byte\Reader $reader): int
     public function labels(): TypedMap
     {
         return Labels::new(Wire\Type::VARINT)
-            ->with(Labels::default, 0)
             ->with(Labels::packed, true)
             ->with(Labels::schemaType, ProtobufType::sint64)
             ;

Internal/Type/StringType.php

@@ -59,7 +59,6 @@ public function readFrom(Byte\Reader $reader): string
     public function labels(): TypedMap
     {
         return Labels::new(Wire\Type::BYTES)
-            ->with(Labels::default, '')
             ->with(Labels::schemaType, ProtobufType::string)
             ;
     }

Internal/Type/TimestampType.php

@@ -40,8 +40,8 @@ final class TimestampType
      * @param int32 $nanos
      */
     private function __construct(
-        public readonly int $seconds,
-        public readonly int $nanos,
+        public readonly int $seconds = 0,
+        public readonly int $nanos = 0,
     ) {}
 
     public static function fromDateTime(\DateTimeInterface $dateTime): self

Internal/Type/ValueType.php

@@ -161,9 +161,7 @@ public function writeTo(Byte\Writer $writer, mixed $value): void
 
     public function labels(): TypedMap
     {
-        return Labels::new(Type::BYTES)
-            ->with(Labels::default, [])
-            ;
+        return Labels::new(Type::BYTES);
     }
 
     /**

Internal/Type/VarintType.php

@@ -59,7 +59,6 @@ public function writeTo(Byte\Writer $writer, mixed $value): void
     public function labels(): TypedMap
     {
         return Labels::new(Wire\Type::VARINT)
-            ->with(Labels::default, 0)
             ->with(Labels::packed, true)
             ->with(Labels::schemaType, ProtobufType::int64)
             ;

Internal/Wire/ProtobufMarshaller.php

@@ -139,7 +139,7 @@ public function deserialize(string $messageType, Byte\Reader $reader): object
         // so that we can distinguish between a real value and no value.
         foreach ($properties as $propertyDeserializer) {
             if (!$propertyDeserializer->isInitialized($object)) {
-                $propertyDeserializer->setDefault($object, $propertyDeserializer->default());
+                $propertyDeserializer->setDefault($object);
             }
         }