Port precision to v2

go.mod

@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	github.com/go-openapi/jsonpointer v0.19.5
-	github.com/josephburnett/jd/v2 v2.0.0-00010101000000-000000000000
+	github.com/josephburnett/jd/v2 v2.0.0-20240724160553-38467990808b
 	gopkg.in/yaml.v2 v2.4.0
 )
 

main.go

@@ -174,9 +174,6 @@ func parseMetadata() ([]jd.Metadata, error) {
 }
 
 func parseMetadataV2() ([]v2.Option, error) {
-	if *precision != 0.0 {
-		errorAndExit("--precision cannot be used with --v2 yet")
-	}
 	if *precision != 0.0 && (*set || *mset) {
 		return nil, fmt.Errorf("-precision cannot be used with -set or -mset because they use hashcodes")
 	}
@@ -202,6 +199,7 @@ func parseMetadataV2() ([]v2.Option, error) {
 	if *format == "merge" {
 		options = append(options, v2.MERGE)
 	}
+	options = append(options, v2.Precision(*precision))
 	return options, nil
 }
 

v2/number.go

@@ -3,6 +3,7 @@ package jd
 import (
 	"bytes"
 	"encoding/binary"
+	"math"
 )
 
 type jsonNumber float64
@@ -22,14 +23,17 @@ func (n jsonNumber) raw() interface{} {
 }
 
 func (n1 jsonNumber) Equals(node JsonNode, options ...Option) bool {
+
+	precision := 0.0
+	if p, ok := getOption[precisionOption](options); ok {
+		precision = p.precision
+	}
+
 	n2, ok := node.(jsonNumber)
 	if !ok {
 		return false
 	}
-	if n1 != n2 {
-		return false
-	}
-	return true
+	return math.Abs(float64(n1)-float64(n2)) <= precision
 }
 
 func (n jsonNumber) hashCode(options []Option) [8]byte {

v2/number_test.go

@@ -17,13 +17,19 @@ func TestNumberEqual(t *testing.T) {
 	checkEqual(ctx, `0`, `0.0`)
 	checkEqual(ctx, `0.0001`, `0.0001`)
 	checkEqual(ctx, `123`, `123`)
+	checkEqual(
+		newTestContext(t).withOptions(Precision(0.1)),
+		`1.0`, `1.09`)
 }
 
 func TestNumberNotEqual(t *testing.T) {
 	ctx := newTestContext(t)
 	checkNotEqual(ctx, `0`, `1`)
 	checkNotEqual(ctx, `0`, `0.0001`)
 	checkNotEqual(ctx, `1234`, `1235`)
+	checkNotEqual(
+		newTestContext(t).withOptions(Precision(0.1)),
+		`1`, `1.2`)
 }
 
 func TestNumberHash(t *testing.T) {

v2/options.go

@@ -9,13 +9,17 @@ type setOption struct{}
 type setKeysOption []string
 type multisetOption struct{}
 type renderColorOption struct{}
+type precisionOption struct {
+	precision float64
+}
 
 func (o mergeOption) isOption()       {}
 func (o mergeOption) string() string  { return "MERGE" }
 func (o setOption) isOption()         {}
 func (o setKeysOption) isOption()     {}
 func (o multisetOption) isOption()    {}
 func (o renderColorOption) isOption() {}
+func (o precisionOption) isOption()   {}
 
 var (
 	SET      = setOption{}
@@ -35,6 +39,10 @@ func SetKeys(keys ...string) Option {
 	return setKeysOption(keys)
 }
 
+func Precision(precision float64) Option {
+	return precisionOption{precision}
+}
+
 type patchStrategy string
 
 const (

vendor/modules.txt

@@ -4,7 +4,7 @@ github.com/go-openapi/jsonpointer
 # github.com/go-openapi/swag v0.21.1
 ## explicit; go 1.11
 github.com/go-openapi/swag
-# github.com/josephburnett/jd/v2 v2.0.0-00010101000000-000000000000 => ./v2
+# github.com/josephburnett/jd/v2 v2.0.0-20240724160553-38467990808b => ./v2
 ## explicit; go 1.18
 github.com/josephburnett/jd/v2
 # github.com/josharian/intern v1.0.0