Box cherry user dynvars too, keeping its cljs.core vars plain

Author: borkdude

src/squint/compiler_common.cljc

@@ -619,13 +619,18 @@
                           (let [m (munged-name expr)]
                             m)))))]
           ;; a reference to a dynamic var (earmuffed, not a local) reads the
-          ;; box's .val. Cherry has real CLJS dynamic vars, no box.
+          ;; box's .val. Cherry boxes user dynvars too (cross-module set! in
+          ;; per-file ESM output), but its cljs.core vars are real CLJS vars:
+          ;; a reference resolved to the core module alias stays plain.
           (emit-return (escape-jsx
-                        (cond-> expr
-                          (and (not= :cherry (:target env))
-                               (dynamic-name? orig-sym)
-                               (not (contains? (:var->ident env) orig-sym)))
-                          (str ".val"))
+                        (let [core-ref? (when-let [core-alias (:core-alias env)]
+                                          (str/starts-with? (str expr) (str core-alias ".")))]
+                          (cond-> expr
+                            (and (dynamic-name? orig-sym)
+                                 (not (contains? (:var->ident env) orig-sym))
+                                 (or (not= :cherry (:target env))
+                                     (not core-ref?)))
+                            (str ".val")))
                         env)
                        env))))))
 
@@ -802,9 +807,8 @@
         init (emit expr (expr-env env*))
         ;; a dynamic var (earmuffed) compiles to a mutable box {value ...} so
         ;; set!/binding can mutate it across ESM modules; references read .value.
-        ;; Cherry has real CLJS dynamic vars, no box.
-        init (if (and (not= :cherry (:target env))
-                      (dynamic-name? name))
+        ;; Cherry too: only its cljs.core vars are plain (see the symbol emit).
+        init (if (dynamic-name? name)
                (str "({val: " init "})")
                init)]
     (str "var " ident " = "