chore: fix

Author: antfu

src/macro.js

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

src/parser.js

@@ -221,6 +221,12 @@ function tokenRomanize(tokens, method) {
   }
 }
 
+function defaultLogCallback(x) {
+  return typeof x == "string"
+    ? console.log(x)
+    : console.dir(x, { depth: null, maxArrayLength: null });
+}
+
 function tokens2asc(
   tokens,
   assert = (msg, pos, b) => {
@@ -648,18 +654,24 @@ async function compile(arg1, arg2, arg3) {
   const {
     lang = "js",
     romanizeIdentifiers = "none",
-    resetVarCnt,
-    logCallback = x =>
-      typeof x == "string"
-        ? console.log(x)
-        : console.dir(x, { depth: null, maxArrayLength: null }),
+    resetVarCnt = true,
+    logCallback = defaultLogCallback,
     errorCallback = process.exit,
     lib = typeof STDLIB == "undefined" ? {} : STDLIB,
     reader = defaultImportReader,
     importPaths = [],
-    strict = false
+    strict = false,
+    allowHttp = false,
+    trustedHosts = [],
+    requestTimeout = 2000
   } = options;
 
+  const requestOptions = {
+    allowHttp,
+    trustedHosts,
+    requestTimeout
+  };
+
   if (resetVarCnt) idenMap = {};
   txt = (txt || "").replace(/\r\n/g, "\n");
 
@@ -689,7 +701,13 @@ async function compile(arg1, arg2, arg3) {
     return 0;
   }
 
-  var macros = await extractMacros(txt, { lib, reader, lang, importPaths });
+  var macros = await extractMacros(txt, {
+    lib,
+    reader,
+    lang,
+    importPaths,
+    requestOptions
+  });
   txt = expandMacros(txt, macros);
 
   logCallback("\n\n=== [PASS 0] EXPAND-MACROS ===");
@@ -743,15 +761,9 @@ async function compile(arg1, arg2, arg3) {
       mwrapper(
         imports[i],
         await compile(isrc, {
-          lang,
-          romanizeIdentifiers,
+          ...options,
           resetVarCnt: false,
-          strict: false,
-          logCallback,
-          errorCallback,
-          lib,
-          reader,
-          importPaths
+          strict: false
         })
       ) + targ;
   }

src/reader.js

@@ -2,6 +2,7 @@ function isHostTrusted(url, trustedHosts) {
   // TODO:
   return false;
 }
+
 function isHttpURL(uri) {
   return !!uri.match(/^https?\:\/\//);
 }
@@ -48,9 +49,6 @@ async function defaultImportReader(
   );
 }
 
-try {
-  module.exports = {
-    normalizeImportPath,
-    defaultImportReader
-  };
-} catch (e) {}
+module.exports = {
+  defaultImportReader
+};