Fix #592: fix clj->js for custom classes (#593)

squint-cljs · Dec 3, 2024 · 4358aa2 · 4358aa2
1 parent bfe1ab5
commit 4358aa2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "squint-cljs",
   "type": "module",
   "sideEffects": false,
-  "version": "0.8.127",
+  "version": "0.8.128",
   "files": [
     "core.js",
     "src/squint/core.js",

diff --git a/src/squint/core.js b/src/squint/core.js
@@ -2751,7 +2751,8 @@ function clj__GT_js_(x, seen) {
     return update_vals(x, x => clj__GT_js_(x, seen));
   }
 
-  if (coll_QMARK_(x)) {
+  const tc = typeConst(x);
+  if (tc && tc != OBJECT_TYPE) {
     return mapv(x => clj__GT_js_(x, seen), x);
   }
   return x;

diff --git a/test/squint/compiler_test.cljs b/test/squint/compiler_test.cljs
@@ -2339,7 +2339,11 @@ new Foo();")
   (is (eq {:a [2 3 4]}
           (jsv! "(clj->js {:a (map inc [1 2 3])})")))
   (is (eq [2 3 4]
-          (jsv! "(def x {:a 1 :b (map inc [1 2 3])}) (set! (.-a x) x) (:b (clj->js x))"))))
+          (jsv! "(def x {:a 1 :b (map inc [1 2 3])}) (set! (.-a x) x) (:b (clj->js x))")))
+  (is (true?
+       (jsv! "(defclass Foo (constructor [this x] (set! this.x x))) (instance? Foo (clj->js (new Foo [1 2 3])))")))
+  (is (true?
+       (jsv! "(= \"foo\" (clj->js \"foo\"))"))))
 
 (defn init []
   (t/run-tests 'squint.compiler-test 'squint.jsx-test 'squint.string-test 'squint.html-test))