Rename Trie

Author: joshuawright11

Sources/Alchemy/Routing/Router.swift

@@ -51,7 +51,7 @@ public final class Router: HTTPRouter, Service {
     var pathPrefixes: [String] = []
 
     /// A trie that holds all the handlers.
-    private let trie = RouterTrieNode<HTTPMethod, HTTPHandler>()
+    private let trie = Trie<HTTPMethod, HTTPHandler>()
 
     /// Creates a new router.
     init() {}

Sources/Alchemy/Routing/RouterTrieNode.swift renamed to Sources/Alchemy/Routing/Trie.swift

@@ -1,12 +1,12 @@
 /// A trie that stores objects at each node. Supports wildcard path
 /// elements denoted by a ":" at the beginning.
-final class RouterTrieNode<StorageKey: Hashable, StorageObject> {
+final class Trie<Key: Hashable, Value> {
     /// Storage of the objects at this node.
-    private var storage: [StorageKey: StorageObject] = [:]
+    private var storage: [Key: Value] = [:]
     /// This node's children, mapped by their path for instant lookup.
-    private var children: [String: RouterTrieNode] = [:]
+    private var children: [String: Trie] = [:]
     /// Any children with wildcards in their path.
-    private var wildcardChildren: [String: RouterTrieNode] = [:]
+    private var wildcardChildren: [String: Trie] = [:]
 
     /// Search this node & it's children for an object at a path,
     /// stored with the given key.
@@ -18,24 +18,24 @@ final class RouterTrieNode<StorageKey: Hashable, StorageObject> {
     /// - Returns: A tuple containing the object and any parsed path
     ///   parameters. `nil` if the object isn't in this node or its
     ///   children.
-    func search(path: [String], storageKey: StorageKey) -> (value: StorageObject, parameters: [PathParameter])? {
+    func search(path: [String], storageKey: Key) -> (value: Value, parameters: [PathParameter])? {
         if let first = path.first {
             let newPath = Array(path.dropFirst())
-            if let matchingChild = self.children[first] {
+            if let matchingChild = children[first] {
                 return matchingChild.search(path: newPath, storageKey: storageKey)
             } else {
-                for (wildcard, node) in self.wildcardChildren {
+                for (wildcard, node) in wildcardChildren {
                     guard var val = node.search(path: newPath, storageKey: storageKey) else {
                         continue
                     }
 
-                    val.1.insert(PathParameter(parameter: wildcard, stringValue: first), at: 0)
+                    val.parameters.insert(PathParameter(parameter: wildcard, stringValue: first), at: 0)
                     return val
                 }
                 return nil
             }
         } else {
-            return self.storage[storageKey].map { ($0, []) }
+            return storage[storageKey].map { ($0, []) }
         }
     }
 
@@ -46,20 +46,20 @@ final class RouterTrieNode<StorageKey: Hashable, StorageObject> {
     ///     stored.
     ///   - storageKey: The key by which to store the value.
     ///   - value: The value to store.
-    func insert(path: [String], storageKey: StorageKey, value: StorageObject) {
+    func insert(path: [String], storageKey: Key, value: Value) {
         if let first = path.first {
             if first.hasPrefix(":") {
                 let firstWithoutEscape = String(first.dropFirst())
-                let child = self.wildcardChildren[firstWithoutEscape] ?? Self()
+                let child = wildcardChildren[firstWithoutEscape] ?? Self()
                 child.insert(path: Array(path.dropFirst()), storageKey: storageKey, value: value)
-                self.wildcardChildren[firstWithoutEscape] = child
+                wildcardChildren[firstWithoutEscape] = child
             } else {
-                let child = self.children[first] ?? Self()
+                let child = children[first] ?? Self()
                 child.insert(path: Array(path.dropFirst()), storageKey: storageKey, value: value)
-                self.children[first] = child
+                children[first] = child
             }
         } else {
-            self.storage[storageKey] = value
+            storage[storageKey] = value
         }
     }
 }

Tests/AlchemyTests/Routing/TrieTests.swift

@@ -3,7 +3,7 @@ import XCTest
 
 final class TrieTests: XCTestCase {
     func testTrie() {
-        let trie = RouterTrieNode<Int, String>()
+        let trie = Trie<Int, String>()
 
         trie.insert(path: ["one"], storageKey: 0, value: "foo")
         trie.insert(path: ["one", "two"], storageKey: 1, value: "bar")