Fix closure keys in dictionaries

Sources/DOMKit/ECMAScript/ArrayBuffer.swift

@@ -11,7 +11,6 @@ public typealias Int32Array = JSTypedArray<Int32>
 public typealias Uint8Array = JSTypedArray<UInt8>
 public typealias Uint16Array = JSTypedArray<UInt16>
 public typealias Uint32Array = JSTypedArray<UInt32>
-//public typealias Uint8ClampedArray = JSTypedArray<Uint8Clamped>
 public typealias Float32Array = JSTypedArray<Float32>
 public typealias Float64Array = JSTypedArray<Float64>
 

Sources/WebIDLToSwift/WebIDL+SwiftRepresentation.swift

@@ -71,12 +71,18 @@ extension MergedDictionary: SwiftRepresentable {
 
     private var swiftInit: SwiftSource {
         """
-        public init(\(sequence: members.map { "\($0.name): \($0.idlType)" })) {
+        public init(\(sequence: members.map { "\($0.name): \($0.idlType.isFunction ? "@escaping " : "")\($0.idlType)" })) {
             let object = JSObject.global.Object.function!.new()
             \(lines: members.map {
-                """
-                object[\(quoted: $0.name)] = \($0.name).jsValue()
-                """
+                if $0.idlType.isFunction {
+                    return """
+                    \($0.idlType.propertyWrapper(readonly: false))[\(quoted: $0.name), in: object] = \($0.name)
+                    """
+                } else {
+                    return """
+                    object[\(quoted: $0.name)] = \($0.name).jsValue()
+                    """
+                }
             })
             \(lines: members.map {
                 """
@@ -487,6 +493,22 @@ extension IDLType: SwiftRepresentable {
         }
     }
 
+    var isFunction: Bool {
+        if case let .single(name) = value {
+            if Context.types[name] is IDLCallback {
+                return true
+            }
+            if let ref = Context.types[name] as? IDLTypedef,
+               case let .single(name) = ref.idlType.value,
+               Context.types[name] is IDLCallback
+            {
+                assert(ref.idlType.nullable)
+                return true
+            }
+        }
+        return false
+    }
+
     func propertyWrapper(readonly: Bool) -> SwiftSource {
         // TODO: handle readonly closure properties
         // (should they be a JSFunction? or a closure? or something else?))