BridgeJS: Keep translating object-like types to JSObject

Author: kateinoigakukun

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

@@ -692,12 +692,14 @@ export class TypeProcessor {
                 "never": "Void",
                 "Promise": "JSPromise",
             };
-            const typeString = type.getSymbol()?.name ?? this.checker.typeToString(type);
+            const symbol = type.getSymbol() ?? type.aliasSymbol;
+            const typeString = symbol?.name ?? this.checker.typeToString(type);
             if (typeMap[typeString]) {
                 return typeMap[typeString];
             }
-
-            const symbol = type.getSymbol() ?? type.aliasSymbol;
+            if (isObjectType(type) && isTypeScriptLibSymbol(symbol)) {
+                return "JSObject";
+            }
             if (symbol && (symbol.flags & ts.SymbolFlags.Enum) !== 0) {
                 const typeName = symbol.name;
                 this.seenTypes.set(type, node);
@@ -922,6 +924,17 @@ function isObjectType(type) {
     return typeof type.objectFlags === "number";
 }
 
+/**
+ * @param {ts.Symbol | undefined} symbol
+ * @returns {boolean}
+ */
+function isTypeScriptLibSymbol(symbol) {
+    if (!symbol) return false;
+    const declarations = symbol.getDeclarations() ?? [];
+    if (!declarations.length) return false;
+    return declarations.every(decl => decl.getSourceFile().fileName.includes("node_modules/typescript/lib"));
+}
+
 /**
  *
  * @param {ts.Type} type

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

@@ -145,6 +145,37 @@ exports[`ts2swift > snapshots Swift output for MultipleImportedTypes.d.ts > Mult
 "
 `;
 
+exports[`ts2swift > snapshots Swift output for ObjectLikeTypes.d.ts > ObjectLikeTypes 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 acceptObject(_ v: JSObject) throws(JSException) -> Void
+
+@JSFunction func acceptFunction(_ v: JSObject) throws(JSException) -> Void
+
+@JSFunction func acceptDate(_ v: JSObject) throws(JSException) -> JSObject
+
+@JSFunction func acceptRegExp(_ v: JSObject) throws(JSException) -> JSObject
+
+@JSFunction func acceptMap(_ v: JSObject) throws(JSException) -> JSObject
+
+@JSFunction func acceptSet(_ v: JSObject) throws(JSException) -> JSObject
+
+@JSFunction func acceptPromiseLike(_ v: JSObject) throws(JSException) -> JSObject
+
+@JSFunction func acceptArrayBuffer(_ v: JSObject) throws(JSException) -> JSObject
+
+@JSFunction func acceptArrayLike(_ v: JSObject) throws(JSException) -> JSObject
+
+@JSFunction func acceptIterable(_ v: JSObject) throws(JSException) -> JSObject
+"
+`;
+
 exports[`ts2swift > snapshots Swift output for PrimitiveParameters.d.ts > PrimitiveParameters 1`] = `
 "// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
 // DO NOT EDIT.

Plugins/BridgeJS/Sources/TS2Swift/JavaScript/test/fixtures/ObjectLikeTypes.d.ts

@@ -0,0 +1,10 @@
+export function acceptObject(v: object): void;
+export function acceptFunction(v: Function): void;
+export function acceptDate(v: Date): Date;
+export function acceptRegExp(v: RegExp): RegExp;
+export function acceptMap(v: Map<string, number>): Map<string, number>;
+export function acceptSet(v: Set<string>): Set<string>;
+export function acceptPromiseLike(v: PromiseLike<string>): PromiseLike<string>;
+export function acceptArrayBuffer(v: ArrayBuffer): ArrayBuffer;
+export function acceptArrayLike(v: ArrayLike<string>): ArrayLike<string>;
+export function acceptIterable(v: Iterable<string>): Iterable<string>;