SwiftFormat pass on codebase

.swiftformat

@@ -26,7 +26,7 @@
 --header ignore
 --hexgrouping 4,8
 --hexliteralcase uppercase
---ifdef indent
+--ifdef no-indent
 --importgrouping alpha
 --indent 4
 --indentcase false

Examples/OSCKitExample/OSCKitExample/AppDelegate.swift

@@ -25,8 +25,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     private func setupOSCServer() {
         oscServer.setHandler { [weak self] message, timeTag in
             do {
-                try self?.oscReceiver.handle(oscMessage: message,
-                                             timeTag: timeTag)
+                try self?.oscReceiver.handle(
+                    oscMessage: message,
+                    timeTag: timeTag
+                )
             } catch {
                 print(error)
             }
@@ -40,7 +42,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
     /// Send a test OSC message.
-    @IBAction func sendTestOSCMessage(_ sender: Any) {
+    @IBAction
+    func sendTestOSCMessage(_ sender: Any) {
         let oscMessage = OSCMessage(
             address: "/some/address/methodB",
             values: [.string("Test string"), .int32(123)]

Sources/OSCKitCore/OSCAddress/OSCAddress init.swift

@@ -24,14 +24,14 @@ extension OSCAddress {
     /// The path component strings will be converted to ASCII strings, lossily converting or removing invalid non-ASCII characters if necessary.
     /// Empty path components is equivalent to the address of "/".
     public init(pathComponents: [String]) {
-        self.address = ("/" + pathComponents.joined(separator: "/")).asciiStringLossy
+        address = ("/" + pathComponents.joined(separator: "/")).asciiStringLossy
     }
 
     /// Create an OSC address from individual path components.
     /// The path component strings will be converted to ASCII strings, lossily converting or removing invalid non-ASCII characters if necessary.
     /// Empty path components is equivalent to the address of "/".
     @_disfavoredOverload
     public init(pathComponents: [ASCIIString]) {
-        self.address = ASCIICharacter("/") + pathComponents.joined(separator: "/")
+        address = ASCIICharacter("/") + pathComponents.joined(separator: "/")
     }
 }

Sources/OSCKitCore/OSCBundle/OSCBundle Data Extensions.swift

@@ -10,6 +10,6 @@ extension Data {
     /// (Note: Does NOT do extensive checks to ensure data block isn't malformed)
     @inlinable
     var appearsToBeOSCBundle: Bool {
-        self.starts(with: OSCBundle.header)
+        starts(with: OSCBundle.header)
     }
 }

Sources/OSCKitCore/OSCBundle/OSCBundle init.swift

@@ -14,7 +14,7 @@ extension OSCBundle {
     ) {
         self.timeTag = timeTag ?? .init(1)
         self.elements = elements
-        self.rawData = Self.generateRawData(
+        rawData = Self.generateRawData(
             from: elements,
             timeTag: self.timeTag
         )

Sources/OSCKitCore/OSCMessage/OSCMessage Data Extensions.swift

@@ -11,6 +11,6 @@ extension Data {
     @inlinable
     public var appearsToBeOSCMessage: Bool {
         // it's possible an OSC address won't start with "/", but it should!
-        self.starts(with: OSCMessage.header)
+        starts(with: OSCMessage.header)
     }
 }

Sources/OSCKitCore/OSCMessage/OSCMessage init.swift

@@ -18,7 +18,7 @@ extension OSCMessage {
         let oscAddress = OSCAddress(address.asciiStringLossy)
         self.address = oscAddress
         self.values = values
-        self.rawData = Self.generateRawData(
+        rawData = Self.generateRawData(
             address: oscAddress,
             values: values
         )
@@ -33,7 +33,7 @@ extension OSCMessage {
         let oscAddress = OSCAddress(address)
         self.address = oscAddress
         self.values = values
-        self.rawData = Self.generateRawData(
+        rawData = Self.generateRawData(
             address: oscAddress,
             values: values
         )
@@ -47,7 +47,7 @@ extension OSCMessage {
     ) {
         self.address = address
         self.values = values
-        self.rawData = Self.generateRawData(
+        rawData = Self.generateRawData(
             address: address,
             values: values
         )
@@ -60,9 +60,9 @@ extension OSCMessage {
         address pathComponents: [String],
         values: [Value] = []
     ) {
-        self.address = OSCAddress(pathComponents: pathComponents)
+        address = OSCAddress(pathComponents: pathComponents)
         self.values = values
-        self.rawData = Self.generateRawData(
+        rawData = Self.generateRawData(
             address: address,
             values: values
         )
@@ -75,9 +75,9 @@ extension OSCMessage {
         address pathComponents: [ASCIIString],
         values: [Value] = []
     ) {
-        self.address = OSCAddress(pathComponents: pathComponents)
+        address = OSCAddress(pathComponents: pathComponents)
         self.values = values
-        self.rawData = Self.generateRawData(
+        rawData = Self.generateRawData(
             address: address,
             values: values
         )

Sources/OSCKitCore/OSCMessage/Value/Mask/Mask Sequence Extensions.swift

@@ -32,15 +32,15 @@ extension Array where Element == OSCMessage.Value {
         mask: [OSCMessage.Value.Mask.Token]
     ) -> Bool {
         // should not contain more values than mask
-        if self.count > mask.count { return false }
+        if count > mask.count { return false }
 
         var matchCount = 0
 
         for idx in 0 ..< mask.count {
             // can be a concrete type or meta type
             let idxOptional = mask[idx].isOptional
 
-            if self.indices.contains(idx) {
+            if indices.contains(idx) {
                 switch self[idx].baseType(
                     matches: mask[idx].baseType,
                     canMatchMetaTypes: true

Sources/OSCKitCore/OSCMessage/Value/Masks/OSCMessageConcreteValue Masks.swift

@@ -34,14 +34,16 @@ extension Array where Element == OSCMessage.Value {
         _ mask: [OSCMessage.Value.Mask.Token]
     ) throws -> [OSCMessageConcreteValue?] {
         // should not contain more values than mask
-        if self.count > mask.count { throw OSCMessage.Value.Mask.MaskError.invalidCount }
+        if count > mask.count {
+            throw OSCMessage.Value.Mask.MaskError.invalidCount
+        }
 
         var values = [OSCMessageConcreteValue?]()
 
         for idx in 0 ..< mask.count {
             let idxOptional = mask[idx].isOptional
 
-            if self.indices.contains(idx) {
+            if indices.contains(idx) {
                 // check if it's the correct base type
                 if !self[idx].baseType(
                     matches: mask[idx].baseType,

Sources/OSCKitCore/OSCMessage/Value/OSCMessageConcreteValue.swift

@@ -9,24 +9,24 @@ import Foundation
 public protocol OSCMessageConcreteValue { }
 
 // true concrete types
-extension Int32                        : OSCMessageConcreteValue { }
-extension Float32                      : OSCMessageConcreteValue { }
-extension ASCIIString                  : OSCMessageConcreteValue { }
-extension Data                         : OSCMessageConcreteValue { }
-extension Int64                        : OSCMessageConcreteValue { }
-extension Double                       : OSCMessageConcreteValue { }
-extension ASCIICharacter               : OSCMessageConcreteValue { }
-extension OSCMessage.Value.MIDIMessage : OSCMessageConcreteValue { }
-extension Bool                         : OSCMessageConcreteValue { }
-extension NSNull                       : OSCMessageConcreteValue { }
+extension Int32: OSCMessageConcreteValue { }
+extension Float32: OSCMessageConcreteValue { }
+extension ASCIIString: OSCMessageConcreteValue { }
+extension Data: OSCMessageConcreteValue { }
+extension Int64: OSCMessageConcreteValue { }
+extension Double: OSCMessageConcreteValue { }
+extension ASCIICharacter: OSCMessageConcreteValue { }
+extension OSCMessage.Value.MIDIMessage: OSCMessageConcreteValue { }
+extension Bool: OSCMessageConcreteValue { }
+extension NSNull: OSCMessageConcreteValue { }
 
-extension OSCTimeTag                   : OSCMessageConcreteValue { }
-extension UInt64                       : OSCMessageConcreteValue { }
+extension OSCTimeTag: OSCMessageConcreteValue { }
+extension UInt64: OSCMessageConcreteValue { }
 
 // substitute types
-extension Int                          : OSCMessageConcreteValue { }
-extension String                       : OSCMessageConcreteValue { }
-extension Character                    : OSCMessageConcreteValue { }
+extension Int: OSCMessageConcreteValue { }
+extension String: OSCMessageConcreteValue { }
+extension Character: OSCMessageConcreteValue { }
 
 // meta types
-extension OSCMessage.Value.Number      : OSCMessageConcreteValue { }
+extension OSCMessage.Value.Number: OSCMessageConcreteValue { }

Sources/OSCKitCore/OSCMessage/Value/Value Sequence Extensions.swift

@@ -11,7 +11,7 @@ extension Sequence where Iterator.Element == OSCMessage.Value {
         withLabel: Bool = true,
         separator: String = ", "
     ) -> String {
-        self.map { $0.stringValue(withLabel: withLabel) }
+        map { $0.stringValue(withLabel: withLabel) }
             .joined(separator: separator)
     }
 }

Sources/OSCKitCore/OSCTimeTag/OSCTimeTag Properties.swift

@@ -20,7 +20,7 @@ extension OSCTimeTag {
 
     /// Returns the time tag converted to a `Date` instance.
     public var date: Date {
-        return isImmediate
+        isImmediate
             ? Date()
             : Self.primeEpoch.addingTimeInterval(rawValue.seconds(era: era))
     }

Sources/OSCKitCore/Utilities/Data Extensions.swift

@@ -15,9 +15,9 @@ extension Data {
         int32Value: Int32,
         byteLength: Int
     )? {
-        if self.count < 4 { return nil }
+        if count < 4 { return nil }
 
-        let chunk = self.subdata(in: 0 ..< 4)
+        let chunk = subdata(in: 0 ..< 4)
 
         guard let value = chunk.toInt32(from: .bigEndian)
         else { return nil }
@@ -31,9 +31,9 @@ extension Data {
         int64Value: Int64,
         byteLength: Int
     )? {
-        if self.count < 8 { return nil }
+        if count < 8 { return nil }
 
-        let chunk = self.subdata(in: 0 ..< 8)
+        let chunk = subdata(in: 0 ..< 8)
 
         guard let value = chunk.toInt64(from: .bigEndian)
         else { return nil }
@@ -47,9 +47,9 @@ extension Data {
         uInt64Value: UInt64,
         byteLength: Int
     )? {
-        if self.count < 8 { return nil }
+        if count < 8 { return nil }
 
-        let chunk = self.subdata(in: 0 ..< 8)
+        let chunk = subdata(in: 0 ..< 8)
 
         guard let value = chunk.toUInt64(from: .bigEndian)
         else { return nil }
@@ -64,9 +64,9 @@ extension Data {
         float32Value: Float32,
         byteLength: Int
     )? {
-        if self.count < 4 { return nil }
+        if count < 4 { return nil }
 
-        let chunk = self.subdata(in: 0 ..< 4)
+        let chunk = subdata(in: 0 ..< 4)
 
         guard let value = chunk.toFloat32(from: .bigEndian)
         else { return nil }
@@ -81,9 +81,9 @@ extension Data {
         doubleValue: Double,
         byteLength: Int
     )? {
-        if self.count < 8 { return nil }
+        if count < 8 { return nil }
 
-        let chunk = self.subdata(in: 0 ..< 8)
+        let chunk = subdata(in: 0 ..< 8)
 
         guard let value = chunk.toDouble(from: .bigEndian)
         else { return nil }
@@ -98,7 +98,7 @@ extension Data {
         byteLength: Int
     )? {
         // extractNull4ByteTerminatedData takes care of data size validation so we don't need to do it here
-        guard let chunk = self.extractNull4ByteTerminatedData()
+        guard let chunk = extractNull4ByteTerminatedData()
         else { return nil }
 
         guard let string = ASCIIString(exactly: chunk.data)
@@ -114,23 +114,23 @@ extension Data {
         byteLength: Int
     )? {
         // ensure minimum of 4 bytes to work with
-        if self.count < 4 { return nil }
+        if count < 4 { return nil }
 
         // check for first null
-        guard let nullFound: Int = self.range(of: Data([0x00]))?.lowerBound
+        guard let nullFound: Int = range(of: Data([0x00]))?.lowerBound
         else { return nil }
 
         // calculate theoretical position after first null that is a multiple of 4 bytes
         let byteCount = nullFound + (4 - (nullFound % 4))
 
         // check to see if there actually are enough bytes
-        guard self.count >= byteCount else { return nil }
+        guard count >= byteCount else { return nil }
 
         // check to see if any pad bytes are all nulls
         guard self[nullFound ..< byteCount].allSatisfy({ $0 == 0x00 })
         else { return nil }
 
-        return (self.subdata(in: 0 ..< nullFound), byteCount)
+        return (subdata(in: 0 ..< nullFound), byteCount)
     }
 
     /// Internal helper function.
@@ -140,30 +140,30 @@ extension Data {
         byteLength: Int
     )? {
         // check for int32 length chunk
-        guard let pull = self.extractInt32()
+        guard let pull = extractInt32()
         else { return nil }
 
         let blobSize = Int(pull.int32Value) // blob byte length
 
         // blob OSC chunk length
-        let blobRawSize = (self.count - 4).roundedUp(toMultiplesOf: 4)
+        let blobRawSize = (count - 4).roundedUp(toMultiplesOf: 4)
 
         // check if data is indeed at least as long as the int32 length claims it is
-        if (blobRawSize > self.count - 4) { return nil }
+        if (blobRawSize > count - 4) { return nil }
 
         // check to see if any pad bytes are all nulls
         guard self[4 + blobSize ..< 4 + blobRawSize].allSatisfy({ $0 == 0x00 })
         else { return nil }
 
-        let chunk = self.subdata(in: 4 ..< 4 + blobSize)
+        let chunk = subdata(in: 4 ..< 4 + blobSize)
 
         return (chunk, blobRawSize)
     }
 
     /// Internal helper function.
     @inlinable
     internal func extract(byteLength: Int) -> Data? {
-        if byteLength < 0 || byteLength > self.count { return nil }
+        if byteLength < 0 || byteLength > count { return nil }
 
         return self[0 ..< byteLength]
     }
@@ -177,12 +177,10 @@ extension Data {
         var retval = self
         let appendval = Data([UInt8](
             repeating: 00,
-            count: (4 - (self.count % 4))
+            count: (4 - (count % 4))
         ))
         retval += appendval
 
         return retval
-
     }
-
 }

Sources/OSCKitCore/Utilities/Log.swift

@@ -6,7 +6,7 @@
 // logging not used in OSCKit, but if needed,
 // uncomment the code below and use logger
 
-//@_implementationOnly import OTCore
+// @_implementationOnly import OTCore
 //
-//let logger = OSLogger(enabled: true,
+// let logger = OSLogger(enabled: true,
 //                      useEmoji: .disabled)

Tests/OSCKitCoreTests/OSCBundle/OSCBundle Tests.swift

@@ -68,7 +68,7 @@ final class OSCBundle_Tests: XCTestCase {
     }
 
     func testCustomStringConvertible_SpecificTimeTag_EmptyElements() {
-        let bundle = OSCBundle(elements: [], timeTag: .init(123456))
+        let bundle = OSCBundle(elements: [], timeTag: .init(123_456))
 
         let desc = bundle.description
 

Tests/OSCKitCoreTests/OSCDispatcher/OSCDispatcher Tests.swift

@@ -139,7 +139,8 @@ final class OSCDispatcher_Tests: XCTestCase {
 
         let t1ID = dispatcher.register(address: "/test1")
         let t2ID = dispatcher.register(address: "/test2")
-        let _ = dispatcher.register(address: "/test1/test1B") // not tested, just want it present
+        let _ = dispatcher
+            .register(address: "/test1/test1B") // not tested, just want it present
 
         // non-matches