perf: reduce the number of unused imports (#8508)

Author: sheremet-va

packages/browser/src/client/tester/runner.ts

@@ -4,11 +4,11 @@ import type { VitestBrowserClientMocker } from './mocker'
 import { globalChannel, onCancel } from '@vitest/browser/client'
 import { page, userEvent } from '@vitest/browser/context'
 import {
+  DecodedMap,
+  getOriginalPosition,
   loadDiffConfig,
   loadSnapshotSerializers,
-  originalPositionFor,
   takeCoverageInsideWorker,
-  TraceMap,
 } from 'vitest/internal/browser'
 import { NodeBenchmarkRunner, VitestTestRunner } from 'vitest/runners'
 import { createStackString, parseStacktrace } from '../../../../utils/src/source-map'
@@ -154,20 +154,11 @@ export function createBrowserRunner(
           return rpc().onTaskAnnotate(test.id, annotation)
         }
 
-        const traceMap = new TraceMap(map as any)
-        const { line, column, source } = originalPositionFor(traceMap, annotation.location)
-        if (line != null && column != null && source != null) {
-          let file: string = annotation.location.file
-          if (source) {
-            const fileUrl = annotation.location.file.startsWith('file://')
-              ? annotation.location.file
-              : `file://${annotation.location.file}`
-            const sourceRootUrl = map.sourceRoot
-              ? new URL(map.sourceRoot, fileUrl)
-              : fileUrl
-            file = new URL(source, sourceRootUrl).pathname
-          }
-
+        const traceMap = new DecodedMap(map as any, annotation.location.file)
+        const position = getOriginalPosition(traceMap, annotation.location)
+        if (position) {
+          const { source, column, line } = position
+          const file = source || annotation.location.file
           annotation.location = {
             line,
             column: column + 1,
@@ -261,7 +252,7 @@ async function getTraceMap(file: string, sourceMaps: Map<string, any>) {
   if (!result) {
     return null
   }
-  return new TraceMap(result as any)
+  return new DecodedMap(result as any, file)
 }
 
 async function updateTestFilesLocations(files: File[], sourceMaps: Map<string, any>) {
@@ -272,8 +263,9 @@ async function updateTestFilesLocations(files: File[], sourceMaps: Map<string, a
     }
     const updateLocation = (task: Task) => {
       if (task.location) {
-        const { line, column } = originalPositionFor(traceMap, task.location)
-        if (line != null && column != null) {
+        const position = getOriginalPosition(traceMap, task.location)
+        if (position) {
+          const { line, column } = position
           task.location = { line, column: task.each ? column : column + 1 }
         }
       }

packages/browser/src/client/tester/snapshot.ts

@@ -1,11 +1,11 @@
 import type { VitestBrowserClient } from '@vitest/browser/client'
 import type { ParsedStack } from 'vitest/internal/browser'
 import type { SnapshotEnvironment } from 'vitest/snapshot'
-import { originalPositionFor, TraceMap } from 'vitest/internal/browser'
+import { DecodedMap, getOriginalPosition } from 'vitest/internal/browser'
 
 export class VitestBrowserSnapshotEnvironment implements SnapshotEnvironment {
   private sourceMaps = new Map<string, any>()
-  private traceMaps = new Map<string, TraceMap>()
+  private traceMaps = new Map<string, DecodedMap>()
 
   public addSourceMap(filepath: string, map: any): void {
     this.sourceMaps.set(filepath, map)
@@ -46,12 +46,12 @@ export class VitestBrowserSnapshotEnvironment implements SnapshotEnvironment {
     }
     let traceMap = this.traceMaps.get(stack.file)
     if (!traceMap) {
-      traceMap = new TraceMap(map)
+      traceMap = new DecodedMap(map, stack.file)
       this.traceMaps.set(stack.file, traceMap)
     }
-    const { line, column } = originalPositionFor(traceMap, stack)
-    if (line != null && column != null) {
-      return { ...stack, line, column }
+    const position = getOriginalPosition(traceMap, stack)
+    if (position) {
+      return { ...stack, line: position.line, column: position.column }
     }
     return stack
   }

packages/browser/src/client/tester/state.ts

@@ -8,7 +8,6 @@ const sessionId = getBrowserState().sessionId
 const state: WorkerGlobalState = {
   ctx: {
     pool: 'browser',
-    worker: './browser.js',
     workerId: 1,
     config,
     projectName: config.name || '',

packages/browser/src/node/commands/screenshotMatcher/utils.ts

@@ -3,7 +3,7 @@ import type { ScreenshotMatcherOptions } from '../../../../context'
 import type { ScreenshotMatcherArguments } from '../../../shared/screenshotMatcher/types'
 import type { AnyCodec } from './codecs'
 import { platform } from 'node:os'
-import { deepMerge } from '@vitest/utils'
+import { deepMerge } from '@vitest/utils/helpers'
 import { basename, dirname, extname, join, relative, resolve } from 'pathe'
 import { takeScreenshot } from '../screenshot'
 import { getCodec } from './codecs'

packages/browser/src/node/plugin.ts

@@ -6,7 +6,7 @@ import type { ParentBrowserProject } from './projectParent'
 import { createReadStream, lstatSync, readFileSync } from 'node:fs'
 import { createRequire } from 'node:module'
 import { dynamicImportPlugin } from '@vitest/mocker/node'
-import { toArray } from '@vitest/utils'
+import { toArray } from '@vitest/utils/helpers'
 import MagicString from 'magic-string'
 import { basename, dirname, extname, resolve } from 'pathe'
 import sirv from 'sirv'
@@ -281,7 +281,6 @@ export default (parentServer: ParentBrowserProject, base = '/'): Plugin[] => {
         const include = [
           'vitest > expect-type',
           'vitest > @vitest/snapshot > magic-string',
-          'vitest > @vitest/runner > strip-literal',
           'vitest > @vitest/expect > chai',
           'vitest > @vitest/expect > chai > loupe',
           'vitest > @vitest/utils > loupe',

packages/browser/src/node/plugins/pluginContext.ts

@@ -2,7 +2,7 @@ import type { Rollup } from 'vite'
 import type { Plugin } from 'vitest/config'
 import type { ParentBrowserProject } from '../projectParent'
 import { fileURLToPath } from 'node:url'
-import { slash } from '@vitest/utils'
+import { slash } from '@vitest/utils/helpers'
 import { dirname, resolve } from 'pathe'
 
 const VIRTUAL_ID_CONTEXT = '\0@vitest/browser/context'

packages/browser/src/node/pool.ts

@@ -1,4 +1,4 @@
-import type { DeferPromise } from '@vitest/utils'
+import type { DeferPromise } from '@vitest/utils/helpers'
 import type {
   BrowserProvider,
   ProcessPool,
@@ -9,7 +9,7 @@ import type {
 import crypto from 'node:crypto'
 import * as nodeos from 'node:os'
 import { performance } from 'node:perf_hooks'
-import { createDefer } from '@vitest/utils'
+import { createDefer } from '@vitest/utils/helpers'
 import { stringify } from 'flatted'
 import { createDebugger } from 'vitest/node'
 

packages/browser/src/node/projectParent.ts

@@ -75,18 +75,19 @@ export class ParentBrowserProject {
         return result?.map
       },
       getUrlId: (id) => {
-        const mod = this.vite.moduleGraph.getModuleById(id)
+        const moduleGraph = this.vite.environments.client.moduleGraph
+        const mod = moduleGraph.getModuleById(id)
         if (mod) {
           return id
         }
         const resolvedPath = resolve(this.vite.config.root, id.slice(1))
-        const modUrl = this.vite.moduleGraph.getModuleById(resolvedPath)
+        const modUrl = moduleGraph.getModuleById(resolvedPath)
         if (modUrl) {
           return resolvedPath
         }
         // some browsers (looking at you, safari) don't report queries in stack traces
         // the next best thing is to try the first id that this file resolves to
-        const files = this.vite.moduleGraph.getModulesByFile(resolvedPath)
+        const files = moduleGraph.getModulesByFile(resolvedPath)
         if (files && files.size) {
           return files.values().next().value!.id!
         }

packages/expect/src/jest-expect.ts

@@ -4,7 +4,7 @@ import type { Constructable } from '@vitest/utils'
 import type { AsymmetricMatcher } from './jest-asymmetric-matchers'
 import type { Assertion, ChaiPlugin } from './types'
 import { isMockFunction } from '@vitest/spy'
-import { assertTypes } from '@vitest/utils'
+import { assertTypes } from '@vitest/utils/helpers'
 import c from 'tinyrainbow'
 import { JEST_MATCHERS_OBJECT } from './constants'
 import {

packages/expect/src/jest-matcher-utils.ts

@@ -1,7 +1,8 @@
 import type { Formatter } from 'tinyrainbow'
 import type { MatcherHintOptions, Tester } from './types'
-import { getType, stringify } from '@vitest/utils'
 import { diff, printDiffOrStringify } from '@vitest/utils/diff'
+import { stringify } from '@vitest/utils/display'
+import { getType } from '@vitest/utils/helpers'
 import c from 'tinyrainbow'
 import { JEST_MATCHERS_OBJECT } from './constants'