cli/cli.js

@@ -2,9 +2,8 @@
 
 import { suite } from 'metaltest'
 
-const run = async (folder) => {
+const run = async () => {
-  if (!folder) folder = process.cwd()
+  await suite(process.cwd())
-  await suite(folder)
 }
 
 const [, , folder] = process.argv

index.js

@@ -1,5 +1,4 @@
 export * from './reporter/index.js'
-export * from './lib/mock.js'
 export { suite } from './lib/suite.js'
 
 import { metaltest } from './lib/metaltest.js'

lib/metaltest.js

@@ -40,11 +40,11 @@ const metaltest = (title) => {
   }
 
   const runner = (name, fn) => {
-    suite.push({ name, fn, at: getAt() })
+    suite.push({ name, fn })
   }
 
-  runner.only = (name, fn) => { only.push({ name, fn, at: getAt() }) }
+  runner.only = (name, fn) => { only.push({ name, fn }) }
-  runner.skip = (name, fn) => { skipped.push({ name, fn, at: getAt() }) }
+  runner.skip = (name, fn) => { skipped.push({ name, fn }) }
   runner.before = (fn) => { before.push(fn) }
   runner.after = (fn) => { after.push(fn) }
   runner.end = (name, fn) => { end.push({ name, fn }) }
@@ -74,7 +74,7 @@ const metaltest = (title) => {
         for (const fn of before) await fn()
         await test.fn(test)
         stats('success', test)
-        await notify(reporters, 'success', test)
+        notify(reporters, 'success', test)
       }
       catch (error) {
         stats('fail', test, error)

lib/mock.js

@@ -1,56 +0,0 @@
-
-const capture = (actions, name, fn) => async (...args) => {
-  const count = actions.reduce((count, curr) => {
-    if (curr.name === name) return count + 1
-
-    return count
-  }, 1)
-
-  try {
-    const result = await fn(...args, { count })
-    actions.push({ name, args, result })
-    return result
-  } catch (error) {
-    actions.push({ name, args, result: error })
-    throw error
-  }
-}
-
-const mock = async (mocks, fn) => {
-  const olds = {}
-  const actions = []
-
-  for (const mock of mocks) {
-    if (mock.package in olds === false) olds[mock.package] = {}
-    const old = olds[mock.package]
-
-    for (const name in mock.funcs) {
-      //Save
-      old[name] = mock.package[name]
-
-      //Capture
-      mock.package[name] = capture(actions, name, mock.funcs[name])
-    }
-  }
-
-  //Restore even when an error occurs
-  //Like with a failed assert
-  try {
-    await fn()
-  } catch (error) {
-    throw error
-  } finally {
-    for (const mock of mocks) {
-      const old = olds[mock.package]
-
-      for (const name in mock.funcs) {
-        //Restore
-        mock.package[name] = old[name]
-      }
-    }
-  }
-
-  return actions
-}
-
-export { mock }

lib/stackparser.js

@@ -1,13 +1,9 @@
 const regAssertParser = /(?<title>.*?)\n+(?<diff>.*?)\n+(?<stacktrace>    (?<where>at.*?file:\/\/(?<file>.*?):(?<line>\d+):(?<column>\d+)\)?)\n.*)/s
 
-const regStack = /(?<=^    )at.*/gm
-
 const stackParser = (stack) => {
   const m = stack.match(regAssertParser)
 
-  const stacks = stack.match(regStack)
+  return m.groups
-
-  return { ...m.groups, stacks }
 }
 
-export { stackParser }
+export { stackParser }

lib/suite.js

@@ -1,17 +1,47 @@
-import path from 'node:path'
+import { readdir } from 'node:fs/promises'
-import { walkDir } from './walkDir.js'
+import { join } from 'node:path'
-import { summaryreporter, totalreporter, totalerrorreporter } from 'metaltest'
+const walkDir = async function* (dir = '.', exclude = []) {
+  const files = await readdir(dir, { withFileTypes: true })
 
+  for (const file of files) {
+    if (exclude.includes(file.name)) continue
+
+    if (file.isDirectory()) {
+      yield* walkDir(join(dir, file.name))
+    } else if (file.isSymbolicLink()) {
+      yield* walkDir(join(dir, file.name))
+    } else {
+      yield join(dir, file.name)
+    }
+  }
+}
+
+import { fileURLToPath } from 'node:url'
+import { dirname } from 'node:path'
+const getStackAbsolutePaths = () => {
+  const old = Error.prepareStackTrace
+  Error.prepareStackTrace = (_, stack) => stack
+  const stack = new Error().stack
+  Error.prepareStackTrace = old
+
+  return stack
+    .map(cs => cs.getFileName())
+    .filter(filename => filename?.startsWith('file://'))
+    .map(filename => dirname(fileURLToPath(filename)))
+}
+
+import { summaryreporter, errorreporter, totalreporter } from 'metaltest'
 const suite = async (folder = '.') => {
+  const absolutePaths = getStackAbsolutePaths()
+  const absolutePath = absolutePaths[2]
   const fileIgnored = []
 
   const total = totalreporter()
-  const error = totalerrorreporter()
 
   for await (const file of walkDir(folder, ['node_modules', '.git'])) {
     if (!file.endsWith('.test.js')) continue
 
-    const module = path.resolve(folder, file)
+    const module = join(absolutePath, file)
     const { test } = await import(module)
 
     if (test === undefined) {
@@ -19,14 +49,13 @@ const suite = async (folder = '.') => {
       continue
     }
 
-    await test.run(summaryreporter(), error, total)
+    await test.run(summaryreporter(), errorreporter(), total)
   }
 
   for (const file of fileIgnored) {
     console.log(`The file ${file} doesn't export the metaltest object`)
   }
 
-  error.msg()
   console.log(total.msg())
 }
 

lib/walkDir.js

@@ -1,24 +0,0 @@
-import { readdir, stat } from 'fs/promises'
-import { join } from 'path/posix'
-
-const walkDir = async function* (dir = '.', exclude = []) {
-  const files = await readdir(dir)
-
-  for await (const file of files) {
-    if (exclude.includes(file)) continue
-
-    try {
-      const stats = await stat(join(dir, file))
-
-      if (stats.isDirectory()) {
-        yield* walkDir(join(dir, file))
-      } else {
-        yield join(dir, file)
-      }
-    }
-    catch (err) { } //Like file not found when symlink to a file that do not exist
-  }
-}
-
-
-export { walkDir }

package.json

@@ -4,7 +4,6 @@
   "description": "Clone of baretest with reporting",
   "type": "module",
   "exports": "./index.js",
-  "bin": "./cli/suite.js",
   "scripts": {
     "test": "node suite.js"
   },

reporter/errorreporter.js

@@ -1,14 +1,37 @@
-import { showError } from './showError.js'
+import chalk from 'chalk'
+import { log } from '../lib/log.js'
 
 const errorreporter = () => {
   const report = {
     end: (stats) => {
       const { testFail } = stats
-      showError(testFail)
+
+      for (const test of testFail) {
+        log('\n' + chalk.redBright(test.name) + '\n')
+        prettyError(test.error)
+      }
     }
   }
 
   return report
 }
 
+import { stackParser } from '../lib/stackparser.js'
+const prettyError = (error) => {
+  if (typeof error == 'string') {
+    log(chalk.yellowBright(error))
+    log('\n')
+    return
+  }
+
+  const stack = stackParser(error.stack)
+  log(chalk.yellowBright(stack.title) + '\n')
+
+  if (stack.diff != '')
+    log(chalk.white(stack.diff) + '\n')
+
+  if (stack.where != '')
+    log(chalk.gray(stack.where) + '\n')
+}
+
 export { errorreporter }

reporter/index.js

@@ -2,5 +2,4 @@ export { summaryreporter } from './summaryreporter.js'
 export { linereporter } from './linereporter.js'
 export { totalreporter } from './totalreporter.js'
 export { errorreporter } from './errorreporter.js'
-export { totalerrorreporter } from './totalerrorreporter.js'
 export { endreporter } from './endreporter.js'

reporter/linereporter.js

@@ -15,7 +15,7 @@ const linereporter = () => {
     fail: (test, e) => {
       const line = e.stack.match(/at.*:(.*):/)[1]
       lines.push(line)
-      log(chalk.redBright('✗'), test.name, `(line ${line})`)
+      log(chalk.redBright('✗'), line, test.name)
     },
     end: (stats) => {
       const { success, fail, testFail } = stats

reporter/showError.js

@@ -1,33 +0,0 @@
-import chalk from 'chalk'
-import { log } from '../lib/log.js'
-import { stackParser } from '../lib/stackparser.js'
-
-const showError = (testsFail) => {
-  for (const test of testsFail) {
-    log('\n' + chalk.redBright(test.name) + '\n')
-    prettyError(test)
-  }
-}
-
-const prettyError = (test) => {
-  const { error } = test
-  if (typeof error == 'string') {
-    log(chalk.yellowBright(error))
-    log('\n')
-    return
-  }
-
-  const stack = stackParser(error.stack)
-  log(chalk.yellowBright(stack.title) + '\n')
-
-  if (stack.diff != '')
-    log(chalk.white(stack.diff) + '\n')
-
-  // if (stack.where != '')
-  //   log(chalk.gray(stack.where) + '\n')
-
-  log(chalk.gray(test.at.summary) + '\n')
-  log(chalk.gray(stack.stacks.join('\n')) + '\n')
-}
-
-export { showError }

reporter/totalerrorreporter.js

@@ -1,16 +0,0 @@
-import { showError } from "./showError.js"
-
-const totalerrorreporter = () => {
-  const testFails = []
-
-  const report = {
-    end: (stats) => testFails.push(...stats.testFail),
-    msg: () => {
-      showError(testFails)
-    },
-  }
-
-  return report
-}
-
-export { totalerrorreporter }