velocious 1.0.52 → 1.0.54

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.52",
+  "version": "1.0.54",
   "main": "index.js",
   "scripts": {
     "test": "VELOCIOUS_TEST_DIR=../ cd spec/dummy && npx velocious test",

package/src/testing/test-runner.js

@@ -145,7 +145,7 @@ export default class TestRunner {
       } catch (error) {
         this._failedTests++
 
-        // console.error(`${leftPadding}  Test failed: ${error.message}`)
+        console.error(`${leftPadding}  Test failed: ${error.message}`)
         addTrackedStackToError(error)
 
         const backtraceCleaner = new BacktraceCleaner(error)

package/src/utils/with-tracked-stack-async-hooks.js

@@ -0,0 +1,69 @@
+import {AsyncLocalStorage} from "async_hooks"
+
+let asyncLocalStorage
+
+if (AsyncLocalStorage) {
+  asyncLocalStorage = new AsyncLocalStorage()
+}
+
+function addTrackedStackToError(error) {
+  // Not supported
+  if (!asyncLocalStorage) return
+
+  const parentStacks = asyncLocalStorage.getStore() || []
+  const additionalStackLines = []
+
+  for (const parentStack of parentStacks) {
+    for (const parentStackLine of parentStack) {
+      additionalStackLines.push(parentStackLine)
+    }
+  }
+
+  // Replace the error message on the first line with this string
+  error.stack += "\n" + additionalStackLines.join("\n")
+}
+
+async function withTrackedStack(arg1, arg2) {
+  let callback, stack
+
+  if (arg2) {
+    callback = arg2
+    stack = arg1
+  } else {
+    callback = arg1
+    stack = Error().stack
+  }
+
+  // Not supported
+  if (!asyncLocalStorage) return await callback()
+
+  const parentStacks = asyncLocalStorage.getStore() || []
+  const additionalStackLines = []
+  const currentStackLines = stack.split("\n")
+
+  currentStackLines[0] = "    [WITH TRACKED STACK]"
+
+  for (let i = currentStackLines.length; i >= 0; i--) {
+    const stackLine = currentStackLines[i]
+
+    additionalStackLines.unshift(stackLine)
+
+    if (stackLine == "    [WITH TRACKED STACK]") {
+      break
+    }
+  }
+
+  const newStacks = [additionalStackLines, ...parentStacks]
+
+  await asyncLocalStorage.run(newStacks, async () => {
+    return await callback()
+  })
+}
+
+if (globalThis.withTrackedStack) {
+  console.warn("globalThis.withTrackedStack was already defined")
+} else {
+  globalThis.withTrackedStack = {addTrackedStackToError, withTrackedStack}
+}
+
+export {addTrackedStackToError, withTrackedStack}

package/src/utils/with-tracked-stack.js

@@ -1,63 +1,23 @@
-import {AsyncLocalStorage} from "async_hooks"
-
-let asyncLocalStorage
-
-if (AsyncLocalStorage) {
-  asyncLocalStorage = new AsyncLocalStorage()
-}
-
 function addTrackedStackToError(error) {
-  // Not supported
-  if (!asyncLocalStorage) return
-
-  const parentStacks = asyncLocalStorage.getStore() || []
-  const additionalStackLines = []
-
-  for (const parentStack of parentStacks) {
-    for (const parentStackLine of parentStack) {
-      additionalStackLines.push(parentStackLine)
-    }
-  }
-
-  // Replace the error message on the first line with this string
-  error.stack += "\n" + additionalStackLines.join("\n")
+  globalThis.withTrackedStack?.addTrackedStackToError(error)
 }
 
-async function withTrackedStack(arg1, arg2) {
-  let callback, stack
+async function withTrackedStack(...args) {
+  const withTrackedStack = globalThis.withTrackedStack?.withTrackedStack
 
-  if (arg2) {
-    callback = arg2
-    stack = arg1
-  } else {
-    callback = arg1
-    stack = Error().stack
-  }
+  let callback
 
-  // Not supported
-  if (!asyncLocalStorage) return await callback()
-
-  const parentStacks = asyncLocalStorage.getStore() || []
-  const additionalStackLines = []
-  const currentStackLines = stack.split("\n")
-
-  currentStackLines[0] = "    [WITH TRACKED STACK]"
-
-  for (let i = currentStackLines.length; i >= 0; i--) {
-    const stackLine = currentStackLines[i]
-
-    additionalStackLines.unshift(stackLine)
-
-    if (stackLine == "    [WITH TRACKED STACK]") {
-      break
-    }
+  if (args[1]) {
+    callback = args[1]
+  } else {
+    callback = args[0]
   }
 
-  const newStacks = [additionalStackLines, ...parentStacks]
-
-  await asyncLocalStorage.run(newStacks, async () => {
+  if (withTrackedStack) {
+    return await withTrackedStack(...args)
+  } else {
     return await callback()
-  })
+  }
 }
 
 export {addTrackedStackToError, withTrackedStack}

package/src/utils/with-tracked-stack.native.js

@@ -1,10 +0,0 @@
-function addTrackedStackToError(error) {
-  // Not supported
-}
-
-async function withTrackedStack(arg1, arg2) {
-  // Not supported
-  return await callback()
-}
-
-export {addTrackedStackToError, withTrackedStack}