@synnaxlabs/x 0.49.2 → 0.49.3

package/src/telem/telem.spec.ts

@@ -1478,7 +1478,7 @@ describe("TimeRange", () => {
     });
   });
 
-  describe("simplify", () => {
+  describe("merge", () => {
     it("should merge overlapping time ranges", () => {
       const trs = [
         new TimeRange(TimeSpan.seconds(1), TimeSpan.seconds(4)),
@@ -1486,45 +1486,33 @@ describe("TimeRange", () => {
         new TimeRange(TimeSpan.seconds(3), TimeSpan.seconds(5)),
         new TimeRange(TimeSpan.seconds(6), TimeSpan.seconds(7)),
       ];
-      const expected = [
-        new TimeRange(TimeSpan.seconds(1), TimeSpan.seconds(5)),
-        new TimeRange(TimeSpan.seconds(6), TimeSpan.seconds(7)),
-      ];
-      const simplified = TimeRange.simplify(trs);
-      expect(simplified).toEqual(expected);
+      const expected = new TimeRange(TimeSpan.seconds(1), TimeSpan.seconds(7));
+      const merged = TimeRange.merge(...trs);
+      expect(merged).toEqual(expected);
     });
     it("should merge time ranges that are adjacent", () => {
       const trs = [
         new TimeRange(TimeSpan.seconds(1), TimeSpan.seconds(4)),
         new TimeRange(TimeSpan.seconds(4), TimeSpan.seconds(5)),
       ];
-      const expected = [new TimeRange(TimeSpan.seconds(1), TimeSpan.seconds(5))];
-      const simplified = TimeRange.simplify(trs);
-      expect(simplified).toEqual(expected);
-    });
-    it("should remove zero length time ranges", () => {
-      const trs = [
-        new TimeRange(TimeSpan.seconds(1), TimeSpan.seconds(4)),
-        new TimeRange(TimeSpan.seconds(5), TimeSpan.seconds(5)),
-      ];
-      const expected = [new TimeRange(TimeSpan.seconds(1), TimeSpan.seconds(4))];
-      const simplified = TimeRange.simplify(trs);
-      expect(simplified).toEqual(expected);
+      const expected = new TimeRange(TimeSpan.seconds(1), TimeSpan.seconds(5));
+      const merged = TimeRange.merge(...trs);
+      expect(merged).toEqual(expected);
     });
     it("should make ranges valid by swapping start and end", () => {
       const trs = [
         new TimeRange(TimeSpan.seconds(4), TimeSpan.seconds(1)),
         new TimeRange(TimeSpan.seconds(2), TimeSpan.seconds(3)),
       ];
-      const expected = [new TimeRange(TimeSpan.seconds(1), TimeSpan.seconds(4))];
-      const simplified = TimeRange.simplify(trs);
-      expect(simplified).toEqual(expected);
+      const expected = new TimeRange(TimeSpan.seconds(1), TimeSpan.seconds(4));
+      const merged = TimeRange.merge(...trs);
+      expect(merged).toEqual(expected);
     });
     it("should work with zero ranges", () => {
       const trs: TimeRange[] = [];
-      const expected: TimeRange[] = [];
-      const simplified = TimeRange.simplify(trs);
-      expect(simplified).toEqual(expected);
+      const expected = TimeRange.MAX.swap();
+      const merged = TimeRange.merge(...trs);
+      expect(merged).toEqual(expected);
     });
   });
   describe("numericBounds", () => {

package/src/telem/telem.ts

@@ -1680,28 +1680,14 @@ export class TimeRange implements primitive.Stringer {
   }
 
   /**
-   * Simplify takes the list of `TimeRange`s, makes all of them valid, sorts them, and
-   * merges any overlapping ranges.
-   *
-   * @param ranges - The list of `TimeRange`s to simplify.
-   * @returns A list of simplified `TimeRange`s.
-   */
-  static simplify(ranges: TimeRange[]): TimeRange[] {
-    return ranges
-      .map((r) => r.makeValid())
-      .sort((a, b) => TimeRange.sort(a, b))
-      .reduce<TimeRange[]>((simplified, range) => {
-        if (range.span.isZero) return simplified;
-        if (simplified.length === 0) {
-          simplified.push(range);
-          return simplified;
-        }
-        const last = simplified[simplified.length - 1];
-        if (last.overlapsWith(range) || last.end.equals(range.start))
-          last.end = TimeStamp.max(last.end, range.end);
-        else simplified.push(range);
-        return simplified;
-      }, []);
+   * Merges the given time ranges into a single time range.
+   *
+   * @param ranges - The list of `CrudeTimeRange`s to merge.
+   * @returns A new `TimeRange` that is the union of the given time ranges - the start
+   * is the minimum of the start times and the end is the maximum of the end times.
+   */
+  static merge(...ranges: CrudeTimeRange[]): TimeRange {
+    return TimeRange.max(...ranges.map((r) => new TimeRange(r).makeValid()));
   }
 }