Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: can mock files with space in path #1457

Merged
merged 2 commits into from Jun 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/mocks/src/has space in path.ts
@@ -0,0 +1 @@
export const thisIsOk = false
7 changes: 7 additions & 0 deletions examples/mocks/test/spaced.spec.ts
@@ -0,0 +1,7 @@
import { thisIsOk } from '../src/has space in path'

vi.mock('../src/has space in path', () => ({ thisIsOk: true }))

test('modules with spaces in name is mocked', () => {
expect(thisIsOk).toBe(true)
})
58 changes: 46 additions & 12 deletions packages/vitest/src/utils/source-map.ts
Expand Up @@ -21,9 +21,6 @@ export function getOriginalPos(map: RawSourceMap | null | undefined, { line, col
})
}

const stackFnCallRE = /at (.*) \((.+):(\d+):(\d+)\)$/
const stackBarePathRE = /at ?(.*) (.+):(\d+):(\d+)$/

export async function interpretSourcePos(stackFrames: ParsedStack[], ctx: Vitest): Promise<ParsedStack[]> {
for (const frame of stackFrames) {
if ('sourcePos' in frame)
Expand All @@ -47,31 +44,68 @@ const stackIgnorePatterns = [
'/node_modules/tinyspy/',
]

function extractLocation(urlLike: string) {
// Fail-fast but return locations like "(native)"
if (!urlLike.includes(':'))
return [urlLike]

const regExp = /(.+?)(?::(\d+))?(?::(\d+))?$/
const parts = regExp.exec(urlLike.replace(/[()]/g, ''))
if (!parts)
return [urlLike]
return [parts[1], parts[2] || undefined, parts[3] || undefined]
}

export function parseStacktrace(e: ErrorWithDiff, full = false): ParsedStack[] {
if (e.stacks)
return e.stacks

const stackStr = e.stack || e.stackStr || ''
const stackFrames = stackStr
.split('\n')
// Based on https://github.com/stacktracejs/error-stack-parser
// Credit to stacktracejs
.map((raw): ParsedStack | null => {
const line = raw.trim()
const match = line.match(stackFnCallRE) || line.match(stackBarePathRE)
if (!match)
let line = raw.trim()

if (line.includes('(eval '))
line = line.replace(/eval code/g, 'eval').replace(/(\(eval at [^()]*)|(,.*$)/g, '')

let sanitizedLine = line
.replace(/^\s+/, '')
.replace(/\(eval code/g, '(')
.replace(/^.*?\s+/, '')

// capture and preseve the parenthesized location "(/foo/my bar.js:12:87)" in
// case it has spaces in it, as the string is split on \s+ later on
const location = sanitizedLine.match(/ (\(.+\)$)/)

// remove the parenthesized location from the line, if it was matched
sanitizedLine = location ? sanitizedLine.replace(location[0], '') : sanitizedLine

// if a location was matched, pass it to extractLocation() otherwise pass all sanitizedLine
// because this line doesn't have function name
const [url, lineNumber, columnNumber] = extractLocation(location ? location[1] : sanitizedLine)
let method = (location && sanitizedLine) || ''
let file = url && ['eval', '<anonymous>'].includes(url) ? undefined : url

if (!file || !lineNumber || !columnNumber)
return null

let file = slash(match[2])
if (method.startsWith('async '))
method = method.slice(6)

if (file.startsWith('file://'))
file = file.slice(7)

if (!full && stackIgnorePatterns.some(p => file.includes(p)))
if (!full && stackIgnorePatterns.some(p => file && file.includes(p)))
return null

return {
method: match[1],
file: match[2],
line: parseInt(match[3]),
column: parseInt(match[4]),
method,
file: slash(file),
line: parseInt(lineNumber),
column: parseInt(columnNumber),
}
})
.filter(notNullish)
Expand Down