polendina 1.0.0 → 2.0.0-alpha

package/resources/bare-run.js

@@ -1,10 +1,10 @@
 // in-browser test runner for bare-sync and bare-async, at end of bundle
 
-const { registry, executionQueue, log, setup } = require('./common-run')
-const BareRunner = require('./bare')
+import { registry, executionQueue, log, setup } from './common-run.js'
+import { BareRunner } from './bare.js'
 
 setup().then(async () => {
   const runner = new BareRunner(log, registry.tests)
   const errors = await runner[registry.argv.runner === 'bare-sync' ? 'runBareSync' : 'runBareAsync']()
-  executionQueue(() => global.polendinaEnd(errors ? 1 : 0))
+  executionQueue(() => globalThis.polendinaEnd(errors ? 1 : 0))
 })

package/resources/bare.js

@@ -1,4 +1,4 @@
-class BareRunner {
+export class BareRunner {
   constructor (log, tests) {
     this.log = log
     this.tests = tests
@@ -36,13 +36,17 @@ class BareRunner {
 
   async runBareAsync () {
     return this.runBare(async (mod) => {
-      const exp = mod.load()
+      const exp = await mod.load()
       if (typeof exp === 'function') {
         return this.execBare(mod.name, exp)
       }
+      const expn = Object.keys(exp)
+      if (expn.length === 1 && expn[0] === 'default' && typeof exp.default === 'function') {
+        return this.execBare(mod.name, exp.default)
+      }
       await this.log.info(`  ${mod.name}`)
       let found = false
-      for (const name in exp) {
+      for (const name of expn) {
         const fn = exp[name]
         if (typeof fn === 'function') {
           found = true
@@ -55,5 +59,3 @@ class BareRunner {
     })
   }
 }
-
-module.exports = BareRunner

package/resources/common-run.js

@@ -1,51 +1,53 @@
 /* globals WorkerGlobalScope ServiceWorkerGlobalScope clients */
 
-const registry = require('./test-registry')
+import { registry } from './test-registry.js'
+
 const inPage =
   typeof window !== 'undefined' &&
   window.location &&
   typeof WorkerGlobalScope === 'undefined'
 const inServiceWorker = !inPage &&
   typeof ServiceWorkerGlobalScope !== 'undefined' &&
-  global instanceof ServiceWorkerGlobalScope
+  globalThis instanceof ServiceWorkerGlobalScope
 const inWorker = !inPage && !inServiceWorker &&
   typeof WorkerGlobalScope !== 'undefined' &&
-  global instanceof WorkerGlobalScope
+  globalThis instanceof WorkerGlobalScope
 let _executionQueue = Promise.resolve()
 
-function executionQueue (fn) {
+export { registry }
+export function executionQueue (fn) {
   _executionQueue = _executionQueue.then(fn)
   return _executionQueue
 }
 
-const log = {
+export const log = {
   info: (...args) => {
-    executionQueue(() => global.polendinaLog(['info'].concat(args)))
+    executionQueue(() => globalThis.polendinaLog(['info'].concat(args)))
     return executionQueue
   },
   // TODO
   warn: (...args) => {
-    executionQueue(() => global.polendinaLog(['warn'].concat(args)))
+    executionQueue(() => globalThis.polendinaLog(['warn'].concat(args)))
     return executionQueue
   },
   // TODO
   error: (...args) => {
-    executionQueue(() => global.polendinaLog(['error'].concat(args)))
+    executionQueue(() => globalThis.polendinaLog(['error'].concat(args)))
     return executionQueue
   }
 }
 
 function setupWorkerGlobals () {
-  global.polendinaLog = async function (...args) {
-    global.postMessage(['polendinaLog'].concat(args))
+  globalThis.polendinaLog = async function (...args) {
+    globalThis.postMessage(['polendinaLog'].concat(args))
   }
 
-  global.polendinaWrite = async function (...args) {
-    global.postMessage(['polendinaWrite'].concat(args))
+  globalThis.polendinaWrite = async function (...args) {
+    globalThis.postMessage(['polendinaWrite'].concat(args))
   }
 
-  global.polendinaEnd = async function (...args) {
-    global.postMessage(['polendinaEnd'].concat(args))
+  globalThis.polendinaEnd = async function (...args) {
+    globalThis.postMessage(['polendinaEnd'].concat(args))
   }
 }
 
@@ -56,15 +58,15 @@ function setupServiceWorkerGlobals () {
     }
   }
 
-  global.polendinaLog = async function (...args) {
+  globalThis.polendinaLog = async function (...args) {
     _postMessage(['polendinaLog'].concat(args))
   }
 
-  global.polendinaWrite = async function (...args) {
+  globalThis.polendinaWrite = async function (...args) {
     _postMessage(['polendinaWrite'].concat(args))
   }
 
-  global.polendinaEnd = async function (...args) {
+  globalThis.polendinaEnd = async function (...args) {
     _postMessage(['polendinaEnd'].concat(args))
   }
 }
@@ -77,7 +79,7 @@ function setupLogging () {
         // process.stdout.write() to console.log()
         // so we strip out the extra \n that necessarily inserts
         // args[0] = args[0].replace(/\n$/, '')
-        executionQueue(() => global.polendinaWrite(args))
+        executionQueue(() => globalThis.polendinaWrite(args))
         return
       }
     } catch (err) {}
@@ -89,13 +91,13 @@ function setupLogging () {
   console.error = log.error
 }
 
-async function setup () {
+export async function setup () {
   if (inWorker) {
     setupWorkerGlobals()
   } else if (inServiceWorker) {
     await new Promise((resolve, reject) => {
-      global.addEventListener('activate', (event) => {
-        event.waitUntil(global.clients.claim())
+      globalThis.addEventListener('activate', (event) => {
+        event.waitUntil(globalThis.clients.claim())
         setupServiceWorkerGlobals()
         resolve()
       })
@@ -104,8 +106,3 @@ async function setup () {
 
   setupLogging()
 }
-
-module.exports.executionQueue = executionQueue
-module.exports.registry = registry
-module.exports.log = log
-module.exports.setup = setup

package/resources/mocha-run.js

@@ -1,31 +1,31 @@
-/* globals mocha Mocha */
-
 // in-browser setup and runner for Mocha, at end of bundle
 
-require('mocha/mocha.js')
-const { registry, executionQueue, log, setup } = require('./common-run')
+import mochaExport from 'mocha/mocha-es2018.js'
+import { registry, executionQueue, log, setup } from './common-run.js'
 
 function runMocha () {
-  mocha.setup({ reporter: registry.argv.mochaReporter, ui: 'bdd' })
+  // mocha@8 exports what we want, mocha@7 sets a global
+  const mochaLocal = mochaExport
+  mochaLocal.setup({ reporter: registry.argv.mochaReporter, ui: 'bdd' })
   // mocha@7 deprecated useColors()
-  if (typeof mocha.color === 'function') {
-    mocha.color(true)
-  } else if (typeof mocha.useColors === 'function') {
-    mocha.useColors(true)
+  if (typeof mochaLocal.color === 'function') {
+    mochaLocal.color(true)
+  } else if (typeof mochaLocal.useColors === 'function') {
+    mochaLocal.useColors(true)
   }
 
   // the well-behaved reporters, like spec, are easy to intercept
-  Mocha.reporters.Base.consoleLog = log.info
+  mochaLocal.constructor.reporters.Base.consoleLog = log.info
 
   for (const mod of registry.tests) {
     mod.load()
   }
 
   let errors = 0
-  mocha
+  mochaLocal
     .run((_errors) => { errors = _errors })
     .on('end', (...args) => {
-      executionQueue(() => global.polendinaEnd(errors))
+      executionQueue(() => globalThis.polendinaEnd(errors))
     })
 }
 

package/resources/tape-run.js

@@ -1,16 +1,16 @@
 // in-browser setup and runner for Tape, at end of bundle
 
-const tape = require('tape')
-const { registry, setup, executionQueue } = require('./common-run')
+import tape from 'tape'
+import { registry, setup, executionQueue } from './common-run.js'
+import { Transform } from 'stream'
 
 function runTape () {
-  const { Transform } = require('stream')
   let failures = 0
 
   const stream = new Transform({
     transform (chunk, encoding, callback) {
       executionQueue(() => {
-        global.polendinaWrite(chunk.toString())
+        globalThis.polendinaWrite(chunk.toString())
           .catch(callback)
           .then(callback)
       })
@@ -18,7 +18,7 @@ function runTape () {
 
     flush (callback) {
       executionQueue(() => {
-        global.polendinaEnd(failures)
+        globalThis.polendinaEnd(failures)
           .catch(callback)
           .then(callback)
       })

package/resources/test-registry.js

@@ -1,3 +1,6 @@
 // see wrap-loader.js
 
-module.exports.tests = []
+export const registry = {
+  argv: null,
+  tests: []
+}

package/test/common.js

@@ -1,13 +1,16 @@
-const path = require('path')
-const assert = require('assert')
-const { execFile } = require('child_process')
+import path from 'path'
+import assert from 'assert'
+import { execFile } from 'child_process'
+import { fileURLToPath } from 'url'
+
+const __dirname = fileURLToPath(path.dirname(import.meta.url))
 const cli = path.join(__dirname, '../polendina-cli.js')
 
-async function runCli (cwd, args) {
+export async function runCli (cwd, args) {
   return runCommand(`${cli} test*.js --cleanup ${args || ''}`, cwd)
 }
 
-async function runCommand (command, cwd) {
+export async function runCommand (command, cwd) {
   return new Promise((resolve, reject) => {
     const args = command.split(' ').filter(Boolean)
     execFile(process.execPath, args, { cwd }, (err, stdout, stderr) => {
@@ -23,6 +26,3 @@ async function runCommand (command, cwd) {
     })
   })
 }
-
-module.exports.runCli = runCli
-module.exports.runCommand = runCommand

package/test/fixtures/bare-async/package.json

@@ -11,5 +11,8 @@
     "type": "git",
     "url": "https://github.com/rvagg/polendina.git"
   },
-  "license": "Apache-2.0"
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "chai": "^4.3.4"
+  }
 }

package/test/fixtures/bare-async/test-1.js

@@ -1,6 +1,6 @@
 /* globals WorkerGlobalScope ServiceWorkerGlobalScope */
 
-const assert = require('assert')
+const { assert } = require('chai')
 
 module.exports = async function () {
   if (typeof ServiceWorkerGlobalScope !== 'undefined' && global instanceof ServiceWorkerGlobalScope) {

package/test/fixtures/bare-async/test-2.js

@@ -1,4 +1,4 @@
-const assert = require('assert')
+const { assert } = require('chai')
 const index = require('./')
 
 module.exports.test1 = async function () {

package/test/fixtures/bare-async-esm/index.js

@@ -0,0 +1,3 @@
+export default function test () {
+  return new Promise((resolve, reject) => setTimeout(() => resolve('bare test fixture'), 500))
+}

package/test/fixtures/bare-async-esm/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "fixture-bare-async",
+  "version": "1.0.0",
+  "description": "test fixture",
+  "main": "index.js",
+  "type": "module",
+  "scripts": {
+    "test": "node test-1.js && node test-2.js"
+  },
+  "author": "Rod <rod@vagg.org> (http://r.va.gg/)",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/rvagg/polendina.git"
+  },
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "chai": "^4.3.4"
+  }
+}

package/test/fixtures/bare-async-esm/test-1.js

@@ -0,0 +1,16 @@
+/* globals WorkerGlobalScope ServiceWorkerGlobalScope */
+
+import { assert } from 'chai'
+
+export default async function () {
+  if (typeof ServiceWorkerGlobalScope !== 'undefined' && global instanceof ServiceWorkerGlobalScope) {
+    console.log('testing is in serviceworker')
+    assert.strictEqual(typeof ServiceWorkerGlobalScope, 'function')
+  } else if (typeof WorkerGlobalScope !== 'undefined' && global instanceof WorkerGlobalScope) {
+    console.log('testing is in worker')
+    assert.strictEqual(typeof WorkerGlobalScope, 'function')
+  } else {
+    console.log('testing is not in worker')
+    assert.strictEqual(typeof WorkerGlobalScope, 'undefined')
+  }
+}

package/test/fixtures/bare-async-esm/test-2.js

@@ -0,0 +1,11 @@
+import { assert } from 'chai'
+import index from './index.js'
+
+export async function test1 () {
+  console.log('testing bare fixture')
+  assert.strictEqual(await index(), 'bare test fixture')
+}
+
+export async function test2 () {
+  assert.ok(true, 'yep')
+}

package/test/fixtures/bare-async-failure/package.json

@@ -11,5 +11,8 @@
     "type": "git",
     "url": "https://github.com/rvagg/polendina.git"
   },
-  "license": "Apache-2.0"
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "chai": "^4.3.4"
+  }
 }

package/test/fixtures/bare-async-failure/test-1.js

@@ -1,6 +1,6 @@
 /* globals WorkerGlobalScope ServiceWorkerGlobalScope */
 
-const assert = require('assert')
+const { assert } = require('chai')
 
 module.exports = async function () {
   if (typeof ServiceWorkerGlobalScope !== 'undefined' && global instanceof ServiceWorkerGlobalScope) {

package/test/fixtures/bare-async-failure/test-2.js

@@ -1,4 +1,4 @@
-const assert = require('assert')
+const { assert } = require('chai')
 const index = require('./')
 
 module.exports.test1 = async function () {
@@ -7,5 +7,5 @@ module.exports.test1 = async function () {
 }
 
 module.exports.test2 = async function () {
-  assert.fail('nope', 'faily mcfailface')
+  assert.fail('faily mcfailface')
 }

package/test/fixtures/bare-async-failure-esm/index.js

@@ -0,0 +1,3 @@
+export default function test () {
+  return new Promise((resolve, reject) => setTimeout(() => resolve('bare test fixture'), 500))
+}

package/test/fixtures/bare-async-failure-esm/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "fixture-bare-async-failure",
+  "version": "1.0.0",
+  "description": "test fixture",
+  "main": "index.js",
+  "type": "module",
+  "scripts": {
+    "test": "node test-1.js && node test-2.js"
+  },
+  "author": "Rod <rod@vagg.org> (http://r.va.gg/)",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/rvagg/polendina.git"
+  },
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "chai": "^4.3.4"
+  }
+}

package/test/fixtures/bare-async-failure-esm/test-1.js

@@ -0,0 +1,16 @@
+/* globals WorkerGlobalScope ServiceWorkerGlobalScope */
+
+import { assert } from 'chai'
+
+export default async function () {
+  if (typeof ServiceWorkerGlobalScope !== 'undefined' && global instanceof ServiceWorkerGlobalScope) {
+    console.log('testing is in serviceworker')
+    assert.strictEqual(typeof ServiceWorkerGlobalScope, 'function')
+  } else if (typeof WorkerGlobalScope !== 'undefined' && global instanceof WorkerGlobalScope) {
+    console.log('testing is in worker')
+    assert.strictEqual(typeof WorkerGlobalScope, 'function')
+  } else {
+    console.log('testing is not in worker')
+    assert.strictEqual(typeof WorkerGlobalScope, 'undefined')
+  }
+}

package/test/fixtures/bare-async-failure-esm/test-2.js

@@ -0,0 +1,11 @@
+import { assert } from 'chai'
+import index from './index.js'
+
+export async function test1 () {
+  console.log('testing bare fixture')
+  assert.strictEqual(await index(), 'bare test fixture')
+}
+
+export async function test2 () {
+  assert.fail('faily mcfailface')
+}

package/test/fixtures/bare-sync/package.json

@@ -11,5 +11,8 @@
     "type": "git",
     "url": "https://github.com/rvagg/polendina.git"
   },
-  "license": "Apache-2.0"
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "chai": "^4.3.4"
+  }
 }

package/test/fixtures/bare-sync/test-1.js

@@ -1,6 +1,6 @@
 /* globals WorkerGlobalScope ServiceWorkerGlobalScope */
 
-const assert = require('assert')
+const { assert } = require('chai')
 
 if (typeof ServiceWorkerGlobalScope !== 'undefined' && global instanceof ServiceWorkerGlobalScope) {
   console.log('testing is in serviceworker')

package/test/fixtures/bare-sync/test-2.js

@@ -1,4 +1,5 @@
-const assert = require('assert')
+
+const { assert } = require('chai')
 const index = require('./')
 
 console.log('testing bare fixture')

package/test/fixtures/bare-sync-esm/index.js

@@ -0,0 +1 @@
+export default 'bare test fixture'

package/test/fixtures/bare-sync-esm/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "fixture-bare-sync",
+  "version": "1.0.0",
+  "description": "test fixture",
+  "main": "index.js",
+  "type": "module",
+  "scripts": {
+    "test": "node test-1.js && node test-2.js"
+  },
+  "author": "Rod <rod@vagg.org> (http://r.va.gg/)",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/rvagg/polendina.git"
+  },
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "chai": "^4.3.4"
+  }
+}

package/test/fixtures/bare-sync-esm/test-1.js

@@ -0,0 +1,14 @@
+/* globals WorkerGlobalScope ServiceWorkerGlobalScope */
+
+import { assert } from 'chai'
+
+if (typeof ServiceWorkerGlobalScope !== 'undefined' && global instanceof ServiceWorkerGlobalScope) {
+  console.log('testing is in serviceworker')
+  assert.strictEqual(typeof ServiceWorkerGlobalScope, 'function')
+} else if (typeof WorkerGlobalScope !== 'undefined' && global instanceof WorkerGlobalScope) {
+  console.log('testing is in worker')
+  assert.strictEqual(typeof WorkerGlobalScope, 'function')
+} else {
+  console.log('testing is not in worker')
+  assert.strictEqual(typeof WorkerGlobalScope, 'undefined')
+}

package/test/fixtures/bare-sync-esm/test-2.js

@@ -0,0 +1,7 @@
+
+import { assert } from 'chai'
+import index from './index.js'
+
+console.log('testing bare fixture')
+assert.strictEqual(index, 'bare test fixture')
+assert.ok(true, 'yep')

package/test/fixtures/bare-sync-failure/package.json

@@ -11,5 +11,8 @@
     "type": "git",
     "url": "https://github.com/rvagg/polendina.git"
   },
-  "license": "Apache-2.0"
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "chai": "^4.3.4"
+  }
 }

package/test/fixtures/bare-sync-failure/test-1.js

@@ -1,6 +1,6 @@
 /* globals WorkerGlobalScope ServiceWorkerGlobalScope */
 
-const assert = require('assert')
+const { assert } = require('chai')
 
 if (typeof ServiceWorkerGlobalScope !== 'undefined' && global instanceof ServiceWorkerGlobalScope) {
   console.log('testing is in serviceworker')

package/test/fixtures/bare-sync-failure/test-2.js

@@ -1,6 +1,6 @@
-const assert = require('assert')
+const { assert } = require('chai')
 const index = require('.')
 
 console.log('testing bare fixture')
 assert.strictEqual(index, 'bare test fixture')
-assert.fail('nope', 'faily mcfailface')
+assert.fail('faily mcfailface')

package/test/fixtures/bare-sync-failure-esm/index.js

@@ -0,0 +1 @@
+export default 'bare test fixture'

package/test/fixtures/bare-sync-failure-esm/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "fixture-bare-sync-failure",
+  "version": "1.0.0",
+  "description": "test fixture",
+  "main": "index.js",
+  "type": "module",
+  "scripts": {
+    "test": "node test-1.js && node test-2.js"
+  },
+  "author": "Rod <rod@vagg.org> (http://r.va.gg/)",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/rvagg/polendina.git"
+  },
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "chai": "^4.3.4"
+  }
+}

package/test/fixtures/bare-sync-failure-esm/test-1.js

@@ -0,0 +1,14 @@
+/* globals WorkerGlobalScope ServiceWorkerGlobalScope */
+
+import { assert } from 'chai'
+
+if (typeof ServiceWorkerGlobalScope !== 'undefined' && global instanceof ServiceWorkerGlobalScope) {
+  console.log('testing is in serviceworker')
+  assert.strictEqual(typeof ServiceWorkerGlobalScope, 'function')
+} else if (typeof WorkerGlobalScope !== 'undefined' && global instanceof WorkerGlobalScope) {
+  console.log('testing is in worker')
+  assert.strictEqual(typeof WorkerGlobalScope, 'function')
+} else {
+  console.log('testing is not in worker')
+  assert.strictEqual(typeof WorkerGlobalScope, 'undefined')
+}

package/test/fixtures/bare-sync-failure-esm/test-2.js

@@ -0,0 +1,6 @@
+import { assert } from 'chai'
+import index from './index.js'
+
+console.log('testing bare fixture')
+assert.strictEqual(index, 'bare test fixture')
+assert.fail('faily mcfailface')

package/test/fixtures/mocha/package.json

@@ -13,6 +13,7 @@
     "url": "https://github.com/rvagg/polendina.git"
   },
   "devDependencies": {
-    "mocha": "^7.0.0"
+    "chai": "^4.3.4",
+    "mocha": "~9.1.3"
   }
 }

package/test/fixtures/mocha/test-1.js

@@ -1,7 +1,7 @@
 /* globals describe it */
 
 const fixture = require('./')
-const assert = require('assert')
+const { assert } = require('chai')
 
 describe('test suite 1', () => {
   it('test case 1', () => {

package/test/fixtures/mocha/test-2.js

@@ -1,6 +1,6 @@
 /* globals describe it WorkerGlobalScope ServiceWorkerGlobalScope */
 
-const assert = require('assert')
+const { assert } = require('chai')
 
 describe('test suite 2 - worker', () => {
   if (typeof ServiceWorkerGlobalScope !== 'undefined' && global instanceof ServiceWorkerGlobalScope) {

package/test/fixtures/mocha/test-3.js

@@ -1,7 +1,7 @@
 /* globals describe it */
 
 const fixture = require('./')
-const assert = require('assert')
+const { assert } = require('chai')
 
 describe('test suite 3', () => {
   it('test case 1', () => {