Update errors and more tests

Author: ptoffy

.swift-version

@@ -0,0 +1 @@
+6.1.0

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:6.0
+// swift-tools-version:6.1
 import PackageDescription
 
 let package = Package(

Sources/LeafKit/Character+Identities.swift

@@ -1,3 +1,4 @@
+// swift-format-ignore
 /// Various helper identities for convenience
 extension Character {
 
@@ -6,7 +7,7 @@ extension Character {
     var isValidInTagName: Bool {
         self.isLowercaseLetter || self.isUppercaseLetter
     }
-    
+
     var isValidInParameter: Bool {
         self.isValidInTagName ||
         self.isValidOperator ||
@@ -45,9 +46,9 @@ extension Character {
             false
         }
     }
-    
+
     // MARK: - General group-membership identities (Internal)
-    
+
     var isHexadecimal: Bool {
         (.zero ... .nine).contains(self) ||
         (.A ... .F).contains(self) ||
@@ -70,7 +71,7 @@ extension Character {
     var isLowercaseLetter: Bool {
         (.a ... .z).contains(self)
     }
-    
+
     // MARK: - General helpers
 
     static let newLine: Self = "\n"

Sources/LeafKit/LeafAST.swift

@@ -3,7 +3,7 @@ import NIOCore
 /// `LeafAST` represents a "compiled," grammatically valid Leaf template (which may or may not be fully resolvable or erroring)
 public struct LeafAST: Hashable, Sendable {
     // MARK: - Public
-    
+
     public func hash(into hasher: inout Hasher) {
         hasher.combine(self.name)
     }
@@ -23,7 +23,7 @@ public struct LeafAST: Hashable, Sendable {
 
         self.updateRefs([:])
     }
-    
+
     init(from: LeafAST, referencing externals: [String: LeafAST]) {
         self.name = from.name
         self.ast = from.ast
@@ -39,9 +39,9 @@ public struct LeafAST: Hashable, Sendable {
     private(set) var externalRefs = Set<String>()
     private(set) var unresolvedRefs = Set<String>()
     private(set) var flat: Bool
-    
+
     // MARK: - Private Only
-    
+
     private var rawAST: [Syntax]?
 
     mutating private func updateRefs(_ externals: [String: LeafAST]) {
@@ -69,7 +69,7 @@ public struct LeafAST: Hashable, Sendable {
                 pos = self.ast.index(after: pos)
                 continue
             }
-            
+
             // replace the original Syntax with the results of inlining, potentially 1...n
             let replacementSyntax = self.ast[pos].inlineRefs(providedExts, [:])
             self.ast.replaceSubrange(pos...pos, with: replacementSyntax)

Sources/LeafKit/LeafCache/DefaultLeafCache.swift

@@ -20,7 +20,6 @@ public actor DefaultLeafCache: LeafCache {
 
     /// - Parameters:
     ///   - document: The `LeafAST` to store
-    ///   - loop: `EventLoop` to return futures on
     ///   - replace: If a document with the same name is already cached, whether to replace or not.
     /// - Returns: The document provided as an identity return
     public func insert(_ document: LeafAST, replace: Bool = false) async throws -> LeafAST {
@@ -32,7 +31,7 @@ public actor DefaultLeafCache: LeafCache {
         // return an error if replace is false and the document name is already in cache
         switch (self.cache.keys.contains(document.name), replace) {
         case (true, false):
-            throw LeafError(.keyExists(document.name))
+            throw LeafError.keyExists(document.name)
         default:
             self.cache[document.name] = document
         }
@@ -41,8 +40,7 @@ public actor DefaultLeafCache: LeafCache {
 
     /// - Parameters:
     ///   - documentName: Name of the `LeafAST`  to try to return
-    ///   - loop: `EventLoop` to return futures on
-    /// - Returns: `EventLoopFuture<LeafAST?>` holding the `LeafAST` or nil if no matching result
+    /// - Returns: ``LeafAST` or nil if no matching result
     public func retrieve(documentName: String) async throws -> LeafAST? {
         guard self.isEnabled else {
             return nil
@@ -52,12 +50,11 @@ public actor DefaultLeafCache: LeafCache {
 
     /// - Parameters:
     ///   - documentName: Name of the `LeafAST`  to try to purge from the cache
-    ///   - loop: `EventLoop` to return futures on
-    /// - Returns: `EventLoopFuture<Bool?>` - If no document exists, returns nil. If removed,
+    /// - Returns: If no document exists, returns nil. If removed,
     ///     returns true. If cache can't remove because of dependencies (not yet possible), returns false.
     public func remove(_ documentName: String) async throws -> Bool? {
         guard self.isEnabled else {
-            throw LeafError(.cachingDisabled)
+            throw LeafError.cachingDisabled()
         }
 
         guard self.cache[documentName] != nil else {
@@ -73,10 +70,10 @@ public actor DefaultLeafCache: LeafCache {
     /// Blocking file load behavior
     func retrieve(documentName: String) throws -> LeafAST? {
         guard self.isEnabled else {
-            throw LeafError(.cachingDisabled)
+            throw LeafError.cachingDisabled()
         }
         guard let result = self.cache[documentName] else {
-            throw LeafError(.noValueForKey(documentName))
+            throw LeafError.noValueForKey(documentName)
         }
         return result
     }

Sources/LeafKit/LeafCache/LeafCache.swift

@@ -5,7 +5,7 @@ import NIOCore
 /// The stored `LeafAST`s may or may not be fully renderable templates, and generally speaking no
 /// attempts should be made inside a `LeafCache` adherent to make any changes to the stored document.
 ///
-/// All definied access methods to a `LeafCache` adherent must guarantee `EventLoopFuture`-based
+/// All definied access methods to a `LeafCache` adherent must guarantee async-await-based
 /// return values. For performance, an adherent may optionally provide additional, corresponding interfaces
 /// where returns are direct values and not future-based by adhering to `SynchronousLeafCache` and
 /// providing applicable option flags indicating which methods may be used. This should only used for