Implement weekday? and last-weekday-of-month?

Author: strika

src/date.janet

@@ -123,6 +123,14 @@
  [d1 d2]
  (>= (to-time d1) (to-time d2)))
 
+(defn weekday?
+  ```
+  Returns true if the date is a week day (Monday-Friday).
+  ```
+  [date]
+  (has-value? ["Monday" "Tuesday" "Wednesday" "Thursday" "Friday"]
+              (date :week-day)))
+
 (defn last-day-of-month?
   ```
   Returns true if the date is the last day of a month.
@@ -139,3 +147,11 @@
   (def next-week (+days date 7))
   (and (= (date :week-day) "Friday")
        (not= (date :month) (next-week :month))))
+
+(defn last-weekday-of-month?
+  ```
+  Return true if the date is the last week day of a month.
+  ```
+  [date]
+  (or (and (weekday? date) (last-day-of-month? date))
+      (last-friday-of-month? date)))

test/commands/schedule_tasks_test.janet

@@ -93,7 +93,7 @@
   (test (scheduled-for? task (d/date 2022 6 30)) true)
   (test (scheduled-for? task (d/date 2022 7 29)) true)
   (test (scheduled-for? task (d/date 2022 8 31)) true)
-  (test (scheduled-for? task (d/date 2022 9 29)) true)
+  (test (scheduled-for? task (d/date 2022 9 30)) true)
   (test (scheduled-for? task (d/date 2022 10 31)) true)
   (test (scheduled-for? task (d/date 2022 11 30)) true)
   (test (scheduled-for? task (d/date 2022 12 30)) true)

test/date_test.janet

@@ -68,6 +68,18 @@
   (test (d/after-or-eq? (d/date 2021 7 1) (d/date 2021 7 1)) true)
   (test (not (d/after-or-eq? (d/date 2021 7 1) (d/date 2021 7 15))) true))
 
+## —————————————————————————————————————————————————————————————————————————————————————————————————
+## Test weekday?
+
+(deftest "returns true if the date is a weekday"
+  (test (d/weekday? (d/date 2022 1 3)) true)
+  (test (d/weekday? (d/date 2022 1 4)) true)
+  (test (d/weekday? (d/date 2022 1 5)) true)
+  (test (d/weekday? (d/date 2022 1 6)) true)
+  (test (d/weekday? (d/date 2022 1 7)) true)
+  (test (d/weekday? (d/date 2022 1 8)) false)
+  (test (d/weekday? (d/date 2022 1 9)) false))
+
 ## —————————————————————————————————————————————————————————————————————————————————————————————————
 ## Test last-day-of-month?
 
@@ -88,7 +100,25 @@
   (test (not (d/last-day-of-month? (d/date 2022 1 30))) true))
 
 ## —————————————————————————————————————————————————————————————————————————————————————————————————
-## Test last-Friday-of-month?
+## Test last-weekday-of-month?
+
+(deftest "returns true when the date is the last week day of the month"
+  (test (d/last-weekday-of-month? (d/date 2022 1 31)) true)
+  (test (d/last-weekday-of-month? (d/date 2022 2 28)) true)
+  (test (d/last-weekday-of-month? (d/date 2022 3 31)) true)
+  (test (d/last-weekday-of-month? (d/date 2022 4 29)) true)
+  (test (d/last-weekday-of-month? (d/date 2022 5 31)) true)
+  (test (d/last-weekday-of-month? (d/date 2022 6 30)) true)
+  (test (d/last-weekday-of-month? (d/date 2022 7 29)) true)
+  (test (d/last-weekday-of-month? (d/date 2022 8 31)) true)
+  (test (d/last-weekday-of-month? (d/date 2022 9 30)) true)
+  (test (d/last-weekday-of-month? (d/date 2022 10 31)) true)
+  (test (d/last-weekday-of-month? (d/date 2022 11 30)) true)
+  (test (d/last-weekday-of-month? (d/date 2022 12 30)) true)
+  (test (not (d/last-weekday-of-month? (d/date 2022 1 30))) true))
+
+## —————————————————————————————————————————————————————————————————————————————————————————————————
+## Test last-friday-of-month?
 
 (deftest "returns true when the date is the last friday of the month"
   (test (d/last-friday-of-month? (d/date 2022 1 28)) true)