fix(core): wasi target (#22)

oxc-project · Jul 21, 2024 · e7a57f3 · e7a57f3
1 parent 9e2fee7
commit e7a57f3
Show file tree

Hide file tree

Showing 15 changed files with 531 additions and 703 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -342,7 +342,6 @@ jobs:
           run: corepack enable && npm run test
   test-wasi:
     name: Test WASI target
-    if: false
     needs:
       - build
     runs-on: ubuntu-latest
@@ -356,7 +355,7 @@ jobs:
           node-version: 20
           cache: pnpm
       - name: Install dependencies
-        run: pnpm install
+        run: pnpm install --force
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
@@ -377,7 +376,7 @@ jobs:
       - test-macOS-windows-binding
       - test-linux-binding
       - build-freebsd
-      # - test-wasi
+      - test-wasi
     steps:
       - uses: actions/checkout@v4
       - name: setup pnpm

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 [dependencies]
 napi               = { version = "3.0.0-alpha.7", default-features = false, features = ["serde-json", "napi3"] }
 napi-derive        = { version = "3.0.0-alpha.6", default-features = false, features = ["type-def"] }
-oxc                = { version = "0.20", features = ["codegen", "transformer"] }
+oxc                = { version = "0.21", features = ["codegen", "transformer"] }
 oxc_resolver       = "1"
 phf                = "0.11"
 serde              = { version = "1.0", features = ["derive"] }

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "packageManager": "[email protected]",
   "devDependencies": {
-    "@napi-rs/cli": "^3.0.0-alpha.60",
+    "@napi-rs/cli": "^3.0.0-alpha.62",
     "@napi-rs/wasm-runtime": "^0.2.4",
     "@oxc-node/core": "workspace:*",
     "@taplo/cli": "^0.7.0",

diff --git a/packages/core/esm.mjs b/packages/core/esm.mjs
@@ -1,5 +1,26 @@
-import { load, resolve, initTracing } from './index.js'
+import { isMainThread, MessageChannel } from 'node:worker_threads'
+
+import { load, createResolve, initTracing } from './index.js'
 
 initTracing()
 
+if (!isMainThread) {
+  const mc = new MessageChannel()
+  mc.port1.ref()
+}
+
+/**
+ * @type {import('node:module').ResolveHook}
+ */
+function resolve(specifier, context, nextResolve) {
+  return createResolve(
+    {
+      getCurrentDirectory: () => process.cwd(),
+    },
+    specifier,
+    context,
+    nextResolve,
+  )
+}
+
 export { load, resolve }
diff --git a/packages/core/index.d.ts b/packages/core/index.d.ts
@@ -13,6 +13,8 @@ export declare class Output {
   sourceMap(): string | null
 }
 
+export declare function createResolve(options: OxcResolveOptions, specifier: string, context: ResolveContext, nextResolve: (arg0: string, arg1?: ResolveContext | undefined | null) => ResolveFnOutput | Promise<ResolveFnOutput>): ResolveFnOutput | Promise<ResolveFnOutput>
+
 export declare function initTracing(): void
 
 export declare function load(url: string, context: LoadContext, nextLoad: (arg0: string, arg1?: LoadContext | undefined | null) => LoadFnOutput | Promise<LoadFnOutput>): LoadFnOutput | Promise<LoadFnOutput>
@@ -32,7 +34,9 @@ export interface LoadFnOutput {
   responseURL?: string
 }
 
-export declare function resolve(specifier: string, context: ResolveContext, nextResolve: (arg0: string, arg1?: ResolveContext | undefined | null) => ResolveFnOutput | Promise<ResolveFnOutput>): ResolveFnOutput | Promise<ResolveFnOutput>
+export interface OxcResolveOptions {
+  getCurrentDirectory?: () => string
+}
 
 export interface ResolveContext {
   /** Export conditions of the relevant `package.json` */

diff --git a/packages/core/index.js b/packages/core/index.js
@@ -336,15 +336,15 @@ if (!nativeBinding || process.env.NAPI_RS_FORCE_WASI) {
     nativeBinding = require('./oxc-node.wasi.cjs')
   } catch (err) {
     if (process.env.NAPI_RS_FORCE_WASI) {
-      console.error(err)
+      loadErrors.push(err)
     }
   }
   if (!nativeBinding) {
     try {
       nativeBinding = require('@oxc-node/core-wasm32-wasi')
     } catch (err) {
       if (process.env.NAPI_RS_FORCE_WASI) {
-        console.error(err)
+        loadErrors.push(err)
       }
     }
   }
@@ -362,8 +362,8 @@ if (!nativeBinding) {
 }
 
 module.exports.Output = nativeBinding.Output
+module.exports.createResolve = nativeBinding.createResolve
 module.exports.initTracing = nativeBinding.initTracing
 module.exports.load = nativeBinding.load
-module.exports.resolve = nativeBinding.resolve
 module.exports.transform = nativeBinding.transform
 module.exports.transformAsync = nativeBinding.transformAsync
diff --git a/packages/core/oxc-node.wasi-browser.js b/packages/core/oxc-node.wasi-browser.js
@@ -59,14 +59,15 @@ function __napi_rs_initialize_modules(__napiInstance) {
   __napiInstance.exports['__napi_register__transform_async_7']?.()
   __napiInstance.exports['__napi_register__ResolveContext_struct_8']?.()
   __napiInstance.exports['__napi_register__ResolveFnOutput_struct_9']?.()
-  __napiInstance.exports['__napi_register__resolve_10']?.()
-  __napiInstance.exports['__napi_register__LoadContext_struct_11']?.()
-  __napiInstance.exports['__napi_register__LoadFnOutput_struct_12']?.()
-  __napiInstance.exports['__napi_register__load_13']?.()
+  __napiInstance.exports['__napi_register__OxcResolveOptions_struct_10']?.()
+  __napiInstance.exports['__napi_register__create_resolve_11']?.()
+  __napiInstance.exports['__napi_register__LoadContext_struct_12']?.()
+  __napiInstance.exports['__napi_register__LoadFnOutput_struct_13']?.()
+  __napiInstance.exports['__napi_register__load_14']?.()
 }
 export const Output = __napiModule.exports.Output
+export const createResolve = __napiModule.exports.createResolve
 export const initTracing = __napiModule.exports.initTracing
 export const load = __napiModule.exports.load
-export const resolve = __napiModule.exports.resolve
 export const transform = __napiModule.exports.transform
 export const transformAsync = __napiModule.exports.transformAsync
diff --git a/packages/core/oxc-node.wasi.cjs b/packages/core/oxc-node.wasi.cjs
@@ -90,14 +90,15 @@ function __napi_rs_initialize_modules(__napiInstance) {
   __napiInstance.exports['__napi_register__transform_async_7']?.()
   __napiInstance.exports['__napi_register__ResolveContext_struct_8']?.()
   __napiInstance.exports['__napi_register__ResolveFnOutput_struct_9']?.()
-  __napiInstance.exports['__napi_register__resolve_10']?.()
-  __napiInstance.exports['__napi_register__LoadContext_struct_11']?.()
-  __napiInstance.exports['__napi_register__LoadFnOutput_struct_12']?.()
-  __napiInstance.exports['__napi_register__load_13']?.()
+  __napiInstance.exports['__napi_register__OxcResolveOptions_struct_10']?.()
+  __napiInstance.exports['__napi_register__create_resolve_11']?.()
+  __napiInstance.exports['__napi_register__LoadContext_struct_12']?.()
+  __napiInstance.exports['__napi_register__LoadFnOutput_struct_13']?.()
+  __napiInstance.exports['__napi_register__load_14']?.()
 }
 module.exports.Output = __napiModule.exports.Output
+module.exports.createResolve = __napiModule.exports.createResolve
 module.exports.initTracing = __napiModule.exports.initTracing
 module.exports.load = __napiModule.exports.load
-module.exports.resolve = __napiModule.exports.resolve
 module.exports.transform = __napiModule.exports.transform
 module.exports.transformAsync = __napiModule.exports.transformAsync
diff --git a/packages/integrate-module-bundler/package.json b/packages/integrate-module-bundler/package.json
@@ -11,7 +11,7 @@
     "test": "node --import @oxc-node/core/register ./src/index.ts"
   },
   "devDependencies": {
-    "@napi-rs/simple-git": "^0.1.16",
+    "@napi-rs/tar": "^0.1.4",
     "@napi-rs/wasm-runtime": "^0.2.4",
     "@oxc-node/core": "workspace:*",
     "@types/node": "^20.14.9",

diff --git a/packages/integrate-module-bundler/src/index.ts b/packages/integrate-module-bundler/src/index.ts
@@ -1,7 +1,7 @@
 import assert from 'node:assert'
 import test from 'node:test'
 
-import { RepositoryState } from '@napi-rs/simple-git'
+import { EntryType } from '@napi-rs/tar'
 import { bar as subBar } from '@subdirectory/bar'
 import { supportedExtensions } from 'file-type'
 import { renderToString } from 'react-dom/server'
@@ -52,7 +52,7 @@ await test('jsx should work', () => {
 })
 
 await test('resolve @napi-rs projects', () => {
-  assert.equal(RepositoryState.ApplyMailbox, 10)
+  assert.equal(EntryType.GNUSparse, 10)
 })
 
 await test('resolve simple-git', () => {