fix: cron.matchDate always returning true for day of month, when eith…

…er weekday or day of month is unrestricted (#271) * resolves #270 * resolves #270 Co-authored-by: Renzo Sartorius <[email protected]>
P4sca1 · Apr 27, 2022 · 8ebd6a6 · 8ebd6a6
1 parent 39cca25
commit 8ebd6a6
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/src/cron.ts b/src/cron.ts
@@ -530,12 +530,19 @@ export class Cron {
     const { second, minute, hour, day, month, weekday } =
       extractDateElements(date)
 
-    return (
-      this.seconds.indexOf(second) !== -1 &&
-      this.minutes.indexOf(minute) !== -1 &&
-      this.hours.indexOf(hour) !== -1 &&
-      this.months.indexOf(month) !== -1 &&
-      (this.days.indexOf(day) !== -1 || this.weekdays.indexOf(weekday) !== -1)
-    )
+    if (
+      this.seconds.indexOf(second) === -1 ||
+      this.minutes.indexOf(minute) === -1 ||
+      this.hours.indexOf(hour) === -1 ||
+      this.months.indexOf(month) === -1
+    ) {
+      return false
+    }
+
+    if (this.days.length !== 31 && this.weekdays.length !== 7) {
+      return this.days.indexOf(day) !== -1 || this.weekdays.indexOf(weekday) !== -1
+    }
+
+    return this.days.indexOf(day) !== -1 && this.weekdays.indexOf(weekday) !== -1
   }
 }