feat: use esbuild by default for es modules, if detected

package.json

@@ -63,6 +63,7 @@
     "del": "^6.0.0",
     "elf-cam": "^0.1.1",
     "end-of-stream": "^1.4.4",
+    "es-module-lexer": "^0.7.1",
     "execa": "^5.0.0",
     "filter-obj": "^2.0.1",
     "find-up": "^5.0.0",

src/runtimes/node/detect_es_module.js

@@ -0,0 +1,23 @@
+const { readFile } = require('fs')
+const { promisify } = require('util')
+
+const pReadFile = promisify(readFile)
+
+const { init, parse } = require('es-module-lexer')
+
+const detectEsModule = async ({ mainFile }) => {
+  if (!mainFile) {
+    return false
+  }
+
+  await init
+
+  // Would love to just use await fs.promises.readFile, but it's not available in our version of Node.
+  const mainFileContents = await pReadFile(mainFile, { encoding: 'utf8' })
+
+  const [imports, exports] = parse(mainFileContents)
+
+  return imports.length !== 0 || exports.length !== 0
+}
+
+module.exports = { detectEsModule }

src/runtimes/node/index.js

@@ -4,20 +4,32 @@ const cpFile = require('cp-file')
 
 const { JS_BUNDLER_ESBUILD, JS_BUNDLER_ESBUILD_ZISI, JS_BUNDLER_ZISI, RUNTIME_JS } = require('../../utils/consts')
 
+const { detectEsModule } = require('./detect_es_module')
 const { findFunctionsInPaths } = require('./finder')
 const { getSrcFiles } = require('./src_files')
 const { zipEsbuild } = require('./zip_esbuild')
 const { zipZisi } = require('./zip_zisi')
 
 // We use ZISI as the default bundler, except for certain extensions, for which
 // esbuild is the only option.
-const getDefaultBundler = ({ extension }) =>
-  ['.mjs', '.ts'].includes(extension) ? JS_BUNDLER_ESBUILD : JS_BUNDLER_ZISI
+const getDefaultBundler = async ({ extension, mainFile }) => {
+  if (['.mjs', '.ts'].includes(extension)) {
+    return JS_BUNDLER_ESBUILD
+  }
+
+  const isEsModule = await detectEsModule({ mainFile })
+
+  if (isEsModule) {
+    return JS_BUNDLER_ESBUILD
+  }
+
+  return JS_BUNDLER_ZISI
+}
 
 // A proxy for the `getSrcFiles` function which adds a default `bundler` using
 // the `getDefaultBundler` function.
-const getSrcFilesWithBundler = (parameters) => {
-  const bundler = parameters.config.nodeBundler || getDefaultBundler({ extension: parameters.extension })
+const getSrcFilesWithBundler = async (parameters) => {
+  const bundler = parameters.config.nodeBundler || (await getDefaultBundler({ extension: parameters.extension }))
 
   return getSrcFiles({ ...parameters, bundler })
 }
@@ -36,7 +48,8 @@ const zipFunction = async function ({
   srcPath,
   stat,
 }) {
-  const bundler = config.nodeBundler || getDefaultBundler({ extension })
+  // how do you construct the srcFile?
+  const bundler = config.nodeBundler || (await getDefaultBundler({ extension, mainFile }))
 
   // If the file is a zip, we assume the function is bundled and ready to go.
   // We simply copy it to the destination path with no further processing.

tests/fixtures/local-require-esm/function_export_only/function_export_only.js

@@ -0,0 +1,2 @@
+// eslint-disable-next-line node/no-unsupported-features/es-syntax
+export const howdy = 'Yee haw!'

tests/fixtures/local-require-esm/function_import_only/function_import_only.js

@@ -0,0 +1,4 @@
+// eslint-disable-next-line node/no-unsupported-features/es-syntax
+import getZero from '../function/file'
+
+getZero()

tests/main.js

@@ -272,16 +272,14 @@ testBundlers('Can use dynamic import() with esbuild', [ESBUILD, ESBUILD_ZISI], a
   await zipNode(t, 'dynamic-import', { opts: { config: { '*': { nodeBundler: bundler } } } })
 })
 
-testBundlers('Bundling does not crash with dynamic import() with zisi', [DEFAULT], async (bundler, t) => {
-  await t.throwsAsync(zipNode(t, 'dynamic-import', { opts: { config: { '*': { nodeBundler: bundler } } } }), {
-    message: /export/,
-  })
-})
-
 testBundlers('Can require local files', [ESBUILD, ESBUILD_ZISI, DEFAULT], async (bundler, t) => {
   await zipNode(t, 'local-require', { opts: { config: { '*': { nodeBundler: bundler } } } })
 })
 
+testBundlers('Can require local esm files', [ESBUILD, ESBUILD_ZISI, DEFAULT], async (bundler, t) => {
+  await zipNode(t, 'local-require-esm', { length: 3, opts: { config: { '*': { nodeBundler: bundler } } } })
+})
+
 testBundlers('Can require local files deeply', [ESBUILD, ESBUILD_ZISI, DEFAULT], async (bundler, t) => {
   await zipNode(t, 'local-deep-require', { opts: { config: { '*': { nodeBundler: bundler } } } })
 })