npm - @lighthouse/common - Versions diffs - 6.9.2 → 6.10.0-canary.0 - Mend

@lighthouse/common 6.9.2 → 6.10.0-canary.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

package/dist/scheduling/helpers/generateRepeatingSchedule.js CHANGED Viewed

@@ -1,11 +1,13 @@
 "use strict";
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.complyingServiceIntervalUnits = void 0;
 exports.generateRepeatingSchedule = generateRepeatingSchedule;
 var _fp = require("lodash/fp");
+var _momentTimezone = _interopRequireDefault(require("moment-timezone"));
 var _ = require(".");
 var _scheduling = require("../scheduling.types");
 var _generators = require("../generators");
@@ -47,7 +49,17 @@ function* generateRepeatingSchedule(props) {
     end,
     start
   });
-  if (!isStartAndEndValid) return [];
+  console.log('[generateRepeatingSchedule] INIT:', {
+    start: _momentTimezone.default.tz(start, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+    end: _momentTimezone.default.tz(end, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+    isStartAndEndValid,
+    frequencyUnit,
+    timezone
+  });
+  if (!isStartAndEndValid) {
+    console.log('[generateRepeatingSchedule] INVALID START/END - RETURNING EARLY');
+    return [];
+  }
   const serviceIntervalSequence = (0, _generators.serviceIntervalsGenerator)({
     end,
     serviceHours,
@@ -58,7 +70,20 @@ function* generateRepeatingSchedule(props) {
   // all service intervals otherwise service interval is from the start and end
   const complyToServiceHours = (0, _fp.includes)(frequencyUnit, complyingServiceIntervalUnits);
   const serviceIntervals = complyToServiceHours ? [...serviceIntervalSequence] : [[start, end]];
+  console.log('[generateRepeatingSchedule] SERVICE_INTERVALS:', {
+    count: serviceIntervals.length,
+    complyToServiceHours,
+    intervals: serviceIntervals.slice(0, 3).map(interval => ({
+      start: _momentTimezone.default.tz(interval[0], timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+      end: _momentTimezone.default.tz(interval[1], timezone).format('YYYY-MM-DD HH:mm:ss Z')
+    }))
+  });
+  let serviceIntervalIndex = 0;
   for (const serviceInterval of serviceIntervals) {
+    console.log(`[generateRepeatingSchedule] PROCESSING_SERVICE_INTERVAL[${serviceIntervalIndex}]:`, {
+      start: _momentTimezone.default.tz(serviceInterval[0], timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+      end: _momentTimezone.default.tz(serviceInterval[1], timezone).format('YYYY-MM-DD HH:mm:ss Z')
+    });
     yield {
       interval: serviceInterval,
       type: _scheduling.IntervalTypes.Service
@@ -69,16 +94,27 @@ function* generateRepeatingSchedule(props) {
       strategy,
       timezone
     });
+    let occurrenceCount = 0;
     for (const occurrenceInterval of occurrenceIntervalsSequence) {
+      console.log(`[generateRepeatingSchedule] OCCURRENCE[${occurrenceCount}]:`, {
+        start: _momentTimezone.default.tz(occurrenceInterval[0], timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+        end: _momentTimezone.default.tz(occurrenceInterval[1], timezone).format('YYYY-MM-DD HH:mm:ss Z')
+      });
       yield {
         interval: occurrenceInterval,
         type: _scheduling.IntervalTypes.Occurrence
       };
+      occurrenceCount++;
     }
+    console.log(`[generateRepeatingSchedule] SERVICE_INTERVAL[${serviceIntervalIndex}] COMPLETED:`, {
+      occurrenceCount
+    });
     // NOTE: we must reset isInitial to true following the first service
     // interval otherwise the occurrence will not start exactly on the next
     // service interval start time
     isInitial = true;
+    serviceIntervalIndex++;
   }
+  console.log('[generateRepeatingSchedule] COMPLETE');
 }

package/dist/scheduling/helpers/generateScheduleEnd.js CHANGED Viewed

@@ -26,6 +26,18 @@ function generateScheduleEnd({
   // NOTE: if frequency unit less than a week we must set end to jump a week
   // plus the interval length of the schedule frequency
   // so that we can ensure that we are within a service interval
-  const end = isFrequencyLessThanWeek ? mStart.add(2, _scheduling.Unit.Week).valueOf() : mStart.add(frequencyValue * 2, frequencyUnit).valueOf();
+  // MODIFIED FOR TESTING: Changed from 2 weeks to 1 hour for testing endless generation bug
+  const end = isFrequencyLessThanWeek ? mStart.add(1, _scheduling.Unit.Hour).valueOf() : mStart.add(frequencyValue * 2, frequencyUnit).valueOf();
+  console.log('[generateScheduleEnd] START:', {
+    start: _momentTimezone.default.tz(start, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+    frequency: `${frequencyValue}${frequencyUnit}`,
+    isFrequencyLessThanWeek,
+    timezone
+  });
+  console.log('[generateScheduleEnd] END CALCULATED:', {
+    end: _momentTimezone.default.tz(end, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+    endTimestamp: end,
+    durationFromStart: `${(0, _momentTimezone.default)(end).diff((0, _momentTimezone.default)(start), 'hours')} hours`
+  });
   return end;
 }

package/dist/scheduling/strategies/getNext.js CHANGED Viewed

@@ -32,6 +32,16 @@ function* getNext({
   } = frequency;
   let initial = isInitial;
   let dateCursor = initial ? _momentTimezone.default.tz(start, timezone).valueOf() : _momentTimezone.default.tz(start, timezone).add(1, _scheduling.Unit.Millisecond).valueOf();
+  console.log('[getNext] START:', {
+    strategy: type,
+    start: _momentTimezone.default.tz(start, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+    end: _momentTimezone.default.tz(end, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+    dateCursor: _momentTimezone.default.tz(dateCursor, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+    isInitial,
+    frequency: `${frequencyValue}${frequencyUnit}`,
+    duration: `${durationValue}${durationUnit}`
+  });
+  let occurrenceCount = 0;
   while (dateCursor < end) {
     let nextOccurrenceStart;
     let nextOccurrenceEnd;
@@ -49,12 +59,27 @@ function* getNext({
       nextOccurrenceStart = _momentTimezone.default.max(earliestNextOccurrenceStart, nextOccurrenceStartByBackCalculation).valueOf();
     }
     if (nextOccurrenceEnd <= nextOccurrenceStart || nextOccurrenceEnd > end) {
+      console.log('[getNext] BOUNDARY CHECK FAILED:', {
+        occurrenceCount,
+        nextOccurrenceStart: _momentTimezone.default.tz(nextOccurrenceStart, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+        nextOccurrenceEnd: _momentTimezone.default.tz(nextOccurrenceEnd, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+        end: _momentTimezone.default.tz(end, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+        condition: `(${nextOccurrenceEnd} <= ${nextOccurrenceStart}) || (${nextOccurrenceEnd} > ${end})`
+      });
       return;
     }
     if (nextOccurrenceStart >= start) {
       const nextOccurrence = [nextOccurrenceStart, nextOccurrenceEnd - 1];
+      console.log(`[getNext] OCCURRENCE[${occurrenceCount}]:`, {
+        start: _momentTimezone.default.tz(nextOccurrenceStart, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+        end: _momentTimezone.default.tz(nextOccurrenceEnd - 1, timezone).format('YYYY-MM-DD HH:mm:ss Z')
+      });
       yield nextOccurrence;
+      occurrenceCount++;
     }
     dateCursor = nextOccurrenceEnd;
   }
+  console.log('[getNext] COMPLETE:', {
+    occurrenceCount
+  });
 }

package/dist/scheduling/strategies/getNextWeekday.js CHANGED Viewed

@@ -32,20 +32,51 @@ function* getNextWeekday({
   } = frequency;
   let initial = isInitial;
   let dateCursor = initial ? _momentTimezone.default.tz(start, timezone).startOf(_scheduling.Unit.Week).valueOf() : _momentTimezone.default.tz(start, timezone).add(frequencyValue, frequencyUnit).startOf(_scheduling.Unit.Week).valueOf();
+  console.log('[getNextWeekday] START:', {
+    start: _momentTimezone.default.tz(start, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+    end: _momentTimezone.default.tz(end, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+    dateCursor: _momentTimezone.default.tz(dateCursor, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+    isInitial,
+    frequency: `${frequencyValue}${frequencyUnit}`,
+    duration: `${durationValue}${durationUnit}`,
+    weekdays
+  });
+  let occurrenceCount = 0;
+  let weekIteration = 0;
   while (dateCursor < end) {
+    console.log(`[getNextWeekday] WEEK_ITERATION[${weekIteration}]:`, {
+      dateCursor: _momentTimezone.default.tz(dateCursor, timezone).format('YYYY-MM-DD')
+    });
     for (const weekday of weekdays) {
       const nextOccurrenceEnd = _momentTimezone.default.tz(dateCursor, timezone).isoWeekday(weekday).add(1, _scheduling.Unit.Day).startOf(_scheduling.Unit.Day).valueOf();
       const nextOccurrenceStart = _momentTimezone.default.tz(nextOccurrenceEnd, timezone).subtract(durationValue, durationUnit).valueOf();
       if (nextOccurrenceEnd <= nextOccurrenceStart || nextOccurrenceEnd > end) {
+        console.log('[getNextWeekday] BOUNDARY CHECK FAILED:', {
+          occurrenceCount,
+          weekday,
+          nextOccurrenceStart: _momentTimezone.default.tz(nextOccurrenceStart, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+          nextOccurrenceEnd: _momentTimezone.default.tz(nextOccurrenceEnd, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+          end: _momentTimezone.default.tz(end, timezone).format('YYYY-MM-DD HH:mm:ss Z')
+        });
         return;
       }
       if (nextOccurrenceStart >= start) {
         const nextOccurrence = [nextOccurrenceStart, nextOccurrenceEnd - 1];
+        console.log(`[getNextWeekday] OCCURRENCE[${occurrenceCount}]:`, {
+          weekday,
+          start: _momentTimezone.default.tz(nextOccurrenceStart, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+          end: _momentTimezone.default.tz(nextOccurrenceEnd - 1, timezone).format('YYYY-MM-DD HH:mm:ss Z')
+        });
         yield nextOccurrence;
+        occurrenceCount++;
         initial = false;
       }
     }
     const nextDateCursor = _momentTimezone.default.tz(dateCursor, timezone).add(1, _scheduling.Unit.Week).valueOf();
     dateCursor = nextDateCursor;
+    weekIteration++;
   }
+  console.log('[getNextWeekday] COMPLETE:', {
+    occurrenceCount
+  });
 }

package/lib/scheduling/helpers/generateRepeatingSchedule.js CHANGED Viewed

@@ -5,6 +5,7 @@ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import { includes } from 'lodash/fp';
+import moment from 'moment-timezone';
 import { generateScheduleEnd, hasValidStartAndEnd } from '.';
 import { IntervalTypes, Unit } from '../scheduling.types';
 import { occurrenceIntervalsGenerator, serviceIntervalsGenerator } from '../generators';
@@ -14,7 +15,7 @@ export var complyingServiceIntervalUnits = [Unit.Second, Unit.Minute, Unit.Hour]
  * Generates repeating schedule service and occurrence intervals
  */
 export function generateRepeatingSchedule(props) {
-  var serviceHours, start, strategy, end, isInitial, frequency, frequencyUnit, timezone, isStartAndEndValid, serviceIntervalSequence, complyToServiceHours, serviceIntervals, _iterator, _step, serviceInterval, occurrenceIntervalsSequence, _iterator2, _step2, occurrenceInterval, _t, _t2;
+  var serviceHours, start, strategy, end, isInitial, frequency, frequencyUnit, timezone, isStartAndEndValid, serviceIntervalSequence, complyToServiceHours, serviceIntervals, serviceIntervalIndex, _iterator, _step, serviceInterval, occurrenceIntervalsSequence, occurrenceCount, _iterator2, _step2, occurrenceInterval, _t, _t2;
   return _regeneratorRuntime.wrap(function (_context) {
     while (1) switch (_context.prev = _context.next) {
       case 0:
@@ -33,10 +34,18 @@ export function generateRepeatingSchedule(props) {
           end: end,
           start: start
         });
+        console.log('[generateRepeatingSchedule] INIT:', {
+          start: moment.tz(start, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+          end: moment.tz(end, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+          isStartAndEndValid: isStartAndEndValid,
+          frequencyUnit: frequencyUnit,
+          timezone: timezone
+        });
         if (isStartAndEndValid) {
           _context.next = 1;
           break;
         }
+        console.log('[generateRepeatingSchedule] INVALID START/END - RETURNING EARLY');
         return _context.abrupt("return", []);
       case 1:
         serviceIntervalSequence = serviceIntervalsGenerator({
@@ -47,15 +56,30 @@ export function generateRepeatingSchedule(props) {
         // all service intervals otherwise service interval is from the start and end
         complyToServiceHours = includes(frequencyUnit, complyingServiceIntervalUnits);
         serviceIntervals = complyToServiceHours ? _toConsumableArray(serviceIntervalSequence) : [[start, end]];
+        console.log('[generateRepeatingSchedule] SERVICE_INTERVALS:', {
+          count: serviceIntervals.length,
+          complyToServiceHours: complyToServiceHours,
+          intervals: serviceIntervals.slice(0, 3).map(function (interval) {
+            return {
+              start: moment.tz(interval[0], timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+              end: moment.tz(interval[1], timezone).format('YYYY-MM-DD HH:mm:ss Z')
+            };
+          })
+        });
+        serviceIntervalIndex = 0;
         _iterator = _createForOfIteratorHelper(serviceIntervals);
         _context.prev = 2;
         _iterator.s();
       case 3:
         if ((_step = _iterator.n()).done) {
-          _context.next = 13;
+          _context.next = 14;
           break;
         }
         serviceInterval = _step.value;
+        console.log("[generateRepeatingSchedule] PROCESSING_SERVICE_INTERVAL[".concat(serviceIntervalIndex, "]:"), {
+          start: moment.tz(serviceInterval[0], timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+          end: moment.tz(serviceInterval[1], timezone).format('YYYY-MM-DD HH:mm:ss Z')
+        });
         _context.next = 4;
         return {
           interval: serviceInterval,
@@ -68,57 +92,71 @@ export function generateRepeatingSchedule(props) {
           strategy: strategy,
           timezone: timezone
         });
+        occurrenceCount = 0;
         _iterator2 = _createForOfIteratorHelper(occurrenceIntervalsSequence);
         _context.prev = 5;
         _iterator2.s();
       case 6:
         if ((_step2 = _iterator2.n()).done) {
-          _context.next = 8;
+          _context.next = 9;
           break;
         }
         occurrenceInterval = _step2.value;
+        console.log("[generateRepeatingSchedule] OCCURRENCE[".concat(occurrenceCount, "]:"), {
+          start: moment.tz(occurrenceInterval[0], timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+          end: moment.tz(occurrenceInterval[1], timezone).format('YYYY-MM-DD HH:mm:ss Z')
+        });
         _context.next = 7;
         return {
           interval: occurrenceInterval,
           type: IntervalTypes.Occurrence
         };
       case 7:
-        _context.next = 6;
-        break;
+        occurrenceCount++;
       case 8:
-        _context.next = 10;
+        _context.next = 6;
         break;
       case 9:
-        _context.prev = 9;
-        _t = _context["catch"](5);
-        _iterator2.e(_t);
+        _context.next = 11;
+        break;
       case 10:
         _context.prev = 10;
-        _iterator2.f();
-        return _context.finish(10);
+        _t = _context["catch"](5);
+        _iterator2.e(_t);
       case 11:
+        _context.prev = 11;
+        _iterator2.f();
+        return _context.finish(11);
+      case 12:
+        console.log("[generateRepeatingSchedule] SERVICE_INTERVAL[".concat(serviceIntervalIndex, "] COMPLETED:"), {
+          occurrenceCount: occurrenceCount
+        });
         // NOTE: we must reset isInitial to true following the first service
         // interval otherwise the occurrence will not start exactly on the next
         // service interval start time
         isInitial = true;
-      case 12:
-        _context.next = 3;
-        break;
+        serviceIntervalIndex++;
       case 13:
-        _context.next = 15;
+        _context.next = 3;
         break;
       case 14:
-        _context.prev = 14;
-        _t2 = _context["catch"](2);
-        _iterator.e(_t2);
+        _context.next = 16;
+        break;
       case 15:
         _context.prev = 15;
-        _iterator.f();
-        return _context.finish(15);
+        _t2 = _context["catch"](2);
+        _iterator.e(_t2);
       case 16:
+        _context.prev = 16;
+        _iterator.f();
+        return _context.finish(16);
+      case 17:
+        console.log('[generateRepeatingSchedule] COMPLETE');
+      case 18:
       case "end":
         return _context.stop();
     }
-  }, _marked, null, [[2, 14, 15, 16], [5, 9, 10, 11]]);
+  }, _marked, null, [[2, 15, 16, 17], [5, 10, 11, 12]]);
 }
 //# sourceMappingURL=generateRepeatingSchedule.js.map

package/lib/scheduling/helpers/generateRepeatingSchedule.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generateRepeatingSchedule.js","names":["generateRepeatingSchedule","_createForOfIteratorHelper","r","e","t","Symbol","iterator","Array","isArray","_unsupportedIterableToArray","length","_n","F","s","n","done","value","f","TypeError","o","a","u","call","next","return","_arrayLikeToArray","toString","slice","constructor","name","from","test","includes","generateScheduleEnd","hasValidStartAndEnd","IntervalTypes","Unit","occurrenceIntervalsGenerator","serviceIntervalsGenerator","complyingServiceIntervalUnits","Second","Minute","Hour","props","serviceHours","start","strategy","end","isInitial","frequency","frequencyUnit","timezone","isStartAndEndValid","serviceIntervalSequence","complyToServiceHours","serviceIntervals","_iterator","_step","serviceInterval","occurrenceIntervalsSequence","_iterator2","_step2","occurrenceInterval","_t","_t2","_regeneratorRuntime","wrap","_context","prev","options","unit","abrupt","_toConsumableArray","interval","type","Service","Occurrence","finish","stop","_marked"],"sources":["../../../src/scheduling/helpers/generateRepeatingSchedule.ts"],"sourcesContent":["import { includes } from 'lodash/fp'\n\nimport { generateScheduleEnd, hasValidStartAndEnd } from '.'\nimport {\n IntervalTypes,\n ScheduleIntervalsGenerator,\n Unit,\n} from '../scheduling.types'\nimport {\n occurrenceIntervalsGenerator,\n serviceIntervalsGenerator,\n} from '../generators'\n\nexport const complyingServiceIntervalUnits = [\n Unit.Second,\n Unit.Minute,\n Unit.Hour,\n]\n\n/*\n Generates repeating schedule service and occurrence intervals\n /\nexport function generateRepeatingSchedule(props: ScheduleIntervalsGenerator) {\n const { serviceHours, start, strategy } = props\n let { end, isInitial } = props\n\n // NOTE support never ending repeating schedule where no end date defined by\n // setting a custom end date using the frequency unit and value\n const {\n options: { frequency },\n } = strategy\n const { unit: frequencyUnit } = frequency\n const { timezone } = serviceHours\n\n end = end \|\| generateScheduleEnd({ frequency, start, timezone })\n\n const isStartAndEndValid = hasValidStartAndEnd({ end, start })\n\n if (!isStartAndEndValid) return []\n\n const serviceIntervalSequence = serviceIntervalsGenerator({\n end,\n serviceHours,\n start,\n })\n\n // NOTE: when repeating and is complying to service hours we iterate through\n // all service intervals otherwise service interval is from the start and end\n const complyToServiceHours = includes(\n frequencyUnit,\n complyingServiceIntervalUnits\n )\n\n const serviceIntervals = complyToServiceHours\n ? [...serviceIntervalSequence]\n : [[start, end]]\n\n for (const serviceInterval of serviceIntervals) {\n yield { interval: serviceInterval, type: IntervalTypes.Service }\n\n const occurrenceIntervalsSequence = occurrenceIntervalsGenerator({\n isInitial,\n serviceInterval,\n strategy,\n timezone,\n })\n\n for (const occurrenceInterval of occurrenceIntervalsSequence) {\n yield { interval: occurrenceInterval, type: IntervalTypes.Occurrence }\n }\n\n // NOTE: we must reset isInitial to true following the first service\n // interval otherwise the occurrence will not start exactly on the next\n // service interval start time\n isInitial = true\n }\n}\n"],"mappings":"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","ignoreList":[]}
1	+ {"version":3,"file":"generateRepeatingSchedule.js","names":["generateRepeatingSchedule","_createForOfIteratorHelper","r","e","t","Symbol","iterator","Array","isArray","_unsupportedIterableToArray","length","_n","F","s","n","done","value","f","TypeError","o","a","u","call","next","return","_arrayLikeToArray","toString","slice","constructor","name","from","test","includes","moment","generateScheduleEnd","hasValidStartAndEnd","IntervalTypes","Unit","occurrenceIntervalsGenerator","serviceIntervalsGenerator","complyingServiceIntervalUnits","Second","Minute","Hour","props","serviceHours","start","strategy","end","isInitial","frequency","frequencyUnit","timezone","isStartAndEndValid","serviceIntervalSequence","complyToServiceHours","serviceIntervals","serviceIntervalIndex","_iterator","_step","serviceInterval","occurrenceIntervalsSequence","occurrenceCount","_iterator2","_step2","occurrenceInterval","_t","_t2","_regeneratorRuntime","wrap","_context","prev","options","unit","console","log","tz","format","abrupt","_toConsumableArray","count","intervals","map","interval","concat","type","Service","Occurrence","finish","stop","_marked"],"sources":["../../../src/scheduling/helpers/generateRepeatingSchedule.ts"],"sourcesContent":["import { includes } from 'lodash/fp'\nimport moment from 'moment-timezone'\n\nimport { generateScheduleEnd, hasValidStartAndEnd } from '.'\nimport {\n IntervalTypes,\n ScheduleIntervalsGenerator,\n Unit,\n} from '../scheduling.types'\nimport {\n occurrenceIntervalsGenerator,\n serviceIntervalsGenerator,\n} from '../generators'\n\nexport const complyingServiceIntervalUnits = [\n Unit.Second,\n Unit.Minute,\n Unit.Hour,\n]\n\n/*\n Generates repeating schedule service and occurrence intervals\n /\nexport function generateRepeatingSchedule(props: ScheduleIntervalsGenerator) {\n const { serviceHours, start, strategy } = props\n let { end, isInitial } = props\n\n // NOTE support never ending repeating schedule where no end date defined by\n // setting a custom end date using the frequency unit and value\n const {\n options: { frequency },\n } = strategy\n const { unit: frequencyUnit } = frequency\n const { timezone } = serviceHours\n\n end = end \|\| generateScheduleEnd({ frequency, start, timezone })\n\n const isStartAndEndValid = hasValidStartAndEnd({ end, start })\n\n console.log('[generateRepeatingSchedule] INIT:', {\n start: moment.tz(start, timezone).format('YYYY-MM-DD HH:mm:ss Z'),\n end: moment.tz(end, timezone).format('YYYY-MM-DD HH:mm:ss Z'),\n isStartAndEndValid,\n frequencyUnit,\n timezone,\n })\n\n if (!isStartAndEndValid) {\n console.log(\n '[generateRepeatingSchedule] INVALID START/END - RETURNING EARLY'\n )\n return []\n }\n\n const serviceIntervalSequence = serviceIntervalsGenerator({\n end,\n serviceHours,\n start,\n })\n\n // NOTE: when repeating and is complying to service hours we iterate through\n // all service intervals otherwise service interval is from the start and end\n const complyToServiceHours = includes(\n frequencyUnit,\n complyingServiceIntervalUnits\n )\n\n const serviceIntervals = complyToServiceHours\n ? [...serviceIntervalSequence]\n : [[start, end]]\n\n console.log('[generateRepeatingSchedule] SERVICE_INTERVALS:', {\n count: serviceIntervals.length,\n complyToServiceHours,\n intervals: serviceIntervals.slice(0, 3).map((interval) => ({\n start: moment.tz(interval[0], timezone).format('YYYY-MM-DD HH:mm:ss Z'),\n end: moment.tz(interval[1], timezone).format('YYYY-MM-DD HH:mm:ss Z'),\n })),\n })\n\n let serviceIntervalIndex = 0\n for (const serviceInterval of serviceIntervals) {\n console.log(\n `[generateRepeatingSchedule] PROCESSING_SERVICE_INTERVAL[${serviceIntervalIndex}]:`,\n {\n start: moment\n .tz(serviceInterval[0], timezone)\n .format('YYYY-MM-DD HH:mm:ss Z'),\n end: moment\n .tz(serviceInterval[1], timezone)\n .format('YYYY-MM-DD HH:mm:ss Z'),\n }\n )\n\n yield { interval: serviceInterval, type: IntervalTypes.Service }\n\n const occurrenceIntervalsSequence = occurrenceIntervalsGenerator({\n isInitial,\n serviceInterval,\n strategy,\n timezone,\n })\n\n let occurrenceCount = 0\n for (const occurrenceInterval of occurrenceIntervalsSequence) {\n console.log(\n `[generateRepeatingSchedule] OCCURRENCE[${occurrenceCount}]:`,\n {\n start: moment\n .tz(occurrenceInterval[0], timezone)\n .format('YYYY-MM-DD HH:mm:ss Z'),\n end: moment\n .tz(occurrenceInterval[1], timezone)\n .format('YYYY-MM-DD HH:mm:ss Z'),\n }\n )\n yield { interval: occurrenceInterval, type: IntervalTypes.Occurrence }\n occurrenceCount++\n }\n\n console.log(\n `[generateRepeatingSchedule] SERVICE_INTERVAL[${serviceIntervalIndex}] COMPLETED:`,\n {\n occurrenceCount,\n }\n )\n\n // NOTE: we must reset isInitial to true following the first service\n // interval otherwise the occurrence will not start exactly on the next\n // service interval start time\n isInitial = true\n serviceIntervalIndex++\n }\n\n console.log('[generateRepeatingSchedule] COMPLETE')\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/scheduling/helpers/generateScheduleEnd.js CHANGED Viewed

@@ -16,7 +16,19 @@ export function generateScheduleEnd(_ref) {
   // NOTE: if frequency unit less than a week we must set end to jump a week
   // plus the interval length of the schedule frequency
   // so that we can ensure that we are within a service interval
-  var end = isFrequencyLessThanWeek ? mStart.add(2, Unit.Week).valueOf() : mStart.add(frequencyValue * 2, frequencyUnit).valueOf();
+  // MODIFIED FOR TESTING: Changed from 2 weeks to 1 hour for testing endless generation bug
+  var end = isFrequencyLessThanWeek ? mStart.add(1, Unit.Hour).valueOf() : mStart.add(frequencyValue * 2, frequencyUnit).valueOf();
+  console.log('[generateScheduleEnd] START:', {
+    start: moment.tz(start, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+    frequency: "".concat(frequencyValue).concat(frequencyUnit),
+    isFrequencyLessThanWeek: isFrequencyLessThanWeek,
+    timezone: timezone
+  });
+  console.log('[generateScheduleEnd] END CALCULATED:', {
+    end: moment.tz(end, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+    endTimestamp: end,
+    durationFromStart: "".concat(moment(end).diff(moment(start), 'hours'), " hours")
+  });
   return end;
 }
 //# sourceMappingURL=generateScheduleEnd.js.map

package/lib/scheduling/helpers/generateScheduleEnd.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generateScheduleEnd.js","names":["includes","moment","Unit","generateScheduleEnd","_ref","frequency","start","timezone","frequencyUnit","unit","frequencyValue","value","isFrequencyLessThanWeek","Millisecond","Second","Minute","Hour","Day","mStart","tz","end","add","~~Week~~","~~valueOf~~"],"sources":["../../../src/scheduling/helpers/generateScheduleEnd.ts"],"sourcesContent":["import { includes } from 'lodash/fp'\nimport moment from 'moment-timezone'\n\nimport { Period, Unit } from '../scheduling.types'\n\ninterface GenerateScheduleEnd {\n readonly frequency: Period\n readonly start: number\n readonly timezone: string\n}\n\n/*\n Generates a schedule end datetime based on the start and frequency\n /\nexport function generateScheduleEnd({\n frequency,\n start,\n timezone,\n}: GenerateScheduleEnd): number {\n const { unit: frequencyUnit, value: frequencyValue } = frequency\n\n const isFrequencyLessThanWeek = includes(frequencyUnit, [\n Unit.Millisecond,\n Unit.Second,\n Unit.Minute,\n Unit.Hour,\n Unit.Day,\n ])\n\n const mStart = moment.tz(start, timezone)\n\n // NOTE: if frequency unit less than a week we must set end to jump a week\n // plus the interval length of the schedule frequency\n // so that we can ensure that we are within a service interval\n const end = isFrequencyLessThanWeek\n ? mStart.add(2, Unit.~~Week~~).valueOf()\n : mStart.add(frequencyValue 2, frequencyUnit).valueOf()\n\n return end\n}\n"],"mappings":"AAAA,SAASA,QAAQ,QAAQ,WAAW;AACpC,OAAOC,MAAM,MAAM,iBAAiB;AAEpC,SAAiBC,IAAI,QAAQ,qBAAqB;AAQlD;AACA;AACA;AACA,OAAO,SAASC,mBAAmBA,CAAAC,IAAA,EAIH;EAAA,IAH9BC,SAAS,GAAAD,IAAA,CAATC,SAAS;IACTC,KAAK,GAAAF,IAAA,CAALE,KAAK;IACLC,QAAQ,GAAAH,IAAA,CAARG,QAAQ;EAER,IAAcC,aAAa,GAA4BH,SAAS,CAAxDI,IAAI;IAAwBC,cAAc,GAAKL,SAAS,CAAnCM,KAAK;EAElC,IAAMC,uBAAuB,GAAGZ,QAAQ,CAACQ,aAAa,EAAE,CACtDN,IAAI,CAACW,WAAW,EAChBX,IAAI,CAACY,MAAM,EACXZ,IAAI,CAACa,MAAM,EACXb,IAAI,CAACc,IAAI,EACTd,IAAI,CAACe,GAAG,CACT,CAAC;EAEF,IAAMC,MAAM,GAAGjB,MAAM,CAACkB,EAAE,CAACb,KAAK,EAAEC,QAAQ,CAAC;;EAEzC;EACA;EACA;EACA,IAAMa,GAAG,GAAGR,uBAAuB,GAC/BM,MAAM,CAACG,GAAG,CAAC,CAAC,EAAEnB,IAAI,~~CAACoB~~,IAAI,CAAC,~~CAACC~~,OAAO,CAAC,CAAC,~~GAClCL~~,MAAM,CAACG,GAAG,CAACX,cAAc,GAAG,CAAC,EAAEF,aAAa,CAAC,~~CAACe~~,OAAO,CAAC,CAAC;~~EAE3D~~,~~OAAOH~~,GAAG;AACZ","ignoreList":[]}
1	+ {"version":3,"file":"generateScheduleEnd.js","names":["includes","moment","Unit","generateScheduleEnd","_ref","frequency","start","timezone","frequencyUnit","unit","frequencyValue","value","isFrequencyLessThanWeek","Millisecond","Second","Minute","Hour","Day","mStart","tz","end","add","valueOf","console","log","format","concat","endTimestamp","durationFromStart","diff"],"sources":["../../../src/scheduling/helpers/generateScheduleEnd.ts"],"sourcesContent":["import { includes } from 'lodash/fp'\nimport moment from 'moment-timezone'\n\nimport { Period, Unit } from '../scheduling.types'\n\ninterface GenerateScheduleEnd {\n readonly frequency: Period\n readonly start: number\n readonly timezone: string\n}\n\n/*\n Generates a schedule end datetime based on the start and frequency\n /\nexport function generateScheduleEnd({\n frequency,\n start,\n timezone,\n}: GenerateScheduleEnd): number {\n const { unit: frequencyUnit, value: frequencyValue } = frequency\n\n const isFrequencyLessThanWeek = includes(frequencyUnit, [\n Unit.Millisecond,\n Unit.Second,\n Unit.Minute,\n Unit.Hour,\n Unit.Day,\n ])\n\n const mStart = moment.tz(start, timezone)\n\n // NOTE: if frequency unit less than a week we must set end to jump a week\n // plus the interval length of the schedule frequency\n // so that we can ensure that we are within a service interval\n // MODIFIED FOR TESTING: Changed from 2 weeks to 1 hour for testing endless generation bug\n const end = isFrequencyLessThanWeek\n ? mStart.add(1, Unit.Hour).valueOf()\n : mStart.add(frequencyValue 2, frequencyUnit).valueOf()\n\n console.log('[generateScheduleEnd] START:', {\n start: moment.tz(start, timezone).format('YYYY-MM-DD HH:mm:ss Z'),\n frequency: `${frequencyValue}${frequencyUnit}`,\n isFrequencyLessThanWeek,\n timezone,\n })\n\n console.log('[generateScheduleEnd] END CALCULATED:', {\n end: moment.tz(end, timezone).format('YYYY-MM-DD HH:mm:ss Z'),\n endTimestamp: end,\n durationFromStart: `${moment(end).diff(moment(start), 'hours')} hours`,\n })\n\n return end\n}\n"],"mappings":"AAAA,SAASA,QAAQ,QAAQ,WAAW;AACpC,OAAOC,MAAM,MAAM,iBAAiB;AAEpC,SAAiBC,IAAI,QAAQ,qBAAqB;AAQlD;AACA;AACA;AACA,OAAO,SAASC,mBAAmBA,CAAAC,IAAA,EAIH;EAAA,IAH9BC,SAAS,GAAAD,IAAA,CAATC,SAAS;IACTC,KAAK,GAAAF,IAAA,CAALE,KAAK;IACLC,QAAQ,GAAAH,IAAA,CAARG,QAAQ;EAER,IAAcC,aAAa,GAA4BH,SAAS,CAAxDI,IAAI;IAAwBC,cAAc,GAAKL,SAAS,CAAnCM,KAAK;EAElC,IAAMC,uBAAuB,GAAGZ,QAAQ,CAACQ,aAAa,EAAE,CACtDN,IAAI,CAACW,WAAW,EAChBX,IAAI,CAACY,MAAM,EACXZ,IAAI,CAACa,MAAM,EACXb,IAAI,CAACc,IAAI,EACTd,IAAI,CAACe,GAAG,CACT,CAAC;EAEF,IAAMC,MAAM,GAAGjB,MAAM,CAACkB,EAAE,CAACb,KAAK,EAAEC,QAAQ,CAAC;;EAEzC;EACA;EACA;EACA;EACA,IAAMa,GAAG,GAAGR,uBAAuB,GAC/BM,MAAM,CAACG,GAAG,CAAC,CAAC,EAAEnB,IAAI,CAACc,IAAI,CAAC,CAACM,OAAO,CAAC,CAAC,GAClCJ,MAAM,CAACG,GAAG,CAACX,cAAc,GAAG,CAAC,EAAEF,aAAa,CAAC,CAACc,OAAO,CAAC,CAAC;EAE3DC,OAAO,CAACC,GAAG,CAAC,8BAA8B,EAAE;IAC1ClB,KAAK,EAAEL,MAAM,CAACkB,EAAE,CAACb,KAAK,EAAEC,QAAQ,CAAC,CAACkB,MAAM,CAAC,uBAAuB,CAAC;IACjEpB,SAAS,KAAAqB,MAAA,CAAKhB,cAAc,EAAAgB,MAAA,CAAGlB,aAAa,CAAE;IAC9CI,uBAAuB,EAAvBA,uBAAuB;IACvBL,QAAQ,EAARA;EACF,CAAC,CAAC;EAEFgB,OAAO,CAACC,GAAG,CAAC,uCAAuC,EAAE;IACnDJ,GAAG,EAAEnB,MAAM,CAACkB,EAAE,CAACC,GAAG,EAAEb,QAAQ,CAAC,CAACkB,MAAM,CAAC,uBAAuB,CAAC;IAC7DE,YAAY,EAAEP,GAAG;IACjBQ,iBAAiB,KAAAF,MAAA,CAAKzB,MAAM,CAACmB,GAAG,CAAC,CAACS,IAAI,CAAC5B,MAAM,CAACK,KAAK,CAAC,EAAE,OAAO,CAAC;EAChE,CAAC,CAAC;EAEF,OAAOc,GAAG;AACZ","ignoreList":[]}

package/lib/scheduling/strategies/getNext.js CHANGED Viewed

@@ -13,7 +13,7 @@ export function getNext(_ref) {
     timezone = _ref.timezone,
     type = _ref.type;
   return /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var duration, frequency, durationUnit, durationValue, frequencyUnit, frequencyValue, initial, dateCursor, nextOccurrenceStart, nextOccurrenceEnd, nextOccurrenceStartByBackCalculation, earliestNextOccurrenceStart, nextOccurrence;
+    var duration, frequency, durationUnit, durationValue, frequencyUnit, frequencyValue, initial, dateCursor, occurrenceCount, nextOccurrenceStart, nextOccurrenceEnd, nextOccurrenceStartByBackCalculation, earliestNextOccurrenceStart, nextOccurrence;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -22,9 +22,19 @@ export function getNext(_ref) {
           frequencyUnit = frequency.unit, frequencyValue = frequency.value;
           initial = isInitial;
           dateCursor = initial ? moment.tz(start, timezone).valueOf() : moment.tz(start, timezone).add(1, Unit.Millisecond).valueOf();
+          console.log('[getNext] START:', {
+            strategy: type,
+            start: moment.tz(start, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+            end: moment.tz(end, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+            dateCursor: moment.tz(dateCursor, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+            isInitial: isInitial,
+            frequency: "".concat(frequencyValue).concat(frequencyUnit),
+            duration: "".concat(durationValue).concat(durationUnit)
+          });
+          occurrenceCount = 0;
         case 1:
           if (!(dateCursor < end)) {
-            _context.next = 4;
+            _context.next = 5;
             break;
           }
           nextOccurrenceStart = void 0;
@@ -44,20 +54,37 @@ export function getNext(_ref) {
             _context.next = 2;
             break;
           }
+          console.log('[getNext] BOUNDARY CHECK FAILED:', {
+            occurrenceCount: occurrenceCount,
+            nextOccurrenceStart: moment.tz(nextOccurrenceStart, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+            nextOccurrenceEnd: moment.tz(nextOccurrenceEnd, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+            end: moment.tz(end, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+            condition: "(".concat(nextOccurrenceEnd, " <= ").concat(nextOccurrenceStart, ") || (").concat(nextOccurrenceEnd, " > ").concat(end, ")")
+          });
           return _context.abrupt("return");
         case 2:
           if (!(nextOccurrenceStart >= start)) {
-            _context.next = 3;
+            _context.next = 4;
             break;
           }
           nextOccurrence = [nextOccurrenceStart, nextOccurrenceEnd - 1];
+          console.log("[getNext] OCCURRENCE[".concat(occurrenceCount, "]:"), {
+            start: moment.tz(nextOccurrenceStart, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+            end: moment.tz(nextOccurrenceEnd - 1, timezone).format('YYYY-MM-DD HH:mm:ss Z')
+          });
           _context.next = 3;
           return nextOccurrence;
         case 3:
+          occurrenceCount++;
+        case 4:
           dateCursor = nextOccurrenceEnd;
           _context.next = 1;
           break;
-        case 4:
+        case 5:
+          console.log('[getNext] COMPLETE:', {
+            occurrenceCount: occurrenceCount
+          });
+        case 6:
         case "end":
           return _context.stop();
       }

package/lib/scheduling/strategies/getNext.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getNext.js","names":["moment","StrategyTypes","Unit","getNext","_ref","end","isInitial","options","start","timezone","type","_regeneratorRuntime","mark","_callee","duration","frequency","durationUnit","durationValue","frequencyUnit","frequencyValue","initial","dateCursor","nextOccurrenceStart","nextOccurrenceEnd","nextOccurrenceStartByBackCalculation","earliestNextOccurrenceStart","nextOccurrence","wrap","_context","prev","next","unit","value","tz","valueOf","add","Millisecond","Stopwatch","subtract","max","abrupt","stop"],"sources":["../../../src/scheduling/strategies/getNext.ts"],"sourcesContent":["import moment from 'moment-timezone'\n\nimport { GetNext, Interval, StrategyTypes, Unit } from '../scheduling.types'\n\n/*\n Generates next occurrence interval for stopwatch and window strategy\n /\nexport function getNext({\n end,\n isInitial,\n options,\n start,\n timezone,\n type,\n}: GetNext): IterableIterator<Interval> {\n const { duration, frequency } = options\n const { unit: durationUnit, value: durationValue } = duration\n const { unit: frequencyUnit, value: frequencyValue } = frequency\n\n let initial: boolean = isInitial\n\n let dateCursor: number = initial\n ? moment.tz(start, timezone).valueOf()\n : moment\n .tz(start, timezone)\n .add(1, Unit.Millisecond)\n .~~valueOf~~()\n\n while (dateCursor < end) {\n let nextOccurrenceStart: number\n let nextOccurrenceEnd: number\n\n if (type === StrategyTypes.Stopwatch) {\n nextOccurrenceStart = dateCursor\n nextOccurrenceEnd = moment\n .tz(dateCursor, timezone)\n .add(durationValue, durationUnit)\n .valueOf()\n\n } else {\n nextOccurrenceEnd = moment\n .tz(dateCursor, timezone)\n .add(frequencyValue, frequencyUnit)\n .valueOf()\n\n const nextOccurrenceStartByBackCalculation = moment\n .tz(nextOccurrenceEnd, timezone)\n .subtract(durationValue, durationUnit)\n\n const earliestNextOccurrenceStart = moment\n .tz(dateCursor, timezone)\n\n // NOTE: this is to ensure that the next occurrence start is always\n // greater than or equal to the date cursor. Moment js handles month addition and subtraction\n // with estimations (Dec 31st + 2 months gives Feb 28th/29th). This can lead to inaccurate start times when calculating forwards then backwards at the end of the month.\n nextOccurrenceStart =\n ~~moment~~.max(\n earliestNextOccurrenceStart~~,\n~~ nextOccurrenceStartByBackCalculation\n ).valueOf()\n }\n\n\n if (nextOccurrenceEnd <= nextOccurrenceStart \|\| nextOccurrenceEnd > end) {\n return\n }\n\n if (nextOccurrenceStart >= start) {\n const nextOccurrence = [nextOccurrenceStart, nextOccurrenceEnd - 1]\n\n yield nextOccurrence\n }\n\n dateCursor = nextOccurrenceEnd\n }\n}\n"],"mappings":";AAAA,OAAOA,MAAM,MAAM,iBAAiB;AAEpC,SAA4BC,aAAa,EAAEC,IAAI,QAAQ,qBAAqB;;AAE5E;AACA;AACA;AACA,OAAO,SAAUC,OAAOA,CAAAC,IAAA;EAAA,IACtBC,GAAG,GAAAD,IAAA,CAAHC,GAAG;IACHC,SAAS,GAAAF,IAAA,CAATE,SAAS;IACTC,OAAO,GAAAH,IAAA,CAAPG,OAAO;IACPC,KAAK,GAAAJ,IAAA,CAALI,KAAK;IACLC,QAAQ,GAAAL,IAAA,CAARK,QAAQ;IACRC,IAAI,GAAAN,IAAA,CAAJM,IAAI;EAAA,oBAAAC,mBAAA,CAAAC,IAAA,UAAAC,QAAA;IAAA,IAAAC,QAAA,EAAAC,SAAA,EAAAC,YAAA,EAAAC,aAAA,EAAAC,aAAA,EAAAC,cAAA,EAAAC,OAAA,EAAAC,UAAA,EAAAC,mBAAA,EAAAC,iBAAA,EAAAC,oCAAA,EAAAC,2BAAA,EAAAC,cAAA;IAAA,~~OAAAf~~,mBAAA,~~CAAAgB~~,IAAA,WAAAC,QAAA;MAAA,kBAAAA,QAAA,CAAAC,IAAA,GAAAD,QAAA,CAAAE,IAAA;QAAA;~~UAEIhB~~,QAAQ,GAAgBP,OAAO,CAA/BO,QAAQ,EAAEC,SAAS,GAAKR,OAAO,CAArBQ,SAAS;UACbC,YAAY,GAA2BF,QAAQ,~~CAArDiB~~,IAAI,~~EAAuBd~~,aAAa,GAAKH,QAAQ,~~CAAjCkB~~,KAAK;~~UACnBd~~,aAAa,GAA4BH,SAAS,~~CAAxDgB~~,IAAI,~~EAAwBZ~~,cAAc,GAAKJ,SAAS,~~CAAnCiB~~,KAAK;~~UAE9BZ~~,OAAgB,GAAGd,SAAS;UAE5Be,UAAkB,GAAGD,OAAO,GAC5BpB,MAAM,~~CAACiC~~,EAAE,~~CAACzB~~,KAAK,EAAEC,QAAQ,CAAC,~~CAACyB~~,OAAO,CAAC,CAAC,~~GACpClC~~,MAAM,~~CACHiC~~,EAAE,~~CAACzB~~,KAAK,EAAEC,QAAQ,CAAC,~~CACnB0B~~,GAAG,CAAC,CAAC,~~EAAEjC~~,IAAI,~~CAACkC~~,WAAW,CAAC,~~CACxBF~~,OAAO,CAAC,CAAC;QAAA;UAAA,~~MAETb~~,UAAU,GAAGhB,GAAG;~~YAAAuB~~,QAAA,CAAAE,IAAA;YAAA;UAAA;UACjBR,mBAA2B;UAC3BC,iBAAyB;UAE7B,~~IAAIb~~,IAAI,KAAKT,aAAa,~~CAACoC~~,SAAS,EAAE;~~YACpCf~~,mBAAmB,~~GAAGD~~,UAAU;~~YAChCE~~,iBAAiB,~~GAAGvB~~,MAAM,~~CACvBiC~~,EAAE,~~CAACZ~~,UAAU,EAAEZ,QAAQ,CAAC,~~CACxB0B~~,GAAG,~~CAAClB~~,aAAa,EAAED,YAAY,CAAC,~~CAChCkB~~,OAAO,CAAC,CAAC;~~UAEd~~,CAAC,MAAM;YACLX,iBAAiB,~~GAAGvB~~,MAAM,~~CACvBiC~~,EAAE,~~CAACZ~~,UAAU,EAAEZ,QAAQ,CAAC,~~CACxB0B~~,GAAG,~~CAAChB~~,cAAc,EAAED,aAAa,CAAC,~~CAClCgB~~,OAAO,CAAC,CAAC;YAENV,oCAAoC,~~GAAGxB~~,MAAM,~~CAChDiC~~,EAAE,CAACV,iBAAiB,~~EAAEd~~,QAAQ,CAAC,CAC/~~B6B~~,QAAQ,~~CAACrB~~,aAAa,EAAED,YAAY,CAAC;~~YAElCS~~,2BAA2B,~~GAAGzB~~,MAAM,~~CACvCiC~~,EAAE,~~CAACZ~~,UAAU,EAAEZ,QAAQ,CAAC,~~EAEzB~~;YACA;YACA;~~YACFa~~,mBAAmB,~~GACjBtB~~,MAAM,~~CAACuC~~,GAAG,~~CACVd~~,2BAA2B,~~EAC3BD~~,~~oCACF~~,CAAC,~~CAACU~~,OAAO,CAAC,CAAC;~~UACb~~;UAAC,~~MAGGX~~,iBAAiB,IAAID,mBAAmB,IAAIC,iBAAiB,~~GAAGlB~~,GAAG;~~YAAAuB~~,QAAA,CAAAE,IAAA;YAAA;UAAA;UAAA,~~OAAAF~~,QAAA,~~CAAAY~~,MAAA;QAAA;UAAA,~~MAInElB~~,mBAAmB,~~IAAId~~,KAAK;~~YAAAoB~~,QAAA,CAAAE,IAAA;YAAA;UAAA;UACxBJ,cAAc,GAAG,CAACJ,mBAAmB,EAAEC,iBAAiB,GAAG,CAAC,CAAC;~~UAAAK~~,QAAA,CAAAE,IAAA;~~UAEnE~~,OAAMJ,cAAc;QAAA;~~UAGtBL~~,UAAU,~~GAAGE~~,iBAAiB;UAAAK,QAAA,CAAAE,IAAA;UAAA;QAAA;QAAA;UAAA,~~OAAAF~~,QAAA,~~CAAAa~~,IAAA;MAAA;IAAA,~~GAAA5B~~,OAAA;EAAA;AAAA","ignoreList":[]}
1	+ {"version":3,"file":"getNext.js","names":["moment","StrategyTypes","Unit","getNext","_ref","end","isInitial","options","start","timezone","type","_regeneratorRuntime","mark","_callee","duration","frequency","durationUnit","durationValue","frequencyUnit","frequencyValue","initial","dateCursor","occurrenceCount","nextOccurrenceStart","nextOccurrenceEnd","nextOccurrenceStartByBackCalculation","earliestNextOccurrenceStart","nextOccurrence","wrap","_context","prev","next","unit","value","tz","valueOf","add","Millisecond","console","log","strategy","format","concat","Stopwatch","subtract","max","condition","abrupt","stop"],"sources":["../../../src/scheduling/strategies/getNext.ts"],"sourcesContent":["import moment from 'moment-timezone'\n\nimport { GetNext, Interval, StrategyTypes, Unit } from '../scheduling.types'\n\n/*\n Generates next occurrence interval for stopwatch and window strategy\n /\nexport function getNext({\n end,\n isInitial,\n options,\n start,\n timezone,\n type,\n}: GetNext): IterableIterator<Interval> {\n const { duration, frequency } = options\n const { unit: durationUnit, value: durationValue } = duration\n const { unit: frequencyUnit, value: frequencyValue } = frequency\n\n let initial: boolean = isInitial\n\n let dateCursor: number = initial\n ? moment.tz(start, timezone).valueOf()\n : moment.tz(start, timezone).add(1, Unit.Millisecond).valueOf()\n\n console.log('[getNext] START:', {\n strategy: type,\n start: moment.tz(start, timezone).format('YYYY-MM-DD HH:mm:ss Z'),\n end: moment.tz(end, timezone).format('YYYY-MM-DD HH:mm:ss Z'),\n dateCursor: moment.tz(dateCursor, timezone).format('YYYY-MM-DD HH:mm:ss Z'),\n isInitial,\n frequency: `${frequencyValue}${frequencyUnit}`,\n duration: `${durationValue}${durationUnit}`,\n })\n\n let occurrenceCount = 0\n while (dateCursor < end) {\n let nextOccurrenceStart: number\n let nextOccurrenceEnd: number\n\n if (type === StrategyTypes.Stopwatch) {\n nextOccurrenceStart = dateCursor\n nextOccurrenceEnd = moment\n .tz(dateCursor, timezone)\n .add(durationValue, durationUnit)\n .valueOf()\n } else {\n nextOccurrenceEnd = moment\n .tz(dateCursor, timezone)\n .add(frequencyValue, frequencyUnit)\n .valueOf()\n\n const nextOccurrenceStartByBackCalculation = moment\n .tz(nextOccurrenceEnd, timezone)\n .subtract(durationValue, durationUnit)\n\n const earliestNextOccurrenceStart = moment.tz(dateCursor, timezone)\n\n // NOTE: this is to ensure that the next occurrence start is always\n // greater than or equal to the date cursor. Moment js handles month addition and subtraction\n // with estimations (Dec 31st + 2 months gives Feb 28th/29th). This can lead to inaccurate start times when calculating forwards then backwards at the end of the month.\n nextOccurrenceStart = moment\n .max(earliestNextOccurrenceStart, nextOccurrenceStartByBackCalculation)\n .valueOf()\n }\n\n if (nextOccurrenceEnd <= nextOccurrenceStart \|\| nextOccurrenceEnd > end) {\n console.log('[getNext] BOUNDARY CHECK FAILED:', {\n occurrenceCount,\n nextOccurrenceStart: moment\n .tz(nextOccurrenceStart, timezone)\n .format('YYYY-MM-DD HH:mm:ss Z'),\n nextOccurrenceEnd: moment\n .tz(nextOccurrenceEnd, timezone)\n .format('YYYY-MM-DD HH:mm:ss Z'),\n end: moment.tz(end, timezone).format('YYYY-MM-DD HH:mm:ss Z'),\n condition: `(${nextOccurrenceEnd} <= ${nextOccurrenceStart}) \|\| (${nextOccurrenceEnd} > ${end})`,\n })\n return\n }\n\n if (nextOccurrenceStart >= start) {\n const nextOccurrence = [nextOccurrenceStart, nextOccurrenceEnd - 1]\n\n console.log(`[getNext] OCCURRENCE[${occurrenceCount}]:`, {\n start: moment\n .tz(nextOccurrenceStart, timezone)\n .format('YYYY-MM-DD HH:mm:ss Z'),\n end: moment\n .tz(nextOccurrenceEnd - 1, timezone)\n .format('YYYY-MM-DD HH:mm:ss Z'),\n })\n\n yield nextOccurrence\n occurrenceCount++\n }\n\n dateCursor = nextOccurrenceEnd\n }\n\n console.log('[getNext] COMPLETE:', { occurrenceCount })\n}\n"],"mappings":";AAAA,OAAOA,MAAM,MAAM,iBAAiB;AAEpC,SAA4BC,aAAa,EAAEC,IAAI,QAAQ,qBAAqB;;AAE5E;AACA;AACA;AACA,OAAO,SAAUC,OAAOA,CAAAC,IAAA;EAAA,IACtBC,GAAG,GAAAD,IAAA,CAAHC,GAAG;IACHC,SAAS,GAAAF,IAAA,CAATE,SAAS;IACTC,OAAO,GAAAH,IAAA,CAAPG,OAAO;IACPC,KAAK,GAAAJ,IAAA,CAALI,KAAK;IACLC,QAAQ,GAAAL,IAAA,CAARK,QAAQ;IACRC,IAAI,GAAAN,IAAA,CAAJM,IAAI;EAAA,oBAAAC,mBAAA,CAAAC,IAAA,UAAAC,QAAA;IAAA,IAAAC,QAAA,EAAAC,SAAA,EAAAC,YAAA,EAAAC,aAAA,EAAAC,aAAA,EAAAC,cAAA,EAAAC,OAAA,EAAAC,UAAA,EAAAC,eAAA,EAAAC,mBAAA,EAAAC,iBAAA,EAAAC,oCAAA,EAAAC,2BAAA,EAAAC,cAAA;IAAA,OAAAhB,mBAAA,CAAAiB,IAAA,WAAAC,QAAA;MAAA,kBAAAA,QAAA,CAAAC,IAAA,GAAAD,QAAA,CAAAE,IAAA;QAAA;UAEIjB,QAAQ,GAAgBP,OAAO,CAA/BO,QAAQ,EAAEC,SAAS,GAAKR,OAAO,CAArBQ,SAAS;UACbC,YAAY,GAA2BF,QAAQ,CAArDkB,IAAI,EAAuBf,aAAa,GAAKH,QAAQ,CAAjCmB,KAAK;UACnBf,aAAa,GAA4BH,SAAS,CAAxDiB,IAAI,EAAwBb,cAAc,GAAKJ,SAAS,CAAnCkB,KAAK;UAE9Bb,OAAgB,GAAGd,SAAS;UAE5Be,UAAkB,GAAGD,OAAO,GAC5BpB,MAAM,CAACkC,EAAE,CAAC1B,KAAK,EAAEC,QAAQ,CAAC,CAAC0B,OAAO,CAAC,CAAC,GACpCnC,MAAM,CAACkC,EAAE,CAAC1B,KAAK,EAAEC,QAAQ,CAAC,CAAC2B,GAAG,CAAC,CAAC,EAAElC,IAAI,CAACmC,WAAW,CAAC,CAACF,OAAO,CAAC,CAAC;UAEjEG,OAAO,CAACC,GAAG,CAAC,kBAAkB,EAAE;YAC9BC,QAAQ,EAAE9B,IAAI;YACdF,KAAK,EAAER,MAAM,CAACkC,EAAE,CAAC1B,KAAK,EAAEC,QAAQ,CAAC,CAACgC,MAAM,CAAC,uBAAuB,CAAC;YACjEpC,GAAG,EAAEL,MAAM,CAACkC,EAAE,CAAC7B,GAAG,EAAEI,QAAQ,CAAC,CAACgC,MAAM,CAAC,uBAAuB,CAAC;YAC7DpB,UAAU,EAAErB,MAAM,CAACkC,EAAE,CAACb,UAAU,EAAEZ,QAAQ,CAAC,CAACgC,MAAM,CAAC,uBAAuB,CAAC;YAC3EnC,SAAS,EAATA,SAAS;YACTS,SAAS,KAAA2B,MAAA,CAAKvB,cAAc,EAAAuB,MAAA,CAAGxB,aAAa,CAAE;YAC9CJ,QAAQ,KAAA4B,MAAA,CAAKzB,aAAa,EAAAyB,MAAA,CAAG1B,YAAY;UAC3C,CAAC,CAAC;UAEEM,eAAe,GAAG,CAAC;QAAA;UAAA,MAChBD,UAAU,GAAGhB,GAAG;YAAAwB,QAAA,CAAAE,IAAA;YAAA;UAAA;UACjBR,mBAA2B;UAC3BC,iBAAyB;UAE7B,IAAId,IAAI,KAAKT,aAAa,CAAC0C,SAAS,EAAE;YACpCpB,mBAAmB,GAAGF,UAAU;YAChCG,iBAAiB,GAAGxB,MAAM,CACvBkC,EAAE,CAACb,UAAU,EAAEZ,QAAQ,CAAC,CACxB2B,GAAG,CAACnB,aAAa,EAAED,YAAY,CAAC,CAChCmB,OAAO,CAAC,CAAC;UACd,CAAC,MAAM;YACLX,iBAAiB,GAAGxB,MAAM,CACvBkC,EAAE,CAACb,UAAU,EAAEZ,QAAQ,CAAC,CACxB2B,GAAG,CAACjB,cAAc,EAAED,aAAa,CAAC,CAClCiB,OAAO,CAAC,CAAC;YAENV,oCAAoC,GAAGzB,MAAM,CAChDkC,EAAE,CAACV,iBAAiB,EAAEf,QAAQ,CAAC,CAC/BmC,QAAQ,CAAC3B,aAAa,EAAED,YAAY,CAAC;YAElCU,2BAA2B,GAAG1B,MAAM,CAACkC,EAAE,CAACb,UAAU,EAAEZ,QAAQ,CAAC,EAEnE;YACA;YACA;YACAc,mBAAmB,GAAGvB,MAAM,CACzB6C,GAAG,CAACnB,2BAA2B,EAAED,oCAAoC,CAAC,CACtEU,OAAO,CAAC,CAAC;UACd;UAAC,MAEGX,iBAAiB,IAAID,mBAAmB,IAAIC,iBAAiB,GAAGnB,GAAG;YAAAwB,QAAA,CAAAE,IAAA;YAAA;UAAA;UACrEO,OAAO,CAACC,GAAG,CAAC,kCAAkC,EAAE;YAC9CjB,eAAe,EAAfA,eAAe;YACfC,mBAAmB,EAAEvB,MAAM,CACxBkC,EAAE,CAACX,mBAAmB,EAAEd,QAAQ,CAAC,CACjCgC,MAAM,CAAC,uBAAuB,CAAC;YAClCjB,iBAAiB,EAAExB,MAAM,CACtBkC,EAAE,CAACV,iBAAiB,EAAEf,QAAQ,CAAC,CAC/BgC,MAAM,CAAC,uBAAuB,CAAC;YAClCpC,GAAG,EAAEL,MAAM,CAACkC,EAAE,CAAC7B,GAAG,EAAEI,QAAQ,CAAC,CAACgC,MAAM,CAAC,uBAAuB,CAAC;YAC7DK,SAAS,MAAAJ,MAAA,CAAMlB,iBAAiB,UAAAkB,MAAA,CAAOnB,mBAAmB,YAAAmB,MAAA,CAASlB,iBAAiB,SAAAkB,MAAA,CAAMrC,GAAG;UAC/F,CAAC,CAAC;UAAA,OAAAwB,QAAA,CAAAkB,MAAA;QAAA;UAAA,MAIAxB,mBAAmB,IAAIf,KAAK;YAAAqB,QAAA,CAAAE,IAAA;YAAA;UAAA;UACxBJ,cAAc,GAAG,CAACJ,mBAAmB,EAAEC,iBAAiB,GAAG,CAAC,CAAC;UAEnEc,OAAO,CAACC,GAAG,yBAAAG,MAAA,CAAyBpB,eAAe,SAAM;YACvDd,KAAK,EAAER,MAAM,CACVkC,EAAE,CAACX,mBAAmB,EAAEd,QAAQ,CAAC,CACjCgC,MAAM,CAAC,uBAAuB,CAAC;YAClCpC,GAAG,EAAEL,MAAM,CACRkC,EAAE,CAACV,iBAAiB,GAAG,CAAC,EAAEf,QAAQ,CAAC,CACnCgC,MAAM,CAAC,uBAAuB;UACnC,CAAC,CAAC;UAAAZ,QAAA,CAAAE,IAAA;UAEF,OAAMJ,cAAc;QAAA;UACpBL,eAAe,EAAE;QAAA;UAGnBD,UAAU,GAAGG,iBAAiB;UAAAK,QAAA,CAAAE,IAAA;UAAA;QAAA;UAGhCO,OAAO,CAACC,GAAG,CAAC,qBAAqB,EAAE;YAAEjB,eAAe,EAAfA;UAAgB,CAAC,CAAC;QAAA;QAAA;UAAA,OAAAO,QAAA,CAAAmB,IAAA;MAAA;IAAA,GAAAnC,OAAA;EAAA;AAAA","ignoreList":[]}

package/lib/scheduling/strategies/getNextWeekday.js CHANGED Viewed

@@ -15,7 +15,7 @@ export function getNextWeekday(_ref) {
     start = _ref.start,
     timezone = _ref.timezone;
   return /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var duration, frequency, weekdays, durationUnit, durationValue, frequencyUnit, frequencyValue, initial, dateCursor, _iterator, _step, weekday, nextOccurrenceEnd, nextOccurrenceStart, nextOccurrence, nextDateCursor, _t;
+    var duration, frequency, weekdays, durationUnit, durationValue, frequencyUnit, frequencyValue, initial, dateCursor, occurrenceCount, weekIteration, _iterator, _step, weekday, nextOccurrenceEnd, nextOccurrenceStart, nextOccurrence, nextDateCursor, _t;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -24,11 +24,25 @@ export function getNextWeekday(_ref) {
           frequencyUnit = frequency.unit, frequencyValue = frequency.value;
           initial = isInitial;
           dateCursor = initial ? moment.tz(start, timezone).startOf(Unit.Week).valueOf() : moment.tz(start, timezone).add(frequencyValue, frequencyUnit).startOf(Unit.Week).valueOf();
+          console.log('[getNextWeekday] START:', {
+            start: moment.tz(start, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+            end: moment.tz(end, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+            dateCursor: moment.tz(dateCursor, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+            isInitial: isInitial,
+            frequency: "".concat(frequencyValue).concat(frequencyUnit),
+            duration: "".concat(durationValue).concat(durationUnit),
+            weekdays: weekdays
+          });
+          occurrenceCount = 0;
+          weekIteration = 0;
         case 1:
           if (!(dateCursor < end)) {
             _context.next = 11;
             break;
           }
+          console.log("[getNextWeekday] WEEK_ITERATION[".concat(weekIteration, "]:"), {
+            dateCursor: moment.tz(dateCursor, timezone).format('YYYY-MM-DD')
+          });
           _iterator = _createForOfIteratorHelper(weekdays);
           _context.prev = 2;
           _iterator.s();
@@ -44,6 +58,13 @@ export function getNextWeekday(_ref) {
             _context.next = 4;
             break;
           }
+          console.log('[getNextWeekday] BOUNDARY CHECK FAILED:', {
+            occurrenceCount: occurrenceCount,
+            weekday: weekday,
+            nextOccurrenceStart: moment.tz(nextOccurrenceStart, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+            nextOccurrenceEnd: moment.tz(nextOccurrenceEnd, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+            end: moment.tz(end, timezone).format('YYYY-MM-DD HH:mm:ss Z')
+          });
           return _context.abrupt("return");
         case 4:
           if (!(nextOccurrenceStart >= start)) {
@@ -51,9 +72,15 @@ export function getNextWeekday(_ref) {
             break;
           }
           nextOccurrence = [nextOccurrenceStart, nextOccurrenceEnd - 1];
+          console.log("[getNextWeekday] OCCURRENCE[".concat(occurrenceCount, "]:"), {
+            weekday: weekday,
+            start: moment.tz(nextOccurrenceStart, timezone).format('YYYY-MM-DD HH:mm:ss Z'),
+            end: moment.tz(nextOccurrenceEnd - 1, timezone).format('YYYY-MM-DD HH:mm:ss Z')
+          });
           _context.next = 5;
           return nextOccurrence;
         case 5:
+          occurrenceCount++;
           initial = false;
         case 6:
           _context.next = 3;
@@ -72,9 +99,14 @@ export function getNextWeekday(_ref) {
         case 10:
           nextDateCursor = moment.tz(dateCursor, timezone).add(1, Unit.Week).valueOf();
           dateCursor = nextDateCursor;
+          weekIteration++;
           _context.next = 1;
           break;
         case 11:
+          console.log('[getNextWeekday] COMPLETE:', {
+            occurrenceCount: occurrenceCount
+          });
+        case 12:
         case "end":
           return _context.stop();
       }

package/lib/scheduling/strategies/getNextWeekday.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getNextWeekday.js","names":["moment","Unit","getNextWeekday","_ref","end","isInitial","options","start","timezone","_regeneratorRuntime","mark","_callee","duration","frequency","weekdays","durationUnit","durationValue","frequencyUnit","frequencyValue","initial","dateCursor","_iterator","_step","weekday","nextOccurrenceEnd","nextOccurrenceStart","nextOccurrence","nextDateCursor","_t","wrap","_context","prev","next","unit","value","tz","startOf","Week","valueOf","add","_createForOfIteratorHelper","s","n","done","isoWeekday","Day","subtract","abrupt","e","f","finish","stop"],"sources":["../../../src/scheduling/strategies/getNextWeekday.ts"],"sourcesContent":["import moment from 'moment-timezone'\n\nimport { GetNext, Interval, Unit } from '../scheduling.types'\n\n/*\n Generates next occurrence interval for weekdays strategy\n /\nexport function getNextWeekday({\n end,\n isInitial,\n options,\n start,\n timezone,\n}: GetNext): IterableIterator<Interval> {\n const { duration, frequency, weekdays } = options\n const { unit: durationUnit, value: durationValue } = duration\n const { unit: frequencyUnit, value: frequencyValue } = frequency\n\n let initial: boolean = isInitial\n\n let dateCursor: number = initial\n ? moment\n .tz(start, timezone)\n .startOf(Unit.Week)\n .valueOf()\n : moment\n .tz(start, timezone)\n .add(frequencyValue, frequencyUnit)\n .startOf(Unit.Week)\n .valueOf()\n\n while (dateCursor < end) {\n for (const weekday of weekdays) {\n const nextOccurrenceEnd: number = moment\n .tz(dateCursor, timezone)\n .isoWeekday(weekday)\n .add(1, Unit.Day)\n .startOf(Unit.Day)\n .valueOf()\n\n const nextOccurrenceStart: number = moment\n .tz(nextOccurrenceEnd, timezone)\n .subtract(durationValue, durationUnit)\n .valueOf()\n\n if (nextOccurrenceEnd <= nextOccurrenceStart \|\| nextOccurrenceEnd > end) {\n return\n }\n\n if (nextOccurrenceStart >= start) {\n const nextOccurrence: Interval = [\n nextOccurrenceStart,\n nextOccurrenceEnd - 1,\n ]\n\n yield nextOccurrence\n\n initial = false\n }\n }\n\n const nextDateCursor: number = moment\n .tz(dateCursor, timezone)\n .add(1, Unit.Week)\n .valueOf()\n\n dateCursor = nextDateCursor\n }\n}\n"],"mappings":";;;;AAAA,OAAOA,MAAM,MAAM,iBAAiB;AAEpC,SAA4BC,IAAI,QAAQ,qBAAqB;;AAE7D;AACA;AACA;AACA,OAAO,SAAUC,cAAcA,CAAAC,IAAA;EAAA,IAC7BC,GAAG,GAAAD,IAAA,CAAHC,GAAG;IACHC,SAAS,GAAAF,IAAA,CAATE,SAAS;IACTC,OAAO,GAAAH,IAAA,CAAPG,OAAO;IACPC,KAAK,GAAAJ,IAAA,CAALI,KAAK;IACLC,QAAQ,GAAAL,IAAA,CAARK,QAAQ;EAAA,oBAAAC,mBAAA,CAAAC,IAAA,UAAAC,QAAA;IAAA,IAAAC,QAAA,EAAAC,SAAA,EAAAC,QAAA,EAAAC,YAAA,EAAAC,aAAA,EAAAC,aAAA,EAAAC,cAAA,EAAAC,OAAA,EAAAC,UAAA,EAAAC,SAAA,EAAAC,KAAA,EAAAC,OAAA,EAAAC,iBAAA,EAAAC,mBAAA,EAAAC,cAAA,EAAAC,cAAA,EAAAC,EAAA;IAAA,~~OAAAnB~~,mBAAA,~~CAAAoB~~,IAAA,WAAAC,QAAA;MAAA,kBAAAA,QAAA,CAAAC,IAAA,GAAAD,QAAA,CAAAE,IAAA;QAAA;~~UAEApB~~,QAAQ,GAA0BN,OAAO,CAAzCM,QAAQ,EAAEC,SAAS,GAAeP,OAAO,CAA/BO,SAAS,EAAEC,QAAQ,GAAKR,OAAO,CAApBQ,QAAQ;UACvBC,YAAY,GAA2BH,QAAQ,~~CAArDqB~~,IAAI,~~EAAuBjB~~,aAAa,GAAKJ,QAAQ,~~CAAjCsB~~,KAAK;~~UACnBjB~~,aAAa,GAA4BJ,SAAS,~~CAAxDoB~~,IAAI,~~EAAwBf~~,cAAc,GAAKL,SAAS,~~CAAnCqB~~,KAAK;~~UAE9Bf~~,OAAgB,GAAGd,SAAS;UAE5Be,UAAkB,GAAGD,OAAO,GAC5BnB,MAAM,~~CACHmC~~,EAAE,~~CAAC5B~~,KAAK,EAAEC,QAAQ,CAAC,~~CACnB4B~~,OAAO,~~CAACnC~~,IAAI,~~CAACoC~~,IAAI,CAAC,~~CAClBC~~,OAAO,CAAC,CAAC,~~GACZtC~~,MAAM,~~CACHmC~~,EAAE,~~CAAC5B~~,KAAK,EAAEC,QAAQ,CAAC,~~CACnB+B~~,GAAG,~~CAACrB~~,cAAc,EAAED,aAAa,CAAC,~~CAClCmB~~,OAAO,~~CAACnC~~,IAAI,~~CAACoC~~,IAAI,CAAC,CAClBC,OAAO,CAAC,CAAC;QAAA;UAAA,~~MAETlB~~,UAAU,GAAGhB,GAAG;~~YAAA0B~~,QAAA,CAAAE,IAAA;YAAA;UAAA;~~UAAAX~~,SAAA,~~GAAAmB~~,0BAAA,~~CACC1B~~,QAAQ;~~UAAAgB~~,QAAA,CAAAC,IAAA;UAAAV,SAAA,~~CAAAoB~~,CAAA;QAAA;UAAA,~~KAAAnB~~,KAAA,GAAAD,SAAA,~~CAAAqB~~,CAAA,IAAAC,IAAA;~~YAAAb~~,QAAA,CAAAE,IAAA;YAAA;UAAA;UAAnBT,OAAO,GAAAD,KAAA,CAAAY,KAAA;UACVV,iBAAyB,~~GAAGxB~~,MAAM,~~CACrCmC~~,EAAE,~~CAACf~~,UAAU,EAAEZ,QAAQ,CAAC,~~CACxBoC~~,UAAU,~~CAACrB~~,OAAO,CAAC,CACnBgB,GAAG,CAAC,CAAC,~~EAAEtC~~,IAAI,~~CAAC4C~~,GAAG,CAAC,~~CAChBT~~,OAAO,~~CAACnC~~,IAAI,~~CAAC4C~~,GAAG,CAAC,~~CACjBP~~,OAAO,CAAC,CAAC;UAENb,mBAA2B,~~GAAGzB~~,MAAM,~~CACvCmC~~,EAAE,CAACX,iBAAiB,~~EAAEhB~~,QAAQ,CAAC,CAC/~~BsC~~,QAAQ,~~CAAC9B~~,aAAa,EAAED,YAAY,CAAC,~~CACrCuB~~,OAAO,CAAC,CAAC;UAAA,MAERd,iBAAiB,IAAIC,mBAAmB,IAAID,iBAAiB,~~GAAGpB~~,GAAG;~~YAAA0B~~,QAAA,CAAAE,IAAA;YAAA;UAAA;UAAA,~~OAAAF~~,QAAA,~~CAAAiB~~,MAAA;QAAA;UAAA,~~MAInEtB~~,mBAAmB,~~IAAIlB~~,KAAK;~~YAAAuB~~,QAAA,CAAAE,IAAA;YAAA;UAAA;UACxBN,cAAwB,GAAG,CAC/BD,mBAAmB,EACnBD,iBAAiB,GAAG,CAAC,CACtB;~~UAAAM~~,QAAA,CAAAE,IAAA;~~UAED~~,OAAMN,cAAc;QAAA;~~UAEpBP~~,OAAO,GAAG,KAAK;QAAA;~~UAAAW~~,QAAA,CAAAE,IAAA;UAAA;QAAA;UAAAF,QAAA,CAAAE,IAAA;UAAA;QAAA;UAAAF,QAAA,CAAAC,IAAA;UAAAH,EAAA,GAAAE,QAAA;UAAAT,SAAA,~~CAAA2B~~,CAAA,~~CAAApB~~,EAAA;QAAA;UAAAE,QAAA,CAAAC,IAAA;UAAAV,SAAA,~~CAAA4B~~,CAAA;UAAA,~~OAAAnB~~,QAAA,~~CAAAoB~~,MAAA;QAAA;~~UAIbvB~~,cAAsB,~~GAAG3B~~,MAAM,~~CAClCmC~~,EAAE,~~CAACf~~,UAAU,EAAEZ,QAAQ,CAAC,~~CACxB+B~~,GAAG,CAAC,CAAC,~~EAAEtC~~,IAAI,~~CAACoC~~,IAAI,CAAC,CACjBC,OAAO,CAAC,CAAC;~~UAEZlB~~,UAAU,~~GAAGO~~,cAAc;~~UAAAG~~,QAAA,CAAAE,IAAA;UAAA;QAAA;QAAA;UAAA,~~OAAAF~~,QAAA,~~CAAAqB~~,IAAA;MAAA;IAAA,~~GAAAxC~~,OAAA;EAAA;AAAA","ignoreList":[]}
1	+ {"version":3,"file":"getNextWeekday.js","names":["moment","Unit","getNextWeekday","_ref","end","isInitial","options","start","timezone","_regeneratorRuntime","mark","_callee","duration","frequency","weekdays","durationUnit","durationValue","frequencyUnit","frequencyValue","initial","dateCursor","occurrenceCount","weekIteration","_iterator","_step","weekday","nextOccurrenceEnd","nextOccurrenceStart","nextOccurrence","nextDateCursor","_t","wrap","_context","prev","next","unit","value","tz","startOf","Week","valueOf","add","console","log","format","concat","_createForOfIteratorHelper","s","n","done","isoWeekday","Day","subtract","abrupt","e","f","finish","stop"],"sources":["../../../src/scheduling/strategies/getNextWeekday.ts"],"sourcesContent":["import moment from 'moment-timezone'\n\nimport { GetNext, Interval, Unit } from '../scheduling.types'\n\n/*\n Generates next occurrence interval for weekdays strategy\n /\nexport function getNextWeekday({\n end,\n isInitial,\n options,\n start,\n timezone,\n}: GetNext): IterableIterator<Interval> {\n const { duration, frequency, weekdays } = options\n const { unit: durationUnit, value: durationValue } = duration\n const { unit: frequencyUnit, value: frequencyValue } = frequency\n\n let initial: boolean = isInitial\n\n let dateCursor: number = initial\n ? moment.tz(start, timezone).startOf(Unit.Week).valueOf()\n : moment\n .tz(start, timezone)\n .add(frequencyValue, frequencyUnit)\n .startOf(Unit.Week)\n .valueOf()\n\n console.log('[getNextWeekday] START:', {\n start: moment.tz(start, timezone).format('YYYY-MM-DD HH:mm:ss Z'),\n end: moment.tz(end, timezone).format('YYYY-MM-DD HH:mm:ss Z'),\n dateCursor: moment.tz(dateCursor, timezone).format('YYYY-MM-DD HH:mm:ss Z'),\n isInitial,\n frequency: `${frequencyValue}${frequencyUnit}`,\n duration: `${durationValue}${durationUnit}`,\n weekdays,\n })\n\n let occurrenceCount = 0\n let weekIteration = 0\n while (dateCursor < end) {\n console.log(`[getNextWeekday] WEEK_ITERATION[${weekIteration}]:`, {\n dateCursor: moment.tz(dateCursor, timezone).format('YYYY-MM-DD'),\n })\n\n for (const weekday of weekdays) {\n const nextOccurrenceEnd: number = moment\n .tz(dateCursor, timezone)\n .isoWeekday(weekday)\n .add(1, Unit.Day)\n .startOf(Unit.Day)\n .valueOf()\n\n const nextOccurrenceStart: number = moment\n .tz(nextOccurrenceEnd, timezone)\n .subtract(durationValue, durationUnit)\n .valueOf()\n\n if (nextOccurrenceEnd <= nextOccurrenceStart \|\| nextOccurrenceEnd > end) {\n console.log('[getNextWeekday] BOUNDARY CHECK FAILED:', {\n occurrenceCount,\n weekday,\n nextOccurrenceStart: moment\n .tz(nextOccurrenceStart, timezone)\n .format('YYYY-MM-DD HH:mm:ss Z'),\n nextOccurrenceEnd: moment\n .tz(nextOccurrenceEnd, timezone)\n .format('YYYY-MM-DD HH:mm:ss Z'),\n end: moment.tz(end, timezone).format('YYYY-MM-DD HH:mm:ss Z'),\n })\n return\n }\n\n if (nextOccurrenceStart >= start) {\n const nextOccurrence: Interval = [\n nextOccurrenceStart,\n nextOccurrenceEnd - 1,\n ]\n\n console.log(`[getNextWeekday] OCCURRENCE[${occurrenceCount}]:`, {\n weekday,\n start: moment\n .tz(nextOccurrenceStart, timezone)\n .format('YYYY-MM-DD HH:mm:ss Z'),\n end: moment\n .tz(nextOccurrenceEnd - 1, timezone)\n .format('YYYY-MM-DD HH:mm:ss Z'),\n })\n\n yield nextOccurrence\n occurrenceCount++\n\n initial = false\n }\n }\n\n const nextDateCursor: number = moment\n .tz(dateCursor, timezone)\n .add(1, Unit.Week)\n .valueOf()\n\n dateCursor = nextDateCursor\n weekIteration++\n }\n\n console.log('[getNextWeekday] COMPLETE:', { occurrenceCount })\n}\n"],"mappings":"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","ignoreList":[]}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@lighthouse/common",
-  "version": "6.9.2",
+  "version": "6.10.0-canary.0",
   "description": "",
   "main": "dist/index.js",
   "module": "lib/index.js",

package/debug-storybook.log DELETED Viewed

	@@ -1 +0,0 @@
1	- [17:05:07.504] [ERROR] Error: Unknown codemod storiesof-to-csf. Run --list for options.