@napi-rs/cli 3.7.4 → 3.8.0

package/src/api/__tests__/artifacts.spec.ts

@@ -53,7 +53,15 @@ test('resolves a relative WASI build output directory from cwd', async (t) => {
   const browserEntry =
     "const worker = new URL('./wasi-worker-browser.mjs', import.meta.url)\n"
   await Promise.all([
+    writeFile(
+      join(tmpDir, 'artifacts', `${binaryName}.wasm32-wasi.wasm`),
+      'wasm artifact',
+    ),
     writeFile(join(buildOutputDir, `${binaryName}.wasi.cjs`), 'node binding'),
+    writeFile(
+      join(buildOutputDir, `${binaryName}.wasi.d.cts`),
+      'node binding types',
+    ),
     writeFile(join(buildOutputDir, 'wasi-worker.mjs'), 'node worker'),
     writeFile(
       join(buildOutputDir, `${binaryName}.wasi-browser.js`),
@@ -63,6 +71,8 @@ test('resolves a relative WASI build output directory from cwd', async (t) => {
       join(buildOutputDir, 'wasi-worker-browser.mjs'),
       'browser worker',
     ),
+    writeFile(join(buildOutputDir, 'browser.js'), 'root browser'),
+    writeFile(join(buildOutputDir, 'index.js'), 'root index'),
   ])
 
   await collectArtifacts({
@@ -70,6 +80,13 @@ test('resolves a relative WASI build output directory from cwd', async (t) => {
     buildOutputDir: 'build-output',
   })
 
+  t.is(
+    await readFile(
+      join(wasiPackageDir, `${binaryName}.wasm32-wasi.wasm`),
+      'utf8',
+    ),
+    'wasm artifact',
+  )
   t.is(
     await readFile(join(wasiPackageDir, `${binaryName}.wasi.cjs`), 'utf8'),
     'node binding',

package/src/api/__tests__/create-npm-dirs.spec.ts

@@ -8,6 +8,7 @@ import { join } from 'node:path'
 import ava, { type TestFn } from 'ava'
 
 import { createNpmDirs } from '../create-npm-dirs.js'
+import { MINIMUM_WASI_NODE_VERSION } from '../../utils/index.js'
 
 const require = createRequire(import.meta.url)
 
@@ -281,7 +282,7 @@ test('should preserve stricter node engine ranges for WASM targets', async (t) =
     name: 'test-wasm-engines',
     version: '1.0.0',
     engines: {
-      node: '>=18',
+      node: '>=24',
     },
     napi: {
       binaryName: 'test-wasm-engines',
@@ -300,7 +301,7 @@ test('should preserve stricter node engine ranges for WASM targets', async (t) =
     await readFile(join(tmpDir, 'npm', 'wasm32-wasi', 'package.json'), 'utf-8'),
   )
 
-  t.is(scopedPackageJson.engines.node, '>=18')
+  t.is(scopedPackageJson.engines.node, '>=24')
 })
 
 test('should intersect mixed node engine ranges with the WASI minimum', async (t) => {
@@ -329,7 +330,7 @@ test('should intersect mixed node engine ranges with the WASI minimum', async (t
     await readFile(join(tmpDir, 'npm', 'wasm32-wasi', 'package.json'), 'utf-8'),
   )
 
-  t.is(scopedPackageJson.engines.node, '>=18.0.0')
+  t.is(scopedPackageJson.engines.node, MINIMUM_WASI_NODE_VERSION)
 })
 
 test('should preserve sibling engine constraints when node is missing for WASM targets', async (t) => {
@@ -360,11 +361,11 @@ test('should preserve sibling engine constraints when node is missing for WASM t
 
   t.deepEqual(scopedPackageJson.engines, {
     npm: '>=10',
-    node: '>=14.0.0',
+    node: MINIMUM_WASI_NODE_VERSION,
   })
 })
 
-test('should replace an exact node engine below the WASI minimum for WASM targets', async (t) => {
+test('should reject an exact node engine below the WASI minimum for WASM targets', async (t) => {
   const { tmpDir, packageJsonPath } = t.context
 
   const packageJson = {
@@ -381,16 +382,14 @@ test('should replace an exact node engine below the WASI minimum for WASM target
 
   await writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2))
 
-  await createNpmDirs({
-    cwd: tmpDir,
-    packageJsonPath: 'package.json',
-  })
-
-  const scopedPackageJson = JSON.parse(
-    await readFile(join(tmpDir, 'npm', 'wasm32-wasi', 'package.json'), 'utf-8'),
+  const error = await t.throwsAsync(() =>
+    createNpmDirs({
+      cwd: tmpDir,
+      packageJsonPath: 'package.json',
+    }),
   )
-
-  t.is(scopedPackageJson.engines.node, '>=14.0.0')
+  t.true(error.message.includes('"13.0.0"'))
+  t.true(error.message.includes(`"${MINIMUM_WASI_NODE_VERSION}"`))
 })
 
 test('should drop exact node engine branches below the WASI minimum for WASM targets', async (t) => {
@@ -419,7 +418,7 @@ test('should drop exact node engine branches below the WASI minimum for WASM tar
     await readFile(join(tmpDir, 'npm', 'wasm32-wasi', 'package.json'), 'utf-8'),
   )
 
-  t.is(scopedPackageJson.engines.node, '>=18.0.0')
+  t.is(scopedPackageJson.engines.node, MINIMUM_WASI_NODE_VERSION)
 })
 
 test('should set @emnapi/core and @emnapi/runtime versions to match emnapi for WASM targets', async (t) => {

package/src/api/__tests__/new.spec.ts

@@ -9,7 +9,7 @@ import { parse as parseToml } from '@std/toml'
 import ava, { type TestFn } from 'ava'
 import { load as yamlLoad } from 'js-yaml'
 
-import { newProject } from '../new.js'
+import { GENERATED_WASI_BINDING, newProject } from '../new.js'
 
 const test = ava as TestFn<{
   tmpDir: string
@@ -66,10 +66,10 @@ test('create a new project with default options', async (t) => {
     join(projectPath, '.gitattributes'),
     'utf-8',
   )
-  t.truthy(gitAttributes.includes('default-project.wasi-browser.js'))
-  t.truthy(gitAttributes.includes('default-project.wasi.cjs'))
-  t.truthy(gitAttributes.includes('wasi-worker-browser.mjs'))
-  t.truthy(gitAttributes.includes('wasi-worker.mjs'))
+  t.false(gitAttributes.includes('default-project.wasi-browser.js'))
+  t.false(gitAttributes.includes('default-project.wasi.cjs'))
+  t.false(gitAttributes.includes('wasi-worker-browser.mjs'))
+  t.false(gitAttributes.includes('wasi-worker.mjs'))
   const ciYaml = await readFile(
     join(projectPath, '.github', 'workflows', 'CI.yml'),
     'utf-8',
@@ -525,3 +525,39 @@ test('should fail when no targets are enabled', async (t) => {
     { message: /At least one target must be enabled/ },
   )
 })
+
+test('generated WASI binding pattern matches every generated artifact name', (t) => {
+  // Mirrors the artifact names produced for the threaded (`wasi`) and
+  // non-threaded (`wasip1`) loader suffixes, including the `.d.cts` loader
+  // typings emitted alongside `.cjs` entries.
+  const generated = [
+    'binary.wasi.cjs',
+    'binary.wasi.d.cts',
+    'binary.wasi-browser.js',
+    'wasi-worker.mjs',
+    'wasi-worker-browser.mjs',
+    'binary.wasip1.cjs',
+    'binary.wasip1.d.cts',
+    'binary.wasip1-browser.js',
+    'binary.wasip1-deferred.js',
+    'binary.wasip1-deferred.d.ts',
+  ]
+  for (const file of generated) {
+    t.true(GENERATED_WASI_BINDING.test(file), `should match ${file}`)
+    t.true(
+      GENERATED_WASI_BINDING.test(`${file} linguist-detectable=false`),
+      `should match the .gitattributes line for ${file}`,
+    )
+  }
+
+  const notGenerated = [
+    'index.js',
+    'index.d.ts',
+    'browser.js',
+    'binary.wasm32-wasi.wasm.d.mts',
+    'binary.node',
+  ]
+  for (const file of notGenerated) {
+    t.false(GENERATED_WASI_BINDING.test(file), `should not match ${file}`)
+  }
+})