@@ -16,19 +16,21 @@

  (fn-traced [db [_ current]]

   (assoc-in db [:cmdline :current] current)))

-(defn execute

-    [db cmdline]

- (let [spells (db :spells)

+(defn execute [db cmdline]

+ (let [append-history #(update-in db [:cmdline :history] conj {:input cmdline :output %})

+       spells (db :spells)

        equipment (db :equipment)

        cmd (keyword cmdline)]

   ; TODO: Replace with the 'match' macro

   (cond

-   (= "Open Game License" cmdline) (db :license)

-   (= "spells" cmdline) (vals spells)

-   (= "items" cmdline) (vals equipment)

-   (contains? spells cmd) (spells cmd)

-   (contains? equipment cmd) (equipment cmd)

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

+   (empty? cmdline) db

+   (= "clear" cmdline) (assoc-in db [:cmdline :history] [])

+   (= "Open Game License" cmdline) (append-history (db :license))

+   (= "spells" cmdline) (append-history (vals spells))

+   (= "items" cmdline) (append-history (vals equipment))

+   (contains? spells cmd) (append-history (spells cmd))

+   (contains? equipment cmd) (append-history (equipment cmd))

+   :else (append-history {:err (str "Unknown command '" cmdline "'")}))))

 (re-frame/reg-fx

  :window/scroll-to

@@ -82,19 +84,13 @@

  ::submit-cmd

  (fn [cofx [_ prompt]]

   (let [db (cofx :db)

-        cmdline (some-> db :cmdline :current trim)

-        not-empty? seq]

+        cmdline (some-> db :cmdline :current trim)]

     {: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))

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

-      (not-empty? cmdline)

-      (as-> db

-        (let [output (execute db cmdline)]

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

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

+     (-> db

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

+      (update-in [:cmdline :selected-history] (constantly nil))

+      (execute cmdline))

+

      ; dispatch-later to ensure that the DOM has already been updated,

      ; so that scrollMaxY has been changed appropriately.

      :fx [[:dispatch-later {:ms 10 :dispatch [::scroll-to prompt]}]]})))