Dev/foundation

.github/scripts/tests.sh

@@ -16,4 +16,5 @@ export LC_CTYPE=en_US.UTF-8
 set -o pipefail && arch -"${ARCH}" xcodebuild  \
            -scheme CodeEditKit \
            -destination "platform=macos,arch=${ARCH}" \
+           -skipPackagePluginValidation \
            clean test | xcpretty

.swiftlint.yml

@@ -1,16 +1,15 @@
 disabled_rules:
-  - todo
-  - trailing_comma
-  - nesting
+  - force_cast
+
+line_length: 160
 
 type_name:
+  allowed_symbols: ['_']
   excluded:
     - ID
 
 identifier_name:
   min_length: 2
   allowed_symbols: ['_']
   excluded:
-    - c
     - id
-    - vc

Package.swift

@@ -1,22 +1,39 @@
-// swift-tools-version:5.6
+// swift-tools-version:5.7
 
 import PackageDescription
 
 let package = Package(
     name: "CodeEditKit",
+    platforms: [
+        .macOS(.v13)
+    ],
     products: [
         .library(
             name: "CodeEditKit",
             type: .dynamic,
-            targets: ["CodeEditKit"]),
+            targets: ["CodeEditKit"])
+    ],
+    dependencies: [
+        .package(url: "https://github.com/ChimeHQ/ConcurrencyPlus", branch: "main"),
+        .package(url: "https://github.com/ChimeHQ/LanguageClient", from: "0.5.0"),
+        .package(url: "https://github.com/ChimeHQ/ProcessService", from: "0.2.6"),
+        .package(
+            url: "https://github.com/lukepistrol/SwiftLintPlugin",
+            from: "0.2.2"
+        ),
+        .package(
+            url: "https://github.com/Flight-School/AnyCodable",
+            from: "0.6.0"
+        )
     ],
-    dependencies: [],
     targets: [
         .target(
             name: "CodeEditKit",
-            dependencies: []),
+            dependencies: ["AnyCodable", "ConcurrencyPlus", "LanguageClient", .product(name: "ProcessServiceClient", package: "ProcessService")],
+            plugins: [.plugin(name: "SwiftLint", package: "SwiftLintPlugin")]
+        ),
         .testTarget(
             name: "CodeEditKitTests",
-            dependencies: ["CodeEditKit"]),
+            dependencies: ["CodeEditKit"])
     ]
 )

Sources/CodeEditKit/CodableColorArray.swift

@@ -0,0 +1,39 @@
+//
+//  File.swift
+//  
+//
+//  Created by Wouter Hennen on 30/12/2022.
+//
+
+import Foundation
+import AppKit
+
+@propertyWrapper
+public struct CodableColorArray {
+    public var wrappedValue: [NSColor]
+
+    public init(wrappedValue: [NSColor]) {
+        self.wrappedValue = wrappedValue
+    }
+}
+
+extension CodableColorArray: Codable {
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.singleValueContainer()
+        let data = try container.decode(Data.self)
+
+        guard let color = try NSKeyedUnarchiver.unarchivedArrayOfObjects(ofClass: NSColor.self, from: data) else {
+            throw DecodingError.dataCorruptedError(
+                in: container,
+                debugDescription: "Invalid color"
+            )
+        }
+        wrappedValue = color
+    }
+
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.singleValueContainer()
+        let data = try NSKeyedArchiver.archivedData(withRootObject: wrappedValue, requiringSecureCoding: true)
+        try container.encode(data)
+    }
+}

Sources/CodeEditKit/CodableWrappers.swift

@@ -0,0 +1,52 @@
+//
+//  File 2.swift
+//  
+//
+//  Created by Wouter Hennen on 06/12/2022.
+//
+
+import Foundation
+
+@propertyWrapper
+public struct Encoded<T: Encodable> {
+    public var wrappedValue: T
+
+    public init(wrappedValue: T) {
+        self.wrappedValue = wrappedValue
+    }
+
+    public var errorDescription: String? {
+        do {
+            _ = try JSONEncoder().encode(wrappedValue)
+            return nil
+        } catch {
+            return error.localizedDescription
+        }
+    }
+
+    public var projectedValue: Data? {
+        try? JSONEncoder().encode(wrappedValue)
+    }
+}
+
+@propertyWrapper
+public struct Decoded<T: Decodable> {
+    public var wrappedValue: Data
+
+    public init(wrappedValue: Data) {
+        self.wrappedValue = wrappedValue
+    }
+
+    public var errorDescription: String? {
+        do {
+            _ = try JSONDecoder().decode(T.self, from: wrappedValue)
+            return nil
+        } catch {
+            return error.localizedDescription
+        }
+    }
+
+    public var projectedValue: T? {
+        try? JSONDecoder().decode(T.self, from: wrappedValue)
+    }
+}

Sources/CodeEditKit/CodeEditExtension+Body.swift

@@ -0,0 +1,41 @@
+//
+//  File.swift
+//  
+//
+//  Created by Wouter Hennen on 03/01/2023.
+//
+
+import Foundation
+import ExtensionKit
+
+struct EmptyAppExtensionScene: AppExtensionScene {
+    var body: Never {
+        fatalError()
+    }
+}
+
+public extension CodeEditExtension {
+    var body: some AppExtensionScene {
+        EmptyAppExtensionScene()
+    }
+}
+
+public extension CodeEditExtension where Self: SettingsExtension {
+    var body: some AppExtensionScene {
+        settingsScene
+    }
+}
+
+public extension CodeEditExtension where Self: SidebarExtension {
+    var body: some AppExtensionScene {
+        sidebarScenes
+    }
+}
+
+public extension CodeEditExtension where Self: SettingsExtension & SidebarExtension {
+    @AppExtensionSceneBuilder
+    var body: some AppExtensionScene {
+        settingsScene
+        sidebarScenes
+    }
+}

Sources/CodeEditKit/CodeEditExtension.swift

@@ -0,0 +1,77 @@
+//
+//  File.swift
+//  
+//
+//  Created by Wouter Hennen on 30/12/2022.
+//
+
+import ExtensionKit
+import ExtensionFoundation
+
+public protocol CodeEditExtension: AppExtension {
+
+    /// UI scenes of the extension.
+    associatedtype Body: AppExtensionScene
+
+    /// Extension Configuration.
+    associatedtype Configuration = AppExtensionSceneConfiguration
+
+    /// A brief description of the extension. Should be max a few words.
+    var description: String { get }
+
+    /// A list of Entitlements the app needs, e.g. Network Access.
+    var entitlements: [Entitlement] { get }
+
+    /// UI scenes of the extension.
+    /// Use the default implementation.
+    var body: Body { get }
+}
+
+extension CodeEditExtension {
+
+    var extensionURL: URL {
+        Bundle.main.bundleURL
+    }
+
+    func gatherAvailableExtensions() -> [ExtensionKind] {
+        var extensions: [ExtensionKind] = []
+
+        if self is any SettingsExtension {
+            extensions.append(.settings)
+        }
+
+        if let self = self as? any SidebarExtension {
+            extensions.append(contentsOf: self.availableExtensions)
+        }
+
+        return extensions
+    }
+}
+
+public extension CodeEditExtension where Self: AnyObject {
+    /// XPC Configuration for communication with CodeEdit.
+    /// Use the default implementation.
+    var configuration: AppExtensionSceneConfiguration {
+        AppExtensionSceneConfiguration(self.body, configuration: SettingsExtensionConfiguration(self))
+    }
+}
+
+struct SettingsExtensionConfiguration<E: CodeEditExtension & AnyObject>: AppExtensionConfiguration {
+    public func accept(connection: NSXPCConnection) -> Bool {
+        guard let appExtension else {
+            return false
+        }
+
+        connection.exportedInterface = .init(with: XPCWrappable.self)
+        connection.exportedObject = XPCWrapper(appExtension)
+        connection.resume()
+
+        return true
+    }
+
+    weak var appExtension: E?
+
+    public init(_ appExtension: E) {
+        self.appExtension = appExtension
+    }
+}

Sources/CodeEditKit/Debugging/Logging.swift

@@ -0,0 +1,13 @@
+//
+//  Logging.swift
+//  
+//
+//  Created by Wouter Hennen on 22/05/2023.
+//
+
+import Foundation
+
+public func print(_ items: Any..., separator: String = " ", terminator: String = "\n") {
+    let formedString = items.map { String(describing: $0) }.joined(separator: separator)
+    NSLog(formedString)
+}