minor refactoring work in progress

service.go

@@ -14,7 +14,6 @@ import (
 	"github.com/viant/datly/reader"
 	"github.com/viant/datly/router"
 	"github.com/viant/datly/view"
-	"github.com/viant/datly/view/state"
 	sjwt "github.com/viant/scy/auth/jwt"
 	"github.com/viant/scy/auth/jwt/signer"
 	"github.com/viant/scy/auth/jwt/verifier"
@@ -105,7 +104,7 @@ func (s *Service) MergeResource(resource *view.Resource, types *xreflect.Types)
 }
 
 // AddParameter add global parameters
-func (s *Service) AddParameter(parameters ...*state.Parameter) error {
+func (s *Service) AddParameter(parameters ...*view.Parameter) error {
 	if err := s.ensureNotInitialised(); err != nil {
 		return err
 	}

view/selector.go

@@ -3,6 +3,7 @@ package view
 import (
 	"github.com/viant/datly/utils/types"
 	"github.com/viant/sqlx/io/read/cache"
+	"github.com/viant/structology"
 	"github.com/viant/toolbox/format"
 	"strings"
 	"sync"
@@ -13,17 +14,20 @@ type (
 	Selector struct {
 		DatabaseFormat format.Case
 		OutputFormat   format.Case
-		Columns        []string      `json:",omitempty"`
-		Fields         []string      `json:",omitempty"`
-		OrderBy        string        `json:",omitempty"`
-		Offset         int           `json:",omitempty"`
-		Limit          int           `json:",omitempty"`
-		Parameters     ParamState    `json:",omitempty"`
-		Criteria       string        `json:",omitempty"`
-		Placeholders   []interface{} `json:",omitempty"`
-		Qualifier      []SelectorQualifier
-		Page           int
-		Ignore         bool
+		Columns        []string `json:",omitempty"`
+		Fields         []string `json:",omitempty"`
+		OrderBy        string   `json:",omitempty"`
+		Offset         int      `json:",omitempty"`
+		Limit          int      `json:",omitempty"`
+
+		Parameters ParamState `json:",omitempty"`
+		State      *structology.State
+
+		Criteria     string        `json:",omitempty"`
+		Placeholders []interface{} `json:",omitempty"`
+		Qualifier    []SelectorQualifier
+		Page         int
+		Ignore       bool
 
 		initialized  bool
 		_columnNames map[string]bool