update recollect to use new memof

Author: tiye

calcit.cirru

@@ -22,13 +22,13 @@
     "md5": "^2.3.0",
     "randomcolor": "^0.6.2",
     "shortid": "^2.2.16",
-    "ws": "^7.4.2"
+    "ws": "^7.4.3"
   },
   "devDependencies": {
     "feather-icons": "^4.28.0",
     "node-notifier": "^9.0.0",
-    "shadow-cljs": "^2.11.11",
+    "shadow-cljs": "^2.11.18",
     "source-map-support": "^0.5.19",
-    "url-parse": "^1.4.7"
+    "url-parse": "^1.5.1"
   }
 }

package.json

@@ -5,16 +5,17 @@
     [mvc-works/hsl "0.1.2"]
     [mvc-works/shell-page "0.1.15"]
     [mvc-works/ws-edn "0.1.4"]
-    [cumulo/recollect "0.6.3"]
+    [cumulo/recollect "0.6.4"]
     [cumulo/reel "0.2.0"]
     [cumulo/util "0.1.12"]
-    [respo "0.13.4"]
+    [cumulo/memof "0.2.3"]
+    [respo "0.13.9"]
     [respo/ui "0.3.16"]
     [respo/alerts "0.5.5"]
     [respo/message "0.3.6"]
     [respo/feather "0.1.1"]
     [cirru/bisection-key "0.1.6"]
-    [cirru/favored-edn "0.1.3"]
+    [cirru/favored-edn "0.1.4"]
     [medley "1.3.0"]
     [applied-science/js-interop "0.2.7"]
     [org.clojure/core.incubator "0.1.4"]

shadow-cljs.edn

@@ -1,33 +1,29 @@
 
 (ns app.twig.container
-  (:require [recollect.twig :refer [deftwig]]
-            [app.twig.user :refer [twig-user]]
-            ["randomcolor" :as color]))
+  (:require [app.twig.user :refer [twig-user]]
+            ["randomcolor" :as color]
+            [memof.alias :refer [memof-call]]))
 
-(deftwig
- twig-members
- (sessions users)
- (->> sessions
-      (map (fn [[k session]] [k (get-in users [(:user-id session) :name])]))
-      (into {})))
+(defn twig-members [sessions users]
+  (->> sessions
+       (map (fn [[k session]] [k (get-in users [(:user-id session) :name])]))
+       (into {})))
 
-(deftwig
- twig-container
- (db session records)
- (let [logged-in? (some? (:user-id session))
-       router (:router session)
-       base-data {:logged-in? logged-in?, :session session, :reel-length (count records)}]
-   (merge
-    base-data
-    (if logged-in?
-      {:user (twig-user (get-in db [:users (:user-id session)])),
-       :router (assoc
-                router
-                :data
-                (case (:name router)
-                  :home (:pages db)
-                  :profile (twig-members (:sessions db) (:users db))
-                  {})),
-       :count (count (:sessions db)),
-       :color (color/randomColor)}
-      nil))))
+(defn twig-container [db session records]
+  (let [logged-in? (some? (:user-id session))
+        router (:router session)
+        base-data {:logged-in? logged-in?, :session session, :reel-length (count records)}]
+    (merge
+     base-data
+     (if logged-in?
+       {:user (memof-call twig-user (get-in db [:users (:user-id session)])),
+        :router (assoc
+                 router
+                 :data
+                 (case (:name router)
+                   :home (:pages db)
+                   :profile (memof-call twig-members (:sessions db) (:users db))
+                   {})),
+        :count (count (:sessions db)),
+        :color (color/randomColor)}
+       nil))))

src/app/twig/container.cljs

@@ -1,4 +1,4 @@
 
-(ns app.twig.user (:require [recollect.twig :refer [deftwig]]))
+(ns app.twig.user (:require ))
 
-(deftwig twig-user (user) (dissoc user :password))
+(defn twig-user [user] (dissoc user :password))