Extract format-command-errors to utils

Author: strika

src/commands/list_contacts.janet

@@ -1,6 +1,7 @@
 ### ————————————————————————————————————————————————————————————————————————————————————————————————
 ### This module implements the list contacts command.
 
+(import ../utils :prefix "")
 (import ../date :as d)
 (import ../contact/repository :as contacts_repository)
 
@@ -18,9 +19,6 @@
     (print (to-csv-line contact)))
   plan)
 
-(defn- format-command-errors [command errors]
-  (map (fn [error] (string command " " (string/ascii-lower error) ".")) errors))
-
 ## —————————————————————————————————————————————————————————————————————————————————————————————————
 ## Public Interface
 

src/commands/schedule_contacts.janet

@@ -1,6 +1,8 @@
 ### ————————————————————————————————————————————————————————————————————————————————————————————————
 ### This module implements a command for scheduling contacts for today in a plan.
 
+(import ../utils :prefix "")
+
 (import ../contact)
 (import ../date)
 (import ../day)
@@ -51,9 +53,6 @@
 (defn- schedule-birthday-tasks [plan contacts today]
   (schedule-tasks plan contacts today birthday-prefix contact/birthday?))
 
-(defn- format-command-errors [command errors]
-  (map (fn [error] (string command " " (string/ascii-lower error) ".")) errors))
-
 ## —————————————————————————————————————————————————————————————————————————————————————————————————
 ## Public Interface
 

src/commands/schedule_tasks.janet

@@ -1,6 +1,8 @@
 ### ————————————————————————————————————————————————————————————————————————————————————————————————
 ### This module implements a command for scheduling days for today in a plan.
 
+(import ../utils :prefix "")
+
 (import ../date)
 (import ../day)
 (import ../plan)
@@ -49,9 +51,6 @@
           (task/mark-as-missed task (day :date))))
        tasks))
 
-(defn- format-errors [errors]
-  (map (fn [error] (string command " " (string/ascii-lower error) ".")) errors))
-
 ## —————————————————————————————————————————————————————————————————————————————————————————————————
 ## Public Interface
 
@@ -74,10 +73,10 @@
     (let [load-file-result (file_repository/load argument)
           errors (load-file-result :errors)]
       (if errors
-        {:errors (format-errors errors)}
+        {:errors (format-command-errors command errors)}
         (let [parse-result (schedule_parser/parse (load-file-result :text))
               errors (parse-result :errors)]
           (if errors
-            {:errors (format-errors errors)}
+            {:errors (format-command-errors command errors)}
             {:command [schedule-tasks (parse-result :tasks) (date/today)]}))))
     {}))

src/commands/stats.janet

@@ -1,7 +1,7 @@
 ### ————————————————————————————————————————————————————————————————————————————
 ### This module implements stats command.
 
-(import ../utils :as "u")
+(import ../utils :prefix "")
 (import ../plan)
 
 ## —————————————————————————————————————————————————————————————————————————————
@@ -12,9 +12,9 @@
   Prints stats for the plan. Returns the plan.
   ```
   [plan]
-  (print (u/pluralize (length (plan :days)) "day"))
-  (print (u/pluralize (length (plan/completed-tasks plan)) "completed task"))
-  (print (u/pluralize (length (plan/pending-tasks plan)) "pending task"))
+  (print (pluralize (length (plan :days)) "day"))
+  (print (pluralize (length (plan/completed-tasks plan)) "completed task"))
+  (print (pluralize (length (plan/pending-tasks plan)) "pending task"))
   plan)
 
 (defn build-command [arguments &]

src/contact/repository.janet

@@ -1,8 +1,9 @@
 ### ————————————————————————————————————————————————————————————————————————————————————————————————
 ### This module implements a repository that loads contacts from Markdown files.
 
-(import ../file_repository)
 (import ../utils)
+
+(import ../file_repository)
 (import ./parser :as contact_parser)
 
 (defn- load-contact [contact-path]

src/utils.janet

@@ -13,3 +13,6 @@
   (if (string/has-suffix? "/" path)
     (string/trimr path "/")
     path))
+
+(defn format-command-errors [command errors]
+  (map (fn [error] (string command " " (string/ascii-lower error) ".")) errors))