fix event metadata marker

Signed-off-by: Julien Eluard <julien.eluard@gmail.com>

.gitignore

@@ -16,3 +16,4 @@ website/static/js/
 website/static/extensions/
 \.\#*
 .nrepl-port
+*.lck

src/pluto/reader/blocks.cljc

@@ -39,7 +39,7 @@
   (cond (contains? values o) (get values o)
         (symbol? o) nil
         (string? o) (utils/interpolate values o)
-        (and (fn? o) (= :event (meta o))) #(o % values) ;; Intercept events and inject the env. TODO remove this hack
+        (and (fn? o) (:event (meta o))) #(o % values) ;; Intercept events and inject the env. TODO remove this hack
         :else o))
 
 (defn walkup-upto-leaf [f lp? lf tree]

src/pluto/reader/types.cljc

@@ -116,11 +116,13 @@
         :else o))
 
 (defn event-after-env [ref data args bindings]
-  (fn [o env]
-    (let [env (merge env (reduce-kv #(assoc %1 (symbol (name %2)) %3) {} o)
-                     (:data (destructuring/destructure bindings (merge o args))))
-          dic (reduce-kv #(assoc %1 %2 (if (contains? env %3) (get env %3) %3)) {} env)]
-      [ref (merge o (reduce-kv #(assoc %1 %2 (replace-atom dic  %3)) {} data))])))
+  (with-meta
+    (fn [o env]
+      (let [env (merge env (reduce-kv #(assoc %1 (symbol (name %2)) %3) {} o)
+                       (:data (destructuring/destructure bindings (merge o args))))
+            dic (reduce-kv #(assoc %1 %2 (if (contains? env %3) (get env %3) %3)) {} env)]
+        [ref (merge o (reduce-kv #(assoc %1 %2 (replace-atom dic  %3)) {} data))]))
+    {:event true}))
 
 (defn- reference-with-arguments [ctx ext ref event arguments args bindings]
   (if arguments

src/pluto/reader/views.cljc

@@ -53,7 +53,7 @@
 (defn wrap-data [type data env o]
   (if (types/reference-types type)
     (if (= :event type)
-      (with-meta (fn [env o] (data env o)) :event)
+      (with-meta (fn [env o] (data env o)) {:event true})
       data)
     data))