Fix Interval.splitAt datetime sorting (#1524)

moment · Oct 14, 2023 · c8a8fa2 · c8a8fa2
1 parent 1b8679e
commit c8a8fa2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/interval.js b/src/interval.js
@@ -320,7 +320,7 @@ export default class Interval {
     const sorted = dateTimes
         .map(friendlyDateTime)
         .filter((d) => this.contains(d))
-        .sort(),
+        .sort((a, b) => a.toMillis() - b.toMillis()),
       results = [];
     let { s } = this,
       i = 0;

diff --git a/test/interval/many.test.js b/test/interval/many.test.js
@@ -301,6 +301,24 @@ test("Interval#splitAt ignores times outside the interval", () => {
   expect(oneAfterOneDuring[1]).toEqual(todayFrom(11, 13));
 });
 
+test("Interval#splitAt handles DST shifts", () => {
+  const zone = "Europe/Berlin";
+  const dayStart = DateTime.fromISO("2023-10-29T00:00:00+02:00", { zone });
+  const dayEnd = DateTime.fromISO("2023-10-30T00:00:00+01:00", { zone });
+  const dstShiftStart = DateTime.fromISO("2023-10-29T02:00:00+02:00", { zone });
+  const dstShiftEnd = DateTime.fromISO("2023-10-29T02:00:00+01:00", { zone });
+
+  const splitByDSTStartAndEnd = Interval.fromDateTimes(dayStart, dayEnd)
+    .splitAt(dstShiftStart, dstShiftEnd)
+    .map((i) => i.toISO());
+
+  expect(splitByDSTStartAndEnd).toEqual([
+    "2023-10-29T00:00:00.000+02:00/2023-10-29T02:00:00.000+02:00",
+    "2023-10-29T02:00:00.000+02:00/2023-10-29T02:00:00.000+01:00",
+    "2023-10-29T02:00:00.000+01:00/2023-10-30T00:00:00.000+01:00",
+  ]);
+});
+
 //-------
 // #splitBy()
 //-------