BridgeJS: Split setter into a separate function

kateinoigakukun · kateinoigakukun · commit 8df0593bb2f1 · 2025-07-23T18:37:20.000+09:00
To mark it `throws`
diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ExportSwift.swift b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.ExportSwift.swift
@@ -6,56 +6,6 @@
 
 @_spi(BridgeJS) import JavaScriptKit
 
-@_expose(wasm, "bjs_PlayBridgeJS_init")
-@_cdecl("bjs_PlayBridgeJS_init")
-public func _bjs_PlayBridgeJS_init() -> UnsafeMutableRawPointer {
-    #if arch(wasm32)
-    let ret = PlayBridgeJS()
-    return Unmanaged.passRetained(ret).toOpaque()
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
-}
-
-@_expose(wasm, "bjs_PlayBridgeJS_update")
-@_cdecl("bjs_PlayBridgeJS_update")
-public func _bjs_PlayBridgeJS_update(_self: UnsafeMutableRawPointer, swiftSourceBytes: Int32, swiftSourceLen: Int32, dtsSourceBytes: Int32, dtsSourceLen: Int32) -> UnsafeMutableRawPointer {
-    #if arch(wasm32)
-    do {
-        let swiftSource = String(unsafeUninitializedCapacity: Int(swiftSourceLen)) { b in
-            _swift_js_init_memory(swiftSourceBytes, b.baseAddress.unsafelyUnwrapped)
-            return Int(swiftSourceLen)
-        }
-        let dtsSource = String(unsafeUninitializedCapacity: Int(dtsSourceLen)) { b in
-            _swift_js_init_memory(dtsSourceBytes, b.baseAddress.unsafelyUnwrapped)
-            return Int(dtsSourceLen)
-        }
-        let ret = try Unmanaged<PlayBridgeJS>.fromOpaque(_self).takeUnretainedValue().update(swiftSource: swiftSource, dtsSource: dtsSource)
-        return Unmanaged.passRetained(ret).toOpaque()
-    } catch let error {
-        if let error = error.thrownValue.object {
-            withExtendedLifetime(error) {
-                _swift_js_throw(Int32(bitPattern: $0.id))
-            }
-        } else {
-            let jsError = JSError(message: String(describing: error))
-            withExtendedLifetime(jsError.jsObject) {
-                _swift_js_throw(Int32(bitPattern: $0.id))
-            }
-        }
-        return UnsafeMutableRawPointer(bitPattern: -1).unsafelyUnwrapped
-    }
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
-}
-
-@_expose(wasm, "bjs_PlayBridgeJS_deinit")
-@_cdecl("bjs_PlayBridgeJS_deinit")
-public func _bjs_PlayBridgeJS_deinit(pointer: UnsafeMutableRawPointer) {
-    Unmanaged<PlayBridgeJS>.fromOpaque(pointer).release()
-}
-
 @_expose(wasm, "bjs_PlayBridgeJSOutput_outputJs")
 @_cdecl("bjs_PlayBridgeJSOutput_outputJs")
 public func _bjs_PlayBridgeJSOutput_outputJs(_self: UnsafeMutableRawPointer) -> Void {
@@ -112,4 +62,54 @@ public func _bjs_PlayBridgeJSOutput_exportSwiftGlue(_self: UnsafeMutableRawPoint
 @_cdecl("bjs_PlayBridgeJSOutput_deinit")
 public func _bjs_PlayBridgeJSOutput_deinit(pointer: UnsafeMutableRawPointer) {
     Unmanaged<PlayBridgeJSOutput>.fromOpaque(pointer).release()
+}
+
+@_expose(wasm, "bjs_PlayBridgeJS_init")
+@_cdecl("bjs_PlayBridgeJS_init")
+public func _bjs_PlayBridgeJS_init() -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = PlayBridgeJS()
+    return Unmanaged.passRetained(ret).toOpaque()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_PlayBridgeJS_update")
+@_cdecl("bjs_PlayBridgeJS_update")
+public func _bjs_PlayBridgeJS_update(_self: UnsafeMutableRawPointer, swiftSourceBytes: Int32, swiftSourceLen: Int32, dtsSourceBytes: Int32, dtsSourceLen: Int32) -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    do {
+        let swiftSource = String(unsafeUninitializedCapacity: Int(swiftSourceLen)) { b in
+            _swift_js_init_memory(swiftSourceBytes, b.baseAddress.unsafelyUnwrapped)
+            return Int(swiftSourceLen)
+        }
+        let dtsSource = String(unsafeUninitializedCapacity: Int(dtsSourceLen)) { b in
+            _swift_js_init_memory(dtsSourceBytes, b.baseAddress.unsafelyUnwrapped)
+            return Int(dtsSourceLen)
+        }
+        let ret = try Unmanaged<PlayBridgeJS>.fromOpaque(_self).takeUnretainedValue().update(swiftSource: swiftSource, dtsSource: dtsSource)
+        return Unmanaged.passRetained(ret).toOpaque()
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: String(describing: error))
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return UnsafeMutableRawPointer(bitPattern: -1).unsafelyUnwrapped
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_PlayBridgeJS_deinit")
+@_cdecl("bjs_PlayBridgeJS_deinit")
+public func _bjs_PlayBridgeJS_deinit(pointer: UnsafeMutableRawPointer) {
+    Unmanaged<PlayBridgeJS>.fromOpaque(pointer).release()
 }
diff --git a/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ExportSwift.json b/Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.ExportSwift.json
@@ -1,53 +1,5 @@
 {
   "classes" : [
-    {
-      "constructor" : {
-        "abiName" : "bjs_PlayBridgeJS_init",
-        "effects" : {
-          "isAsync" : false,
-          "isThrows" : false
-        },
-        "parameters" : [
-
-        ]
-      },
-      "methods" : [
-        {
-          "abiName" : "bjs_PlayBridgeJS_update",
-          "effects" : {
-            "isAsync" : false,
-            "isThrows" : true
-          },
-          "name" : "update",
-          "parameters" : [
-            {
-              "label" : "swiftSource",
-              "name" : "swiftSource",
-              "type" : {
-                "string" : {
-
-                }
-              }
-            },
-            {
-              "label" : "dtsSource",
-              "name" : "dtsSource",
-              "type" : {
-                "string" : {
-
-                }
-              }
-            }
-          ],
-          "returnType" : {
-            "swiftHeapObject" : {
-              "_0" : "PlayBridgeJSOutput"
-            }
-          }
-        }
-      ],
-      "name" : "PlayBridgeJS"
-    },
     {
       "methods" : [
         {
@@ -116,6 +68,54 @@
         }
       ],
       "name" : "PlayBridgeJSOutput"
+    },
+    {
+      "constructor" : {
+        "abiName" : "bjs_PlayBridgeJS_init",
+        "effects" : {
+          "isAsync" : false,
+          "isThrows" : false
+        },
+        "parameters" : [
+
+        ]
+      },
+      "methods" : [
+        {
+          "abiName" : "bjs_PlayBridgeJS_update",
+          "effects" : {
+            "isAsync" : false,
+            "isThrows" : true
+          },
+          "name" : "update",
+          "parameters" : [
+            {
+              "label" : "swiftSource",
+              "name" : "swiftSource",
+              "type" : {
+                "string" : {
+
+                }
+              }
+            },
+            {
+              "label" : "dtsSource",
+              "name" : "dtsSource",
+              "type" : {
+                "string" : {
+
+                }
+              }
+            }
+          ],
+          "returnType" : {
+            "swiftHeapObject" : {
+              "_0" : "PlayBridgeJSOutput"
+            }
+          }
+        }
+      ],
+      "name" : "PlayBridgeJS"
     }
   ],
   "functions" : [
diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift
@@ -281,7 +281,8 @@ struct ImportTS {
                                     )
                                 }
                             }
-                        )
+                        ),
+                        effectSpecifiers: ImportTS.buildFunctionEffect(throws: true, async: false)
                     ),
                     bodyBuilder: {
                         self.renderImportDecl()
@@ -365,38 +366,33 @@ struct ImportTS {
             try builder.liftReturnValue(returnType: property.type)
             return AccessorDeclSyntax(
                 accessorSpecifier: .keyword(.get),
+                effectSpecifiers: Self.buildAccessorEffect(throws: true, async: false),
                 body: CodeBlockSyntax {
                     builder.renderImportDecl()
                     builder.body
                 }
             )
         }
 
-        func renderSetterDecl(property: ImportedPropertySkeleton) throws -> AccessorDeclSyntax {
+        func renderSetterDecl(property: ImportedPropertySkeleton) throws -> DeclSyntax {
             let builder = ImportedThunkBuilder(
                 moduleName: moduleName,
                 abiName: property.setterAbiName(context: type)
             )
+            let newValue = Parameter(label: nil, name: "newValue", type: property.type)
             try builder.lowerParameter(param: Parameter(label: nil, name: "self", type: .jsObject(name)))
-            try builder.lowerParameter(param: Parameter(label: nil, name: "newValue", type: property.type))
+            try builder.lowerParameter(param: newValue)
             builder.call(returnType: .void)
-            return AccessorDeclSyntax(
-                modifier: DeclModifierSyntax(name: .keyword(.nonmutating)),
-                accessorSpecifier: .keyword(.set),
-                body: CodeBlockSyntax {
-                    builder.renderImportDecl()
-                    builder.body
-                }
+            return builder.renderThunkDecl(
+                name: "set\(property.name.capitalizedFirstLetter())",
+                parameters: [newValue],
+                returnType: .void
             )
         }
 
         func renderPropertyDecl(property: ImportedPropertySkeleton) throws -> [DeclSyntax] {
-            var accessorDecls: [AccessorDeclSyntax] = []
-            accessorDecls.append(try renderGetterDecl(property: property))
-            if !property.isReadonly {
-                accessorDecls.append(try renderSetterDecl(property: property))
-            }
-            return [
+            let accessorDecls: [AccessorDeclSyntax] = [try renderGetterDecl(property: property)]
+            var decls: [DeclSyntax] = [
                 DeclSyntax(
                     VariableDeclSyntax(
                         leadingTrivia: Self.renderDocumentation(documentation: property.documentation),
@@ -419,6 +415,10 @@ struct ImportTS {
                     )
                 )
             ]
+            if !property.isReadonly {
+                decls.append(try renderSetterDecl(property: property))
+            }
+            return decls
         }
         let classDecl = try StructDeclSyntax(
             leadingTrivia: Self.renderDocumentation(documentation: type.documentation),
@@ -483,4 +483,23 @@ struct ImportTS {
                 ) : nil,
         )
     }
+    static func buildAccessorEffect(throws: Bool, async: Bool) -> AccessorEffectSpecifiersSyntax {
+        return AccessorEffectSpecifiersSyntax(
+            asyncSpecifier: `async` ? .keyword(.async) : nil,
+            throwsClause: `throws`
+                ? ThrowsClauseSyntax(
+                    throwsSpecifier: .keyword(.throws),
+                    leftParen: .leftParenToken(),
+                    type: IdentifierTypeSyntax(name: .identifier("JSException")),
+                    rightParen: .rightParenToken()
+                ) : nil,
+        )
+    }
+}
+
+extension String {
+    func capitalizedFirstLetter() -> String {
+        guard !isEmpty else { return self }
+        return prefix(1).uppercased() + dropFirst()
+    }
 }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.swift
@@ -17,7 +17,7 @@ struct Greeter {
         self.this = JSObject(id: UInt32(bitPattern: this))
     }
 
-    init(_ name: String) {
+    init(_ name: String) throws(JSException) {
         #if arch(wasm32)
         @_extern(wasm, module: "Check", name: "bjs_Greeter_init")
         func bjs_Greeter_init(_ name: Int32) -> Int32
@@ -35,7 +35,7 @@ struct Greeter {
     }
 
     var name: String {
-        get {
+        get throws(JSException) {
             #if arch(wasm32)
             @_extern(wasm, module: "Check", name: "bjs_Greeter_name_get")
             func bjs_Greeter_name_get(_ self: Int32) -> Int32
@@ -50,25 +50,26 @@ struct Greeter {
                 return Int(ret)
             }
         }
-        nonmutating set {
-            #if arch(wasm32)
-            @_extern(wasm, module: "Check", name: "bjs_Greeter_name_set")
-            func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void
-            #else
-            func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void {
-                fatalError("Only available on WebAssembly")
-            }
-            #endif
-            var newValue = newValue
-            let newValueId = newValue.withUTF8 { b in
-                _swift_js_make_js_string(b.baseAddress.unsafelyUnwrapped, Int32(b.count))
-            }
-            bjs_Greeter_name_set(Int32(bitPattern: self.this.id), newValueId)
+    }
+
+    func setName(_ newValue: String) throws(JSException) -> Void {
+        #if arch(wasm32)
+        @_extern(wasm, module: "Check", name: "bjs_Greeter_name_set")
+        func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void
+        #else
+        func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void {
+            fatalError("Only available on WebAssembly")
+        }
+        #endif
+        var newValue = newValue
+        let newValueId = newValue.withUTF8 { b in
+            _swift_js_make_js_string(b.baseAddress.unsafelyUnwrapped, Int32(b.count))
         }
+        bjs_Greeter_name_set(Int32(bitPattern: self.this.id), newValueId)
     }
 
     var age: Double {
-        get {
+        get throws(JSException) {
             #if arch(wasm32)
             @_extern(wasm, module: "Check", name: "bjs_Greeter_age_get")
             func bjs_Greeter_age_get(_ self: Int32) -> Float64
diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ImportTS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.ImportTS.swift
diff --git a/Tests/BridgeJSRuntimeTests/ImportAPITests.swift b/Tests/BridgeJSRuntimeTests/ImportAPITests.swift
