@exodus/test 1.0.0-rc.108 → 1.0.0-rc.109

package/README.md

@@ -12,7 +12,7 @@ It can run your existing tests on [all runtimes and also browsers](#engines), wi
   and typestrip (via `--typescript`) modes
 - Runs on Node.js [node:test](https://nodejs.org/api/test.html), Bun, Deno, Electron,
   [v8 CLI](https://v8.dev/docs/d8), JSC, [Hermes](https://hermesengine.dev), [SpiderMonkey](https://spidermonkey.dev/),
-  Chrome, Firefox, WebKit, Brave, Microsoft Edge,
+  Chrome, Firefox, WebKit, Brave, Microsoft Edge, [Servo](https://servo.org/),
   [QuickJS](https://github.com/quickjs-ng/quickjs), [XS](https://github.com/Moddable-OpenSource/moddable-xst),
   [GraalJS](https://github.com/oracle/graaljs), [Escargot](https://github.com/Samsung/escargot),
   [Boa](https://github.com/boa-dev/boa), and even [engine262](https://github.com/engine262/engine262).
@@ -66,6 +66,8 @@ Use `--engine` (or `EXODUS_TEST_ENGINE=`) to specify one of:
     - `firefox:puppeteer` — Firefox
     - `brave:puppeteer` — Brave
     - `msedge:puppeteer` — Microsoft Edge
+  - Bundle
+    - `servo:bundle` — Servo (expects it to be installed in the system or in PATH)
 - Barebone engines (system-provided or installed with `npx jsvu` / `npx esvu`):
   - `v8:bundle` — [v8 CLI](https://v8.dev/docs/d8) (Chrome/Blink/Node.js JavaScript engine)
   - `jsc:bundle` — [JavaScriptCore](https://docs.webkit.org/Deep%20Dive/JSC/JavaScriptCore.html) (Safari/WebKit JavaScript engine)
@@ -128,7 +130,7 @@ Use `--engine` (or `EXODUS_TEST_ENGINE=`) to specify one of:
  </pre>
 </details>
 
-See live output in [CI](https://github.com/ExodusMovement/test/actions/workflows/checks.yaml)
+See live output in [CI](https://github.com/ExodusOSS/test/actions/workflows/checks.yaml)
 
 ## Library
 

package/bin/find-binary.js

@@ -91,6 +91,10 @@ function findBinaryOnce(name) {
     case 'safari':
       addPaths('darwin', '/Applications/Safari.app/Contents/MacOS/Safari')
       break
+    case 'servo':
+      addPaths('darwin', '/Applications/Servo.app/Contents/MacOS/servo')
+      addPaths('linux', '/usr/bin/servo')
+      break
     default:
       throw new Error('Trying to find an unexpected executable name')
   }

package/bin/index.js

@@ -7,7 +7,7 @@ import { fileURLToPath } from 'node:url'
 import { basename, join } from 'node:path'
 import { randomUUID } from 'node:crypto'
 import { existsSync, rmSync, realpathSync } from 'node:fs'
-import { unlink } from 'node:fs/promises'
+import { writeFile, unlink } from 'node:fs/promises'
 import { tmpdir, availableParallelism, homedir } from 'node:os'
 import assert from 'node:assert/strict'
 // The following make sense only when we run the code in the same Node.js version, i.e. engineOptions.haveIsOk
@@ -52,6 +52,8 @@ const ENGINES = new Map(
     'escargot:bundle': { binary: 'escargot', ...bareboneOpts },
     'boa:bundle': { binary: 'boa', binaryArgs: ['-m'], ...bareboneOpts },
     'jerryscript:bundle': { binary: 'jerryscript', ...bareboneOpts },
+    // Special case: running a browser from CLI like a bundle
+    'servo:bundle': { binary: 'servo', binaryArgs: ['--headless'], ...bundleOpts, html: true },
     // Browser engines
     'chrome:puppeteer': { binary: 'chrome', browsers: 'puppeteer', ...bundleOpts },
     'firefox:puppeteer': { binary: 'firefox', browsers: 'puppeteer', ...bundleOpts },
@@ -65,7 +67,7 @@ const ENGINES = new Map(
   })
 )
 const barebonesOk = ['v8', 'd8', 'spidermonkey', 'quickjs', 'xs', 'hermes', 'shermes']
-const barebonesUnhandled = ['jsc', 'escargot', 'boa', 'graaljs', 'jerry', 'engine262']
+const barebonesUnhandled = ['jsc', 'escargot', 'boa', 'graaljs', 'jerry', 'engine262', 'servo']
 
 const getEnvFlag = (name) => {
   if (!Object.hasOwn(process.env, name)) return
@@ -282,7 +284,7 @@ const engineOptions = ENGINES.get(options.engine)
 assert(engineOptions, `Unknown engine: ${options.engine}`)
 Object.assign(options, engineOptions)
 options.platform = options.binary // binary can be overriden by c8 or electron
-const isBrowserLike = options.browsers || options.electron
+const isBrowserLike = options.browsers || options.electron || options.html
 setEnv('EXODUS_TEST_ENGINE', options.engine) // e.g. 'hermes:bundle', 'node:bundle', 'node:test', 'node:pure'
 setEnv('EXODUS_TEST_PLATFORM', options.binary === 'shermes' ? 'hermes' : options.binary) // e.g. 'hermes', 'node'
 setEnv('EXODUS_TEST_TIMEOUT', options.testTimeout)
@@ -595,7 +597,7 @@ if (options.binary === 'electron') {
   }
 }
 
-if (options.barebone || ['electron', 'workerd'].includes(options.binary)) {
+if (options.barebone || ['electron', 'workerd', 'servo'].includes(options.binary)) {
   options.binary = findBinary(options.binary)
   options.binaryCanBeAbsolute = true
 }
@@ -689,9 +691,14 @@ if (options.pure) {
   const runOne = async (inputFile) => {
     const bundled = buildFile ? await buildFile(inputFile) : undefined
     if (buildFile) assert(bundled.file)
-    const file = buildFile ? bundled.file : inputFile
     if (bundled?.errors.length > 0) return { ok: false, output: bundled.errors }
+    if (bundled && options.html) {
+      bundled.fileHtml = `${bundled.file}.html`
+      assert(/^[a-z0-9/_.-]+\.js$/iu.test(bundled.file), bundled.file)
+      await writeFile(bundled.fileHtml, `<script src="${bundled.file}"></script>`)
+    }
 
+    const file = buildFile ? bundled.fileHtml ?? bundled.file : inputFile
     const failedBare = 'EXODUS_TEST_FAILED_EXIT_CODE_1'
     const cleanOut = (out) => out.replaceAll(`\n${failedBare}\n`, '\n').replaceAll(failedBare, '')
     // Timeout is fallback if timeout in script hangs, 50x as it can be adjusted per-script inside them
@@ -721,6 +728,7 @@ if (options.pure) {
       throw err // Internal test runner error, e.g. launch() failed
     } finally {
       if (bundled) await unlink(bundled.file)
+      if (bundled?.fileHtml) await unlink(bundled.fileHtml)
     }
   }
 

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@exodus/test",
-  "version": "1.0.0-rc.108",
+  "version": "1.0.0-rc.109",
   "author": "Exodus Movement, Inc.",
   "description": "A test suite runner",
-  "homepage": "https://github.com/ExodusMovement/test",
+  "homepage": "https://github.com/ExodusOSS/test",
   "repository": {
     "type": "git",
-    "url": "https://github.com/ExodusMovement/test.git"
+    "url": "https://github.com/ExodusOSS/test.git"
   },
   "bugs": {
-    "url": "https://github.com/ExodusMovement/tests/issues"
+    "url": "https://github.com/ExodusOSS/tests/issues"
   },
   "keywords": [
     "test",
@@ -124,6 +124,7 @@
     "test:hermes": "EXODUS_TEST_ENGINE=hermes:bundle npm run test:_bundle --",
     "test:shermes": "EXODUS_TEST_ENGINE=shermes:bundle npm run test:_bundle --",
     "test:spidermonkey": "EXODUS_TEST_ENGINE=spidermonkey:bundle npm run test:_bundle --",
+    "test:servo": "EXODUS_TEST_ENGINE=servo:bundle npm run test:_bundle --",
     "test:engine262": "EXODUS_TEST_ENGINE=engine262:bundle npm run test:_bundle --",
     "test:quickjs": "EXODUS_TEST_ENGINE=quickjs:bundle npm run test:_bundle --",
     "test:xs": "EXODUS_TEST_ENGINE=xs:bundle npm run test:_bundle --",
@@ -144,7 +145,7 @@
   "optionalDependencies": {
     "@chalker/queue": "^1.0.1",
     "@exodus/replay": "^1.0.0-rc.9",
-    "@exodus/test-bundler": "1.0.0-rc.9",
+    "@exodus/test-bundler": "1.0.0-rc.10",
     "c8": "^9.1.0",
     "expect": "^30.2.0",
     "fast-glob": "^3.2.11",

package/src/benchmark.js

@@ -37,6 +37,7 @@ export async function benchmark(name, options, fn) {
   let min, max
   let total = 0n
   let count = 0
+  const endAt = getTime() + BigInt(timeout) * 10n ** 6n
   while (true) {
     const arg = args ? args[count % args.length] : count
     count++
@@ -48,11 +49,11 @@ export async function benchmark(name, options, fn) {
     total += diff
     if (min === undefined || min > diff) min = diff
     if (max === undefined || max < diff) max = diff
-    if (total >= BigInt(timeout) * 10n ** 6n) break
+    if (stop >= endAt) break
   }
 
   const mean = total / BigInt(count)
-  const rps = 1e9 / Number(mean)
+  const rps = (1e9 * count) / Number(total) // Loss in precision to doubles on very fast ops, but this is better than mean rounding
   let res = `${name} x ${fRps(rps)} ops/sec @ ${fTime(mean)}/op`
   if (fTime(min) !== fTime(max)) res += ` (${fTime(min)}..${fTime(max)})`
   console.log(res)

package/src/engine.pure.snapshot.cjs

@@ -1,7 +1,7 @@
 const nameCounts = new Map()
 let snapshotText, snapshotTextClean
 
-const escapeSnapshot = (str) => str.replaceAll(/([\\`])/gu, '\\$1')
+const escapeSnapshot = (str) => str.replaceAll(/([\\`]|\$\{)/gu, '\\$1')
 
 function matchSnapshot(readSnapshot, assert, name, serialized) {
   // We don't have native snapshots, polyfill reading