def

Author: borkdude

cherry/corpus/foo.cljs

@@ -1,8 +1,12 @@
 (ns foo)
 
-(js/console.log "hello")
-(js/console.log (+ 1 2 3))
+(def log js/console.log)
 
-(let [x (do (js/console.log "in do")
-            12)]
-  (js/console.log "x + 1 =" (inc x)))
+(log "hello")
+(log (+ 1 2 3))
+
+(let [y (let [x (do (log "in do")
+                   12)]
+         (log "x + 1 =" (inc x))
+         (+ x 13))]
+  (log "y =" y))

cherry/corpus/foo.mjs

@@ -1,5 +1,9 @@
-console.log("hello");
-console.log((1 + 2 + 3));
-(function () { const x = (function () { console.log("in do");
+const log = console.log;
+;
+log("hello");
+log((1 + 2 + 3));
+(function () { const y = (function () { const x = (function () { log("in do");
 return 12; })();
-return (function () { return console.log("x + 1 =", (x + 1)); })(); })();
+return (function () { log("x + 1 =", (x + 1));
+return (x + 13); })(); })();
+return (function () { return log("y =", y); })(); })();

cherry/src/cherry/transpiler.clj

@@ -73,9 +73,13 @@
   (str (name expr)))
 
 (defmethod emit clojure.lang.Symbol [expr]
-  (when-not (valid-symbol? (str expr))
-    (#' throwf "%s is not a valid javascript symbol" expr))
-  (str expr))
+  (let [expr (if (and (qualified-symbol? expr)
+                      (= "js" (namespace expr)))
+               (name expr)
+               expr)]
+    (when-not (valid-symbol? (str expr))
+      (#' throwf "%s is not a valid javascript symbol" expr))
+    (str expr)))
 
 (defmethod emit java.util.regex.Pattern [expr]
   (str \/ expr \/))
@@ -87,7 +91,7 @@
                          'return 'delete 'new 'do 'aget 'while 'doseq
                          'str 'inc! 'dec! 'dec 'inc 'defined? 'and 'or
                          '? 'try 'break
-                         'await 'const 'defn 'let 'ns]))
+                         'await 'const 'defn 'let 'ns 'def]))
 
 (def prefix-unary-operators (set ['!]))
 
@@ -138,12 +142,18 @@
                               (partition 2 more))
                          (repeat statement-separator))))
 
-(defmethod emit-special 'const [_type [const & more]]
+(defn emit-const [more]
   (apply str (interleave (map (fn [[name expr]]
                                 (str "const " (emit name) " = " (emit expr)))
                               (partition 2 more))
                          (repeat statement-separator))))
 
+(defmethod emit-special 'const [_type [_const & more]]
+  (emit-const more))
+
+(defmethod emit-special 'def [_type [_const & more]]
+  (emit-const more))
+
 (declare emit-do)
 
 (defn wrap-await [s]