oxc-coverage-instrument 0.7.2 → 0.7.3

package/browser.js

@@ -1 +1,17 @@
-export * from '@oxc-coverage-instrument/binding-wasm32-wasi'
+// oxc-coverage-instrument: browser WASI selector (issue #87)
+const binding =
+  globalThis.OXC_COVERAGE_FORCE_WASI_SINGLE_THREADED === true ||
+  typeof SharedArrayBuffer === 'undefined'
+    ? await import('@oxc-coverage-instrument/binding-wasm32-wasi-singlethreaded')
+    : await import('@oxc-coverage-instrument/binding-wasm32-wasi');
+
+const api = binding.default ?? binding;
+
+export default api;
+export const instrument = binding.instrument ?? api.instrument;
+export const remapCoverageMap = binding.remapCoverageMap ?? api.remapCoverageMap;
+export const remapCoverageMapWithLoader =
+  binding.remapCoverageMapWithLoader ?? api.remapCoverageMapWithLoader;
+export const v8ToIstanbul = binding.v8ToIstanbul ?? api.v8ToIstanbul;
+export const v8ToIstanbulWithLoader =
+  binding.v8ToIstanbulWithLoader ?? api.v8ToIstanbulWithLoader;

package/coverage-instrument.wasi-browser.js

@@ -4,24 +4,40 @@ import {
   instantiateNapiModuleSync as __emnapiInstantiateNapiModuleSync,
   WASI as __WASI,
 } from '@napi-rs/wasm-runtime'
+import __wasmModule from './coverage-instrument.wasm32-wasi.wasm'
 
 
 
+
+// oxc-coverage-instrument: SharedArrayBuffer guard (issue #89)
+if (typeof SharedArrayBuffer === 'undefined') {
+  throw new Error(
+    'oxc-coverage-instrument: the browser WASM binding requires SharedArrayBuffer. ' +
+      'Enable Cross-Origin-Opener-Policy: same-origin and ' +
+      'Cross-Origin-Embedder-Policy: require-corp on your host page so the ' +
+      'browser is cross-origin isolated. See ' +
+      'https://github.com/fallow-rs/oxc-coverage-instrument#runtime-matrix',
+  );
+}
+
 const __wasi = new __WASI({
   version: 'preview1',
 })
 
-const __wasmUrl = new URL('./coverage-instrument.wasm32-wasi.wasm', import.meta.url).href
 const __emnapiContext = __emnapiGetDefaultContext()
 
 
 const __sharedMemory = new WebAssembly.Memory({
   initial: 4000,
   maximum: 65536,
-  shared: true,
 })
 
-const __wasmFile = await fetch(__wasmUrl).then((res) => res.arrayBuffer())
+const __wasmFile =
+  __wasmModule instanceof WebAssembly.Module
+    ? __wasmModule
+    : typeof __wasmModule === 'string'
+      ? await fetch(__wasmModule).then((res) => res.arrayBuffer())
+      : __wasmModule
 
 const {
   instance: __napiInstance,
@@ -29,22 +45,17 @@ const {
   napiModule: __napiModule,
 } = __emnapiInstantiateNapiModuleSync(__wasmFile, {
   context: __emnapiContext,
-  asyncWorkPoolSize: 4,
+  asyncWorkPoolSize: 0,
   wasi: __wasi,
-  onCreateWorker() {
-    const worker = new Worker(new URL('./wasi-worker-browser.mjs', import.meta.url), {
-      type: 'module',
-    })
-
-
-    return worker
-  },
   overwriteImports(importObject) {
     importObject.env = {
       ...importObject.env,
       ...importObject.napi,
       ...importObject.emnapi,
       memory: __sharedMemory,
+      __tls_align: 1,
+      __tls_size: 0,
+      __wasm_init_tls: () => {},
     }
     return importObject
   },

package/coverage-instrument.wasi.cjs

@@ -29,7 +29,6 @@ const __emnapiContext = __emnapiGetDefaultContext()
 const __sharedMemory = new WebAssembly.Memory({
   initial: 4000,
   maximum: 65536,
-  shared: true,
 })
 
 let __wasmFilePath = __nodePath.join(__dirname, 'coverage-instrument.wasm32-wasi.wasm')
@@ -39,63 +38,25 @@ if (__nodeFs.existsSync(__wasmDebugFilePath)) {
   __wasmFilePath = __wasmDebugFilePath
 } else if (!__nodeFs.existsSync(__wasmFilePath)) {
   try {
-    __wasmFilePath = require.resolve('@oxc-coverage-instrument/binding-wasm32-wasi/coverage-instrument.wasm32-wasi.wasm')
+    __wasmFilePath = require.resolve('@oxc-coverage-instrument/binding-wasm32-wasi-singlethreaded-singlethreaded/coverage-instrument.wasm32-wasi.wasm')
   } catch {
-    throw new Error('Cannot find coverage-instrument.wasm32-wasi.wasm file, and @oxc-coverage-instrument/binding-wasm32-wasi package is not installed.')
+    throw new Error('Cannot find coverage-instrument.wasm32-wasi.wasm file, and @oxc-coverage-instrument/binding-wasm32-wasi-singlethreaded-singlethreaded package is not installed.')
   }
 }
 
 const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule } = __emnapiInstantiateNapiModuleSync(__nodeFs.readFileSync(__wasmFilePath), {
   context: __emnapiContext,
-  asyncWorkPoolSize: (function() {
-    const threadsSizeFromEnv = Number(process.env.NAPI_RS_ASYNC_WORK_POOL_SIZE ?? process.env.UV_THREADPOOL_SIZE)
-    // NaN > 0 is false
-    if (threadsSizeFromEnv > 0) {
-      return threadsSizeFromEnv
-    } else {
-      return 4
-    }
-  })(),
-  reuseWorker: true,
+  asyncWorkPoolSize: 0,
   wasi: __wasi,
-  onCreateWorker() {
-    const worker = new Worker(__nodePath.join(__dirname, 'wasi-worker.mjs'), {
-      env: process.env,
-    })
-    worker.onmessage = ({ data }) => {
-      __wasmCreateOnMessageForFsProxy(__nodeFs)(data)
-    }
-
-    // The main thread of Node.js waits for all the active handles before exiting.
-    // But Rust threads are never waited without `thread::join`.
-    // So here we hack the code of Node.js to prevent the workers from being referenced (active).
-    // According to https://github.com/nodejs/node/blob/19e0d472728c79d418b74bddff588bea70a403d0/lib/internal/worker.js#L415,
-    // a worker is consist of two handles: kPublicPort and kHandle.
-    {
-      const kPublicPort = Object.getOwnPropertySymbols(worker).find(s =>
-        s.toString().includes("kPublicPort")
-      );
-      if (kPublicPort) {
-        worker[kPublicPort].ref = () => {};
-      }
-
-      const kHandle = Object.getOwnPropertySymbols(worker).find(s =>
-        s.toString().includes("kHandle")
-      );
-      if (kHandle) {
-        worker[kHandle].ref = () => {};
-      }
-
-      worker.unref();
-    }
-    return worker
-  },
   overwriteImports(importObject) {
     importObject.env = {
       ...importObject.env,
       ...importObject.napi,
       ...importObject.emnapi,
       memory: __sharedMemory,
+      __tls_align: 1,
+      __tls_size: 0,
+      __wasm_init_tls: () => {},
     }
     return importObject
   },

package/index.d.ts

@@ -102,8 +102,13 @@ export interface InstrumentResult {
  * the Vitest istanbul reporter path. For nyc's disk-read flow (Mode A
  * fallback) use [`remap_coverage_map_with_loader`] and supply a
  * `Record<string, string>` of preloaded maps keyed by FileCoverage path.
+ *
+ * Pass `{ dropUnmapped: true }` to align with `istanbul-lib-source-maps`'s
+ * `transformer.js` and drop entries whose positions cannot be looked up in
+ * the source map (instead of silently keeping their generated-output
+ * coordinates). See [`RemapOptions`] for the full per-kind drop semantics.
  */
-export declare function remapCoverageMap(coverageJson: string): string
+export declare function remapCoverageMap(coverageJson: string, options?: RemapOptions | undefined | null): string
 
 /**
  * Like [`remap_coverage_map`], but with a preloaded map dictionary used as
@@ -119,7 +124,30 @@ export declare function remapCoverageMap(coverageJson: string): string
  * [`oxc_coverage_instrument::SourceMapStore`] (Mode B continuous remap)
  * stays Rust-only until a Jest provider integration targets it directly.
  */
-export declare function remapCoverageMapWithLoader(coverageJson: string, sourceMaps: Record<string, string>): string
+export declare function remapCoverageMapWithLoader(coverageJson: string, sourceMaps: Record<string, string>, options?: RemapOptions | undefined | null): string
+
+/**
+ * Options for `remapCoverageMap` and `remapCoverageMapWithLoader`.
+ *
+ * Defaults to the legacy keep-generated-position behaviour, so callers that
+ * omit this argument see no change.
+ */
+export interface RemapOptions {
+  /**
+   * When `true`, statement / function / branch entries whose positions
+   * cannot be looked up in the source map are pruned, along with their
+   * matching `s` / `f` / `b` / `bT` hit-count slots.
+   *
+   * Drop semantics mirror `istanbul-lib-source-maps`'s `transformer.js`:
+   * statements drop when start or end fails to remap; functions drop when
+   * any of `decl` / `loc` start or end fails; branch arms drop per arm,
+   * and the whole branch drops when no arms survive or when the umbrella
+   * `loc` start/end fails to remap.
+   *
+   * Defaults to `false`.
+   */
+  dropUnmapped?: boolean
+}
 
 /** A coverage pragma comment that was found but not handled. */
 export interface UnhandledPragma {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oxc-coverage-instrument",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "Istanbul-compatible JavaScript/TypeScript coverage instrumentation using the Oxc AST. 8-48x faster than istanbul-lib-instrument.",
   "main": "index.js",
   "browser": "browser.js",
@@ -55,6 +55,7 @@
       "x86_64-unknown-linux-musl",
       "x86_64-pc-windows-msvc",
       "aarch64-pc-windows-msvc",
+      "wasm32-wasip1",
       "wasm32-wasip1-threads"
     ]
   },
@@ -62,24 +63,27 @@
     "@napi-rs/wasm-runtime": "^1.1.4"
   },
   "devDependencies": {
-    "@napi-rs/cli": "^3.6.0",
+    "@napi-rs/cli": "3.6.2",
     "istanbul-lib-instrument": "^6.0.3"
   },
   "scripts": {
-    "build": "napi build --release --platform",
-    "build:debug": "napi build --platform",
+    "build": "napi build --release --platform && npm run patch-shim",
+    "build:debug": "napi build --platform && npm run patch-shim",
+    "patch-shim": "node scripts/patch-wasi-browser-shim.mjs && node scripts/patch-browser-loader.mjs",
     "prepublishOnly": "napi prepublish -t npm",
     "artifacts": "napi artifacts",
-    "test": "node test.mjs"
+    "test": "node test.mjs && node scripts/patch-wasi-browser-shim.test.mjs",
+    "test:browser-loader": "node scripts/browser-loader.test.mjs"
   },
   "optionalDependencies": {
-    "@oxc-coverage-instrument/binding-darwin-arm64": "0.7.2",
-    "@oxc-coverage-instrument/binding-darwin-x64": "0.7.2",
-    "@oxc-coverage-instrument/binding-linux-arm64-gnu": "0.7.2",
-    "@oxc-coverage-instrument/binding-linux-x64-gnu": "0.7.2",
-    "@oxc-coverage-instrument/binding-linux-x64-musl": "0.7.2",
-    "@oxc-coverage-instrument/binding-win32-arm64-msvc": "0.7.2",
-    "@oxc-coverage-instrument/binding-win32-x64-msvc": "0.7.2",
-    "@oxc-coverage-instrument/binding-wasm32-wasi": "0.7.2"
+    "@oxc-coverage-instrument/binding-darwin-arm64": "0.7.3",
+    "@oxc-coverage-instrument/binding-darwin-x64": "0.7.3",
+    "@oxc-coverage-instrument/binding-linux-arm64-gnu": "0.7.3",
+    "@oxc-coverage-instrument/binding-linux-x64-gnu": "0.7.3",
+    "@oxc-coverage-instrument/binding-linux-x64-musl": "0.7.3",
+    "@oxc-coverage-instrument/binding-win32-arm64-msvc": "0.7.3",
+    "@oxc-coverage-instrument/binding-win32-x64-msvc": "0.7.3",
+    "@oxc-coverage-instrument/binding-wasm32-wasi": "0.7.3",
+    "@oxc-coverage-instrument/binding-wasm32-wasi-singlethreaded": "0.7.3"
   }
-}
+}