TS2Swift: inject diagnostics for export assignment test

Author: kateinoigakukun

Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js

@@ -97,13 +97,13 @@ Examples:
 /**
  * Run ts2swift for a single input file (programmatic API, no process I/O).
  * @param {string[]} filePaths - Paths to the .d.ts files
- * @param {{ tsconfigPath: string, logLevel?: keyof typeof DiagnosticEngine.LEVELS, globalFiles?: string[] }} options
+ * @param {{ tsconfigPath: string, logLevel?: keyof typeof DiagnosticEngine.LEVELS, globalFiles?: string[], diagnosticEngine?: DiagnosticEngine }} options
  * @returns {string} Generated Swift source
  * @throws {Error} on parse/type-check errors (diagnostics are included in the message)
  */
 export function run(filePaths, options) {
-    const { tsconfigPath, logLevel = 'info', globalFiles = [] } = options;
-    const diagnosticEngine = new DiagnosticEngine(logLevel);
+    const { tsconfigPath, logLevel = 'info', globalFiles = [], diagnosticEngine } = options;
+    const engine = diagnosticEngine ?? new DiagnosticEngine(logLevel);
 
     const configFile = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
     const configParseResult = ts.parseJsonConfigFileContent(
@@ -164,7 +164,7 @@ export function run(filePaths, options) {
     const bodies = [];
     const globalFileSet = new Set(globalFiles);
     for (const inputPath of [...filePaths, ...globalFiles]) {
-        const processor = new TypeProcessor(program.getTypeChecker(), diagnosticEngine, {
+        const processor = new TypeProcessor(program.getTypeChecker(), engine, {
             defaultImportFromGlobal: globalFileSet.has(inputPath),
         });
         const result = processor.processTypeDeclarations(program, inputPath);
@@ -247,7 +247,7 @@ export function main(args) {
 
     let swiftOutput;
     try {
-        swiftOutput = run(filePaths, { tsconfigPath, logLevel, globalFiles });
+        swiftOutput = run(filePaths, { tsconfigPath, logLevel, globalFiles, diagnosticEngine });
     } catch (/** @type {unknown} */ err) {
         if (err instanceof Error) {
             diagnosticEngine.print("error", err.message);

Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/ts2swift.test.js

@@ -1,5 +1,5 @@
 // @ts-check
-import { describe, it, expect, vi } from 'vitest';
+import { describe, it, expect } from 'vitest';
 import { readdirSync, mkdtempSync, writeFileSync, rmSync } from 'fs';
 import { fileURLToPath } from 'url';
 import path from 'path';
@@ -53,16 +53,15 @@ describe('ts2swift', () => {
 
     it('emits a warning when export assignments cannot be generated', () => {
         const dtsPath = path.join(inputsDir, 'ExportAssignment.d.ts');
-        const stderrSpy = vi.spyOn(process.stderr, 'write').mockImplementation(() => true);
-        try {
-            run([dtsPath], { tsconfigPath, logLevel: 'warning' });
-            const combined = stderrSpy.mock.calls.map(args => String(args[0])).join('');
-            expect(combined).toMatch(/Skipping export assignment/);
-            // Only warn once for the export assignment node
-            const occurrences = (combined.match(/Skipping export assignment/g) || []).length;
-            expect(occurrences).toBe(1);
-        } finally {
-            stderrSpy.mockRestore();
-        }
+        /** @type {{ level: string, message: string }[]} */
+        const diagnostics = [];
+        const diagnosticEngine = {
+            print: (level, message) => diagnostics.push({ level, message }),
+        };
+        run([dtsPath], { tsconfigPath, logLevel: 'warning', diagnosticEngine });
+        const messages = diagnostics.map((d) => d.message).join('\n');
+        expect(messages).toMatch(/Skipping export assignment/);
+        const occurrences = (messages.match(/Skipping export assignment/g) || []).length;
+        expect(occurrences).toBe(1);
     });
 });