wip

src/Trend.php

@@ -124,10 +124,22 @@ public function count(string $column = '*'): Collection
 
     public function mapValuesToDates(Collection $values): Collection
     {
-        return $this->getDatePeriod()
-            ->flatMap(fn (Carbon $date) => [$date->format($this->getCarbonDateFormat()) => 0])
-            ->merge($values->flatMap(fn ($value) => [$value->date => $value->aggregate]))
-            ->sortKeys();
+        $values = $values->map(fn ($value) => new TrendValue(
+            date: $value->date,
+            aggregate: $value->aggregate,
+        ));
+
+        $placeholders = $this->getDatePeriod()->map(
+            fn (Carbon $date) => new TrendValue(
+                date: $date->format($this->getCarbonDateFormat()),
+                aggregate: 0,
+            )
+        );
+
+        return $values
+            ->merge($placeholders)
+            ->unique('date')
+            ->flatten();
     }
 
     protected function getDatePeriod(): Collection

src/TrendValue.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Flowframe\Trend;
+
+class TrendValue
+{
+    public function __construct(
+        public string $date,
+        public mixed $aggregate,
+    ) {
+    }
+}