update

Author: admpub

context_x_response.go

@@ -10,7 +10,6 @@ import (
 	"time"
 	"unicode"
 
-	"github.com/admpub/xencoding/filter"
 	json "github.com/admpub/xencoding/json/standard"
 	xml "github.com/admpub/xencoding/xml/standard"
 	"github.com/webx-top/echo/engine"
@@ -100,11 +99,11 @@ func (c *XContext) JSON(i interface{}, codes ...int) (err error) {
 		}
 	}
 	var b []byte
-	if ft, ok := c.route.Get(metaKeyEncodingFilter).(EncodingFilter); ok {
+	if ft, ok := c.route.Get(metaKeyEncodingConfig).(EncodingConfig); ok {
 		b, err = json.MarshalWithOption(
 			i,
-			json.OptionFilter(filter.Exclude(ft.OmitFields...)),
-			json.OptionSelector(filter.Include(ft.OnlyFields...)),
+			json.OptionFilter(ft.filter),
+			json.OptionSelector(ft.selector),
 		)
 	} else {
 		b, err = json.Marshal(i)
@@ -132,11 +131,11 @@ func (c *XContext) JSONP(callback string, i interface{}, codes ...int) (err erro
 		}
 	}
 	var b []byte
-	if ft, ok := c.route.Get(metaKeyEncodingFilter).(EncodingFilter); ok {
+	if ft, ok := c.route.Get(metaKeyEncodingConfig).(EncodingConfig); ok {
 		b, err = json.MarshalWithOption(
 			i,
-			json.OptionFilter(filter.Exclude(ft.OmitFields...)),
-			json.OptionSelector(filter.Include(ft.OnlyFields...)),
+			json.OptionFilter(ft.filter),
+			json.OptionSelector(ft.selector),
 		)
 	} else {
 		b, err = json.Marshal(i)
@@ -159,11 +158,11 @@ func (c *XContext) XML(i interface{}, codes ...int) (err error) {
 		}
 	}
 	var b []byte
-	if ft, ok := c.route.Get(metaKeyEncodingFilter).(EncodingFilter); ok {
+	if ft, ok := c.route.Get(metaKeyEncodingConfig).(EncodingConfig); ok {
 		b, err = xml.MarshalWithOption(
 			i,
-			xml.OptionFilter(filter.Exclude(ft.OmitFields...)),
-			xml.OptionSelector(filter.Include(ft.OnlyFields...)),
+			xml.OptionFilter(ft.filter),
+			xml.OptionSelector(ft.selector),
 		)
 	} else {
 		b, err = xml.Marshal(i)

echo.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/admpub/log"
 	"github.com/admpub/realip"
+	"github.com/admpub/xencoding/filter"
 
 	"github.com/webx-top/echo/engine"
 	"github.com/webx-top/echo/logger"
@@ -100,9 +101,9 @@ type (
 		Template(Context) (string, error)
 	}
 
-	EncodingFilter struct {
-		OmitFields []string
-		OnlyFields []string
+	EncodingConfig struct {
+		filter   filter.Filter
+		selector filter.Selector
 	}
 )
 
@@ -136,6 +137,24 @@ func (h HandlerFuncWithArg[R, W]) Handle(c Context) error {
 	return c.Render(``, w)
 }
 
+func (c EncodingConfig) SetFilter(f filter.Filter) EncodingConfig {
+	c.filter = f
+	return c
+}
+
+func (c EncodingConfig) SetSelector(f filter.Selector) EncodingConfig {
+	c.selector = f
+	return c
+}
+
+func (c EncodingConfig) Filter() filter.Filter {
+	return c.filter
+}
+
+func (c EncodingConfig) Selector() filter.Selector {
+	return c.selector
+}
+
 // New creates an instance of Echo.
 func New() (e *Echo) {
 	return NewWithContext(func(e *Echo) Context {

router.go

@@ -8,6 +8,7 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/admpub/xencoding/filter"
 	"github.com/webx-top/echo/param"
 )
 
@@ -147,13 +148,53 @@ func (r *Route) SetMetaKV(key string, value interface{}) IRouter {
 	return r
 }
 
-const metaKeyEncodingFilter = `encodingFilter`
+const metaKeyEncodingConfig = `encodingConfig`
 
-func (r *Route) SetEncodingFilter(ef EncodingFilter) IRouter {
+func (r *Route) SetEncodingConfig(ef EncodingConfig) IRouter {
 	if r.Meta == nil {
 		r.Meta = H{}
 	}
-	r.Meta[metaKeyEncodingFilter] = ef
+	r.Meta[metaKeyEncodingConfig] = ef
+	return r
+}
+
+func (r *Route) SetEncodingOmitFields(names ...string) IRouter {
+	if r.Meta == nil {
+		r.Meta = H{}
+		r.Meta[metaKeyEncodingConfig] = EncodingConfig{
+			filter: filter.Exclude(names...),
+		}
+		return r
+	}
+	cfg, ok := r.Meta[metaKeyEncodingConfig].(EncodingConfig)
+	if !ok {
+		cfg = EncodingConfig{
+			filter: filter.Exclude(names...),
+		}
+	} else {
+		cfg.filter = filter.Exclude(names...)
+	}
+	r.Meta[metaKeyEncodingConfig] = cfg
+	return r
+}
+
+func (r *Route) SetEncodingOnlyFields(names ...string) IRouter {
+	if r.Meta == nil {
+		r.Meta = H{}
+		r.Meta[metaKeyEncodingConfig] = EncodingConfig{
+			selector: filter.Include(names...),
+		}
+		return r
+	}
+	cfg, ok := r.Meta[metaKeyEncodingConfig].(EncodingConfig)
+	if !ok {
+		cfg = EncodingConfig{
+			selector: filter.Include(names...),
+		}
+	} else {
+		cfg.selector = filter.Include(names...)
+	}
+	r.Meta[metaKeyEncodingConfig] = cfg
 	return r
 }