Skip to content

TS2Swift: treat callable exported consts as functions #652

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 18, 2026
+37 −1
Merged

TS2Swift: treat callable exported consts as functions #652

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
1758695
TS2Swift: handle callable exported consts
kateinoigakukun Feb 18, 2026
27c3d53
TS2Swift tests: use non-Promise callable const fixture
kateinoigakukun Feb 18, 2026
fc7aff6
TS2Swift: only const callable exports become JSFunction
kateinoigakukun Feb 18, 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
20 changes: 19 additions & 1 deletion 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 @@ -261,6 +261,7 @@ export class TypeProcessor {
if (!isExported) return;

const fromArg = this.renderDefaultJSImportFromArgument();
const isConst = (node.declarationList.flags & ts.NodeFlags.Const) !== 0;

for (const decl of node.declarationList.declarations) {
if (!ts.isIdentifier(decl.name)) continue;
Expand All @@ -270,13 +271,30 @@ export class TypeProcessor {
const swiftVarName = this.renderIdentifier(swiftName);

const type = this.checker.getTypeAtLocation(decl);
const swiftType = this.visitType(type, decl);

/** @type {string[]} */
const args = [];
const jsNameArg = this.renderOptionalJSNameArg(jsName, swiftName);
if (jsNameArg) args.push(jsNameArg);
if (fromArg) args.push(fromArg);
const callSignatures = type.getCallSignatures();

if (isConst && callSignatures.length > 0) {
const signature = callSignatures[0];
const parameters = signature.getParameters();
const parameterNameMap = this.buildParameterNameMap(parameters);
const params = this.renderParameters(parameters, decl);
const returnType = this.visitType(signature.getReturnType(), decl);
const effects = this.renderEffects({ isAsync: false });
const annotation = this.renderMacroAnnotation("JSFunction", args);

this.emitDocComment(decl, { indent: "", parameterNameMap });
this.swiftLines.push(`${annotation} func ${swiftVarName}(${params}) ${effects} -> ${returnType}`);
this.swiftLines.push("");
continue;
}

const swiftType = this.visitType(type, decl);
const annotation = this.renderMacroAnnotation("JSGetter", args);

this.emitDocComment(decl, { indent: "" });
Expand Down
16 changes: 16 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 @@ -48,6 +48,22 @@ exports[`ts2swift > snapshots Swift output for Async.d.ts > Async 1`] = `
"
`;

exports[`ts2swift > snapshots Swift output for CallableConst.d.ts > CallableConst 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(BridgeJS) import JavaScriptKit

@JSFunction func fetch(_ url: String) throws(JSException) -> Response

@JSClass struct Response {
}
"
`;

exports[`ts2swift > snapshots Swift output for Documentation.d.ts > Documentation 1`] = `
"// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
// DO NOT EDIT.
Expand Down
2 changes: 2 additions & 0 deletions Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/CallableConst.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export interface Response {}
export const fetch: (url: string) => Response;