Merge pull request #29 from toyobayashi/feat-wasi-sdk

.eslintignore

@@ -7,3 +7,5 @@ node_modules
 /test/CMakeFiles
 /packages/runtime/lib
 /packages/emnapi/lib
+/packages/emnapi/transformer/out
+/packages/core/src/index.js

.github/workflows/main.yml

@@ -19,6 +19,12 @@ jobs:
   build:
     name: Build
     runs-on: ${{ matrix.os }}
+    env:
+      WASI_VERSION: '19'
+      WASI_VERSION_FULL: '19.0'
+      WASI_SDK_PATH: './wasi-sdk-19.0'
+      LLVM_VERSION: '15.0.7'
+      LLVM_PATH: './wasi-sdk-19.0'
     strategy:
       fail-fast: false
       matrix:
@@ -36,6 +42,32 @@ jobs:
         version: '3.1.29'
         # no-cache: true
         actions-cache-folder: 'emsdk-cache'
+    - uses: actions-rs/toolchain@v1
+      with:
+        toolchain: nightly
+        default: true
+        target: wasm32-unknown-unknown
+    - uses: actions-rs/toolchain@v1
+      with:
+        toolchain: nightly
+        default: true
+        target: wasm32-wasi
+
+    - name: Cache wasi-sdk
+      id: cache-wasi-sdk
+      uses: actions/cache@v3
+      with:
+        path: ${{ env.WASI_SDK_PATH }}
+        key: ${{ runner.os }}-${{ env.WASI_VERSION_FULL }}
+
+    - name: Install wasi-sdk
+      if: ${{ steps.cache-wasi-sdk.outputs.cache-hit != 'true' }}
+      shell: bash
+      run: |
+        wget -q https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_VERSION}/wasi-sdk-${WASI_VERSION_FULL}-linux.tar.gz
+        mkdir -p $WASI_SDK_PATH
+        tar zxvf wasi-sdk-${WASI_VERSION_FULL}-linux.tar.gz -C $WASI_SDK_PATH --strip 1
+
     - uses: actions/setup-node@v3
       with:
         node-version: '16.15.0'
@@ -50,27 +82,39 @@ jobs:
         npm install -g node-gyp
         npm install --legacy-peer-deps
         npm run build --workspaces --if-present
-    
+
     - name: Lint
       run: npm run lint
 
-    - name: Test
+    - name: Test wasm32-unknown-emscripten
       run: |
         npm run rebuild -w packages/test
         npm run test -w packages/test
 
-    - name: Test MEMORY64
+    - name: Test wasm64-unknown-emscripten
       env:
         MEMORY64: '1'
       run: |
         npm run rebuild -w packages/test
         npm run test -w packages/test
 
+    - name: Test wasm32-wasi
+      run: |
+        npm run rebuild:w -w packages/test
+        cd ./packages/test/rust && cargo build --release --target=wasm32-wasi && cd ../../..
+        npm run test:w -w packages/test
+
+    - name: Test wasm32-unknown-unknown
+      run: |
+        npm run rebuild:wasm32 -w packages/test
+        cd ./packages/test/rust && cargo build --release --target=wasm32-unknown-unknown && cd ../../..
+        npm run test:wasm32 -w packages/test
+
     - name: Publish
       if: ${{ startsWith(github.event.ref, 'refs/tags') && matrix.os == 'ubuntu-latest' }}
       run: |
         node ./script/release.js
-        npm publish --ignore-scripts -w packages/runtime -w packages/node -w packages/emnapi
+        npm publish --ignore-scripts -w packages/runtime -w packages/node -w packages/emnapi -w packages/core
 
     - name: Create release
       if: ${{ startsWith(github.event.ref, 'refs/tags') }}

.vscode/c_cpp_properties.json

@@ -49,7 +49,7 @@
     },
     {
       "name": "Emscripten",
-      "defines": ["${defines}", "__wasm32__", "__EMSCRIPTEN_PTHREADS__", "NAPI_VERSION=8"],
+      "defines": ["${defines}", "__wasm__", "__EMSCRIPTEN_PTHREADS__", "NAPI_VERSION=8"],
       "compilerPath": "${env:EMSDK}/upstream/emscripten/emcc",
       "intelliSenseMode": "linux-clang-x86",
       "cStandard": "c11",
@@ -58,12 +58,31 @@
     },
     {
       "name": "Win32 Emscripten",
-      "defines": ["${defines}", "__wasm32__", "__EMSCRIPTEN_PTHREADS__", "NAPI_VERSION=8"],
+      "defines": ["${defines}", "__wasm__", "__EMSCRIPTEN_PTHREADS__", "NAPI_VERSION=8"],
       "compilerPath": "${env:EMSDK}\\upstream\\emscripten\\emcc.bat",
       "intelliSenseMode": "linux-clang-x86",
       "cStandard": "c11",
       "cppStandard": "c++17",
       "includePath": ["${includePath}"]
+    },
+    {
+      "name": "WASI",
+      "defines": ["${defines}"],
+      "compilerPath": "${env:WASI_SDK_PATH}/bin/clang",
+      "intelliSenseMode": "clang-x86",
+      "cStandard": "c11",
+      "cppStandard": "c++14",
+      "includePath": ["${includePath}"]
+    },
+    {
+      "name": "WASM32",
+      "defines": ["${defines}", "PAGESIZE=65536"],
+      "compilerPath": "${env:WASI_SDK_PATH}/bin/clang",
+      "intelliSenseMode": "clang-x86",
+      "cStandard": "c11",
+      "cppStandard": "c++14",
+      "includePath": ["${includePath}"],
+      "compilerArgs": ["--target=wasm32"]
     }
   ],
   "version": 4

.vscode/launch.json

@@ -1,12 +1,23 @@
 {
   "version": "0.2.0",
   "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Launch Build",
+      "runtimeArgs": [],
+      "program": "${workspaceFolder}/packages/emnapi/script/build.js",
+      "args": []
+    },
     {
       "type": "node",
       "request": "launch",
       "name": "Launch Program",
-      "runtimeArgs": ["--expose-gc"],
-      "program": "${workspaceFolder}/packages/test/make_callback/make_callback.test.js",
+      "env": {
+        "EMNAPI_TEST_WASI": "1"
+      },
+      "runtimeArgs": ["--experimental-wasi-unstable-preview1", "--expose-gc"],
+      "program": "${workspaceFolder}/packages/test/arg/arg.test.js",
       "args": []
     },
     {

package.json

@@ -42,6 +42,7 @@
     "packages/runtime",
     "packages/node",
     "packages/emnapi",
+    "packages/core",
     "packages/test",
     "packages/bench"
   ]

packages/bench/package.json

@@ -6,7 +6,7 @@
     "rebuild": "cgen rebuild -e"
   },
   "devDependencies": {
-    "@tybys/cgen": "^0.14.0",
+    "@tybys/cgen": "^0.14.1",
     "node-addon-api": "5.1.0",
     "benchmark": "^2.1.4"
   }

packages/core/.gitignore

@@ -0,0 +1,4 @@
+/lib
+node_modules
+/dist
+/src/index.js

packages/core/.npmignore

@@ -0,0 +1,9 @@
+.vscode
+node_modules
+/script
+/lib
+/src
+.gitignore
+.npmignore
+api-extractor.json
+tsconfig.json

packages/core/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021-present Toyobayashi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

packages/core/README.md

@@ -0,0 +1 @@
+See [https://github.com/toyobayashi/emnapi](https://github.com/toyobayashi/emnapi)

packages/core/index.d.ts

@@ -0,0 +1,46 @@
+export declare interface CreateOptions {
+  context: import('@tybys/emnapi-runtime').Context
+  filename?: string
+  nodeBinding?: {
+    node: {
+      emitAsyncInit: Function
+      emitAsyncDestroy: Function
+      makeCallback: Function
+    }
+    napi: {
+      asyncInit: Function
+      asyncDestroy: Function
+      makeCallback: Function
+    }
+  }
+}
+
+export declare interface PointerInfo {
+  address: number
+  ownership: 0 | 1
+  runtimeAllocated: 0 | 1
+}
+
+export declare interface NapiModule {
+  imports: {
+    env: any
+    napi: any
+    emnapi: any
+  }
+  exports: any
+  loaded: boolean
+  filename: string
+  emnapi: {
+    syncMemory<T extends ArrayBuffer | ArrayBufferView> (
+      js_to_wasm: boolean,
+      arrayBufferOrView: T,
+      offset?: number,
+      len?: int
+    ): T
+    getMemoryAddress (arrayBufferOrView: ArrayBuffer | ArrayBufferView): PointerInfo
+  }
+
+  init (instance: WebAssembly.Instance, memory?: WebAssembly.Memory, table?: WebAssembly.Table): any
+}
+
+export function createNapiModule (options: CreateOptions): NapiModule

packages/core/index.js

@@ -0,0 +1,5 @@
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./dist/emnapi-core.cjs.min.js')
+} else {
+  module.exports = require('./dist/emnapi-core.cjs.js')
+}

packages/core/package.json

@@ -0,0 +1,51 @@
+{
+  "name": "@tybys/emnapi-core",
+  "version": "0.29.0",
+  "description": "emnapi core",
+  "main": "index.js",
+  "module": "./src/index.js",
+  "types": "./index.d.ts",
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "module": "./src/index.js",
+      "import": "./dist/emnapi-core.mjs",
+      "require": "./index.js",
+      "types": "./index.d.ts"
+    },
+    "./dist/emnapi-core.cjs.min": {
+      "default": "./dist/emnapi-core.cjs.min.js",
+      "types": "./index.d.ts"
+    },
+    "./dist/emnapi-core.min.mjs": {
+      "import": "./dist/emnapi-core.min.mjs",
+      "require": null,
+      "types": "./index.d.ts"
+    }
+  },
+  "dependencies": {
+    "tslib": "^2.4.0"
+  },
+  "devDependencies": {
+    "@rollup/plugin-node-resolve": "^13.3.0",
+    "@rollup/plugin-replace": "^5.0.2",
+    "rollup": "^2.77.2",
+    "rollup-plugin-terser": "^7.0.2"
+  },
+  "scripts": {
+    "build": "node ./script/build.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/toyobayashi/emnapi.git"
+  },
+  "author": "toyobayashi",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/toyobayashi/emnapi/issues"
+  },
+  "homepage": "https://github.com/toyobayashi/emnapi#readme",
+  "publishConfig": {
+    "access": "public"
+  }
+}