Add #[JsonProperty] attribute and runtime improvements

.github/workflows/tests.yml

@@ -31,7 +31,7 @@ jobs:
             ${{ runner.os }}-php-
 
       - name: Install dependencies
-        run: composer install --prefer-dist --no-progress --no-suggest
+        run: composer install --prefer-dist --no-progress
 
       - name: Run test suite
         run: composer tests

src/ArrayObjectMapper.php

@@ -13,10 +13,13 @@
 use Tcds\Io\Jackson\Node\Mappers\Writers\DateTimeWriter;
 use Tcds\Io\Jackson\Node\Reader;
 use Tcds\Io\Jackson\Node\Runtime\RuntimeReader;
+use Tcds\Io\Jackson\Node\Runtime\RuntimeTypeNodeFactory;
+use Tcds\Io\Jackson\Node\Runtime\RuntimeTypeNodeSpecificationFactory;
 use Tcds\Io\Jackson\Node\Runtime\RuntimeWriter;
 use Tcds\Io\Jackson\Node\StaticReader;
 use Tcds\Io\Jackson\Node\StaticWriter;
 use Tcds\Io\Jackson\Node\TypeNode;
+use Tcds\Io\Jackson\Node\TypeNodeFactory;
 use Tcds\Io\Jackson\Node\Writer;
 use Throwable;
 
@@ -25,19 +28,30 @@
  */
 readonly class ArrayObjectMapper implements ObjectMapper
 {
+    /** @var Reader<mixed> */
+    private Reader $defaultTypeReader;
+    /** @var Writer<mixed> */
+    private Writer $defaultTypeWriter;
     /** @var TypeMappers */
     private array $typeMappers;
 
     /**
-     * @param Reader<mixed> $defaultTypeReader
-     * @param Writer<mixed> $defaultTypeWriter
+     * @param Reader<mixed>|null $defaultTypeReader
+     * @param Writer<mixed>|null $defaultTypeWriter
      * @param TypeMappers $typeMappers
      */
     public function __construct(
-        private Reader $defaultTypeReader = new RuntimeReader(),
-        private Writer $defaultTypeWriter = new RuntimeWriter(),
+        ?Reader $defaultTypeReader = null,
+        ?Writer $defaultTypeWriter = null,
         array $typeMappers = [],
+        TypeNodeFactory $typeNodeFactory = new RuntimeTypeNodeFactory(),
     ) {
+        $this->defaultTypeReader = $defaultTypeReader ?? new RuntimeReader(
+            node: $typeNodeFactory,
+            specification: new RuntimeTypeNodeSpecificationFactory(factory: $typeNodeFactory),
+        );
+        $this->defaultTypeWriter = $defaultTypeWriter ?? new RuntimeWriter(node: $typeNodeFactory);
+
         $dateTimeMapper = ['reader' => new DateTimeReader(), 'writer' => new DateTimeWriter()];
 
         $this->typeMappers = [

src/JsonObjectMapper.php

@@ -5,8 +5,8 @@
 use Override;
 use Tcds\Io\Jackson\Node\Json;
 use Tcds\Io\Jackson\Node\Reader;
-use Tcds\Io\Jackson\Node\Runtime\RuntimeReader;
-use Tcds\Io\Jackson\Node\Runtime\RuntimeWriter;
+use Tcds\Io\Jackson\Node\Runtime\RuntimeTypeNodeFactory;
+use Tcds\Io\Jackson\Node\TypeNodeFactory;
 use Tcds\Io\Jackson\Node\Writer;
 
 /**
@@ -17,16 +17,17 @@
     private ArrayObjectMapper $mapper;
 
     /**
-     * @param Reader<mixed> $defaultTypeReader
-     * @param Writer<mixed> $defaultTypeWriter
+     * @param Reader<mixed>|null $defaultTypeReader
+     * @param Writer<mixed>|null $defaultTypeWriter
      * @param TypeMappers $typeMappers
      */
     public function __construct(
-        Reader $defaultTypeReader = new RuntimeReader(),
-        Writer $defaultTypeWriter = new RuntimeWriter(),
+        ?Reader $defaultTypeReader = null,
+        ?Writer $defaultTypeWriter = null,
         array $typeMappers = [],
+        TypeNodeFactory $typeNodeFactory = new RuntimeTypeNodeFactory(),
     ) {
-        $this->mapper = new ArrayObjectMapper($defaultTypeReader, $defaultTypeWriter, $typeMappers);
+        $this->mapper = new ArrayObjectMapper($defaultTypeReader, $defaultTypeWriter, $typeMappers, $typeNodeFactory);
     }
 
     #[Override] public function readValueWith(string $type, mixed $value, array $with = [])

src/Node/InputNode.php

@@ -4,7 +4,16 @@
 
 readonly class InputNode
 {
-    public function __construct(public string $name, public string $type, public mixed $default)
+    public function __construct(
+        public string $name,
+        public string $type,
+        public mixed $default,
+        public ?string $key = null,
+    ) {
+    }
+
+    public function key(): string
     {
+        return $this->key ?? $this->name;
     }
 }

src/Node/JsonProperty.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tcds\Io\Jackson\Node;
+
+use Attribute;
+
+#[Attribute(Attribute::TARGET_PARAMETER | Attribute::TARGET_PROPERTY)]
+final readonly class JsonProperty
+{
+    public function __construct(public string $name)
+    {
+    }
+}