Evaluate rhs after string slices (#76)

* Fixes #69 - evaluate rhs after string slices Signed-off-by: Springcomp <[email protected]> * Added unit-test Signed-off-by: Springcomp <[email protected]> * Updated linter settings Signed-off-by: Springcomp <[email protected]> * Added unit-test for failing case Signed-off-by: Springcomp <[email protected]> * gofumpt Signed-off-by: Springcomp <[email protected]> --------- Signed-off-by: Springcomp <[email protected]>
jmespath-community · Jan 14, 2025 · a8b468f · a8b468f
1 parent a74fd8e
commit a8b468f
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 3 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -64,3 +64,14 @@ linters:
     - whitespace
     # - wrapcheck
     # - wsl
+
+linters-settings:
+  depguard:
+    rules:
+      main:
+        files:
+          - $all
+          - "!$test"
+        allow:
+          - $gostd
+          - github.com/jmespath-community/go-jmespath
diff --git a/Makefile b/Makefile
@@ -21,6 +21,9 @@ build:
 test: build
 	go test -v ./...
 
+format:
+	gofumpt -l -w .
+
 check:
 	go vet ./...
 	staticcheck ./...
@@ -43,5 +46,6 @@ pprof-cpu:
 
 install-dev-cmds:
 	go install honnef.co/go/tools/cmd/staticcheck@latest
+	go install mvdan.cc/gofumpt@latest
 	go install golang.org/x/tools/cmd/stringer@latest
-	command -v golangci-lint || { curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.46.2; }
+	command -v golangci-lint || { curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.61.0; }
diff --git a/compliance b/compliance
diff --git a/pkg/interpreter/interpreter.go b/pkg/interpreter/interpreter.go
@@ -374,7 +374,13 @@ func (intr *treeInterpreter) execute(node parsing.ASTNode, value any, functionCa
 			}
 			stringType, ok := left.(string)
 			if allowString && ok {
-				return stringType, nil
+				// a projection is really a sub-expression in disguise
+				// we must evaluate the right hand expression
+				result, err := intr.Execute(node.Children[1], stringType)
+				if err != nil {
+					return nil, err
+				}
+				return result, nil
 			}
 			return nil, nil
 		}

diff --git a/pkg/interpreter/interpreter_test.go b/pkg/interpreter/interpreter_test.go
@@ -193,6 +193,22 @@ func TestCanSupportSliceOfStructsWithFunctions(t *testing.T) {
 	assert.Equal(result.(float64), 2.0)
 }
 
+func TestCanSupportEvaluatingRightHandSideOfStringSlice(t *testing.T) {
+	assert := assert.New(t)
+	data := make(map[string]interface{})
+	result, err := search(t, "'foo'[:].length(@)", data)
+	assert.Nil(err)
+	assert.Equal(result.(float64), 3.0)
+}
+
+func TestErrEvaluatingRightHandSideOfStringSlice(t *testing.T) {
+	assert := assert.New(t)
+	data := make(map[string]interface{})
+	_, err := search(t, "'foo'[:].unknown(@)", data)
+	assert.NotNil(err)
+	assert.Equal("unknown function: unknown", err.Error())
+}
+
 func BenchmarkInterpretSingleFieldStruct(b *testing.B) {
 	assert := assert.New(b)
 	intr := NewInterpreter(nil, nil)
+139 −0		README.md
+0 −134		README.rst
+12 −0		tests/slice.json