Apply swiftformat

Author: kateinoigakukun

IntegrationTests/TestSuites/Sources/BenchmarkTests/Benchmark.swift

@@ -1,22 +1,20 @@
 import JavaScriptKit
 
 class Benchmark {
-    
     init(_ title: String) {
         self.title = title
     }
-    
+
     let title: String
     let runner: JSFunctionRef = JSObjectRef.global.benchmarkRunner.function!
-    
+
     func testSuite(_ name: String, _ body: @escaping () -> Void) {
         let jsBody = JSClosure { arguments -> JSValue in
             let iteration = Int(arguments[0].number!)
-            for _ in 0..<iteration { body() }
+            for _ in 0 ..< iteration { body() }
             return .undefined
         }
         runner("\(title)/\(name)", jsBody)
         jsBody.release()
     }
-
 }

IntegrationTests/TestSuites/Sources/BenchmarkTests/main.swift

@@ -2,12 +2,11 @@ import JavaScriptKit
 
 let serialization = Benchmark("Serialization")
 
-
 let swiftInt: Double = 42
 serialization.testSuite("Swift Int to JavaScript") {
     let jsNumber = JSValue.number(swiftInt)
     let object = JSObjectRef.global
-    for i in 0..<100 {
+    for i in 0 ..< 100 {
         object.set("numberValue\(i)", jsNumber)
     }
 }
@@ -16,7 +15,7 @@ let swiftString = "Hello, world"
 serialization.testSuite("Swift String to JavaScript") {
     let jsString = JSValue.string(swiftString)
     let object = JSObjectRef.global
-    for i in 0..<100 {
+    for i in 0 ..< 100 {
         object.set("stringValue\(i)", jsString)
     }
 }

IntegrationTests/TestSuites/Sources/PrimaryTests/UnitTestUtils.swift

@@ -24,7 +24,7 @@ func expectEqual<T: Equatable>(
 
 func expectObject(_ value: JSValue, file: StaticString = #file, line: UInt = #line, column: UInt = #column) throws -> JSObjectRef {
     switch value {
-    case .object(let ref): return ref
+    case let .object(ref): return ref
     default:
         throw MessageError("Type of \(value) should be \"object\"", file: file, line: line, column: column)
     }
@@ -39,31 +39,31 @@ func expectArray(_ value: JSValue, file: StaticString = #file, line: UInt = #lin
 
 func expectFunction(_ value: JSValue, file: StaticString = #file, line: UInt = #line, column: UInt = #column) throws -> JSFunctionRef {
     switch value {
-    case .function(let ref): return ref
+    case let .function(ref): return ref
     default:
         throw MessageError("Type of \(value) should be \"function\"", file: file, line: line, column: column)
     }
 }
 
 func expectBoolean(_ value: JSValue, file: StaticString = #file, line: UInt = #line, column: UInt = #column) throws -> Bool {
     switch value {
-    case .boolean(let bool): return bool
+    case let .boolean(bool): return bool
     default:
         throw MessageError("Type of \(value) should be \"boolean\"", file: file, line: line, column: column)
     }
 }
 
 func expectNumber(_ value: JSValue, file: StaticString = #file, line: UInt = #line, column: UInt = #column) throws -> Double {
     switch value {
-    case .number(let number): return number
+    case let .number(number): return number
     default:
         throw MessageError("Type of \(value) should be \"number\"", file: file, line: line, column: column)
     }
 }
 
 func expectString(_ value: JSValue, file: StaticString = #file, line: UInt = #line, column: UInt = #column) throws -> String {
     switch value {
-    case .string(let string): return string
+    case let .string(string): return string
     default:
         throw MessageError("Type of \(value) should be \"string\"", file: file, line: line, column: column)
     }

IntegrationTests/TestSuites/Sources/PrimaryTests/main.swift

@@ -62,7 +62,7 @@ Object_Conversion: do {
     let prop_4 = getJSValue(this: globalObject1Ref, name: "prop_4")
     let prop_4Array = try expectObject(prop_4)
     let expectedProp_4: [JSValue] = [
-        .number(3), .number(4), .string("str_elm_1"), .number(5)
+        .number(3), .number(4), .string("str_elm_1"), .number(5),
     ]
     for (index, expectedElement) in expectedProp_4.enumerated() {
         let actualElement = getJSValue(this: prop_4Array, index: Int32(index))
@@ -95,7 +95,7 @@ Array_Iterator: do {
     let prop_4 = getJSValue(this: globalObject1Ref, name: "prop_4")
     let array = try expectArray(prop_4)
     let expectedProp_4: [JSValue] = [
-        .number(3), .number(4), .string("str_elm_1"), .number(5)
+        .number(3), .number(4), .string("str_elm_1"), .number(5),
     ]
     try expectEqual(Array(array), expectedProp_4)
 }
@@ -105,6 +105,7 @@ Value_Decoder: do {
         struct Prop1: Codable {
             let nested_prop: Int
         }
+
         let prop_1: Prop1
         let prop_2: Int
         let prop_3: Bool
@@ -167,7 +168,6 @@ Function_Call: do {
 }
 
 Host_Function_Registration: do {
-
     // ```js
     // global.globalObject1 = {
     //   ...
@@ -184,7 +184,7 @@ Host_Function_Registration: do {
     let prop_6Ref = try expectObject(prop_6)
 
     var isHostFunc1Called = false
-    let hostFunc1 = JSClosure { (arguments) -> JSValue in
+    let hostFunc1 = JSClosure { (_) -> JSValue in
         isHostFunc1Called = true
         return .number(1)
     }
@@ -215,7 +215,6 @@ Host_Function_Registration: do {
 }
 
 New_Object_Construction: do {
-
     // ```js
     // global.Animal = function(name, age, isCat) {
     //   this.name = name
@@ -240,7 +239,6 @@ New_Object_Construction: do {
 }
 
 Call_Function_With_This: do {
-
     // ```js
     // global.Animal = function(name, age, isCat) {
     //   this.name = name
@@ -322,4 +320,4 @@ ObjectRef_Lifetime: do {
     try expectEqual(ref2.prop_2, .number(2))
 } catch {
     print(error)
-}
+}

Package.swift

@@ -5,7 +5,7 @@ import PackageDescription
 let package = Package(
     name: "JavaScriptKit",
     products: [
-        .library(name: "JavaScriptKit", targets: ["JavaScriptKit"])
+        .library(name: "JavaScriptKit", targets: ["JavaScriptKit"]),
     ],
     targets: [
         .target(
@@ -24,8 +24,9 @@ let package = Package(
                         "--export=swjs_library_version",
                     ],
                     .when(platforms: [.wasi])
-                )
-            ]),
+                ),
+            ]
+        ),
         .target(
             name: "_CJavaScriptKit",
             linkerSettings: [
@@ -35,10 +36,12 @@ let package = Package(
                         "--allow-undefined",
                     ],
                     .when(platforms: [.wasi])
-                )
-            ]),
+                ),
+            ]
+        ),
         .testTarget(
             name: "JavaScriptKitTests",
-            dependencies: ["JavaScriptKit"]),
+            dependencies: ["JavaScriptKit"]
+        ),
     ]
 )

Package@swift-5.2.swift

@@ -5,7 +5,7 @@ import PackageDescription
 let package = Package(
     name: "JavaScriptKit",
     products: [
-        .library(name: "JavaScriptKit", targets: ["JavaScriptKit"])
+        .library(name: "JavaScriptKit", targets: ["JavaScriptKit"]),
     ],
     targets: [
         .target(
@@ -23,8 +23,9 @@ let package = Package(
                         "-Xlinker",
                         "--export=swjs_library_version",
                     ]
-                )
-            ]),
+                ),
+            ]
+        ),
         .target(
             name: "_CJavaScriptKit",
             linkerSettings: [
@@ -33,10 +34,12 @@ let package = Package(
                         "-Xlinker",
                         "--allow-undefined",
                     ]
-                )
-            ]),
+                ),
+            ]
+        ),
         .testTarget(
             name: "JavaScriptKitTests",
-            dependencies: ["JavaScriptKit"]),
+            dependencies: ["JavaScriptKit"]
+        ),
     ]
 )

Sources/JavaScriptKit/JSArrayRef.swift

@@ -1,6 +1,5 @@
 
 public class JSArrayRef {
-
     static let classObject = JSObjectRef.global.Array.function!
 
     static func isArray(_ object: JSObjectRef) -> Bool {
@@ -15,7 +14,6 @@ public class JSArrayRef {
     }
 }
 
-
 extension JSArrayRef: Sequence {
     public typealias Element = JSValue
 
@@ -29,6 +27,7 @@ extension JSArrayRef: Sequence {
         init(ref: JSObjectRef) {
             self.ref = ref
         }
+
         public func next() -> Element? {
             defer { index += 1 }
             guard index < Int(ref.length.number!) else {

Sources/JavaScriptKit/JSFunction.swift

@@ -2,11 +2,10 @@ import _CJavaScriptKit
 
 @dynamicCallable
 public class JSFunctionRef: JSObjectRef {
-
     @discardableResult
     public func dynamicallyCall(withArguments arguments: [JSValueConvertible]) -> JSValue {
         let result = arguments.withRawJSValues { rawValues -> RawJSValue in
-            return rawValues.withUnsafeBufferPointer { bufferPointer -> RawJSValue in
+            rawValues.withUnsafeBufferPointer { bufferPointer -> RawJSValue in
                 let argv = bufferPointer.baseAddress
                 let argc = bufferPointer.count
                 var result = RawJSValue()
@@ -23,16 +22,16 @@ public class JSFunctionRef: JSObjectRef {
     public func apply(this: JSObjectRef, arguments: JSValueConvertible...) -> JSValue {
         apply(this: this, argumentList: arguments)
     }
+
     public func apply(this: JSObjectRef, argumentList: [JSValueConvertible]) -> JSValue {
         let result = argumentList.withRawJSValues { rawValues in
             rawValues.withUnsafeBufferPointer { bufferPointer -> RawJSValue in
                 let argv = bufferPointer.baseAddress
                 let argc = bufferPointer.count
                 var result = RawJSValue()
                 _call_function_with_this(this.id,
-                    self.id, argv, Int32(argc),
-                    &result.kind, &result.payload1, &result.payload2, &result.payload3
-                )
+                                         self.id, argv, Int32(argc),
+                                         &result.kind, &result.payload1, &result.payload2, &result.payload3)
                 return result
             }
         }
@@ -55,17 +54,16 @@ public class JSFunctionRef: JSObjectRef {
     }
 
     @available(*, unavailable, message: "Please use JSClosure instead")
-    public static func from(_ body: @escaping ([JSValue]) -> JSValue) -> JSFunctionRef {
+    public static func from(_: @escaping ([JSValue]) -> JSValue) -> JSFunctionRef {
         fatalError("unavailable")
     }
 
-    public override func jsValue() -> JSValue {
+    override public func jsValue() -> JSValue {
         .function(self)
     }
 }
 
 public class JSClosure: JSFunctionRef {
-
     static var sharedFunctions: [JavaScriptHostFuncRef: ([JSValue]) -> JSValue] = [:]
 
     private var hostFuncRef: JavaScriptHostFuncRef = 0
@@ -79,16 +77,15 @@ public class JSClosure: JSFunctionRef {
         var objectRef: JavaScriptObjectRef = 0
         _create_function(funcRef, &objectRef)
 
-        self.hostFuncRef = funcRef
-        self.id = objectRef
+        hostFuncRef = funcRef
+        id = objectRef
     }
 
     public func release() {
         Self.sharedFunctions[hostFuncRef] = nil
     }
 }
 
-
 @_cdecl("swjs_prepare_host_function_call")
 public func _prepare_host_function_call(_ argc: Int32) -> UnsafeMutableRawPointer {
     let argumentSize = MemoryLayout<RawJSValue>.size * Int(argc)
@@ -104,7 +101,8 @@ public func _cleanup_host_function_call(_ pointer: UnsafeMutableRawPointer) {
 public func _call_host_function(
     _ hostFuncRef: JavaScriptHostFuncRef,
     _ argv: UnsafePointer<RawJSValue>, _ argc: Int32,
-    _ callbackFuncRef: JavaScriptObjectRef) {
+    _ callbackFuncRef: JavaScriptObjectRef
+) {
     guard let hostFunc = JSClosure.sharedFunctions[hostFuncRef] else {
         fatalError("The function was already released")
     }

Sources/JavaScriptKit/JSObject.swift

@@ -9,11 +9,9 @@ public class JSObjectRef: Equatable {
 
     @_disfavoredOverload
     public subscript(dynamicMember name: String) -> ((JSValueConvertible...) -> JSValue)? {
-        get {
-            guard let function = self[dynamicMember: name].function else { return nil }
-            return { (arguments: JSValueConvertible...) in
-                function.apply(this: self, argumentList: arguments)
-            }
+        guard let function = self[dynamicMember: name].function else { return nil }
+        return { (arguments: JSValueConvertible...) in
+            function.apply(this: self, argumentList: arguments)
         }
     }