Improve importing

.gitignore

@@ -6,4 +6,5 @@ build/wenyan-win.exe
 temp
 dist
 /tools/calendar.html
-藏書樓
+藏書樓
+.node-xmlhttprequest-*

src/macro.js

@@ -1,5 +1,5 @@
 function extractMacros(txt, options = {}) {
-  const { lib, reader, lang, importPaths, requestOptions } = options;
+  const { lib, reader, lang, importOptions } = options;
 
   function getImports() {
     var imps = [];
@@ -117,15 +117,25 @@ function extractMacros(txt, options = {}) {
   var imports = getImports();
   var macros = getMacros();
   for (var i = 0; i < imports.length; i++) {
-    var isrc;
+    var isrc, entry;
     if (imports[i] in lib[lang]) {
       isrc = lib[lang][imports[i]];
     } else if (imports[i] in lib) {
       isrc = lib[imports[i]];
     } else {
-      isrc = reader(imports[i], importPaths, requestOptions);
+      const file = reader(imports[i], importOptions);
+      isrc = file.src;
+      entry = file.entry;
     }
-    macros = macros.concat(extractMacros(isrc, options));
+    macros = macros.concat(
+      extractMacros(isrc, {
+        ...options,
+        importOptions: {
+          ...importOptions,
+          entryFilepath: entry
+        }
+      })
+    );
   }
   return macros;
 }

src/parser.js

@@ -224,6 +224,11 @@ function defaultLogCallback(x) {
     : console.dir(x, { depth: null, maxArrayLength: null });
 }
 
+function defaultErrorCallback(e) {
+  console.error(e);
+  process.exit();
+}
+
 function tokens2asc(
   tokens,
   assert = (msg, pos, b) => {
@@ -677,19 +682,29 @@ function compile(arg1, arg2, arg3) {
     romanizeIdentifiers = "none",
     resetVarCnt = true,
     logCallback = defaultLogCallback,
-    errorCallback = process.exit,
-    lib = typeof STDLIB == "undefined" ? {} : STDLIB,
-    reader = defaultImportReader,
-    importPaths = [],
+    errorCallback = defaultErrorCallback,
+    lib = STDLIB,
     strict = false,
+
+    // import options
+    entryFilepath = undefined,
+    importPaths = [],
+    importCache = {},
+    importContext = {},
     allowHttp = false,
     trustedHosts = [],
     requestTimeout = 2000
   } = options;
 
   trustedHosts.push(...defaultTrustedHosts);
 
-  const requestOptions = {
+  const reader = defaultImportReader;
+
+  const importOptions = {
+    entryFilepath,
+    importPaths,
+    importCache,
+    importContext,
     allowHttp,
     trustedHosts,
     requestTimeout
@@ -728,8 +743,7 @@ function compile(arg1, arg2, arg3) {
     lib,
     reader,
     lang,
-    importPaths,
-    requestOptions
+    importOptions
   });
   txt = expandMacros(txt, macros);
 
@@ -765,26 +779,29 @@ function compile(arg1, arg2, arg3) {
   }
   var klass = compilers[lang];
   var compiler = new klass(asc);
-  var result = compiler.compile({ imports });
-  var { imports, result } = result;
+  var { imports, result } = compiler.compile({ imports });
   var targ = result;
   logCallback(targ);
   imports = imports || [];
   imports = Array.from(new Set(imports));
+  logCallback("Loading imports", imports);
   for (var i = 0; i < imports.length; i++) {
-    var isrc;
+    var isrc, entry;
     if (imports[i] in lib[lang]) {
       isrc = lib[lang][imports[i]];
     } else if (imports[i] in lib) {
       isrc = lib[imports[i]];
     } else {
-      isrc = reader(imports[i], importPaths, requestOptions);
+      const file = reader(imports[i], importOptions);
+      isrc = file.src;
+      entry = file.entry;
     }
     targ =
       mwrapper(
         imports[i],
         compile(isrc, {
           ...options,
+          entryFilepath: entry,
           resetVarCnt: false,
           strict: false
         })

src/reader.js

@@ -30,21 +30,52 @@ function fetchTextSync(url, timeout) {
   throw new URIError(xmlHttp.responseText);
 }
 
-function defaultImportReader(
-  moduleName,
-  importPaths = [],
-  requestOptions = {}
-) {
+function fetchSync(uri, cache, requestTimeout) {
+  if (cache[uri]) return cache[uri];
+
+  const data = isHttpURL(uri)
+    ? fetchTextSync(uri, requestTimeout)
+    : eval("require")("fs").readFileSync(uri, "utf-8");
+
+  cache[uri] = data;
+
+  return data;
+}
+
+function defaultImportReader(moduleName, requestOptions = {}) {
   const {
     allowHttp = false,
+    entryFilepath,
+    importPaths = [],
+    importCache = {},
+    importContext = {},
     trustedHosts = [],
     requestTimeout = 2000
   } = requestOptions;
 
-  if (typeof importPaths === "string") importPaths = [importPaths];
+  if (importContext[moduleName]) return { src: importContext[moduleName] };
+
+  const pathes = [];
 
-  for (dir of importPaths) {
+  if (typeof importPaths === "string") {
+    pathes.push(importPaths);
+  } else {
+    pathes.push(...importPaths);
+  }
+
+  if (entryFilepath)
+    pathes.push(
+      entryFilepath
+        .replace(/\\/g, "/")
+        .split("/")
+        .slice(0, -1)
+        .join("/")
+    );
+
+  for (dir of pathes) {
     let uri = dir;
+    let entries = [];
+    let src;
 
     if (uri.endsWith("/")) uri = uri.slice(0, -1);
 
@@ -55,33 +86,23 @@ function defaultImportReader(
             `You can turn it on by specify the "allowHttp" option.`
         );
       }
-
-      try {
-        return fetchTextSync(
-          `${uri}/${encodeURIComponent(moduleName)}.wy`,
-          requestTimeout
-        );
-      } catch (e) {}
-      try {
-        return fetchTextSync(
-          `${uri}/${encodeURIComponent(moduleName)}/${encodeURIComponent(
-            INDEX_FILENAME
-          )}.wy`,
-          requestTimeout
-        );
-      } catch (e) {}
+      entries = [
+        `${uri}/${encodeURIComponent(moduleName)}.wy`,
+        `${uri}/${encodeURIComponent(moduleName)}/${encodeURIComponent(
+          INDEX_FILENAME
+        )}.wy`
+      ];
     } else {
+      entries = [
+        `${uri}/${moduleName}.wy`,
+        `${uri}/${moduleName}/${INDEX_FILENAME}.wy`
+      ];
+    }
+
+    for (const entry of entries) {
       try {
-        return eval("require")("fs").readFileSync(
-          `${dir}/${moduleName}.wy`,
-          "utf-8"
-        );
-      } catch (e) {}
-      try {
-        return eval("require")("fs").readFileSync(
-          `${dir}/${moduleName}/${INDEX_FILENAME}.wy`,
-          "utf-8"
-        );
+        src = fetchSync(entry, importCache, requestTimeout);
+        return { src, entry };
       } catch (e) {}
     }
   }

static/ide.js

@@ -130,7 +130,7 @@ function main() {
       romanizeIdentifiers: selr.value,
       resetVarCnt: true,
       errorCallback: (...args) => (outdiv.innerText += args.join(" ") + "\n"),
-      reader: x => Examples.examples[x]
+      importContext: Examples.examples,
     });
 
     var showcode = hidestd.checked ? hideImportedModules(code) : code;

static/ide2.html

@@ -698,6 +698,18 @@
 hidestd.onchange = crun;
 outputHanzi.onchange = crun;
 
+function getImportContext(){
+  let context =  { 
+    ...Examples.examples,
+  }
+
+  for(const key of Object.keys(state.files)){
+    context[key] = state.files[key].code
+  }
+
+  return context
+}
+
 function compile(){
   document.getElementById("out").innerText = "";
   var log = ""
@@ -706,7 +718,7 @@
     romanizeIdentifiers: selr.value,
     resetVarCnt: true,
     errorCallback: (...args) => (outdiv.innerText += args.join(" ") + "\n"),
-    reader: x => Examples.examples[x],
+    importContext: getImportContext(),
     logCallback:(x)=>{log+=x+"\n"},
     strict:true
   });
@@ -733,7 +745,7 @@
     romanizeIdentifiers: selr.value,
     resetVarCnt: true,
     errorCallback: (...args) => (outdiv.innerText += args.join(" ") + "\n"),
-    reader: x => Examples.examples[x]
+    importContext: getImportContext(),
   });
 
   var showcode = hidestd.checked ? hideImportedModules(code) : code;

test/fixture/nested-import/四庫全書/序.wy

@@ -0,0 +1,3 @@
+吾嘗觀「「本草綱目」」之書。方悟「草部」之義。
+
+今有一元。曰「草部」。名之曰「草部」。

test/fixture/nested-import/四庫全書/本草綱目/序.wy

@@ -0,0 +1,3 @@
+吾嘗觀「「草部」」之書。方悟「草部」之義。
+
+今有一元。曰「草部」。名之曰「草部」。

test/fixture/nested-import/四庫全書/本草綱目/草部.wy

@@ -0,0 +1 @@
+今有一言。曰「「甘草。黄芪。人参。」」。名之曰「草部」。

test/import.test.js

@@ -0,0 +1,18 @@
+const { createTestUtil } = require("./utils");
+
+const { expectOutput } = createTestUtil({
+  prefix: "吾嘗觀「「四庫全書」」之書。",
+  suffix: "書之",
+  compileOptions: {
+    importPaths: "./test/fixture/nested-import"
+  }
+});
+
+describe("import", () => {
+  it("nested import", () => {
+    expectOutput(
+      "方悟「草部」之義。今有一元。曰「草部」。",
+      "甘草。黄芪。人参。"
+    );
+  });
+});