feat: make outputHanzi works for ide and site

Author: antfu

src/parser.js

@@ -772,7 +772,7 @@ function hanzinize(value) {
   } else if (typeof value == "boolean") {
     return bool2hanzi(value);
   } else if (Array.isArray(value)) {
-    return value.map(i => hanzinize(i));
+    return value.map(i => hanzinize(i)).join("。");
   } else {
     return value;
   }
@@ -785,7 +785,12 @@ function outputHanziWrapper(log) {
 }
 
 function evalCompiled(compiledCode, options = {}) {
-  const { outputHanzi = true, scoped = false, lang = "js" } = options;
+  const {
+    outputHanzi = true,
+    scoped = false,
+    lang = "js",
+    output = console.log
+  } = options;
 
   isLangSupportedForEval(lang);
 
@@ -794,7 +799,7 @@ function evalCompiled(compiledCode, options = {}) {
   (() => {
     const _console_log = console.log;
     if (outputHanzi) {
-      console.log = outputHanziWrapper(_console_log);
+      console.log = outputHanziWrapper(output);
     }
     try {
       if (!scoped && "window" in this) {

tools/make_ide.js

@@ -136,6 +136,8 @@ function main() {
   selr.onchange = run;
 
   var hidestd = document.getElementById("hide-std");
+  var outdiv = document.getElementById("out");
+
   hidestd.onchange = run;
 
   function run() {
@@ -153,27 +155,16 @@ function main() {
 
     document.getElementById("js").innerText = js_beautify(showcode);
     hljs.highlightBlock(document.getElementById("js"));
-    code = code.replace(/console.log\(/g, `log2div(`);
-    eval(code);
+
+    evalCompiled(code, {
+      output: (...args) => {
+        outdiv.innerText += args.join(" ") + "\n";
+      }
+    });
   }
 
-  // document.getElementById("in").append(ln);
   document.getElementById("in").append(ed);
-
   document.getElementById("run").onclick = run;
-  function log2div() {
-    var outdiv = document.getElementById("out");
-    for (var i = 0; i < arguments.length; i++) {
-      if (typeof arguments[i] == "number") {
-        outdiv.innerText += num2hanzi(arguments[i]);
-      } else if (typeof arguments[i] == "boolean") {
-        outdiv.innerText += bool2hanzi(arguments[i]);
-      } else {
-        outdiv.innerText += arguments[i];
-      }
-    }
-    outdiv.innerText += "\n";
-  }
   run();
 }
 

tools/make_site.js

@@ -25,7 +25,6 @@ function load_svg(pth) {
   svg = svg.replace(/(\d+)\.(\d)\d*/g, `$1.$2`);
   svg = svg.replace(/width=".+?"/, `width="100%"`);
   svg = svg.replace(/height=".+?"/, ``);
-  console.log(svg);
   return svg;
 }
 
@@ -45,7 +44,7 @@ function main() {
       romanizeIdentifiers: "none",
       errorCallback: function(x) {
         hasError = true;
-        log2div(i, x);
+        louts[i].innerText = x;
       }
     });
     if (i == 0) {
@@ -64,36 +63,14 @@ function main() {
       document.getElementById("rb").innerText =
         "# Ruby\n" + rb.split("#####\n")[1];
     }
-    // hljs.highlightBlock(document.getElementById("js"));
-    if (!hasError) {
-      code = code.replace(/console.log\(/g, `log2div(` + i + ",");
-      eval(code);
-    }
-  }
 
-  function log2div() {
-    // alert(arguments[1])
-    if (arguments[1] instanceof Array && arguments.length == 2) {
-      var l = [];
-      for (var i = 0; i < arguments[1].length; i++) {
-        if (i != 0) {
-          l.push("。");
+    if (!hasError) {
+      evalCompiled(code, {
+        output: (...args) => {
+          outs[i].innerText += args.join(" ") + "\n";
         }
-        l.push(arguments[1][i]);
-      }
-      return log2div(arguments[0], ...l);
-    }
-    var outdiv = outs[arguments[0]];
-    for (var i = 1; i < arguments.length; i++) {
-      if (typeof arguments[i] == "number") {
-        outdiv.innerText += num2hanzi(arguments[i]);
-      } else if (typeof arguments[i] == "boolean") {
-        outdiv.innerText += bool2hanzi(arguments[i]);
-      } else {
-        outdiv.innerText += arguments[i];
-      }
+      });
     }
-    outdiv.innerText += "\n";
   }
 
   function loop() {