special-case CustomElementConstructor

Author: j-f1

Sources/DOMKit/ECMAScript/Support.swift

@@ -16,3 +16,4 @@ public let globalThis = Window(from: JSObject.global.jsValue())!
 public typealias Uint8ClampedArray = JSUInt8ClampedArray
 public typealias CSSColorValue_or_CSSStyleValue = CSSStyleValue
 public typealias Any_CSSColorValue_or_CSSStyleValue = CSSStyleValue
+public typealias CustomElementConstructor = JSFunction

Sources/DOMKit/WebIDL/CustomElementRegistry.swift

@@ -12,16 +12,27 @@ public class CustomElementRegistry: JSBridgedClass {
         self.jsObject = jsObject
     }
 
-    // XXX: member 'define' is ignored
+    @inlinable public func define(name: String, constructor: CustomElementConstructor, options: ElementDefinitionOptions? = nil) {
+        let this = jsObject
+        _ = this[Strings.define].function!(this: this, arguments: [name.jsValue(), constructor.jsValue(), options?.jsValue() ?? .undefined])
+    }
 
     @inlinable public func get(name: String) -> CustomElementConstructor? {
         let this = jsObject
         return this[Strings.get].function!(this: this, arguments: [name.jsValue()]).fromJSValue()!
     }
 
-    // XXX: member 'whenDefined' is ignored
+    @inlinable public func whenDefined(name: String) -> JSPromise {
+        let this = jsObject
+        return this[Strings.whenDefined].function!(this: this, arguments: [name.jsValue()]).fromJSValue()!
+    }
 
-    // XXX: member 'whenDefined' is ignored
+    @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
+    @inlinable public func whenDefined(name: String) async throws -> CustomElementConstructor {
+        let this = jsObject
+        let _promise: JSPromise = this[Strings.whenDefined].function!(this: this, arguments: [name.jsValue()]).fromJSValue()!
+        return try await _promise.get().fromJSValue()!
+    }
 
     @inlinable public func upgrade(root: Node) {
         let this = jsObject

Sources/DOMKit/WebIDL/Strings.swift

@@ -1855,6 +1855,7 @@ import JavaScriptKit
     @usableFromInline static let defaultValue: JSString = "defaultValue"
     @usableFromInline static let defaultView: JSString = "defaultView"
     @usableFromInline static let `defer`: JSString = "defer"
+    @usableFromInline static let define: JSString = "define"
     @usableFromInline static let deg: JSString = "deg"
     @usableFromInline static let degradationPreference: JSString = "degradationPreference"
     @usableFromInline static let delay: JSString = "delay"
@@ -4975,6 +4976,7 @@ import JavaScriptKit
     @usableFromInline static let webkitdirectory: JSString = "webkitdirectory"
     @usableFromInline static let weight: JSString = "weight"
     @usableFromInline static let whatToShow: JSString = "whatToShow"
+    @usableFromInline static let whenDefined: JSString = "whenDefined"
     @usableFromInline static let which: JSString = "which"
     @usableFromInline static let whiteBalanceMode: JSString = "whiteBalanceMode"
     @usableFromInline static let wholeText: JSString = "wholeText"

Sources/DOMKit/WebIDL/Typedefs.swift

@@ -146,7 +146,6 @@ public typealias FileCallback = (File) -> Void
 public typealias PositionCallback = (GeolocationPosition) -> Void
 public typealias PositionErrorCallback = (GeolocationPositionError) -> Void
 public typealias BlobCallback = (Blob?) -> Void
-public typealias CustomElementConstructor = () -> HTMLElement
 public typealias FunctionStringCallback = (String) -> Void
 public typealias EventHandlerNonNull = (Event) -> JSValue
 public typealias OnErrorEventHandlerNonNull = (Event_or_String, String, UInt32, UInt32, JSValue) -> JSValue

Sources/WebIDLToSwift/IDLBuilder.swift

@@ -10,10 +10,11 @@ enum IDLBuilder {
     \n
     """
 
-    // dictionaries that depend on types not exposed to Window environments
     static let ignoredNames: Set = [
+        // dictionaries that depend on types not exposed to Window environments
         "BreakTokenOptions", "TrustedTypePolicyOptions", "FragmentResultOptions",
         "Client_or_MessagePort_or_ServiceWorker", "ExtendableMessageEventInit",
+        // redundant unions
         "CSSColorValue_or_CSSStyleValue",
     ]
 
@@ -81,8 +82,6 @@ enum IDLBuilder {
                     "XRSession": ["requestAnimationFrame"],
                     // variadic callbacks are unsupported
                     "TrustedTypePolicyFactory": ["createPolicy"],
-                    // functions as return types are unsupported
-                    "CustomElementRegistry": ["define", "whenDefined"],
                     // NodeFilter
                     "Document": ["createNodeIterator", "createTreeWalker"],
                     "NodeIterator": ["filter"],

Sources/WebIDLToSwift/MergeDeclarations.swift

@@ -1,7 +1,11 @@
 import WebIDL
 
 enum DeclarationMerger {
-    static let ignoredTypedefs: Set<String> = ["Function", "AudioWorkletProcessorConstructor"]
+    static let ignoredTypedefs: Set<String> = [
+        "Function",
+        "AudioWorkletProcessorConstructor",
+        "CustomElementConstructor",
+    ]
     static let validExposures: Set<String> = ["Window"]
 
     private static func addAsync(_ members: [IDLNode]) -> [IDLNode] {