Merge branch 'master' into release

Author: sadespresso

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.1.0
+
+- Fixed `LocalWeekTimeRange` and `IsoWeekTimeRange`'s `to` being 1 microsecond ahead
+- Now you can parse/serialize `TimeRange` by calling `TimeRange.parse()` and `TimeRange.toString()`
+
 ## 2.0.2
 
 - Expose `PageableRange`

lib/src/time_range.dart

@@ -130,6 +130,74 @@ abstract class TimeRange {
   @override
   int get hashCode => Object.hash(from, to, isUtc);
 
+  /// You can reconstruct [this] by passing the return value to
+  /// [TimeRange.parse].
+  ///
+  /// Serializes [DateTime] to ISO 8601 string, therefore preserves
+  /// [from] and [to]'s timezone information.
   @override
-  String toString() => "TimeRange($from -> $to)";
+  String toString() {
+    if (this is HourTimeRange) {
+      return "HourTimeRange:${from.toIso8601String()}";
+    }
+    if (this is DayTimeRange) {
+      return "DayTimeRange:${from.toIso8601String()}";
+    }
+    if (this is LocalWeekTimeRange) {
+      return "LocalWeekTimeRange:${from.toIso8601String()}";
+    }
+    if (this is MonthTimeRange) {
+      return "MonthTimeRange:${from.toIso8601String()}";
+    }
+    if (this is YearTimeRange) {
+      return "YearTimeRange:${from.toIso8601String()}";
+    }
+
+    return "CustomTimeRange:${from.toIso8601String()}:${to.toIso8601String()}";
+  }
+
+  /// Parses string generated by [toString]
+  ///
+  /// Throws [FormatException] if the string is not in the correct format
+  static TimeRange parse(String serialized) {
+    final TimeRange? result = tryParse(serialized);
+
+    if (result == null) {
+      throw const FormatException(
+        "Cannot parse TimeRange from serialized string",
+      );
+    }
+
+    return result;
+  }
+
+  /// Parses string generated by [toString]
+  ///
+  /// Returns null in any case of failure
+  static TimeRange? tryParse(String serialized) {
+    final List<String> parts = serialized.split(":");
+
+    if (parts.length < 2) return null;
+
+    final DateTime? from = DateTime.tryParse(parts[1]);
+    final DateTime? to = parts.length > 2 ? DateTime.tryParse(parts[2]) : null;
+
+    if (from == null) return null;
+    if (parts.first == "CustomTimeRange" && to == null) return null;
+
+    switch (parts[0]) {
+      case "HourTimeRange":
+        return HourTimeRange.fromDateTime(from);
+      case "DayTimeRange":
+        return DayTimeRange.fromDateTime(from);
+      case "LocalWeekTimeRange":
+        return LocalWeekTimeRange(from);
+      case "MonthTimeRange":
+        return MonthTimeRange.fromDateTime(from);
+      case "YearTimeRange":
+        return YearTimeRange.fromDateTime(from);
+      default:
+        return CustomTimeRange(from, to!);
+    }
+  }
 }

lib/src/time_range/week.dart

@@ -9,7 +9,7 @@ class LocalWeekTimeRange extends CustomTimeRange
   LocalWeekTimeRange(DateTime dateTime, [this.weekStart])
       : super(
           dateTime.startOfLocalWeek(weekStart),
-          dateTime.startOfNextLocalWeek(weekStart),
+          dateTime.endOfLocalWeek(weekStart),
         );
 
   @override
@@ -28,7 +28,7 @@ class LocalWeekTimeRange extends CustomTimeRange
 class IsoWeekTimeRange extends CustomTimeRange
     with PageableRange<IsoWeekTimeRange> {
   IsoWeekTimeRange(DateTime dateTime)
-      : super(dateTime.startOfLocalWeek(1), dateTime.startOfNextLocalWeek(1));
+      : super(dateTime.startOfLocalWeek(1), dateTime.endOfLocalWeek(1));
 
   int get weekYear => from.weekYear;
   int get week => from.week;

pubspec.yaml

@@ -1,6 +1,6 @@
 name: moment_dart
 description: Multi-purpose immutable DateTime subclass. Supports multiple localizations to easily convert DateTime and Duration into human-readable format
-version: 2.0.2
+version: 2.1.0
 homepage: https://github.com/sadespresso/moment_dart
 issue_tracker: https://github.com/sadespresso/moment_dart/issues
 funding: