Support wasm32-wasi-threads

.eslintignore

@@ -1,4 +1,5 @@
 **/dist
+**/lib
 node_modules
 /lib/typings
 .eslintrc.js
@@ -9,3 +10,4 @@ node_modules
 /packages/emnapi/lib
 /packages/emnapi/transformer/out
 /packages/core/src/index.js
+/out

.eslintrc.js

@@ -12,6 +12,7 @@ module.exports = {
     'spaced-comment': 'off',
     'no-new-func': 'off',
     'no-implied-eval': 'off',
+    'no-var': 'off',
     '@typescript-eslint/no-implied-eval': 'off',
     '@typescript-eslint/no-unused-vars': 'error',
     '@typescript-eslint/no-namespace': 'off',
@@ -24,6 +25,10 @@ module.exports = {
     '@typescript-eslint/no-dynamic-delete': 'off',
     '@typescript-eslint/method-signature-style': 'off',
     '@typescript-eslint/prefer-includes': 'off',
+    '@typescript-eslint/ban-ts-comment': 'off',
+    '@typescript-eslint/ban-types': 'off',
+    '@typescript-eslint/consistent-type-imports': 'off',
+    '@typescript-eslint/consistent-generic-constructors': 'off',
     '@typescript-eslint/no-unnecessary-type-assertion': 'off',
     '@typescript-eslint/member-delimiter-style': ['error', {
       multiline: {

.github/workflows/main.yml

@@ -28,7 +28,7 @@ jobs:
         - 'wasm64-unknown-emscripten'
         - 'wasm32-unknown-unknown'
         - 'wasm32-wasi'
-        # - 'wasm32-wasi-threads'
+        - 'wasm32-wasi-threads'
 
     steps:
     - uses: actions/checkout@v3

.vscode/c_cpp_properties.json

@@ -74,6 +74,16 @@
       "cppStandard": "c++14",
       "includePath": ["${includePath}"]
     },
+    {
+      "name": "WASI-THREADS",
+      "defines": ["${defines}", "_REENTRANT"],
+      "compilerPath": "${env:WASI_SDK_PATH}/bin/clang",
+      "intelliSenseMode": "clang-x86",
+      "cStandard": "c11",
+      "cppStandard": "c++14",
+      "includePath": ["${includePath}"],
+      "compilerArgs": ["--target=wasm32-wasi-threads"]
+    },
     {
       "name": "WASM32",
       "defines": ["${defines}", "PAGESIZE=65536"],

.vscode/launch.json

@@ -14,10 +14,12 @@
       "request": "launch",
       "name": "Launch Program",
       "env": {
-        "EMNAPI_TEST_WASI": "1"
+        "NODE_TEST_KNOWN_GLOBALS": "0",
+        "EMNAPI_TEST_WASI": "1",
+        "EMNAPI_TEST_WASI_THREADS": "1"
       },
       "runtimeArgs": ["--experimental-wasi-unstable-preview1", "--expose-gc"],
-      "program": "${workspaceFolder}/packages/test/arg/arg.test.js",
+      "program": "${workspaceFolder}/packages/test/node-addon-api/async_worker.test.js",
       "args": []
     },
     {

package.json

@@ -31,13 +31,13 @@
     "@tybys/tsapi": "^0.6.0",
     "@types/fs-extra": "^9.0.13",
     "@types/node": "^16.11.21",
-    "@typescript-eslint/eslint-plugin": "^5.32.0",
-    "@typescript-eslint/parser": "^5.32.0",
-    "eslint": "^8.21.0",
-    "eslint-config-standard-with-typescript": "^22.0.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-n": "^15.2.4",
-    "eslint-plugin-promise": "^6.0.0",
+    "@typescript-eslint/eslint-plugin": "^5.52.0",
+    "@typescript-eslint/parser": "^5.52.0",
+    "eslint": "^8.34.0",
+    "eslint-config-standard-with-typescript": "^34.0.0",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-n": "^15.6.1",
+    "eslint-plugin-promise": "^6.1.1",
     "fs-extra": "^10.1.0",
     "typescript": "~4.8.4"
   },

packages/core/index.d.ts

@@ -1,22 +1,36 @@
 import type { Context } from '@emnapi/runtime'
 
-export declare interface CreateOptions {
-  context: Context
-  filename?: string
-  nodeBinding?: {
-    node: {
-      emitAsyncInit: Function
-      emitAsyncDestroy: Function
-      makeCallback: Function
-    }
-    napi: {
-      asyncInit: Function
-      asyncDestroy: Function
-      makeCallback: Function
-    }
+export declare interface NodeBinding {
+  node: {
+    emitAsyncInit: Function
+    emitAsyncDestroy: Function
+    makeCallback: Function
+  }
+  napi: {
+    asyncInit: Function
+    asyncDestroy: Function
+    makeCallback: Function
   }
 }
 
+export declare type BaseCreateOptions = {
+  filename?: string
+  nodeBinding?: NodeBinding
+  reuseWorker?: boolean
+  onCreateWorker?: () => any
+  print?: (str: string) => void
+  printErr?: (str: string) => void
+  postMessage?: (msg: any) => any
+}
+
+export declare type CreateOptions = BaseCreateOptions & ({
+  context: Context
+  childThread?: boolean
+} | {
+  context?: Context
+  childThread: true
+})
+
 export declare interface PointerInfo {
   address: number
   ownership: 0 | 1
@@ -39,6 +53,7 @@ export declare interface NapiModule {
   exports: any
   loaded: boolean
   filename: string
+  childThread: boolean
   emnapi: {
     syncMemory<T extends ArrayBuffer | ArrayBufferView> (
       js_to_wasm: boolean,
@@ -50,6 +65,70 @@ export declare interface NapiModule {
   }
 
   init (options: InitOptions): any
+  spawnThread (startArg: number, errorOrTid?: number): number
+  startThread (tid: number, startArg: number): void
+  postMessage?: (msg: any) => any
+}
+
+export declare function createNapiModule (
+  options: CreateOptions
+): NapiModule
+
+export declare interface ReactorWASI {
+  readonly wasiImport?: Record<string, any>
+  initialize (instance: object): void
+  getImportObject? (): any
+}
+
+export declare interface LoadOptions {
+  wasi?: ReactorWASI
+  overwriteImports?: (importObject: WebAssembly.Imports) => WebAssembly.Imports
+  getMemory?: (exports: WebAssembly.Exports) => WebAssembly.Memory
+  getTable?: (exports: WebAssembly.Exports) => WebAssembly.Table
 }
 
-export function createNapiModule (options: CreateOptions): NapiModule
+export declare type InstantiateOptions = CreateOptions & LoadOptions
+
+export declare interface InstantiatedSource extends WebAssembly.WebAssemblyInstantiatedSource {
+  napiModule: NapiModule
+}
+
+export declare type InputType = string | URL | Response | BufferSource | WebAssembly.Module
+
+export declare function loadNapiModule (
+  napiModule: NapiModule,
+  /** Only support `BufferSource` or `WebAssembly.Module` on Node.js */
+  wasmInput: InputType | Promise<InputType>,
+  options?: LoadOptions
+): Promise<WebAssembly.WebAssemblyInstantiatedSource>
+
+export declare function loadNapiModuleSync (
+  napiModule: NapiModule,
+  wasmInput: BufferSource | WebAssembly.Module,
+  options?: LoadOptions
+): WebAssembly.WebAssemblyInstantiatedSource
+
+export declare function instantiateNapiModule (
+  /** Only support `BufferSource` or `WebAssembly.Module` on Node.js */
+  wasmInput: InputType | Promise<InputType>,
+  options: InstantiateOptions
+): Promise<InstantiatedSource>
+
+export declare function instantiateNapiModuleSync (
+  wasmInput: BufferSource | WebAssembly.Module,
+  options: InstantiateOptions
+): InstantiatedSource
+
+export declare interface OnLoadData {
+  wasmModule: WebAssembly.Module
+  wasmMemory: WebAssembly.Memory
+}
+
+export declare interface HandleOptions {
+  onLoad (data: OnLoadData): InstantiatedSource | Promise<InstantiatedSource>
+}
+
+export declare class MessageHandler {
+  constructor (options: HandleOptions)
+  handle (e: { data: any }): void
+}

packages/core/script/build.js

@@ -5,16 +5,32 @@ const rollupNodeResolve = require('@rollup/plugin-node-resolve').default
 const rollupReplace = require('@rollup/plugin-replace').default
 const rollupTerser = require('rollup-plugin-terser').terser
 const dist = path.join(__dirname, '../dist')
+const { compile } = require('@tybys/tsapi')
 
 function build () {
+  compile(path.join(__dirname, '../tsconfig.json'), {
+    optionsToExtend: {
+      target: require('typescript').ScriptTarget.ES5,
+      outDir: path.join(__dirname, '../lib/es5')
+    }
+  })
+  compile(path.join(__dirname, '../tsconfig.json'), {
+    optionsToExtend: {
+      target: require('typescript').ScriptTarget.ES2019,
+      outDir: path.join(__dirname, '../lib/es2019'),
+      removeComments: true,
+      downlevelIteration: false
+    }
+  })
+
   /**
    * @param {'es5' | 'es2019'} esversion
    * @param {boolean=} minify
    * @returns {rollup.RollupOptions}
    */
   function createInput (esversion, minify, options) {
     return {
-      input: path.join(__dirname, '../src/index.js'),
+      input: path.join(__dirname, '../lib', esversion, 'index.js'),
       plugins: [
         rollupNodeResolve({
           mainFields: ['module', 'main'],

packages/core/src/index.js

@@ -1,3 +1,11 @@
 export { createNapiModule } from './module.js'
+export {
+  loadNapiModule,
+  loadNapiModuleSync,
+  instantiateNapiModule,
+  instantiateNapiModuleSync
+} from './load.js'
+
+export { MessageHandler } from './worker.js'
 
 export const version = __VERSION__