Skip to content

Fix ts2swift alias struct naming and docs #627

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 3 commits into from
Feb 12, 2026
+33 −3
Merged

Fix ts2swift alias struct naming and docs #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c44eba
Fix ts2swift type alias names and add console alias test
kateinoigakukun Feb 12, 2026
df0d043
Remove unused aliasNameByType map
kateinoigakukun Feb 12, 2026
04dffe7
Cover type alias doc comments in ts2swift snapshots
kateinoigakukun Feb 12, 2026
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
6 changes: 3 additions & 3 deletions Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/processor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,8 +747,8 @@ export class TypeProcessor {
* @private
*/
visitStructuredType(type, diagnosticNode, members) {
const symbol = type.getSymbol() ?? type.aliasSymbol;
const name = symbol?.name ?? this.checker.typeToString(type);
const symbol = type.aliasSymbol ?? type.getSymbol();
const name = type.aliasSymbol?.name ?? symbol?.name ?? this.checker.typeToString(type);
if (!name) return;
if (this.emittedStructuredTypeNames.has(name)) return;
this.emittedStructuredTypeNames.add(name);
Expand All @@ -760,7 +760,7 @@ export class TypeProcessor {
if (jsNameArg) args.push(jsNameArg);
const annotation = this.renderMacroAnnotation("JSClass", args);
const typeName = this.renderIdentifier(swiftName);
const docNode = symbol?.getDeclarations()?.[0] ?? diagnosticNode;
const docNode = type.aliasSymbol?.getDeclarations()?.[0] ?? symbol?.getDeclarations()?.[0] ?? diagnosticNode;
if (docNode) {
this.emitDocComment(docNode, { indent: "" });
}
Expand Down
19 changes: 19 additions & 0 deletions Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/__snapshots__/ts2swift.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,25 @@ exports[`ts2swift > snapshots Swift output for TypeAlias.d.ts > TypeAlias 1`] =
"
`;

exports[`ts2swift > snapshots Swift output for TypeAliasObject.d.ts > TypeAliasObject 1`] = `
"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
// DO NOT EDIT.
//
// To update this file, just rebuild your project or run
// \`swift package bridge-js\`.

@_spi(Experimental) @_spi(BridgeJS) import JavaScriptKit

@JSFunction func console() throws(JSException) -> Console

/// Console from the environment.
@JSClass struct Console {
/// Log a message.
@JSFunction func log(_ message: String) throws(JSException) -> Void
}
"
`;

exports[`ts2swift > snapshots Swift output for TypeScriptClass.d.ts > TypeScriptClass 1`] = `
"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
// DO NOT EDIT.
Expand Down
11 changes: 11 additions & 0 deletions Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/TypeAliasObject.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/**
* Console from the environment.
*/
export type Console = {
/**
* Log a message.
*/
log(message: string): void;
};

export function console(): Console;