diff --git a/packages/extension/src/api.ts b/packages/extension/src/api.ts index 78f9fb3..5a6a6eb 100644 --- a/packages/extension/src/api.ts +++ b/packages/extension/src/api.ts @@ -187,13 +187,13 @@ async function createVitestProcessAPI( pkg: VitestPackage, ): Promise { return withProcess(pkg, async (meta) => { - meta.config.projects.forEach((project) => { + meta.metadata.projects.forEach((project) => { if (project.config) { usedConfigs.add(project.config) } }) const files = await meta.rpc.getFiles() - const config = new VitestProjectConfig(pkg, meta.config) + const config = new VitestProjectConfig(pkg, meta.metadata) const api = new VitestProcessAPI(config) return { api, files } }) diff --git a/packages/extension/src/apiProcess.ts b/packages/extension/src/apiProcess.ts index 13387e4..5801efa 100644 --- a/packages/extension/src/apiProcess.ts +++ b/packages/extension/src/apiProcess.ts @@ -1,4 +1,4 @@ -import type { ExtensionWorkerConfig, SerializedProject } from 'vitest-vscode-shared' +import type { SerializedProject, WorkerReadyMetadata } from 'vitest-vscode-shared' import type { VitestPackage } from './spawn/pkg' import { usesJestTestNamePattern } from './spawn/pkg' import type { ExtensionWorkerEvents, VitestExtensionRPC } from './spawn/rpc' @@ -22,7 +22,7 @@ export class VitestProjectConfig { constructor( readonly pkg: VitestPackage, - readonly extensionConfig: ExtensionWorkerConfig, + readonly metadata: WorkerReadyMetadata, ) { this.id = normalize(pkg.id) this.workspaceFolder = pkg.folder @@ -42,11 +42,11 @@ export class VitestProjectConfig { } get projects(): SerializedProject[] { - return this.extensionConfig.projects + return this.metadata.projects } get workspaceSource() { - return this.extensionConfig.workspaceSource + return this.metadata.workspaceSource } get version() { @@ -118,7 +118,7 @@ export class VitestProcessAPI { * a handle wrapping the existing process (without closing it). */ static forDebug(pkg: VitestPackage, meta: ResolvedMeta): VitestProcessAPI { - const config = new VitestProjectConfig(pkg, meta.config) + const config = new VitestProjectConfig(pkg, meta.metadata) const api = new VitestProcessAPI(config) api.currentMeta = meta return api @@ -328,7 +328,7 @@ export interface RunHandlers { export interface ResolvedMeta { rpc: VitestExtensionRPC - config: ExtensionWorkerConfig + metadata: WorkerReadyMetadata process: ExtensionWorkerProcess pkg: VitestPackage handlers: { diff --git a/packages/extension/src/spawn/terminal.ts b/packages/extension/src/spawn/terminal.ts index 221939b..0c25b5b 100644 --- a/packages/extension/src/spawn/terminal.ts +++ b/packages/extension/src/spawn/terminal.ts @@ -93,7 +93,7 @@ export async function createVitestTerminalProcess( const vitestProcess = new ExtensionTerminalProcess(terminal, server, meta.ws) return { rpc: meta.rpc, - config: meta.config, + metadata: meta.metadata, handlers: meta.handlers, pkg, process: vitestProcess, diff --git a/packages/extension/src/spawn/ws.ts b/packages/extension/src/spawn/ws.ts index b0ab02a..65c157d 100644 --- a/packages/extension/src/spawn/ws.ts +++ b/packages/extension/src/spawn/ws.ts @@ -114,9 +114,9 @@ export function onWsConnection( } onStart({ rpc: api, - config: { - ...message.config, - projects: message.config.projects.map((p) => { + metadata: { + ...message.metadata, + projects: message.metadata.projects.map((p) => { if (p.dir) { p.dir = resolve(pkg.cwd, p.dir) } diff --git a/packages/extension/src/worker/index.ts b/packages/extension/src/worker/index.ts index 7105368..6b86cca 100644 --- a/packages/extension/src/worker/index.ts +++ b/packages/extension/src/worker/index.ts @@ -39,7 +39,7 @@ emitter.on('message', async function onMessage(message: any) { const workerPath = pathToFileURL(join(__dirname, workerName)) const initModule = await import(workerPath.toString()) - const { config, createWorker, reporter } = await initModule.initVitest( + const { createWorker, metadata, reporter } = await initModule.initVitest( vitestModule, data, emitter, @@ -73,7 +73,7 @@ emitter.on('message', async function onMessage(message: any) { }) worker.initRpc(rpc) reporter.initRpc(rpc) - emitter.ready(config, isLegacy, vitestModule.version) + emitter.ready(metadata, isLegacy, vitestModule.version) await worker.vitest.report('onInit', worker.vitest) } catch (err: any) { diff --git a/packages/shared/src/emitter.ts b/packages/shared/src/emitter.ts index c2b60df..fcd5ea2 100644 --- a/packages/shared/src/emitter.ts +++ b/packages/shared/src/emitter.ts @@ -1,4 +1,4 @@ -import type { ExtensionWorkerConfig, WorkerEvent } from 'vitest-vscode-shared' +import type { WorkerEvent, WorkerReadyMetadata } from 'vitest-vscode-shared' import type WebSocket from 'ws' abstract class WorkerEventEmitter { @@ -8,8 +8,8 @@ abstract class WorkerEventEmitter { abstract on(event: string, listener: (...args: any[]) => void): void abstract off(event: string, listener: (...args: any[]) => void): void - ready(config: ExtensionWorkerConfig, legacy: boolean, version: string | undefined) { - this.sendWorkerEvent({ type: 'ready', config, legacy, version }) + ready(metadata: WorkerReadyMetadata, legacy: boolean, version: string | undefined) { + this.sendWorkerEvent({ type: 'ready', metadata, legacy, version }) } error(err: any) { diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts index 1483383..9e1cd88 100644 --- a/packages/shared/src/index.ts +++ b/packages/shared/src/index.ts @@ -189,14 +189,14 @@ export interface SerializedProject { } } -export interface ExtensionWorkerConfig { +export interface WorkerReadyMetadata { projects: SerializedProject[] workspaceSource: string | false } export interface EventReady { type: 'ready' - config: ExtensionWorkerConfig + metadata: WorkerReadyMetadata legacy: boolean // the actual runtime version, unlike VitestPackage.version // this is also defined when vitest is resolved via yarn pnp diff --git a/packages/worker-legacy/src/index.ts b/packages/worker-legacy/src/index.ts index 7e5aaae..cdb0bdb 100644 --- a/packages/worker-legacy/src/index.ts +++ b/packages/worker-legacy/src/index.ts @@ -1,6 +1,6 @@ import type { - ExtensionWorkerConfig, SerializedProject, + WorkerReadyMetadata, WorkerRunnerOptions, WorkerWSEventEmitter, } from 'vitest-vscode-shared' @@ -203,11 +203,11 @@ export async function initVitest( : vitest.config.workspace != null || vitest.config.projects != null ? vitest.server.config.configFile || false : false - const config: ExtensionWorkerConfig = { projects, workspaceSource } + const metadata: WorkerReadyMetadata = { projects, workspaceSource } return { vitest, reporter, - config, + metadata, meta, createWorker() { return new ExtensionWorker(vitest, !!data.debug, emitter) diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts index 60c0dd2..727004a 100644 --- a/packages/worker/src/index.ts +++ b/packages/worker/src/index.ts @@ -1,6 +1,6 @@ import type { - ExtensionWorkerConfig, SerializedProject, + WorkerReadyMetadata, WorkerRunnerOptions, WorkerWSEventEmitter, } from 'vitest-vscode-shared' @@ -168,11 +168,11 @@ export async function initVitest( const workspaceSource: string | false = vitest.config.projects != null ? vitest.vite.config.configFile || false : false - const config: ExtensionWorkerConfig = { projects, workspaceSource } + const metadata: WorkerReadyMetadata = { projects, workspaceSource } return { vitest, reporter, - config, + metadata, meta, createWorker() { return new ExtensionWorker(vitest, !!data.debug, emitter)