@exodus/test 1.0.0-rc.26 → 1.0.0-rc.27

package/bin/index.js

@@ -37,10 +37,6 @@ function parseOptions() {
     debug: { files: false },
     ideaCompat: false,
     engine: process.env.EXODUS_TEST_ENGINE ?? 'node:test',
-    // Engine options
-    binary: 'node',
-    pure: false,
-    hasImportLoader: false,
   }
 
   const args = [...process.argv]
@@ -233,8 +229,11 @@ if (options.esbuild) {
   assert(resolveImport)
   if (options.hasImportLoader) {
     args.push('--import', resolveImport('tsx'))
+  } else if (options.engine === process.env.EXODUS_TEST_ENGINE) {
+    console.warn(`Warning: ${options.engine} engine does not support --esbuild option`)
   } else {
-    args.push('-r', resolveImport('tsx/cjs'))
+    console.error(`Error: ${options.engine} engine does not support --esbuild option`)
+    process.exit(1)
   }
 }
 
@@ -350,9 +349,9 @@ if (options.pure) {
     console.log(`All ${files.length} test suites passed`)
   }
 } else {
-  assert(['node', c8].includes(options.binary), 'Native test engine is only supported with Node.js')
-  assert.equal(options.engine, 'node:test')
-  process.env.EXODUS_TEST_CONTEXT = 'node:test'
+  assert(['node', c8].includes(options.binary), `Unexpected native engine: ${options.binary}`)
+  assert(['node:test'].includes(options.engine))
+  process.env.EXODUS_TEST_CONTEXT = options.engine
   const node = spawn(options.binary, [...args, ...files], { stdio: 'inherit' })
   const [code] = await once(node, 'close')
   process.exitCode = code

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/test",
-  "version": "1.0.0-rc.26",
+  "version": "1.0.0-rc.27",
   "author": "Exodus Movement, Inc.",
   "description": "A test suite runner",
   "homepage": "https://github.com/ExodusMovement/test",
@@ -59,7 +59,7 @@
   "scripts": {
     "test": "npm run test:jest",
     "test:all": "npm run test:jest && npm run test:tape && npm run test:native",
-    "test:native": "EXODUS_TEST_IGNORE='{**/typescript/**,**/jest-repo/**/user.test.js}' ./bin/index.js --jest '__test__/**/*.test.js'",
+    "test:native": "EXODUS_TEST_IGNORE='{**/typescript/**,**/jest-repo/**/user.test.js}' ./bin/index.js --jest '__test__/**/*.test.{js,cjs,mjs}'",
     "test:jest": "./bin/index.js --jest --esbuild",
     "test:tape": "./bin/index.js --esbuild '__test__/tape/test/*.js' __test__/tape.test.js",
     "test:pure": "EXODUS_TEST_ENGINE=node:pure npm run test",

package/src/dark.cjs

@@ -108,7 +108,7 @@ function getTestNamePath(t) {
 const execArgv = process.env.EXODUS_TEST_EXECARGV
   ? JSON.parse(process.env.EXODUS_TEST_EXECARGV)
   : process.execArgv
-const insideEsbuild = execArgv.some((x) => x.includes('node_modules/tsx/dist/'))
+const insideEsbuild = execArgv.some((x) => x.endsWith('node_modules/tsx/dist/loader.mjs'))
 
 function makeEsbuildMockable() {
   if (!insideEsbuild) return

package/src/engine.pure.cjs

@@ -3,7 +3,12 @@ const assertLoose = require('node:assert')
 const { existsSync, readFileSync } = require('node:fs')
 const { normalize, basename, dirname, join: pathJoin } = require('node:path')
 const { format: utilFormat } = require('node:util')
-const { createRequire, builtinModules, syncBuiltinESMExports } = require('node:module')
+const {
+  createRequire,
+  builtinModules,
+  syncBuiltinESMExports,
+  syncBuiltinExports, // bun has it under a different name (also a no-op and always synced atm)
+} = require('node:module')
 
 const { setTimeout, setInterval, setImmediate, Date } = globalThis
 const { clearTimeout, clearInterval, clearImmediate } = globalThis
@@ -329,7 +334,7 @@ module.exports = {
   engine: 'pure',
   ...{ assert, assertLoose },
   ...{ mock, describe, test, beforeEach, afterEach, before, after },
-  ...{ builtinModules, syncBuiltinESMExports },
+  ...{ builtinModules, syncBuiltinESMExports: syncBuiltinESMExports || syncBuiltinExports },
   ...{ utilFormat, isPromise, nodeVersion },
   ...{ baseFile, relativeRequire, isTopLevelESM },
   ...{ readSnapshot, setSnapshotSerializers, setSnapshotResolver },

package/src/jest.js

@@ -178,7 +178,7 @@ export const jest = {
       engine: String(node.engine),
       timers: Boolean(mock.timers && haveValidTimers),
       esmMocks: Boolean(mock.module), // full support for ESM mocks
-      esmClone: Boolean(insideEsbuild), // support for ESM mocks creation without a mocker function
+      esmInterop: Boolean(insideEsbuild), // loading/using ESM as CJS, ESM mocks creation without a mocker function
       esmNamedBuiltinMocks: Boolean(mock.module || insideEsbuild), // support for named ESM imports from builtin module mocks
       concurrency: node.engine !== 'pure', // pure engine doesn't support concurrency
     },

package/src/jest.mock.js

@@ -132,7 +132,9 @@ function mockCloneItem(obj, cache) {
     // Special path, as .default might be a getter and we want to unwrap it
     if (obj.__esModule === true) {
       const { __esModule, default: def, ...rest } = obj
-      return { __esModule, ...mockClone({ default: def, ...rest }, cache) }
+      const proto = Object.getPrototypeOf(obj)
+      const toClone = proto?.[Symbol.toStringTag] === 'Module' ? proto : { default: def, ...rest } // unwrap bun modules for proper cloning
+      return { __esModule, ...mockClone(toClone, cache) }
     }
 
     const prototype = Object.getPrototypeOf(obj)