diff --git a/benchmark_test.go b/benchmark_test.go
index e1f989ab6ec175bf8b7d031d54939ed89e9f9f1b..db35a255a027ee5a7e02cbe9e21bd7d53959f0bb 100644
--- a/benchmark_test.go
+++ b/benchmark_test.go
@@ -9,7 +9,7 @@ func BenchmarkTransformer(b *testing.B) {
for i := 0; i < b.N; i++ {
- tt := NewTransformer(m)
+ tt := NewTransformer(&m)
tt.Transform("static:AtEst | strtolower | strtoupper | prefix:b | md5")
}
diff --git a/go.mod b/go.mod
index 84ae72ed1d7e6de4c723765b84b6613f4d116096..7fa88155d79bec95c7fa68ef693eaa41b8997abb 100644
--- a/go.mod
+++ b/go.mod
@@ -4,4 +4,6 @@ go 1.19
require github.com/volker-schukai/tokenizer v1.0.0
+require gitlab.schukai.com/oss/libraries/go/utilities/pathfinder v0.4.0
+
replace github.com/volker-schukai/tokenizer => /home/volker.schukai/projekte/github/tokenizer
diff --git a/go.sum b/go.sum
index aaf3fc9a69a2749b17a9abdeed19b1f70588fb79..87c0b79af0ccfa79b45a0d0ef87e8e7ba9d24564 100644
--- a/go.sum
+++ b/go.sum
@@ -4,5 +4,9 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/volker-schukai/tokenizer v1.0.0 h1:wF4haFoCodq7lgAk8c+th/DZmpFpL2WVD8wDzAGU1mA=
github.com/volker-schukai/tokenizer v1.0.0/go.mod h1:LPw7lLIxUnZgeg96818N7IvwLE1x8ya31J/Aa0aCq9M=
+gitlab.schukai.com/oss/libraries/go/utilities/pathfinder v0.3.1 h1:oyElaqEiyr2XgaE1CYwD8LoeHsuR/vQD/p6k3jYbJFs=
+gitlab.schukai.com/oss/libraries/go/utilities/pathfinder v0.3.1/go.mod h1:UvdD4NAf3gLKYafabJD7e9ZCOetzM9JZ9y4GkZukPVU=
+gitlab.schukai.com/oss/libraries/go/utilities/pathfinder v0.4.0 h1:eAEsq3lsHwMe5Zz71vNab5csPtp8S+i5zFPmNnDPFDg=
+gitlab.schukai.com/oss/libraries/go/utilities/pathfinder v0.4.0/go.mod h1:UvdD4NAf3gLKYafabJD7e9ZCOetzM9JZ9y4GkZukPVU=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/parser.go b/parser.go
index 25aceeeac1e3132cd98cce35621d7343f76bd5c2..d34cd64bcffc6b202e4f6d9d8852373cd5c4f64c 100644
--- a/parser.go
+++ b/parser.go
@@ -10,6 +10,7 @@ const (
PipeCmdStatic
PipeCmdIndex
+ PipeCmdPath
PipeCmdToUpper
PipeCmdToLower
PipeCmdEmpty
@@ -68,6 +69,7 @@ func initTokenizer() *tokenizer.Tokenizer {
parser.DefineTokens(PipeCmdStatic, []string{"static"})
parser.DefineTokens(PipeCmdIndex, []string{"index", "dataset"})
+ parser.DefineTokens(PipeCmdPath, []string{"path"})
parser.DefineTokens(PipeReflectionIsNil, []string{"isnull", "isnil"})
parser.DefineTokens(PipeCmdNop, []string{"nop"})
diff --git a/transformer.go b/transformer.go
index 59de1b01051d1bc547ec9a333a0540ae3ddaffa1..1d430cab8a5f71699b99d53d71f1bd7e05cdd8c2 100644
--- a/transformer.go
+++ b/transformer.go
@@ -10,6 +10,7 @@ import (
"errors"
"fmt"
"github.com/volker-schukai/tokenizer"
+ "gitlab.schukai.com/oss/libraries/go/utilities/pathfinder"
"html"
"math"
"net/url"
@@ -20,16 +21,17 @@ import (
)
type Transformer struct {
- dataset map[any]any
+ dataset *map[any]any
errors []error
parser *tokenizer.Tokenizer
}
-type Number interface {
- int | int8 | int16 | int32 | int64 | uint | uint8 | uint16 | uint32 | uint64
-}
+//
+//type Number interface {
+// int | int8 | int16 | int32 | int64 | uint | uint8 | uint16 | uint32 | uint64
+//}
-func NewTransformer(dataset map[any]any) *Transformer {
+func NewTransformer(dataset *map[any]any) *Transformer {
parser := initTokenizer()
return &Transformer{
@@ -53,6 +55,10 @@ func (t *Transformer) Transform(pipe string) (interface{}, error) {
return t.tokenize(pipe)
}
+func (t *Transformer) Dataset() *map[any]any {
+ return t.dataset
+}
+
func (t *Transformer) tokenize(pipe string) (any, error) {
// create tokens stream
@@ -65,6 +71,9 @@ func (t *Transformer) tokenize(pipe string) (any, error) {
// iterate over each token
for stream.IsValid() {
token := stream.CurrentToken()
+ if token == nil {
+ break
+ }
stream.GoNext()
if token.Is(PipeSymbol) {
@@ -85,8 +94,13 @@ func (t *Transformer) tokenize(pipe string) (any, error) {
}
var currentValue any
+ //datasetAvailable := true
currentValue = t.dataset
+ //if reflect.ValueOf(currentValue).IsNil() {
+ // datasetAvailable = false
+ //}
+
var err error
var ok bool
@@ -107,30 +121,86 @@ func (t *Transformer) tokenize(pipe string) (any, error) {
continue
}
- if tokens[0].Is(PipeCmdIndex) {
+ if tokens[0].Is(PipeCmdPath) {
+
+ if len(tokens) > 1 {
+
+ parts := []string{}
+ for _, token := range tokens[1:] {
+ parts = append(parts, token.ValueUnescapedString())
+ }
+
+ path := strings.Join(parts, "")
+ currentValue, err = pathfinder.GetValue[any](currentValue, path)
+ if err != nil {
+ return nil, err
+ }
+ } else {
+ return nil, errors.New("invalid path command")
+ }
+
+ continue
+
+ } else if tokens[0].Is(PipeCmdIndex) {
var index string
if index, err = handleIndexCommand(tokens); err != nil {
return nil, err
}
switch currentValue.(type) {
+
+ case *map[any]any:
+
+ if reflect.ValueOf(currentValue).IsNil() {
+ return nil, errors.New("index command on nil map")
+ }
+
+ currentValue, ok = (*currentValue.(*map[any]any))[index]
+ if !ok {
+ return nil, errors.New("index " + index + " not found")
+ }
+
case map[any]any:
currentValue, ok = currentValue.(map[any]any)[index]
if !ok {
t.errors = append(t.errors, errors.New("index not found: "+index))
}
+ case *map[string]any:
+
+ if reflect.ValueOf(currentValue).IsNil() {
+ return nil, errors.New("index command on nil map")
+ }
+
+ currentValue, ok = (*currentValue.(*map[string]any))[index]
+ if !ok {
+ t.errors = append(t.errors, errors.New("index not found: "+index))
+ }
+
case map[string]any:
currentValue, ok = currentValue.(map[string]any)[index]
if !ok {
t.errors = append(t.errors, errors.New("index not found: "+index))
}
+ case *[]string:
+ indexInt, err := strconv.Atoi(index)
+ if err != nil {
+ return nil, errors.New("index must be an integer")
+ }
+ currentValue = (*currentValue.(*[]string))[indexInt]
+
case []string:
indexInt, err := strconv.Atoi(index)
if err != nil {
return nil, err
}
currentValue = currentValue.([]string)[indexInt]
+ case *[]any:
+ indexInt, err := strconv.Atoi(index)
+ if err != nil {
+ return nil, err
+ }
+ currentValue = (*currentValue.(*[]any))[indexInt]
case []any:
indexInt, err := strconv.Atoi(index)
@@ -141,8 +211,19 @@ func (t *Transformer) tokenize(pipe string) (any, error) {
if currentValue == nil {
t.errors = append(t.errors, errors.New("index not found: "+index))
}
+
default:
- return nil, errors.New("invalid index command")
+ //var value generic[currentValue]
+ //
+ //genericValue := reflect.ValueOf(currentValue)
+ vxx, err := pathfinder.GetValue[any](currentValue, index)
+ fmt.Println(vxx, err)
+
+ //case struct{}:
+ // return nil, errors.New("index command on struct")
+ //
+ //default:
+ // return nil, errors.New("unsupported type " + reflect.TypeOf(currentValue).String())
}
continue
@@ -177,16 +258,26 @@ func (t *Transformer) tokenize(pipe string) (any, error) {
continue
+ case *map[any]any:
+ v, ok := currentValue.(*map[any]any)
+ if !ok {
+ return nil, errors.New("invalid map")
+ }
+ if currentValue, err = handleMap(tokens, v); err != nil {
+ return nil, err
+ }
+
case map[any]any, map[string]any:
v, ok := currentValue.(map[any]any)
if !ok {
- v = make(map[any]any)
+ m := make(map[any]any)
for k, vv := range currentValue.(map[string]any) {
- v[k] = vv
+ m[k] = vv
}
+ v = m
}
- if currentValue, err = handleMap(tokens, v); err != nil {
+ if currentValue, err = handleMap(tokens, &v); err != nil {
return nil, err
}
continue
@@ -205,7 +296,7 @@ func (t *Transformer) tokenize(pipe string) (any, error) {
continue
default:
- return nil, errors.New("invalid type")
+ return nil, errors.New("the type " + reflect.TypeOf(currentValue).String() + " is not supported")
}
return nil, errors.New("unknown command " + tokens[0].ValueUnescapedString())
@@ -330,13 +421,13 @@ func handleFloat(tokens TokenList, currentValue float64) (any, error) {
return nil, errors.New(tokens[0].ValueString() + " is not a valid command for value of type float (" + strconv.FormatFloat(currentValue, 'f', -1, 64) + ")")
}
-func handleMap(tokens TokenList, currentValue map[any]any) (any, error) {
+func handleMap(tokens TokenList, currentValue *map[any]any) (any, error) {
if tokens[0].Is(PipeCmdToJSON) {
// convert to string map
stringMap := make(map[string]any)
- for k, v := range currentValue {
+ for k, v := range *currentValue {
key, ok := k.(string)
if !ok {
return nil, errors.New("invalid key type for json conversion")
diff --git a/transformer_test.go b/transformer_test.go
index 88816ea86d98ac0b9f50ee0831dcac77a018a7db..4dd083d7a0f8cd8f1d07b889c0437128547e472c 100644
--- a/transformer_test.go
+++ b/transformer_test.go
@@ -5,7 +5,7 @@ import (
)
func TestNewTransformer(t *testing.T) {
- tt := NewTransformer(map[any]any{})
+ tt := NewTransformer(&map[any]any{})
if tt == nil {
t.Error("Transformer is nil")
}
@@ -638,7 +638,7 @@ func TestTransformValues(t *testing.T) {
t.Run(td.instruction, func(t *testing.T) {
- tt := NewTransformer(td.data)
+ tt := NewTransformer(&td.data)
result, err := tt.Transform(td.instruction)
if td.hasError {