update to use memof-call; bump 0.6.4

README.md

@@ -7,11 +7,10 @@ Cached rendering and diff/patch library designed for Cumulo project.
 ### API [![Clojars Project](https://img.shields.io/clojars/v/cumulo/recollect.svg)](https://clojars.org/cumulo/recollect)
 
 ```clojure
-[cumulo/recollect "0.6.2"]
+[cumulo/recollect "0.6.4"]
 ```
 
 ```clojure
-(recollect.twig/deftwig twig-name [param] body)
 (recollect.twig/clear-twig-caches!)
 (recollect.twig/new-twig-loop!)
 (recollect.diff/diff-twig a b {:key :id})

deps.edn

@@ -1,5 +1,5 @@
 {
-  :paths ["src" "polyfill"]
+  :paths ["src"]
   :deps {
     cumulo/memof {:mvn/version "0.2.3"}
   }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "recollect",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Recollect data renderer",
   "main": "index.js",
   "scripts": {
@@ -23,6 +23,6 @@
   "author": "jiyinyiyong",
   "license": "MIT",
   "devDependencies": {
-    "shadow-cljs": "^2.11.15"
+    "shadow-cljs": "^2.11.18"
   }
 }

release.edn

@@ -1,4 +1,4 @@
-{:version "0.6.3",
+{:version "0.6.4",
  :group-id "cumulo",
  :artifact-id "recollect",
  :skip-tag true,

shadow-cljs.edn

@@ -1,10 +1,10 @@
 {
-  :source-paths ["src" "polyfill" "cli"]
+  :source-paths ["src" "cli"]
   :cache-blockers #{cumulo-util.build}
   :dependencies [
     [mvc-works/hsl "0.1.2"]
     [mvc-works/shell-page "0.1.15"]
-    [respo "0.13.4"]
+    [respo "0.13.9"]
     [respo/ui "0.3.16"]
     [cumulo/util "0.1.12"]
     [cumulo/memof "0.2.3"]

src/recollect/app/twig/card.cljs

@@ -1,4 +1,4 @@
 
-(ns recollect.app.twig.card (:require [recollect.twig :refer [deftwig]]))
+(ns recollect.app.twig.card (:require ))
 
-(deftwig twig-card (user date) {:user user, :date date})
+(defn twig-card [user date] {:user user, :date date})

src/recollect/app/twig/container.cljs

@@ -1,8 +1,4 @@
 
-(ns recollect.app.twig.container
-  (:require [recollect.app.twig.card :refer [twig-card]] [recollect.twig :refer [deftwig]]))
+(ns recollect.app.twig.container (:require [recollect.app.twig.card :refer [twig-card]]))
 
-(deftwig
- twig-container
- (store)
- (merge store {:card (twig-card (:user store) (:date store))}))
+(defn twig-container [store] (merge store {:card (twig-card (:user store) (:date store))}))

src/recollect/test.cljs

@@ -4,14 +4,13 @@
             [recollect.diff :refer [diff-twig]]
             [recollect.patch :refer [patch-twig]]
             [recollect.schema :as schema]
-            [recollect.util :refer [vec-add seq-add]]
-            [recollect.twig :refer [deftwig]]))
+            [recollect.util :refer [vec-add seq-add]]))
 
 (deftest
  test-diff-funcs
  ()
- (let [A (deftwig twig-a0 (f) (f))
-       B (deftwig twig-b0 (f) (f))
+ (let [A (defn twig-a0 [f] (f))
+       B (defn twig-b0 [f] (f))
        fx (fn [] "x")
        a0 (A fx)
        b (B fx)

src/recollect/twig.cljs

@@ -1,18 +1,12 @@
 
-(ns recollect.twig (:require [memof.core :as memof]) (:require-macros [recollect.twig]))
+(ns recollect.twig
+  (:require [memof.core :as memof]
+            [memof.alias
+             :refer
+             [*memof-call-states reset-calling-caches! tick-calling-loop!]]))
 
-(defonce *twig-caches (atom (memof/new-states {})))
+(defn clear-twig-caches! [] (reset-calling-caches!))
 
-(defn call-twig-func [f params]
-  (let [v (memof/access-record *twig-caches f params)]
-    (if (some? v)
-      v
-      (let [result (apply f params)]
-        (memof/write-record! *twig-caches f params result)
-        result))))
+(defn new-twig-loop! [] (tick-calling-loop!))
 
-(defn clear-twig-caches! [] (memof/reset-entries! *twig-caches))
-
-(defn new-twig-loop! [] (memof/new-loop! *twig-caches))
-
-(defn show-twig-summay [] (memof/show-summary @*twig-caches))
+(defn show-twig-summay [] (memof/show-summary @*memof-call-states))