@napi-rs/cli 3.0.0-alpha.7 → 3.0.0-alpha.71

package/cli.mjs

@@ -5,7 +5,7 @@ import { resolve } from 'path'
 import { fileURLToPath } from 'url'
 
 execSync(
-  `node --loader ts-node/esm/transpile-only ${resolve(
+  `node --import @oxc-node/core/register ${resolve(
     fileURLToPath(import.meta.url),
     '../src/cli.ts',
   )} ${process.argv.slice(2).join(' ')}`,

package/dist/api/artifacts.js

@@ -1,18 +1,18 @@
-import { join, parse, resolve } from 'node:path';
+import { join, parse } from 'node:path';
 import * as colors from 'colorette';
 import { applyDefaultArtifactsOptions, } from '../def/artifacts.js';
 import { readNapiConfig, debugFactory, readFileAsync, writeFileAsync, UniArchsByPlatform, readdirAsync, } from '../utils/index.js';
 const debug = debugFactory('artifacts');
 export async function collectArtifacts(userOptions) {
     const options = applyDefaultArtifactsOptions(userOptions);
-    const packageJsonPath = resolve(options.cwd, options.packageJsonPath);
-    const { targets, binaryName } = await readNapiConfig(packageJsonPath);
-    const distDirs = targets.map((platform) => resolve(options.cwd, options.npmDir, platform.platformArchABI));
+    const packageJsonPath = join(options.cwd, options.packageJsonPath);
+    const { targets, binaryName, packageName } = await readNapiConfig(packageJsonPath);
+    const distDirs = targets.map((platform) => join(options.cwd, options.npmDir, platform.platformArchABI));
     const universalSourceBins = new Set(targets
         .filter((platform) => platform.arch === 'universal')
         .flatMap((p) => UniArchsByPlatform[p.platform]?.map((a) => `${p.platform}-${a}`))
         .filter(Boolean));
-    await collectNodeBinaries(resolve(options.cwd, options.outputDir)).then((output) => Promise.all(output.map(async (filePath) => {
+    await collectNodeBinaries(join(options.cwd, options.outputDir)).then((output) => Promise.all(output.map(async (filePath) => {
         debug.info(`Read [${colors.yellowBright(filePath)}]`);
         const sourceContent = await readFileAsync(filePath);
         const parsedName = parse(filePath);
@@ -38,15 +38,36 @@ export async function collectArtifacts(userOptions) {
         debug.info(`Write file content to [${colors.yellowBright(distFilePathLocal)}]`);
         await writeFileAsync(distFilePathLocal, sourceContent);
     })));
+    const wasiTarget = targets.find((t) => t.platform === 'wasi');
+    if (wasiTarget) {
+        const wasiDir = join(options.cwd, options.npmDir, wasiTarget.platformArchABI);
+        const cjsFile = join(options.buildOutputDir ?? options.cwd, `${binaryName}.wasi.cjs`);
+        const workerFile = join(options.buildOutputDir ?? options.cwd, `wasi-worker.mjs`);
+        const browserEntry = join(options.buildOutputDir ?? options.cwd, `${binaryName}.wasi-browser.js`);
+        const browserWorkerFile = join(options.buildOutputDir ?? options.cwd, `wasi-worker-browser.mjs`);
+        debug.info(`Move wasi binding file [${colors.yellowBright(cjsFile)}] to [${colors.yellowBright(wasiDir)}]`);
+        await writeFileAsync(join(wasiDir, `${binaryName}.wasi.cjs`), await readFileAsync(cjsFile));
+        debug.info(`Move wasi worker file [${colors.yellowBright(workerFile)}] to [${colors.yellowBright(wasiDir)}]`);
+        await writeFileAsync(join(wasiDir, `wasi-worker.mjs`), await readFileAsync(workerFile));
+        debug.info(`Move wasi browser entry file [${colors.yellowBright(browserEntry)}] to [${colors.yellowBright(wasiDir)}]`);
+        await writeFileAsync(join(wasiDir, `${binaryName}.wasi-browser.js`), 
+        // https://github.com/vitejs/vite/issues/8427
+        (await readFileAsync(browserEntry, 'utf8')).replace(`new URL('./wasi-worker-browser.mjs', import.meta.url)`, `new URL('${packageName}-wasm32-wasi/wasi-worker-browser.mjs', import.meta.url)`));
+        debug.info(`Move wasi browser worker file [${colors.yellowBright(browserWorkerFile)}] to [${colors.yellowBright(wasiDir)}]`);
+        await writeFileAsync(join(wasiDir, `wasi-worker-browser.mjs`), await readFileAsync(browserWorkerFile));
+    }
 }
 async function collectNodeBinaries(root) {
     const files = await readdirAsync(root, { withFileTypes: true });
     const nodeBinaries = files
-        .filter((file) => file.isFile() && file.name.endsWith('.node'))
+        .filter((file) => file.isFile() &&
+        (file.name.endsWith('.node') || file.name.endsWith('.wasm')))
         .map((file) => join(root, file.name));
     const dirs = files.filter((file) => file.isDirectory());
     for (const dir of dirs) {
-        nodeBinaries.push(...(await collectNodeBinaries(join(root, dir.name))));
+        if (dir.name !== 'node_modules') {
+            nodeBinaries.push(...(await collectNodeBinaries(join(root, dir.name))));
+        }
     }
     return nodeBinaries;
 }

package/dist/api/artifacts.js.map

@@ -1 +1 @@
-{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../src/api/artifacts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../src/api/artifacts.ts"],"names":[],"mappings":"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"}

package/dist/api/build.js

@@ -1,17 +1,23 @@
 import { spawn } from 'node:child_process';
 import { createHash } from 'node:crypto';
+import { existsSync, mkdirSync, unlinkSync } from 'node:fs';
 import { createRequire } from 'node:module';
-import { tmpdir } from 'node:os';
+import { tmpdir, homedir } from 'node:os';
 import { parse, join, resolve } from 'node:path';
 import * as colors from 'colorette';
+import { include as setjmpInclude, lib as setjmpLib } from 'wasm-sjlj';
 import { CLI_VERSION, copyFileAsync, debugFactory, DEFAULT_TYPE_DEF_HEADER, fileExists, getSystemDefaultTarget, getTargetLinker, mkdirAsync, parseMetadata, parseTriple, processTypeDef, readFileAsync, readNapiConfig, targetToEnvVar, tryInstallCargoBinary, unlinkAsync, writeFileAsync, } from '../utils/index.js';
-import { createWasiBinding } from './load-wasi-template.js';
-import { createCjsBinding } from './templates/index.js';
-import { WASI_WORKER_TEMPLATE } from './wasi-worker-template.js';
+import { createCjsBinding, createEsmBinding } from './templates/index.js';
+import { createWasiBinding, createWasiBrowserBinding, } from './templates/load-wasi-template.js';
+import { createWasiBrowserWorkerBinding, WASI_WORKER_TEMPLATE, } from './templates/wasi-worker-template.js';
 const debug = debugFactory('build');
 const require = createRequire(import.meta.url);
 export async function buildProject(options) {
     debug('napi build command receive options: %O', options);
+    options = {
+        dtsCache: true,
+        ...options,
+    };
     const cwd = options.cwd ?? process.cwd();
     const resolvePath = (...paths) => resolve(cwd, ...paths);
     const manifestPath = resolvePath(options.manifestPath ?? 'Cargo.toml');
@@ -35,7 +41,7 @@ export async function buildProject(options) {
             ? parseTriple(process.env.CARGO_BUILD_TARGET)
             : getSystemDefaultTarget(), crateDir, resolvePath(options.outputDir ?? crateDir), options.targetDir ??
         process.env.CARGO_BUILD_TARGET_DIR ??
-        metadata.target_directory, await readNapiConfig(resolvePath(options.packageJsonPath ?? 'package.json')));
+        metadata.target_directory, await readNapiConfig(resolvePath(options.configPath ?? options.packageJsonPath ?? 'package.json'), options.configPath ? resolvePath(options.configPath) : undefined));
     return builder.build();
 }
 class Builder {
@@ -85,16 +91,91 @@ class Builder {
             .setPackage()
             .setFeatures()
             .setTarget()
+            .pickCrossToolchain()
             .setEnvs()
             .setBypassArgs()
             .exec();
     }
+    pickCrossToolchain() {
+        if (!this.options.useNapiCross) {
+            return this;
+        }
+        if (this.options.useCross) {
+            debug.warn('You are trying to use both `--cross` and `--use-napi-cross` options, `--use-cross` will be ignored.');
+        }
+        if (this.options.crossCompile) {
+            debug.warn('You are trying to use both `--cross-compile` and `--use-napi-cross` options, `--cross-compile` will be ignored.');
+        }
+        try {
+            const { version, download } = require('@napi-rs/cross-toolchain');
+            const alias = {
+                's390x-unknown-linux-gnu': 's390x-ibm-linux-gnu',
+            };
+            const toolchainPath = join(homedir(), '.napi-rs', 'cross-toolchain', version, this.target.triple);
+            mkdirSync(toolchainPath, { recursive: true });
+            if (existsSync(join(toolchainPath, 'package.json'))) {
+                debug(`Toolchain ${toolchainPath} exists, skip extracting`);
+            }
+            else {
+                const tarArchive = download(process.arch, this.target.triple);
+                tarArchive.unpack(toolchainPath);
+            }
+            const upperCaseTarget = targetToEnvVar(this.target.triple);
+            const crossTargetName = alias[this.target.triple] ?? this.target.triple;
+            const linkerEnv = `CARGO_TARGET_${upperCaseTarget}_LINKER`;
+            this.envs[linkerEnv] = join(toolchainPath, 'bin', `${crossTargetName}-gcc`);
+            if (!process.env.TARGET_SYSROOT) {
+                this.envs[`TARGET_SYSROOT`] = join(toolchainPath, crossTargetName, 'sysroot');
+            }
+            if (!process.env.TARGET_AR) {
+                this.envs[`TARGET_AR`] = join(toolchainPath, 'bin', `${crossTargetName}-ar`);
+            }
+            if (!process.env.TARGET_RANLIB) {
+                this.envs[`TARGET_RANLIB`] = join(toolchainPath, 'bin', `${crossTargetName}-ranlib`);
+            }
+            if (!process.env.TARGET_READELF) {
+                this.envs[`TARGET_READELF`] = join(toolchainPath, 'bin', `${crossTargetName}-readelf`);
+            }
+            if (!process.env.TARGET_C_INCLUDE_PATH) {
+                this.envs[`TARGET_C_INCLUDE_PATH`] = join(toolchainPath, crossTargetName, 'sysroot', 'usr', 'include/');
+            }
+            if (!process.env.CC && !process.env.TARGET_CC) {
+                this.envs[`CC`] = join(toolchainPath, 'bin', `${crossTargetName}-gcc`);
+                this.envs[`TARGET_CC`] = join(toolchainPath, 'bin', `${crossTargetName}-gcc`);
+            }
+            if (!process.env.CXX && !process.env.TARGET_CXX) {
+                this.envs[`CXX`] = join(toolchainPath, 'bin', `${this.target.triple}-g++`);
+                this.envs[`TARGET_CXX`] = join(toolchainPath, 'bin', `${this.target.triple}-g++`);
+            }
+            if ((process.env.CC === 'clang' &&
+                (process.env.TARGET_CC === 'clang' || !process.env.TARGET_CC)) ||
+                process.env.TARGET_CC === 'clang') {
+                this.envs.CFLAGS = `--sysroot=${this.envs.TARGET_SYSROOT} --gcc-toolchain=${toolchainPath}`;
+            }
+            if ((process.env.CXX === 'clang++' &&
+                (process.env.TARGET_CXX === 'clang++' || !process.env.TARGET_CXX)) ||
+                process.env.TARGET_CXX === 'clang++') {
+                this.envs.CXXFLAGS = `--sysroot=${this.envs.TARGET_SYSROOT} --gcc-toolchain=${toolchainPath}`;
+            }
+            this.envs.PATH = this.envs.PATH
+                ? `${toolchainPath}/bin:${this.envs.PATH}:${process.env.PATH}`
+                : `${toolchainPath}/bin:${process.env.PATH}`;
+        }
+        catch (e) {
+            debug.warn('Pick cross toolchain failed', e);
+            // ignore, do nothing
+        }
+        return this;
+    }
     exec() {
         debug(`Start building crate: ${this.crate.name}`);
         debug('  %i', `cargo ${this.args.join(' ')}`);
         const controller = new AbortController();
         const watch = this.options.watch;
         const buildTask = new Promise((resolve, reject) => {
+            if (this.options.useCross && this.options.crossCompile) {
+                throw new Error('`--use-cross` and `--cross-compile` can not be used together');
+            }
             const command = process.env.CARGO ?? (this.options.useCross ? 'cross' : 'cargo');
             const buildProcess = spawn(command, this.args, {
                 env: {
@@ -123,7 +204,7 @@ class Builder {
             buildProcess.stderr?.on('data', (data) => {
                 const output = data.toString();
                 console.error(output);
-                if (/Finished\s(dev|release)/.test(output)) {
+                if (/Finished\s(`dev`|`release`)/.test(output)) {
                     this.postBuild().catch(() => { });
                 }
             });
@@ -248,7 +329,7 @@ class Builder {
         //   will detect by cargo config when it becomes stable
         //   see: https://github.com/rust-lang/cargo/issues/9301
         const linkerEnv = `CARGO_TARGET_${targetToEnvVar(this.target.triple)}_LINKER`;
-        if (linker && !process.env[linkerEnv]) {
+        if (linker && !process.env[linkerEnv] && !this.envs[linkerEnv]) {
             this.envs[linkerEnv] = linker;
         }
         if (this.target.platform === 'android') {
@@ -266,10 +347,10 @@ class Builder {
             Object.assign(this.envs, {
                 CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin/${targetArch}-linux-android24-clang`,
                 CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin/${targetArch}-linux-androideabi24-clang`,
-                CC: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin/${targetArch}-linux-${targetPlatform}-clang`,
-                CXX: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin/${targetArch}-linux-${targetPlatform}-clang++`,
-                AR: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin/llvm-ar`,
-                RANLIB: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin/llvm-ranlib`,
+                TARGET_CC: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin/${targetArch}-linux-${targetPlatform}-clang`,
+                TARGET_CXX: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin/${targetArch}-linux-${targetPlatform}-clang++`,
+                TARGET_AR: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin/llvm-ar`,
+                TARGET_RANLIB: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin/llvm-ranlib`,
                 ANDROID_NDK: ANDROID_NDK_LATEST_HOME,
                 PATH: `${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/${hostPlatform}-x86_64/bin:${process.env.PATH}`,
             });
@@ -278,6 +359,21 @@ class Builder {
         if (this.target.platform === 'wasi') {
             const emnapi = join(require.resolve('emnapi'), '..', 'lib', 'wasm32-wasi-threads');
             this.envs.EMNAPI_LINK_DIR = emnapi;
+            this.envs.SETJMP_LINK_DIR = setjmpLib;
+            const { WASI_SDK_PATH } = process.env;
+            if (WASI_SDK_PATH && existsSync(WASI_SDK_PATH)) {
+                this.envs.CARGO_TARGET_WASM32_WASI_PREVIEW1_THREADS_LINKER = join(WASI_SDK_PATH, 'bin', 'wasm-ld');
+                this.envs.CARGO_TARGET_WASM32_WASIP1_LINKER = join(WASI_SDK_PATH, 'bin', 'wasm-ld');
+                this.envs.CARGO_TARGET_WASM32_WASIP1_THREADS_LINKER = join(WASI_SDK_PATH, 'bin', 'wasm-ld');
+                this.envs.CARGO_TARGET_WASM32_WASIP2_LINKER = join(WASI_SDK_PATH, 'bin', 'wasm-ld');
+                this.setEnvIfNotExists('CC', join(WASI_SDK_PATH, 'bin', 'clang'));
+                this.setEnvIfNotExists('CXX', join(WASI_SDK_PATH, 'bin', 'clang++'));
+                this.setEnvIfNotExists('AR', join(WASI_SDK_PATH, 'bin', 'ar'));
+                this.setEnvIfNotExists('RANLIB', join(WASI_SDK_PATH, 'bin', 'ranlib'));
+                this.setEnvIfNotExists('CFLAGS', `--target=wasm32-wasi-threads --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj -I${setjmpInclude}`);
+                this.setEnvIfNotExists('CXXFLAGS', `--target=wasm32-wasi-threads --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj -I${setjmpInclude}`);
+                this.setEnvIfNotExists(`LDFLAGS`, `-fuse-ld=${WASI_SDK_PATH}/bin/wasm-ld --target=wasm32-wasi-threads`);
+            }
         }
         debug('Set envs: ');
         Object.entries(this.envs).forEach(([k, v]) => {
@@ -287,13 +383,16 @@ class Builder {
     }
     setFeatures() {
         const args = [];
+        if (this.options.allFeatures && this.options.noDefaultFeatures) {
+            throw new Error('Cannot specify --all-features and --no-default-features together');
+        }
         if (this.options.allFeatures) {
             args.push('--all-features');
         }
         else if (this.options.noDefaultFeatures) {
             args.push('--no-default-features');
         }
-        else if (this.options.features) {
+        if (this.options.features) {
             args.push('--features', ...this.options.features);
         }
         debug('Set features flags: ');
@@ -314,17 +413,28 @@ class Builder {
         if (this.options.profile) {
             this.args.push('--profile', this.options.profile);
         }
+        if (this.options.manifestPath) {
+            this.args.push('--manifest-path', this.options.manifestPath);
+        }
         if (this.options.cargoOptions?.length) {
             this.args.push(...this.options.cargoOptions);
         }
         return this;
     }
     getIntermediateTypeFile() {
-        return join(tmpdir(), `${this.crate.name}-${createHash('sha256')
+        const dtsPath = join(tmpdir(), `${this.crate.name}-${createHash('sha256')
             .update(this.crate.manifest_path)
             .update(CLI_VERSION)
             .digest('hex')
-            .substring(0, 8)}.napi_type_def.tmp`);
+            .substring(0, 8)}.napi_type_def`);
+        if (!this.options.dtsCache) {
+            try {
+                unlinkSync(dtsPath);
+            }
+            catch { }
+            return `${dtsPath}_${Date.now()}.tmp`;
+        }
+        return `${dtsPath}.tmp`;
     }
     getIntermediateWasiRegisterFile() {
         return join(tmpdir(), `${this.crate.name}-${createHash('sha256')
@@ -345,30 +455,40 @@ class Builder {
                 cause: e,
             });
         }
-        const dest = await this.copyArtifact();
+        const wasmBinaryName = await this.copyArtifact();
         // only for cdylib
         if (this.cdyLibName) {
             const idents = await this.generateTypeDef();
             const intermediateWasiRegisterFile = this.envs.WASI_REGISTER_TMP_PATH;
-            const wasiRegisterFunctions = this.target.arch === 'wasm32'
-                ? JSON.parse(await readFileAsync(intermediateWasiRegisterFile, 'utf8').catch((err) => {
-                    console.warn(`Read ${colors.yellowBright(intermediateWasiRegisterFile)} failed, reason: ${err.message}`);
-                    return `[]`;
-                }))
+            const wasiRegisterFunctions = this.config.targets.some((t) => t.platform === 'wasi')
+                ? await (async function readIntermediateWasiRegisterFile() {
+                    const fileContent = await readFileAsync(intermediateWasiRegisterFile, 'utf8').catch((err) => {
+                        console.warn(`Read ${colors.yellowBright(intermediateWasiRegisterFile)} failed, reason: ${err.message}`);
+                        return ``;
+                    });
+                    return fileContent
+                        .split('\n')
+                        .map((l) => l.trim())
+                        .filter((l) => l.length)
+                        .map((line) => {
+                        const [_, fn] = line.split(':');
+                        return fn.trim();
+                    });
+                })()
                 : [];
             const jsOutput = await this.writeJsBinding(idents);
-            const wasmOutput = await this.writeWasiBinding(wasiRegisterFunctions, dest ?? 'index.wasm', idents);
+            const wasmBindingsOutput = await this.writeWasiBinding(wasiRegisterFunctions, wasmBinaryName ?? 'index.wasm', idents);
             if (jsOutput) {
                 this.outputs.push(jsOutput);
             }
-            if (wasmOutput) {
-                this.outputs.push(wasmOutput);
+            if (wasmBindingsOutput) {
+                this.outputs.push(...wasmBindingsOutput);
             }
         }
         return this.outputs;
     }
     async copyArtifact() {
-        const [srcName, destName] = this.getArtifactNames();
+        const [srcName, destName, wasmBinaryName] = this.getArtifactNames();
         if (!srcName || !destName) {
             return;
         }
@@ -376,6 +496,7 @@ class Builder {
         const src = join(this.targetDir, this.target.triple, profile, srcName);
         debug(`Copy artifact from: [${src}]`);
         const dest = join(this.outputDir, destName);
+        const isWasm = dest.endsWith('.wasm');
         try {
             if (await fileExists(dest)) {
                 debug('Old artifact found, remove it first');
@@ -383,12 +504,44 @@ class Builder {
             }
             debug('Copy artifact to:');
             debug('  %i', dest);
-            await copyFileAsync(src, dest);
+            if (isWasm) {
+                const { ModuleConfig } = await import('@napi-rs/wasm-tools');
+                debug('Generate debug wasm module');
+                try {
+                    const debugWasmModule = new ModuleConfig()
+                        .generateDwarf(true)
+                        .generateNameSection(true)
+                        .generateProducersSection(true)
+                        .preserveCodeTransform(true)
+                        .strictValidate(false)
+                        .parse(await readFileAsync(src));
+                    const debugWasmBinary = debugWasmModule.emitWasm(true);
+                    await writeFileAsync(dest.replace('.wasm', '.debug.wasm'), debugWasmBinary);
+                    debug('Generate release wasm module');
+                    const releaseWasmModule = new ModuleConfig()
+                        .generateDwarf(false)
+                        .generateNameSection(false)
+                        .generateProducersSection(false)
+                        .preserveCodeTransform(false)
+                        .strictValidate(false)
+                        .onlyStableFeatures(false)
+                        .parse(debugWasmBinary);
+                    const releaseWasmBinary = releaseWasmModule.emitWasm(false);
+                    await writeFileAsync(dest, releaseWasmBinary);
+                }
+                catch (e) {
+                    debug.warn(`Failed to generate debug wasm module: ${e.message ?? e}`);
+                    await copyFileAsync(src, dest);
+                }
+            }
+            else {
+                await copyFileAsync(src, dest);
+            }
             this.outputs.push({
-                kind: dest.endsWith('.node') ? 'node' : 'exe',
+                kind: dest.endsWith('.node') ? 'node' : isWasm ? 'wasm' : 'exe',
                 path: dest,
             });
-            return dest;
+            return wasmBinaryName ? join(this.outputDir, wasmBinaryName) : null;
         }
         catch (e) {
             throw new Error('Failed to copy artifact', {
@@ -399,6 +552,7 @@ class Builder {
     getArtifactNames() {
         if (this.cdyLibName) {
             const cdyLib = this.cdyLibName.replace(/-/g, '_');
+            const wasiTarget = this.config.targets.find((t) => t.platform === 'wasi');
             const srcName = this.target.platform === 'darwin'
                 ? `lib${cdyLib}.dylib`
                 : this.target.platform === 'win32'
@@ -414,12 +568,18 @@ class Builder {
                 destName += `.${this.target.platformArchABI}`;
             }
             if (srcName.endsWith('.wasm')) {
-                destName += '.wasi-wasm32.wasm';
+                destName += '.wasm';
             }
             else {
                 destName += '.node';
             }
-            return [srcName, destName];
+            return [
+                srcName,
+                destName,
+                wasiTarget
+                    ? `${this.config.binaryName}.${wasiTarget.platformArchABI}.wasm`
+                    : null,
+            ];
         }
         else if (this.binName) {
             const srcName = this.target.platform === 'win32' ? `${this.binName}.exe` : this.binName;
@@ -432,8 +592,16 @@ class Builder {
             return [];
         }
         const dest = join(this.outputDir, this.options.dts ?? 'index.d.ts');
-        const { dts, exports } = await processTypeDef(this.envs.TYPE_DEF_TMP_PATH, !this.options.noDtsHeader
-            ? this.options.dtsHeader ?? DEFAULT_TYPE_DEF_HEADER
+        const { dts, exports } = await processTypeDef(this.envs.TYPE_DEF_TMP_PATH, this.options.constEnum ?? this.config.constEnum ?? true, !this.options.noDtsHeader
+            ? (this.options.dtsHeader ??
+                (this.config.dtsHeaderFile
+                    ? await readFileAsync(join(this.cwd, this.config.dtsHeaderFile), 'utf-8').catch(() => {
+                        debug.warn(`Failed to read dts header file ${this.config.dtsHeaderFile}`);
+                        return null;
+                    })
+                    : null) ??
+                this.config.dtsHeader ??
+                DEFAULT_TYPE_DEF_HEADER)
             : '');
         try {
             debug('Writing type def to:');
@@ -457,13 +625,14 @@ class Builder {
             idents.length === 0) {
             return;
         }
-        const name = parse(this.options.jsBinding ?? 'index.js').name;
-        const cjs = createCjsBinding(this.config.binaryName, this.config.packageName, idents);
+        const name = this.options.jsBinding ?? 'index.js';
+        const createBinding = this.options.esm ? createEsmBinding : createCjsBinding;
+        const binding = createBinding(this.config.binaryName, this.config.packageName, idents);
         try {
-            const dest = join(this.outputDir, `${name}.js`);
+            const dest = join(this.outputDir, name);
             debug('Writing js binding to:');
             debug('  %i', dest);
-            await writeFileAsync(dest, cjs, 'utf-8');
+            await writeFileAsync(dest, binding, 'utf-8');
             return {
                 kind: 'js',
                 path: dest,
@@ -476,23 +645,54 @@ class Builder {
     async writeWasiBinding(wasiRegisterFunctions, distFileName, idents) {
         if (distFileName && wasiRegisterFunctions.length) {
             const { name, dir } = parse(distFileName);
-            const newPath = join(dir, `${this.config.binaryName}.wasi.mjs`);
+            const bindingPath = join(dir, `${this.config.binaryName}.wasi.cjs`);
+            const browserBindingPath = join(dir, `${this.config.binaryName}.wasi-browser.js`);
             const workerPath = join(dir, 'wasi-worker.mjs');
-            const declareCodes = `const { ${idents.join(', ')} } = binding\n`;
-            const exportsCode = `export {\n${idents
-                .map((ident) => `  ${ident}`)
-                .join(',\n')}\n}`;
-            await writeFileAsync(newPath, createWasiBinding(name, wasiRegisterFunctions) +
-                declareCodes +
+            const browserWorkerPath = join(dir, 'wasi-worker-browser.mjs');
+            const browserEntryPath = join(dir, 'browser.js');
+            const exportsCode = idents
+                .map((ident) => `module.exports.${ident} = __napiModule.exports.${ident}`)
+                .join('\n');
+            await writeFileAsync(bindingPath, createWasiBinding(name, this.config.packageName, wasiRegisterFunctions, this.config.wasm?.initialMemory, this.config.wasm?.maximumMemory) +
                 exportsCode +
                 '\n', 'utf8');
+            await writeFileAsync(browserBindingPath, createWasiBrowserBinding(name, wasiRegisterFunctions, this.config.wasm?.initialMemory, this.config.wasm?.maximumMemory, this.config.wasm?.browser?.fs) +
+                idents
+                    .map((ident) => `export const ${ident} = __napiModule.exports.${ident}`)
+                    .join('\n') +
+                '\n', 'utf8');
             await writeFileAsync(workerPath, WASI_WORKER_TEMPLATE, 'utf8');
-            return {
-                kind: 'wasm',
-                path: newPath,
-            };
+            await writeFileAsync(browserWorkerPath, createWasiBrowserWorkerBinding(this.config.wasm?.browser?.fs ?? false), 'utf8');
+            await writeFileAsync(browserEntryPath, `export * from '${this.config.packageName}-wasm32-wasi'\n`);
+            return [
+                {
+                    kind: 'js',
+                    path: bindingPath,
+                },
+                {
+                    kind: 'js',
+                    path: browserBindingPath,
+                },
+                {
+                    kind: 'js',
+                    path: workerPath,
+                },
+                {
+                    kind: 'js',
+                    path: browserWorkerPath,
+                },
+                {
+                    kind: 'js',
+                    path: browserEntryPath,
+                },
+            ];
+        }
+        return [];
+    }
+    setEnvIfNotExists(env, value) {
+        if (!process.env[env]) {
+            this.envs[env] = value;
         }
-        return null;
     }
 }
 //# sourceMappingURL=build.js.map