Skip to content

Commit b25f787

Browse files
j-f1j-f1
committed
Update to latest JSKit
1 parent 7d5867e commit b25f787

File tree

89 files changed

+1092
-1117
lines changed

Some content is hidden

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

89 files changed

+1092
-1117
lines changed

‎.swift-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
system

‎Package.resolved

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ let package = Package(
1111
targets: ["DOMKit"]),
1212
],
1313
dependencies: [
14-
.package(name: "JavaScriptKit", url: "https://github.com/j-f1/forked-JavaScriptKit.git", .revision("745bb00")),
14+
.package(name: "JavaScriptKit", url: "https://github.com/j-f1/forked-JavaScriptKit.git", .revision("b62b78e")),
1515
],
1616
targets: [
1717
.target(

‎Sources/DOMKit/ECMAScript/ArrayBuffer.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ public typealias Float64Array = JSTypedArray<Float64>
1717

1818
public class ArrayBuffer: JSBridgedClass {
1919

20-
public class var classRef: JSFunctionRef { JSObjectRef.global.ArrayBuffer.function! }
20+
public class var constructor: JSFunction { JSObject.global.ArrayBuffer.function! }
2121

22-
public let objectRef: JSObjectRef
22+
public let jsObject: JSObject
2323

24-
public required init(withCompatibleObject objectRef: JSObjectRef) {
25-
self.objectRef = objectRef
24+
public required init(withCompatibleObject jsObject: JSObject) {
25+
self.jsObject = jsObject
2626
}
2727

2828
public convenience init(length: Int) {
29-
self.init(withCompatibleObject: Self.classRef.new( length))
29+
self.init(withCompatibleObject: Self.constructor.new( length))
3030
}
3131

3232
public static func isView(_ object: AnyJSValueCodable) -> Bool {
33-
return JSObjectRef.global.ArrayBuffer.object!.isView!(object).fromJSValue()!
33+
return JSObject.global.ArrayBuffer.object!.isView!(object).fromJSValue()!
3434
}
3535
}

‎Sources/DOMKit/ECMAScript/DataView.swift

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,30 @@ import JavaScriptKit
66

77
public class DataView: JSBridgedClass {
88

9-
public class var classRef: JSFunctionRef { JSObjectRef.global.DataView.function! }
9+
public class var constructor: JSFunction { JSObject.global.DataView.function! }
1010

11-
public let objectRef: JSObjectRef
11+
public let jsObject: JSObject
1212

13-
public required init(withCompatibleObject objectRef: JSObjectRef) {
14-
_buffer = ReadonlyAttribute(objectRef: objectRef, name: "buffer")
15-
_byteOffset = ReadonlyAttribute(objectRef: objectRef, name: "byteOffset")
16-
_byteLength = ReadonlyAttribute(objectRef: objectRef, name: "byteLength")
17-
self.objectRef = objectRef
13+
public required init(withCompatibleObject jsObject: JSObject) {
14+
_buffer = ReadonlyAttribute(jsObject: jsObject, name: "buffer")
15+
_byteOffset = ReadonlyAttribute(jsObject: jsObject, name: "byteOffset")
16+
_byteLength = ReadonlyAttribute(jsObject: jsObject, name: "byteLength")
17+
self.jsObject = jsObject
1818
}
1919

2020
public convenience init(buffer: ArrayBuffer) {
2121

22-
self.init(withCompatibleObject: DataView.classRef.new(buffer.jsValue()))
22+
self.init(withCompatibleObject: DataView.constructor.new(buffer.jsValue()))
2323
}
2424

2525
public convenience init(buffer: ArrayBuffer, byteOffset: UInt32) {
2626

27-
self.init(withCompatibleObject: DataView.classRef.new(buffer.jsValue(), byteOffset.jsValue()))
27+
self.init(withCompatibleObject: DataView.constructor.new(buffer.jsValue(), byteOffset.jsValue()))
2828
}
2929

3030
public convenience init(buffer: ArrayBuffer, byteOffset: UInt32, byteLength: UInt32) {
3131

32-
self.init(withCompatibleObject: DataView.classRef.new(buffer.jsValue(), byteOffset.jsValue(), byteLength.jsValue()))
32+
self.init(withCompatibleObject: DataView.constructor.new(buffer.jsValue(), byteOffset.jsValue(), byteLength.jsValue()))
3333
}
3434

3535
@ReadonlyAttribute
@@ -44,128 +44,128 @@ public class DataView: JSBridgedClass {
4444

4545
public func getFloat32(byteOffset: UInt32) -> Float {
4646

47-
return objectRef.getFloat32!(byteOffset.jsValue()).fromJSValue()!
47+
return jsObject.getFloat32!(byteOffset.jsValue()).fromJSValue()!
4848
}
4949

5050
public func getFloat32(byteOffset: UInt32, littleEndian: Bool) -> Float {
5151

52-
return objectRef.getFloat32!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
52+
return jsObject.getFloat32!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
5353
}
5454

5555
public func getFloat64(byteOffset: UInt32) -> Double {
5656

57-
return objectRef.getFloat64!(byteOffset.jsValue()).fromJSValue()!
57+
return jsObject.getFloat64!(byteOffset.jsValue()).fromJSValue()!
5858
}
5959

6060
public func getFloat64(byteOffset: UInt32, littleEndian: Bool) -> Double {
6161

62-
return objectRef.getFloat64!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
62+
return jsObject.getFloat64!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
6363
}
6464

6565
public func getUint8(byteOffset: UInt32) -> UInt8 {
6666

67-
return objectRef.getUint8!(byteOffset.jsValue()).fromJSValue()!
67+
return jsObject.getUint8!(byteOffset.jsValue()).fromJSValue()!
6868
}
6969

7070
public func getUint16(byteOffset: UInt32) -> UInt16 {
7171

72-
return objectRef.getUint16!(byteOffset.jsValue()).fromJSValue()!
72+
return jsObject.getUint16!(byteOffset.jsValue()).fromJSValue()!
7373
}
7474

7575
public func getUint16(byteOffset: UInt32, littleEndian: Bool) -> UInt16 {
7676

77-
return objectRef.getUint16!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
77+
return jsObject.getUint16!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
7878
}
7979

8080
public func getUint32(byteOffset: UInt32) -> UInt32 {
8181

82-
return objectRef.getUint32!(byteOffset.jsValue()).fromJSValue()!
82+
return jsObject.getUint32!(byteOffset.jsValue()).fromJSValue()!
8383
}
8484

8585
public func getUint32(byteOffset: UInt32, littleEndian: Bool) -> UInt32 {
8686

87-
return objectRef.getUint32!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
87+
return jsObject.getUint32!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
8888
}
8989

9090
public func getInt8(byteOffset: UInt32) -> Int8 {
9191

92-
return objectRef.getInt8!(byteOffset.jsValue()).fromJSValue()!
92+
return jsObject.getInt8!(byteOffset.jsValue()).fromJSValue()!
9393
}
9494

9595
public func getInt16(byteOffset: UInt32) -> Int16 {
9696

97-
return objectRef.getInt16!(byteOffset.jsValue()).fromJSValue()!
97+
return jsObject.getInt16!(byteOffset.jsValue()).fromJSValue()!
9898
}
9999

100100
public func getInt16(byteOffset: UInt32, littleEndian: Bool) -> Int16 {
101101

102-
return objectRef.getInt16!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
102+
return jsObject.getInt16!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
103103
}
104104

105105
public func getInt32(byteOffset: UInt32) -> Int32 {
106106

107-
return objectRef.getInt32!(byteOffset.jsValue()).fromJSValue()!
107+
return jsObject.getInt32!(byteOffset.jsValue()).fromJSValue()!
108108
}
109109

110110
public func getInt32(byteOffset: UInt32, littleEndian: Bool) -> Int32 {
111111

112-
return objectRef.getInt32!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
112+
return jsObject.getInt32!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
113113
}
114114

115115
public func setUint8(byteOffset: UInt32, value: UInt8) {
116-
_ = objectRef.setUint8!(byteOffset.jsValue(), value.jsValue())
116+
_ = jsObject.setUint8!(byteOffset.jsValue(), value.jsValue())
117117
}
118118

119119
public func setUint16(byteOffset: UInt32, value: UInt16) {
120-
_ = objectRef.setUint16!(byteOffset.jsValue(), value.jsValue())
120+
_ = jsObject.setUint16!(byteOffset.jsValue(), value.jsValue())
121121
}
122122

123123
public func setUint16(byteOffset: UInt32, value: UInt16, littleEndian: Bool) {
124-
_ = objectRef.setUint16!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
124+
_ = jsObject.setUint16!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
125125
}
126126

127127
public func setUint32(byteOffset: UInt32, value: UInt32) {
128-
_ = objectRef.setUint32!(byteOffset.jsValue(), value.jsValue())
128+
_ = jsObject.setUint32!(byteOffset.jsValue(), value.jsValue())
129129
}
130130

131131
public func setUint32(byteOffset: UInt32, value: UInt32, littleEndian: Bool) {
132-
_ = objectRef.setUint32!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
132+
_ = jsObject.setUint32!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
133133
}
134134

135135
public func setInt8(byteOffset: UInt32, value: Int8) {
136-
_ = objectRef.setUint8!(byteOffset.jsValue(), value.jsValue())
136+
_ = jsObject.setUint8!(byteOffset.jsValue(), value.jsValue())
137137
}
138138

139139
public func setInt16(byteOffset: UInt32, value: Int16) {
140-
_ = objectRef.setInt16!(byteOffset.jsValue(), value.jsValue())
140+
_ = jsObject.setInt16!(byteOffset.jsValue(), value.jsValue())
141141
}
142142

143143
public func setInt16(byteOffset: UInt32, value: Int16, littleEndian: Bool) {
144-
_ = objectRef.setInt16!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
144+
_ = jsObject.setInt16!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
145145
}
146146

147147
public func setInt32(byteOffset: UInt32, value: Int32) {
148-
_ = objectRef.setInt32!(byteOffset.jsValue(), value.jsValue())
148+
_ = jsObject.setInt32!(byteOffset.jsValue(), value.jsValue())
149149
}
150150

151151
public func setInt32(byteOffset: UInt32, value: Int32, littleEndian: Bool) {
152-
_ = objectRef.setInt32!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
152+
_ = jsObject.setInt32!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
153153
}
154154

155155
public func setFloat32(byteOffset: UInt32, value: Float) {
156-
_ = objectRef.setFloat32!(byteOffset.jsValue(), value.jsValue())
156+
_ = jsObject.setFloat32!(byteOffset.jsValue(), value.jsValue())
157157
}
158158

159159
public func setFloat32(byteOffset: UInt32, value: Float, littleEndian: Bool) {
160-
_ = objectRef.setFloat32!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
160+
_ = jsObject.setFloat32!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
161161
}
162162

163163
public func setFloat64(byteOffset: UInt32, value: Double) {
164-
_ = objectRef.setFloat64!(byteOffset.jsValue(), value.jsValue())
164+
_ = jsObject.setFloat64!(byteOffset.jsValue(), value.jsValue())
165165
}
166166

167167
public func setFloat64(byteOffset: UInt32, value: Double, littleEndian: Bool) {
168-
_ = objectRef.setFloat64!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
168+
_ = jsObject.setFloat64!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
169169
}
170170
}
171171

‎Sources/DOMKit/ECMAScript/Date.swift

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)