fix pageable time range

Author: sadespresso

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.3.0
+
+- Fixed where `PageableRange.next` and/or `PageableRange.last` could end up with
+  illegal values such as month=13, day=32, etc...
+
 ## 3.2.1
 
 - Make static analyzer happy; +10 pts to Gryffindor

lib/src/time_range/day.dart

@@ -9,16 +9,38 @@ class DayTimeRange extends TimeRange with PageableRange<DayTimeRange> {
   final int month;
   final int day;
 
-  /// Please note that [hour], [minute], [second], [millisecond], [microsecond]
-  /// will be ignored.
-  const DayTimeRange(
+  factory DayTimeRange(
+    int year,
+    int month,
+    int day, {
+    bool isUtc = false,
+  }) {
+    final DateTime dateTime = DateTimeConstructors.withTimezone(
+      isUtc,
+      year,
+      month,
+      day,
+    );
+
+    return DayTimeRange._internal(
+      dateTime.year,
+      dateTime.month,
+      dateTime.day,
+      isUtc: dateTime.isUtc,
+    );
+  }
+
+  const DayTimeRange._internal(
     this.year,
     this.month,
     this.day, {
     this.isUtc = false,
   }) : assert(month > 0 && month <= 12 && day > 0 && day <= 31);
 
   /// Will preserve the timezone of [dateTime]
+  ///
+  /// Please note that [hour], [minute], [second], [millisecond], [microsecond]
+  /// will be ignored.
   factory DayTimeRange.fromDateTime(DateTime dateTime) => DayTimeRange(
         dateTime.year,
         dateTime.month,

lib/src/time_range/hour.dart

@@ -12,7 +12,33 @@ class HourTimeRange extends TimeRange with PageableRange<HourTimeRange> {
 
   /// Please note that  [minute], [second], [millisecond], [microsecond]
   /// will be ignored.
-  const HourTimeRange(
+  factory HourTimeRange(
+    int year,
+    int month,
+    int day,
+    int hour, {
+    bool isUtc = false,
+  }) {
+    final DateTime dateTime = DateTimeConstructors.withTimezone(
+      isUtc,
+      year,
+      month,
+      day,
+      hour,
+    );
+
+    return HourTimeRange._internal(
+      dateTime.year,
+      dateTime.month,
+      dateTime.day,
+      dateTime.hour,
+      isUtc: dateTime.isUtc,
+    );
+  }
+
+  /// Please note that  [minute], [second], [millisecond], [microsecond]
+  /// will be ignored.
+  const HourTimeRange._internal(
     this.year,
     this.month,
     this.day,

lib/src/time_range/month.dart

@@ -8,15 +8,25 @@ class MonthTimeRange extends TimeRange with PageableRange<MonthTimeRange> {
   final int year;
   final int month;
 
-  /// Please note that [day], [hour], [minute], [second], [millisecond], [microsecond]
-  /// will be ignored.
-  const MonthTimeRange(
+  factory MonthTimeRange(
+    int year,
+    int month, {
+    bool isUtc = false,
+  }) {
+    final DateTime date = DateTimeConstructors.withTimezone(isUtc, year, month);
+    return MonthTimeRange._internal(date.year, date.month, isUtc: date.isUtc);
+  }
+
+  const MonthTimeRange._internal(
     this.year,
     this.month, {
     this.isUtc = false,
   }) : assert(month > 0 && month <= 12);
 
   /// Will preserve the timezone of [dateTime]
+  ///
+  /// Please note that [day], [hour], [minute], [second], [millisecond], [microsecond]
+  /// will be ignored.
   factory MonthTimeRange.fromDateTime(DateTime dateTime) => MonthTimeRange(
         dateTime.year,
         dateTime.month,

lib/src/time_range/year.dart

@@ -7,7 +7,15 @@ class YearTimeRange extends TimeRange with PageableRange<YearTimeRange> {
 
   final int year;
 
-  const YearTimeRange(
+  factory YearTimeRange(
+    int year, {
+    bool isUtc = false,
+  }) {
+    final DateTime dateTime = DateTimeConstructors.withTimezone(isUtc, year);
+    return YearTimeRange._internal(dateTime.year, isUtc: dateTime.isUtc);
+  }
+
+  const YearTimeRange._internal(
     this.year, {
     this.isUtc = false,
   });

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: 3.2.1
+version: 3.3.0
 homepage: https://github.com/sadespresso/moment_dart
 issue_tracker: https://github.com/sadespresso/moment_dart/issues
 funding: