Skip to content

Commit

Permalink
Resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@MaxDesiatov
MaxDesiatov committed May 2, 2022
1 parent 78f92fd commit a2745ed
Show file tree
Hide file tree
Showing 2 changed files with 118 additions and 105 deletions.
118 changes: 118 additions & 0 deletions Sources/DOMKit/WebIDL/Generated.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14732,6 +14732,107 @@ public class XSLTProcessor: JSBridgedClass {
}
}

public enum console {
@inlinable public static var jsObject: JSObject {
JSObject.global[Strings.console].object!
}

@inlinable public static func assert(condition: Bool? = nil, data: JSValue...) {
let this = JSObject.global[Strings.console].object!
_ = this[Strings.assert].function!(this: this, arguments: [condition?.jsValue ?? .undefined] + data.map(\.jsValue))
}

@inlinable public static func clear() {
let this = JSObject.global[Strings.console].object!
_ = this[Strings.clear].function!(this: this, arguments: [])
}

@inlinable public static func debug(data: JSValue...) {
let this = JSObject.global[Strings.console].object!
_ = this[Strings.debug].function!(this: this, arguments: data.map(\.jsValue))
}

@inlinable public static func error(data: JSValue...) {
let this = JSObject.global[Strings.console].object!
_ = this[Strings.error].function!(this: this, arguments: data.map(\.jsValue))
}

@inlinable public static func info(data: JSValue...) {
let this = JSObject.global[Strings.console].object!
_ = this[Strings.info].function!(this: this, arguments: data.map(\.jsValue))
}

@inlinable public static func log(data: JSValue...) {
let this = JSObject.global[Strings.console].object!
_ = this[Strings.log].function!(this: this, arguments: data.map(\.jsValue))
}

@inlinable public static func table(tabularData: JSValue? = nil, properties: [String]? = nil) {
let this = JSObject.global[Strings.console].object!
_ = this[Strings.table].function!(this: this, arguments: [tabularData?.jsValue ?? .undefined, properties?.jsValue ?? .undefined])
}

@inlinable public static func trace(data: JSValue...) {
let this = JSObject.global[Strings.console].object!
_ = this[Strings.trace].function!(this: this, arguments: data.map(\.jsValue))
}

@inlinable public static func warn(data: JSValue...) {
let this = JSObject.global[Strings.console].object!
_ = this[Strings.warn].function!(this: this, arguments: data.map(\.jsValue))
}

@inlinable public static func dir(item: JSValue? = nil, options: JSObject? = nil) {
let this = JSObject.global[Strings.console].object!
_ = this[Strings.dir].function!(this: this, arguments: [item?.jsValue ?? .undefined, options?.jsValue ?? .undefined])
}

@inlinable public static func dirxml(data: JSValue...) {
let this = JSObject.global[Strings.console].object!
_ = this[Strings.dirxml].function!(this: this, arguments: data.map(\.jsValue))
}

@inlinable public static func count(label: String? = nil) {
let this = JSObject.global[Strings.console].object!
_ = this[Strings.count].function!(this: this, arguments: [label?.jsValue ?? .undefined])
}

@inlinable public static func countReset(label: String? = nil) {
let this = JSObject.global[Strings.console].object!
_ = this[Strings.countReset].function!(this: this, arguments: [label?.jsValue ?? .undefined])
}

@inlinable public static func group(data: JSValue...) {
let this = JSObject.global[Strings.console].object!
_ = this[Strings.group].function!(this: this, arguments: data.map(\.jsValue))
}

@inlinable public static func groupCollapsed(data: JSValue...) {
let this = JSObject.global[Strings.console].object!
_ = this[Strings.groupCollapsed].function!(this: this, arguments: data.map(\.jsValue))
}

@inlinable public static func groupEnd() {
let this = JSObject.global[Strings.console].object!
_ = this[Strings.groupEnd].function!(this: this, arguments: [])
}

@inlinable public static func time(label: String? = nil) {
let this = JSObject.global[Strings.console].object!
_ = this[Strings.time].function!(this: this, arguments: [label?.jsValue ?? .undefined])
}

@inlinable public static func timeLog(label: String? = nil, data: JSValue...) {
let this = JSObject.global[Strings.console].object!
_ = this[Strings.timeLog].function!(this: this, arguments: [label?.jsValue ?? .undefined] + data.map(\.jsValue))
}

@inlinable public static func timeEnd(label: String? = nil) {
let this = JSObject.global[Strings.console].object!
_ = this[Strings.timeEnd].function!(this: this, arguments: [label?.jsValue ?? .undefined])
}
}

/* variadic generics please */
@propertyWrapper public final class ClosureAttribute0<ReturnType>
where ReturnType: JSValueCompatible
Expand Down Expand Up @@ -15506,6 +15607,7 @@ public class XSLTProcessor: JSBridgedClass {
@usableFromInline static let ariaValueText: JSString = "ariaValueText"
@usableFromInline static let arrayBuffer: JSString = "arrayBuffer"
@usableFromInline static let `as`: JSString = "as"
@usableFromInline static let assert: JSString = "assert"
@usableFromInline static let assign: JSString = "assign"
@usableFromInline static let assignedElements: JSString = "assignedElements"
@usableFromInline static let assignedNodes: JSString = "assignedNodes"
Expand Down Expand Up @@ -15630,6 +15732,7 @@ public class XSLTProcessor: JSBridgedClass {
@usableFromInline static let composite: JSString = "composite"
@usableFromInline static let computedOffset: JSString = "computedOffset"
@usableFromInline static let confirm: JSString = "confirm"
@usableFromInline static let console: JSString = "console"
@usableFromInline static let contains: JSString = "contains"
@usableFromInline static let content: JSString = "content"
@usableFromInline static let contentDocument: JSString = "contentDocument"
Expand All @@ -15643,6 +15746,8 @@ public class XSLTProcessor: JSBridgedClass {
@usableFromInline static let cookie: JSString = "cookie"
@usableFromInline static let cookieEnabled: JSString = "cookieEnabled"
@usableFromInline static let coords: JSString = "coords"
@usableFromInline static let count: JSString = "count"
@usableFromInline static let countReset: JSString = "countReset"
@usableFromInline static let createAttribute: JSString = "createAttribute"
@usableFromInline static let createAttributeNS: JSString = "createAttributeNS"
@usableFromInline static let createCDATASection: JSString = "createCDATASection"
Expand Down Expand Up @@ -15686,6 +15791,7 @@ public class XSLTProcessor: JSBridgedClass {
@usableFromInline static let dataTransfer: JSString = "dataTransfer"
@usableFromInline static let dataset: JSString = "dataset"
@usableFromInline static let dateTime: JSString = "dateTime"
@usableFromInline static let debug: JSString = "debug"
@usableFromInline static let declare: JSString = "declare"
@usableFromInline static let decode: JSString = "decode"
@usableFromInline static let decoding: JSString = "decoding"
Expand Down Expand Up @@ -15723,6 +15829,7 @@ public class XSLTProcessor: JSBridgedClass {
@usableFromInline static let dir: JSString = "dir"
@usableFromInline static let dirName: JSString = "dirName"
@usableFromInline static let direction: JSString = "direction"
@usableFromInline static let dirxml: JSString = "dirxml"
@usableFromInline static let disable: JSString = "disable"
@usableFromInline static let disabled: JSString = "disabled"
@usableFromInline static let disconnect: JSString = "disconnect"
Expand Down Expand Up @@ -15858,6 +15965,9 @@ public class XSLTProcessor: JSBridgedClass {
@usableFromInline static let globalAlpha: JSString = "globalAlpha"
@usableFromInline static let globalCompositeOperation: JSString = "globalCompositeOperation"
@usableFromInline static let go: JSString = "go"
@usableFromInline static let group: JSString = "group"
@usableFromInline static let groupCollapsed: JSString = "groupCollapsed"
@usableFromInline static let groupEnd: JSString = "groupEnd"
@usableFromInline static let handled: JSString = "handled"
@usableFromInline static let hangingBaseline: JSString = "hangingBaseline"
@usableFromInline static let hardwareConcurrency: JSString = "hardwareConcurrency"
Expand Down Expand Up @@ -15903,6 +16013,7 @@ public class XSLTProcessor: JSBridgedClass {
@usableFromInline static let indeterminate: JSString = "indeterminate"
@usableFromInline static let index: JSString = "index"
@usableFromInline static let inert: JSString = "inert"
@usableFromInline static let info: JSString = "info"
@usableFromInline static let initCompositionEvent: JSString = "initCompositionEvent"
@usableFromInline static let initCustomEvent: JSString = "initCustomEvent"
@usableFromInline static let initEvent: JSString = "initEvent"
Expand Down Expand Up @@ -15990,6 +16101,7 @@ public class XSLTProcessor: JSBridgedClass {
@usableFromInline static let location: JSString = "location"
@usableFromInline static let locationbar: JSString = "locationbar"
@usableFromInline static let locked: JSString = "locked"
@usableFromInline static let log: JSString = "log"
@usableFromInline static let longDesc: JSString = "longDesc"
@usableFromInline static let lookupNamespaceURI: JSString = "lookupNamespaceURI"
@usableFromInline static let lookupPrefix: JSString = "lookupPrefix"
Expand Down Expand Up @@ -16495,6 +16607,7 @@ public class XSLTProcessor: JSBridgedClass {
@usableFromInline static let tFoot: JSString = "tFoot"
@usableFromInline static let tHead: JSString = "tHead"
@usableFromInline static let tabIndex: JSString = "tabIndex"
@usableFromInline static let table: JSString = "table"
@usableFromInline static let tagName: JSString = "tagName"
@usableFromInline static let taintEnabled: JSString = "taintEnabled"
@usableFromInline static let takeRecords: JSString = "takeRecords"
Expand All @@ -16510,6 +16623,9 @@ public class XSLTProcessor: JSBridgedClass {
@usableFromInline static let textRendering: JSString = "textRendering"
@usableFromInline static let textTracks: JSString = "textTracks"
@usableFromInline static let throwIfAborted: JSString = "throwIfAborted"
@usableFromInline static let time: JSString = "time"
@usableFromInline static let timeEnd: JSString = "timeEnd"
@usableFromInline static let timeLog: JSString = "timeLog"
@usableFromInline static let timeOrigin: JSString = "timeOrigin"
@usableFromInline static let timeStamp: JSString = "timeStamp"
@usableFromInline static let timeline: JSString = "timeline"
Expand All @@ -16527,6 +16643,7 @@ public class XSLTProcessor: JSBridgedClass {
@usableFromInline static let toolbar: JSString = "toolbar"
@usableFromInline static let top: JSString = "top"
@usableFromInline static let total: JSString = "total"
@usableFromInline static let trace: JSString = "trace"
@usableFromInline static let track: JSString = "track"
@usableFromInline static let transfer: JSString = "transfer"
@usableFromInline static let transferControlToOffscreen: JSString = "transferControlToOffscreen"
Expand Down Expand Up @@ -16578,6 +16695,7 @@ public class XSLTProcessor: JSBridgedClass {
@usableFromInline static let vspace: JSString = "vspace"
@usableFromInline static let w: JSString = "w"
@usableFromInline static let waiting: JSString = "waiting"
@usableFromInline static let warn: JSString = "warn"
@usableFromInline static let webkitMatchesSelector: JSString = "webkitMatchesSelector"
@usableFromInline static let whatToShow: JSString = "whatToShow"
@usableFromInline static let whenDefined: JSString = "whenDefined"
Expand Down
105 changes: 0 additions & 105 deletions Sources/DOMKit/WebIDL/console.swift
View file

This file was deleted.

0 comments on commit a2745ed

Please sign in to comment.