busroot-sdk 0.0.8-dev.2930158956 → 0.0.8-dev.2937171652

package/build/index.js

@@ -567,6 +567,8 @@ var require_times = __commonJS({
     exports2.fromSpecificHourString = fromSpecificHourString;
     exports2.plantWeekNumber = plantWeekNumber;
     exports2.plantWeekStart = plantWeekStart;
+    exports2.plantDayStart = plantDayStart;
+    exports2.plantProductionDate = plantProductionDate;
     exports2.addPlantDays = addPlantDays;
     exports2.getTimeRangeFromRangeCode = getTimeRangeFromRangeCode;
     exports2.getCoverage = getCoverage;
@@ -995,9 +997,24 @@ var require_times = __commonJS({
       return start;
     }
     var DAYS_PER_WEEK = 7;
+    function plantDayStart(date, dayStartHour) {
+      const start = date.clone().hour(dayStartHour);
+      const timezone = date.tz();
+      if (timezone && (0, moment_timezone_1.default)(start.valueOf()).tz(timezone).hour() !== dayStartHour) {
+        return (0, moment_timezone_1.default)(start.valueOf()).tz(timezone).add(1, "hour");
+      }
+      return start;
+    }
+    function plantProductionDate(instant, plant) {
+      const date = (0, moment_timezone_1.default)(instant).tz(plant.timezone).startOf("day");
+      if (instant < plantDayStart(date, plant.dayStartHour).valueOf()) {
+        date.subtract(1, "day");
+      }
+      return date;
+    }
     function plantDayRange(date, days, dayStartHour) {
-      const from = date.clone().add(dayStartHour, "hour").valueOf();
-      const to = date.clone().add(days, "days").add(dayStartHour, "hour").valueOf();
+      const from = plantDayStart(date, dayStartHour).valueOf();
+      const to = plantDayStart(date.clone().add(days, "days"), dayStartHour).valueOf();
       return timestampsToTimeRange({ from, to });
     }
     function addPlantDays(instant, days, timezone) {
@@ -1005,10 +1022,11 @@ var require_times = __commonJS({
     }
     function floorToPlantWeekStart(instant, plant) {
       const weekStartDay = plant.weekStartDay ?? 0;
-      return (0, moment_timezone_1.default)(instant).tz(plant.timezone).subtract(weekStartDay, "days").subtract(plant.dayStartHour, "hours").startOf("isoWeek").add(weekStartDay, "days").add(plant.dayStartHour, "hours").valueOf();
+      const weekStart = plantProductionDate(instant, plant).subtract(weekStartDay, "days").startOf("isoWeek").add(weekStartDay, "days");
+      return plantDayStart(weekStart, plant.dayStartHour).valueOf();
     }
     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();
+      return plantDayStart(plantProductionDate(instant, plant), plant.dayStartHour).valueOf();
     }
     var CUSTOM_RANGE_MINUTE_STEPS = {
       "5m": 5,
@@ -1063,19 +1081,18 @@ var require_times = __commonJS({
           return timestampsToTimeRange({ from: day.valueOf(), to: day.add(1, "hours").valueOf() });
         },
         // Every range below ends where the next one of its kind starts, built on the plant's local calendar
-        // (add whole days/months, then dayStartHour) and only then read as UTC. Adding a fixed n×24h instead
-        // would make a range that contains a daylight-saving change an hour too long or short, leaving gaps
-        // and overlaps between consecutive ranges.
+        // (add whole days/months, then set the hour to dayStartHour) and only then read as UTC. Adding a fixed
+        // n×24h instead would make a range that contains a daylight-saving change an hour too long or short,
+        // leaving gaps and overlaps between consecutive ranges.
         //
-        // TODAY/YESTERDAY: subtract dayStartHour before startOf("day") to find the
-        // correct production day boundary, then re-add it. This handles the case where
-        // e.g. it's 02:00 but the production day started at 06:00 the previous calendar day.
+        // TODAY/YESTERDAY: the production date containing `now` - e.g. at 02:00 with a 06:00 day start,
+        // the production day that started the previous calendar day.
         today: () => {
-          const date = (0, moment_timezone_1.default)(now).tz(plant.timezone).add(-plant.dayStartHour, "hour").startOf("day");
+          const date = plantProductionDate(now ?? Date.now(), plant);
           return plantDayRange(date, 1, plant.dayStartHour);
         },
         yesterday: () => {
-          const date = (0, moment_timezone_1.default)(now).tz(plant.timezone).add(-plant.dayStartHour, "hour").startOf("day").add(-1, "day");
+          const date = plantProductionDate(now ?? Date.now(), plant).subtract(1, "day");
           return plantDayRange(date, 1, plant.dayStartHour);
         },
         day: () => {
@@ -1087,7 +1104,7 @@ var require_times = __commonJS({
           return plantDayRange(week, DAYS_PER_WEEK, plant.dayStartHour);
         },
         month: () => {
-          const month = moment_timezone_1.default.tz(`${parseInt(parts[1])}_${parseInt(parts[2])}}`, "YYYY_MM", plant.timezone).startOf("month");
+          const month = moment_timezone_1.default.tz(`${parseInt(parts[1])}_${parseInt(parts[2])}`, "YYYY_MM", plant.timezone).startOf("month");
           return plantDayRange(month, month.daysInMonth(), plant.dayStartHour);
         },
         // QUARTER: 13 ISO weeks (14 for Q4 in 53-week years). Start at the first ISO week of the quarter,

package/package.json

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