starred/godoxy-yusing
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2026-03-31 22:23:14 +02:00
Code Issues 18 Packages Projects Releases 10 Wiki Activity

feat(rules): replace go templates with custom variable expansion

Browse Source 
- Replace template syntax ({{ .Request.Method }}) with $-prefixed variables ($req_method)
- Implement custom variable parser with static ($req_method, $status_code) and dynamic ($header(), $arg(), $form()) variables
- Replace templateOrStr interface with templateString struct and ExpandVars methods
- Add parser improvements for reliable quote handling
- Add new error types: ErrUnterminatedParenthesis, ErrUnexpectedVar, ErrExpectOneOrTwoArgs
- Update all tests and help text to use new variable syntax
- Add comprehensive unit and benchmark tests for variable expansion
This commit is contained in:
yusing
2025-10-25 22:43:47 +08:00
parent 9c3346dd9d
commit 1ec2872f3d
16 changed files with 1253 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
internal/route/rules/do_set.go
View File

@@ -54,7 +54,7 @@ var modFields = map[string]struct {
k, tmpl := args.(*keyValueTemplate).Unpack()
return &FieldHandler{
set: NonTerminatingCommand(func(w http.ResponseWriter, r *http.Request) error {
v, err := executeRequestTemplateString(tmpl, r)
v, err := tmpl.ExpandVarsToString(w, r)
if err != nil {
return err
}
@@ -62,7 +62,7 @@ var modFields = map[string]struct {
return nil
}),
add: NonTerminatingCommand(func(w http.ResponseWriter, r *http.Request) error {
v, err := executeRequestTemplateString(tmpl, r)
v, err := tmpl.ExpandVarsToString(w, r)
if err != nil {
return err
}
@@ -89,7 +89,7 @@ var modFields = map[string]struct {
k, tmpl := args.(*keyValueTemplate).Unpack()
return &FieldHandler{
set: NonTerminatingCommand(func(w http.ResponseWriter, r *http.Request) error {
v, err := executeRequestTemplateString(tmpl, r)
v, err := tmpl.ExpandVarsToString(w, r)
if err != nil {
return err
}
@@ -97,7 +97,7 @@ var modFields = map[string]struct {
return nil
}),
add: NonTerminatingCommand(func(w http.ResponseWriter, r *http.Request) error {
v, err := executeRequestTemplateString(tmpl, r)
v, err := tmpl.ExpandVarsToString(w, r)
if err != nil {
return err
}
@@ -124,7 +124,7 @@ var modFields = map[string]struct {
k, tmpl := args.(*keyValueTemplate).Unpack()
return &FieldHandler{
set: NonTerminatingCommand(func(w http.ResponseWriter, r *http.Request) error {
v, err := executeRequestTemplateString(tmpl, r)
v, err := tmpl.ExpandVarsToString(w, r)
if err != nil {
return err
}
@@ -134,7 +134,7 @@ var modFields = map[string]struct {
return nil
}),
add: NonTerminatingCommand(func(w http.ResponseWriter, r *http.Request) error {
v, err := executeRequestTemplateString(tmpl, r)
v, err := tmpl.ExpandVarsToString(w, r)
if err != nil {
return err
}
@@ -165,7 +165,7 @@ var modFields = map[string]struct {
k, tmpl := args.(*keyValueTemplate).Unpack()
return &FieldHandler{
set: NonTerminatingCommand(func(w http.ResponseWriter, r *http.Request) error {
v, err := executeRequestTemplateString(tmpl, r)
v, err := tmpl.ExpandVarsToString(w, r)
if err != nil {
return err
}
@@ -181,7 +181,7 @@ var modFields = map[string]struct {
return nil
}),
add: NonTerminatingCommand(func(w http.ResponseWriter, r *http.Request) error {
v, err := executeRequestTemplateString(tmpl, r)
v, err := tmpl.ExpandVarsToString(w, r)
if err != nil {
return err
}
@@ -221,7 +221,7 @@ var modFields = map[string]struct {
helpListItem("Request", "the request object"),
"",
"Example:",
helpExample(FieldBody, "HTTP STATUS: {{ .Request.Method }} {{ .Request.URL.Path }}"),
helpExample(FieldBody, "HTTP STATUS: $req_method $req_path"),
),
args: map[string]string{
"template": "the body template",
@@ -234,7 +234,7 @@ var modFields = map[string]struct {
return validateTemplate(args[0], true)
},
builder: func(args any) *FieldHandler {
tmpl := args.(templateOrStr)
tmpl := args.(templateString)
return &FieldHandler{
set: NonTerminatingCommand(func(w http.ResponseWriter, r *http.Request) error {
if r.Body != nil {
@@ -244,7 +244,7 @@ var modFields = map[string]struct {
bufPool := GetInitResponseModifier(w).BufPool()
b := bufPool.GetBuffer()
err := executeRequestTemplateTo(tmpl, b, r)
err := tmpl.ExpandVars(w, r, b)
if err != nil {
return err
}
@@ -266,7 +266,7 @@ var modFields = map[string]struct {
helpListItem("Response", "the response object"),
"",
"Example:",
helpExample(FieldResponseBody, "HTTP STATUS: {{ .Request.Method }} {{ .Response.StatusCode }}"),
helpExample(FieldResponseBody, "HTTP STATUS: $req_method $status_code"),
),
args: map[string]string{
"template": "the response body template",
@@ -279,12 +279,12 @@ var modFields = map[string]struct {
return validateTemplate(args[0], true)
},
builder: func(args any) *FieldHandler {
tmpl := args.(templateOrStr)
tmpl := args.(templateString)
return &FieldHandler{
set: OnResponseCommand(func(w http.ResponseWriter, r *http.Request) error {
rm := GetInitResponseModifier(w)
rm.ResetBody()
return executeReqRespTemplateTo(tmpl, rm, rm, r)
return tmpl.ExpandVars(w, r, rm)
}),
}
},