slightly better formatting

Author: borkdude

cherry/corpus/foo.cljs

@@ -6,7 +6,7 @@
 (log (+ 1 2 3))
 
 (let [y (let [x (do (log "in do")
-                   12)]
-         (log "x + 1 =" (inc x))
-         (+ x 13))]
+                    12)]
+          (log "x + 1 =" (inc x))
+          (+ x 13))]
   (log "y =" y))

cherry/corpus/foo.mjs

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

cherry/src/cherry/transpiler.clj

@@ -163,7 +163,7 @@
   (wrap-await (emit more)))
 
 (defn wrap-iife [s & [{:keys [async?]}]]
-  (cond-> (format "(%sfunction () { %s })()" (if async? "async " "") s)
+  (cond-> (format "(%sfunction () {\n %s\n})()" (if async? "async " "") s)
     async? (wrap-await)))
 
 (defn return [s]
@@ -301,7 +301,7 @@
   (assert (vector? sig))
   (let [body (return (emit-do body {:async? async?}))]
     (str (when-not elide-function? "function ") (comma-list sig) " {\n"
-         (emit-var-declarations) body " }")))
+         (emit-var-declarations) body "\n}")))
 
 (defn emit-function* [expr]
   (let [name (when (symbol? (first expr)) (first expr))
@@ -480,9 +480,8 @@
       (let [next-form (e/parse-next rdr)]
         (if (= ::e/eof next-form)
           transpiled
-          (let [next-js (js (clj next-form))]
-            (recur (str transpiled next-js (when-not (str/blank? next-js)
-                                             ";\n")))))))))
+          (let [next-js (some-> (js (clj next-form)) not-empty (statement))]
+            (recur (str transpiled next-js))))))))
 
 (defn transpile-file [{:keys [in-file out-file]}]
   (let [out-file (or out-file