refactor: use XMLHttpRequest for blocking request and remove async functions

Author: antfu

package-lock.json

@@ -67,13 +67,12 @@
     "prettier": "^1.19.1",
     "raw-loader": "^4.0.0",
     "rimraf": "^3.0.0",
-    "synchronized-promise": "^0.2.0",
     "version-bump-prompt": "^5.0.6",
     "webpack": "^4.41.4",
     "webpack-cli": "^3.3.10",
     "webpack-shell-plugin": "^0.5.0"
   },
   "dependencies": {
-    "axios": "^0.19.0"
+    "xmlhttprequest": "^1.8.0"
   }
 }

package.json

@@ -1,4 +1,4 @@
-async function extractMacros(txt, options = {}) {
+function extractMacros(txt, options = {}) {
   const { lib, reader, lang, importPaths, requestOptions } = options;
 
   function getImports() {
@@ -108,9 +108,9 @@ async function extractMacros(txt, options = {}) {
     } else if (imports[i] in lib) {
       isrc = lib[imports[i]];
     } else {
-      isrc = await reader(imports[i], importPaths, requestOptions);
+      isrc = reader(imports[i], importPaths, requestOptions);
     }
-    macros = macros.concat(await extractMacros(isrc, options));
+    macros = macros.concat(extractMacros(isrc, options));
   }
   return macros;
 }

src/macro.js

@@ -7,7 +7,6 @@ var compilers = require("./compiler/compilers");
 var { typecheck, printSignature } = require("./typecheck");
 var { expandMacros, extractMacros } = require("./macro.js");
 var { defaultImportReader } = require("./reader");
-const makeSynchronize = require("synchronized-promise");
 
 const defaultTrustedHosts = [
   "https://raw.githubusercontent.com/LingDong-/wenyan-lang/master"
@@ -636,7 +635,7 @@ function pyWrapModule(name, src) {
   return `#/*___wenyan_module_${name}_start___*/\n${src}\n#/*___wenyan_module_${name}_end___*/\n`;
 }
 
-async function compileAsync(arg1, arg2, arg3) {
+function compile(arg1, arg2, arg3) {
   let options = {};
   let txt = "";
 
@@ -701,7 +700,7 @@ async function compileAsync(arg1, arg2, arg3) {
     return 0;
   }
 
-  var macros = await extractMacros(txt, {
+  var macros = extractMacros(txt, {
     lib,
     reader,
     lang,
@@ -742,7 +741,7 @@ async function compileAsync(arg1, arg2, arg3) {
   }
   var klass = compilers[lang];
   var compiler = new klass(asc);
-  var result = await compiler.compile({ imports });
+  var result = compiler.compile({ imports });
   var { imports, result } = result;
   var targ = result;
   logCallback(targ);
@@ -755,12 +754,12 @@ async function compileAsync(arg1, arg2, arg3) {
     } else if (imports[i] in lib) {
       isrc = lib[imports[i]];
     } else {
-      isrc = await reader(imports[i], importPaths);
+      isrc = reader(imports[i], importPaths);
     }
     targ =
       mwrapper(
         imports[i],
-        await compile(isrc, {
+        compile(isrc, {
           ...options,
           resetVarCnt: false,
           strict: false
@@ -771,8 +770,6 @@ async function compileAsync(arg1, arg2, arg3) {
   return targ;
 }
 
-const compile = makeSynchronize(compileAsync, { tick: 10 });
-
 function isLangSupportedForEval(lang) {
   if (lang !== "js")
     throw new Error(
@@ -828,21 +825,17 @@ function evalCompiled(compiledCode, options = {}) {
   })();
 }
 
-async function executeAsync(source, options = {}) {
+function execute(source, options = {}) {
   const { lang = "js" } = options;
   isLangSupportedForEval(lang);
-  const compiled = compileAsync(source, options);
+  const compiled = compile(source, options);
   evalCompiled(compiled, options);
 }
 
-const execute = makeSynchronize(executeAsync, { tick: 10 });
-
 var parser = {
   compile,
-  compileAsync,
   evalCompiled,
   execute,
-  executeAsync,
   version,
   wy2tokens,
   tokens2asc,

src/parser.js

@@ -1,5 +1,3 @@
-const axios = require("axios");
-
 function isHostTrusted(url, trustedHosts) {
   for (const host of trustedHosts) {
     // FIXME: it can be bypassed by relative path resolving,
@@ -13,7 +11,24 @@ function isHttpURL(uri) {
   return !!uri.match(/^https?\:\/\//);
 }
 
-async function defaultImportReader(
+function fetchTextSync(url, timeout) {
+  let XHR;
+  if (typeof window !== "undefined" && "XMLHttpRequest" in window)
+    XHR = window.XMLHttpRequest;
+  else XHR = eval("require")("xmlhttprequest").XMLHttpRequest;
+
+  var xmlHttp = new XHR();
+  xmlHttp.timeout = timeout;
+  xmlHttp.open("GET", url, false); // false for synchronous request
+  xmlHttp.send(null);
+
+  if (xmlHttp.status >= 200 && xmlHttp.status < 300)
+    return xmlHttp.responseText;
+
+  throw new URIError(xmlHttp.responseText);
+}
+
+function defaultImportReader(
   moduleName,
   importPaths = [],
   requestOptions = {}
@@ -37,15 +52,11 @@ async function defaultImportReader(
       }
 
       try {
-        const res = await axios(uri, {
-          responseType: "text",
-          timeout: requestTimeout
-        });
-        return res.data;
+        return fetchTextSync(uri, requestTimeout);
       } catch (e) {}
     } else {
       try {
-        return await eval("require")("fs").readFileSync(uri, "utf-8");
+        return eval("require")("fs").readFileSync(uri, "utf-8");
       } catch (e) {}
     }
   }