更新

Author: deatil

array/array.go

@@ -408,12 +408,12 @@ func (this *Array) Set(value any, path ...any) (*Array, error) {
 
 			switch {
 			case sourceValue.Kind() == reflect.Map:
-    			sourceType := sourceValue.Type()
+				sourceType := sourceValue.Type()
 
-    			pathSegValue, ok := this.convertTo(sourceType.Key(), path[target])
-    			if !ok {
-    				return nil, fmt.Errorf("convert failed to resolve path segment '%v': field '%v' was error", target, pathSeg)
-    			}
+				pathSegValue, ok := this.convertTo(sourceType.Key(), path[target])
+				if !ok {
+					return nil, fmt.Errorf("convert failed to resolve path segment '%v': field '%v' was error", target, pathSeg)
+				}
 
 				if target == len(path)-1 {
 					valueValue, ok := this.convertTo(sourceType.Elem(), value)

array/array_test.go

@@ -50,6 +50,14 @@ var (
 					789.156,
 				},
 			},
+			"hhTy66": &map[int]any{
+				777: &[]float64{
+					12.3,
+					32.5,
+					22.56,
+					789.156,
+				},
+			},
 			"kJh21ay": map[string]any{
 				"Hjk2": "fccDcc",
 				"23rt": "^hgcF5c",
@@ -58,6 +66,12 @@ var (
 					1231,
 				},
 			},
+			"kJh21ay22": map[int64]any{
+				33: []any{
+					"adfa",
+					1231,
+				},
+			},
 		},
 	}
 )
@@ -846,7 +860,9 @@ func Test_FlattenIncludeEmpty(t *testing.T) {
 func Test_JSONPointer(t *testing.T) {
 	assert := assertT(t)
 
-	json1, _ := ParseJSON([]byte(`{"foo":[{"bar":"1"},{"bar":"2"}]}`))
+	data := []byte(`{"foo":[{"bar":"1"},{"bar":"2"}]}`)
+
+	json1, _ := ParseJSON(data)
 
 	testData := []struct {
 		key      string
@@ -868,16 +884,43 @@ func Test_JSONPointer(t *testing.T) {
 			`{"bar":"2"}`,
 			"map[string]any",
 		},
+		{
+			"/foo/5",
+			`null`,
+			"not find",
+		},
+		{
+			"/",
+			`null`,
+			"null",
+		},
 	}
 
 	for _, v := range testData {
 		check, err := json1.JSONPointer(v.key)
-        if err != nil {
-            t.Fatal(err)
-        }
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		assert(check.String(), v.expected, v.msg)
+	}
+
+	var dst any
+	json.Unmarshal(data, &dst)
+
+	for _, v := range testData {
+		check, err := JSONPointer(dst, v.key)
+		if err != nil {
+			t.Fatal(err)
+		}
 
 		assert(check.String(), v.expected, v.msg)
 	}
+
+	_, err := json1.JSONPointer("foo/1")
+	if err == nil {
+		t.Error("value should not have been found in foo")
+	}
 }
 
 func Test_Set(t *testing.T) {
@@ -907,7 +950,7 @@ func Test_Set(t *testing.T) {
 		t.Errorf("Unexpected value: %v != %v", act, exp)
 	}
 
-    // ========
+	// ========
 
 	arrData2 := map[string]any{
 		"a": 123,
@@ -1023,6 +1066,11 @@ func Test_SetMap(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	_, err = obj2.Set(133.122333, "b", "kJh21ay22", "ftd")
+	if err == nil {
+		t.Error("Set should error")
+	}
+
 	res2 := fmt.Sprintf("%v", obj2.Sub("b.hhTy3").Value())
 
 	check2 := `&map[111:hccccc 222:hddddd 333:map[qq1:qq1ccccc qq2:qq2ddddd qq3:qq3fffff] 666:133.122333]`
@@ -1180,6 +1228,9 @@ func Test_BadIndexes(t *testing.T) {
 	if act := obj2.Sub("b.ddd").Index(4).Value(); act != nil {
 		t.Errorf("Unexpected value returned: %v != %v", nil, act)
 	}
+	if act := obj2.Sub("b.hhTy66.777").Index(4).Value(); act != nil {
+		t.Errorf("Unexpected value returned: %v != %v", nil, act)
+	}
 
 	oo := obj2.Sub("b.ddd")
 
@@ -1285,6 +1336,11 @@ func Test_Deletes(t *testing.T) {
 	if actual2 := jsonParsed2.Sub("b.t666").String(); actual2 != expected2 {
 		t.Errorf("Unexpected result from deletes: %v != %v", actual2, expected2)
 	}
+
+	jsonParsed3 := New(nil)
+	if err := jsonParsed3.Delete("b", "ff", 333); err == nil {
+		t.Error("data should return error")
+	}
 }
 
 func Test_DeletesWithSlices(t *testing.T) {
@@ -1417,6 +1473,17 @@ func Test_BasicWithDecoder(t *testing.T) {
 	checkNumber("test.float", "6.66")
 }
 
+func Test_BadWithDecoder(t *testing.T) {
+	sample := []byte(`{"test":{"int":10, "float":6.66}`)
+	dec := json.NewDecoder(bytes.NewReader(sample))
+	dec.UseNumber()
+
+	_, err := ParseJSONDecoder(dec)
+	if err == nil {
+		t.Error("data should not have been found in ParseJSONDecoder")
+	}
+}
+
 func Test_isPathShadowedInDeepMap(t *testing.T) {
 	assert := assertT(t)