Skip to content

BridgeJS: Remove BridgeType usage from ts2swift #520

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
Jan 26, 2026
Merged

BridgeJS: Remove BridgeType usage from ts2swift #520

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
11 changes: 1 addition & 10 deletions Plugins/BridgeJS/Sources/TS2Swift/JavaScript/src/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
export type BridgeType =
| { "int": {} }
| { "float": {} }
| { "double": {} }
| { "string": {} }
| { "bool": {} }
| { "jsObject": { "_0": string } | {} }
| { "void": {} }

export type Parameter = {
name: string;
type: BridgeType;
type: string;
}
100 changes: 37 additions & 63 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 @@ -7,7 +7,6 @@
import ts from 'typescript';

/** @typedef {import('./index.d.ts').Parameter} Parameter */
/** @typedef {import('./index.d.ts').BridgeType} BridgeType */

/**
* @typedef {{
Expand Down Expand Up @@ -48,7 +47,7 @@ export class TypeProcessor {
this.diagnosticEngine = diagnosticEngine;
this.options = options;

/** @type {Map<ts.Type, BridgeType>} */
/** @type {Map<ts.Type, string>} */
this.processedTypes = new Map();
/** @type {Map<ts.Type, ts.Node>} Seen position by type */
this.seenTypes = new Map();
Expand Down Expand Up @@ -202,7 +201,7 @@ export class TypeProcessor {
if (!signature) return;

const params = this.renderParameters(signature.getParameters(), node);
const returnType = this.renderBridgeType(this.visitType(signature.getReturnType(), node), node);
const returnType = this.visitType(signature.getReturnType(), node);
const effects = this.renderEffects({ isAsync: false });
const swiftName = this.renderIdentifier(name);

Expand Down Expand Up @@ -242,7 +241,7 @@ export class TypeProcessor {

/**
* @param {ts.PropertyDeclaration | ts.PropertySignature} node
* @returns {{ name: string, type: BridgeType, isReadonly: boolean, documentation: string | undefined } | null}
* @returns {{ name: string, type: string, isReadonly: boolean, documentation: string | undefined } | null}
*/
visitPropertyDecl(node) {
if (!node.name) return null;
Expand All @@ -253,10 +252,10 @@ export class TypeProcessor {
}

const type = this.checker.getTypeAtLocation(node)
const bridgeType = this.visitType(type, node);
const swiftType = this.visitType(type, node);
const isReadonly = node.modifiers?.some(m => m.kind === ts.SyntaxKind.ReadonlyKeyword) ?? false;
const documentation = this.getFullJSDocText(node);
return { name: propertyName, type: bridgeType, isReadonly, documentation };
return { name: propertyName, type: swiftType, isReadonly, documentation };
}

/**
Expand All @@ -266,8 +265,8 @@ export class TypeProcessor {
*/
visitSignatureParameter(symbol, node) {
const type = this.checker.getTypeOfSymbolAtLocation(symbol, node);
const bridgeType = this.visitType(type, node);
return { name: symbol.name, type: bridgeType };
const swiftType = this.visitType(type, node);
return { name: symbol.name, type: swiftType };
}

/**
Expand Down Expand Up @@ -375,10 +374,10 @@ export class TypeProcessor {
}

/**
* Convert TypeScript type string to BridgeType
* @param {ts.Type} type - TypeScript type string
* Convert TypeScript type to Swift type string
* @param {ts.Type} type - TypeScript type
* @param {ts.Node} node - Node
* @returns {BridgeType} Bridge type
* @returns {string} Swift type string
* @private
*/
visitType(type, node) {
Expand All @@ -392,56 +391,52 @@ export class TypeProcessor {
}
/**
* @param {ts.Type} type
* @returns {BridgeType}
* @returns {string}
*/
const convert = (type) => {
/** @type {Record<string, BridgeType>} */
/** @type {Record<string, string>} */
const typeMap = {
"number": { "double": {} },
"string": { "string": {} },
"boolean": { "bool": {} },
"void": { "void": {} },
"any": { "jsObject": {} },
"unknown": { "jsObject": {} },
"null": { "void": {} },
"undefined": { "void": {} },
"bigint": { "int": {} },
"object": { "jsObject": {} },
"symbol": { "jsObject": {} },
"never": { "void": {} },
"Promise": {
"jsObject": {
"_0": "JSPromise"
}
},
"number": "Double",
"string": "String",
"boolean": "Bool",
"void": "Void",
"any": "JSObject",
"unknown": "JSObject",
"null": "Void",
"undefined": "Void",
"bigint": "Int",
"object": "JSObject",
"symbol": "JSObject",
"never": "Void",
"Promise": "JSPromise",
};
const typeString = type.getSymbol()?.name ?? this.checker.typeToString(type);
if (typeMap[typeString]) {
return typeMap[typeString];
}

if (this.checker.isArrayType(type) || this.checker.isTupleType(type) || type.getCallSignatures().length > 0) {
return { "jsObject": {} };
return "JSObject";
}
// "a" | "b" -> string
if (this.checker.isTypeAssignableTo(type, this.checker.getStringType())) {
return { "string": {} };
return "String";
}
if (type.isTypeParameter()) {
return { "jsObject": {} };
return "JSObject";
}

const typeName = this.deriveTypeName(type);
if (!typeName) {
this.diagnosticEngine.print("warning", `Unknown non-nominal type: ${typeString}`, node);
return { "jsObject": {} };
return "JSObject";
}
this.seenTypes.set(type, node);
return { "jsObject": { "_0": typeName } };
return this.renderIdentifier(typeName);
}
const bridgeType = convert(type);
this.processedTypes.set(type, bridgeType);
return bridgeType;
const swiftType = convert(type);
this.processedTypes.set(type, swiftType);
return swiftType;
}

/**
Expand Down Expand Up @@ -471,7 +466,7 @@ export class TypeProcessor {
const property = this.visitPropertyDecl(node);
if (!property) return;

const type = this.renderBridgeType(property.type, node);
const type = property.type;
const name = this.renderIdentifier(property.name);

// Always render getter
Expand Down Expand Up @@ -501,7 +496,7 @@ export class TypeProcessor {
if (!signature) return;

const params = this.renderParameters(signature.getParameters(), node);
const returnType = this.renderBridgeType(this.visitType(signature.getReturnType(), node), node);
const returnType = this.visitType(signature.getReturnType(), node);
const effects = this.renderEffects({ isAsync: false });
const swiftName = this.renderIdentifier(name);

Expand Down Expand Up @@ -538,35 +533,14 @@ export class TypeProcessor {
renderParameters(parameters, node) {
const params = [];
for (const p of parameters) {
const bridgeType = this.visitSignatureParameter(p, node);
const param = this.visitSignatureParameter(p, node);
const paramName = this.renderIdentifier(p.name);
const type = this.renderBridgeType(bridgeType.type, node);
const type = param.type;
params.push(`_ ${paramName}: ${type}`);
}
return params.join(", ");
}

/**
* Render bridge type to Swift type
* @param {BridgeType} bridgeType
* @param {ts.Node} node
* @returns {string}
* @private
*/
renderBridgeType(bridgeType, node) {
if ("int" in bridgeType) return "Int";
if ("float" in bridgeType) return "Float";
if ("double" in bridgeType) return "Double";
if ("string" in bridgeType) return "String";
if ("bool" in bridgeType) return "Bool";
if ("void" in bridgeType) return "Void";
if ("jsObject" in bridgeType) {
const name = "_0" in bridgeType.jsObject ? bridgeType.jsObject._0 : undefined;
return name ? this.renderIdentifier(name) : "JSObject";
}
return "JSObject";
}

/**
* Render effects (async/throws)
* @param {{ isAsync: boolean }} effects
Expand Down