(goctl): fix prefix syntax (#4113)

zeromicro · Apr 30, 2024 · a9d27cd · a9d27cd
1 parent 04116f6
commit a9d27cd
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 5 deletions.
diff --git a/tools/goctl/pkg/parser/api/parser/parser.go b/tools/goctl/pkg/parser/api/parser/parser.go
@@ -1247,6 +1247,34 @@ func (p *Parser) parseAtServerKVExpression() *ast.KVExpr {
 				}
 			}
 
+			valueTok.Type = token.PATH
+			node := ast.NewTokenNode(valueTok)
+			node.SetLeadingCommentGroup(leadingCommentGroup)
+			expr.Value = node
+			return expr
+		} else if p.peekTokenIs(token.SUB) {
+			for {
+				if p.peekTokenIs(token.SUB) {
+					if !p.nextToken() {
+						return nil
+					}
+
+					subTok := p.curTok
+					if !p.advanceIfPeekTokenIs(token.IDENT) {
+						return nil
+					}
+
+					idTok := p.curTok
+					valueTok = token.Token{
+						Text:     valueTok.Text + subTok.Text + idTok.Text,
+						Position: valueTok.Position,
+					}
+					leadingCommentGroup = p.curTokenNode().LeadingCommentGroup
+				} else {
+					break
+				}
+			}
+
 			valueTok.Type = token.PATH
 			node := ast.NewTokenNode(valueTok)
 			node.SetLeadingCommentGroup(leadingCommentGroup)

diff --git a/tools/goctl/pkg/parser/api/parser/parser_test.go b/tools/goctl/pkg/parser/api/parser/parser_test.go
@@ -303,6 +303,7 @@ func TestParser_Parse_atServerStmt(t *testing.T) {
 			"prefix1:":    "/v1/v2_test/v2-beta",
 			"prefix2:":    "v1/v2_test/v2-beta",
 			"prefix3:":    "v1/v2_",
+			"prefix4:":    "a-b-c",
 			"summary:":    `"test"`,
 		}
 

diff --git a/tools/goctl/pkg/parser/api/parser/testdata/atserver_test.api b/tools/goctl/pkg/parser/api/parser/testdata/atserver_test.api
@@ -17,5 +17,6 @@
     prefix1: /v1/v2_test/v2-beta
     prefix2: v1/v2_test/v2-beta
     prefix3: v1/v2_
+    prefix4: a-b-c
     summary:"test"
 )
diff --git a/tools/goctl/pkg/parser/api/parser/testdata/example.api b/tools/goctl/pkg/parser/api/parser/testdata/example.api
@@ -180,12 +180,14 @@ service example {
 	post /example/array/base (DemoOfArrayReq) returns ([]string)
 }
 
+@server (
+	group:    /prefix
+	prefix:   foo-bar
+	summary: "test"
+)
 service example {
-	@handler nestDemo1
-	post /example/nest (NestDemoReq1) returns (NestDemoResp1)
-
-	@handler nestDemo2
-	post /example/nest2 (NestDemoReq2) returns (NestDemoResp2)
+	@handler prefixDemo
+	post /example/prefix (PostFormReq) returns (PostFormResp)
 }
 
 @server (