* src/cljs/cljs/core.cljs: fix type to return nil for types w/o const…

…ructors
clojure · Apr 11, 2012 · 9319579 · 9319579
1 parent f7a0039
commit 9319579
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/cljs/cljs/core.cljs b/src/cljs/cljs/core.cljs
@@ -245,7 +245,9 @@
   (identical? x nil))
 
 (defn type [x]
-  (js* "(~{x}).constructor"))
+  (if (or (nil? x) (undefined? x))
+    nil
+    (js* "(~{x}).constructor")))
 
 ;;;;;;;;;;;;;;;;;;; protocols on primitives ;;;;;;;;
 (declare hash-map list equiv-sequential)

diff --git a/test/cljs/cljs/core_test.cljs b/test/cljs/cljs/core_test.cljs
@@ -609,6 +609,8 @@
 
   ;; js->clj
   (assert (= {"a" 1, "b" 2} (js->clj (js* "{\"a\":1,\"b\":2}"))))
+  (assert (= {"a" nil} (js->clj (js* "{\"a\":null}"))))
+  (assert (= {"a" true, "b" false} (js->clj (js* "{\"a\":true,\"b\":false}"))))
   (assert (= {:a 1, :b 2} (js->clj (js* "{\"a\":1,\"b\":2}") :keywordize-keys true)))
   (assert (= [[{:a 1, :b 2} {:a 1, :b 2}]]
                (js->clj (js* "[[{\"a\":1,\"b\":2}, {\"a\":1,\"b\":2}]]") :keywordize-keys true)))