feat: outputHanzi option for ide

antfu · antfu · commit 7f24f4c4cca9 · 2020-01-02T11:23:26.000+08:00
diff --git a/src/parser.js b/src/parser.js
@@ -790,9 +790,9 @@ function hanzinize(value) {
   }
 }
 
-function outputHanziWrapper(log) {
+function outputHanziWrapper(log, outputHanzi) {
   return function output(...args) {
-    log(...args.map(i => hanzinize(i)));
+    log(...args.map(i => (outputHanzi ? hanzinize(i) : i)));
   };
 }
 
@@ -810,9 +810,7 @@ function evalCompiled(compiledCode, options = {}) {
 
   (() => {
     const _console_log = console.log;
-    if (outputHanzi) {
-      console.log = outputHanziWrapper(output);
-    }
+    console.log = outputHanziWrapper(output, outputHanzi);
     try {
       if (!scoped && "window" in this) {
         window.eval(code);
@@ -822,7 +820,7 @@ function evalCompiled(compiledCode, options = {}) {
     } catch (e) {
       throw e;
     } finally {
-      if (outputHanzi) console.log = _console_log;
+      console.log = _console_log;
     }
   })();
 }
diff --git a/tools/make_ide.js b/tools/make_ide.js
@@ -136,9 +136,11 @@ function main() {
   selr.onchange = run;
 
   var hidestd = document.getElementById("hide-std");
+  var outputHanzi = document.getElementById("output-hanzi");
   var outdiv = document.getElementById("out");
 
   hidestd.onchange = run;
+  outputHanzi.onchange = run;
 
   function run() {
     highlightCode();
@@ -158,6 +160,7 @@ function main() {
     hljs.highlightBlock(document.getElementById("js"));
 
     evalCompiled(code, {
+      outputHanzi: outputHanzi.checked,
       output: (...args) => {
         outdiv.innerText += args.join(" ") + "\n";
       }
@@ -185,7 +188,19 @@ pre{tab-size: 4;}
 <script>${utils.catsrc()}</script>
 <body style="background:#272822;padding:20px;color:white;font-family:sans-serif;">
   <h2><i>wenyan-lang</i></h2>
-<table><tr><td><select id="pick-example"></select><button id="run">Run</button>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="auto-hl"/><small>Auto Highlight</small>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="hide-std" checked=""/><small>Hide Imported Code</small>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<small>Romanization</small><select id="pick-roman"></select></td></tr><tr><td id="in" valign="top"><div class="tbar">EDITOR</div></td><td rowspan="2" valign="top"><div class="tbar">COMPILED JAVASCRIPT</div><pre id="js"></pre></td></tr><tr><td valign="top"><div class="tbar">OUTPUT</div><pre id="out"></pre></td></tr></table>
+<table><tr><td>
+<select id="pick-example"></select><button id="run">Run</button>
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<input type="checkbox" id="auto-hl"/><small>Auto Highlight</small>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<input type="checkbox" id="hide-std" checked=""/><small>Hide Imported Code</small>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<input type="checkbox" id="output-hanzi" checked=""/><small>Output Hanzi</small>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<small>Romanization</small><select id="pick-roman"></select>
+
+</td></tr><tr><td id="in" valign="top"><div class="tbar">EDITOR</div></td><td rowspan="2" valign="top"><div class="tbar">COMPILED JAVASCRIPT</div><pre id="js"></pre></td></tr><tr><td valign="top"><div class="tbar">OUTPUT</div><pre id="out"></pre></td></tr></table>
 <script>var STDLIB = ${JSON.stringify(lib)};</script>
 <script>var prgms = ${JSON.stringify(prgms)};</script>
 <script>var examplesAlias = ${JSON.stringify(examplesAlias)};</script>

Original file line number	Diff line number	Diff line change
`@@ -790,9 +790,9 @@ function hanzinize(value) {`
`790`	`790`	`}`
`791`	`791`	`}`
`792`	`792`
`793`		`-function outputHanziWrapper(log) {`
	`793`	`+function outputHanziWrapper(log, outputHanzi) {`
`794`	`794`	`return function output(...args) {`
`795`		`- log(...args.map(i => hanzinize(i)));`
	`795`	`+ log(...args.map(i => (outputHanzi ? hanzinize(i) : i)));`
`796`	`796`	`};`
`797`	`797`	`}`
`798`	`798`
`@@ -810,9 +810,7 @@ function evalCompiled(compiledCode, options = {}) {`
`810`	`810`
`811`	`811`	`(() => {`
`812`	`812`	`const _console_log = console.log;`
`813`		`- if (outputHanzi) {`
`814`		`- console.log = outputHanziWrapper(output);`
`815`		`- }`
	`813`	`+ console.log = outputHanziWrapper(output, outputHanzi);`
`816`	`814`	`try {`
`817`	`815`	`if (!scoped && "window" in this) {`
`818`	`816`	`window.eval(code);`
`@@ -822,7 +820,7 @@ function evalCompiled(compiledCode, options = {}) {`
`822`	`820`	`} catch (e) {`
`823`	`821`	`throw e;`
`824`	`822`	`} finally {`
`825`		`- if (outputHanzi) console.log = _console_log;`
	`823`	`+ console.log = _console_log;`
`826`	`824`	`}`
`827`	`825`	`})();`
`828`	`826`	`}`