111

Author: lvan100

lib/tidl/parser.go

@@ -504,6 +504,9 @@ func (l *ParseTreeListener) ExitRpc_def(ctx *Rpc_defContext) {
 	if !IsPascal(r.Request.Name) {
 		panic(errutil.Explain(nil, "RPC request type %s is not PascalCase in line %d", r.Request.Name, r.Position.Start))
 	}
+	if !strings.HasSuffix(r.Request.Name, "Req") {
+		panic(errutil.Explain(nil, "RPC request type %s does not end with \"Req\" in line %d", r.Request.Name, r.Position.Start))
+	}
 	l.Document.UsedTypes[r.Request.Name] = struct{}{}
 
 	// Response
@@ -518,6 +521,9 @@ func (l *ParseTreeListener) ExitRpc_def(ctx *Rpc_defContext) {
 	if !IsPascal(r.Response.UserType.Name) {
 		panic(errutil.Explain(nil, "RPC response type %s is not PascalCase in line %d", r.Response.UserType.Name, r.Position.Start))
 	}
+	if !strings.HasSuffix(r.Response.UserType.Name, "Resp") {
+		panic(errutil.Explain(nil, "RPC response type %s does not end with \"Resp\" in line %d", r.Response.UserType.Name, r.Position.Start))
+	}
 	l.Document.UsedTypes[r.Response.UserType.Name] = struct{}{}
 
 	// Annotations

lib/tidl/testdata/success/http.formated.idl

@@ -57,11 +57,11 @@ type Response<T> {
 }
 
 // ---- RPC definitions ----
-rpc GetUser(UserReq) UserResponse {
+rpc GetUser(UserReq) UserResp {
     go.type = "*string"
     method = "GET"
     path = "/user"
 }
 
 // ---- type re-definition ----
-type UserResponse Response<list<User?>>
+type UserResp Response<list<User?>>

lib/tidl/testdata/success/http.idl

@@ -56,11 +56,11 @@ type Response<T> {
 }
 
 // ---- RPC definitions ----
-rpc GetUser (UserReq) UserResponse {
+rpc GetUser (UserReq) UserResp {
     go.type="*string"
     method="GET"
     path="/user"
 }
 
 // ---- type re-definition ----
-type UserResponse Response<list<User?>>
+type UserResp Response<list<User?>>

lib/tidl/testdata/success/http.idl.json

@@ -574,7 +574,7 @@
       }
     },
     {
-      "Name": "UserResponse",
+      "Name": "UserResp",
       "OneOf": false,
       "Redefined": {
         "Name": "Response",
@@ -618,7 +618,7 @@
       "Response": {
         "Stream": false,
         "UserType": {
-          "Name": "UserResponse",
+          "Name": "UserResp",
           "Optional": false
         }
       },
@@ -690,13 +690,13 @@
     "Response": 4,
     "User": 1,
     "UserReq": 0,
-    "UserResponse": 5
+    "UserResp": 5
   },
   "UsedTypes": {
     "Address": {},
     "Payload": {},
     "User": {},
     "UserReq": {},
-    "UserResponse": {}
+    "UserResp": {}
   }
 }