Skip to content

Commit 1f83e4e

Browse files
committed
Correctly set inClass state in the code generator
1 parent fd9bfad commit 1f83e4e

File tree

3 files changed

+36
-35
lines changed

3 files changed

+36
-35
lines changed

Sources/CSSOM/Generated.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ public class CSSColorValue: CSSStyleValue {
397397
}
398398

399399
// XXX: illegal static override
400-
// override public static func parse(cssText: String) -> CSSColorValue_or_CSSStyleValue
400+
// override public class func parse(cssText: String) -> CSSColorValue_or_CSSStyleValue
401401
}
402402

403403
public class CSSGroupingRule: CSSRule {
@@ -952,7 +952,7 @@ public class CSSNumericValue: CSSStyleValue {
952952
}
953953

954954
// XXX: illegal static override
955-
// override public static func parse(cssText: String) -> Self
955+
// override public class func parse(cssText: String) -> Self
956956
}
957957

958958
public class CSSOKLCH: CSSColorValue {
@@ -1419,12 +1419,12 @@ public class CSSStyleValue: JSBridgedClass {
14191419
jsObject[Strings.toString]!().fromJSValue()!
14201420
}
14211421

1422-
@inlinable public static func parse(property: String, cssText: String) -> Self {
1422+
@inlinable public class func parse(property: String, cssText: String) -> Self {
14231423
let this = constructor!
14241424
return this[Strings.parse].function!(this: this, arguments: [_toJSValue(property), _toJSValue(cssText)]).fromJSValue()!
14251425
}
14261426

1427-
@inlinable public static func parseAll(property: String, cssText: String) -> [CSSStyleValue] {
1427+
@inlinable public class func parseAll(property: String, cssText: String) -> [CSSStyleValue] {
14281428
let this = constructor!
14291429
return this[Strings.parseAll].function!(this: this, arguments: [_toJSValue(property), _toJSValue(cssText)]).fromJSValue()!
14301430
}

Sources/DOM/Generated.swift

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -246,12 +246,12 @@ public class AbortSignal: EventTarget {
246246
super.init(unsafelyWrapping: jsObject)
247247
}
248248

249-
@inlinable public static func abort(reason: JSValue? = nil) -> Self {
249+
@inlinable public class func abort(reason: JSValue? = nil) -> Self {
250250
let this = constructor!
251251
return this[Strings.abort].function!(this: this, arguments: [_toJSValue(reason)]).fromJSValue()!
252252
}
253253

254-
@inlinable public static func timeout(milliseconds: UInt64) -> Self {
254+
@inlinable public class func timeout(milliseconds: UInt64) -> Self {
255255
let this = constructor!
256256
return this[Strings.timeout].function!(this: this, arguments: [_toJSValue(milliseconds)]).fromJSValue()!
257257
}
@@ -619,13 +619,13 @@ public class AudioDecoder: JSBridgedClass {
619619
_ = this[Strings.close].function!(this: this, arguments: [])
620620
}
621621

622-
@inlinable public static func isConfigSupported(config: AudioDecoderConfig) -> JSPromise {
622+
@inlinable public class func isConfigSupported(config: AudioDecoderConfig) -> JSPromise {
623623
let this = constructor!
624624
return this[Strings.isConfigSupported].function!(this: this, arguments: [_toJSValue(config)]).fromJSValue()!
625625
}
626626

627627
@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
628-
@inlinable public static func isConfigSupported(config: AudioDecoderConfig) async throws -> AudioDecoderSupport {
628+
@inlinable public class func isConfigSupported(config: AudioDecoderConfig) async throws -> AudioDecoderSupport {
629629
let this = constructor!
630630
let _promise: JSPromise = this[Strings.isConfigSupported].function!(this: this, arguments: [_toJSValue(config)]).fromJSValue()!
631631
return try await _promise.value.fromJSValue()!
@@ -758,13 +758,13 @@ public class AudioEncoder: JSBridgedClass {
758758
_ = this[Strings.close].function!(this: this, arguments: [])
759759
}
760760

761-
@inlinable public static func isConfigSupported(config: AudioEncoderConfig) -> JSPromise {
761+
@inlinable public class func isConfigSupported(config: AudioEncoderConfig) -> JSPromise {
762762
let this = constructor!
763763
return this[Strings.isConfigSupported].function!(this: this, arguments: [_toJSValue(config)]).fromJSValue()!
764764
}
765765

766766
@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
767-
@inlinable public static func isConfigSupported(config: AudioEncoderConfig) async throws -> AudioEncoderSupport {
767+
@inlinable public class func isConfigSupported(config: AudioEncoderConfig) async throws -> AudioEncoderSupport {
768768
let this = constructor!
769769
let _promise: JSPromise = this[Strings.isConfigSupported].function!(this: this, arguments: [_toJSValue(config)]).fromJSValue()!
770770
return try await _promise.value.fromJSValue()!
@@ -2770,13 +2770,13 @@ public class DOMMatrix: DOMMatrixReadOnly {
27702770
}
27712771

27722772
// XXX: illegal static override
2773-
// override public static func fromMatrix(other: DOMMatrixInit? = nil) -> Self
2773+
// override public class func fromMatrix(other: DOMMatrixInit? = nil) -> Self
27742774

27752775
// XXX: illegal static override
2776-
// override public static func fromFloat32Array(array32: Float32Array) -> Self
2776+
// override public class func fromFloat32Array(array32: Float32Array) -> Self
27772777

27782778
// XXX: illegal static override
2779-
// override public static func fromFloat64Array(array64: Float64Array) -> Self
2779+
// override public class func fromFloat64Array(array64: Float64Array) -> Self
27802780

27812781
@usableFromInline let _a: ReadWriteAttribute<Double>
27822782
@inlinable override public var a: Double {
@@ -3145,17 +3145,17 @@ public class DOMMatrixReadOnly: JSBridgedClass {
31453145
self.init(unsafelyWrapping: Self.constructor!.new(arguments: [_toJSValue(`init`)]))
31463146
}
31473147

3148-
@inlinable public static func fromMatrix(other: DOMMatrixInit? = nil) -> Self {
3148+
@inlinable public class func fromMatrix(other: DOMMatrixInit? = nil) -> Self {
31493149
let this = constructor!
31503150
return this[Strings.fromMatrix].function!(this: this, arguments: [_toJSValue(other)]).fromJSValue()!
31513151
}
31523152

3153-
@inlinable public static func fromFloat32Array(array32: Float32Array) -> Self {
3153+
@inlinable public class func fromFloat32Array(array32: Float32Array) -> Self {
31543154
let this = constructor!
31553155
return this[Strings.fromFloat32Array].function!(this: this, arguments: [_toJSValue(array32)]).fromJSValue()!
31563156
}
31573157

3158-
@inlinable public static func fromFloat64Array(array64: Float64Array) -> Self {
3158+
@inlinable public class func fromFloat64Array(array64: Float64Array) -> Self {
31593159
let this = constructor!
31603160
return this[Strings.fromFloat64Array].function!(this: this, arguments: [_toJSValue(array64)]).fromJSValue()!
31613161
}
@@ -3378,7 +3378,7 @@ public class DOMPoint: DOMPointReadOnly {
33783378
}
33793379

33803380
// XXX: illegal static override
3381-
// override public static func fromPoint(other: DOMPointInit? = nil) -> Self
3381+
// override public class func fromPoint(other: DOMPointInit? = nil) -> Self
33823382

33833383
@usableFromInline let _x: ReadWriteAttribute<Double>
33843384
@inlinable override public var x: Double {
@@ -3453,7 +3453,7 @@ public class DOMPointReadOnly: JSBridgedClass {
34533453
self.init(unsafelyWrapping: Self.constructor!.new(arguments: [_toJSValue(x), _toJSValue(y), _toJSValue(z), _toJSValue(w)]))
34543454
}
34553455

3456-
@inlinable public static func fromPoint(other: DOMPointInit? = nil) -> Self {
3456+
@inlinable public class func fromPoint(other: DOMPointInit? = nil) -> Self {
34573457
let this = constructor!
34583458
return this[Strings.fromPoint].function!(this: this, arguments: [_toJSValue(other)]).fromJSValue()!
34593459
}
@@ -3498,12 +3498,12 @@ public class DOMQuad: JSBridgedClass {
34983498
self.init(unsafelyWrapping: Self.constructor!.new(arguments: [_toJSValue(p1), _toJSValue(p2), _toJSValue(p3), _toJSValue(p4)]))
34993499
}
35003500

3501-
@inlinable public static func fromRect(other: DOMRectInit? = nil) -> Self {
3501+
@inlinable public class func fromRect(other: DOMRectInit? = nil) -> Self {
35023502
let this = constructor!
35033503
return this[Strings.fromRect].function!(this: this, arguments: [_toJSValue(other)]).fromJSValue()!
35043504
}
35053505

3506-
@inlinable public static func fromQuad(other: DOMQuadInit? = nil) -> Self {
3506+
@inlinable public class func fromQuad(other: DOMQuadInit? = nil) -> Self {
35073507
let this = constructor!
35083508
return this[Strings.fromQuad].function!(this: this, arguments: [_toJSValue(other)]).fromJSValue()!
35093509
}
@@ -3578,7 +3578,7 @@ public class DOMRect: DOMRectReadOnly {
35783578
}
35793579

35803580
// XXX: illegal static override
3581-
// override public static func fromRect(other: DOMRectInit? = nil) -> Self
3581+
// override public class func fromRect(other: DOMRectInit? = nil) -> Self
35823582

35833583
@usableFromInline let _x: ReadWriteAttribute<Double>
35843584
@inlinable override public var x: Double {
@@ -3680,7 +3680,7 @@ public class DOMRectReadOnly: JSBridgedClass {
36803680
self.init(unsafelyWrapping: Self.constructor!.new(arguments: [_toJSValue(x), _toJSValue(y), _toJSValue(width), _toJSValue(height)]))
36813681
}
36823682

3683-
@inlinable public static func fromRect(other: DOMRectInit? = nil) -> Self {
3683+
@inlinable public class func fromRect(other: DOMRectInit? = nil) -> Self {
36843684
let this = constructor!
36853685
return this[Strings.fromRect].function!(this: this, arguments: [_toJSValue(other)]).fromJSValue()!
36863686
}
@@ -8786,7 +8786,7 @@ public class HTMLScriptElement: HTMLElement {
87868786
@ReadonlyAttribute
87878787
public var blocking: DOMTokenList
87888788

8789-
@inlinable public static func supports(type: String) -> Bool {
8789+
@inlinable public class func supports(type: String) -> Bool {
87908790
let this = constructor!
87918791
return this[Strings.supports].function!(this: this, arguments: [_toJSValue(type)]).fromJSValue()!
87928792
}
@@ -10066,13 +10066,13 @@ public class ImageDecoder: JSBridgedClass {
1006610066
_ = this[Strings.close].function!(this: this, arguments: [])
1006710067
}
1006810068

10069-
@inlinable public static func isTypeSupported(type: String) -> JSPromise {
10069+
@inlinable public class func isTypeSupported(type: String) -> JSPromise {
1007010070
let this = constructor!
1007110071
return this[Strings.isTypeSupported].function!(this: this, arguments: [_toJSValue(type)]).fromJSValue()!
1007210072
}
1007310073

1007410074
@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
10075-
@inlinable public static func isTypeSupported(type: String) async throws -> Bool {
10075+
@inlinable public class func isTypeSupported(type: String) async throws -> Bool {
1007610076
let this = constructor!
1007710077
let _promise: JSPromise = this[Strings.isTypeSupported].function!(this: this, arguments: [_toJSValue(type)]).fromJSValue()!
1007810078
return try await _promise.value.fromJSValue()!
@@ -10785,7 +10785,7 @@ public class MediaRecorder: EventTarget {
1078510785
_ = this[Strings.requestData].function!(this: this, arguments: [])
1078610786
}
1078710787

10788-
@inlinable public static func isTypeSupported(type: String) -> Bool {
10788+
@inlinable public class func isTypeSupported(type: String) -> Bool {
1078910789
let this = constructor!
1079010790
return this[Strings.isTypeSupported].function!(this: this, arguments: [_toJSValue(type)]).fromJSValue()!
1079110791
}
@@ -10927,7 +10927,7 @@ public class MediaSource: EventTarget {
1092710927
_ = this[Strings.clearLiveSeekableRange].function!(this: this, arguments: [])
1092810928
}
1092910929

10930-
@inlinable public static func isTypeSupported(type: String) -> Bool {
10930+
@inlinable public class func isTypeSupported(type: String) -> Bool {
1093110931
let this = constructor!
1093210932
return this[Strings.isTypeSupported].function!(this: this, arguments: [_toJSValue(type)]).fromJSValue()!
1093310933
}
@@ -13923,12 +13923,12 @@ public class Response: JSBridgedClass, Body {
1392313923
self.init(unsafelyWrapping: Self.constructor!.new(arguments: [_toJSValue(body), _toJSValue(`init`)]))
1392413924
}
1392513925

13926-
@inlinable public static func error() -> Self {
13926+
@inlinable public class func error() -> Self {
1392713927
let this = constructor!
1392813928
return this[Strings.error].function!(this: this, arguments: []).fromJSValue()!
1392913929
}
1393013930

13931-
@inlinable public static func redirect(url: String, status: UInt16? = nil) -> Self {
13931+
@inlinable public class func redirect(url: String, status: UInt16? = nil) -> Self {
1393213932
let this = constructor!
1393313933
return this[Strings.redirect].function!(this: this, arguments: [_toJSValue(url), _toJSValue(status)]).fromJSValue()!
1393413934
}
@@ -15703,12 +15703,12 @@ public class URL: JSBridgedClass {
1570315703
self.jsObject = jsObject
1570415704
}
1570515705

15706-
@inlinable public static func createObjectURL(obj: Blob_or_MediaSource) -> String {
15706+
@inlinable public class func createObjectURL(obj: Blob_or_MediaSource) -> String {
1570715707
let this = constructor!
1570815708
return this[Strings.createObjectURL].function!(this: this, arguments: [_toJSValue(obj)]).fromJSValue()!
1570915709
}
1571015710

15711-
@inlinable public static func revokeObjectURL(url: String) {
15711+
@inlinable public class func revokeObjectURL(url: String) {
1571215712
let this = constructor!
1571315713
_ = this[Strings.revokeObjectURL].function!(this: this, arguments: [_toJSValue(url)])
1571415714
}
@@ -16039,13 +16039,13 @@ public class VideoDecoder: JSBridgedClass {
1603916039
_ = this[Strings.close].function!(this: this, arguments: [])
1604016040
}
1604116041

16042-
@inlinable public static func isConfigSupported(config: VideoDecoderConfig) -> JSPromise {
16042+
@inlinable public class func isConfigSupported(config: VideoDecoderConfig) -> JSPromise {
1604316043
let this = constructor!
1604416044
return this[Strings.isConfigSupported].function!(this: this, arguments: [_toJSValue(config)]).fromJSValue()!
1604516045
}
1604616046

1604716047
@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
16048-
@inlinable public static func isConfigSupported(config: VideoDecoderConfig) async throws -> VideoDecoderSupport {
16048+
@inlinable public class func isConfigSupported(config: VideoDecoderConfig) async throws -> VideoDecoderSupport {
1604916049
let this = constructor!
1605016050
let _promise: JSPromise = this[Strings.isConfigSupported].function!(this: this, arguments: [_toJSValue(config)]).fromJSValue()!
1605116051
return try await _promise.value.fromJSValue()!
@@ -16203,13 +16203,13 @@ public class VideoEncoder: JSBridgedClass {
1620316203
_ = this[Strings.close].function!(this: this, arguments: [])
1620416204
}
1620516205

16206-
@inlinable public static func isConfigSupported(config: VideoEncoderConfig) -> JSPromise {
16206+
@inlinable public class func isConfigSupported(config: VideoEncoderConfig) -> JSPromise {
1620716207
let this = constructor!
1620816208
return this[Strings.isConfigSupported].function!(this: this, arguments: [_toJSValue(config)]).fromJSValue()!
1620916209
}
1621016210

1621116211
@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
16212-
@inlinable public static func isConfigSupported(config: VideoEncoderConfig) async throws -> VideoEncoderSupport {
16212+
@inlinable public class func isConfigSupported(config: VideoEncoderConfig) async throws -> VideoEncoderSupport {
1621316213
let this = constructor!
1621416214
let _promise: JSPromise = this[Strings.isConfigSupported].function!(this: this, arguments: [_toJSValue(config)]).fromJSValue()!
1621516215
return try await _promise.value.fromJSValue()!

Sources/WebIDLToSwift/ModuleState.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ struct ScopedState {
8585
newState.this = this
8686
newState.inProtocol = inProtocol
8787
newState.className = className
88+
newState.inClass = true
8889
return newState
8990
}
9091

0 commit comments

Comments
 (0)