@@ -30,17 +30,19 @@

    (contains? equipment cmd) (equipment cmd)

    :else {:err (str "Unknown command '" cmdline "'")})))

-(re-frame/reg-event-db

+(re-frame/reg-event-fx

  ::submit-cmd

- (fn-traced [db _]

-  (let [cmdline (-> db (get-in [:cmdline :current]) trim)

+ (fn [cofx _]

+  (let [db (cofx :db)

+        cmdline (-> db (get-in [:cmdline :current]) trim)

         not-empty? seq]

-    ; TODO replace this with a "->when" macro so that we

-    ; don't always have to prefix with a conditional

-    (cond-> db

-     true (update-in [:cmdline :current] (constantly nil))

-     (not-empty? cmdline)

-     (as-> db

-       (let [output (execute db cmdline)]

-           (update-in db [:cmdline :history] conj

-               {:input cmdline :output output})))))))

+    {:db

+     ; TODO replace this with a "->when" macro so that we

+     ; don't always have to prefix with a conditional

+     (cond-> db

+      true (update-in [:cmdline :current] (constantly nil))

+      (not-empty? cmdline)

+      (as-> db

+        (let [output (execute db cmdline)]

+            (update-in db [:cmdline :history] conj

+                {:input cmdline :output output}))))})))