feat: Removes base routes and goes back to separated routes.

Tests/ApiRouteTests/EmployeeApiRouteTests.swift

@@ -24,7 +24,7 @@ struct EmployeeApiRouteTests {
     )
     let route = try router.parse(&request)
     #expect(
-      route == .employee(.base(.create(.init(firstName: "Blob", lastName: "Esquire", active: true))))
+      route == .employee(.create(.init(firstName: "Blob", lastName: "Esquire", active: true)))
     )
   }
 
@@ -50,7 +50,7 @@ struct EmployeeApiRouteTests {
     )
     let route = try router.parse(&request)
     #expect(
-      route == .employee(.base(.get(id: id)))
+      route == .employee(.get(id: id))
     )
   }
 
@@ -62,7 +62,7 @@ struct EmployeeApiRouteTests {
     )
     let route = try router.parse(&request)
     #expect(
-      route == .employee(.base(.index))
+      route == .employee(.index)
       // route == .employee(\.index)
     )
   }
@@ -84,10 +84,10 @@ struct EmployeeApiRouteTests {
     )
     let route = try router.parse(&request)
     #expect(
-      route == .employee(.base(.update(
+      route == .employee(.update(
         id: id,
         updates: .init(firstName: "Blob", lastName: "Esquire", active: true)
-      )))
+      ))
     )
   }
 

Tests/ApiRouteTests/PurchaseOrderApiRouteTests.swift

@@ -29,7 +29,7 @@ struct PurchaseOrderApiRouteTests {
       body: .init(json.utf8)
     )
     let route = try router.parse(&request)
-    #expect(route == .purchaseOrder(.base(.create(.init(
+    #expect(route == .purchaseOrder(.create(.init(
       id: 1,
       workOrder: 12345,
       materials: "some",
@@ -38,7 +38,7 @@ struct PurchaseOrderApiRouteTests {
       createdByID: id,
       createdForID: id,
       vendorBranchID: id
-    )))))
+    ))))
   }
 
   @Test
@@ -60,7 +60,7 @@ struct PurchaseOrderApiRouteTests {
       path: "/api/v1/purchase-orders/\(id)"
     )
     let route = try router.parse(&request)
-    #expect(route == .purchaseOrder(.base(.get(id: id))))
+    #expect(route == .purchaseOrder(.get(id: id)))
   }
 
   @Test
@@ -70,7 +70,7 @@ struct PurchaseOrderApiRouteTests {
       path: "/api/v1/purchase-orders"
     )
     let route = try router.parse(&request)
-    #expect(route == .purchaseOrder(.base(.index)))
+    #expect(route == .purchaseOrder(.index))
   }
 
   @Test
@@ -80,7 +80,7 @@ struct PurchaseOrderApiRouteTests {
       path: "/api/v1/purchase-orders/next"
     )
     let route = try router.parse(&request)
-    #expect(route == .purchaseOrder(.base(.page(page: 1, limit: 25))))
+    #expect(route == .purchaseOrder(.page(page: 1, limit: 25)))
 
     var request2 = URLRequestData(
       method: "GET",
@@ -88,6 +88,6 @@ struct PurchaseOrderApiRouteTests {
       query: ["page": ["2"], "limit": ["50"]]
     )
     let route2 = try router.parse(&request2)
-    #expect(route2 == .purchaseOrder(.base(.page(page: 2, limit: 50))))
+    #expect(route2 == .purchaseOrder(.page(page: 2, limit: 50)))
   }
 }

Tests/ApiRouteTests/UserApiRouteTests.swift

@@ -25,12 +25,12 @@ struct UserApiRouteTests {
     )
     let route = try router.parse(&request)
     #expect(
-      route == .user(.base(.create(.init(
+      route == .user(.create(.init(
         username: "foo",
         email: "foo@bar.com",
         password: "super-secret",
         confirmPassword: "super-secret"
-      )))))
+      ))))
   }
 
   @Test
@@ -52,7 +52,7 @@ struct UserApiRouteTests {
       path: "/api/v1/users/\(id)"
     )
     let route = try router.parse(&request)
-    #expect(route == .user(.base(.get(id: id))))
+    #expect(route == .user(.get(id: id)))
   }
 
   @Test
@@ -62,7 +62,7 @@ struct UserApiRouteTests {
       path: "/api/v1/users"
     )
     let route = try router.parse(&request)
-    #expect(route == .user(.base(.index)))
+    #expect(route == .user(.index))
   }
 
   @Test
@@ -80,6 +80,6 @@ struct UserApiRouteTests {
       body: .init(json.utf8)
     )
     let route = try router.parse(&request)
-    #expect(route == .user(.base(.update(id: id, updates: .init(username: "bar", email: "bar@foo.com")))))
+    #expect(route == .user(.update(id: id, updates: .init(username: "bar", email: "bar@foo.com"))))
   }
 }

Tests/ApiRouteTests/VendorApiRouteTests.swift

@@ -21,7 +21,7 @@ struct VendorApiRouteTests {
       body: .init(json.utf8)
     )
     let route = try router.parse(&request)
-    #expect(route == .vendor(.base(.create(.init(name: "Test")))))
+    #expect(route == .vendor(.create(.init(name: "Test"))))
   }
 
   @Test
@@ -43,7 +43,7 @@ struct VendorApiRouteTests {
       path: "/api/v1/vendors/\(id)"
     )
     let route = try router.parse(&request)
-    #expect(route == .vendor(.base(.get(id: id))))
+    #expect(route == .vendor(.get(id: id)))
   }
 
   @Test
@@ -53,7 +53,7 @@ struct VendorApiRouteTests {
       path: "/api/v1/vendors"
     )
     let route = try router.parse(&request)
-    #expect(route == .vendor(.base(.index())))
+    #expect(route == .vendor(.index()))
 
     var request2 = URLRequestData(
       method: "GET",
@@ -61,7 +61,7 @@ struct VendorApiRouteTests {
       query: ["branches": ["true"]]
     )
     let route2 = try router.parse(&request2)
-    #expect(route2 == .vendor(.base(.index(withBranches: true))))
+    #expect(route2 == .vendor(.index(withBranches: true)))
   }
 
   @Test
@@ -78,6 +78,6 @@ struct VendorApiRouteTests {
       body: .init(json.utf8)
     )
     let route = try router.parse(&request)
-    #expect(route == .vendor(.base(.update(id: id, updates: .init(name: "Test")))))
+    #expect(route == .vendor(.update(id: id, updates: .init(name: "Test"))))
   }
 }

Tests/ApiRouteTests/VendorBranchApiRouteTests.swift

@@ -23,7 +23,7 @@ struct VendorBranchApiRouteTests {
       body: .init(json.utf8)
     )
     let route = try router.parse(&request)
-    #expect(route == .vendorBranch(.base(.create(.init(name: "Test", vendorID: id)))))
+    #expect(route == .vendorBranch(.create(.init(name: "Test", vendorID: id))))
   }
 
   @Test
@@ -45,7 +45,7 @@ struct VendorBranchApiRouteTests {
       path: "/api/v1/vendors/branches/\(id)"
     )
     let route = try router.parse(&request)
-    #expect(route == .vendorBranch(.base(.get(id: id))))
+    #expect(route == .vendorBranch(.get(id: id)))
   }
 
   @Test
@@ -56,7 +56,7 @@ struct VendorBranchApiRouteTests {
       path: "/api/v1/vendors/branches"
     )
     let route = try router.parse(&request)
-    #expect(route == .vendorBranch(.base(.index())))
+    #expect(route == .vendorBranch(.index()))
 
     var request2 = URLRequestData(
       method: "GET",
@@ -64,7 +64,7 @@ struct VendorBranchApiRouteTests {
       query: ["vendorID": ["\(id)"]]
     )
     let route2 = try router.parse(&request2)
-    #expect(route2 == .vendorBranch(.base(.index(for: id))))
+    #expect(route2 == .vendorBranch(.index(for: id)))
   }
 
   @Test
@@ -81,7 +81,7 @@ struct VendorBranchApiRouteTests {
       body: .init(json.utf8)
     )
     let route = try router.parse(&request)
-    #expect(route == .vendorBranch(.base(.update(id: id, updates: .init(name: "Test")))))
+    #expect(route == .vendorBranch(.update(id: id, updates: .init(name: "Test"))))
   }
 
 }