change up handler method

joshuawright11 · Jun 5, 2024 · e2d08f1 · e2d08f1
1 parent 2b610b7
commit e2d08f1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Papyrus/Sources/PapyrusMacros.swift b/Papyrus/Sources/PapyrusMacros.swift
@@ -5,7 +5,7 @@ import Foundation
 @attached(peer, names: suffixed(API))
 public macro API() = #externalMacro(module: "PapyrusPlugin", type: "APIMacro")
 
-@attached(extension, names: named(useAPI))
+@attached(extension, names: named(registerHandlers))
 @attached(peer, names: suffixed(Live), suffixed(Routes))
 public macro Routes() = #externalMacro(module: "PapyrusPlugin", type: "RoutesMacro")
 

diff --git a/PapyrusPlugin/Sources/Macros/APIMacro.swift b/PapyrusPlugin/Sources/Macros/APIMacro.swift
@@ -36,7 +36,7 @@ extension API {
 
             // 2. builder used by all live endpoint functions
 
-            Declaration("func builder(method: String, path: String) -> RequestBuilder") {
+            Declaration("func builder(method: String, path: String) -> Papyrus.RequestBuilder") {
                 if attributes.isEmpty {
                     "provider.newBuilder(method: method, path: path)"
                 } else {

diff --git a/PapyrusPlugin/Sources/Macros/RoutesMacro.swift b/PapyrusPlugin/Sources/Macros/RoutesMacro.swift
@@ -62,9 +62,9 @@ extension API {
     }
 
     func routesExtension() -> Declaration {
-        Declaration("extension \(name) where Self: PapyrusRouter") {
-            Declaration("func useAPI(_ api: (any \(name)).Type)") {
-                "\(name)Routes.register(api: self, router: self)"
+        Declaration("extension \(name)") {
+            Declaration("func registerHandlers(_ of: (any \(name)).Type = \(name).self, on router: PapyrusRouter)") {
+                "\(name)Routes.register(api: self, router: router)"
             }
         }
         .access(access)