remove string restriction on atserver (zeromicro#4499)

kokizzu · Dec 17, 2024 · 89ecb50 · 89ecb50
1 parent dbed1ea
commit 89ecb50
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 13 deletions.
diff --git a/tools/goctl/pkg/parser/api/parser/analyzer.go b/tools/goctl/pkg/parser/api/parser/analyzer.go
@@ -176,11 +176,7 @@ func (a *Analyzer) convertKV(kv []*ast.KVExpr) map[string]string {
 	var ret = map[string]string{}
 	for _, v := range kv {
 		key := strings.TrimSuffix(v.Key.Token.Text, ":")
-		if key == summaryKeyText {
-			ret[key] = v.Value.RawText()
-		} else {
-			ret[key] = v.Value.Token.Text
-		}
+		ret[key] = v.Value.RawText()
 	}
 
 	return ret

diff --git a/tools/goctl/pkg/parser/api/parser/parser.go b/tools/goctl/pkg/parser/api/parser/parser.go
@@ -14,8 +14,6 @@ import (
 
 const (
 	idAPI              = "api"
-	summaryKeyExprText = "summary:"
-	summaryKeyText     = "summary"
 	groupKeyText       = "group"
 	infoTitleKey       = "Title"
 	infoDescKey        = "Desc"
@@ -1201,12 +1199,6 @@ func (p *Parser) parseAtServerKVExpression() *ast.KVExpr {
 		expr.Value = node
 		return expr
 	} else if p.peekTokenIs(token.STRING) {
-		if expr.Key.Token.Text != summaryKeyExprText {
-			if p.notExpectPeekToken(token.QUO, token.DURATION, token.IDENT, token.INT) {
-				return nil
-			}
-		}
-
 		if !p.nextToken() {
 			return nil
 		}

diff --git a/tools/goctl/pkg/parser/api/parser/parser_test.go b/tools/goctl/pkg/parser/api/parser/parser_test.go
@@ -305,6 +305,7 @@ func TestParser_Parse_atServerStmt(t *testing.T) {
 			"prefix3:":    "v1/v2_",
 			"prefix4:":    "a-b-c",
 			"summary:":    `"test"`,
+			"key:":    `"bar"`,
 		}
 
 		p := New("foo.api", atServerTestAPI)

diff --git a/tools/goctl/pkg/parser/api/parser/testdata/atserver_test.api b/tools/goctl/pkg/parser/api/parser/testdata/atserver_test.api
@@ -19,4 +19,5 @@
     prefix3: v1/v2_
     prefix4: a-b-c
     summary:"test"
+    key:"bar"
 )
diff --git a/tools/goctl/pkg/parser/api/parser/testdata/test.api b/tools/goctl/pkg/parser/api/parser/testdata/test.api
@@ -129,6 +129,7 @@ service test {
 @server (
     jwt: Auth
     group: Group1
+    foo:"bar"
 )
 service test {
     @doc "ping"