Switch to ESM / Wasm builds

.github/workflows/build.yml

@@ -16,6 +16,9 @@ jobs:
         emsdk: [ "tot", "latest" ]
       fail-fast: false
     steps:
+    - uses: actions/setup-node@v2
+      with:
+        node-version: '16'
     - name: "Set up Emsdk"
       run: |
         mkdir $HOME/emsdk
@@ -75,39 +78,38 @@ jobs:
         source $HOME/emsdk/emsdk_env.sh
         emcc --version
         emcmake cmake .. -DCMAKE_BUILD_TYPE=Release
-        emmake make -j2 binaryen_js
-        cp ./bin/binaryen_js.js ../../index.js
+        emmake make -j2 binaryen_wasm
+        cp ./bin/binaryen_wasm.js ../../index.js
         cd ../..
     - name: "Test binaryen.js"
       run: |
         node ./tests/sanity
-    - name: "Build binaryen.wasm"
+    - name: "Build wasm-opt"
       run: |
         cd ./binaryen/build
         source $HOME/emsdk/emsdk_env.sh
         emcc --version
-        emcmake cmake .. -DCMAKE_BUILD_TYPE=Release
-        emmake make -j2 binaryen_wasm
-        cp ./bin/binaryen_wasm.js ../../wasm.js
+        emmake make -j2 wasm-opt
+        echo '#!/usr/bin/env node' | cat - ./bin/wasm-opt.js > ../../bin/wasm-opt
         cd ../..
-    - name: "Test binaryen.wasm"
+    - name: "Test wasm-opt"
       run: |
-        node ./tests/sanity --wasm
-    - name: "Build wasm-opt"
+        node ./bin/wasm-opt --help
+    - name: "Build wasm2js"
       run: |
         cd ./binaryen/build
         source $HOME/emsdk/emsdk_env.sh
         emcc --version
-        emmake make -j2 wasm-opt
-        echo '#!/usr/bin/env node' | cat - ./bin/wasm-opt.js > ../../bin/wasm-opt
+        emmake make -j2 wasm2js
+        echo '#!/usr/bin/env node' | cat - ./bin/wasm2js.js > ../../bin/wasm2js
         cd ../..
-    - name: "Test wasm-opt"
+    - name: "Test wasm2js"
       run: |
-        node ./bin/wasm-opt --help
+        node ./bin/wasm2js --help
     - name: "Push changes to GitHub"
       if: github.event_name == 'schedule' && matrix.emsdk == 'tot'
       run: |
-        git add ./binaryen ./index.js ./wasm.js ./bin/wasm-opt
+        git add ./binaryen ./index.js ./bin/wasm-opt ./bin/wasm2js
         npm version $VERSION --no-git-tag-version --force
         if [ $RELEASE ]; then
           echo "Committing release ("$VERSION") ..."

README.md

@@ -15,7 +15,8 @@ $> npm install binaryen
 ```
 
 ```js
-var binaryen = require("binaryen");
+import Binaryen from "binaryen";
+const binaryen = await Binaryen();
 
 // Create a module with a single function
 var myModule = new binaryen.Module();
@@ -71,6 +72,10 @@ or you can use one of the [previous versions](https://github.com/AssemblyScript/
 
   Replace `VERSION` with a [specific version](https://github.com/AssemblyScript/binaryen.js/releases) or omit it (not recommended in production) to use main/latest.
 
+### Command line
+
+The package includes Node.js builds of [wasm-opt](https://github.com/WebAssembly/binaryen#wasm-opt) and [wasm2js](https://github.com/WebAssembly/binaryen#wasm2js).
+
 API
 ---
 

bin/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}

index.d.ts

@@ -1,8 +1,5 @@
 declare module binaryen {
 
-  const isReady: boolean;
-  const ready: Promise<typeof binaryen>;
-
   type Type = number;
 
   const none: Type;
@@ -1829,4 +1826,6 @@ declare module binaryen {
   }
 }
 
-export = binaryen;
+declare function Binaryen(): Promise<typeof binaryen>;
+
+export default Binaryen;