@exodus/test 1.0.0-rc.112 → 1.0.0-rc.114

package/README.md

@@ -28,7 +28,7 @@ It can run your existing tests on [all runtimes and also browsers](#engines), wi
 [![JavaScriptCore](https://img.shields.io/badge/JavaScriptCore-006CFF?style=flat-square)](https://docs.webkit.org/Deep%20Dive/JSC/JavaScriptCore.html)
 [![SpiderMonkey](https://img.shields.io/badge/SpiderMonkey-FFD681?style=flat-square)](https://spidermonkey.dev/)
 [![QuickJS](https://img.shields.io/badge/QuickJS-E58200?style=flat-square)](https://github.com/quickjs-ng/quickjs)
-[![XS](https://img.shields.io/badge/XS-0B307A?style=flat-square)](https://github.com/Moddable-OpenSource/moddable-xst)
+[![XS](https://img.shields.io/badge/XS-0B307A?style=flat-square)](https://github.com/Moddable-OpenSource/moddable)
 [![GraalJS](https://img.shields.io/badge/GraalJS-C74634?style=flat-square)](https://github.com/oracle/graaljs)
 [![Boa](https://img.shields.io/badge/Boa-F3FF00?style=flat-square)](https://github.com/boa-dev/boa)
 [![Escargot](https://img.shields.io/badge/Escargot-1428A0?style=flat-square)](https://github.com/Samsung/escargot)
@@ -174,7 +174,7 @@ Use `--engine` (or `EXODUS_TEST_ENGINE=`) to specify one of:
   - `hermes:bundle` — [Hermes](https://hermesengine.dev) (React Native JavaScript engine)
   - `spidermonkey:bundle` — [SpiderMonkey](https://spidermonkey.dev/) (Firefox/Gecko JavaScript engine)
   - `quickjs:bundle` — [QuickJS](https://github.com/quickjs-ng/quickjs)
-  - `xs:bundle` — [XS](https://github.com/Moddable-OpenSource/moddable-xst)
+  - `xs:bundle` — [Moddable XS](https://github.com/Moddable-OpenSource/moddable)
   - `graaljs:bundle` — [GraalJS](https://github.com/oracle/graaljs)
   - `escargot:bundle` — [Escargot](https://github.com/Samsung/escargot)
   - `boa:bundle` — [Boa](https://github.com/boa-dev/boa)

package/bin/find-binary.js

@@ -69,6 +69,8 @@ function findBinaryOnce(name) {
       return require('electron')
     case 'workerd':
       return require.resolve('workerd/bin/workerd')
+    case 'porffor':
+      return require.resolve('porffor/porf')
     case 'jerryscript':
       name = 'jerry' // look under this name, including in global
       return findFile([jsvu, esvu])

package/bin/index.js

@@ -55,6 +55,7 @@ const ENGINES = new Map(
     'boa:bundle': { binary: 'boa', binaryArgs: ['-m'], ...bareboneOpts },
     'nova:bundle': { binary: 'nova', binaryArgs: ['eval'], ...bareboneOpts },
     'jerryscript:bundle': { binary: 'jerryscript', ...bareboneOpts },
+    'porffor:bundle': { binary: 'porffor', ...bareboneOpts }, // blocked on https://github.com/CanadaHonk/porffor/issues/176
     // Special case: running a browser from CLI like a bundle
     'servo:bundle': { binary: 'servo', binaryArgs: ['--headless'], ...bundleOpts, html: true },
     'workerd:bundle': { binary: 'workerd', binaryArgs: ['test'], ...bundleOpts, workerd: true },
@@ -71,8 +72,8 @@ const ENGINES = new Map(
   })
 )
 const bareOk = ['v8', 'd8', 'spidermonkey', 'quickjs', 'xs', 'hermes', 'shermes']
-const bareNotrack = ['jsc', 'escargot', 'boa', 'graaljs', 'jerry', 'engine262', 'servo', 'workerd']
-const bareIncomplete = ['ladybird-js', 'nova', 'duk']
+const bareNotrack = ['jsc', 'escargot', 'boa', 'graaljs', 'jerryscript', 'engine262', 'servo']
+const bareIncomplete = ['ladybird-js', 'nova', 'duktape']
 
 const getEnvFlag = (name) => {
   if (!Object.hasOwn(process.env, name)) return
@@ -662,7 +663,7 @@ async function launch(binary, args, opts = {}, buffering = false) {
   }
 
   const barebones = [...bareOk, ...bareNotrack, ...bareIncomplete]
-  assertBinary(binary, ['node', 'bun', 'deno', 'electron', 'workerd', ...barebones])
+  assertBinary(binary, ['node', 'bun', 'deno', 'electron', 'workerd', 'jerry', 'duk', ...barebones])
   if (binary === c8 && process.platform === 'win32') {
     ;[binary, args] = ['node', [binary, ...args]]
   }
@@ -693,7 +694,7 @@ if (options.pure) {
 
   setEnv('EXODUS_TEST_CONTEXT', 'pure')
   const missUnhandled = bareNotrack.includes(options.platform) || isBrowserLike
-  const isIncomplete = bareIncomplete.includes(options.platform)
+  const isIncomplete = bareIncomplete.includes(options.platform) || options.platform === 'workerd'
   if (missUnhandled) warnHuman(`Warning: ${engineName} does not have unhandled rejections tracking`)
   if (isIncomplete) warnHuman(`Warning: ${engineName} support is incomplete`)
 
@@ -711,18 +712,20 @@ if (options.pure) {
       bundled.fileWrapper = `${bundled.file}.wrapper.js`
       bundled.fileConfig = `${bundled.file}.capnp`
       assert(/^[a-z0-9/_.-]+\.js$/iu.test(bundled.file), bundled.file)
+      const { compatibilityDate } = await import('workerd')
       const jsRelativePath = basename(bundled.file)
       const wrapperRelativePath = basename(bundled.fileWrapper)
       const wrapperContent = `
 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)
@@ -734,7 +737,7 @@ const mainWorker :Workerd.Worker = (
     (name = ${JSON.stringify(wrapperRelativePath)}, esModule = embed ${JSON.stringify(wrapperRelativePath)}),
     (name = ${JSON.stringify(jsRelativePath)}, esModule = embed ${JSON.stringify(jsRelativePath)}),
   ],
-  compatibilityDate = "2024-01-01",
+  compatibilityDate = ${JSON.stringify(compatibilityDate)},
 );`
       await writeFile(bundled.fileConfig, configContent)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/test",
-  "version": "1.0.0-rc.112",
+  "version": "1.0.0-rc.114",
   "author": "Exodus Movement, Inc.",
   "description": "A test suite runner",
   "homepage": "https://github.com/ExodusOSS/test",
@@ -181,8 +181,8 @@
   },
   "optionalDependencies": {
     "@chalker/queue": "^1.0.1",
-    "@exodus/replay": "^1.0.0-rc.10",
-    "@exodus/test-bundler": "1.0.0-rc.13",
+    "@exodus/replay": "^1.0.0-rc.11",
+    "@exodus/test-bundler": "1.0.0-rc.15",
     "c8": "^9.1.0",
     "expect": "^30.2.0",
     "fast-glob": "^3.2.11",
@@ -210,7 +210,7 @@
     "jsvu": "^3.0.3",
     "prettier": "^3.0.3",
     "typedoc": "^0.28.16",
-    "workerd": "^1.20260205.0"
+    "workerd": "^1.20260207.0"
   },
   "peerDependencies": {
     "@babel/register": "^7.0.0",

package/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
@@ -30,7 +30,7 @@ const check = (condition, message) => {
 
 function parseArgs(args) {
   check(args.length <= 3)
-  const name = typeof args[0] === 'string' ? args.shift() : 'test'
+  const name = typeof args[0] === 'string' ? args.shift() : undefined
   const fn = args.pop()
   const options = args.pop() || {}
   return { name, options, fn }
@@ -46,6 +46,7 @@ class Context {
   #hooks
 
   constructor(parent, name, options = {}) {
+    if (!name || typeof name !== 'string') name = '<anonymous>'
     Object.assign(this, { root: parent?.root, parent, name, options })
     this.#fullName = parent && parent !== parent.root ? `${parent.fullName} > ${name}` : name
     if (this.#fullName === name) this.#fullName = this.#fullName.replace(INBAND_PREFIX_REGEX, '')
@@ -104,7 +105,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 +186,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 +194,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)
@@ -491,7 +486,7 @@ function getMacrotick() {
   const { scheduler, MessageChannel } = globalThis
   if (scheduler?.yield) return () => scheduler.yield()
   if (setImmediate) return () => new Promise((resolve) => setImmediate(resolve))
-  if (MessageChannel) {
+  if (MessageChannel && !globalThis.Cloudflare) {
     return async () => {
       const { port1, port2 } = new MessageChannel()
       await new Promise((resolve) => {
@@ -569,7 +564,7 @@ if (process.env.EXODUS_TEST_ENVIRONMENT === 'bundle') {
 
 // eslint-disable-next-line no-undef
 let snapshotResolver = (dir, name) => [dir, `${name}.snapshot`] // default per Node.js docs
-let snapshotSerializers = [(obj) => JSON.stringify(obj, null, 2)]
+let snapshotSerializers = [(obj) => (obj === undefined ? `${obj}` : JSON.stringify(obj, null, 2))]
 const serializeSnapshot = (obj) => {
   let val = obj
   for (const fn of snapshotSerializers) val = fn(val)

package/src/engine.pure.snapshot.cjs

@@ -2,6 +2,7 @@ const nameCounts = new Map()
 let snapshotText, snapshotTextClean
 
 const escapeSnapshot = (str) => str.replaceAll(/([\\`]|\$\{)/gu, '\\$1')
+const escapeSnapshotKey = (s) => escapeSnapshot(s).replaceAll('\n', '\\n').replaceAll('"', '\\"')
 
 function matchSnapshot(readSnapshot, assert, name, serialized) {
   // We don't have native snapshots, polyfill reading
@@ -25,12 +26,16 @@ function matchSnapshot(readSnapshot, assert, name, serialized) {
   nameCounts.set(name, count)
   const escaped = escapeSnapshot(serialized)
   const key = `${name} ${count}`
-  const makeEntry = (x) => `\nexports[\`${escapeSnapshot(key)}\`] = \`${x}\`;\n`
-  const fixedText = escaped.includes('\r') ? snapshotText : snapshotTextClean // well, if we expect \r let's preserve them
-  const final = escaped.includes('\n') ? `\n${escaped}\n` : escaped
-  if (fixedText.includes(makeEntry(final))) return
-  // Perhaps wrapped with newlines from Node.js snapshots?
-  if (!final.includes('\n') && fixedText.includes(makeEntry(`\n${final}\n`))) return
+  // Node.js and jest escape keys differently, both result to same strings, accept both
+  for (const keyfun of [escapeSnapshot, escapeSnapshotKey]) {
+    const makeEntry = (x) => `\nexports[\`${keyfun(key)}\`] = \`${x}\`;\n`
+    const fixedText = escaped.includes('\r') ? snapshotText : snapshotTextClean // well, if we expect \r let's preserve them
+    const final = escaped.includes('\n') ? `\n${escaped}\n` : escaped
+    if (fixedText.includes(makeEntry(final))) return
+    // Perhaps wrapped with newlines from Node.js snapshots?
+    if (!final.includes('\n') && fixedText.includes(makeEntry(`\n${final}\n`))) return
+  }
+
   return assert.fail(`Could not match "${key}" in snapshot. ${addFail}`)
 }