Fix: Ensure BridgeJS.Macros.swift is processed by SwiftToSkeleton

Regenerate BridgeJS files

Author: fjtrujy

Benchmarks/Sources/Generated/BridgeJS.swift

@@ -2158,6 +2158,57 @@ fileprivate func bjs_benchmarkRunner(_ name: Int32, _ body: Int32) -> Void {
 }
 #endif
 
+func _$benchmarkRunner(_ name: String, _ body: JSObject) throws(JSException) -> Void {
+    let nameValue = name.bridgeJSLowerParameter()
+    let bodyValue = body.bridgeJSLowerParameter()
+    bjs_benchmarkRunner(nameValue, bodyValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkHelperNoop")
+fileprivate func bjs_benchmarkHelperNoop() -> Void
+#else
+fileprivate func bjs_benchmarkHelperNoop() -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+
+func _$benchmarkHelperNoop() throws(JSException) -> Void {
+    bjs_benchmarkHelperNoop()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkHelperNoopWithNumber")
+fileprivate func bjs_benchmarkHelperNoopWithNumber(_ n: Float64) -> Void
+#else
+fileprivate func bjs_benchmarkHelperNoopWithNumber(_ n: Float64) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+
+func _$benchmarkHelperNoopWithNumber(_ n: Double) throws(JSException) -> Void {
+    let nValue = n.bridgeJSLowerParameter()
+    bjs_benchmarkHelperNoopWithNumber(nValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkRunner")
+fileprivate func bjs_benchmarkRunner(_ name: Int32, _ body: Int32) -> Void
+#else
+fileprivate func bjs_benchmarkRunner(_ name: Int32, _ body: Int32) -> Void {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+
 func _$benchmarkRunner(_ name: String, _ body: JSObject) throws(JSException) -> Void {
     let nameValue = name.bridgeJSLowerParameter()
     let bodyValue = body.bridgeJSLowerParameter()

Benchmarks/Sources/Generated/JavaScript/BridgeJS.json

@@ -2783,6 +2783,68 @@
         ],
         "types" : [
 
+        ]
+      },
+      {
+        "functions" : [
+          {
+            "name" : "benchmarkHelperNoop",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "void" : {
+
+              }
+            }
+          },
+          {
+            "name" : "benchmarkHelperNoopWithNumber",
+            "parameters" : [
+              {
+                "name" : "n",
+                "type" : {
+                  "double" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "void" : {
+
+              }
+            }
+          },
+          {
+            "name" : "benchmarkRunner",
+            "parameters" : [
+              {
+                "name" : "name",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              },
+              {
+                "name" : "body",
+                "type" : {
+                  "jsObject" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "void" : {
+
+              }
+            }
+          }
+        ],
+        "types" : [
+
         ]
       }
     ]

Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift

@@ -163,6 +163,42 @@ fileprivate func bjs_TS2Swift_convert(_ self: Int32, _ ts: Int32) -> Int32 {
 }
 #endif
 
+func _$TS2Swift_convert(_ self: JSObject, _ ts: String) throws(JSException) -> String {
+    let selfValue = self.bridgeJSLowerParameter()
+    let tsValue = ts.bridgeJSLowerParameter()
+    let ret = bjs_TS2Swift_convert(selfValue, tsValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return String.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "PlayBridgeJS", name: "bjs_createTS2Swift")
+fileprivate func bjs_createTS2Swift() -> Int32
+#else
+fileprivate func bjs_createTS2Swift() -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+
+func _$createTS2Swift() throws(JSException) -> TS2Swift {
+    let ret = bjs_createTS2Swift()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return TS2Swift.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "PlayBridgeJS", name: "bjs_TS2Swift_convert")
+fileprivate func bjs_TS2Swift_convert(_ self: Int32, _ ts: Int32) -> Int32
+#else
+fileprivate func bjs_TS2Swift_convert(_ self: Int32, _ ts: Int32) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+
 func _$TS2Swift_convert(_ self: JSObject, _ ts: String) throws(JSException) -> String {
     let selfValue = self.bridgeJSLowerParameter()
     let tsValue = ts.bridgeJSLowerParameter()

Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json

@@ -195,6 +195,52 @@
           }
         ]
       },
+      {
+        "functions" : [
+          {
+            "name" : "createTS2Swift",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "jsObject" : {
+                "_0" : "TS2Swift"
+              }
+            }
+          }
+        ],
+        "types" : [
+          {
+            "getters" : [
+
+            ],
+            "methods" : [
+              {
+                "name" : "convert",
+                "parameters" : [
+                  {
+                    "name" : "ts",
+                    "type" : {
+                      "string" : {
+
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ],
+            "name" : "TS2Swift",
+            "setters" : [
+
+            ]
+          }
+        ]
+      },
       {
         "functions" : [
 

Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSTool.swift

@@ -113,6 +113,7 @@ import BridgeJSUtilities
             let bridgeJsGlobalDtsPath = targetDirectory.appending(path: "bridge-js.global.d.ts")
             let hasDts = FileManager.default.fileExists(atPath: bridgeJsDtsPath.path)
             let hasGlobalDts = FileManager.default.fileExists(atPath: bridgeJsGlobalDtsPath.path)
+            var generatedMacrosPath: String? = nil
             if hasDts || hasGlobalDts {
                 guard let tsconfigPath = doubleDashOptions["project"] else {
                     throw BridgeJSToolError("--project option is required when processing .d.ts files")
@@ -128,9 +129,16 @@ import BridgeJSUtilities
                     progress: progress,
                     outputPath: bridgeJSMacrosPath.path
                 )
+                generatedMacrosPath = bridgeJSMacrosPath.path
             }
 
-            let inputFiles = inputSwiftFiles(targetDirectory: targetDirectory, positionalArguments: positionalArguments)
+            var inputFiles = inputSwiftFiles(targetDirectory: targetDirectory, positionalArguments: positionalArguments)
+            // BridgeJS.Macros.swift contains imported declarations (@JSFunction, @JSClass, etc.) that need
+            // to be processed by SwiftToSkeleton to populate the imported skeleton. The command plugin
+            // filters out Generated/ files, so we explicitly add it here after generation.
+            if let macrosPath = generatedMacrosPath, FileManager.default.fileExists(atPath: macrosPath) {
+                inputFiles.append(macrosPath)
+            }
             let swiftToSkeleton = SwiftToSkeleton(
                 progress: progress,
                 moduleName: moduleName,