LeafKit 1.0.0.tau (#178)

Leaf 4.0.0-tau

tau is the final prerelease of LeafKit 1.0 and Leaf4.

This is a massive rebuild from the previous prerelease version and entirely replaces the architecture for extending the language; as such, there is no direct transition path for converting LeafTag objects to the new architecture directly.

Migration documents are coming soon to address how that functionality has improved and changed.

Package.swift

@@ -10,7 +10,7 @@ let package = Package(
         .library(name: "Leaf", targets: ["Leaf"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/leaf-kit.git", from: "1.0.0-rc.1.16"),
+        .package(name: "leaf-kit", url: "https://github.com/vapor/leaf-kit", from: "1.0.0-tau.1"),
         .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0"),
     ],
     targets: [
@@ -21,6 +21,7 @@ let package = Package(
         .testTarget(name: "LeafTests", dependencies: [
             .target(name: "Leaf"),
             .product(name: "XCTVapor", package: "vapor"),
+            .product(name: "XCTLeafKit", package: "leaf-kit")
         ]),
     ]
 )

Sources/Leaf/Helpers.swift

@@ -0,0 +1,24 @@
+import Vapor
+
+internal typealias ELF = EventLoopFuture
+internal typealias LFMIndexing = LeafFileMiddleware.DirectoryIndexing
+internal typealias Record = (process: Bool, modTime: Date)
+
+internal extension Request {
+    var eL: EventLoop { eventLoop }
+    func fail<T>(_ error: Error) -> ELF<T> { eL.makeFailedFuture(error) }
+    func succeed<T>(_ value: T) -> ELF<T> { eL.makeSucceededFuture(value) }
+}
+
+internal extension LeafEngine {
+    var eL: EventLoop { eventLoop }
+    func fail<T>(_ error: Error) -> ELF<T> { eL.makeFailedFuture(error) }
+    func succeed<T>(_ value: T) -> ELF<T> { eL.makeSucceededFuture(value) }
+}
+
+internal extension String {
+    var fileExt: String {
+        if let i = lastIndex(of: ".") { return String(self[index(after: i)..<endIndex]) }
+        return ""
+    }
+}

Sources/Leaf/LeafDataRepresentable/Foundation.swift

@@ -0,0 +1,26 @@
+import Foundation
+import Vapor
+
+extension URL {
+    var _leafData: LeafData {
+        var values = (try? resourceValues(forKeys: .init(LFMIndexing.keys)))?._leafData ?? [:]
+        values["name"] = lastPathComponent
+        values["absolutePath"] = absoluteString
+        values["pathComponents"] = pathComponents
+        values["mimeType"] = HTTPMediaType.fileExtension(pathExtension) ?? .plainText
+        return .dictionary(values)
+    }
+}
+
+extension URLResourceValues {
+    var _leafData: [String: LeafDataRepresentable] {[
+        "isApplication": isApplication,
+        "isDirectory": isDirectory,
+        "isRegularFile": isRegularFile,
+        "isHidden": isHidden,
+        "isSymbolicLink": isSymbolicLink,
+        "fileSize": fileSize,
+        "creationDate": creationDate, // returns nil on Ubuntu xenial
+        "contentModificationDate": contentModificationDate,
+    ]}
+}

Sources/Leaf/LeafDataRepresentable/Vapor.swift

@@ -0,0 +1,11 @@
+import Vapor
+
+extension HTTPMediaType: LeafDataRepresentable {
+    public static var leafDataType: LeafDataType? { .dictionary }
+    public var leafData: LeafData { .dictionary([
+        "type": type,
+        "subType": subType,
+        "parameters": parameters,
+        "serialized": serialize(),
+    ]) }
+}