Improve Temporal set string formatting

Author: nyamsprod

src/Event.php

@@ -6,6 +6,8 @@
 
 use JsonSerializable;
 
+use function explode;
+
 final class Event implements HasIdentifiers, JsonSerializable
 {
     private function __construct(
@@ -24,25 +26,34 @@ public static function at(Time $time, Identifiers|string $identifier = new Ident
         return new self($time, !$identifier instanceof Identifiers ? new Identifiers($identifier) : $identifier);
     }
 
+    /**
+     * @see TimeFormat::decode()
+     *
+     * @throws InvalidTime|TemporalException
+     */
+    public static function fromFormat(string $value, TimeFormat $format = TimeFormat::Iso8601): self
+    {
+        [$time, $identifiers] = explode(';', $value, 2) + [1 => ''];
+
+        return new self(Time::fromFormat($time, $format), Identifiers::fromFormat($identifiers));
+    }
+
     /**
      * @see IntervalFormat::encode()
      *
      * @return non-empty-string
      */
     public function format(TimeFormat $format = TimeFormat::Iso8601): string
     {
-        return $format->encode($this->at).' -> '.$this->identifier->formatted();
+        return $format->encode($this->at).';'.$this->identifier->formatted();
     }
 
     /**
-     * @return array{at: Time, identifiers: Identifiers}
+     * @return non-empty-string
      */
-    public function jsonSerialize(): mixed
+    public function jsonSerialize(): string
     {
-        return [
-            'at' => $this->at,
-            'identifiers' => $this->identifier,
-       ];
+        return $this->format();
     }
 
     public function identifiers(): Identifiers

src/Identifiers.php

@@ -13,9 +13,11 @@
 use function array_filter;
 use function array_keys;
 use function count;
+use function explode;
 use function implode;
 use function in_array;
 use function is_string;
+use function preg_match;
 use function sort;
 use function trim;
 
@@ -93,6 +95,16 @@ private static function filterIdentifiers(Identifiers|HasIdentifiers|iterable|st
         return $filteredData;
     }
 
+    /**
+     * @throws TemporalException
+     */
+    public static function fromFormat(string $value): self
+    {
+        $value = trim($value);
+
+        return '' === $value ? new self() : new self(explode(',', $value)); /* @phpstan-ignore-line  */
+    }
+
     /**
      * @param InputIdentifiers ...$others
      *
@@ -238,6 +250,8 @@ public function __serialize(): array
 
     /**
      * @param array{0: array{identifiers: list<non-empty-string>}, 1: array{}} $data
+     *
+     * @throws TemporalException
      */
     public function __unserialize(array $data): void
     {

src/Task.php

@@ -6,6 +6,8 @@
 
 use JsonSerializable;
 
+use function explode;
+
 final readonly class Task implements HasIdentifiers, JsonSerializable
 {
     private function __construct(
@@ -30,14 +32,23 @@ public function identifiers(): Identifiers
     }
 
     /**
-     * @return array{period: Interval, identifiers: Identifiers}
+     * @return non-empty-string
      */
-    public function jsonSerialize(): array
+    public function jsonSerialize(): string
     {
-        return [
-            'period' => $this->period,
-            'identifiers' => $this->identifier,
-        ];
+        return $this->format();
+    }
+
+    /**
+     * @see IntervalFormat::decode()
+     *
+     * @throws InvalidInterval|TemporalException
+     */
+    public static function fromFormat(string $value, IntervalFormat $format = IntervalFormat::Iso8601StartDuration, ?Unit $unit = null): self
+    {
+        [$period, $identifiers] = explode(';', $value, 2) + [1 => ''];
+
+        return new self(Interval::fromFormat($period, $format, $unit), Identifiers::fromFormat($identifiers));
     }
 
     /**
@@ -47,7 +58,7 @@ public function jsonSerialize(): array
      */
     public function format(IntervalFormat $format = IntervalFormat::Iso8601StartDuration, ?Unit $unit = null): string
     {
-        return $format->encode($this->period, $unit).' => '.$this->identifier->formatted();
+        return $format->encode($this->period, $unit).';'.$this->identifier->formatted();
     }
 
     public function equals(Task $other): bool

src/TaskSetTest.php

@@ -39,9 +39,9 @@ public function test_union_merges_overlapping_tasks(): void
         $result = $set->union([$this->task('B', Interval::between(Time::at(11), Time::at(14)))]);
 
         self::assertEquals([
-            '[09:00:00,11:00:00) => A',
-            '[11:00:00,12:00:00) => A,B',
-            '[12:00:00,14:00:00) => B',
+            '[09:00:00,11:00:00);A',
+            '[11:00:00,12:00:00);A,B',
+            '[12:00:00,14:00:00);B',
         ], $this->format($result));
     }
 
@@ -59,8 +59,8 @@ public function test_intersect_returns_only_shared_intervals(): void
         $result = $a->intersect([$b]);
 
         self::assertEquals([
-            '[10:00:00,12:00:00) => A',
-            '[13:00:00,14:00:00) => B,A',
+            '[10:00:00,12:00:00);A',
+            '[13:00:00,14:00:00);B,A',
         ], $this->format($result));
     }
 
@@ -83,7 +83,7 @@ public function test_gaps_detect_missing_time(): void
 
         $gaps = $set->gaps();
 
-        self::assertEquals(['[11:00:00,13:00:00) => '], $this->format($gaps));
+        self::assertEquals(['[11:00:00,13:00:00);'], $this->format($gaps));
     }
 
     public function test_difference_returns_the_source_set_if_there_is_no_intersection(): void
@@ -103,8 +103,8 @@ public function test_difference_removes_middle_overlap(): void
         $result = $a->difference($b);
 
         self::assertEquals([
-            '[09:00:00,10:00:00) => A',
-            '[11:00:00,12:00:00) => A',
+            '[09:00:00,10:00:00);A',
+            '[11:00:00,12:00:00);A',
         ], $this->format($result));
     }
 
@@ -115,7 +115,7 @@ public function test_difference_with_no_overlap_returns_original(): void
         $result = $a->difference($b);
 
         self::assertEquals([
-            '[09:00:00,12:00:00) => A',
+            '[09:00:00,12:00:00);A',
         ], $this->format($result));
     }
 
@@ -140,8 +140,8 @@ public function test_difference_splits_multiple_tasks(): void
         $result = $a->difference($b);
 
         self::assertEquals([
-            '[09:00:00,10:00:00) => A',
-            '[12:00:00,13:00:00) => A2',
+            '[09:00:00,10:00:00);A',
+            '[12:00:00,13:00:00);A2',
         ], $this->format($result));
     }
 
@@ -164,7 +164,7 @@ public function test_difference_edge_touching_boundaries(): void
         $result = $a->difference($b);
 
         self::assertEquals([
-            '[09:00:00,12:00:00) => A',
+            '[09:00:00,12:00:00);A',
         ], $this->format($result));
     }