Implement support for v1 json.Number (#74)

arshal_any.go

@@ -8,6 +8,7 @@ import (
 	"reflect"
 	"strconv"
 
+	"github.com/go-json-experiment/json/internal"
 	"github.com/go-json-experiment/json/internal/jsonflags"
 	"github.com/go-json-experiment/json/internal/jsonopts"
 	"github.com/go-json-experiment/json/internal/jsonwire"
@@ -71,6 +72,9 @@ func unmarshalValueAny(dec *jsontext.Decoder, uo *jsonopts.Struct) (any, error)
 			}
 			return makeString(xd.StringCache, val), nil
 		case '0':
+			if uo.Flags.Get(jsonflags.UnmarshalAnyWithRawNumber) {
+				return internal.RawNumberOf(val), nil
+			}
 			fv, ok := jsonwire.ParseFloat(val, 64)
 			if !ok && uo.Flags.Get(jsonflags.RejectFloatOverflow) {
 				return nil, newUnmarshalErrorAfter(dec, float64Type, strconv.ErrRange)

arshal_default.go

@@ -17,6 +17,7 @@ import (
 	"strconv"
 	"sync"
 
+	"github.com/go-json-experiment/json/internal"
 	"github.com/go-json-experiment/json/internal/jsonflags"
 	"github.com/go-json-experiment/json/internal/jsonopts"
 	"github.com/go-json-experiment/json/internal/jsonwire"
@@ -1629,7 +1630,11 @@ func makeInterfaceArshaler(t reflect.Type) *arshaler {
 			case '"':
 				v = newAddressableValue(stringType)
 			case '0':
-				v = newAddressableValue(float64Type)
+				if uo.Flags.Get(jsonflags.UnmarshalAnyWithRawNumber) {
+					v = addressableValue{reflect.ValueOf(internal.NewRawNumber()).Elem()}
+				} else {
+					v = newAddressableValue(float64Type)
+				}
 			case '{':
 				v = newAddressableValue(mapStringAnyType)
 			case '[':

internal/internal.go

@@ -12,3 +12,10 @@ type NotForPublicUse struct{}
 // AllowInternalUse is passed from "json" to "jsontext" to authenticate
 // that the caller can have access to internal functionality.
 var AllowInternalUse NotForPublicUse
+
+var (
+	// NewRawNumber returns new(jsonv1.Number).
+	NewRawNumber func() any
+	// RawNumberOf returns jsonv1.Number(b).
+	RawNumberOf func(b []byte) any
+)

v1/failing.txt

@@ -6,16 +6,13 @@ TestMarshalInvalidUTF8/#04
 TestMarshalInvalidUTF8/#05
 TestMarshalEmbeds
 TestUnmarshal
-TestUnmarshal/#07
 TestUnmarshal/#13
 TestUnmarshal/#14
 TestUnmarshal/#15
 TestUnmarshal/#16
 TestUnmarshal/#17
 TestUnmarshal/#18
 TestUnmarshal/#19
-TestUnmarshal/#21
-TestUnmarshal/#23
 TestUnmarshal/#30
 TestUnmarshal/#32
 TestUnmarshal/#35

v1/inject.go

@@ -0,0 +1,13 @@
+// Copyright 2024 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package json
+
+import "github.com/go-json-experiment/json/internal"
+
+// Inject functionality into v2 to properly handle v1 types.
+func init() {
+	internal.NewRawNumber = func() any { return new(Number) }
+	internal.RawNumberOf = func(b []byte) any { return Number(b) }
+}