Fix templated string with dynamic attrs (#539)

squint-cljs · Jun 20, 2024 · 5b797b8 · 5b797b8
1 parent 58aa353
commit 5b797b8
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/src/squint/compiler.cljc b/src/squint/compiler.cljc
@@ -325,23 +325,25 @@
                           (seq children)
                           (assoc :children children))))
                 env))
-        (emit-return
-         (cond->> (format "<%s%s>%s</%s>"
+        (let [ret (format "<%s%s>%s</%s>"
                           tag-name
                           (cc/jsx-attrs attrs env)
                           (let [env (expr-env env)]
                             (str/join "" (map #(emit % env) elts)))
-                          tag-name)
-           (:outer-html (meta expr)) (format "%s`%s`"
-                                             (if-let [t (:tag (meta expr))]
-                                               (emit t (expr-env (dissoc env :jsx :html)))
-                                               (if @has-dynamic-expr?
-                                                 (do
-                                                   (when top-dynamic-expr
-                                                     (reset! top-dynamic-expr true))
-                                                   "squint_html.tag")
-                                                 ""))))
-         env)))
+                          tag-name)]
+          (when @has-dynamic-expr?
+            (when top-dynamic-expr
+              (reset! top-dynamic-expr true)))
+          (emit-return
+           (cond->> ret
+               (:outer-html (meta expr))
+             (format "%s`%s`"
+                     (if-let [t (:tag (meta expr))]
+                       (emit t (expr-env (dissoc env :jsx :html)))
+                       (if @has-dynamic-expr?
+                         "squint_html.tag"
+                         ""))))
+           env))))
     (emit-return (format "[%s]"
                          (str/join ", " (emit-args env expr))) env)))
 
@@ -359,7 +361,7 @@
           mk-pair (fn [pair]
                     (let [k (key pair)]
                       (str (if (= :& k)
-                             (str "...")
+                             "..."
                              (str (emit (key-fn k) expr-env) ": "))
                            (emit (val pair) expr-env))))
           keys (str/join ", " (map mk-pair (seq expr)))]