Convert partial interfaces into extensions

Author: j-f1

Sources/DOM/Generated.swift

@@ -15806,21 +15806,13 @@ public class ULongRange: BridgedDictionary {
     public var min: UInt32
 }
 
-public class URL: JSBridgedClass {
-    @inlinable public class var constructor: JSFunction? { JSObject.global[Strings.URL].function }
-
-    public let jsObject: JSObject
-
-    public required init(unsafelyWrapping jsObject: JSObject) {
-        self.jsObject = jsObject
-    }
-
-    @inlinable public class func createObjectURL(obj: Blob_or_MediaSource) -> String {
+public extension URL {
+    @inlinable class func createObjectURL(obj: Blob_or_MediaSource) -> String {
         let this = constructor!
         return this[Strings.createObjectURL].function!(this: this, arguments: [_toJSValue(obj)]).fromJSValue()!
     }
 
-    @inlinable public class func revokeObjectURL(url: String) {
+    @inlinable class func revokeObjectURL(url: String) {
         let this = constructor!
         _ = this[Strings.revokeObjectURL].function!(this: this, arguments: [_toJSValue(url)])
     }

Sources/Gamepad/Generated.swift

@@ -362,16 +362,8 @@ public class GamepadTouch: JSBridgedClass {
     public var surfaceDimensions: Uint32Array?
 }
 
-public class Navigator: JSBridgedClass {
-    @inlinable public class var constructor: JSFunction? { JSObject.global[Strings.Navigator].function }
-
-    public let jsObject: JSObject
-
-    public required init(unsafelyWrapping jsObject: JSObject) {
-        self.jsObject = jsObject
-    }
-
-    @inlinable public func getGamepads() -> [Gamepad?] {
+public extension Navigator {
+    @inlinable func getGamepads() -> [Gamepad?] {
         let this = jsObject
         return this[Strings.getGamepads].function!(this: this, arguments: []).fromJSValue()!
     }

Sources/WebIDLToSwift/MergeDeclarations.swift

@@ -121,6 +121,7 @@ enum DeclarationMerger {
             grouping: allNodes(ofType: IDLInterface.self).map {
                 MergedInterface(
                     name: $0.name,
+                    partial: $0.partial,
                     parentClasses: [$0.inheritance]
                         .compactMap { $0 }
                         .filter { !Self.ignoredParents.contains($0) },
@@ -137,6 +138,7 @@ enum DeclarationMerger {
             by: \.name
         ).mapValues { toMerge -> MergedInterface in
             var interface = toMerge.dropFirst().reduce(into: toMerge.first!) { partialResult, interface in
+                partialResult.partial = partialResult.partial && interface.partial
                 partialResult.parentClasses += interface.parentClasses
                 partialResult.members += interface.members
                 partialResult.exposed.formUnion(interface.exposed)
@@ -287,6 +289,7 @@ struct MergedDictionary: DeclarationFile {
 
 struct MergedInterface: DeclarationFile {
     let name: String
+    var partial: Bool
     var parentClasses: [String]
     var mixins: [String] = []
     var members: [IDLInterfaceMember]

Sources/WebIDLToSwift/WebIDL+SwiftRepresentation.swift

@@ -222,7 +222,6 @@ extension MergedInterface: SwiftRepresentable {
             }.joined(separator: "\n\n")
         }
 
-        let inheritance = (parentClasses.isEmpty ? ["JSBridgedClass"] : parentClasses) + mixins
         // Allow cross-module subclassing with `open` access modifier for classes that require this.
         let openClasses = [
             "DocumentFragment",
@@ -237,29 +236,32 @@ extension MergedInterface: SwiftRepresentable {
         ]
         let access: SwiftSource = openClasses.contains(name) ? "open" : "public"
 
-        let globalAccessor: SwiftSource
-        if global {
-            globalAccessor = """
-            @inlinable public static var global: \(name) {
-                \(name)(unsafelyWrapping: JSObject.global)
-            }
-            """
+        let header: SwiftSource
+        if partial {
+            header = "public extension \(name)"
         } else {
-            globalAccessor = ""
+            let inheritance = (parentClasses.isEmpty ? ["JSBridgedClass"] : parentClasses) + mixins
+            header = "\(access) class \(name): \(sequence: inheritance.map(SwiftSource.init(_:)))"
         }
 
         return """
-        \(access) class \(name): \(sequence: inheritance.map(SwiftSource.init(_:))) {
-            @inlinable \(access)\(parentClasses.isEmpty ? "" : " override") class var constructor: JSFunction? { \(constructor) }
+        \(header) {
+            \(partial ? "" : """
+                @inlinable \(access)\(parentClasses.isEmpty ? "" : " override") class var constructor: JSFunction? { \(constructor) }
 
-            \(parentClasses.isEmpty ? "public let jsObject: JSObject" : "")
+                \(parentClasses.isEmpty ? "public let jsObject: JSObject" : "")
 
-            \(globalAccessor)
+                \(global ? """
+                    @inlinable public static var global: \(name) {
+                        \(name)(unsafelyWrapping: JSObject.global)
+                    }
+                """ : "")
 
-            public required init(unsafelyWrapping jsObject: JSObject) {
-                \(memberInits.joined(separator: "\n"))
-                \(parentClasses.isEmpty ? "self.jsObject = jsObject" : "super.init(unsafelyWrapping: jsObject)")
-            }
+                public required init(unsafelyWrapping jsObject: JSObject) {
+                    \(memberInits.joined(separator: "\n"))
+                    \(parentClasses.isEmpty ? "self.jsObject = jsObject" : "super.init(unsafelyWrapping: jsObject)")
+                }
+            """)
 
             \(body)
         }