Merge branch 'main' into 02-05-feat_assertion_helper_to_filter_out_internal_stack_traces

Author: hi-ogawa

docs/guide/lifecycle.md

@@ -126,15 +126,17 @@ The execution follows this order:
 
 1. **File-level code** - All code outside `describe` blocks runs immediately
 2. **Test collection** - `describe` blocks are processed, and tests are registered as side effects of importing the test file
-3. **`beforeAll` hooks** - Run once before any tests in the suite
-4. **For each test:**
+3. **[`aroundAll`](/api/hooks#aroundall) hooks** - Wrap around all tests in the suite (must call `runSuite()`)
+4. **[`beforeAll`](/api/hooks#beforeall) hooks** - Run once before any tests in the suite
+5. **For each test:**
+   - [`aroundEach`](/api/hooks#aroundeach) hooks wrap around the test (must call `runTest()`)
    - `beforeEach` hooks execute (in order defined, or based on [`sequence.hooks`](/config/sequence#sequence-hooks))
    - Test function executes
    - `afterEach` hooks execute (reverse order by default with `sequence.hooks: 'stack'`)
    - [`onTestFinished`](/api/hooks#ontestfinished) callbacks run (always in reverse order)
    - If test failed: [`onTestFailed`](/api/hooks#ontestfailed) callbacks run
    - Note: if `repeats` or `retry` are set, all of these steps are executed again
-5. **`afterAll` hooks** - Run once after all tests in the suite complete
+6. **[`afterAll`](/api/hooks#afterall) hooks** - Run once after all tests in the suite complete
 
 **Example execution flow:**
 
@@ -146,11 +148,25 @@ describe('User API', () => {
   // This runs immediately (collection phase)
   console.log('Suite defined')
 
+  aroundAll(async (runSuite) => {
+    // Wraps around all tests in this suite
+    console.log('aroundAll before')
+    await runSuite()
+    console.log('aroundAll after')
+  })
+
   beforeAll(() => {
     // Runs once before all tests in this suite
     console.log('beforeAll')
   })
 
+  aroundEach(async (runTest) => {
+    // Wraps around each test
+    console.log('aroundEach before')
+    await runTest()
+    console.log('aroundEach after')
+  })
+
   beforeEach(() => {
     // Runs before each test
     console.log('beforeEach')
@@ -180,29 +196,61 @@ describe('User API', () => {
 // Output:
 // File loaded
 // Suite defined
-// beforeAll
-// beforeEach
-// test 1
-// afterEach
-// beforeEach
-// test 2
-// afterEach
-// afterAll
+// aroundAll before
+//   beforeAll
+//   aroundEach before
+//     beforeEach
+//       test 1
+//     afterEach
+//   aroundEach after
+//   aroundEach before
+//     beforeEach
+//       test 2
+//     afterEach
+//   aroundEach after
+//   afterAll
+// aroundAll after
 ```
 
 #### Nested Suites
 
-When using nested `describe` blocks, hooks follow a hierarchical pattern:
+When using nested `describe` blocks, hooks follow a hierarchical pattern. The `aroundAll` and `aroundEach` hooks wrap around their respective scopes, with parent hooks wrapping child hooks:
 
 ```ts
 describe('outer', () => {
+  aroundAll(async (runSuite) => {
+    console.log('outer aroundAll before')
+    await runSuite()
+    console.log('outer aroundAll after')
+  })
+
   beforeAll(() => console.log('outer beforeAll'))
+
+  aroundEach(async (runTest) => {
+    console.log('outer aroundEach before')
+    await runTest()
+    console.log('outer aroundEach after')
+  })
+
   beforeEach(() => console.log('outer beforeEach'))
 
   test('outer test', () => console.log('outer test'))
 
   describe('inner', () => {
+    aroundAll(async (runSuite) => {
+      console.log('inner aroundAll before')
+      await runSuite()
+      console.log('inner aroundAll after')
+    })
+
     beforeAll(() => console.log('inner beforeAll'))
+
+    aroundEach(async (runTest) => {
+      console.log('inner aroundEach before')
+      await runTest()
+      console.log('inner aroundEach after')
+    })
+
     beforeEach(() => console.log('inner beforeEach'))
 
     test('inner test', () => console.log('inner test'))
@@ -216,18 +264,28 @@ describe('outer', () => {
 })
 
 // Output:
-// outer beforeAll
-// outer beforeEach
-// outer test
-// outer afterEach
-// inner beforeAll
-// outer beforeEach
-// inner beforeEach
-// inner test
-// inner afterEach (with stack mode)
-// outer afterEach (with stack mode)
-// inner afterAll
-// outer afterAll
+// outer aroundAll before
+//   outer beforeAll
+//   outer aroundEach before
+//     outer beforeEach
+//       outer test
+//     outer afterEach
+//   outer aroundEach after
+//   inner aroundAll before
+//     inner beforeAll
+//     outer aroundEach before
+//       inner aroundEach before
+//         outer beforeEach
+//           inner beforeEach
+//             inner test
+//           inner afterEach
+//         outer afterEach
+//       inner aroundEach after
+//     outer aroundEach after
+//     inner afterAll
+//   inner aroundAll after
+//   outer afterAll
+// outer aroundAll after
 ```
 
 #### Concurrent Tests
@@ -278,7 +336,9 @@ Understanding where code executes is crucial for avoiding common pitfalls:
 | Global Setup | Main process | ❌ No (use `provide`/`inject`) | Once per Vitest run |
 | Setup Files | Worker (same as tests) | ✅ Yes | Before each test file |
 | File-level code | Worker | ✅ Yes | Once per test file |
+| `aroundAll` | Worker | ✅ Yes | Once per suite (wraps all tests) |
 | `beforeAll` / `afterAll` | Worker | ✅ Yes | Once per suite |
+| `aroundEach` | Worker | ✅ Yes | Per test (wraps each test) |
 | `beforeEach` / `afterEach` | Worker | ✅ Yes | Per test |
 | Test function | Worker | ✅ Yes | Once (or more with retries/repeats) |
 | Global Teardown | Main process | ❌ No | Once per Vitest run |

packages/utils/src/source-map.ts

@@ -370,7 +370,7 @@ export class DecodedMap {
     this._decodedMemo = memoizedState()
     this.url = from
     this.resolvedSources = (sources || []).map(s =>
-      resolve(s || '', from),
+      resolve(from, '..', s || ''),
     )
   }
 }

packages/vitest/LICENSE.md

@@ -316,6 +316,37 @@ Repository: egoist/cac
 
 ---------------------------------------
 
+## convert-source-map
+License: MIT
+By: Thorsten Lorenz
+Repository: git://github.com/thlorenz/convert-source-map.git
+
+> Copyright 2013 Thorsten Lorenz. 
+> All rights reserved.
+>
+> Permission is hereby granted, free of charge, to any person
+> obtaining a copy of this software and associated documentation
+> files (the "Software"), to deal in the Software without
+> restriction, including without limitation the rights to use,
+> copy, modify, merge, publish, distribute, sublicense, and/or sell
+> copies of the Software, and to permit persons to whom the
+> Software is furnished to do so, subject to the following
+> conditions:
+>
+> The above copyright notice and this permission notice shall be
+> included in all copies or substantial portions of the Software.
+>
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+> EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+> OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+> NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+> HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+> WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+> FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+> OTHER DEALINGS IN THE SOFTWARE.
+
+---------------------------------------
+
 ## empathic
 License: MIT
 By: Luke Edwards

packages/vitest/package.json

@@ -138,7 +138,8 @@
     "@vitest/browser-webdriverio": "workspace:*",
     "@vitest/ui": "workspace:*",
     "happy-dom": "*",
-    "jsdom": "*"
+    "jsdom": "*",
+    "vite": "^6.0.0 || ^7.0.0 || ^8.0.0-0"
   },
   "peerDependenciesMeta": {
     "@edge-runtime/vm": {
@@ -167,6 +168,9 @@
     },
     "jsdom": {
       "optional": true
+    },
+    "vite": {
+      "optional": false
     }
   },
   "dependencies": {
@@ -188,7 +192,7 @@
     "tinyexec": "^1.0.2",
     "tinyglobby": "catalog:",
     "tinyrainbow": "catalog:",
-    "vite": "^6.0.0 || ^7.0.0",
+    "vite": "^6.0.0 || ^7.0.0 || ^8.0.0-0",
     "why-is-node-running": "^2.3.0"
   },
   "devDependencies": {
@@ -198,6 +202,7 @@
     "@jridgewell/trace-mapping": "catalog:",
     "@opentelemetry/api": "^1.9.0",
     "@sinonjs/fake-timers": "15.0.0",
+    "@types/convert-source-map": "^2.0.3",
     "@types/estree": "catalog:",
     "@types/istanbul-lib-coverage": "catalog:",
     "@types/istanbul-reports": "catalog:",
@@ -210,6 +215,7 @@
     "acorn-walk": "catalog:",
     "birpc": "catalog:",
     "cac": "catalog:",
+    "convert-source-map": "^2.0.0",
     "empathic": "^2.0.0",
     "flatted": "catalog:",
     "happy-dom": "^20.4.0",

packages/vitest/src/node/ast-collect.ts

@@ -161,6 +161,10 @@ function astParseFile(filepath: string, code: string) {
       }
       else {
         message = code.slice(messageNode.start, messageNode.end)
+
+        if (message.endsWith('.name')) {
+          message = message.slice(0, -5)
+        }
       }
 
       if (message.startsWith('0,')) {

packages/vitest/src/node/plugins/index.ts

@@ -1,7 +1,7 @@
 import type { UserConfig as ViteConfig, Plugin as VitePlugin } from 'vite'
 import type { ResolvedConfig, UserConfig } from '../types/config'
 import { deepClone, deepMerge, notNullish } from '@vitest/utils/helpers'
-import { relative } from 'pathe'
+import { relative, resolve } from 'pathe'
 import * as vite from 'vite'
 import { defaultPort } from '../../constants'
 import { configDefaults } from '../../defaults'
@@ -30,7 +30,7 @@ export async function VitestPlugin(
   const userConfig = deepMerge({}, options) as UserConfig
 
   async function UIPlugin() {
-    await vitest.packageInstaller.ensureInstalled('@vitest/ui', options.root || process.cwd(), vitest.version)
+    await vitest.packageInstaller.ensureInstalled('@vitest/ui', resolve(options.root || process.cwd()), vitest.version)
     return (await import('@vitest/ui')).default(vitest)
   }
 

packages/vitest/src/node/pool.ts

@@ -281,7 +281,7 @@ function resolveOptions(ctx: Vitest) {
       ...conditions,
       '--experimental-import-meta-resolve',
       // https://github.com/vitest-dev/vitest/issues/8896
-      ...((globalThis as any).Deno ? [] : ['--require', suppressWarningsPath]),
+      ...((globalThis as any).Deno || process.versions.pnp ? [] : ['--require', suppressWarningsPath]),
     ],
     env: {
       TEST: 'true',

packages/vitest/src/node/test-run.ts

@@ -7,6 +7,7 @@ import type {
 } from '@vitest/runner'
 import type { TaskEventData, TestArtifact } from '@vitest/runner/types/tasks'
 import type { SerializedError } from '@vitest/utils'
+import type { SourceMap } from 'rollup'
 import type { UserConsoleLog } from '../types/general'
 import type { Vitest } from './core'
 import type { TestProject } from './project'
@@ -15,11 +16,13 @@ import type { TestSpecification } from './test-specification'
 import type { TestRunEndReason } from './types/reporter'
 import assert from 'node:assert'
 import { createHash } from 'node:crypto'
-import { existsSync } from 'node:fs'
+import { existsSync, readFileSync } from 'node:fs'
 import { copyFile, mkdir, writeFile } from 'node:fs/promises'
+import path from 'node:path'
 import { isPrimitive } from '@vitest/utils/helpers'
 import { serializeValue } from '@vitest/utils/serialize'
 import { parseErrorStacktrace } from '@vitest/utils/source-map'
+import convertSourceMap from 'convert-source-map'
 import mime from 'mime/lite'
 import { basename, extname, resolve } from 'pathe'
 
@@ -170,6 +173,18 @@ export class TestRun {
         else {
           error.stacks = parseErrorStacktrace(error, {
             frameFilter: project.config.onStackTrace,
+            getSourceMap(file) {
+              // This only handles external modules since
+              // source map is already applied for inlined modules.
+              // Module node exists due to Vitest fetch module,
+              // but transformResult should be empty for external modules.
+              const mod = project.vite.moduleGraph.getModuleById(file)
+              if (!mod?.transformResult && existsSync(file)) {
+                const code = readFileSync(file, 'utf-8')
+                const result = extractSourcemapFromFile(code, file)
+                return result
+              }
+            },
           })
         }
       })
@@ -298,3 +313,31 @@ function sanitizeFilePath(s: string): string {
   // eslint-disable-next-line no-control-regex
   return s.replace(/[\x00-\x2C\x2E\x2F\x3A-\x40\x5B-\x60\x7B-\x7F]+/g, '-')
 }
+
+// based on vite
+// https://github.com/vitejs/vite/blob/84079a84ad94de4c1ef4f1bdb2ab448ff2c01196/packages/vite/src/node/server/sourcemap.ts#L149
+function extractSourcemapFromFile(
+  code: string,
+  filePath: string,
+): SourceMap | undefined {
+  const map = (
+    convertSourceMap.fromSource(code)
+    || (convertSourceMap.fromMapFileSource(
+      code,
+      createConvertSourceMapReadMap(filePath),
+    ))
+  )?.toObject()
+  return map
+}
+
+function createConvertSourceMapReadMap(originalFileName: string) {
+  return (filename: string) => {
+    // convertSourceMap can detect invalid filename from comments.
+    // fallback to empty source map to avoid errors.
+    const targetPath = path.resolve(path.dirname(originalFileName), filename)
+    if (existsSync(targetPath)) {
+      return readFileSync(targetPath, 'utf-8')
+    }
+    return '{}'
+  }
+}