status-im/re-frame
2
0
Fork 0
mirror of https://github.com/status-im/re-frame.git synced 2025-02-23 23:38:11 +00:00
Code Issues Projects Releases Wiki Activity

Refactor code

Browse Source 
- calculate subscription value within with-trace
- rename sub-value to value
This commit is contained in:
Saskia Lindner 2017-09-26 08:24:26 +02:00
parent 7249b7b5c2
commit d0f93ad626
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/re_frame/subs.cljc
View File

@ -114,7 +114,7 @@
(if-let [cached (cache-lookup query)]
(do
(trace/merge-trace! {:tags {:cached? true
:sub-value (deref cached)
:value (deref cached)
:reaction (reagent-id cached)}})
cached)
@ -125,7 +125,7 @@
(do (trace/merge-trace! {:error true})
(console :error (str "re-frame: no subscription handler registered for: \"" query-id "\". Returning a nil subscription.")))
(let [sub-reaction (handler-fn app-db query)]
(do (trace/merge-trace! {:tags {:sub-value (deref sub-reaction)}})
(do (trace/merge-trace! {:tags {:value (deref sub-reaction)}})
(cache-and-return query [] sub-reaction))))))))
([query dynv]
@ -305,13 +305,13 @@
reaction-id (atom nil)
reaction (make-reaction
(fn []
(let [sub-value (computation-fn (deref-input-signals subscriptions query-id) query-vec)]
(trace/with-trace {:operation (first-in-vector query-vec)
:op-type :sub/run
:tags {:sub-value sub-value
:query-v query-vec
:reaction @reaction-id}}
sub-value))))]
(trace/with-trace {:operation (first-in-vector query-vec)
:op-type :sub/run
:tags {:query-v query-vec
:reaction @reaction-id}}
(let [subscription (computation-fn (deref-input-signals subscriptions query-id) query-vec)]
(trace/merge-trace! {:tags {:value subscription}})
subscription))))]
(reset! reaction-id (reagent-id reaction))
reaction))
@ -320,14 +320,14 @@
reaction-id (atom nil)
reaction (make-reaction
(fn []
(let [sub-value (computation-fn (deref-input-signals subscriptions query-id) query-vec dyn-vec)]
(trace/with-trace {:operation (first-in-vector query-vec)
:op-type :sub/run
:tags {:sub-value sub-value
:query-v query-vec
:dyn-v dyn-vec
:reaction @reaction-id}}
sub-value))))]
(trace/with-trace {:operation (first-in-vector query-vec)
:op-type :sub/run
:tags {:query-v query-vec
:dyn-v dyn-vec
:reaction @reaction-id}}
(let [subscription (computation-fn (deref-input-signals subscriptions query-id) query-vec dyn-vec)]
(trace/merge-trace! {:tags {:value subscription}})
subscription))))]
(reset! reaction-id (reagent-id reaction))
reaction))))))