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

Sources/SharedModels/Routes/ApiRoute.swift

@@ -36,77 +36,188 @@ public enum ApiRoute: Sendable, Equatable {
   }
 
   public enum EmployeeRoute: Sendable, Equatable {
-    case base(BaseRoute.EmployeeRoute)
+    case create(Employee.Create)
     case delete(id: Employee.ID)
+    case get(id: Employee.ID)
+    case index
+    case update(id: Employee.ID, updates: Employee.Update)
+
+    static let rootPath = "employees"
 
     public static let router = OneOf {
-      Route(.case(Self.base)) {
-        BaseRoute.EmployeeRoute.router
+      Route(.case(Self.create)) {
+        Path { rootPath }
+        Method.post
+        Body(.json(Employee.Create.self))
       }
       Route(.case(Self.delete(id:))) {
-        Path { BaseRoute.EmployeeRoute.rootPath; Employee.ID.parser() }
+        Path { rootPath; Employee.ID.parser() }
         Method.delete
       }
+      Route(.case(Self.index)) {
+        Path { rootPath }
+        Method.get
+      }
+      Route(.case(Self.get(id:))) {
+        Path { rootPath; Employee.ID.parser() }
+        Method.get
+      }
+      Route(.case(Self.update(id:updates:))) {
+        Path { rootPath; Employee.ID.parser() }
+        Method.put
+        Body(.json(Employee.Update.self))
+      }
     }
   }
 
   public enum PurchaseOrderRoute: Sendable, Equatable {
-    case base(BaseRoute.PurchaseOrderRoute)
+    case create(PurchaseOrder.Create)
     case delete(id: PurchaseOrder.ID)
+    case get(id: PurchaseOrder.ID)
+    case index
+    case page(page: Int, limit: Int)
+
+    static let rootPath = "purchase-orders"
 
     public static let router = OneOf {
-      Route(.case(Self.base)) {
-        BaseRoute.PurchaseOrderRoute.router
+      Route(.case(Self.create)) {
+        Path { rootPath }
+        Method.post
+        Body(.json(PurchaseOrder.Create.self))
       }
       Route(.case(Self.delete(id:))) {
-        Path { BaseRoute.PurchaseOrderRoute.rootPath; PurchaseOrder.ID.parser() }
+        Path { rootPath; PurchaseOrder.ID.parser() }
         Method.delete
       }
+      Route(.case(Self.get(id:))) {
+        Path { rootPath; Digits() }
+        Method.get
+      }
+      Route(.case(Self.index)) {
+        Path { rootPath }
+        Method.get
+      }
+      Route(.case(Self.page(page:limit:))) {
+        Path { rootPath; "next" }
+        Method.get
+        Query {
+          Field("page", default: 1) { Digits() }
+          Field("limit", default: 25) { Digits() }
+        }
+      }
     }
   }
 
   public enum UserRoute: Sendable, Equatable {
-    case base(BaseRoute.UserRoute)
     case delete(id: User.ID)
+    case create(User.Create)
+    case get(id: User.ID)
+    case index
+    case update(id: User.ID, updates: User.Update)
+
+    static let rootPath = "users"
 
     public static let router = OneOf {
-      Route(.case(Self.base)) {
-        BaseRoute.UserRoute.router
+      Route(.case(Self.create)) {
+        Path { rootPath }
+        Method.post
+        Body(.json(User.Create.self))
       }
       Route(.case(Self.delete(id:))) {
-        Path { BaseRoute.UserRoute.rootPath; User.ID.parser() }
+        Path { rootPath; User.ID.parser() }
         Method.delete
       }
+      Route(.case(Self.get(id:))) {
+        Path { rootPath; User.ID.parser() }
+        Method.get
+      }
+      Route(.case(Self.index)) {
+        Path { rootPath }
+        Method.get
+      }
+      Route(.case(Self.update(id:updates:))) {
+        Path { rootPath; User.ID.parser() }
+        Method.patch
+        Body(.json(User.Update.self))
+      }
     }
   }
 
   public enum VendorRoute: Sendable, Equatable {
-    case base(BaseRoute.VendorRoute)
     case delete(id: Vendor.ID)
+    case index(withBranches: Bool? = nil)
+    case create(Vendor.Create)
+    case get(id: Vendor.ID)
+    case update(id: Vendor.ID, updates: Vendor.Update)
+
+    static let rootPath = "vendors"
 
     public static let router = OneOf {
-      Route(.case(Self.base)) {
-        BaseRoute.VendorRoute.router
-      }
       Route(.case(Self.delete(id:))) {
-        Path { BaseRoute.VendorRoute.rootPath; Vendor.ID.parser() }
+        Path { rootPath; Vendor.ID.parser() }
         Method.delete
       }
+      Route(.case(Self.create)) {
+        Path { rootPath }
+        Method.post
+        Body(.json(Vendor.Create.self))
+      }
+      Route(.case(Self.get(id:))) {
+        Path { rootPath; Vendor.ID.parser() }
+        Method.get
+      }
+      Route(.case(Self.index(withBranches:))) {
+        Path { rootPath }
+        Method.get
+        Query {
+          Optionally {
+            Field("branches", default: nil) {
+              Bool.parser()
+            }
+          }
+        }
+      }
+      Route(.case(Self.update(id:updates:))) {
+        Path { rootPath; Vendor.ID.parser() }
+        Method.put
+        Body(.json(Vendor.Update.self))
+      }
     }
   }
 
   public enum VendorBranchRoute: Sendable, Equatable {
-    case base(BaseRoute.VendorBranchRoute)
     case delete(id: VendorBranch.ID)
+    case create(VendorBranch.Create)
+    case get(id: VendorBranch.ID)
+    case index(for: Vendor.ID? = nil)
+    case update(id: VendorBranch.ID, updates: VendorBranch.Update)
 
     public static let router = OneOf {
-      Route(.case(Self.base)) {
-        BaseRoute.VendorBranchRoute.router
+      Route(.case(Self.create)) {
+        Path { "vendors"; "branches" }
+        Method.post
+        Body(.json(VendorBranch.Create.self))
       }
       Route(.case(Self.delete(id:))) {
         Path { "vendors"; "branches"; VendorBranch.ID.parser() }
         Method.delete
       }
+      Route(.case(Self.get(id:))) {
+        Path { "vendors"; "branches"; VendorBranch.ID.parser() }
+        Method.get
+      }
+      Route(.case(Self.index(for:))) {
+        Path { "vendors"; "branches" }
+        Method.get
+        Query {
+          Optionally { Field("vendorID", default: nil) { VendorBranch.ID.parser() } }
+        }
+      }
+      Route(.case(Self.update(id:updates:))) {
+        Path { "vendors"; "branches"; VendorBranch.ID.parser() }
+        Method.put
+        Body(.json(VendorBranch.Update.self))
+      }
     }
   }
 }

Sources/SharedModels/Routes/BaseRoutes.swift

@@ -1,267 +0,0 @@
-import CasePaths
-import Foundation
-@preconcurrency import URLRouting
-
-public enum BaseRoute {}
-
-public extension BaseRoute {
-  enum EmployeeRoute: Sendable, Equatable {
-    case create(Employee.Create)
-    case get(id: Employee.ID)
-    case index
-    case update(id: Employee.ID, updates: Employee.Update)
-
-    static let rootPath = "employees"
-
-    public static let router = OneOf {
-      Route(.case(Self.create)) {
-        Path { rootPath }
-        Method.post
-        OneOf {
-          Body(.json(Employee.Create.self))
-          Body {
-            FormData {
-              Field("firstName", .string)
-              Field("lastName", .string)
-              Optionally { Field("active") { Bool.parser() } }
-            }
-            .map(.memberwise(Employee.Create.init))
-          }
-        }
-      }
-      Route(.case(Self.index)) {
-        Path { rootPath }
-        Method.get
-      }
-      Route(.case(Self.get(id:))) {
-        Path { rootPath; Employee.ID.parser() }
-        Method.get
-      }
-      Route(.case(Self.update(id:updates:))) {
-        Path { rootPath; Employee.ID.parser() }
-        Method.put
-        OneOf {
-          Body(.json(Employee.Update.self))
-          Body {
-            FormData {
-              Optionally { Field("firstName") { CharacterSet.alphanumerics.map(.string) } }
-              Optionally { Field("lastName") { CharacterSet.alphanumerics.map(.string) } }
-              Optionally { Field("active") { Bool.parser() } }
-            }
-            .map(.memberwise(Employee.Update.init))
-          }
-        }
-      }
-    }
-  }
-}
-
-public extension BaseRoute {
-  enum PurchaseOrderRoute: Sendable, Equatable {
-    case create(PurchaseOrder.Create)
-    case get(id: PurchaseOrder.ID)
-    case index
-    case page(page: Int, limit: Int)
-
-    static let rootPath = "purchase-orders"
-
-    public static let router = OneOf {
-      Route(.case(Self.create)) {
-        Path { rootPath }
-        Method.post
-        OneOf {
-          Body(.json(PurchaseOrder.Create.self))
-          Body {
-            FormData {
-              Optionally { Field("id") { PurchaseOrder.ID.parser() } }
-              Optionally { Field("workOrder") { Int.parser() } }
-              Field("materials", .string)
-              Field("customer", .string)
-              Optionally { Field("truckStock") { Bool.parser() } }
-              Field("createdByID") { User.ID.parser() }
-              Field("createdForID") { Employee.ID.parser() }
-              Field("vendorBranchID") { VendorBranch.ID.parser() }
-            }
-            .map(.memberwise(PurchaseOrder.Create.init))
-          }
-        }
-      }
-      Route(.case(Self.get(id:))) {
-        Path { rootPath; Digits() }
-        Method.get
-      }
-      Route(.case(Self.index)) {
-        Path { rootPath }
-        Method.get
-      }
-      Route(.case(Self.page(page:limit:))) {
-        Path { rootPath; "next" }
-        Method.get
-        Query {
-          Field("page", default: 1) { Digits() }
-          Field("limit", default: 25) { Digits() }
-        }
-      }
-    }
-  }
-}
-
-public extension BaseRoute {
-  enum UserRoute: Sendable, Equatable {
-    case create(User.Create)
-    case get(id: User.ID)
-    case index
-    case update(id: User.ID, updates: User.Update)
-
-    static let rootPath = "users"
-
-    public static let router = OneOf {
-      Route(.case(Self.create)) {
-        Path { rootPath }
-        Method.post
-        OneOf {
-          Body(.json(User.Create.self))
-          Body {
-            FormData {
-              Field("username", .string)
-              Field("email", .string)
-              Field("password", .string)
-              Field("confirmPassword", .string)
-            }
-            .map(.memberwise(User.Create.init))
-          }
-        }
-      }
-      Route(.case(Self.get(id:))) {
-        Path { rootPath; User.ID.parser() }
-        Method.get
-      }
-      Route(.case(Self.index)) {
-        Path { rootPath }
-        Method.get
-      }
-      Route(.case(Self.update(id:updates:))) {
-        Path { rootPath; User.ID.parser() }
-        Method.patch
-        OneOf {
-          Body(.json(User.Update.self))
-          Body {
-            FormData {
-              Optionally { Field("username") {
-                CharacterSet.alphanumerics.map(.string)
-              }
-              }
-              Optionally { Field("email", .string) }
-            }
-            .map(.memberwise(User.Update.init))
-          }
-        }
-      }
-    }
-  }
-}
-
-public extension BaseRoute {
-  enum VendorRoute: Sendable, Equatable {
-    case index(withBranches: Bool? = nil)
-    case create(Vendor.Create)
-    case get(id: Vendor.ID)
-    case update(id: Vendor.ID, updates: Vendor.Update)
-
-    static let rootPath = "vendors"
-
-    public static let router = OneOf {
-      Route(.case(Self.create)) {
-        Path { rootPath }
-        Method.post
-        OneOf {
-          Body(.json(Vendor.Create.self))
-          Body {
-            FormData {
-              Field("name", .string)
-            }
-            .map(.memberwise(Vendor.Create.init))
-          }
-        }
-      }
-      Route(.case(Self.get(id:))) {
-        Path { rootPath; Vendor.ID.parser() }
-        Method.get
-      }
-      Route(.case(Self.index(withBranches:))) {
-        Path { rootPath }
-        Method.get
-        Query {
-          Optionally {
-            Field("branches", default: nil) {
-              Bool.parser()
-            }
-          }
-        }
-      }
-      Route(.case(Self.update(id:updates:))) {
-        Path { rootPath; Vendor.ID.parser() }
-        Method.put
-        OneOf {
-          Body(.json(Vendor.Update.self))
-          Body {
-            FormData {
-              Field("name", .string)
-            }
-            .map(.memberwise(Vendor.Update.init))
-          }
-        }
-      }
-    }
-  }
-}
-
-public extension BaseRoute {
-  enum VendorBranchRoute: Sendable, Equatable {
-    case create(VendorBranch.Create)
-    case get(id: VendorBranch.ID)
-    case index(for: Vendor.ID? = nil)
-    case update(id: VendorBranch.ID, updates: VendorBranch.Update)
-
-    public static let router = OneOf {
-      Route(.case(Self.create)) {
-        Path { "vendors"; "branches" }
-        Method.post
-        OneOf {
-          Body(.json(VendorBranch.Create.self))
-          Body {
-            FormData {
-              Field("name", .string)
-              Field("vendorID") { Vendor.ID.parser() }
-            }
-            .map(.memberwise(VendorBranch.Create.init))
-          }
-        }
-      }
-      Route(.case(Self.get(id:))) {
-        Path { "vendors"; "branches"; VendorBranch.ID.parser() }
-        Method.get
-      }
-      Route(.case(Self.index(for:))) {
-        Path { "vendors"; "branches" }
-        Method.get
-        Query {
-          Optionally { Field("vendorID", default: nil) { VendorBranch.ID.parser() } }
-        }
-      }
-      Route(.case(Self.update(id:updates:))) {
-        Path { "vendors"; "branches"; VendorBranch.ID.parser() }
-        Method.put
-        OneOf {
-          Body(.json(VendorBranch.Update.self))
-          Body {
-            FormData {
-              Field("name", .string)
-            }
-            .map(.memberwise(VendorBranch.Update.init))
-          }
-        }
-      }
-    }
-  }
-}