AssemblyScript · jtenner · May 22, 2020 · May 22, 2020 · May 22, 2020
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,12 +12,12 @@
     "url": "https://github.com/AssemblyScript/node/issues"
   },
   "devDependencies": {
-    "@as-pect/core": "^3.1.0-beta.3",
-    "assemblyscript": "0.9.3",
+    "@as-pect/core": "^3.2.2",
+    "assemblyscript": "0.10.0",
     "glob": "^7.1.6"
   },
   "scripts": {
-    "test": "node --experimental-wasi-unstable-preview1 tests/node"
+    "test": "node --experimental-wasi-unstable-preview1 --experimental-wasm-bigint tests/node"
   },
   "dependencies": {}
 }
diff --git a/tests/fs.spec.ts b/tests/fs.spec.ts
@@ -0,0 +1,3 @@
+test("an empty test", () => {
+
+});
diff --git a/tests/fs.spec.wasi.js b/tests/fs.spec.wasi.js
@@ -0,0 +1,7 @@
+module.exports = {
+  env: process.env,
+  argv: process.argv,
+  preopens: {
+    "./tests/sandbox": "./tests/sandbox"
+  }
+};
diff --git a/tests/node.js b/tests/node.js
@@ -4,7 +4,8 @@ const { instantiateSync } = require("assemblyscript/lib/loader");
 const { main } = require("assemblyscript/cli/asc");
 const { parse } = require("assemblyscript/cli/util/options");
 const path = require("path");
-const fs = require("fs").promises;
+const fssync = require("fs");
+const fs = fssync.promises;
 const { WASI } = require("wasi");
 
 const promises = [];
@@ -21,13 +22,29 @@ const options = parse(process.argv.slice(2), {
     "type": "b",
     "alias": "u"
   },
+  "preopens": {
+    "description": "A set of preopened directories for wasi. Ex. ./dir=./dir",
+    "type": "S",
+    "alias": "p",
+    "default": [],
+  },
 });
 
 if (options.unknown.length > 1) {
   console.error("Unknown options arguments: " + options.unknown.join(" "));
   process.exit(1);
 }
 
+// calculate default preopens from cli
+const preopens = options.options.preopens.reduce(
+  (obj, value) => {
+    const [_, dir1, dir2] = /([^=])*=(.*)/.exec(value);
+    obj[dir1] = dir2;
+    return obj;
+  },
+  {}
+);
+
 const reporter = new VerboseReporter();
 reporter.stderr = process.stderr;
 reporter.stdout = process.stdout;
@@ -40,7 +57,6 @@ const ascOptions = [
   relativeFromCwd(require.resolve("@as-pect/assembly/assembly/index.ts")),
   "--use", "ASC_RTRACE=1",
   "--explicitStart",
-  "--validate",
   "--measure",
   "--lib", "assembly",
   "--transform", require.resolve("@as-pect/core/lib/transform/index.js"),
@@ -117,29 +133,36 @@ function runTest(fileName, type, binary, wat) {
   const basename = path.basename(fileName, ".ts");
   const fullName = path.join(dirname, basename)
   const watPath = `${fullName}.${type}.wat`;
+  const wasiPath = `${fullName}.wasi.js`;
   const fileNamePath = `${fullName}.${type}.ts`;
 
+  // use either a custom wasi configuration, or the default one
+  const wasiOptions = fssync.existsSync(wasiPath)
+    ? require(path.resolve(wasiPath))
+    : {
+      args: process.argv,
+      env: process.env,
+      preopens,
+    };
+
   // should not block testing
   promises.push(fs.writeFile(watPath, wat));
 
+  const wasi = new WASI(wasiOptions);
+
   const context = new TestContext({
     fileName: fileNamePath, // set the fileName
     reporter, // use verbose reporter
     binary, // pass the binary to get function names
+    wasi,
   });
-  const wasi = new WASI({
-    args: [],
-    env: {},
-    preopens: {
-      // '/sandbox': '/some/real/path/that/wasm/can/access'
-    }
-  });
+
   const imports = context.createImports({
     wasi_snapshot_preview1: wasi.wasiImport,
   });
 
   const instance = instantiateSync(binary, imports);
-  // TODO: wasi.start(instance);
+
   process.stdout.write("\n");
   context.run(instance);
 

diff --git a/tests/sandbox/test.txt b/tests/sandbox/test.txt