feat: support for 序.wy and 藏書樓 in cli

Author: antfu

.gitignore

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

package.json

@@ -54,6 +54,7 @@
     "eslint-config-prettier": "^6.7.0",
     "eslint-plugin-babel": "^5.3.0",
     "eslint-plugin-prettier": "^3.1.2",
+    "find-up": "^4.1.0",
     "fs-extra": "^8.1.0",
     "husky": "^3.1.0",
     "lint-staged": "^9.5.0",
@@ -63,6 +64,7 @@
     "pkg": "^4.4.2",
     "prettier": "^1.19.1",
     "raw-loader": "^4.0.0",
+    "resolve-url": "^0.2.1",
     "rimraf": "^3.0.0",
     "version-bump-prompt": "^5.0.6",
     "webpack": "^4.41.4",

src/cli.js

@@ -4,8 +4,10 @@ const { compile, evalCompiled } = require("./parser");
 const { render, unrender } = require("./render");
 const path = require("path");
 const commander = require("commander");
+const findUp = require("find-up");
 
 var Logo = ` ,_ ,_\n \\/ ==\n /\\ []\n`;
+const MODULE_LIBRARY_NAME = "藏書樓";
 
 const program = new commander.Command();
 program
@@ -121,11 +123,19 @@ function getImportPaths() {
   if (program.dir) {
     pathes.push(...program.dir.split(","));
   }
+
+  const moduleLib = findModuleLibrary();
+  if (moduleLib) pathes.push(moduleLib);
+
   pathes.push(...program.files.map(file => path.resolve(path.dirname(file))));
   pathes.push(path.resolve("."));
   return Array.from(new Set(pathes));
 }
 
+function findModuleLibrary() {
+  return findUp.sync(MODULE_LIBRARY_NAME, { type: "directory" });
+}
+
 function getCompileOptions() {
   return {
     lang: program.lang,

src/reader.js

@@ -1,3 +1,9 @@
+const URL = require("url");
+
+const isClient = typeof window !== "undefined";
+
+const INDEX_FILENAME = "序";
+
 function isHostTrusted(url, trustedHosts) {
   for (const host of trustedHosts) {
     // FIXME: it can be bypassed by relative path resolving,
@@ -42,7 +48,14 @@ function defaultImportReader(
   if (typeof importPaths === "string") importPaths = [importPaths];
 
   for (dir of importPaths) {
-    const uri = dir + "/" + moduleName + ".wy";
+    let uri = dir;
+
+    if (isClient) {
+      uri = URL.resolve(window.document.location, uri);
+    }
+
+    if (uri.endsWith("/")) uri = uri.slice(0, -1);
+
     if (isHttpURL(uri)) {
       if (!allowHttp && !isHostTrusted(uri, trustedHosts)) {
         throw new URIError(
@@ -52,11 +65,31 @@ function defaultImportReader(
       }
 
       try {
-        return fetchTextSync(uri, requestTimeout);
+        return fetchTextSync(
+          `${uri}/${encodeURIComponent(moduleName)}.wy`,
+          requestTimeout
+        );
+      } catch (e) {}
+      try {
+        return fetchTextSync(
+          `${uri}/${encodeURIComponent(moduleName)}/${encodeURIComponent(
+            INDEX_FILENAME
+          )}.wy`,
+          requestTimeout
+        );
       } catch (e) {}
     } else {
       try {
-        return eval("require")("fs").readFileSync(uri, "utf-8");
+        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"
+        );
       } catch (e) {}
     }
   }

test/__snapshots__/examples.test.js.mocha-snapshot

@@ -146,3 +146,7 @@ exports["examples/javascript/sieve(1)"] = "二。三。五。七。一十一。
 
 exports["examples/javascript/try(1)"] = "嗚呼哀哉。伏维尚飨\n事不關心\n";
 
+exports["examples/javascript/pascal_triangle(0)"] = "一\n一。一\n一。二。一\n一。三。三。一\n一。四。六。四。一\n一。五。一十。一十。五。一\n一。六。一十五。二十。一十五。六。一\n一。七。二十一。三十五。三十五。二十一。七。一\n一。八。二十八。五十六。七十。五十六。二十八。八。一\n";
+
+exports["examples/romanizeIdentifiers/pascal_triangle(0)"] = "一\n一。一\n一。二。一\n一。三。三。一\n一。四。六。四。一\n一。五。一十。一十。五。一\n一。六。一十五。二十。一十五。六。一\n一。七。二十一。三十五。三十五。二十一。七。一\n一。八。二十八。五十六。七十。五十六。二十八。八。一\n";
+

test/reader.test.js

@@ -5,14 +5,14 @@ const helloworldContent = "吾有一言。曰「「問天地好在。」」。
 
 describe("reader", () => {
   describe("local", () => {
-    it("import local files", async () => {
-      const content = await reader("helloworld", "./examples");
+    it("import local files", () => {
+      const content = reader("helloworld", "./examples");
 
       expect(content).eq(helloworldContent);
     });
 
-    it("search for files", async () => {
-      const content = await reader("helloworld", [
+    it("search for files", () => {
+      const content = reader("helloworld", [
         "./some/invalid/dir",
         "./lib",
         "./examples"
@@ -21,9 +21,9 @@ describe("reader", () => {
       expect(content).eq(helloworldContent);
     });
 
-    it("not found", async () => {
+    it("not found", () => {
       try {
-        await reader("not_exists", "./examples");
+        reader("not_exists", "./examples");
       } catch (e) {
         expect(e).to.be.an.instanceof(ReferenceError);
       }
@@ -42,8 +42,8 @@ describe("reader", () => {
       }
     });
 
-    it("load http contents", async () => {
-      const content = await reader(
+    it("load http contents", () => {
+      const content = reader(
         "helloworld",
         "https://raw.githubusercontent.com/LingDong-/wenyan-lang/master/examples/",
         {
@@ -54,8 +54,8 @@ describe("reader", () => {
       expect(content).eq(helloworldContent);
     });
 
-    it("load http contents in trusted hosts", async () => {
-      const content = await reader(
+    it("load http contents in trusted hosts", () => {
+      const content = reader(
         "helloworld",
         "https://raw.githubusercontent.com/LingDong-/wenyan-lang/master/examples/",
         {
@@ -68,8 +68,8 @@ describe("reader", () => {
       expect(content).eq(helloworldContent);
     });
 
-    it("search for http contents", async () => {
-      const content = await reader(
+    it("search for http contents", () => {
+      const content = reader(
         "helloworld",
         [
           "https://raw.githubusercontent.com/LingDong-/wenyan-lang/master/lib/",