Fixed issue 197 (#198)

CHANGELOG.md

@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 The structure and content of this file follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [1.26.1] - 2025-01-09
+### Fixed
+- Fixed issue #197 where nested array elements were not filled when using `oj.Match()`.
+
 ## [1.26.0] - 2024-12-31
 ### Added
 - Support for non-selector scripts added to the jp package. See the

jp/match_test.go

@@ -3,9 +3,13 @@
 package jp_test
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/ohler55/ojg/jp"
+	"github.com/ohler55/ojg/oj"
+	"github.com/ohler55/ojg/pretty"
+	"github.com/ohler55/ojg/sen"
 	"github.com/ohler55/ojg/tt"
 )
 
@@ -54,3 +58,30 @@ func TestPathMatchDoubleRoot(t *testing.T) {
 func TestPathMatchSkipBracket(t *testing.T) {
 	tt.Equal(t, true, jp.PathMatch(jp.B().C("a"), jp.C("a")))
 }
+
+func TestMatchNestedMapArray(t *testing.T) {
+	var buf []byte
+	err := oj.Match([]byte(`[{"a":[1, 2]}]`), func(path jp.Expr, data any) {
+		buf = fmt.Appendf(buf, "%s: %s", path, pretty.SEN(data))
+	}, jp.MustParseString("$[*]"))
+	tt.Nil(t, err)
+	tt.Equal(t, "$[0]: {a: [1 2]}", string(buf))
+}
+
+func TestMatchNestedArrays(t *testing.T) {
+	var buf []byte
+	err := oj.Match([]byte(`[[[1, [2]]]]`), func(path jp.Expr, data any) {
+		buf = fmt.Appendf(buf, "%s: %s", path, sen.Bytes(data))
+	}, jp.MustParseString("$[*]"))
+	tt.Nil(t, err)
+	tt.Equal(t, "$[0]: [[1 [2]]]", string(buf))
+}
+
+func TestMatchNestedMap(t *testing.T) {
+	var buf []byte
+	err := oj.Match([]byte(`{"a": {"b": 1, "c": {"d": 2}}}`), func(path jp.Expr, data any) {
+		buf = fmt.Appendf(buf, "%s: %s", path, pretty.SEN(data))
+	}, jp.MustParseString("$[*]"))
+	tt.Nil(t, err)
+	tt.Equal(t, "$.a: {b: 1 c: {d: 2}}", string(buf))
+}

jp/matchhandler.go

@@ -104,7 +104,7 @@ func (h *MatchHandler) ArrayEnd() {
 	h.objArrayEnd()
 }
 
-// AddValue is called when a leave value is encountered.
+// AddValue is called when a leaf value is encountered.
 func (h *MatchHandler) AddValue(v any) {
 	if 0 < len(h.Stack) {
 		switch ts := h.Stack[len(h.Stack)-1].(type) {
@@ -142,7 +142,16 @@ func (h *MatchHandler) objArrayEnd() {
 				h.OnData(p, v)
 			}
 		}
+		v := h.Stack[len(h.Stack)-1]
 		h.Stack = h.Stack[:len(h.Stack)-1]
+		if 0 < len(h.Stack) {
+			switch ts := h.Stack[len(h.Stack)-1].(type) {
+			case map[string]any:
+				ts[string(h.Path[len(h.Path)-1].(Child))] = v
+			case []any:
+				ts[h.Path[len(h.Path)-1].(Nth)] = v
+			}
+		}
 	}
 	h.incNth()
 }

oj/tokenizer_test.go

@@ -279,3 +279,10 @@ func TestTokenizerMany(t *testing.T) {
 		}
 	}
 }
+
+func TestTokenizerNesting(t *testing.T) {
+	var h testHandler
+	err := oj.TokenizeString(`[{"a":[1, 2]}]`, &h)
+	tt.Nil(t, err)
+	tt.Equal(t, "[ { a: [ 1 2 ] } ] ", string(h.buf))
+}