Fix CI: update snapshots, formatting, runtime test, add docs and review feedback

Author: krodak

Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift

@@ -1425,7 +1425,12 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
         }
     }
 
-    /// Walks extension members under the matching type’s state, returning whether the type was found
+    /// Walks extension members under the matching type’s state, returning whether the type was found.
+    ///
+    /// Note: The lookup scans dictionaries keyed by `makeKey(name:namespace:)`, matching only by
+    /// plain name. If two types share a name but differ by namespace, `.first(where:)` picks
+    /// whichever comes first. This is acceptable today since namespace collisions are unlikely,
+    /// but may need refinement if namespace-qualified extension resolution is added.
     func resolveExtension(_ ext: ExtensionDeclSyntax) -> Bool {
         let name = ext.extendedType.trimmedDescription
         let state: State
@@ -1435,6 +1440,13 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             state = .structBody(name: name, key: entry.key)
         } else if let entry = exportedEnumByName.first(where: { $0.value.name == name }) {
             state = .enumBody(name: name, key: entry.key)
+        } else if exportedProtocolByName.values.contains(where: { $0.name == name }) {
+            diagnose(
+                node: ext.extendedType,
+                message: "Protocol extensions are not supported by BridgeJS.",
+                hint: "You cannot extend `@JS` protocol '\(name)' with additional members"
+            )
+            return true
         } else {
             return false
         }

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.d.ts

@@ -16,7 +16,6 @@ export interface DataPoint {
     label: string;
     optCount: number | null;
     optFlag: boolean | null;
-    distanceFromOrigin(): number;
 }
 export interface Address {
     street: string;
@@ -44,6 +43,12 @@ export interface Container {
     object: any;
     optionalObject: any | null;
 }
+export interface Vector2D {
+    dx: number;
+    dy: number;
+    magnitude(): number;
+    scaled(factor: number): Vector2D;
+}
 export type PrecisionObject = typeof PrecisionValues;
 
 /// Represents a Swift heap object like a class instance or an actor instance.

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js

@@ -74,13 +74,7 @@ export async function createInstantiator(options, swift) {
             const string = strStack.pop();
             const f64 = f64Stack.pop();
             const f641 = f64Stack.pop();
-            const instance1 = { x: f641, y: f64, label: string, optCount: optValue1, optFlag: optValue };
-            instance1.distanceFromOrigin = function() {
-                structHelpers.DataPoint.lower(this);
-                const ret = instance.exports.bjs_DataPoint_distanceFromOrigin();
-                return ret;
-            }.bind(instance1);
-            return instance1;
+            return { x: f641, y: f64, label: string, optCount: optValue1, optFlag: optValue };
         }
     });
     const __bjs_createAddressHelpers = () => ({
@@ -226,6 +220,29 @@ export async function createInstantiator(options, swift) {
             return { object: value, optionalObject: optValue };
         }
     });
+    const __bjs_createVector2DHelpers = () => ({
+        lower: (value) => {
+            f64Stack.push(value.dx);
+            f64Stack.push(value.dy);
+        },
+        lift: () => {
+            const f64 = f64Stack.pop();
+            const f641 = f64Stack.pop();
+            const instance1 = { dx: f641, dy: f64 };
+            instance1.magnitude = function() {
+                structHelpers.Vector2D.lower(this);
+                const ret = instance.exports.bjs_Vector2D_magnitude();
+                return ret;
+            }.bind(instance1);
+            instance1.scaled = function(factor) {
+                structHelpers.Vector2D.lower(this);
+                const ret = instance.exports.bjs_Vector2D_scaled(factor);
+                const structValue = structHelpers.Vector2D.lift();
+                return structValue;
+            }.bind(instance1);
+            return instance1;
+        }
+    });
 
     return {
         /**
@@ -343,6 +360,13 @@ export async function createInstantiator(options, swift) {
                 const value = structHelpers.Container.lift();
                 return swift.memory.retain(value);
             }
+            bjs["swift_js_struct_lower_Vector2D"] = function(objectId) {
+                structHelpers.Vector2D.lower(swift.memory.getObject(objectId));
+            }
+            bjs["swift_js_struct_lift_Vector2D"] = function() {
+                const value = structHelpers.Vector2D.lift();
+                return swift.memory.retain(value);
+            }
             bjs["swift_js_return_optional_bool"] = function(isSome, value) {
                 if (isSome === 0) {
                     tmpRetOptionalBool = null;
@@ -534,6 +558,9 @@ export async function createInstantiator(options, swift) {
             const ContainerHelpers = __bjs_createContainerHelpers();
             structHelpers.Container = ContainerHelpers;
 
+            const Vector2DHelpers = __bjs_createVector2DHelpers();
+            structHelpers.Vector2D = Vector2DHelpers;
+
             const exports = {
                 Greeter,
                 roundtrip: function bjs_roundtrip(session) {

Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Class.md

@@ -77,6 +77,53 @@ export type Exports = {
 }
 ```
 
+## Adding Members via Extensions
+
+You can add exported methods, computed properties, and static members to a `@JS` class using extensions. The extension block itself does not need `@JS` - only the individual members do:
+
+```swift
+@JS class Greeter {
+    @JS var name: String
+
+    @JS init(name: String) {
+        self.name = name
+    }
+
+    @JS func greet() -> String {
+        return "Hello, " + self.name + "!"
+    }
+}
+
+extension Greeter {
+    @JS func greetEnthusiastically() -> String {
+        return "Hey, " + self.name + "!!!"
+    }
+
+    @JS var nameCount: Int { name.count }
+
+    @JS static func greetAnonymously() -> String {
+        return "Hello."
+    }
+
+    @JS static var defaultGreeting: String { "Hello, world!" }
+}
+```
+
+This also works across files within the same module:
+
+```swift
+// GreeterExtension.swift
+extension Greeter {
+    @JS func greetFormally() -> String {
+        return "Good day, " + self.name + "."
+    }
+}
+```
+
+All `@JS`-annotated members in extensions are merged into the same generated TypeScript interface as the original class declaration.
+
+> Note: Extensions must target `@JS`-annotated types from the same module.
+
 ## How It Works
 
 Classes use **reference semantics** when crossing the Swift/JavaScript boundary:
@@ -103,5 +150,6 @@ This differs from structs, which use copy semantics and transfer data by value.
 | Static / class properties: `static var`, `class let` | ✅ (See <doc:Exporting-Swift-Static-Properties> )|
 | Methods: `func` | ✅ (See <doc:Exporting-Swift-Function> ) |
 | Static/class methods: `static func`, `class func` | ✅ (See <doc:Exporting-Swift-Static-Functions> ) |
+| Extension methods/properties | ✅ |
 | Subscripts: `subscript()` | ❌ |
 | Generics | ❌ |

Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Enum.md

@@ -514,4 +514,5 @@ This differs from classes, which use reference semantics and share state across
 | Associated values: `JSObject` | ✅ |
 | Associated values: Arrays | ✅ |
 | Associated values: Optionals of all supported types | ✅ |
+| Extension static functions/properties | ✅ |
 | Generics | ❌ |

Sources/JavaScriptKit/Documentation.docc/Articles/BridgeJS/Exporting-Swift/Exporting-Swift-Struct.md

@@ -165,6 +165,7 @@ This differs from classes, which use reference semantics and share state across
 | Instance methods | ✅ |
 | Static methods | ✅ |
 | Static properties | ✅ |
+| Extension methods/properties | ✅ |
 | Property observers (`willSet`, `didSet`) | ❌ |
 | Generics | ❌ |
 | Conformances | ❌ |

Tests/JavaScriptEventLoopTests/JSClosure+AsyncTests.swift

@@ -72,7 +72,7 @@ class JSClosureAsyncTests: XCTestCase {
         )!.value()
         XCTAssertEqual(result, 42.0)
     }
-
+    
     func testAsyncOneshotClosureWithPriority() async throws {
         let priority = UnsafeSendableBox<TaskPriority?>(nil)
         let closure = JSOneshotClosure.async(priority: .high) { _ in
@@ -83,7 +83,7 @@ class JSClosureAsyncTests: XCTestCase {
         XCTAssertEqual(result, 42.0)
         XCTAssertEqual(priority.value, .high)
     }
-
+    
     @available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
     func testAsyncOneshotClosureWithTaskExecutor() async throws {
         let executor = AnyTaskExecutor()
@@ -93,7 +93,7 @@ class JSClosureAsyncTests: XCTestCase {
         let result = try await JSPromise(from: closure.function!())!.value()
         XCTAssertEqual(result, 42.0)
     }
-
+    
     @available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
     func testAsyncOneshotClosureWithTaskExecutorPreference() async throws {
         let executor = AnyTaskExecutor()

Tests/prelude.mjs

@@ -801,7 +801,7 @@ function testStructSupport(exports) {
     assert.equal(exports.DataPoint.dimensions, 2);
 
     // Test struct extension instance methods
-    const vec = new exports.Vector2D(3.0, 4.0);
+    const vec = exports.Vector2D.init(3.0, 4.0);
     assert.equal(vec.magnitude(), 5.0);
     const scaled = vec.scaled(2.0);
     assert.equal(scaled.dx, 6.0);