refactor: use direct status codes instead of @Mocket namespace

oboard · oboard · commit cf89a88731a5 · 2025-11-25T21:12:22.000+08:00
Replace @mocket.OK and @mocket.NotFound with direct status code references (OK, NotFound) for cleaner code and better readability
diff --git a/src/cors/cors.mbt b/src/cors/cors.mbt
@@ -66,7 +66,7 @@ pub fn handle_cors(
       max_age~,
     )
     // 对于预检请求，直接返回空响应，不调用next()
-    @mocket.HttpResponse::new(@mocket.OK).to_responder()
+    @mocket.HttpResponse::new(OK).to_responder()
   } else {
     append_cors_headers(
       event,
diff --git a/src/examples/responder/pkg.generated.mbti b/src/examples/responder/pkg.generated.mbti
@@ -1,13 +1,18 @@
 // Generated using `moon info`, DON'T EDIT IT
 package "oboard/mocket/examples/responder"
 
+import(
+  "moonbitlang/core/json"
+)
+
 // Values
 
 // Errors
 
 // Types and methods
 type Person
 impl ToJson for Person
+impl @json.FromJson for Person
 
 // Type aliases
 
diff --git a/src/examples/route/main.mbt b/src/examples/route/main.mbt
@@ -57,7 +57,7 @@ fn main {
   ..post("/echo", e => e.req)
 
   // 404 Page
-  ..get("/404", _ => @mocket.HttpResponse::new(@mocket.NotFound).body(
+  ..get("/404", _ => @mocket.HttpResponse::new(NotFound).body(
     @mocket.html(
       (
         #|<html>
diff --git a/src/pkg.generated.mbti b/src/pkg.generated.mbti
@@ -96,15 +96,15 @@ fn HttpRequestInternal::on_complete(Self, FuncRef[() -> Unit]) -> Unit
 fn HttpRequestInternal::on_headers(Self, FuncRef[(@native.CStr) -> Unit]) -> Unit
 
 pub(all) struct HttpResponse {
-  mut status_code : &StatusCoder
+  mut status_code : StatusCode
   headers : Map[StringView, StringView]
   cookies : Map[String, CookieItem]
   mut raw_body : Bytes
 }
 fn HttpResponse::body(Self, &Responder) -> Self
 fn HttpResponse::delete_cookie(Self, String) -> Unit
-fn HttpResponse::json(Self, Json) -> Self
-fn HttpResponse::new(&StatusCoder, headers? : Map[StringView, StringView], cookies? : Map[String, CookieItem], raw_body? : Bytes) -> Self
+fn HttpResponse::json(Self, &ToJson) -> Self
+fn HttpResponse::new(StatusCode, headers? : Map[StringView, StringView], cookies? : Map[String, CookieItem], raw_body? : Bytes) -> Self
 fn HttpResponse::set_cookie(Self, String, String, max_age? : Int, path? : String, domain? : String, secure? : Bool, http_only? : Bool, same_site? : SameSiteOption) -> Unit
 fn HttpResponse::to_responder(Self) -> &Responder
 impl Responder for HttpResponse
@@ -239,10 +239,12 @@ pub(all) enum StatusCode {
   LoopDetected
   NotExtended
   NetworkAuthenticationRequired
+  Custom(Int)
 }
+fn StatusCode::from_int(Int) -> Self
+fn StatusCode::to_int(Self) -> Int
 impl Show for StatusCode
 impl ToJson for StatusCode
-impl StatusCoder for StatusCode
 
 pub enum WebSocketAggregatedMessage {
   Text(String)
@@ -304,8 +306,3 @@ pub(open) trait ServeStaticProvider {
   get_fallthrough(Self) -> Bool
 }
 
-pub trait StatusCoder {
-  to_int(Self) -> Int
-}
-impl StatusCoder for Int
-
diff --git a/src/request.mbt b/src/request.mbt
@@ -8,7 +8,7 @@ pub(all) struct HttpRequest {
 
 ///|
 pub(open) trait BodyReader {
-  from_request(req: HttpRequest) -> Self raise
+  from_request(req : HttpRequest) -> Self raise
 }
 
 ///|
diff --git a/src/static_file/static_file.mbt b/src/static_file/static_file.mbt
@@ -26,10 +26,10 @@ pub impl ServeStaticProvider for StaticFileProvider with get_contents(
   self,
   id : String,
 ) -> &Responder {
-  let res : &Responder = @mocket.HttpResponse::new(@mocket.OK).body(
+  let res : &Responder = @mocket.HttpResponse::new(OK).body(
     @fs.read_file_to_bytes(self.path + "/" + id),
   ) catch {
-    _ => @mocket.HttpResponse::new(@mocket.NotFound).body("Not Found")
+    _ => @mocket.HttpResponse::new(NotFound).body("Not Found")
   }
   res
 }
diff --git a/src/status_code.mbt b/src/status_code.mbt
@@ -129,12 +129,13 @@ pub(all) enum StatusCode {
   Custom(Int)
 } derive(Show, ToJson)
 
+///|
 pub fn StatusCode::from_int(i : Int) -> StatusCode {
   Custom(i)
 }
 
 ///|
-pub fn StatusCode::to_int(self: StatusCode) -> Int {
+pub fn StatusCode::to_int(self : StatusCode) -> Int {
   match self {
     Continue => 100
     SwitchingProtocols => 101

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ pub fn handle_cors(`
`66`	`66`	`max_age~,`
`67`	`67`	`)`
`68`	`68`	`// 对于预检请求，直接返回空响应，不调用next()`
`69`		`- @mocket.HttpResponse::new(@mocket.OK).to_responder()`
	`69`	`+ @mocket.HttpResponse::new(OK).to_responder()`
`70`	`70`	`} else {`
`71`	`71`	`append_cors_headers(`
`72`	`72`	`event,`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ fn main {`
`57`	`57`	`..post("/echo", e => e.req)`
`58`	`58`
`59`	`59`	`// 404 Page`
`60`		`- ..get("/404", _ => @mocket.HttpResponse::new(@mocket.NotFound).body(`
	`60`	`+ ..get("/404", _ => @mocket.HttpResponse::new(NotFound).body(`
`61`	`61`	`@mocket.html(`
`62`	`62`	`(`
`63`	`63`	`#\|<html>`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ pub(all) struct HttpRequest {`
`8`	`8`
`9`	`9`	`///\|`
`10`	`10`	`pub(open) trait BodyReader {`
`11`		`- from_request(req: HttpRequest) -> Self raise`
	`11`	`+ from_request(req : HttpRequest) -> Self raise`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`///\|`
Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,10 @@ pub impl ServeStaticProvider for StaticFileProvider with get_contents(`
`26`	`26`	`self,`
`27`	`27`	`id : String,`
`28`	`28`	`) -> &Responder {`
`29`		`- let res : &Responder = @mocket.HttpResponse::new(@mocket.OK).body(`
	`29`	`+ let res : &Responder = @mocket.HttpResponse::new(OK).body(`
`30`	`30`	`@fs.read_file_to_bytes(self.path + "/" + id),`
`31`	`31`	`) catch {`
`32`		`- _ => @mocket.HttpResponse::new(@mocket.NotFound).body("Not Found")`
	`32`	`+ _ => @mocket.HttpResponse::new(NotFound).body("Not Found")`
`33`	`33`	`}`
`34`	`34`	`res`
`35`	`35`	`}`