refactor: clean public API and fix bugs in phpunit package

- Remove dead re-exports from Printer barrel (AnsiStyle, DEFAULT_THEME, ColorTheme)
- Narrow root barrel to only export TestDefinition and TestType from types.ts
- Remove resolveWasmDir from public API
- Fix double close event in TestRunner when process spawn fails
- Fix XmlElement.getText() return type to string | undefined with call-site guards
- Fix TestStore.set() to remove file from old suite when moving to new suite

Author: recca0120

packages/phpunit/src/Configuration/PHPUnitXML.ts

@@ -78,8 +78,9 @@ export class PHPUnitXML {
             const name = parent.getAttribute('name') as string;
             const prefix = node.getAttribute('prefix');
             const suffix = node.getAttribute('suffix');
+            const text = node.getText() ?? '';
 
-            return { tag, name, value: this.resolveToRoot(root, node.getText()), prefix, suffix };
+            return { tag, name, value: this.resolveToRoot(root, text), prefix, suffix };
         };
 
         const excludeCallback = (_tag: string, node: XmlElement, parent: XmlElement) => {
@@ -95,7 +96,7 @@ export class PHPUnitXML {
                 node.querySelectorAll(type).map((child) => ({
                     tag: 'exclude',
                     name,
-                    value: this.resolveToRoot(root, child.getText()),
+                    value: this.resolveToRoot(root, child.getText() ?? ''),
                 })),
             );
         };
@@ -166,7 +167,7 @@ export class PHPUnitXML {
         for (const parent of this.element.querySelectorAll('phpunit testsuites testsuite')) {
             for (const node of parent.querySelectorAll('directory')) {
                 const dir = node.getText();
-                if (dir.startsWith('..')) {
+                if (dir?.startsWith('..')) {
                     const resolvedAbs = resolve(configRoot, dir);
                     const configRootAbs = resolve(configRoot);
 
@@ -195,9 +196,9 @@ export class PHPUnitXML {
                 const prefix = node.getAttribute('prefix');
                 const suffix = node.getAttribute('suffix');
 
-                return { tag, value: node.getText(), prefix, suffix };
+                return { tag, value: node.getText() ?? '', prefix, suffix };
             },
-            file: (tag: string, node: XmlElement) => ({ tag, value: node.getText() }),
+            file: (tag: string, node: XmlElement) => ({ tag, value: node.getText() ?? '' }),
         });
     }
 

packages/phpunit/src/Configuration/XmlElement.ts

@@ -18,12 +18,12 @@ export class XmlElement {
         return (this.node[`@_${key}`] as string) ?? undefined;
     }
 
-    getText(): string {
+    getText(): string | undefined {
         if (typeof this.node === 'string') {
             return this.node;
         }
 
-        return this.node['#text'] as string;
+        return this.node['#text'] as string | undefined;
     }
 
     querySelector(selector: string) {

packages/phpunit/src/Interpreter/AstParser/index.ts

@@ -1,4 +1,4 @@
 export * from './ChainAstParser';
 export * from './PhpParser/PhpParserAstParser';
 export * from './TreeSitter/TreeSitterAstParser';
-export { initTreeSitter, resolveWasmDir } from './TreeSitter/TreeSitterParser';
+export { initTreeSitter } from './TreeSitter/TreeSitterParser';

packages/phpunit/src/Printer/index.ts

@@ -1,4 +1,3 @@
-export * from './AnsiStyle';
 export * from './OutputWriter';
 export * from './Printer';
 export * from './PrinterConfig';

packages/phpunit/src/TestCollection/TestStore.test.ts

@@ -197,6 +197,21 @@ describe('TestStore', () => {
         expect(store.size).toBe(2);
     });
 
+    it('set removes file from old suite when moving to new suite', () => {
+        const store = new TestStore();
+        const uri = URI.file('/project/tests/FooTest.php');
+
+        store.set('suiteA', uri, makeTests(['t1'], uri.fsPath));
+        store.set('suiteB', uri, makeTests(['t2'], uri.fsPath));
+
+        const files = [...store.gatherFiles()];
+        const matchingFiles = files.filter((f) => f.uri.toString() === uri.toString());
+        expect(matchingFiles).toHaveLength(1);
+        expect(matchingFiles[0].testsuite).toBe('suiteB');
+        expect(store.getDefinition('t1')).toBeUndefined();
+        expect(store.getDefinition('t2')).toBeDefined();
+    });
+
     it('initSuites does not overwrite existing suites', () => {
         const store = new TestStore();
         const uri = URI.file('/project/tests/FooTest.php');

packages/phpunit/src/TestCollection/TestStore.ts

@@ -20,8 +20,9 @@ export class TestStore {
     }
 
     set(testsuite: string, uri: URI, tests: TestDefinition[]): void {
-        this.remove(testsuite, uri);
         const uriStr = uri.toString();
+        const oldSuite = this.fileIndex.get(uriStr);
+        this.remove(oldSuite ?? testsuite, uri);
 
         let suiteFiles = this.suites.get(testsuite);
         if (!suiteFiles) {

packages/phpunit/src/TestRunner/TestRunner.ts

@@ -14,6 +14,7 @@ export class TestRunner {
     private readonly testOutputParser = new TestOutputParser();
     private readonly teamcityPattern = /##teamcity\[/i;
     private observers: TestRunnerObserver[] = [];
+    private closed = false;
 
     constructor() {
         this.defaultObserver = createTestRunnerEventProxy();
@@ -34,6 +35,7 @@ export class TestRunner {
     }
 
     run(builder: ProcessBuilder) {
+        this.closed = false;
         const process = new TestRunnerProcess(builder);
 
         process.on('start', (builder: ProcessBuilder) => this.emit(TestRunnerEvent.run, builder));
@@ -56,12 +58,16 @@ export class TestRunner {
     }
 
     private handleProcessError(err: Error) {
+        this.closed = true;
         const error = err.stack ?? err.message;
         this.emit(TestRunnerEvent.error, error);
         this.emit(TestRunnerEvent.close, 2);
     }
 
     private handleProcessClose(code: number | null, output: string) {
+        if (this.closed) {
+            return;
+        }
         const eventName = this.teamcityPattern.test(output)
             ? TestRunnerEvent.output
             : TestRunnerEvent.error;

packages/phpunit/src/index.ts

@@ -6,5 +6,5 @@ export * from './TestCoverage';
 export * from './TestOutput/types';
 export * from './TestParser';
 export * from './TestRunner';
-export * from './types';
+export { type TestDefinition, TestType } from './types';
 export { EOL, parseDataset, semverGte, semverLt } from './utils';