fix: improve native module detection (#674)

* fix: add node-gyp to native module detection

* feat: detect modules with native file

* chore: doh

src/runtimes/node/native_modules/detector.js

@@ -1,16 +1,21 @@
-// eslint-disable-next-line complexity
-const isNativeModule = ({ binary, dependencies = {}, devDependencies = {}, gypfile }) =>
-  Boolean(
-    dependencies.bindings ||
-      dependencies.prebuild ||
-      dependencies.nan ||
-      dependencies['node-pre-gyp'] ||
-      dependencies['node-gyp-build'] ||
-      devDependencies.prebuild ||
-      devDependencies['node-pre-gyp'] ||
-      devDependencies['node-gyp-build'] ||
-      gypfile ||
-      binary,
-  )
+const { extname } = require('path')
+
+const markerModules = ['bindings', 'nan', 'node-gyp', 'node-gyp-build', 'node-pre-gyp', 'prebuild']
+
+const isNativeModule = ({ binary, dependencies = {}, devDependencies = {}, files = [], gypfile }) => {
+  if (binary || gypfile) {
+    return true
+  }
+
+  const hasMarkerModule = markerModules.some((marker) => dependencies[marker] || devDependencies[marker])
+
+  if (hasMarkerModule) {
+    return true
+  }
+
+  const hasBinaryFile = files.some((path) => !path.startsWith('!') && extname(path) === '.node')
+
+  return hasBinaryFile
+}
 
 module.exports = { isNativeModule }

tests/fixtures/node-module-native-buildtime/function.js

@@ -1 +1,5 @@
-module.exports = require('test')
+const moduleWithNodeFile = require('module-with-node-file')
+const moduleWithNodeGyp = require('module-with-node-gyp')
+const moduleWithPrebuild = require('module-with-prebuild')
+
+module.exports = [moduleWithNodeFile, moduleWithNodeGyp, moduleWithPrebuild]

tests/fixtures/node-module-native-buildtime/package.json

@@ -2,6 +2,8 @@
   "name": "node-module-native-buildtime",
   "version": "1.0.0",
   "dependencies": {
-    "test": "1.0.0"
+    "module-with-node-file": "3.0.0",
+    "module-with-node-gyp": "1.0.0",
+    "module-with-prebuild": "2.0.0"
   }
 }

tests/main.js

@@ -91,17 +91,32 @@ testBundlers(
     })
     const requires = await getRequires({ filePath: resolve(tmpDir, 'function.js') })
     const normalizedRequires = new Set(requires.map(unixify))
-    const modulePath = resolve(FIXTURES_DIR, `${fixtureDir}/node_modules/test`)
 
     t.is(files.length, 1)
     t.is(files[0].runtime, 'js')
-    t.true(await pathExists(`${tmpDir}/node_modules/test/native.node`))
-    t.true(await pathExists(`${tmpDir}/node_modules/test/side-file.js`))
-    t.true(normalizedRequires.has('test'))
+
+    const moduleWithNodeFile = resolve(FIXTURES_DIR, `${fixtureDir}/node_modules/module-with-node-file`)
+    t.true(await pathExists(`${tmpDir}/node_modules/module-with-node-file/native.node`))
+    t.true(await pathExists(`${tmpDir}/node_modules/module-with-node-file/side-file.js`))
+    t.true(normalizedRequires.has('module-with-node-file'))
+
+    const moduleWithNodeGypPath = resolve(FIXTURES_DIR, `${fixtureDir}/node_modules/module-with-node-gyp`)
+    t.true(await pathExists(`${tmpDir}/node_modules/module-with-node-gyp/native.node`))
+    t.true(await pathExists(`${tmpDir}/node_modules/module-with-node-gyp/side-file.js`))
+    t.true(normalizedRequires.has('module-with-node-gyp'))
+
+    const moduleWithPrebuildPath = resolve(FIXTURES_DIR, `${fixtureDir}/node_modules/module-with-prebuild`)
+    t.true(await pathExists(`${tmpDir}/node_modules/module-with-prebuild/native.node`))
+    t.true(await pathExists(`${tmpDir}/node_modules/module-with-prebuild/side-file.js`))
+    t.true(normalizedRequires.has('module-with-prebuild'))
 
     // We can only detect native modules when using esbuild.
     if (bundler !== DEFAULT) {
-      t.deepEqual(files[0].nativeNodeModules, { test: { [modulePath]: '1.0.0' } })
+      t.deepEqual(files[0].nativeNodeModules, {
+        'module-with-node-file': { [moduleWithNodeFile]: '3.0.0' },
+        'module-with-node-gyp': { [moduleWithNodeGypPath]: '1.0.0' },
+        'module-with-prebuild': { [moduleWithPrebuildPath]: '2.0.0' },
+      })
     }
   },
 )