Remove task :done attribute

Author: strika

src/plan.janet

@@ -114,10 +114,10 @@
   (tasks-from-days (days-between plan start-date end-date)))
 
 (defn completed-tasks [plan]
-  (filter (fn [t] (t :done)) (all-tasks plan)))
+  (filter (fn [t] (= (t :state) :checked)) (all-tasks plan)))
 
 (defn pending-tasks [plan]
-  (filter (fn [t] (not (t :done))) (all-tasks plan)))
+  (filter (fn [t] (= (t :state) :open)) (all-tasks plan)))
 
 (defn has-task-after?
   ```

src/plan/parser.janet

@@ -39,7 +39,7 @@
     :tasks
       {:main (group (any :task))
        :task
-         {:main (replace (* (constant :done) :task-begin
+         {:main (replace (* (constant :state) :task-begin
                             " "
                             (constant :title) (capture (some (if-not (+ "\n" " (missed on") 1)))
                             (? :task-missed-on-date)
@@ -51,8 +51,8 @@
             {:main (* "- " :checkbox)
              :checkbox
                {:main (+ :checkbox-done :checkbox-pending)
-                :checkbox-done (* (+ "[x]" "[X]") (constant true))
-                :checkbox-pending (* "[ ]" (constant false))}}
+                :checkbox-done (* (+ "[x]" "[X]") (constant :checked))
+                :checkbox-pending (* "[ ]" (constant :open))}}
           :task-missed-on-date (* " (missed on " (constant :missed-on) :date ")")
           :task-body
             {:main (group (any :task-body-line))

src/plan/serializer.janet

@@ -8,8 +8,8 @@
 (defn- plan-title [plan]
   (string "# " (plan :title)))
 
-(defn- checkbox [done]
-  (if done "[X]" "[ ]"))
+(defn- checkbox [task]
+  (if (= (task :state) :checked) "[X]" "[ ]"))
 
 (defn- serialize-event-title [event]
   (string "- " (event :title)))
@@ -34,7 +34,7 @@
     ""))
 
 (defn- serialize-task-title [task]
-  (string "- " (checkbox (task :done)) " " (task :title) (task-mark task)))
+  (string "- " (checkbox task) " " (task :title) (task-mark task)))
 
 (defn- serialize-task-body [task]
   (def body (task :body))

src/task.janet

@@ -1,11 +1,13 @@
 ### ————————————————————————————————————————————————————————————————————————————————————————————————
 ### This module implements task entity and related functions.
+###
+### A task can have the following states: :checked, :open.
 
 (import ./date)
 
 (defn build-task [title done &opt body]
   (default body @[])
-  {:title title :body body :done done :state (if done :checked :open)})
+  {:title title :body body :state (if done :checked :open)})
 
 (defn build-scheduled-task [line title schedule]
   (def task (build-task title false))

test/commands/schedule_contacts_test.janet

@@ -17,7 +17,7 @@
   (let [day ((plan :days) 0)
         task ((day :tasks) 0)]
     (test (task :title) "Contact John Doe")
-    (test (task :done) false)
+    (test (task :state) :open)
     (test (empty? (task :body)) true)))
 
 (deftest "schedules contacts for future"
@@ -33,7 +33,7 @@
   (if (= 1 (length (day-2 :tasks)))
     (let [task ((day-2 :tasks) 0)]
       (test (task :title) "Contact John Doe")
-      (test (task :done) false)
+      (test (task :state) :open)
       (test (empty? (task :body)) true))))
 
 (deftest "schedules contacts with birthday"
@@ -46,7 +46,7 @@
   (let [day ((plan :days) 0)
         task ((day :tasks) 0)]
     (test (task :title) "Congratulate birthday to John Doe")
-    (test (task :done) false)
+    (test (task :state) :open)
     (test (empty? (task :body)) true)))
 
 (deftest "schedules contacts with missed birthday"

test/commands/schedule_tasks_test.janet

@@ -170,7 +170,7 @@
   (let [day ((plan :days) 1)
         task ((day :tasks) 0)]
     (test (task :title) "Weekly meeting")
-    (test (task :done) false)
+    (test (task :state) :open)
     (test (task :schedule) "every Monday")))
 
 (deftest "doesn't insert duplicate tasks"
@@ -194,7 +194,7 @@
       (let [task ((day :tasks) 0)]
         (test (task :title) "Weekly meeting")
         (test (d/equal? (d/date 2022 1 17) (task :missed-on)) true)
-        (test (task :done) false)
+        (test (task :state) :open)
         (test (task :schedule) "every Monday")))))
 
 (deftest "schedules missed monthly tasks"
@@ -221,7 +221,7 @@
     (if (not (empty? (day :tasks)))
       (let [task ((day :tasks) 0)]
         (test (task :title) "Weekly meeting")
-        (test (task :done) false)
+        (test (task :state) :open)
         (test (task :schedule) "every Monday")))))
 
 (deftest "doesn't schedule tasks that are not scheduled for future day that is not in the plan"

test/examples/todo.md

@@ -5,9 +5,9 @@
 ## 2020-08-01, Saturday
 
 - [ ] Develop photos for the grandmother
-- [X] Pay bills
+- [ ] Pay bills
 
 ## 2020-07-31, Friday
 
-- [X] Review open pull requests
-- [X] Fix flaky test
+- [ ] Review open pull requests
+- [ ] Fix flaky test

test/plan/parser_test.janet

@@ -36,31 +36,31 @@
   (test (plan :title) "Main TODO")
   (let [task (inbox 0)]
     (test (task :title) "#home - Fix the lamp")
-    (test (not (task :done)) true))
+    (test (task :state) :open))
   (let [task (inbox 1)]
     (test (task :title) "Update Rust")
-    (test (not (task :done)) true))
+    (test (task :state) :open))
   (test (= (d/date 2020 8 1) (day-1 :date)) true)
   (let [task ((day-1 :tasks) 0)]
     (test (task :title) "Develop photos")
-    (test (not (task :done)) true))
+    (test (task :state) :open))
   (let [task ((day-1 :tasks) 1)]
     (test (task :title) "Pay bills")
-    (test (task :done) true))
+    (test (task :state) :checked))
   (let [task ((day-1 :tasks) 2)]
     (test (task :title) "Fix the lamp")
-    (test (not (task :done)) true)
+    (test (task :state) :open)
     (test (d/equal? (d/date 2020 7 30) (task :missed-on)) true))
   (test (= (d/date 2020 7 31) (day-2 :date)) true)
   (let [event ((day-2 :events) 0)]
     (test (event :title) "Talked to Mike & Molly")
     (test (empty? (event :body)) true))
   (let [task ((day-2 :tasks) 0)]
     (test (task :title) "#work - Review open pull requests")
-    (test (task :done) true))
+    (test (task :state) :checked))
   (let [task ((day-2 :tasks) 1)]
     (test (task :title) "#work - Fix the flaky test")
-    (test (task :done) true)))
+    (test (task :state) :checked)))
 
 (deftest "parses a template plan"
   (def plan-string
@@ -90,7 +90,7 @@
         task ((day :tasks) 0)]
     (test (= (d/date 2020 7 30) (day :date)) true)
     (test (task :title) "Pay bills")
-    (test (not (task :done)) true)))
+    (test (task :state) :open)))
 
 (deftest "parses a plan with one task that has a body"
   (def plan-string
@@ -110,7 +110,7 @@
         task-body (task :body)]
     (test (= (d/date 2020 7 30) (day :date)) true)
     (test (task :title) "Pay bills")
-    (test (not (task :done)) true)
+    (test (task :state) :open)
     (test (task-body 0) "- Electricity")
     (test (task-body 1) "- Water")))
 
@@ -131,9 +131,9 @@
         task-2 ((day :tasks) 1)]
     (test (= (d/date 2020 7 30) (day :date)) true)
     (test (task-1 :title) "Pay bills")
-    (test (not (task-1 :done)) true)
+    (test (task-1 :state) :open)
     (test (task-2 :title) "Fix the lamp")
-    (test (task-2 :done) true)))
+    (test (task-2 :state) :checked)))
 
 (deftest "parses a plan without inbox"
   (def plan-string
@@ -206,7 +206,7 @@
     (test (event :title) "Talked to Mike & Molly")
     (test ((event :body) 0) "- They moved to a new apartment")
     (test (task :title) "Fix the lamp")
-    (test (task :done) true)))
+    (test (task :state) :checked)))
 
 (deftest "parses a plan with an event without any tasks"
   (def plan-string

test/schedule_parser_test.janet

@@ -26,7 +26,7 @@
   (test (length scheduled-tasks) 9)
   (let [task (scheduled-tasks 0)]
     (test (task :title) "Weekly Meeting")
-    (test (task :done) false)
+    (test (task :state) :open)
     (test (task :schedule) "every Tuesday"))
   (let [task (scheduled-tasks 1)]
     (test (task :title) "Puzzle Storm on Lichess")

test/task_test.janet

@@ -10,7 +10,6 @@
 (deftest "builds a new task"
   (def task (task/build-task "Weekly meeting" false "Meeting agenda"))
   (test (task :title) "Weekly meeting")
-  (test (task :done) false)
   (test (task :body) "Meeting agenda")
   (test (task :state) :open))
 
@@ -23,7 +22,6 @@
 (deftest "builds a new scheduled task"
   (def task (task/build-scheduled-task 15 "Weekly meeting" "every Tuesday"))
   (test (task :title) "Weekly meeting")
-  (test (task :done) false)
   (test (task :state) :open))
 
 ## —————————————————————————————————————————————————————————————————————————————————————————————————
@@ -33,7 +31,6 @@
   (test (task :title) "Weekly meeting")
   (test (task :body) "Meeting agenda")
   (test (d/equal? (task :missed-on) date) true)
-  (test (task :done) false)
   (test (task :state) :open))
 
 ## —————————————————————————————————————————————————————————————————————————————————————————————————
@@ -43,7 +40,6 @@
   (test (task :title) "Weekly meeting")
   (test (task :contact) "John Doe")
   (test (task :body) "Meeting agenda")
-  (test (task :done) false)
   (test (task :state) :open))
 
 ## —————————————————————————————————————————————————————————————————————————————————————————————————