Skip to content

Commit a2745ed

Browse files
committed
Resolve conflicts
1 parent 78f92fd commit a2745ed

File tree

2 files changed

+118
-105
lines changed

2 files changed

+118
-105
lines changed

Sources/DOMKit/WebIDL/Generated.swift

+118
Original file line numberDiff line numberDiff line change
@@ -14732,6 +14732,107 @@ public class XSLTProcessor: JSBridgedClass {
1473214732
}
1473314733
}
1473414734

14735+
public enum console {
14736+
@inlinable public static var jsObject: JSObject {
14737+
JSObject.global[Strings.console].object!
14738+
}
14739+
14740+
@inlinable public static func assert(condition: Bool? = nil, data: JSValue...) {
14741+
let this = JSObject.global[Strings.console].object!
14742+
_ = this[Strings.assert].function!(this: this, arguments: [condition?.jsValue ?? .undefined] + data.map(\.jsValue))
14743+
}
14744+
14745+
@inlinable public static func clear() {
14746+
let this = JSObject.global[Strings.console].object!
14747+
_ = this[Strings.clear].function!(this: this, arguments: [])
14748+
}
14749+
14750+
@inlinable public static func debug(data: JSValue...) {
14751+
let this = JSObject.global[Strings.console].object!
14752+
_ = this[Strings.debug].function!(this: this, arguments: data.map(\.jsValue))
14753+
}
14754+
14755+
@inlinable public static func error(data: JSValue...) {
14756+
let this = JSObject.global[Strings.console].object!
14757+
_ = this[Strings.error].function!(this: this, arguments: data.map(\.jsValue))
14758+
}
14759+
14760+
@inlinable public static func info(data: JSValue...) {
14761+
let this = JSObject.global[Strings.console].object!
14762+
_ = this[Strings.info].function!(this: this, arguments: data.map(\.jsValue))
14763+
}
14764+
14765+
@inlinable public static func log(data: JSValue...) {
14766+
let this = JSObject.global[Strings.console].object!
14767+
_ = this[Strings.log].function!(this: this, arguments: data.map(\.jsValue))
14768+
}
14769+
14770+
@inlinable public static func table(tabularData: JSValue? = nil, properties: [String]? = nil) {
14771+
let this = JSObject.global[Strings.console].object!
14772+
_ = this[Strings.table].function!(this: this, arguments: [tabularData?.jsValue ?? .undefined, properties?.jsValue ?? .undefined])
14773+
}
14774+
14775+
@inlinable public static func trace(data: JSValue...) {
14776+
let this = JSObject.global[Strings.console].object!
14777+
_ = this[Strings.trace].function!(this: this, arguments: data.map(\.jsValue))
14778+
}
14779+
14780+
@inlinable public static func warn(data: JSValue...) {
14781+
let this = JSObject.global[Strings.console].object!
14782+
_ = this[Strings.warn].function!(this: this, arguments: data.map(\.jsValue))
14783+
}
14784+
14785+
@inlinable public static func dir(item: JSValue? = nil, options: JSObject? = nil) {
14786+
let this = JSObject.global[Strings.console].object!
14787+
_ = this[Strings.dir].function!(this: this, arguments: [item?.jsValue ?? .undefined, options?.jsValue ?? .undefined])
14788+
}
14789+
14790+
@inlinable public static func dirxml(data: JSValue...) {
14791+
let this = JSObject.global[Strings.console].object!
14792+
_ = this[Strings.dirxml].function!(this: this, arguments: data.map(\.jsValue))
14793+
}
14794+
14795+
@inlinable public static func count(label: String? = nil) {
14796+
let this = JSObject.global[Strings.console].object!
14797+
_ = this[Strings.count].function!(this: this, arguments: [label?.jsValue ?? .undefined])
14798+
}
14799+
14800+
@inlinable public static func countReset(label: String? = nil) {
14801+
let this = JSObject.global[Strings.console].object!
14802+
_ = this[Strings.countReset].function!(this: this, arguments: [label?.jsValue ?? .undefined])
14803+
}
14804+
14805+
@inlinable public static func group(data: JSValue...) {
14806+
let this = JSObject.global[Strings.console].object!
14807+
_ = this[Strings.group].function!(this: this, arguments: data.map(\.jsValue))
14808+
}
14809+
14810+
@inlinable public static func groupCollapsed(data: JSValue...) {
14811+
let this = JSObject.global[Strings.console].object!
14812+
_ = this[Strings.groupCollapsed].function!(this: this, arguments: data.map(\.jsValue))
14813+
}
14814+
14815+
@inlinable public static func groupEnd() {
14816+
let this = JSObject.global[Strings.console].object!
14817+
_ = this[Strings.groupEnd].function!(this: this, arguments: [])
14818+
}
14819+
14820+
@inlinable public static func time(label: String? = nil) {
14821+
let this = JSObject.global[Strings.console].object!
14822+
_ = this[Strings.time].function!(this: this, arguments: [label?.jsValue ?? .undefined])
14823+
}
14824+
14825+
@inlinable public static func timeLog(label: String? = nil, data: JSValue...) {
14826+
let this = JSObject.global[Strings.console].object!
14827+
_ = this[Strings.timeLog].function!(this: this, arguments: [label?.jsValue ?? .undefined] + data.map(\.jsValue))
14828+
}
14829+
14830+
@inlinable public static func timeEnd(label: String? = nil) {
14831+
let this = JSObject.global[Strings.console].object!
14832+
_ = this[Strings.timeEnd].function!(this: this, arguments: [label?.jsValue ?? .undefined])
14833+
}
14834+
}
14835+
1473514836
/* variadic generics please */
1473614837
@propertyWrapper public final class ClosureAttribute0<ReturnType>
1473714838
where ReturnType: JSValueCompatible
@@ -15506,6 +15607,7 @@ public class XSLTProcessor: JSBridgedClass {
1550615607
@usableFromInline static let ariaValueText: JSString = "ariaValueText"
1550715608
@usableFromInline static let arrayBuffer: JSString = "arrayBuffer"
1550815609
@usableFromInline static let `as`: JSString = "as"
15610+
@usableFromInline static let assert: JSString = "assert"
1550915611
@usableFromInline static let assign: JSString = "assign"
1551015612
@usableFromInline static let assignedElements: JSString = "assignedElements"
1551115613
@usableFromInline static let assignedNodes: JSString = "assignedNodes"
@@ -15630,6 +15732,7 @@ public class XSLTProcessor: JSBridgedClass {
1563015732
@usableFromInline static let composite: JSString = "composite"
1563115733
@usableFromInline static let computedOffset: JSString = "computedOffset"
1563215734
@usableFromInline static let confirm: JSString = "confirm"
15735+
@usableFromInline static let console: JSString = "console"
1563315736
@usableFromInline static let contains: JSString = "contains"
1563415737
@usableFromInline static let content: JSString = "content"
1563515738
@usableFromInline static let contentDocument: JSString = "contentDocument"
@@ -15643,6 +15746,8 @@ public class XSLTProcessor: JSBridgedClass {
1564315746
@usableFromInline static let cookie: JSString = "cookie"
1564415747
@usableFromInline static let cookieEnabled: JSString = "cookieEnabled"
1564515748
@usableFromInline static let coords: JSString = "coords"
15749+
@usableFromInline static let count: JSString = "count"
15750+
@usableFromInline static let countReset: JSString = "countReset"
1564615751
@usableFromInline static let createAttribute: JSString = "createAttribute"
1564715752
@usableFromInline static let createAttributeNS: JSString = "createAttributeNS"
1564815753
@usableFromInline static let createCDATASection: JSString = "createCDATASection"
@@ -15686,6 +15791,7 @@ public class XSLTProcessor: JSBridgedClass {
1568615791
@usableFromInline static let dataTransfer: JSString = "dataTransfer"
1568715792
@usableFromInline static let dataset: JSString = "dataset"
1568815793
@usableFromInline static let dateTime: JSString = "dateTime"
15794+
@usableFromInline static let debug: JSString = "debug"
1568915795
@usableFromInline static let declare: JSString = "declare"
1569015796
@usableFromInline static let decode: JSString = "decode"
1569115797
@usableFromInline static let decoding: JSString = "decoding"
@@ -15723,6 +15829,7 @@ public class XSLTProcessor: JSBridgedClass {
1572315829
@usableFromInline static let dir: JSString = "dir"
1572415830
@usableFromInline static let dirName: JSString = "dirName"
1572515831
@usableFromInline static let direction: JSString = "direction"
15832+
@usableFromInline static let dirxml: JSString = "dirxml"
1572615833
@usableFromInline static let disable: JSString = "disable"
1572715834
@usableFromInline static let disabled: JSString = "disabled"
1572815835
@usableFromInline static let disconnect: JSString = "disconnect"
@@ -15858,6 +15965,9 @@ public class XSLTProcessor: JSBridgedClass {
1585815965
@usableFromInline static let globalAlpha: JSString = "globalAlpha"
1585915966
@usableFromInline static let globalCompositeOperation: JSString = "globalCompositeOperation"
1586015967
@usableFromInline static let go: JSString = "go"
15968+
@usableFromInline static let group: JSString = "group"
15969+
@usableFromInline static let groupCollapsed: JSString = "groupCollapsed"
15970+
@usableFromInline static let groupEnd: JSString = "groupEnd"
1586115971
@usableFromInline static let handled: JSString = "handled"
1586215972
@usableFromInline static let hangingBaseline: JSString = "hangingBaseline"
1586315973
@usableFromInline static let hardwareConcurrency: JSString = "hardwareConcurrency"
@@ -15903,6 +16013,7 @@ public class XSLTProcessor: JSBridgedClass {
1590316013
@usableFromInline static let indeterminate: JSString = "indeterminate"
1590416014
@usableFromInline static let index: JSString = "index"
1590516015
@usableFromInline static let inert: JSString = "inert"
16016+
@usableFromInline static let info: JSString = "info"
1590616017
@usableFromInline static let initCompositionEvent: JSString = "initCompositionEvent"
1590716018
@usableFromInline static let initCustomEvent: JSString = "initCustomEvent"
1590816019
@usableFromInline static let initEvent: JSString = "initEvent"
@@ -15990,6 +16101,7 @@ public class XSLTProcessor: JSBridgedClass {
1599016101
@usableFromInline static let location: JSString = "location"
1599116102
@usableFromInline static let locationbar: JSString = "locationbar"
1599216103
@usableFromInline static let locked: JSString = "locked"
16104+
@usableFromInline static let log: JSString = "log"
1599316105
@usableFromInline static let longDesc: JSString = "longDesc"
1599416106
@usableFromInline static let lookupNamespaceURI: JSString = "lookupNamespaceURI"
1599516107
@usableFromInline static let lookupPrefix: JSString = "lookupPrefix"
@@ -16495,6 +16607,7 @@ public class XSLTProcessor: JSBridgedClass {
1649516607
@usableFromInline static let tFoot: JSString = "tFoot"
1649616608
@usableFromInline static let tHead: JSString = "tHead"
1649716609
@usableFromInline static let tabIndex: JSString = "tabIndex"
16610+
@usableFromInline static let table: JSString = "table"
1649816611
@usableFromInline static let tagName: JSString = "tagName"
1649916612
@usableFromInline static let taintEnabled: JSString = "taintEnabled"
1650016613
@usableFromInline static let takeRecords: JSString = "takeRecords"
@@ -16510,6 +16623,9 @@ public class XSLTProcessor: JSBridgedClass {
1651016623
@usableFromInline static let textRendering: JSString = "textRendering"
1651116624
@usableFromInline static let textTracks: JSString = "textTracks"
1651216625
@usableFromInline static let throwIfAborted: JSString = "throwIfAborted"
16626+
@usableFromInline static let time: JSString = "time"
16627+
@usableFromInline static let timeEnd: JSString = "timeEnd"
16628+
@usableFromInline static let timeLog: JSString = "timeLog"
1651316629
@usableFromInline static let timeOrigin: JSString = "timeOrigin"
1651416630
@usableFromInline static let timeStamp: JSString = "timeStamp"
1651516631
@usableFromInline static let timeline: JSString = "timeline"
@@ -16527,6 +16643,7 @@ public class XSLTProcessor: JSBridgedClass {
1652716643
@usableFromInline static let toolbar: JSString = "toolbar"
1652816644
@usableFromInline static let top: JSString = "top"
1652916645
@usableFromInline static let total: JSString = "total"
16646+
@usableFromInline static let trace: JSString = "trace"
1653016647
@usableFromInline static let track: JSString = "track"
1653116648
@usableFromInline static let transfer: JSString = "transfer"
1653216649
@usableFromInline static let transferControlToOffscreen: JSString = "transferControlToOffscreen"
@@ -16578,6 +16695,7 @@ public class XSLTProcessor: JSBridgedClass {
1657816695
@usableFromInline static let vspace: JSString = "vspace"
1657916696
@usableFromInline static let w: JSString = "w"
1658016697
@usableFromInline static let waiting: JSString = "waiting"
16698+
@usableFromInline static let warn: JSString = "warn"
1658116699
@usableFromInline static let webkitMatchesSelector: JSString = "webkitMatchesSelector"
1658216700
@usableFromInline static let whatToShow: JSString = "whatToShow"
1658316701
@usableFromInline static let whenDefined: JSString = "whenDefined"

Sources/DOMKit/WebIDL/console.swift

-105
This file was deleted.

0 commit comments

Comments
 (0)