Fix some issues with styles as js-value

funcool · Aug 23, 2024 · 0016623 · 0016623
1 parent 8e205d5
commit 0016623
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/src/rumext/v2/compiler.clj b/src/rumext/v2/compiler.clj
@@ -415,25 +415,29 @@
   expression. Mainly used by macros for create js data structures at
   compile time."
   [form]
-  (if (empty? form)
-    (list 'js* "{}")
-    (let [[keys vals] (compile-kv-to-js form)]
-      (-> (apply list 'js* (str "{" keys "}") vals)
-          (vary-meta assoc :tag 'object)))))
+  (if (map? form)
+    (if (empty? form)
+      (list 'js* "{}")
+      (let [[keys vals] (compile-kv-to-js form)]
+        (-> (apply list 'js* (str "{" keys "}") vals)
+            (vary-meta assoc :tag 'object))))
+    form))
 
 (defn compile-vec-to-js
   "Compile a statically known map data sturcture, non-recursivelly to js
   expression. Mainly used by macros for create js data structures at
   compile time."
   [form]
-  (if (empty? form)
-    (list 'js* "[]")
-    (let [template (->> form
-                        (map (constantly "~{}"))
-                        (interpose ",")
-                        (apply str))]
-      (-> (apply list 'js* (str "[" template "]") form)
-          (vary-meta assoc :tag 'object)))))
+  (if (vector? form)
+    (if (empty? form)
+      (list 'js* "[]")
+      (let [template (->> form
+                          (map (constantly "~{}"))
+                          (interpose ",")
+                          (apply str))]
+        (-> (apply list 'js* (str "[" template "]") form)
+            (vary-meta assoc :tag 'object))))
+    form))
 
 (defn compile-props-to-js
   [props & {:keys [::transform-props-recursive