Feature/project

.github/workflows/ci.yml

@@ -9,10 +9,10 @@ on:
 
 jobs:
   mac-os:
-    runs-on: macos-15
+    runs-on: macos-26
     strategy:
       matrix:
-        xcode: ["16.0"]
+        xcode: ["26.4.1"]
     steps:
       - uses: maxim-lobanov/setup-xcode@v1
         with:

.swift-format

@@ -0,0 +1,12 @@
+{
+  "indentation": {
+    "spaces": 4
+  },
+  "lineLength": 120,
+  "multilineTrailingCommaBehavior": "alwaysUsed",
+  "multiElementCollectionTrailingCommas": false,
+  "rules": {
+    "NoAccessLevelOnExtensionDeclaration": false
+  },
+  "version": 1
+}

Package.swift

@@ -17,7 +17,12 @@ let package = Package(
             name: "DataCacheKit",
             targets: ["DataCacheKit"]),
     ],
-    dependencies: [],
+    dependencies: [
+        // .package(url: "https://github.com/swiftty/swift-project-starter.git", from: "0.2.0"),
+        // AUTO GENERATED ↓: swift-project-starter: deps
+        .package(url: "https://github.com/swiftty/swift-format-plugin", from: "1.0.0")
+        // AUTO GENERATED ↑: swift-project-starter: deps
+    ],
     targets: [
         .target(
             name: "DataCacheKit",
@@ -34,3 +39,33 @@ let package = Package(
             dependencies: ["LRUCache"]),
     ]
 )
+
+// AUTO GENERATED ↓: swift-project-starter: settings
+for target in package.targets {
+    if [.executable, .test, .regular].contains(target.type) {
+        do {
+            var swiftSettings = target.swiftSettings ?? []
+            defer {
+                target.swiftSettings = swiftSettings
+            }
+            swiftSettings += [
+                .enableUpcomingFeature("InternalImportsByDefault"),
+                .enableUpcomingFeature("NonisolatedNonsendingByDefault"),
+                .enableUpcomingFeature("MemberImportVisibility"),
+                .enableUpcomingFeature("InferIsolatedConformances"),
+                .enableUpcomingFeature("ImmutableWeakCaptures"),
+                .enableUpcomingFeature("ExistentialAny")
+            ]
+        }
+        do {
+            var plugins = target.plugins ?? []
+            defer {
+                target.plugins = plugins
+            }
+            plugins += [
+                .plugin(name: "Lint", package: "swift-format-plugin")
+            ]
+        }
+    }
+}
+// AUTO GENERATED ↑: swift-project-starter: settings

Sources/DataCacheKit/Cache.swift

@@ -1,5 +1,5 @@
 import Foundation
-import OSLog
+public import OSLog
 
 public actor Cache<Key: Hashable & Sendable, Value: Codable & Sendable>: Caching {
     public struct Options: Sendable {
@@ -15,7 +15,7 @@ public actor Cache<Key: Hashable & Sendable, Value: Codable & Sendable>: Caching
     public nonisolated let options: Options
     public nonisolated let logger: Logger
 
-    public subscript (key: Key) -> Value? {
+    public subscript(key: Key) -> Value? {
         get async throws {
             try await value(for: key)
         }

Sources/DataCacheKit/Caching.swift

@@ -4,7 +4,7 @@ public protocol Caching<Key, Value>: Actor {
     associatedtype Key: Hashable & Sendable
     associatedtype Value
 
-    subscript (key: Key) -> Value? { get async throws }
+    subscript(key: Key) -> Value? { get async throws }
 
     func value(for key: Key) async throws -> Value?
 

Sources/DataCacheKit/DiskCache+Options.swift

@@ -1,4 +1,4 @@
-import Foundation
+public import Foundation
 import CommonCrypto
 
 extension DiskCache {
@@ -17,15 +17,15 @@ extension DiskCache {
             self.init(
                 sizeLimit: 150 * 1024 * 1024,
                 filename: defaultFilename(for:),
-                path: path
+                path: path,
             )
         }
 
         public init(
             sizeLimit: Int,
             filename: @escaping @Sendable (Key) -> String?,
             path: Path,
-            expirationTimeout: TimeInterval? = nil
+            expirationTimeout: TimeInterval? = nil,
         ) {
             self.sizeLimit = sizeLimit
             self.filename = filename

Sources/DataCacheKit/DiskCache.swift

@@ -3,8 +3,8 @@
 // This implementation is based on kean/Nuke's DataCache
 // https://github.com/kean/Nuke/blob/master/Sources/Core/Caching/DataCache.swift
 
-import Foundation
-import OSLog
+public import Foundation
+public import OSLog
 
 // MARK: - DiskCache
 public actor DiskCache<Key: Hashable & Sendable>: Caching, @unchecked Sendable {
@@ -14,17 +14,17 @@ public actor DiskCache<Key: Hashable & Sendable>: Caching, @unchecked Sendable {
     public nonisolated let options: Options
     public nonisolated let logger: Logger
 
-    public subscript (key: Key) -> Data? {
+    public subscript(key: Key) -> Data? {
         get async throws {
             try await value(for: key)
         }
-//        set {
-//            if let newValue {
-//                storeData(newValue, for: key)
-//            } else {
-//                removeData(for: key)
-//            }
-//        }
+        //        set {
+        //            if let newValue {
+        //                storeData(newValue, for: key)
+        //            } else {
+        //                removeData(for: key)
+        //            }
+        //        }
     }
 
     private let clock: any Clock<Duration>
@@ -42,11 +42,11 @@ public actor DiskCache<Key: Hashable & Sendable>: Caching, @unchecked Sendable {
 
     private(set) lazy var staging = Staging<Key>()
 
-    private var runningTasks: [Key: Task<Void, Error>] = [:]
+    private var runningTasks: [Key: Task<Void, any Error>] = [:]
 
-    private(set) var flushingTask: Task<Void, Error>?
+    private(set) var flushingTask: Task<Void, any Error>?
 
-    private(set) var sweepingTask: Task<Void, Error>?
+    private(set) var sweepingTask: Task<Void, any Error>?
 
     private(set) var isFlushNeeded = false
 
@@ -77,7 +77,7 @@ public actor DiskCache<Key: Hashable & Sendable>: Caching, @unchecked Sendable {
     func value(for key: Key, with now: Date) async throws -> Data? {
         await Task.yield()
 
-        let task = Task<Data?, Error> {
+        let task = Task<Data?, any Error> {
             _ = await queueingTask?.result
 
             for stage in staging.stages.reversed() {
@@ -96,7 +96,7 @@ public actor DiskCache<Key: Hashable & Sendable>: Caching, @unchecked Sendable {
 
             await waitForTask(for: key)
 
-            let task = Task<Data?, Error>.detached {
+            let task = Task<Data?, any Error>.detached {
                 do {
                     let data = try Data(contentsOf: url)
 
@@ -117,7 +117,6 @@ public actor DiskCache<Key: Hashable & Sendable>: Caching, @unchecked Sendable {
         return try await task.value
     }
 
-
     @discardableResult
     public nonisolated func store(_ value: Value, for key: Key) -> Task<Void, Never> {
         return Task {
@@ -178,7 +177,8 @@ public actor DiskCache<Key: Hashable & Sendable>: Caching, @unchecked Sendable {
         let dir: URL?
         switch options.path {
         case .default(let name):
-            dir = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first?.appendingPathComponent(name)
+            dir = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first?.appendingPathComponent(
+                name)
 
         case .custom(let url):
             dir = url
@@ -228,7 +228,7 @@ extension DiskCache {
         }
     }
 
-    private func flushIfNeeded(_ oldTask: Task<Void, Error>?) async throws {
+    private func flushIfNeeded(_ oldTask: Task<Void, any Error>?) async throws {
         guard !isFlushScheduled else { return }
         isFlushScheduled = true
         defer { isFlushScheduled = false }
@@ -292,13 +292,14 @@ extension DiskCache {
         }
     }
 
-    private func peformChange(_ change: Staging<Key>.Change, with url: URL) -> Task<Void, Error> {
+    private func peformChange(_ change: Staging<Key>.Change, with url: URL) -> Task<Void, any Error> {
         let task = Task {
             do {
                 switch change.operation {
                 case .add(let data):
                     if case let dir = url.deletingLastPathComponent(),
-                       !FileManager.default.fileExists(atPath: dir.path) {
+                        !FileManager.default.fileExists(atPath: dir.path)
+                    {
                         try FileManager.default.createDirectory(at: dir, withIntermediateDirectories: true)
                     }
 
@@ -324,7 +325,7 @@ extension DiskCache {
         return task
     }
 
-    private func performChangeRemoveAll(for changes: some Collection<Staging<Key>.Change>) -> Task<Void, Error> {
+    private func performChangeRemoveAll(for changes: some Collection<Staging<Key>.Change>) -> Task<Void, any Error> {
         let task = Task {
             do {
                 let dir = try path
@@ -376,10 +377,13 @@ extension DiskCache {
             do {
                 try FileManager.default.removeItem(at: item.url)
                 size -= item.meta.totalFileAllocatedSize ?? 0
-                logger.debug("\(self.logKey)sweeped item: \(item.url.lastPathComponent), size: \(item.meta.totalFileAllocatedSize ?? 0)")
+                logger.debug(
+                    "\(self.logKey)sweeped item: \(item.url.lastPathComponent), size: \(item.meta.totalFileAllocatedSize ?? 0)"
+                )
                 return true
             } catch {
-                logger.error("\(self.logKey)sweep item: \(item.url.lastPathComponent), error: \(String(describing: error))")
+                logger.error(
+                    "\(self.logKey)sweep item: \(item.url.lastPathComponent), error: \(String(describing: error))")
                 return false
             }
         }
@@ -500,7 +504,7 @@ struct Staging<Key: Hashable & Sendable> {
     mutating func remove(for key: Key) {
         let change = Change(key: key, id: changeID.nextID(), operation: .remove)
         if checkConflicts(on: key) {
-            stages.append(Stage(id: stageID.nextID(),changes: [key: change]))
+            stages.append(Stage(id: stageID.nextID(), changes: [key: change]))
         } else {
             stages[stages.count - 1].changes[key] = change
         }
@@ -520,7 +524,8 @@ struct Staging<Key: Hashable & Sendable> {
         stages.append(stage)
     }
 
-    mutating func flushed(id: Int, changes: [Change], with logger: Logger, logKey: @autoclosure @escaping () -> String) {
+    mutating func flushed(id: Int, changes: [Change], with logger: Logger, logKey: @autoclosure @escaping () -> String)
+    {
         guard case (let i, var stage)? = stages.enumerated().first(where: { $1.id == id }) else {
             assert(changes.isEmpty)
             return

Sources/DataCacheKit/MemoryCache+Options.swift

@@ -1,4 +1,4 @@
-import Foundation
+public import Foundation
 
 extension MemoryCache {
     public struct Options: Sendable {
@@ -17,7 +17,7 @@ extension MemoryCache {
 extension MemoryCache.Options where Value == Data {
     public init(
         countLimit: Int,
-        sizeLimit: Int
+        sizeLimit: Int,
     ) {
         self.countLimit = countLimit
         self.sizeLimit = sizeLimit

Sources/DataCacheKit/MemoryCache.swift

@@ -1,5 +1,5 @@
 import Foundation
-import OSLog
+public import OSLog
 import LRUCache
 
 public actor MemoryCache<Key: Hashable & Sendable, Value: Sendable>: Caching {
@@ -9,7 +9,7 @@ public actor MemoryCache<Key: Hashable & Sendable, Value: Sendable>: Caching {
     private let lruCache = LRUCache<Key, Value>()
     private var queueingTask: Task<Void, Never>?
 
-    public subscript (key: Key) -> Value? {
+    public subscript(key: Key) -> Value? {
         get async {
             await value(for: key)
         }

Sources/LRUCache/LRUCache.swift

@@ -52,7 +52,7 @@ public struct LRUCache<Key: Hashable & Sendable, Value: Sendable>: ~Copyable, Se
 }
 
 extension LRUCache {
-    public subscript (_ key: Key, cost cost: Int = 0) -> Value? {
+    public subscript(_ key: Key, cost cost: Int = 0) -> Value? {
         get {
             value(forKey: key)
         }

Tests/DataCacheKitTests/DiskCacheTests.swift

@@ -1,8 +1,11 @@
 import Testing
 import Foundation
 @testable import DataCacheKit
+import os
 
-func yield(until condition: @autoclosure () async -> Bool, message: @autoclosure () -> String? = nil, limit: Int = 10000) async throws {
+func yield(
+    until condition: @autoclosure () async -> Bool, message: @autoclosure () -> String? = nil, limit: Int = 10000,
+) async throws {
     var limit = limit
     while limit > 0 {
         limit -= 1