BridgeJS: fix: don't allow for other than top-levels namespace macros

krodak · krodak · commit 5ca3335bc5a0 · 2025-08-14T18:57:21.000+02:00
diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift
@@ -130,6 +130,14 @@ class ExportSwift {
             let name = node.name.text
             let namespace = extractNamespace(from: jsAttribute)
             
+            if namespace != nil, case .classBody = state {
+                diagnose(
+                    node: jsAttribute,
+                    message: "Namespace is only needed in top-level declaration",
+                    hint: "Remove the namespace from @JS attribute or move this function to top-level"
+                )
+            }
+            
             var parameters: [Parameter] = []
             for param in node.signature.parameterClause.parameters {
                 guard let type = self.parent.lookupType(for: param.type) else {
@@ -214,6 +222,17 @@ class ExportSwift {
                 diagnose(node: node, message: "@JS init must be inside a @JS class")
                 return .skipChildren
             }
+            
+            if let jsAttribute = node.attributes.firstJSAttribute,
+               let namespace = extractNamespace(from: jsAttribute),
+               namespace != nil {
+                diagnose(
+                    node: jsAttribute,
+                    message: "Namespace is not supported for initializer declarations",
+                    hint: "Remove the namespace from @JS attribute"
+                )
+            }
+            
             var parameters: [Parameter] = []
             for param in node.signature.parameterClause.parameters {
                 guard let type = self.parent.lookupType(for: param.type) else {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Namespaces.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Namespaces.swift
@@ -1,32 +1,33 @@
 @JS func plainFunction() -> String { "plain" }
 
+@JS("MyModule.Utils") func namespacedFunction() -> String { "namespaced" }
+
 @JS("__Swift.Foundation") class Greeter {
     var name: String
 
-    @JS("__Swift.Foundation") init(name: String) {
+    @JS init(name: String) {
         self.name = name
     }
     
-    @JS("__Swift.Foundation") func greet() -> String {
+    @JS func greet() -> String {
         return "Hello, " + self.name + "!"
     }
     
-    @JS("__Swift.Foundation") func changeName(name: String) {
+    func changeName(name: String) {
         self.name = name
     }
 }
 
 @JS("Utils.Converters") class Converter {
-    @JS("Utils.Converters") init() {}
+    @JS init() {}
     
-    @JS("Utils.Converters") func toString(value: Int) -> String {
+    @JS func toString(value: Int) -> String {
         return String(value)
     }
 }
 
 @JS("__Swift.Foundation")
 class UUID {
-    @JS("__Swift.Foundation")
     @JS func uuidString() -> String {
          Foundation.UUID().uuidString
     }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.d.ts
@@ -20,13 +20,17 @@ declare global {
             class Greeter {
                 constructor(name: string);
                 greet(): string;
-                changeName(name: string): void;
             }
             class UUID {
                 uuidString(): string;
             }
         }
     }
+    namespace MyModule {
+        namespace Utils {
+            function namespacedFunction(): string;
+        }
+    }
 }
 
 /// Represents a Swift heap object like a class instance or an actor instance.
@@ -38,7 +42,6 @@ export interface SwiftHeapObject {
 }
 export interface Greeter extends SwiftHeapObject {
     greet(): string;
-    changeName(name: string): void;
 }
 export interface Converter extends SwiftHeapObject {
     toString(value: number): string;
@@ -56,6 +59,7 @@ export type Exports = {
     UUID: {
     }
     plainFunction(): string;
+    namespacedFunction(): string;
 }
 export type Imports = {
 }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js
@@ -89,12 +89,6 @@ export async function createInstantiator(options, swift) {
                     tmpRetString = undefined;
                     return ret;
                 }
-                changeName(name) {
-                    const nameBytes = textEncoder.encode(name);
-                    const nameId = swift.memory.retain(nameBytes);
-                    instance.exports.bjs_Greeter_changeName(this.pointer, nameId, nameBytes.length);
-                    swift.memory.release(nameId);
-                }
             }
             class Converter extends SwiftHeapObject {
                 constructor() {
@@ -126,8 +120,20 @@ export async function createInstantiator(options, swift) {
                     tmpRetString = undefined;
                     return ret;
                 },
+                namespacedFunction: function bjs_namespacedFunction() {
+                    instance.exports.bjs_namespacedFunction();
+                    const ret = tmpRetString;
+                    tmpRetString = undefined;
+                    return ret;
+                },
             };
 
+            if (typeof globalThis.MyModule === 'undefined') {
+                globalThis.MyModule = {};
+            }
+            if (typeof globalThis.MyModule.Utils === 'undefined') {
+                globalThis.MyModule.Utils = {};
+            }
             if (typeof globalThis.Utils === 'undefined') {
                 globalThis.Utils = {};
             }
@@ -143,6 +149,7 @@ export async function createInstantiator(options, swift) {
             globalThis.__Swift.Foundation.Greeter = exports.Greeter;
             globalThis.Utils.Converters.Converter = exports.Converter;
             globalThis.__Swift.Foundation.UUID = exports.UUID;
+            globalThis.MyModule.Utils.namespacedFunction = exports.namespacedFunction;
 
             return exports;
         },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json
@@ -27,44 +27,12 @@
             "isThrows" : false
           },
           "name" : "greet",
-          "namespace" : [
-            "__Swift",
-            "Foundation"
-          ],
           "parameters" : [
 
           ],
           "returnType" : {
             "string" : {
 
-            }
-          }
-        },
-        {
-          "abiName" : "bjs_Greeter_changeName",
-          "effects" : {
-            "isAsync" : false,
-            "isThrows" : false
-          },
-          "name" : "changeName",
-          "namespace" : [
-            "__Swift",
-            "Foundation"
-          ],
-          "parameters" : [
-            {
-              "label" : "name",
-              "name" : "name",
-              "type" : {
-                "string" : {
-
-                }
-              }
-            }
-          ],
-          "returnType" : {
-            "void" : {
-
             }
           }
         }
@@ -94,10 +62,6 @@
             "isThrows" : false
           },
           "name" : "toString",
-          "namespace" : [
-            "Utils",
-            "Converters"
-          ],
           "parameters" : [
             {
               "label" : "value",
@@ -131,10 +95,6 @@
             "isThrows" : false
           },
           "name" : "uuidString",
-          "namespace" : [
-            "__Swift",
-            "Foundation"
-          ],
           "parameters" : [
 
           ],
@@ -162,6 +122,26 @@
       "name" : "plainFunction",
       "parameters" : [
 
+      ],
+      "returnType" : {
+        "string" : {
+
+        }
+      }
+    },
+    {
+      "abiName" : "bjs_namespacedFunction",
+      "effects" : {
+        "isAsync" : false,
+        "isThrows" : false
+      },
+      "name" : "namespacedFunction",
+      "namespace" : [
+        "MyModule",
+        "Utils"
+      ],
+      "parameters" : [
+
       ],
       "returnType" : {
         "string" : {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.swift
@@ -19,6 +19,19 @@ public func _bjs_plainFunction() -> Void {
     #endif
 }
 
+@_expose(wasm, "bjs_namespacedFunction")
+@_cdecl("bjs_namespacedFunction")
+public func _bjs_namespacedFunction() -> Void {
+    #if arch(wasm32)
+    var ret = namespacedFunction()
+    return ret.withUTF8 { ptr in
+        _swift_js_return_string(ptr.baseAddress, Int32(ptr.count))
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
 @_expose(wasm, "bjs_Greeter_init")
 @_cdecl("bjs_Greeter_init")
 public func _bjs_Greeter_init(nameBytes: Int32, nameLen: Int32) -> UnsafeMutableRawPointer {
@@ -47,20 +60,6 @@ public func _bjs_Greeter_greet(_self: UnsafeMutableRawPointer) -> Void {
     #endif
 }
 
-@_expose(wasm, "bjs_Greeter_changeName")
-@_cdecl("bjs_Greeter_changeName")
-public func _bjs_Greeter_changeName(_self: UnsafeMutableRawPointer, nameBytes: Int32, nameLen: Int32) -> Void {
-    #if arch(wasm32)
-    let name = String(unsafeUninitializedCapacity: Int(nameLen)) { b in
-        _swift_js_init_memory(nameBytes, b.baseAddress.unsafelyUnwrapped)
-        return Int(nameLen)
-    }
-    Unmanaged<Greeter>.fromOpaque(_self).takeUnretainedValue().changeName(name: name)
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
-}
-
 @_expose(wasm, "bjs_Greeter_deinit")
 @_cdecl("bjs_Greeter_deinit")
 public func _bjs_Greeter_deinit(pointer: UnsafeMutableRawPointer) {
diff --git a/Sources/JavaScriptKit/Macros.swift b/Sources/JavaScriptKit/Macros.swift
@@ -34,19 +34,19 @@
 ///     UUID().uuidString
 /// }
 ///
-/// // Export a class with a custom namespace (note that each method needs to specify the namespace)
+/// // Export a class with a custom namespace (note that only top level macro needs to specify the namespace)
 /// @JS("Utils.Greeters") class Greeter {
 ///     var name: String
 ///
-///     @JS("Utils.Greeters") init(name: String) {
+///     @JS init(name: String) {
 ///         self.name = name
 ///     }
 ///
-///     @JS("Utils.Greeters") func greet() -> String {
+///     @JS func greet() -> String {
 ///         return "Hello, " + self.name + "!"
 ///     }
 ///
-///     @JS("Utils.Greeters") func changeName(name: String) {
+///     @JS func changeName(name: String) {
 ///         self.name = name
 ///     }
 /// }

Original file line number	Diff line number	Diff line change
`@@ -1,32 +1,33 @@`
`1`	`1`	`@JS func plainFunction() -> String { "plain" }`
`2`	`2`
	`3`	`+@JS("MyModule.Utils") func namespacedFunction() -> String { "namespaced" }`
	`4`	`+`
`3`	`5`	`@JS("__Swift.Foundation") class Greeter {`
`4`	`6`	`var name: String`
`5`	`7`
`6`		`- @JS("__Swift.Foundation") init(name: String) {`
	`8`	`+ @JS init(name: String) {`
`7`	`9`	`self.name = name`
`8`	`10`	`}`
`9`	`11`
`10`		`- @JS("__Swift.Foundation") func greet() -> String {`
	`12`	`+ @JS func greet() -> String {`
`11`	`13`	`return "Hello, " + self.name + "!"`
`12`	`14`	`}`
`13`	`15`
`14`		`- @JS("__Swift.Foundation") func changeName(name: String) {`
	`16`	`+ func changeName(name: String) {`
`15`	`17`	`self.name = name`
`16`	`18`	`}`
`17`	`19`	`}`
`18`	`20`
`19`	`21`	`@JS("Utils.Converters") class Converter {`
`20`		`- @JS("Utils.Converters") init() {}`
	`22`	`+ @JS init() {}`
`21`	`23`
`22`		`- @JS("Utils.Converters") func toString(value: Int) -> String {`
	`24`	`+ @JS func toString(value: Int) -> String {`
`23`	`25`	`return String(value)`
`24`	`26`	`}`
`25`	`27`	`}`
`26`	`28`
`27`	`29`	`@JS("__Swift.Foundation")`
`28`	`30`	`class UUID {`
`29`		`- @JS("__Swift.Foundation")`
`30`	`31`	`@JS func uuidString() -> String {`
`31`	`32`	`Foundation.UUID().uuidString`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,13 +20,17 @@ declare global {`
`20`	`20`	`class Greeter {`
`21`	`21`	`constructor(name: string);`
`22`	`22`	`greet(): string;`
`23`		`- changeName(name: string): void;`
`24`	`23`	`}`
`25`	`24`	`class UUID {`
`26`	`25`	`uuidString(): string;`
`27`	`26`	`}`
`28`	`27`	`}`
`29`	`28`	`}`
	`29`	`+ namespace MyModule {`
	`30`	`+ namespace Utils {`
	`31`	`+ function namespacedFunction(): string;`
	`32`	`+ }`
	`33`	`+ }`
`30`	`34`	`}`
`31`	`35`
`32`	`36`	`/// Represents a Swift heap object like a class instance or an actor instance.`
`@@ -38,7 +42,6 @@ export interface SwiftHeapObject {`
`38`	`42`	`}`
`39`	`43`	`export interface Greeter extends SwiftHeapObject {`
`40`	`44`	`greet(): string;`
`41`		`- changeName(name: string): void;`
`42`	`45`	`}`
`43`	`46`	`export interface Converter extends SwiftHeapObject {`
`44`	`47`	`toString(value: number): string;`
`@@ -56,6 +59,7 @@ export type Exports = {`
`56`	`59`	`UUID: {`
`57`	`60`	`}`
`58`	`61`	`plainFunction(): string;`
	`62`	`+ namespacedFunction(): string;`
`59`	`63`	`}`
`60`	`64`	`export type Imports = {`
`61`	`65`	`}`