Skip to content

BridgeJS: Improve ts2swift diagnostics on invalid definitions #651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kateinoigakukun merged 1 commit into from
Feb 18, 2026
+39 −4
Merged

BridgeJS: Improve ts2swift diagnostics on invalid definitions #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,30 @@ export function run(filePaths, options) {
}

const program = TypeProcessor.createProgram([...filePaths, ...globalFiles], configParseResult.options);
const diagnostics = program.getSemanticDiagnostics();
if (diagnostics.length > 0) {

const formatDiagnostics = (diagnostics, kind) => {
if (diagnostics.length === 0) return null;
const message = ts.formatDiagnosticsWithColorAndContext(diagnostics, {
getCanonicalFileName: (fileName) => fileName,
getNewLine: () => ts.sys.newLine,
getCurrentDirectory: () => ts.sys.getCurrentDirectory(),
});
throw new Error(`TypeScript semantic errors:\n${message}`);
return `${kind} errors:\n${message}`;
};

const syntaxErrors = formatDiagnostics(program.getSyntacticDiagnostics(), "TypeScript syntax");
if (syntaxErrors) {
throw new Error(syntaxErrors);
}

const optionErrors = formatDiagnostics(program.getOptionsDiagnostics(), "TypeScript option");
if (optionErrors) {
throw new Error(optionErrors);
}

const semanticErrors = formatDiagnostics(program.getSemanticDiagnostics(), "TypeScript semantic");
if (semanticErrors) {
throw new Error(semanticErrors);
}

const prelude = [
Expand Down Expand Up @@ -244,6 +260,13 @@ export function main(args) {
cleanup();
}
}

if (swiftOutput.length === 0) {
diagnosticEngine.print(
"warning",
"No Swift declarations were generated. This usually means the .d.ts contained constructs that BridgeJS cannot import."
);
}
// Write to file or stdout
if (options.values.output && options.values.output !== "-") {
if (swiftOutput.length > 0) {
Expand Down
14 changes: 13 additions & 1 deletion Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/ts2swift.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
// @ts-check
import { describe, it, expect } from 'vitest';
import { readdirSync } from 'fs';
import { readdirSync, mkdtempSync, writeFileSync, rmSync } from 'fs';
import { fileURLToPath } from 'url';
import path from 'path';
import os from 'os';
import { run } from '../src/cli.js';

const __dirname = path.dirname(fileURLToPath(import.meta.url));
Expand Down Expand Up @@ -38,4 +39,15 @@ describe('ts2swift', () => {
expect(swiftOutput).toMatchSnapshot(name);
});
}

it('reports TypeScript syntax errors via thrown message', () => {
const tmpDir = mkdtempSync(path.join(os.tmpdir(), 'ts2swift-invalid-'));
const invalidPath = path.join(tmpDir, 'invalid.d.ts');
writeFileSync(invalidPath, 'function foo(x');
try {
expect(() => runTs2Swift(invalidPath)).toThrowError(/TypeScript syntax errors/);
} finally {
rmSync(tmpDir, { recursive: true, force: true });
}
});
});