feat: wrap workerd loader to match others

Author: ChALkeR

bin/index.js

@@ -718,12 +718,13 @@ if (options.pure) {
 export default {
   async test(ctrl, env, ctx) {
     await import('./' + ${JSON.stringify(jsRelativePath)})
-    let exitCode = EXODUS_TEST_PROCESS.exitCode // can fail early
-    if (exitCode === 0) {
-      if (typeof globalThis.EXODUS_TEST_RUN !== 'function') throw new Error('node:test not loaded')
-      exitCode = await globalThis.EXODUS_TEST_RUN()
+    await globalThis.EXODUS_TEST_LOAD()
+    if (globalThis.EXODUS_TEST_PROMISE) {
+      const exitCode = await globalThis.EXODUS_TEST_PROMISE
+      if (exitCode !== 0) throw new Error(\`Tests failed with exit code \${exitCode}\`)
+    } else {
+      console.log('WARNING: node:test not loaded, asynchronous tests might be missed')
     }
-    if (exitCode !== 0) throw new Error(\`Tests failed with exit code \${exitCode}\`)
   }
 }`
       await writeFile(bundled.fileWrapper, wrapperContent)

bundler/bundle.js

@@ -292,9 +292,11 @@ export const build = async (...files) => {
   const buildWrap = async (opts) => esbuild.build(opts).catch((err) => err)
   let main = input.join(';\n')
   const exit = `EXODUS_TEST_PROCESS.exitCode = 1; EXODUS_TEST_PROCESS._maybeProcessExitCode();`
-  if (process.env.EXODUS_TEST_IS_BAREBONE) {
+  if (process.env.EXODUS_TEST_PLATFORM === 'workerd') {
+    main = `globalThis.EXODUS_TEST_LOAD = async () => {\n${main}\n}`
+  } else if (process.env.EXODUS_TEST_IS_BAREBONE) {
     main = `try {\n${main}\n} catch (err) { print(err); ${exit} }`
-  } else if (process.env.EXODUS_TEST_IS_BROWSER || process.env.EXODUS_TEST_PLATFORM === 'workerd') {
+  } else if (process.env.EXODUS_TEST_IS_BROWSER) {
     main = `try {\n${main}\n} catch (err) { console.error(err); ${exit} }`
   }
 

src/engine.pure.cjs

@@ -15,7 +15,7 @@ let willstart
 
 const abstractProcess = globalThis.process || globalThis.EXODUS_TEST_PROCESS
 
-if (process.env.EXODUS_TEST_IS_BROWSER) {
+if (process.env.EXODUS_TEST_IS_BROWSER || process.env.EXODUS_TEST_PLATFORM === 'workerd') {
   globalThis.EXODUS_TEST_PROMISE = new Promise((resolve) => (abstractProcess._exitHook = resolve))
   if (!abstractProcess._maybeProcessExitCode && abstractProcess === globalThis.process) {
     // Electron with Node.js integration has real process
@@ -104,7 +104,7 @@ function enterContext(name, options) {
 function exitContext() {
   check(context !== context.root)
   context = context.parent
-  if (context === context.root && run !== globalThis.EXODUS_TEST_RUN) willstart = setTimeout(run, 0)
+  if (context === context.root) willstart = setTimeout(run, 0)
 }
 
 async function runFunction(fn, context) {
@@ -185,8 +185,6 @@ async function runContext(context) {
 async function run() {
   check(!running)
   running = true
-  const manual = globalThis.EXODUS_TEST_RUN === run
-  const res = manual ? new Promise((resolve) => (abstractProcess._exitHook = resolve)) : undefined
   check(context === context.root)
   await runContext(context).catch((error) => {
     // Should not throw under regular circumstances
@@ -195,12 +193,8 @@ async function run() {
   })
   // Let unhandled errors be processed (and set the error code)
   setTimeout(() => abstractProcess._maybeProcessExitCode?.(), 0)
-  return res
 }
 
-// For workerd, expose run as a global so the wrapper can call it
-if (process.env.EXODUS_TEST_PLATFORM === 'workerd') globalThis.EXODUS_TEST_RUN = run
-
 async function describe(...args) {
   const { name, options, fn } = parseArgs(args)
   enterContext(name, options)