feat: module separation of temp conf creation for windows

Author: mato533

packages/vscode-wdio-worker/package.json

@@ -6,6 +6,9 @@
     "exports": {
         ".": {
             "import": "./dist/index.js"
+        },
+        "./windows": {
+            "import": "./dist/config.js"
         }
     },
     "scripts": {

packages/vscode-wdio-worker/src/test.ts

@@ -3,7 +3,7 @@ import * as os from 'node:os'
 import { dirname, isAbsolute, join, resolve } from 'node:path'
 
 import { getLauncherInstance } from './cli.js'
-import { createTempConfigFile, isWindows } from './config.js'
+import { getTempConfigCreator, isWindows } from './utils.js'
 import type { RunTestOptions, TestResultData } from '@vscode-wdio/types/api'
 import type { ResultSet } from '@vscode-wdio/types/reporter'
 import type { LoggerInterface } from '@vscode-wdio/types/utils'
@@ -43,7 +43,8 @@ export async function runTest(this: WorkerMetaContext, options: RunTestOptions):
         }
 
         if (isWindows()) {
-            configFile = await createTempConfigFile(options.configPath, outputDir.json!)
+            const creator = await getTempConfigCreator(this)
+            configFile = await creator(options.configPath, outputDir.json!)
             options.configPath = configFile
             wdioArgs.configPath = configFile
         }

packages/vscode-wdio-worker/src/utils.ts

@@ -0,0 +1,25 @@
+import path from 'node:path'
+
+import type { WorkerMetaContext } from '@vscode-wdio/types'
+import type { createTempConfigFile } from './config.js'
+
+export type TempConfigFileCreator = typeof createTempConfigFile
+
+const VSCODE_WINDOWS_CONFIG_CREATOR_PATH = path.resolve(__dirname, 'parser/ast.cjs')
+
+let tempConfigCreator: TempConfigFileCreator | undefined
+
+export async function getTempConfigCreator(context: WorkerMetaContext): Promise<TempConfigFileCreator> {
+    if (tempConfigCreator){
+        context.log.debug('Use cached TempConfigFileCreator')
+        return tempConfigCreator
+    }
+    context.log.debug('Import TempConfigFileCreator')
+    tempConfigCreator =((await import(VSCODE_WINDOWS_CONFIG_CREATOR_PATH)).createTempConfigFile as TempConfigFileCreator)
+    return tempConfigCreator
+
+}
+
+export function isWindows() {
+    return process.platform === 'win32'
+}

packages/vscode-wdio-worker/tests/test.test.ts

@@ -5,8 +5,8 @@ import { join } from 'node:path'
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
 
 import { getLauncherInstance } from '../src/cli.js'
-import { createTempConfigFile, isWindows } from '../src/config.js'
 import { runTest } from '../src/test.js'
+import { getTempConfigCreator, isWindows } from '../src/utils.js'
 import type { Dirent } from 'node:fs'
 import type { WorkerMetaContext } from '@vscode-wdio/types/worker'
 
@@ -21,10 +21,11 @@ vi.mock('../src/cli.js', () => {
     )
     return { getLauncherInstance }
 })
-vi.mock('../src/config.js', () => {
+
+vi.mock('../src/utils.js', () => {
     return {
-        createTempConfigFile: vi.fn(async (config) => config),
         isWindows: vi.fn(() => false),
+        getTempConfigCreator: vi.fn(),
     }
 })
 
@@ -52,6 +53,7 @@ describe('runTest', () => {
     const mockResultDir = '/mock/tmp/dir/result-xyz123'
     const mockResultFile = 'wdio-0-0.json'
     const mockResultData = JSON.stringify({ some: 'test result' })
+    const mockTempConfigCreator = vi.fn(async () => '/path/to/customized/wdio.conf.ts')
 
     beforeEach(() => {
         // Reset mocks
@@ -63,10 +65,13 @@ describe('runTest', () => {
         vi.mocked(fs.mkdir).mockResolvedValue(undefined)
         vi.mocked(fs.mkdtemp).mockResolvedValue(mockResultDir)
         vi.mocked(fs.access).mockResolvedValue(undefined)
+        // @ts-ignore
         vi.mocked(fs.readdir).mockResolvedValue([mockResultFile as unknown as Dirent])
         vi.mocked(fs.readFile).mockResolvedValue(Buffer.from(mockResultData))
         vi.mocked(fs.rm).mockResolvedValue(undefined)
 
+        vi.mocked(getTempConfigCreator).mockResolvedValue(mockTempConfigCreator)
+
         // Mock console methods
         vi.spyOn(console, 'log').mockImplementation(() => {})
         vi.spyOn(console, 'error').mockImplementation(() => {})
@@ -104,7 +109,6 @@ describe('runTest', () => {
 
     it('should run tests successfully and return results on the windows', async () => {
         vi.mocked(isWindows).mockReturnValue(true)
-        vi.mocked(createTempConfigFile).mockResolvedValue('/path/to/customized/wdio.conf.ts')
         // Act
         const result = await runTest.call(mockContext, mockOptions)
 
@@ -122,7 +126,7 @@ describe('runTest', () => {
         expect(fs.mkdtemp).toHaveBeenCalledWith(join(mockTmpDir, 'vscode-webdriverio', 'result-'))
 
         // Verify createTempConfigFile were called
-        expect(createTempConfigFile).toHaveBeenCalledWith(mockConfigFile, mockResultDir)
+        expect(mockTempConfigCreator).toHaveBeenCalledWith(mockConfigFile, mockResultDir)
 
         // Verify result files were read
         expect(fs.readdir).toHaveBeenCalledWith(mockResultDir)

packages/vscode-webdriverio/package.json

@@ -19,6 +19,10 @@
         "./reporter": {
             "requireSource": "./src/reporter.ts",
             "require": "./dist/reporter.cjs"
+        },
+        "./parser/ast": {
+            "requireSource": "./src/parser/ast.ts",
+            "require": "./dist/parser/ast.cjs"
         }
     },
     "scripts": {

packages/vscode-webdriverio/src/parser/ast.ts

@@ -0,0 +1 @@
+export { createTempConfigFile } from '@vscode-wdio/worker/windows'