Skip to content

Commit 7aff5d8

Browse files
MaxDesiatovj-f1
andauthored
Add console, fix DOMKitDemo build (#21)
This shouldn't conflict much with #19, as it generates a single `console.swift` file. Co-authored-by: Jed Fox <git@jedfox.com>
1 parent b56e5fc commit 7aff5d8

File tree

5 files changed

+126
-2
lines changed

5 files changed

+126
-2
lines changed

.github/workflows/test.yml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
2020
brew install swiftwasm/tap/carton
2121
22+
carton bundle --product DOMKitDemo
2223
carton test --environment defaultBrowser
2324
env:
2425
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Sources/DOMKit/WebIDL/Strings.swift

+17
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ import JavaScriptKit
326326
@usableFromInline static let ariaValueText: JSString = "ariaValueText"
327327
@usableFromInline static let arrayBuffer: JSString = "arrayBuffer"
328328
@usableFromInline static let `as`: JSString = "as"
329+
@usableFromInline static let assert: JSString = "assert"
329330
@usableFromInline static let assign: JSString = "assign"
330331
@usableFromInline static let assignedElements: JSString = "assignedElements"
331332
@usableFromInline static let assignedNodes: JSString = "assignedNodes"
@@ -450,6 +451,7 @@ import JavaScriptKit
450451
@usableFromInline static let composite: JSString = "composite"
451452
@usableFromInline static let computedOffset: JSString = "computedOffset"
452453
@usableFromInline static let confirm: JSString = "confirm"
454+
@usableFromInline static let console: JSString = "console"
453455
@usableFromInline static let contains: JSString = "contains"
454456
@usableFromInline static let content: JSString = "content"
455457
@usableFromInline static let contentDocument: JSString = "contentDocument"
@@ -463,6 +465,8 @@ import JavaScriptKit
463465
@usableFromInline static let cookie: JSString = "cookie"
464466
@usableFromInline static let cookieEnabled: JSString = "cookieEnabled"
465467
@usableFromInline static let coords: JSString = "coords"
468+
@usableFromInline static let count: JSString = "count"
469+
@usableFromInline static let countReset: JSString = "countReset"
466470
@usableFromInline static let createAttribute: JSString = "createAttribute"
467471
@usableFromInline static let createAttributeNS: JSString = "createAttributeNS"
468472
@usableFromInline static let createCDATASection: JSString = "createCDATASection"
@@ -506,6 +510,7 @@ import JavaScriptKit
506510
@usableFromInline static let dataTransfer: JSString = "dataTransfer"
507511
@usableFromInline static let dataset: JSString = "dataset"
508512
@usableFromInline static let dateTime: JSString = "dateTime"
513+
@usableFromInline static let debug: JSString = "debug"
509514
@usableFromInline static let declare: JSString = "declare"
510515
@usableFromInline static let decode: JSString = "decode"
511516
@usableFromInline static let decoding: JSString = "decoding"
@@ -543,6 +548,7 @@ import JavaScriptKit
543548
@usableFromInline static let dir: JSString = "dir"
544549
@usableFromInline static let dirName: JSString = "dirName"
545550
@usableFromInline static let direction: JSString = "direction"
551+
@usableFromInline static let dirxml: JSString = "dirxml"
546552
@usableFromInline static let disable: JSString = "disable"
547553
@usableFromInline static let disabled: JSString = "disabled"
548554
@usableFromInline static let disconnect: JSString = "disconnect"
@@ -678,6 +684,9 @@ import JavaScriptKit
678684
@usableFromInline static let globalAlpha: JSString = "globalAlpha"
679685
@usableFromInline static let globalCompositeOperation: JSString = "globalCompositeOperation"
680686
@usableFromInline static let go: JSString = "go"
687+
@usableFromInline static let group: JSString = "group"
688+
@usableFromInline static let groupCollapsed: JSString = "groupCollapsed"
689+
@usableFromInline static let groupEnd: JSString = "groupEnd"
681690
@usableFromInline static let handled: JSString = "handled"
682691
@usableFromInline static let hangingBaseline: JSString = "hangingBaseline"
683692
@usableFromInline static let hardwareConcurrency: JSString = "hardwareConcurrency"
@@ -723,6 +732,7 @@ import JavaScriptKit
723732
@usableFromInline static let indeterminate: JSString = "indeterminate"
724733
@usableFromInline static let index: JSString = "index"
725734
@usableFromInline static let inert: JSString = "inert"
735+
@usableFromInline static let info: JSString = "info"
726736
@usableFromInline static let initCompositionEvent: JSString = "initCompositionEvent"
727737
@usableFromInline static let initCustomEvent: JSString = "initCustomEvent"
728738
@usableFromInline static let initEvent: JSString = "initEvent"
@@ -810,6 +820,7 @@ import JavaScriptKit
810820
@usableFromInline static let location: JSString = "location"
811821
@usableFromInline static let locationbar: JSString = "locationbar"
812822
@usableFromInline static let locked: JSString = "locked"
823+
@usableFromInline static let log: JSString = "log"
813824
@usableFromInline static let longDesc: JSString = "longDesc"
814825
@usableFromInline static let lookupNamespaceURI: JSString = "lookupNamespaceURI"
815826
@usableFromInline static let lookupPrefix: JSString = "lookupPrefix"
@@ -1315,6 +1326,7 @@ import JavaScriptKit
13151326
@usableFromInline static let tFoot: JSString = "tFoot"
13161327
@usableFromInline static let tHead: JSString = "tHead"
13171328
@usableFromInline static let tabIndex: JSString = "tabIndex"
1329+
@usableFromInline static let table: JSString = "table"
13181330
@usableFromInline static let tagName: JSString = "tagName"
13191331
@usableFromInline static let taintEnabled: JSString = "taintEnabled"
13201332
@usableFromInline static let takeRecords: JSString = "takeRecords"
@@ -1330,6 +1342,9 @@ import JavaScriptKit
13301342
@usableFromInline static let textRendering: JSString = "textRendering"
13311343
@usableFromInline static let textTracks: JSString = "textTracks"
13321344
@usableFromInline static let throwIfAborted: JSString = "throwIfAborted"
1345+
@usableFromInline static let time: JSString = "time"
1346+
@usableFromInline static let timeEnd: JSString = "timeEnd"
1347+
@usableFromInline static let timeLog: JSString = "timeLog"
13331348
@usableFromInline static let timeOrigin: JSString = "timeOrigin"
13341349
@usableFromInline static let timeStamp: JSString = "timeStamp"
13351350
@usableFromInline static let timeline: JSString = "timeline"
@@ -1347,6 +1362,7 @@ import JavaScriptKit
13471362
@usableFromInline static let toolbar: JSString = "toolbar"
13481363
@usableFromInline static let top: JSString = "top"
13491364
@usableFromInline static let total: JSString = "total"
1365+
@usableFromInline static let trace: JSString = "trace"
13501366
@usableFromInline static let track: JSString = "track"
13511367
@usableFromInline static let transfer: JSString = "transfer"
13521368
@usableFromInline static let transferControlToOffscreen: JSString = "transferControlToOffscreen"
@@ -1398,6 +1414,7 @@ import JavaScriptKit
13981414
@usableFromInline static let vspace: JSString = "vspace"
13991415
@usableFromInline static let w: JSString = "w"
14001416
@usableFromInline static let waiting: JSString = "waiting"
1417+
@usableFromInline static let warn: JSString = "warn"
14011418
@usableFromInline static let webkitMatchesSelector: JSString = "webkitMatchesSelector"
14021419
@usableFromInline static let whatToShow: JSString = "whatToShow"
14031420
@usableFromInline static let whenDefined: JSString = "whenDefined"

Sources/DOMKit/WebIDL/console.swift

+105
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
// This file was auto-generated by WebIDLToSwift. DO NOT EDIT!
2+
3+
import JavaScriptEventLoop
4+
import JavaScriptKit
5+
6+
public enum console {
7+
@inlinable public static var jsObject: JSObject {
8+
JSObject.global[Strings.console].object!
9+
}
10+
11+
@inlinable public static func assert(condition: Bool? = nil, data: JSValue...) {
12+
let this = JSObject.global[Strings.console].object!
13+
_ = this[Strings.assert].function!(this: this, arguments: [condition?.jsValue ?? .undefined] + data.map(\.jsValue))
14+
}
15+
16+
@inlinable public static func clear() {
17+
let this = JSObject.global[Strings.console].object!
18+
_ = this[Strings.clear].function!(this: this, arguments: [])
19+
}
20+
21+
@inlinable public static func debug(data: JSValue...) {
22+
let this = JSObject.global[Strings.console].object!
23+
_ = this[Strings.debug].function!(this: this, arguments: data.map(\.jsValue))
24+
}
25+
26+
@inlinable public static func error(data: JSValue...) {
27+
let this = JSObject.global[Strings.console].object!
28+
_ = this[Strings.error].function!(this: this, arguments: data.map(\.jsValue))
29+
}
30+
31+
@inlinable public static func info(data: JSValue...) {
32+
let this = JSObject.global[Strings.console].object!
33+
_ = this[Strings.info].function!(this: this, arguments: data.map(\.jsValue))
34+
}
35+
36+
@inlinable public static func log(data: JSValue...) {
37+
let this = JSObject.global[Strings.console].object!
38+
_ = this[Strings.log].function!(this: this, arguments: data.map(\.jsValue))
39+
}
40+
41+
@inlinable public static func table(tabularData: JSValue? = nil, properties: [String]? = nil) {
42+
let this = JSObject.global[Strings.console].object!
43+
_ = this[Strings.table].function!(this: this, arguments: [tabularData?.jsValue ?? .undefined, properties?.jsValue ?? .undefined])
44+
}
45+
46+
@inlinable public static func trace(data: JSValue...) {
47+
let this = JSObject.global[Strings.console].object!
48+
_ = this[Strings.trace].function!(this: this, arguments: data.map(\.jsValue))
49+
}
50+
51+
@inlinable public static func warn(data: JSValue...) {
52+
let this = JSObject.global[Strings.console].object!
53+
_ = this[Strings.warn].function!(this: this, arguments: data.map(\.jsValue))
54+
}
55+
56+
@inlinable public static func dir(item: JSValue? = nil, options: JSObject? = nil) {
57+
let this = JSObject.global[Strings.console].object!
58+
_ = this[Strings.dir].function!(this: this, arguments: [item?.jsValue ?? .undefined, options?.jsValue ?? .undefined])
59+
}
60+
61+
@inlinable public static func dirxml(data: JSValue...) {
62+
let this = JSObject.global[Strings.console].object!
63+
_ = this[Strings.dirxml].function!(this: this, arguments: data.map(\.jsValue))
64+
}
65+
66+
@inlinable public static func count(label: String? = nil) {
67+
let this = JSObject.global[Strings.console].object!
68+
_ = this[Strings.count].function!(this: this, arguments: [label?.jsValue ?? .undefined])
69+
}
70+
71+
@inlinable public static func countReset(label: String? = nil) {
72+
let this = JSObject.global[Strings.console].object!
73+
_ = this[Strings.countReset].function!(this: this, arguments: [label?.jsValue ?? .undefined])
74+
}
75+
76+
@inlinable public static func group(data: JSValue...) {
77+
let this = JSObject.global[Strings.console].object!
78+
_ = this[Strings.group].function!(this: this, arguments: data.map(\.jsValue))
79+
}
80+
81+
@inlinable public static func groupCollapsed(data: JSValue...) {
82+
let this = JSObject.global[Strings.console].object!
83+
_ = this[Strings.groupCollapsed].function!(this: this, arguments: data.map(\.jsValue))
84+
}
85+
86+
@inlinable public static func groupEnd() {
87+
let this = JSObject.global[Strings.console].object!
88+
_ = this[Strings.groupEnd].function!(this: this, arguments: [])
89+
}
90+
91+
@inlinable public static func time(label: String? = nil) {
92+
let this = JSObject.global[Strings.console].object!
93+
_ = this[Strings.time].function!(this: this, arguments: [label?.jsValue ?? .undefined])
94+
}
95+
96+
@inlinable public static func timeLog(label: String? = nil, data: JSValue...) {
97+
let this = JSObject.global[Strings.console].object!
98+
_ = this[Strings.timeLog].function!(this: this, arguments: [label?.jsValue ?? .undefined] + data.map(\.jsValue))
99+
}
100+
101+
@inlinable public static func timeEnd(label: String? = nil) {
102+
let this = JSObject.global[Strings.console].object!
103+
_ = this[Strings.timeEnd].function!(this: this, arguments: [label?.jsValue ?? .undefined])
104+
}
105+
}

Sources/DOMKitDemo/main.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import JavaScriptKit
22
import DOMKit
33

4-
let document = global.document
4+
let document = globalThis.document
55

66
let header = HTMLElement(from: document.createElement(localName: "h1"))!
77
header.innerText = "Hello World!"
8-
_ = document.body.appendChild(node: header)
8+
_ = document.body!.appendChild(node: header)
99

1010
console.log(data: "Hello, world!")

parse-idl/parse-all.js

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ console.log(
2222
"service-workers",
2323
"url",
2424
"streams",
25+
"console",
2526
].map((key) => parsedFiles[key]),
2627
null,
2728
2

0 commit comments

Comments
 (0)