Merge pull request #411 from swiftwasm/yt/restore-new-style-ctor

kateinoigakukun · web-flow · commit 80de55bc1460 · 2025-08-16T16:08:58.000+09:00
diff --git a/Examples/ExportSwift/index.js b/Examples/ExportSwift/index.js
@@ -2,7 +2,7 @@ import { init } from "./.build/plugins/PackageToJS/outputs/Package/index.js";
 const { exports } = await init({});
 
 const Greeter = exports.Greeter;
-const greeter = Greeter.init("World");
+const greeter = new Greeter("World");
 const circle = exports.renderCircleSVG(100);
 
 // Display the results
diff --git a/Examples/PlayBridgeJS/Sources/JavaScript/app.js b/Examples/PlayBridgeJS/Sources/JavaScript/app.js
@@ -52,7 +52,7 @@ export class BridgeJSPlayground {
                     createTS2Skeleton: this.createTS2Skeleton
                 }
             });
-            this.playBridgeJS = exports.PlayBridgeJS.init();
+            this.playBridgeJS = new exports.PlayBridgeJS();
             console.log('BridgeJS initialized successfully');
         } catch (error) {
             console.error('Failed to initialize BridgeJS:', error);
@@ -162,4 +162,4 @@ export class BridgeJSPlayground {
     hideError() {
         this.errorDisplay.classList.remove('show');
     }
-}
+}
diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
@@ -43,18 +43,16 @@ struct BridgeJSLink {
     let swiftHeapObjectClassJs = """
         /// Represents a Swift heap object like a class instance or an actor instance.
         class SwiftHeapObject {
-            static __construct(ptr, deinit) {
-                return new SwiftHeapObject(ptr, deinit);
-            }
-
-            constructor(pointer, deinit) {
-                this.pointer = pointer;
-                this.hasReleased = false;
-                this.deinit = deinit;
-                this.registry = new FinalizationRegistry((pointer) => {
+            static __wrap(pointer, deinit, prototype) {
+                const obj = Object.create(prototype);
+                obj.pointer = pointer;
+                obj.hasReleased = false;
+                obj.deinit = deinit;
+                obj.registry = new FinalizationRegistry((pointer) => {
                     deinit(pointer);
                 });
-                this.registry.register(this, this.pointer);
+                obj.registry.register(this, obj.pointer);
+                return obj;
             }
 
             release() {
@@ -525,13 +523,11 @@ struct BridgeJSLink {
         var constructorLines: [String] = []
         constructorLines.append("static __construct(ptr) {")
         constructorLines.append(
-            "return new \(klass.name)(ptr, instance.exports.bjs_\(klass.name)_deinit);".indent(count: 4)
+            "return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_\(klass.name)_deinit, \(klass.name).prototype);"
+                .indent(count: 4)
         )
         constructorLines.append("}")
         constructorLines.append("")
-        constructorLines.append("constructor(pointer, deinit) {")
-        constructorLines.append("super(pointer, deinit);".indent(count: 4))
-        constructorLines.append("}")
         jsLines.append(contentsOf: constructorLines.map { $0.indent(count: 4) })
 
         if let constructor: ExportedConstructor = klass.constructor {
@@ -541,7 +537,7 @@ struct BridgeJSLink {
             }
             var funcLines: [String] = []
             funcLines.append("")
-            funcLines.append("static init(\(constructor.parameters.map { $0.name }.joined(separator: ", "))) {")
+            funcLines.append("constructor(\(constructor.parameters.map { $0.name }.joined(separator: ", "))) {")
             let returnExpr = thunkBuilder.callConstructor(abiName: constructor.abiName)
             funcLines.append(contentsOf: thunkBuilder.bodyLines.map { $0.indent(count: 4) })
             funcLines.append(contentsOf: thunkBuilder.cleanupLines.map { $0.indent(count: 4) })
@@ -551,7 +547,7 @@ struct BridgeJSLink {
             jsLines.append(contentsOf: funcLines.map { $0.indent(count: 4) })
 
             dtsExportEntryLines.append(
-                "init\(renderTSSignature(parameters: constructor.parameters, returnType: .swiftHeapObject(klass.name)));"
+                "constructor\(renderTSSignature(parameters: constructor.parameters, returnType: .swiftHeapObject(klass.name)));"
                     .indent(count: 4)
             )
         }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.d.ts
@@ -51,10 +51,10 @@ export interface UUID extends SwiftHeapObject {
 }
 export type Exports = {
     Greeter: {
-        init(name: string): Greeter;
+        constructor(name: string): Greeter;
     }
     Converter: {
-        init(): Converter;
+        constructor(): Converter;
     }
     UUID: {
     }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js
@@ -60,18 +60,16 @@ export async function createInstantiator(options, swift) {
             const js = swift.memory.heap;
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
-                static __construct(ptr, deinit) {
-                    return new SwiftHeapObject(ptr, deinit);
-                }
-            
-                constructor(pointer, deinit) {
-                    this.pointer = pointer;
-                    this.hasReleased = false;
-                    this.deinit = deinit;
-                    this.registry = new FinalizationRegistry((pointer) => {
+                static __wrap(pointer, deinit, prototype) {
+                    const obj = Object.create(prototype);
+                    obj.pointer = pointer;
+                    obj.hasReleased = false;
+                    obj.deinit = deinit;
+                    obj.registry = new FinalizationRegistry((pointer) => {
                         deinit(pointer);
                     });
-                    this.registry.register(this, this.pointer);
+                    obj.registry.register(this, obj.pointer);
+                    return obj;
                 }
             
                 release() {
@@ -81,14 +79,11 @@ export async function createInstantiator(options, swift) {
             }
             class Greeter extends SwiftHeapObject {
                 static __construct(ptr) {
-                    return new Greeter(ptr, instance.exports.bjs_Greeter_deinit);
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Greeter_deinit, Greeter.prototype);
                 }
                 
-                constructor(pointer, deinit) {
-                    super(pointer, deinit);
-                }
                 
-                static init(name) {
+                constructor(name) {
                     const nameBytes = textEncoder.encode(name);
                     const nameId = swift.memory.retain(nameBytes);
                     const ret = instance.exports.bjs_Greeter_init(nameId, nameBytes.length);
@@ -104,14 +99,11 @@ export async function createInstantiator(options, swift) {
             }
             class Converter extends SwiftHeapObject {
                 static __construct(ptr) {
-                    return new Converter(ptr, instance.exports.bjs_Converter_deinit);
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Converter_deinit, Converter.prototype);
                 }
                 
-                constructor(pointer, deinit) {
-                    super(pointer, deinit);
-                }
                 
-                static init() {
+                constructor() {
                     const ret = instance.exports.bjs_Converter_init();
                     return Converter.__construct(ret);
                 }
@@ -124,12 +116,9 @@ export async function createInstantiator(options, swift) {
             }
             class UUID extends SwiftHeapObject {
                 static __construct(ptr) {
-                    return new UUID(ptr, instance.exports.bjs_UUID_deinit);
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_UUID_deinit, UUID.prototype);
                 }
                 
-                constructor(pointer, deinit) {
-                    super(pointer, deinit);
-                }
                 uuidString() {
                     instance.exports.bjs_UUID_uuidString(this.pointer);
                     const ret = tmpRetString;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.d.ts
@@ -17,7 +17,7 @@ export interface Greeter extends SwiftHeapObject {
 }
 export type Exports = {
     Greeter: {
-        init(name: string): Greeter;
+        constructor(name: string): Greeter;
     }
     takeGreeter(greeter: Greeter): void;
 }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftClass.Export.js
@@ -60,18 +60,16 @@ export async function createInstantiator(options, swift) {
             const js = swift.memory.heap;
             /// Represents a Swift heap object like a class instance or an actor instance.
             class SwiftHeapObject {
-                static __construct(ptr, deinit) {
-                    return new SwiftHeapObject(ptr, deinit);
-                }
-            
-                constructor(pointer, deinit) {
-                    this.pointer = pointer;
-                    this.hasReleased = false;
-                    this.deinit = deinit;
-                    this.registry = new FinalizationRegistry((pointer) => {
+                static __wrap(pointer, deinit, prototype) {
+                    const obj = Object.create(prototype);
+                    obj.pointer = pointer;
+                    obj.hasReleased = false;
+                    obj.deinit = deinit;
+                    obj.registry = new FinalizationRegistry((pointer) => {
                         deinit(pointer);
                     });
-                    this.registry.register(this, this.pointer);
+                    obj.registry.register(this, obj.pointer);
+                    return obj;
                 }
             
                 release() {
@@ -81,14 +79,11 @@ export async function createInstantiator(options, swift) {
             }
             class Greeter extends SwiftHeapObject {
                 static __construct(ptr) {
-                    return new Greeter(ptr, instance.exports.bjs_Greeter_deinit);
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Greeter_deinit, Greeter.prototype);
                 }
                 
-                constructor(pointer, deinit) {
-                    super(pointer, deinit);
-                }
                 
-                static init(name) {
+                constructor(name) {
                     const nameBytes = textEncoder.encode(name);
                     const nameId = swift.memory.retain(nameBytes);
                     const ret = instance.exports.bjs_Greeter_init(nameId, nameBytes.length);
diff --git a/Sources/JavaScriptKit/Documentation.docc/Articles/Exporting-Swift-to-JavaScript.md b/Sources/JavaScriptKit/Documentation.docc/Articles/Exporting-Swift-to-JavaScript.md
@@ -133,7 +133,7 @@ In JavaScript:
 import { init } from "./.build/plugins/PackageToJS/outputs/Package/index.js";
 const { exports } = await init({});
 
-const cart = exports.ShoppingCart.init();
+const cart = new exports.ShoppingCart();
 cart.addItem("Laptop", 999.99, 1);
 cart.addItem("Mouse", 24.99, 2);
 console.log(`Items in cart: ${cart.getItemCount()}`);
@@ -158,7 +158,7 @@ export interface ShoppingCart extends SwiftHeapObject {
 
 export type Exports = {
     ShoppingCart: {
-        init(): ShoppingCart;
+        new(): ShoppingCart;
     }
 }
 ```
@@ -175,8 +175,8 @@ You can export functions to specific namespaces by providing a namespace paramet
 import JavaScriptKit
 
 // Export a function to a custom namespace
-@JS(namespace: "MyModule.Utils") func namespacedFunction() -> String {
-    return "namespaced"
+@JS(namespace: "MyModule.Utils") func namespacedFunction() -> String { 
+    return "namespaced" 
 }
 ```
 
diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs
@@ -115,7 +115,7 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) {
         assert.equal(exports.roundTripString(v), v);
     }
 
-    const g = exports.Greeter.init("John");
+    const g = new exports.Greeter("John");
     assert.equal(g.greet(), "Hello, John!");
     g.changeName("Jane");
     assert.equal(g.greet(), "Hello, Jane!");

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ export class BridgeJSPlayground {`
`52`	`52`	`createTS2Skeleton: this.createTS2Skeleton`
`53`	`53`	`}`
`54`	`54`	`});`
`55`		`- this.playBridgeJS = exports.PlayBridgeJS.init();`
	`55`	`+ this.playBridgeJS = new exports.PlayBridgeJS();`
`56`	`56`	`console.log('BridgeJS initialized successfully');`
`57`	`57`	`} catch (error) {`
`58`	`58`	`console.error('Failed to initialize BridgeJS:', error);`
`@@ -162,4 +162,4 @@ export class BridgeJSPlayground {`
`162`	`162`	`hideError() {`
`163`	`163`	`this.errorDisplay.classList.remove('show');`
`164`	`164`	`}`
`165`		`-}`
	`165`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,10 @@ export interface UUID extends SwiftHeapObject {`
`51`	`51`	`}`
`52`	`52`	`export type Exports = {`
`53`	`53`	`Greeter: {`
`54`		`- init(name: string): Greeter;`
	`54`	`+ constructor(name: string): Greeter;`
`55`	`55`	`}`
`56`	`56`	`Converter: {`
`57`		`- init(): Converter;`
	`57`	`+ constructor(): Converter;`
`58`	`58`	`}`
`59`	`59`	`UUID: {`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ export interface Greeter extends SwiftHeapObject {`
`17`	`17`	`}`
`18`	`18`	`export type Exports = {`
`19`	`19`	`Greeter: {`
`20`		`- init(name: string): Greeter;`
	`20`	`+ constructor(name: string): Greeter;`
`21`	`21`	`}`
`22`	`22`	`takeGreeter(greeter: Greeter): void;`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) {`
`115`	`115`	`assert.equal(exports.roundTripString(v), v);`
`116`	`116`	`}`
`117`	`117`
`118`		`- const g = exports.Greeter.init("John");`
	`118`	`+ const g = new exports.Greeter("John");`
`119`	`119`	`assert.equal(g.greet(), "Hello, John!");`
`120`	`120`	`g.changeName("Jane");`
`121`	`121`	`assert.equal(g.greet(), "Hello, Jane!");`