Skip to content

Commit 1d8188b

Browse files
j-f1j-f1
committed
update to the new JSKit APIs
1 parent 157f5ca commit 1d8188b

File tree

1,652 files changed

+5945
-5965
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,652 files changed

+5945
-5965
lines changed

‎Sources/DOMKit/ECMAScript/ArrayBufferView.swift

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,32 +62,32 @@ public enum ArrayBufferView: JSValueCompatible, AnyArrayBufferView {
6262
return nil
6363
}
6464

65-
public func jsValue() -> JSValue {
65+
public var jsValue: JSValue {
6666
switch self {
6767
// case let .bigInt64Array(bigInt64Array):
68-
// return bigInt64Array.jsValue()
68+
// return bigInt64Array.jsValue
6969
// case let .bigUint64Array(bigUint64Array):
70-
// return bigUint64Array.jsValue()
70+
// return bigUint64Array.jsValue
7171
case let .dataView(dataView):
72-
return dataView.jsValue()
72+
return dataView.jsValue
7373
case let .float32Array(float32Array):
74-
return float32Array.jsValue()
74+
return float32Array.jsValue
7575
case let .float64Array(float64Array):
76-
return float64Array.jsValue()
76+
return float64Array.jsValue
7777
case let .int16Array(int16Array):
78-
return int16Array.jsValue()
78+
return int16Array.jsValue
7979
case let .int32Array(int32Array):
80-
return int32Array.jsValue()
80+
return int32Array.jsValue
8181
case let .int8Array(int8Array):
82-
return int8Array.jsValue()
82+
return int8Array.jsValue
8383
case let .uint16Array(uint16Array):
84-
return uint16Array.jsValue()
84+
return uint16Array.jsValue
8585
case let .uint32Array(uint32Array):
86-
return uint32Array.jsValue()
86+
return uint32Array.jsValue
8787
case let .uint8Array(uint8Array):
88-
return uint8Array.jsValue()
88+
return uint8Array.jsValue
8989
case let .uint8ClampedArray(uint8ClampedArray):
90-
return uint8ClampedArray.jsValue()
90+
return uint8ClampedArray.jsValue
9191
}
9292
}
9393
}

‎Sources/DOMKit/ECMAScript/Attributes.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import JavaScriptKit
1616

1717
@inlinable public static subscript(name: JSString, in jsObject: JSObject) -> Wrapped {
1818
get { jsObject[name].fromJSValue()! }
19-
set { jsObject[name] = newValue.jsValue() }
19+
set { jsObject[name] = newValue.jsValue }
2020
}
2121
}
2222

‎Sources/DOMKit/ECMAScript/BridgedDictionary.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import JavaScriptKit
33
public class BridgedDictionary: JSValueCompatible {
44
public let jsObject: JSObject
55

6-
public func jsValue() -> JSValue {
7-
jsObject.jsValue()
6+
public var jsValue: JSValue {
7+
jsObject.jsValue
88
}
99

1010
public required init(unsafelyWrapping jsObject: JSObject) {

‎Sources/DOMKit/ECMAScript/DataView.swift

Lines changed: 31 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import JavaScriptKit
66

77
public class DataView: JSBridgedClass {
8-
98
public class var constructor: JSFunction { JSObject.global.DataView.function! }
109

1110
public let jsObject: JSObject
@@ -18,18 +17,15 @@ public class DataView: JSBridgedClass {
1817
}
1918

2019
public convenience init(buffer: ArrayBuffer) {
21-
22-
self.init(unsafelyWrapping: DataView.constructor.new(buffer.jsValue()))
20+
self.init(unsafelyWrapping: DataView.constructor.new(buffer.jsValue))
2321
}
2422

2523
public convenience init(buffer: ArrayBuffer, byteOffset: UInt32) {
26-
27-
self.init(unsafelyWrapping: DataView.constructor.new(buffer.jsValue(), byteOffset.jsValue()))
24+
self.init(unsafelyWrapping: DataView.constructor.new(buffer.jsValue, byteOffset.jsValue))
2825
}
2926

3027
public convenience init(buffer: ArrayBuffer, byteOffset: UInt32, byteLength: UInt32) {
31-
32-
self.init(unsafelyWrapping: DataView.constructor.new(buffer.jsValue(), byteOffset.jsValue(), byteLength.jsValue()))
28+
self.init(unsafelyWrapping: DataView.constructor.new(buffer.jsValue, byteOffset.jsValue, byteLength.jsValue))
3329
}
3430

3531
@ReadonlyAttribute
@@ -41,131 +37,115 @@ public class DataView: JSBridgedClass {
4137
@ReadonlyAttribute
4238
public var byteLength: UInt32
4339

44-
4540
public func getFloat32(byteOffset: UInt32) -> Float {
46-
47-
return jsObject.getFloat32!(byteOffset.jsValue()).fromJSValue()!
41+
jsObject.getFloat32!(byteOffset.jsValue).fromJSValue()!
4842
}
4943

5044
public func getFloat32(byteOffset: UInt32, littleEndian: Bool) -> Float {
51-
52-
return jsObject.getFloat32!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
45+
jsObject.getFloat32!(byteOffset.jsValue, littleEndian.jsValue).fromJSValue()!
5346
}
5447

5548
public func getFloat64(byteOffset: UInt32) -> Double {
56-
57-
return jsObject.getFloat64!(byteOffset.jsValue()).fromJSValue()!
49+
jsObject.getFloat64!(byteOffset.jsValue).fromJSValue()!
5850
}
5951

6052
public func getFloat64(byteOffset: UInt32, littleEndian: Bool) -> Double {
61-
62-
return jsObject.getFloat64!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
53+
jsObject.getFloat64!(byteOffset.jsValue, littleEndian.jsValue).fromJSValue()!
6354
}
6455

6556
public func getUint8(byteOffset: UInt32) -> UInt8 {
66-
67-
return jsObject.getUint8!(byteOffset.jsValue()).fromJSValue()!
57+
jsObject.getUint8!(byteOffset.jsValue).fromJSValue()!
6858
}
6959

7060
public func getUint16(byteOffset: UInt32) -> UInt16 {
71-
72-
return jsObject.getUint16!(byteOffset.jsValue()).fromJSValue()!
61+
jsObject.getUint16!(byteOffset.jsValue).fromJSValue()!
7362
}
7463

7564
public func getUint16(byteOffset: UInt32, littleEndian: Bool) -> UInt16 {
76-
77-
return jsObject.getUint16!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
65+
jsObject.getUint16!(byteOffset.jsValue, littleEndian.jsValue).fromJSValue()!
7866
}
7967

8068
public func getUint32(byteOffset: UInt32) -> UInt32 {
81-
82-
return jsObject.getUint32!(byteOffset.jsValue()).fromJSValue()!
69+
jsObject.getUint32!(byteOffset.jsValue).fromJSValue()!
8370
}
8471

8572
public func getUint32(byteOffset: UInt32, littleEndian: Bool) -> UInt32 {
86-
87-
return jsObject.getUint32!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
73+
jsObject.getUint32!(byteOffset.jsValue, littleEndian.jsValue).fromJSValue()!
8874
}
8975

9076
public func getInt8(byteOffset: UInt32) -> Int8 {
91-
92-
return jsObject.getInt8!(byteOffset.jsValue()).fromJSValue()!
77+
jsObject.getInt8!(byteOffset.jsValue).fromJSValue()!
9378
}
9479

9580
public func getInt16(byteOffset: UInt32) -> Int16 {
96-
97-
return jsObject.getInt16!(byteOffset.jsValue()).fromJSValue()!
81+
jsObject.getInt16!(byteOffset.jsValue).fromJSValue()!
9882
}
9983

10084
public func getInt16(byteOffset: UInt32, littleEndian: Bool) -> Int16 {
101-
102-
return jsObject.getInt16!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
85+
jsObject.getInt16!(byteOffset.jsValue, littleEndian.jsValue).fromJSValue()!
10386
}
10487

10588
public func getInt32(byteOffset: UInt32) -> Int32 {
106-
107-
return jsObject.getInt32!(byteOffset.jsValue()).fromJSValue()!
89+
jsObject.getInt32!(byteOffset.jsValue).fromJSValue()!
10890
}
10991

11092
public func getInt32(byteOffset: UInt32, littleEndian: Bool) -> Int32 {
111-
112-
return jsObject.getInt32!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
93+
jsObject.getInt32!(byteOffset.jsValue, littleEndian.jsValue).fromJSValue()!
11394
}
11495

11596
public func setUint8(byteOffset: UInt32, value: UInt8) {
116-
_ = jsObject.setUint8!(byteOffset.jsValue(), value.jsValue())
97+
_ = jsObject.setUint8!(byteOffset.jsValue, value.jsValue)
11798
}
11899

119100
public func setUint16(byteOffset: UInt32, value: UInt16) {
120-
_ = jsObject.setUint16!(byteOffset.jsValue(), value.jsValue())
101+
_ = jsObject.setUint16!(byteOffset.jsValue, value.jsValue)
121102
}
122103

123104
public func setUint16(byteOffset: UInt32, value: UInt16, littleEndian: Bool) {
124-
_ = jsObject.setUint16!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
105+
_ = jsObject.setUint16!(byteOffset.jsValue, value.jsValue, littleEndian.jsValue)
125106
}
126107

127108
public func setUint32(byteOffset: UInt32, value: UInt32) {
128-
_ = jsObject.setUint32!(byteOffset.jsValue(), value.jsValue())
109+
_ = jsObject.setUint32!(byteOffset.jsValue, value.jsValue)
129110
}
130111

131112
public func setUint32(byteOffset: UInt32, value: UInt32, littleEndian: Bool) {
132-
_ = jsObject.setUint32!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
113+
_ = jsObject.setUint32!(byteOffset.jsValue, value.jsValue, littleEndian.jsValue)
133114
}
134115

135116
public func setInt8(byteOffset: UInt32, value: Int8) {
136-
_ = jsObject.setUint8!(byteOffset.jsValue(), value.jsValue())
117+
_ = jsObject.setUint8!(byteOffset.jsValue, value.jsValue)
137118
}
138119

139120
public func setInt16(byteOffset: UInt32, value: Int16) {
140-
_ = jsObject.setInt16!(byteOffset.jsValue(), value.jsValue())
121+
_ = jsObject.setInt16!(byteOffset.jsValue, value.jsValue)
141122
}
142123

143124
public func setInt16(byteOffset: UInt32, value: Int16, littleEndian: Bool) {
144-
_ = jsObject.setInt16!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
125+
_ = jsObject.setInt16!(byteOffset.jsValue, value.jsValue, littleEndian.jsValue)
145126
}
146127

147128
public func setInt32(byteOffset: UInt32, value: Int32) {
148-
_ = jsObject.setInt32!(byteOffset.jsValue(), value.jsValue())
129+
_ = jsObject.setInt32!(byteOffset.jsValue, value.jsValue)
149130
}
150131

151132
public func setInt32(byteOffset: UInt32, value: Int32, littleEndian: Bool) {
152-
_ = jsObject.setInt32!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
133+
_ = jsObject.setInt32!(byteOffset.jsValue, value.jsValue, littleEndian.jsValue)
153134
}
154135

155136
public func setFloat32(byteOffset: UInt32, value: Float) {
156-
_ = jsObject.setFloat32!(byteOffset.jsValue(), value.jsValue())
137+
_ = jsObject.setFloat32!(byteOffset.jsValue, value.jsValue)
157138
}
158139

159140
public func setFloat32(byteOffset: UInt32, value: Float, littleEndian: Bool) {
160-
_ = jsObject.setFloat32!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
141+
_ = jsObject.setFloat32!(byteOffset.jsValue, value.jsValue, littleEndian.jsValue)
161142
}
162143

163144
public func setFloat64(byteOffset: UInt32, value: Double) {
164-
_ = jsObject.setFloat64!(byteOffset.jsValue(), value.jsValue())
145+
_ = jsObject.setFloat64!(byteOffset.jsValue, value.jsValue)
165146
}
166147

167148
public func setFloat64(byteOffset: UInt32, value: Double, littleEndian: Bool) {
168-
_ = jsObject.setFloat64!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
149+
_ = jsObject.setFloat64!(byteOffset.jsValue, value.jsValue, littleEndian.jsValue)
169150
}
170151
}
171-

‎Sources/DOMKit/ECMAScript/Iterators.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class ValueIterableAsyncIterator<SequenceType: JSBridgedClass & AsyncSequ
3232

3333
public func next() async throws -> SequenceType.Element? {
3434
let promise = JSPromise(from: iterator.next!())!
35-
let result = try await promise.get()
35+
let result = try await promise.value
3636
let done = result.done.boolean!
3737
guard !done else { return nil }
3838

‎Sources/DOMKit/ECMAScript/Support.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public extension HTMLElement {
1111
}
1212
}
1313

14-
public let globalThis = Window(from: JSObject.global.jsValue())!
14+
public let globalThis = Window(from: JSObject.global.jsValue)!
1515

1616
public typealias Uint8ClampedArray = JSUInt8ClampedArray
1717
public typealias CSSColorValue_or_CSSStyleValue = CSSStyleValue

‎Sources/DOMKit/WebIDL/ANGLE_instanced_arrays.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ public class ANGLE_instanced_arrays: JSBridgedClass {
1616

1717
@inlinable public func drawArraysInstancedANGLE(mode: GLenum, first: GLint, count: GLsizei, primcount: GLsizei) {
1818
let this = jsObject
19-
_ = this[Strings.drawArraysInstancedANGLE].function!(this: this, arguments: [mode.jsValue(), first.jsValue(), count.jsValue(), primcount.jsValue()])
19+
_ = this[Strings.drawArraysInstancedANGLE].function!(this: this, arguments: [mode.jsValue, first.jsValue, count.jsValue, primcount.jsValue])
2020
}
2121

2222
@inlinable public func drawElementsInstancedANGLE(mode: GLenum, count: GLsizei, type: GLenum, offset: GLintptr, primcount: GLsizei) {
2323
let this = jsObject
24-
_ = this[Strings.drawElementsInstancedANGLE].function!(this: this, arguments: [mode.jsValue(), count.jsValue(), type.jsValue(), offset.jsValue(), primcount.jsValue()])
24+
_ = this[Strings.drawElementsInstancedANGLE].function!(this: this, arguments: [mode.jsValue, count.jsValue, type.jsValue, offset.jsValue, primcount.jsValue])
2525
}
2626

2727
@inlinable public func vertexAttribDivisorANGLE(index: GLuint, divisor: GLuint) {
2828
let this = jsObject
29-
_ = this[Strings.vertexAttribDivisorANGLE].function!(this: this, arguments: [index.jsValue(), divisor.jsValue()])
29+
_ = this[Strings.vertexAttribDivisorANGLE].function!(this: this, arguments: [index.jsValue, divisor.jsValue])
3030
}
3131
}

‎Sources/DOMKit/WebIDL/AbortController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ public class AbortController: JSBridgedClass {
2222

2323
@inlinable public func abort(reason: JSValue? = nil) {
2424
let this = jsObject
25-
_ = this[Strings.abort].function!(this: this, arguments: [reason?.jsValue() ?? .undefined])
25+
_ = this[Strings.abort].function!(this: this, arguments: [reason?.jsValue ?? .undefined])
2626
}
2727
}

‎Sources/DOMKit/WebIDL/AbortSignal.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ public class AbortSignal: EventTarget {
1515

1616
@inlinable public static func abort(reason: JSValue? = nil) -> Self {
1717
let this = constructor
18-
return this[Strings.abort].function!(this: this, arguments: [reason?.jsValue() ?? .undefined]).fromJSValue()!
18+
return this[Strings.abort].function!(this: this, arguments: [reason?.jsValue ?? .undefined]).fromJSValue()!
1919
}
2020

2121
@inlinable public static func timeout(milliseconds: UInt64) -> Self {
2222
let this = constructor
23-
return this[Strings.timeout].function!(this: this, arguments: [milliseconds.jsValue()]).fromJSValue()!
23+
return this[Strings.timeout].function!(this: this, arguments: [milliseconds.jsValue]).fromJSValue()!
2424
}
2525

2626
@ReadonlyAttribute

‎Sources/DOMKit/WebIDL/AbsoluteOrientationReadingValues.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import JavaScriptKit
66
public class AbsoluteOrientationReadingValues: BridgedDictionary {
77
public convenience init(quaternion: [Double]?) {
88
let object = JSObject.global[Strings.Object].function!.new()
9-
object[Strings.quaternion] = quaternion.jsValue()
9+
object[Strings.quaternion] = quaternion.jsValue
1010
self.init(unsafelyWrapping: object)
1111
}
1212

‎Sources/DOMKit/WebIDL/AbsoluteOrientationSensor.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ public class AbsoluteOrientationSensor: OrientationSensor {
1111
}
1212

1313
@inlinable public convenience init(sensorOptions: OrientationSensorOptions? = nil) {
14-
self.init(unsafelyWrapping: Self.constructor.new(arguments: [sensorOptions?.jsValue() ?? .undefined]))
14+
self.init(unsafelyWrapping: Self.constructor.new(arguments: [sensorOptions?.jsValue ?? .undefined]))
1515
}
1616
}

‎Sources/DOMKit/WebIDL/Accelerometer.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class Accelerometer: Sensor {
1414
}
1515

1616
@inlinable public convenience init(options: AccelerometerSensorOptions? = nil) {
17-
self.init(unsafelyWrapping: Self.constructor.new(arguments: [options?.jsValue() ?? .undefined]))
17+
self.init(unsafelyWrapping: Self.constructor.new(arguments: [options?.jsValue ?? .undefined]))
1818
}
1919

2020
@ReadonlyAttribute

‎Sources/DOMKit/WebIDL/AccelerometerLocalCoordinateSystem.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ public enum AccelerometerLocalCoordinateSystem: JSString, JSValueCompatible {
1818
self.init(rawValue: JSString(string))
1919
}
2020

21-
@inlinable public func jsValue() -> JSValue { rawValue.jsValue() }
21+
@inlinable public var jsValue: JSValue { rawValue.jsValue }
2222
}

‎Sources/DOMKit/WebIDL/AccelerometerReadingValues.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import JavaScriptKit
66
public class AccelerometerReadingValues: BridgedDictionary {
77
public convenience init(x: Double?, y: Double?, z: Double?) {
88
let object = JSObject.global[Strings.Object].function!.new()
9-
object[Strings.x] = x.jsValue()
10-
object[Strings.y] = y.jsValue()
11-
object[Strings.z] = z.jsValue()
9+
object[Strings.x] = x.jsValue
10+
object[Strings.y] = y.jsValue
11+
object[Strings.z] = z.jsValue
1212
self.init(unsafelyWrapping: object)
1313
}
1414

‎Sources/DOMKit/WebIDL/AccelerometerSensorOptions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import JavaScriptKit
66
public class AccelerometerSensorOptions: BridgedDictionary {
77
public convenience init(referenceFrame: AccelerometerLocalCoordinateSystem) {
88
let object = JSObject.global[Strings.Object].function!.new()
9-
object[Strings.referenceFrame] = referenceFrame.jsValue()
9+
object[Strings.referenceFrame] = referenceFrame.jsValue
1010
self.init(unsafelyWrapping: object)
1111
}
1212

‎Sources/DOMKit/WebIDL/AddEventListenerOptions.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import JavaScriptKit
66
public class AddEventListenerOptions: BridgedDictionary {
77
public convenience init(passive: Bool, once: Bool, signal: AbortSignal) {
88
let object = JSObject.global[Strings.Object].function!.new()
9-
object[Strings.passive] = passive.jsValue()
10-
object[Strings.once] = once.jsValue()
11-
object[Strings.signal] = signal.jsValue()
9+
object[Strings.passive] = passive.jsValue
10+
object[Strings.once] = once.jsValue
11+
object[Strings.signal] = signal.jsValue
1212
self.init(unsafelyWrapping: object)
1313
}
1414

‎Sources/DOMKit/WebIDL/AesCbcParams.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import JavaScriptKit
66
public class AesCbcParams: BridgedDictionary {
77
public convenience init(iv: BufferSource) {
88
let object = JSObject.global[Strings.Object].function!.new()
9-
object[Strings.iv] = iv.jsValue()
9+
object[Strings.iv] = iv.jsValue
1010
self.init(unsafelyWrapping: object)
1111
}
1212

0 commit comments

Comments
 (0)