Report only one error using eval.TooManyArgError()

goadesign · May 16, 2024 · abe4753 · abe4753
1 parent 3dc0890
commit abe4753
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 0 deletions.
diff --git a/dsl/http.go b/dsl/http.go
@@ -745,6 +745,7 @@ func Param(name string, args ...any) {
 func MapParams(args ...any) {
 	if len(args) > 1 {
 		eval.TooManyArgError()
+		return
 	}
 	e, ok := eval.Current().(*expr.HTTPEndpointExpr)
 	if !ok {

diff --git a/dsl/payload.go b/dsl/payload.go
@@ -71,6 +71,7 @@ import (
 func Payload(val any, args ...any) {
 	if len(args) > 2 {
 		eval.TooManyArgError()
+		return
 	}
 	e, ok := eval.Current().(*expr.MethodExpr)
 	if !ok {
@@ -125,6 +126,7 @@ func Payload(val any, args ...any) {
 func StreamingPayload(val any, args ...any) {
 	if len(args) > 2 {
 		eval.TooManyArgError()
+		return
 	}
 	e, ok := eval.Current().(*expr.MethodExpr)
 	if !ok {

diff --git a/dsl/result_type.go b/dsl/result_type.go
@@ -99,6 +99,7 @@ func ResultType(identifier string, args ...any) *expr.ResultTypeExpr {
 				}
 				if len(args) > 2 {
 					eval.TooManyArgError()
+					return nil
 				}
 			}
 		}

diff --git a/dsl/server.go b/dsl/server.go
@@ -59,6 +59,7 @@ import (
 func Server(name string, fn ...func()) *expr.ServerExpr {
 	if len(fn) > 1 {
 		eval.TooManyArgError()
+		return nil
 	}
 	api, ok := eval.Current().(*expr.APIExpr)
 	if !ok {