feat: add wasm runtime package (#1904)

napi-rs · Jan 16, 2024 · 120accd · 120accd
1 parent ddeaf30
commit 120accd
Show file tree

Hide file tree

Showing 24 changed files with 4,437 additions and 181 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -25,7 +25,7 @@ build_and_test: &BUILD_AND_TEST
       yarn --version
   test_script:
     - yarn install --immutable --mode=skip-build
-    - yarn build
+    - yarn lerna run build --scope '@napi-rs/*' --ignore '@napi-rs/wasm-runtime'
     - cargo test -p napi-sys --lib -- --nocapture
     - yarn build:test
     - yarn test --verbose

diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -205,7 +205,7 @@ overrides:
       - '@typescript-eslint'
     parserOptions:
       project:
-        - ./examples/tsconfig.json
+        - ./tsconfig.json
     rules:
       'import/order':
         [

diff --git a/.yarn/patches/buffer-npm-6.0.3-cd90dfedfe.patch b/.yarn/patches/buffer-npm-6.0.3-cd90dfedfe.patch
@@ -0,0 +1,49 @@
+diff --git a/index.js b/index.js
+index 7a0e9c2a123bc9d26c20bb3de4a3c4e49b24ee40..b1a53729c2900ddfca88a0f312a785c51a5aac80 100644
+--- a/index.js
++++ b/index.js
+@@ -8,19 +8,17 @@
+
+ 'use strict'
+
+-const base64 = require('base64-js')
+-const ieee754 = require('ieee754')
++import * as base64 from 'base64-js'
++import * as ieee754 from 'ieee754'
+ const customInspectSymbol =
+   (typeof Symbol === 'function' && typeof Symbol['for'] === 'function') // eslint-disable-line dot-notation
+     ? Symbol['for']('nodejs.util.inspect.custom') // eslint-disable-line dot-notation
+     : null
+
+-exports.Buffer = Buffer
+-exports.SlowBuffer = SlowBuffer
+-exports.INSPECT_MAX_BYTES = 50
++const INSPECT_MAX_BYTES = 50
+
+ const K_MAX_LENGTH = 0x7fffffff
+-exports.kMaxLength = K_MAX_LENGTH
++const kMaxLength = K_MAX_LENGTH
+
+ /**
+  * If `Buffer.TYPED_ARRAY_SUPPORT`:
+@@ -616,7 +614,7 @@ Buffer.prototype.equals = function equals (b) {
+
+ Buffer.prototype.inspect = function inspect () {
+   let str = ''
+-  const max = exports.INSPECT_MAX_BYTES
++  const max = INSPECT_MAX_BYTES
+   str = this.toString('hex', 0, max).replace(/(.{2})/g, '$1 ').trim()
+   if (this.length > max) str += ' ... '
+   return '<Buffer ' + str + '>'
+@@ -2104,3 +2102,10 @@ function defineBigIntMethod (fn) {
+ function BufferBigIntNotDefined () {
+   throw new Error('BigInt not supported')
+ }
++
++export {
++  Buffer,
++  SlowBuffer,
++  INSPECT_MAX_BYTES,
++  kMaxLength,
++}
+\ No newline at end of file
diff --git a/.yarn/patches/node-inspect-extracted-npm-3.0.0-f661b6c334.patch b/.yarn/patches/node-inspect-extracted-npm-3.0.0-f661b6c334.patch
diff --git a/cli/src/api/templates/load-wasi-template.ts b/cli/src/api/templates/load-wasi-template.ts
@@ -1,10 +1,12 @@
 export const createWasiBrowserBinding = (
   wasiFilename: string,
   wasiRegisterFunctions: string[],
-) => `import { instantiateNapiModuleSync as __emnapiInstantiateNapiModuleSync } from '@emnapi/core'
-import { getDefaultContext as __emnapiGetDefaultContext } from '@emnapi/runtime'
-import { WASI as __WASI } from '@tybys/wasm-util'
-import { Volume as __Volume, createFsFromVolume as __createFsFromVolume } from 'memfs-browser'
+) => `import {
+  instantiateNapiModuleSync as __emnapiInstantiateNapiModuleSync,
+  getDefaultContext as __emnapiGetDefaultContext,
+  WASI as __WASI,
+} from '@napi-rs/wasm-runtime'
+import { Volume as __Volume, createFsFromVolume as __createFsFromVolume } from '@napi-rs/wasm-runtime/fs'
 
 import __wasmUrl from './${wasiFilename}.wasm?url'
 

diff --git a/cli/src/api/templates/wasi-worker-template.ts b/cli/src/api/templates/wasi-worker-template.ts
@@ -51,9 +51,8 @@ globalThis.onmessage = function (e) {
 };
 `
 
-export const WASI_WORKER_BROWSER_TEMPLATE = `import { instantiateNapiModuleSync, MessageHandler } from '@emnapi/core'
-import { WASI } from '@tybys/wasm-util'
-import { Volume, createFsFromVolume } from 'memfs-browser'
+export const WASI_WORKER_BROWSER_TEMPLATE = `import { instantiateNapiModuleSync, MessageHandler, WASI } from '@napi-rs/wasm-runtime'
+import { Volume, createFsFromVolume } from '@napi-rs/wasm-runtime/fs'
 
 const fs = createFsFromVolume(
   Volume.fromJSON({

diff --git a/examples/napi/__tests__/__snapshots__/values.spec.ts.md b/examples/napi/__tests__/__snapshots__/values.spec.ts.md
@@ -10,14 +10,14 @@ Generated by [AVA](https://avajs.dev).
 
     [
       '@napi-rs/cli',
+      '@napi-rs/wasm-runtime',
       '@types/lodash',
       '@vitest/browser',
       '@vitest/ui',
       'ava',
       'cross-env',
       'electron',
       'lodash',
-      'memfs-browser',
       'sinon',
       'vite',
       'vite-plugin-node-polyfills',

diff --git a/examples/napi/__tests__/__snapshots__/values.spec.ts.snap b/examples/napi/__tests__/__snapshots__/values.spec.ts.snap
diff --git a/examples/napi/index.html b/examples/napi/index.html
@@ -2,12 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/png" href="https://napi.rs/img/favicon.png" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>NAPI-RS examples playground</title>
+    <title>Vite Playground</title>
+    <script type="module" src="./vite-entry.js"></script>
   </head>
-
-  <body>
-    <div id="app" />
-  </body>
 </html>
diff --git a/examples/napi/index.wasi-browser.js b/examples/napi/index.wasi-browser.js
@@ -1,10 +1,12 @@
-import { instantiateNapiModuleSync as __emnapiInstantiateNapiModuleSync } from '@emnapi/core'
-import { getDefaultContext as __emnapiGetDefaultContext } from '@emnapi/runtime'
-import { WASI as __WASI } from '@tybys/wasm-util'
+import {
+  instantiateNapiModuleSync as __emnapiInstantiateNapiModuleSync,
+  getDefaultContext as __emnapiGetDefaultContext,
+  WASI as __WASI,
+} from '@napi-rs/wasm-runtime'
 import {
   Volume as __Volume,
   createFsFromVolume as __createFsFromVolume,
-} from 'memfs-browser'
+} from '@napi-rs/wasm-runtime/fs'
 
 import __wasmUrl from './index.wasm?url'