hron-ts 0.2.0 → 0.4.0

package/dist/index.js

@@ -847,11 +847,16 @@ function matches(schedule, datetime) {
     const untilDate = resolveUntil(schedule.until, datetime);
     if (Temporal.PlainDate.compare(date, untilDate) > 0) return false;
   }
-  const timeMatches = (times) => times.some((tod) => zdt.hour === tod.hour && zdt.minute === tod.minute);
+  const timeMatchesWithDst = (times) => times.some((tod) => {
+    if (zdt.hour === tod.hour && zdt.minute === tod.minute) return true;
+    const t = toPlainTime(tod);
+    const resolved = atTimeOnDate(date, t, tz);
+    return resolved.epochNanoseconds === datetime.epochNanoseconds;
+  });
   switch (schedule.expr.type) {
     case "dayRepeat": {
       if (!matchesDayFilter(date, schedule.expr.days)) return false;
-      if (!timeMatches(schedule.expr.times)) return false;
+      if (!timeMatchesWithDst(schedule.expr.times)) return false;
       if (schedule.expr.interval > 1) {
         const anchorDate = schedule.anchor ? Temporal.PlainDate.from(schedule.anchor) : EPOCH_DATE;
         const dayOffset = daysBetween(anchorDate, date);
@@ -875,13 +880,13 @@ function matches(schedule, datetime) {
       const { interval, days, times } = schedule.expr;
       const dow = date.dayOfWeek;
       if (!days.some((d) => weekdayNameToNumber(d) === dow)) return false;
-      if (!timeMatches(times)) return false;
+      if (!timeMatchesWithDst(times)) return false;
       const anchorDate = schedule.anchor ? Temporal.PlainDate.from(schedule.anchor) : EPOCH_MONDAY;
       const weeks = weeksBetween(anchorDate, date);
       return weeks >= 0 && weeks % interval === 0;
     }
     case "monthRepeat": {
-      if (!timeMatches(schedule.expr.times)) return false;
+      if (!timeMatchesWithDst(schedule.expr.times)) return false;
       if (schedule.expr.interval > 1) {
         const anchorDate = schedule.anchor ? Temporal.PlainDate.from(schedule.anchor) : EPOCH_DATE;
         const monthOffset = monthsBetweenYM(anchorDate, date);
@@ -902,7 +907,7 @@ function matches(schedule, datetime) {
       return Temporal.PlainDate.compare(date, lastWd) === 0;
     }
     case "ordinalRepeat": {
-      if (!timeMatches(schedule.expr.times)) return false;
+      if (!timeMatchesWithDst(schedule.expr.times)) return false;
       if (schedule.expr.interval > 1) {
         const anchorDate = schedule.anchor ? Temporal.PlainDate.from(schedule.anchor) : EPOCH_DATE;
         const monthOffset = monthsBetweenYM(anchorDate, date);
@@ -926,7 +931,7 @@ function matches(schedule, datetime) {
       return Temporal.PlainDate.compare(date, targetDate) === 0;
     }
     case "singleDate": {
-      if (!timeMatches(schedule.expr.times)) return false;
+      if (!timeMatchesWithDst(schedule.expr.times)) return false;
       const { date: dateSpec } = schedule.expr;
       if (dateSpec.type === "iso") {
         const target = Temporal.PlainDate.from(dateSpec.date);
@@ -938,7 +943,7 @@ function matches(schedule, datetime) {
       return false;
     }
     case "yearRepeat": {
-      if (!timeMatches(schedule.expr.times)) return false;
+      if (!timeMatchesWithDst(schedule.expr.times)) return false;
       if (schedule.expr.interval > 1) {
         const anchorYear = schedule.anchor ? Temporal.PlainDate.from(schedule.anchor).year : EPOCH_DATE.year;
         const yearOffset = date.year - anchorYear;