chore: update code styling

Author: mato533

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

@@ -28,12 +28,12 @@ export class RepositoryManager implements IRepositoryManager {
     private _workspaceTestItems: vscode.TestItem[] = []
     private _wdioConfigTestItems: vscode.TestItem[] = []
     private _isInitialized = false
-    private isCreatedDefaultProfile = false
+    private _isCreatedDefaultProfile = false
 
     constructor(
         public readonly controller: vscode.TestController,
         public readonly configManager: ExtensionConfigManager,
-        private readonly workerManager: IWorkerManager,
+        private readonly _workerManager: IWorkerManager,
         private readonly _metadata = new MetadataRepository()
     ) {
         this._loadingTestItem = this.controller.createTestItem(LOADING_TEST_ITEM_ID, 'Resolving WebdriverIO Tests...')
@@ -56,7 +56,7 @@ export class RepositoryManager implements IRepositoryManager {
                 .then(async () => await this.initialize())
                 .then(async () => await Promise.all(this.repos.map(async (repo) => await repo.discoverAllTests())))
                 .then(() => this.registerToTestController())
-                .then(() => this.workerManager.reorganize(configManager.getWdioConfigPaths()))
+                .then(() => this._workerManager.reorganize(configManager.getWdioConfigPaths()))
         })
     }
 
@@ -86,11 +86,11 @@ export class RepositoryManager implements IRepositoryManager {
 
         this._workspaceTestItems = await Promise.all(
             workspaces.map(async (workspace) => {
-                const workspaceTestItem = this.createWorkspaceTestItem(workspace.workspaceFolder)
+                const workspaceTestItem = this._createWorkspaceTestItem(workspace.workspaceFolder)
                 for (const wdioConfigFile of workspace.wdioConfigFiles) {
-                    await this.createWdioConfigTestItem(workspace.workspaceFolder, workspaceTestItem, wdioConfigFile)
+                    await this._createWdioConfigTestItem(workspace.workspaceFolder, workspaceTestItem, wdioConfigFile)
 
-                    this.isCreatedDefaultProfile = true
+                    this._isCreatedDefaultProfile = true
                 }
                 return workspaceTestItem
             })
@@ -104,7 +104,7 @@ export class RepositoryManager implements IRepositoryManager {
             return item.uri?.fsPath === workspaceFolder.uri.fsPath
         })
         for (const workspaceTestItem of affectedWorkspaceItems) {
-            const configTestItem = await this.createWdioConfigTestItem(
+            const configTestItem = await this._createWdioConfigTestItem(
                 workspaceFolder,
                 workspaceTestItem,
                 wdioConfigPath
@@ -125,7 +125,7 @@ export class RepositoryManager implements IRepositoryManager {
         log.debug(`Remove the config file from ${affectedWorkspaceItems.length} workspace(s)`)
         const configUri = convertPathToUri(wdioConfigPath)
         for (const workspaceItem of affectedWorkspaceItems) {
-            const config = workspaceItem.children.get(this.generateConfigTestItemId(workspaceItem, configUri))
+            const config = workspaceItem.children.get(this._generateConfigTestItemId(workspaceItem, configUri))
             if (!config) {
                 continue
             }
@@ -141,7 +141,7 @@ export class RepositoryManager implements IRepositoryManager {
                     this.controller.items.delete(workspaceItem.id)
                 }
             } else {
-                const targetId = this.generateConfigTestItemId(workspaceItem, configUri)
+                const targetId = this._generateConfigTestItemId(workspaceItem, configUri)
                 log.debug(`Remove Configuration from the controller: ${targetId}`)
                 this.controller.items.delete(targetId)
             }
@@ -162,7 +162,7 @@ export class RepositoryManager implements IRepositoryManager {
         log.debug('Successfully registered.')
     }
 
-    private createWorkspaceTestItem(workspaceFolder: vscode.WorkspaceFolder) {
+    private _createWorkspaceTestItem(workspaceFolder: vscode.WorkspaceFolder) {
         const workspaceItem = this.controller.createTestItem(
             `workspace:${workspaceFolder.uri.fsPath}`,
             workspaceFolder.name,
@@ -172,14 +172,14 @@ export class RepositoryManager implements IRepositoryManager {
         return workspaceItem
     }
 
-    private async createWdioConfigTestItem(
+    private async _createWdioConfigTestItem(
         workspaceFolder: vscode.WorkspaceFolder,
         workspaceTestItem: vscode.TestItem,
         wdioConfigPath: string
     ) {
         const uri = convertPathToUri(wdioConfigPath)
         const configItem = this.controller.createTestItem(
-            this.generateConfigTestItemId(workspaceTestItem, uri),
+            this._generateConfigTestItemId(workspaceTestItem, uri),
             basename(wdioConfigPath),
             uri
         )
@@ -192,20 +192,20 @@ export class RepositoryManager implements IRepositoryManager {
             this.controller,
             wdioConfigPath,
             configItem,
-            this.workerManager,
+            this._workerManager,
             workspaceFolder
         )
         this._repos.add(repository)
 
         configItem.description = relative(workspaceTestItem.uri!.fsPath, dirname(wdioConfigPath))
 
-        const runProfiles = createRunProfile.call(this, configItem, !this.isCreatedDefaultProfile)
+        const runProfiles = createRunProfile.call(this, configItem, !this._isCreatedDefaultProfile)
 
         this._metadata.createWdioConfigFileMetadata(configItem, { uri, repository, runProfiles })
         return configItem
     }
 
-    private generateConfigTestItemId(workspaceTestItem: vscode.TestItem, configUri: vscode.Uri) {
+    private _generateConfigTestItemId(workspaceTestItem: vscode.TestItem, configUri: vscode.Uri) {
         return [workspaceTestItem.id, `config:${configUri.fsPath}`].join(TEST_ID_SEPARATOR)
     }
 
@@ -225,7 +225,7 @@ export class RepositoryManager implements IRepositoryManager {
             )
 
             this.registerToTestController()
-            await this.workerManager.reorganize(this.configManager.getWdioConfigPaths())
+            await this._workerManager.reorganize(this.configManager.getWdioConfigPaths())
         } catch (error) {
             this.controller.items.replace([])
             const errorMessage = error instanceof Error ? error.message : String(error)

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

@@ -2,9 +2,10 @@ import type { ITestRepository, TestItemMetadata, TestType } from '@vscode-wdio/t
 import type * as vscode from 'vscode'
 
 export class MetadataRepository {
-    private static testMetadataRepository = new WeakMap<vscode.TestItem, TestItemMetadata>()
+    private static _testMetadataRepository = new WeakMap<vscode.TestItem, TestItemMetadata>()
+
     public getMetadata(testItem: vscode.TestItem) {
-        const metadata = MetadataRepository.testMetadataRepository.get(testItem)
+        const metadata = MetadataRepository._testMetadataRepository.get(testItem)
         if (!metadata) {
             throw new Error("The metadata for TestItem is not set. This is extension's bug.")
         }
@@ -20,7 +21,7 @@ export class MetadataRepository {
     }
 
     protected setMetadata(testItem: vscode.TestItem, metadata: TestItemMetadata) {
-        MetadataRepository.testMetadataRepository.set(testItem, metadata)
+        MetadataRepository._testMetadataRepository.set(testItem, metadata)
     }
 
     public createTestMetadata(

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

@@ -48,11 +48,11 @@ export class TestReporter {
 
                     // Process suites in this spec file
                     for (const suite of result.suites) {
-                        this.processHierarchicalSuite(suite, specTestItem)
+                        this._processHierarchicalSuite(suite, specTestItem)
                     }
 
                     // Update spec file status based on overall result status
-                    this.updateSpecFileStatus(specTestItem, result)
+                    this._updateSpecFileStatus(specTestItem, result)
                 }
 
                 // Check if any test failed
@@ -74,7 +74,7 @@ export class TestReporter {
      * @param suite The suite result from WebdriverIO with potential nested suites
      * @param parentItem The parent TestItem (spec file or parent suite)
      */
-    private processHierarchicalSuite(suite: TestSuite, parentItem: vscode.TestItem): void {
+    private _processHierarchicalSuite(suite: TestSuite, parentItem: vscode.TestItem): void {
         // Find the suite TestItem in the repository
         let suiteItem: vscode.TestItem | undefined
 
@@ -91,26 +91,26 @@ export class TestReporter {
 
         // Process tests in this suite
         for (const test of suite.tests) {
-            this.processTest(test, suiteItem)
+            this._processTest(test, suiteItem)
         }
 
         // Process nested suites if any
         if (suite.suites && suite.suites.length > 0) {
             for (const nestedSuite of suite.suites) {
-                this.processHierarchicalSuite(nestedSuite, suiteItem)
+                this._processHierarchicalSuite(nestedSuite, suiteItem)
             }
         }
 
         // Set suite status based on its tests
-        this.updateSuiteStatus(suiteItem, suite)
+        this._updateSuiteStatus(suiteItem, suite)
     }
 
     /**
      * Process a test and update its status
      * @param test The test result from WebdriverIO
      * @param suiteItem The parent suite TestItem
      */
-    private processTest(test: Test, suiteItem: vscode.TestItem): void {
+    private _processTest(test: Test, suiteItem: vscode.TestItem): void {
         // Find the test item in the children of the suite item
         let testItem: vscode.TestItem | undefined
 
@@ -148,7 +148,7 @@ export class TestReporter {
      * @param suiteItem The suite TestItem
      * @param suiteResult The suite result from WebdriverIO
      */
-    private updateSuiteStatus(suiteItem: vscode.TestItem, suiteResult: TestSuite): void {
+    private _updateSuiteStatus(suiteItem: vscode.TestItem, suiteResult: TestSuite): void {
         const hasFailedTests = suiteResult.tests.some((test) => test.state === 'failed')
 
         if (hasFailedTests || suiteResult.tests.length > 0) {
@@ -168,7 +168,7 @@ export class TestReporter {
      * @param specItem The spec file TestItem
      * @param result The WebdriverIO result for this spec file
      */
-    private updateSpecFileStatus(specItem: vscode.TestItem, result: ResultSet): void {
+    private _updateSpecFileStatus(specItem: vscode.TestItem, result: ResultSet): void {
         if (result.state.failed > 0) {
             const message = new vscode.TestMessage(
                 `${result.state.failed} tests failed out of ${result.state.passed + result.state.failed + result.state.skipped}`

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

@@ -68,7 +68,7 @@ export class TestRepository extends WorkerMiddleware implements ITestRepository
         return this._framework
     }
 
-    private async getEnvOptions() {
+    private async _getEnvOptions() {
         return await getEnvOptions(this.configManager, this._workspaceFolder)
     }
 
@@ -79,7 +79,7 @@ export class TestRepository extends WorkerMiddleware implements ITestRepository
         try {
             const worker = await this.getWorker()
             const config = await worker.rpc.loadWdioConfig({
-                env: await this.getEnvOptions(),
+                env: await this._getEnvOptions(),
                 configFilePath: this.wdioConfigPath,
             })
 
@@ -95,7 +95,7 @@ export class TestRepository extends WorkerMiddleware implements ITestRepository
             this._specPatterns = config.specPatterns
 
             // Get specs from configuration
-            const allSpecs = this.convertPathString(config.specs)
+            const allSpecs = this._convertPathString(config.specs)
 
             if (allSpecs.length < 1) {
                 log.debug('No spec files found in configuration')
@@ -105,7 +105,7 @@ export class TestRepository extends WorkerMiddleware implements ITestRepository
             log.debug(`Discovered ${allSpecs.length} spec files`)
 
             // Register all specs
-            return await this.resisterSpecs(allSpecs)
+            return await this._resisterSpecs(allSpecs)
         } catch (error) {
             log.error(`Failed to discover tests: ${(error as Error).message}`)
             log.trace(`Failed to discover tests: ${(error as Error).stack}`)
@@ -120,7 +120,7 @@ export class TestRepository extends WorkerMiddleware implements ITestRepository
         try {
             const worker = await this.getWorker()
             const config = await worker.rpc.loadWdioConfig({
-                env: await this.getEnvOptions(),
+                env: await this._getEnvOptions(),
                 configFilePath: this.wdioConfigPath,
             })
             if (!config) {
@@ -131,10 +131,10 @@ export class TestRepository extends WorkerMiddleware implements ITestRepository
             this._specPatterns = config.specPatterns
 
             // Get specs from configuration
-            const allConfigSpecs = this.convertPathString(config.specs)
+            const allConfigSpecs = this._convertPathString(config.specs)
             if (!filePaths || filePaths.length === 0) {
                 for (const [fileId] of this._fileMap.entries()) {
-                    this.removeSpecFileById(fileId)
+                    this._removeSpecFileById(fileId)
                 }
             }
             // Filter specs to only include those that match the provided file paths
@@ -158,7 +158,7 @@ export class TestRepository extends WorkerMiddleware implements ITestRepository
                 }
             }
             // Register the updated spec files
-            await this.resisterSpecs(specsToReload, false)
+            await this._resisterSpecs(specsToReload, false)
 
             log.debug(`Successfully reloaded ${specsToReload.length} spec files`)
         } catch (error) {
@@ -178,7 +178,7 @@ export class TestRepository extends WorkerMiddleware implements ITestRepository
         }
     }
 
-    private getTestFileId(wdioConfigTestItem: vscode.TestItem, testFilePath: string) {
+    private _getTestFileId(wdioConfigTestItem: vscode.TestItem, testFilePath: string) {
         return [wdioConfigTestItem.id, testFilePath].join(TEST_ID_SEPARATOR)
     }
 
@@ -187,14 +187,14 @@ export class TestRepository extends WorkerMiddleware implements ITestRepository
      * @param specs Paths to spec files
      * @param replaceAllSpecFiles if all spec files to resister, this parameter must be true
      */
-    private async resisterSpecs(specs: string[], replaceAllSpecFiles: boolean = true) {
+    private async _resisterSpecs(specs: string[], replaceAllSpecFiles: boolean = true) {
         if (replaceAllSpecFiles) {
             this._fileMap.clear()
         }
         log.debug(`Spec files registration is started for: ${specs.length} files.`)
         const worker = await this.getWorker()
         const testData = await worker.rpc.readSpecs({
-            env: await this.getEnvOptions(),
+            env: await this._getEnvOptions(),
             specs,
         })
 
@@ -203,11 +203,11 @@ export class TestRepository extends WorkerMiddleware implements ITestRepository
                 testData.map(async (test) => {
                     try {
                         // Create TestItem testFile by testFile
-                        const fileId = this.getTestFileId(this._wdioConfigTestItem, test.spec)
+                        const fileId = this._getTestFileId(this._wdioConfigTestItem, test.spec)
 
                         const specFileUri = vscode.Uri.file(test.spec)
 
-                        const fileTestItem = this.resisterSpecFile(fileId, specFileUri)
+                        const fileTestItem = this._resisterSpecFile(fileId, specFileUri)
                         for (const testCase of test.tests) {
                             fileTestItem.children.add(
                                 testTreeCreator(this, this._metadata, fileId, testCase, specFileUri)
@@ -241,11 +241,11 @@ export class TestRepository extends WorkerMiddleware implements ITestRepository
      */
     public removeSpecFile(specPath: string): void {
         const normalizedPath = normalizePath(specPath)
-        const fileId = this.getTestFileId(this._wdioConfigTestItem, normalizedPath)
-        this.removeSpecFileById(fileId, specPath)
+        const fileId = this._getTestFileId(this._wdioConfigTestItem, normalizedPath)
+        this._removeSpecFileById(fileId, specPath)
     }
 
-    private removeSpecFileById(fileId: string, _specPath?: string): void {
+    private _removeSpecFileById(fileId: string, _specPath?: string): void {
         const specPath = _specPath ? _specPath : fileId.split(TEST_ID_SEPARATOR)[2]
         // Get the TestItem for this spec file
         const fileItem = this._fileMap.get(fileId)
@@ -266,7 +266,7 @@ export class TestRepository extends WorkerMiddleware implements ITestRepository
     /**
      * Convert spec paths from WebdriverIO config to file system paths
      */
-    private convertPathString(specs: (string | string[])[]) {
+    private _convertPathString(specs: (string | string[])[]) {
         return specs.flatMap((spec) => (Array.isArray(spec) ? spec.map((path) => path) : [spec]))
     }
 
@@ -276,7 +276,7 @@ export class TestRepository extends WorkerMiddleware implements ITestRepository
      * @param uri Spec file URI
      * @returns TestItem for the spec file
      */
-    private resisterSpecFile(id: string, uri: vscode.Uri) {
+    private _resisterSpecFile(id: string, uri: vscode.Uri) {
         log.trace(`[repository] spec file was registered: ${id}`)
         const fileTestItem = this.controller.createTestItem(id, path.basename(uri.fsPath), uri)
         fileTestItem.sortText = uri.fsPath

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

@@ -11,18 +11,18 @@ import type { IExtensionConfigManager } from '@vscode-wdio/types/config'
 import type { RepositoryManager } from './manager.js'
 
 class TestQueue {
-    private queue: vscode.TestItem[] = []
+    private _queue: vscode.TestItem[] = []
 
     push(item: vscode.TestItem) {
-        this.queue.push(item)
+        this._queue.push(item)
     }
 
-    forEach(cb: Parameters<typeof this.queue.forEach>[0]) {
-        this.queue.forEach(cb)
+    forEach(cb: Parameters<typeof this._queue.forEach>[0]) {
+        this._queue.forEach(cb)
     }
 
     [Symbol.iterator]() {
-        return this.queue[Symbol.iterator]()
+        return this._queue[Symbol.iterator]()
     }
 }