Remove wasi_polyfill files.

Author: yurydelendik

wasm/.gitignore

@@ -2,3 +2,5 @@
 *.css
 *.css.map
 pkg/
+node_modules/
+package-lock.json

wasm/Makefile

@@ -11,19 +11,5 @@ build:
 
 clean:
 	$(MAKE) -C .. $(MAKE_OPTS) clean-all
-	rf -f pkg/
-
-wasi_polyfill.wasm: wasi_polyfill.wat
-	$(WABT)/bin/wat2wasm wasi_polyfill.wat -o wasi_polyfill.wasm
-
-pack: wasi_polyfill.wasm build
-	mkdir -p pkg
-	cp package.json.in pkg/package.json
-	touch pkg/index.js
-	mkdir -p pkg/sassc/bin
-	cp ../sassc/bin/sassc.wasm pkg/sassc/bin/
-	mkdir -p pkg/wasm
-	cp cli.js wasi_polyfill.js wasi_polyfill.wasm pkg/wasm/
-	echo "cd pkg && npm publish"
 
 .PHONY: build clean pack

wasm/README.md

@@ -5,16 +5,18 @@ To build `../sassc/bin/sassc.wasm`:
 * Clone https://github.com/yurydelendik/sassc into parent (libsass) folder
 * Run `make`
 
-To rebuild `wasi_polyfill.wasm`: `make wasi_polyfill.wasm`
-
 # Running
 
+Prerequisites:
+* node v12 (e.g. via `nvm use 12`).
+* install "node-wasi" dependency via `npm i` in the "wasm" directory.
+
 Examples:
 
 ```
-node cli.js -v
-node cli.js $PWD/test.sass
-node cli.js $PWD/test.sass $PWD/test.css
+node --experimental-wasm-bigint cli.js -v
+node --experimental-wasm-bigint cli.js $PWD/test.sass
+node --experimental-wasm-bigint cli.js $PWD/test.sass $PWD/test.css
 ```
 
 Note: Use full path for the file names and only in the current dir (hence `$PWD/` prefix).

wasm/cli.js

@@ -1,29 +1,25 @@
-#!/usr/bin/env node
-const wp = require('./wasi_polyfill.js');
+#!/usr/bin/env node --experimental-wasm-bigint
+
+'use strict';
+
 const fs = require('fs');
 const path = require('path');
+const WASI = require('wasi');
+
+const wasmPath = path.join(__dirname, "../sassc/bin/sassc.wasm");
+const bin = fs.readFileSync(wasmPath);
+
+const mod = new WebAssembly.Module(bin);
+
+const wasi = new WASI({
+  preopenDirectories: { [process.cwd()]: process.cwd() },
+  env: process.env,
+  args: [wasmPath, ...process.argv.slice(2)],
+});
+const instance = new WebAssembly.Instance(mod, {
+  wasi_unstable: wasi.exports,
+});
 
-async function init() {
-  const host = new wp.createWasiHost();
-  const { instance: wrapper } = await WebAssembly.instantiate(
-    fs.readFileSync(path.join(__dirname, "wasi_polyfill.wasm")),
-    {"wasi_polyfill": host}
-  );
-  const wasmPath = path.join(__dirname, "../sassc/bin/sassc.wasm");
-  const { instance: sassc } = await WebAssembly.instantiate(
-    fs.readFileSync(wasmPath),
-    {"wasi_unstable": wrapper.exports}
-  );
-  host.args = [wasmPath, ...process.argv.slice(2)];
-  host.env = [`PWD=${process.cwd()}`];
-  host.memory = sassc.exports.memory;
-  return sassc.exports;
-}
+wasi.setMemory(instance.exports.memory);
 
-init().then(sassc => {
-  try {
-    sassc._start();
-  } catch (e) {
-    if (e.message != "proc_exit") throw e;
-  }
-}, console.error);
+instance.exports._start();

wasm/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "sassc-wasi-cli",
+  "version": "1.0.0",
+  "description": "To build `../sassc/bin/sassc.wasm`:",
+  "main": "cli.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "wasi": "github:devsnek/node-wasi#785df3a0"
+  }
+}