busroot-sdk 0.0.8-dev.2797946662 → 0.0.8-dev.2803109172

package/build/index.js

@@ -1422,40 +1422,39 @@ var require_times = __commonJS({
     function floorToPlantDayStart(instant, plant) {
       return (0, moment_timezone_1.default)(instant).tz(plant.timezone).subtract(plant.dayStartHour, "hours").startOf("day").add(plant.dayStartHour, "hours").valueOf();
     }
+    var CUSTOM_RANGE_MINUTE_STEPS = {
+      "5m": 5,
+      "15m": 15,
+      "30m": 30
+    };
+    var CUSTOM_RANGE_CALENDAR_UNITS = {
+      "1h": { startOf: "hour", step: "hour" },
+      "1d": { startOf: "day", step: "day" },
+      "7d": { startOf: "isoWeek", step: "week" }
+    };
+    function snapCustomRangeEdge(timestamp, timezone, aggregateWindow, direction) {
+      if (aggregateWindow == null) {
+        return timestamp;
+      }
+      const edge = (0, moment_timezone_1.default)(timestamp).tz(timezone).startOf("minute");
+      const minuteStep = CUSTOM_RANGE_MINUTE_STEPS[aggregateWindow];
+      if (minuteStep != null) {
+        const offsetFromBoundary = edge.minute() % minuteStep;
+        return direction === "backward" ? edge.subtract(offsetFromBoundary, "minutes").valueOf() : edge.add((minuteStep - offsetFromBoundary) % minuteStep, "minutes").valueOf();
+      }
+      const calendarUnit = CUSTOM_RANGE_CALENDAR_UNITS[aggregateWindow];
+      if (calendarUnit == null) {
+        return timestamp;
+      }
+      const boundary = edge.clone().startOf(calendarUnit.startOf);
+      return direction === "backward" || boundary.valueOf() === edge.valueOf() ? boundary.valueOf() : boundary.add(1, calendarUnit.step).valueOf();
+    }
     function getTimeRangeFromRangeCode(range, plant, aggregateWindow, now) {
       if (range.custom != null && range.custom.from != null && range.custom.to != null) {
-        let fromTimestamp = range.custom.from;
-        let toTimestamp = range.custom.to;
-        const fromTimestampMomentStartOfMinute = (0, moment_timezone_1.default)(fromTimestamp).tz(plant?.timezone || "UTC").startOf("minute");
-        const toTimestampMomentStartOfMinute = (0, moment_timezone_1.default)(toTimestamp).tz(plant?.timezone || "UTC").startOf("minute");
-        const currentFromTimestampMinute = fromTimestampMomentStartOfMinute.minute();
-        const currentToTimestampMinute = toTimestampMomentStartOfMinute.minute();
-        if (aggregateWindow === "5m") {
-          fromTimestamp = fromTimestampMomentStartOfMinute.add((5 - currentFromTimestampMinute % 5) % 5, "minutes").valueOf();
-          toTimestamp = toTimestampMomentStartOfMinute.add((5 - currentToTimestampMinute % 5) % 5, "minutes").valueOf();
-        } else if (aggregateWindow === "15m") {
-          fromTimestamp = fromTimestampMomentStartOfMinute.add((15 - currentFromTimestampMinute % 15) % 15, "minutes").valueOf();
-          toTimestamp = toTimestampMomentStartOfMinute.add((15 - currentToTimestampMinute % 15) % 15, "minutes").valueOf();
-        } else if (aggregateWindow === "30m") {
-          fromTimestamp = fromTimestampMomentStartOfMinute.add((30 - currentFromTimestampMinute % 30) % 30, "minutes").valueOf();
-          toTimestamp = toTimestampMomentStartOfMinute.add((30 - currentToTimestampMinute % 30) % 30, "minutes").valueOf();
-        } else if (aggregateWindow === "1h") {
-          const fromStartOfHour = fromTimestampMomentStartOfMinute.clone().startOf("hour");
-          const toStartOfHour = toTimestampMomentStartOfMinute.clone().startOf("hour");
-          fromTimestamp = fromTimestampMomentStartOfMinute.valueOf() === fromStartOfHour.valueOf() ? fromStartOfHour.valueOf() : fromStartOfHour.add(1, "hour").valueOf();
-          toTimestamp = toTimestampMomentStartOfMinute.valueOf() === toStartOfHour.valueOf() ? toStartOfHour.valueOf() : toStartOfHour.add(1, "hour").valueOf();
-        } else if (aggregateWindow === "1d") {
-          const fromStartOfDay = fromTimestampMomentStartOfMinute.clone().startOf("day");
-          const toStartOfDay = toTimestampMomentStartOfMinute.clone().startOf("day");
-          fromTimestamp = fromTimestampMomentStartOfMinute.valueOf() === fromStartOfDay.valueOf() ? fromStartOfDay.valueOf() : fromStartOfDay.add(1, "day").valueOf();
-          toTimestamp = toTimestampMomentStartOfMinute.valueOf() === toStartOfDay.valueOf() ? toStartOfDay.valueOf() : toStartOfDay.add(1, "day").valueOf();
-        } else if (aggregateWindow === "7d") {
-          const fromStartOfWeek = fromTimestampMomentStartOfMinute.clone().startOf("isoWeek");
-          const toStartOfWeek = toTimestampMomentStartOfMinute.clone().startOf("isoWeek");
-          fromTimestamp = fromTimestampMomentStartOfMinute.valueOf() === fromStartOfWeek.valueOf() ? fromStartOfWeek.valueOf() : fromStartOfWeek.add(1, "week").valueOf();
-          toTimestamp = toTimestampMomentStartOfMinute.valueOf() === toStartOfWeek.valueOf() ? toStartOfWeek.valueOf() : toStartOfWeek.add(1, "week").valueOf();
-        }
-        return timestampsToTimeRange({ from: fromTimestamp, to: toTimestamp });
+        const timezone = plant?.timezone || "UTC";
+        const fromTimestamp = snapCustomRangeEdge(range.custom.from, timezone, aggregateWindow, "forward");
+        const toTimestamp = snapCustomRangeEdge(range.custom.to, timezone, aggregateWindow, "backward");
+        return timestampsToTimeRange({ from: fromTimestamp, to: Math.max(fromTimestamp, toTimestamp) });
       }
       if (range.code == null) {
         throw new Error("Either Range Code or custom Time Range required");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "busroot-sdk",
-  "version": "0.0.8-dev.2797946662",
+  "version": "0.0.8-dev.2803109172",
   "description": "An SDK for accessing Busroot from output.industries",
   "homepage": "https://www.output.industries",
   "main": "./build/index.js",