clarify oxlint fixture ownership

Co-authored-by: Kent C. Dodds <me+github@kentcdodds.com>

Author: cursoragent

lint-rules/oxlint-test-utils.js

@@ -65,45 +65,60 @@ export async function writeOxlintFixture({
 }
 
 export async function runOxlint(input) {
-	const fixture =
-		'filePath' in input && 'configPath' in input
-			? input
-			: await writeOxlintFixture(input)
-
-	const args = ['--config', fixture.configPath, '--format', 'json', fixture.filePath]
-
-	if (fixture.typeAware) args.unshift('--type-aware')
-
-	const result = await new Promise((resolve, reject) => {
-		const child = spawn(oxlintBinary, args, {
-			cwd: rootDirectory,
-			stdio: ['ignore', 'pipe', 'pipe'],
+	const fixtureWasProvided = 'filePath' in input && 'configPath' in input
+	const fixture = fixtureWasProvided ? input : await writeOxlintFixture(input)
+
+	try {
+		const args = [
+			'--config',
+			fixture.configPath,
+			'--format',
+			'json',
+			fixture.filePath,
+		]
+
+		if (fixture.typeAware) args.unshift('--type-aware')
+
+		const result = await new Promise((resolve, reject) => {
+			const child = spawn(oxlintBinary, args, {
+				cwd: rootDirectory,
+				stdio: ['ignore', 'pipe', 'pipe'],
+			})
+			let stdout = ''
+			let stderr = ''
+
+			child.stdout.on('data', (chunk) => {
+				stdout += chunk
+			})
+			child.stderr.on('data', (chunk) => {
+				stderr += chunk
+			})
+			child.on('error', reject)
+			child.on('close', (exitCode) => {
+				resolve({ exitCode, stderr, stdout })
+			})
 		})
-		let stdout = ''
-		let stderr = ''
 
-		child.stdout.on('data', (chunk) => {
-			stdout += chunk
-		})
-		child.stderr.on('data', (chunk) => {
-			stderr += chunk
-		})
-		child.on('error', reject)
-		child.on('close', (exitCode) => {
-			resolve({ exitCode, stderr, stdout })
-		})
-	})
+		if (result.stderr) {
+			throw new Error(result.stderr)
+		}
 
-	if (result.stderr) {
-		throw new Error(result.stderr)
-	}
+		if (result.exitCode && result.exitCode !== 0) {
+			throw new Error(result.stdout || `Oxlint exited with code ${result.exitCode}`)
+		}
 
-	if (result.exitCode && result.exitCode !== 0) {
-		throw new Error(result.stdout || `Oxlint exited with code ${result.exitCode}`)
+		const stdout = result.stdout.trim()
+		return stdout ? JSON.parse(stdout) : { diagnostics: [] }
+	} finally {
+		if (!fixtureWasProvided) {
+			await disposeOxlintFixture(fixture)
+		}
 	}
+}
 
-	const stdout = result.stdout.trim()
-	return stdout ? JSON.parse(stdout) : { diagnostics: [] }
+export async function disposeOxlintFixture(fixture) {
+	// oxlint-disable-next-line epic-web/no-manual-dispose
+	await fixture[Symbol.asyncDispose]()
 }
 
 export async function readLockfile() {

lint-rules/prefer-dispose-in-tests.test.js

@@ -1,15 +1,11 @@
 import { describe, expect, it } from 'vitest'
 
 import {
+	disposeOxlintFixture,
 	runOxlint,
 	writeOxlintFixture,
 } from './oxlint-test-utils.js'
 
-async function cleanupFixture(fixture) {
-	// oxlint-disable-next-line epic-web/no-manual-dispose
-	await fixture[Symbol.asyncDispose]()
-}
-
 describe('epic-web/prefer-dispose-in-tests', () => {
 	it('reports lifecycle hooks that can move into a test body', async () => {
 		const fixture = await writeOxlintFixture({
@@ -38,7 +34,7 @@ describe('epic-web/prefer-dispose-in-tests', () => {
 			})
 			expect(result.diagnostics[0].message).toContain('instead of beforeEach')
 		} finally {
-		await cleanupFixture(fixture)
+			await disposeOxlintFixture(fixture)
 		}
 	})
 
@@ -76,7 +72,7 @@ describe('epic-web/prefer-dispose-in-tests', () => {
 			const result = await runOxlint(fixture)
 			expect(result.diagnostics).toHaveLength(0)
 		} finally {
-		await cleanupFixture(fixture)
+			await disposeOxlintFixture(fixture)
 		}
 	})
 
@@ -106,7 +102,7 @@ describe('epic-web/prefer-dispose-in-tests', () => {
 			expect(result.diagnostics).toHaveLength(1)
 			expect(result.diagnostics[0].message).toContain('instead of beforeEach')
 		} finally {
-		await cleanupFixture(fixture)
+			await disposeOxlintFixture(fixture)
 		}
 	})
 })