Code style

src/Adapter/Elasticsearch.php

@@ -12,20 +12,20 @@
 
 final class Elasticsearch implements Adapter
 {
-    private Transport $transport;
-    private Url $url;
-    private Elasticsearch\Transaction $transaction;
-
-    private function __construct(Transport $transport, Url $url)
-    {
-        $this->transport = $transport;
-        $this->url = $url;
-        $this->transaction = Elasticsearch\Transaction::of();
+    private function __construct(
+        private Transport $transport,
+        private Url $url,
+        private Elasticsearch\Transaction $transaction,
+    ) {
     }
 
     public static function of(Transport $transport, ?Url $url = null): self
     {
-        return new self($transport, $url ?? Url::of('http://localhost:9200/'));
+        return new self(
+            $transport,
+            $url ?? Url::of('http://localhost:9200/'),
+            Elasticsearch\Transaction::of(),
+        );
     }
 
     #[\Override]

src/Adapter/Elasticsearch/CreateIndex.php

@@ -26,20 +26,12 @@
 
 final class CreateIndex
 {
-    private Transport $http;
-    private Aggregates $aggregates;
-    private Mapping $mapping;
-    private Url $url;
-
     private function __construct(
-        Transport $http,
-        Aggregates $aggregates,
-        Url $url,
+        private Transport $http,
+        private Aggregates $aggregates,
+        private Mapping $mapping,
+        private Url $url,
     ) {
-        $this->http = $http;
-        $this->aggregates = $aggregates;
-        $this->mapping = Mapping::new();
-        $this->url = $url;
     }
 
     /**
@@ -73,6 +65,11 @@ public static function of(
         Aggregates $aggregates,
         Url $url,
     ): self {
-        return new self($transport, $aggregates, $url);
+        return new self(
+            $transport,
+            $aggregates,
+            Mapping::new(),
+            $url,
+        );
     }
 }

src/Adapter/Elasticsearch/DropIndex.php

@@ -22,18 +22,11 @@
 
 final class DropIndex
 {
-    private Transport $http;
-    private Aggregates $aggregates;
-    private Url $url;
-
     private function __construct(
-        Transport $http,
-        Aggregates $aggregates,
-        Url $url,
+        private Transport $http,
+        private Aggregates $aggregates,
+        private Url $url,
     ) {
-        $this->http = $http;
-        $this->aggregates = $aggregates;
-        $this->url = $url;
     }
 
     /**

src/Adapter/Elasticsearch/Mapping.php

@@ -11,11 +11,8 @@
  */
 final class Mapping
 {
-    private MapType $mapType;
-
-    private function __construct()
+    private function __construct(private MapType $mapType)
     {
-        $this->mapType = MapType::new();
     }
 
     public function __invoke(Definition $definition): array
@@ -61,7 +58,7 @@ public function __invoke(Definition $definition): array
      */
     public static function new(): self
     {
-        return new self;
+        return new self(MapType::new());
     }
 
     /**

src/Adapter/Elasticsearch/Refresh.php

@@ -13,11 +13,8 @@
 
 final class Refresh implements Transport
 {
-    private Transport $transport;
-
-    private function __construct(Transport $transport)
+    private function __construct(private Transport $transport)
     {
-        $this->transport = $transport;
     }
 
     #[\Override]

src/Adapter/Elasticsearch/Repository.php

@@ -53,7 +53,7 @@ final class Repository implements RepositoryInterface, Effectful
     private Decode $decode;
     private Painless $script;
     private Query $query;
-    /** @var Constraint<mixed, 0|positive-int> */
+    /** @var Constraint<mixed, int<0, max>> */
     private Constraint $pluckCount;
     /** @var Constraint<mixed, Sequence<array>> */
     private Constraint $pluckHits;
@@ -76,7 +76,7 @@ private function __construct(
         $this->script = Painless::new();
         /**
          * @psalm-suppress MixedReturnStatement
-         * @var Constraint<mixed, 0|positive-int>
+         * @var Constraint<mixed, int<0, max>>
          */
         $this->pluckCount = Is::shape(
             'count',
@@ -406,7 +406,7 @@ private static function url(
     }
 
     /**
-     * @param 0|positive-int $drop
+     * @param int<0, max> $drop
      * @return Sequence<Aggregate>
      */
     private function stream(int $drop, ?array $sort, ?array $query): Sequence
@@ -463,8 +463,8 @@ private function stream(int $drop, ?array $sort, ?array $query): Sequence
     /**
      * @param callable(mixed): Maybe<Aggregate> $decode
      * @param Constraint<mixed, Sequence<array>> $pluckHits
-     * @param 0|positive-int $drop
-     * @param positive-int $take
+     * @param int<0, max> $drop
+     * @param int<1, max> $take
      *
      * @return Sequence<Aggregate>
      */

src/Adapter/Filesystem.php

@@ -11,16 +11,13 @@
 
 final class Filesystem implements Adapter
 {
-    private Filesystem\Transaction $transaction;
-
-    private function __construct(Storage $adapter)
+    private function __construct(private Filesystem\Transaction $transaction)
     {
-        $this->transaction = Filesystem\Transaction::of($adapter);
     }
 
     public static function of(Storage $adapter): self
     {
-        return new self($adapter);
+        return new self(Filesystem\Transaction::of($adapter));
     }
 
     #[\Override]

src/Adapter/Filesystem/Decode.php

@@ -25,15 +25,11 @@
  */
 final class Decode
 {
-    /** @var Definition<T> */
-    private Definition $definition;
-
     /**
      * @param Definition<T> $definition
      */
-    private function __construct(Definition $definition)
+    private function __construct(private Definition $definition)
     {
-        $this->definition = $definition;
     }
 
     /**

src/Adapter/Filesystem/Fold.php

@@ -29,15 +29,11 @@
  */
 final class Fold
 {
-    /** @var Definition<T> */
-    private Definition $definition;
-
     /**
      * @param Definition<T> $definition
      */
-    private function __construct(Definition $definition)
+    private function __construct(private Definition $definition)
     {
-        $this->definition = $definition;
     }
 
     /**

src/Adapter/Repository.php

@@ -48,8 +48,8 @@ public function remove(Aggregate\Id $id): Attempt;
     public function removeAll(Specification $specification): Attempt;
 
     /**
-     * @param ?positive-int $drop
-     * @param ?positive-int $take
+     * @param ?int<1, max> $drop
+     * @param ?int<1, max> $take
      *
      * @return Sequence<Aggregate>
      */
@@ -61,7 +61,7 @@ public function fetch(
     ): Sequence;
 
     /**
-     * @return 0|positive-int
+     * @return int<0, max>
      */
     public function size(?Specification $specification = null): int;
 

src/Adapter/Repository/CrossAggregateMatching.php

@@ -12,8 +12,8 @@ interface CrossAggregateMatching
     /**
      * @psalm-mutation-free
      *
-     * @param ?positive-int $drop
-     * @param ?positive-int $take
+     * @param ?int<1, max> $drop
+     * @param ?int<1, max> $take
      *
      * @return Maybe<SubMatch>
      */

src/Adapter/Repository/SubMatch.php

@@ -9,11 +9,8 @@
  */
 final class SubMatch
 {
-    private mixed $value;
-
-    private function __construct(mixed $value)
+    private function __construct(private mixed $value)
     {
-        $this->value = $value;
     }
 
     /**

src/Adapter/SQL/Encode.php

@@ -14,15 +14,11 @@
  */
 final class Encode
 {
-    /** @var MainTable<T> */
-    private MainTable $mainTable;
-
     /**
      * @param MainTable<T> $mainTable
      */
-    private function __construct(MainTable $mainTable)
+    private function __construct(private MainTable $mainTable)
     {
-        $this->mainTable = $mainTable;
     }
 
     /**

src/Adapter/SQL/Repository.php

@@ -230,7 +230,7 @@ public function size(?Specification $specification = null): int
     {
         $count = $this->mainTable->count($specification);
 
-        /** @var 0|positive-int SQL count() should never return a negative value */
+        /** @var int<0, max> SQL count() should never return a negative value */
         return ($this->connection)($count)
             ->first()
             ->flatMap(static fn($row) => $row->column('count'))

src/Adapter/SQL/ShowCreateTable.php

@@ -14,21 +14,14 @@
 
 final class ShowCreateTable
 {
-    private Aggregates $aggregates;
-    private MapType $mapType;
-    private bool $ifNotExists;
-
     /**
      * @psalm-mutation-free
      */
     private function __construct(
-        Aggregates $aggregates,
-        MapType $mapType,
-        bool $ifNotExists,
+        private Aggregates $aggregates,
+        private MapType $mapType,
+        private bool $ifNotExists,
     ) {
-        $this->aggregates = $aggregates;
-        $this->mapType = $mapType;
-        $this->ifNotExists = $ifNotExists;
     }
 
     /**

src/Adapter/SQL/SubQuery.php

@@ -18,19 +18,13 @@ final class SubQuery implements Comparator
 {
     use Composable;
 
-    /** @var non-empty-string */
-    private string $property;
-    private Query $query;
-
     /**
      * @param non-empty-string $property
      */
     private function __construct(
-        string $property,
-        Query $query,
+        private string $property,
+        private Query $query,
     ) {
-        $this->property = $property;
-        $this->query = $query;
     }
 
     /**

src/Adapter/SQL/Transaction.php

@@ -20,11 +20,8 @@
  */
 final class Transaction implements TransactionInterface
 {
-    private Connection $connection;
-
-    private function __construct(Connection $connection)
+    private function __construct(private Connection $connection)
     {
-        $this->connection = $connection;
     }
 
     /**

src/Adapter/SQL/Update.php

@@ -14,15 +14,11 @@
  */
 final class Update
 {
-    /** @var MainTable<T> */
-    private MainTable $mainTable;
-
     /**
      * @param MainTable<T> $mainTable
      */
-    private function __construct(MainTable $mainTable)
+    private function __construct(private MainTable $mainTable)
     {
-        $this->mainTable = $mainTable;
     }
 
     /**