Get borrowed_encode_test.go passing [ci-skip]

2 files changed, 51 insertions, 17 deletions

diff --git a/compat/json/borrowed_misc.go b/compat/json/borrowed_misc.go
index 30a3b0e..e6b0162 100644
--- a/compat/json/borrowed_misc.go
+++ b/compat/json/borrowed_misc.go
@@ -4,6 +4,10 @@
 
 package json
 
+import (
+	"reflect"
+)
+
 // A SyntaxError is a description of a JSON syntax error.
 // Unmarshal will return a SyntaxError if the JSON can't be parsed.
 type SyntaxError struct {
@@ -12,3 +16,23 @@ type SyntaxError struct {
 }
 
 func (e *SyntaxError) Error() string { return e.msg }
+
+// A MarshalerError represents an error from calling a MarshalJSON or MarshalText method.
+type MarshalerError struct {
+	Type       reflect.Type
+	Err        error
+	sourceFunc string
+}
+
+func (e *MarshalerError) Error() string {
+	srcFunc := e.sourceFunc
+	if srcFunc == "" {
+		srcFunc = "MarshalJSON"
+	}
+	return "json: error calling " + srcFunc +
+		" for type " + e.Type.String() +
+		": " + e.Err.Error()
+}
+
+// Unwrap returns the underlying error.
+func (e *MarshalerError) Unwrap() error { return e.Err }
diff --git a/compat/json/compat.go b/compat/json/compat.go
index 04dfb24..7145a86 100644
--- a/compat/json/compat.go
+++ b/compat/json/compat.go
@@ -29,35 +29,45 @@ type (
 	InvalidUnmarshalError = json.InvalidUnmarshalError // lowmemjson.DecodeArgumentError
 
 	// marshal errors
-	InvalidUTF8Error      = json.InvalidUTF8Error
-	MarshalerError        = lowmemjson.EncodeMethodError // expose a field
+	InvalidUTF8Error = json.InvalidUTF8Error
+	//MarshalerError        = lowmemjson.EncodeMethodError // expose a field
 	UnsupportedTypeError  = json.UnsupportedTypeError
 	UnsupportedValueError = json.UnsupportedValueError
 )
 
-/////////////////////////////////////////////////////////////////////
+// Encode wrappers ///////////////////////////////////////////////////
 
-func MarshalIndent(v any, prefix, indent string) ([]byte, error) {
+func marshal(v any, formatter *lowmemjson.ReEncoder) ([]byte, error) {
 	var buf bytes.Buffer
-	formatter := &lowmemjson.ReEncoder{
-		Out:    &buf,
+	formatter.Out = &buf
+	if err := lowmemjson.Encode(formatter, v); err != nil {
+		if me, ok := err.(*lowmemjson.EncodeMethodError); ok {
+			err = &MarshalerError{
+				Type:       me.Type,
+				Err:        me.Err,
+				sourceFunc: me.SourceFunc,
+			}
+		}
+		return nil, err
+	}
+	return buf.Bytes(), nil
+}
+
+func MarshalIndent(v any, prefix, indent string) ([]byte, error) {
+	return marshal(v, &lowmemjson.ReEncoder{
 		Indent: indent,
 		Prefix: prefix,
-	}
-	err := lowmemjson.Encode(formatter, v)
-	return buf.Bytes(), err
+	})
 }
 
 func Marshal(v any) ([]byte, error) {
-	var buf bytes.Buffer
-	formatter := &lowmemjson.ReEncoder{
-		Out:     &buf,
+	return marshal(v, &lowmemjson.ReEncoder{
 		Compact: true,
-	}
-	err := lowmemjson.Encode(formatter, v)
-	return buf.Bytes(), err
+	})
 }
 
+// ReEncode wrappers /////////////////////////////////////////////////
+
 func HTMLEscape(dst *bytes.Buffer, src []byte) {
 	formatter := &lowmemjson.ReEncoder{
 		Out: dst,
@@ -101,12 +111,12 @@ func Valid(data []byte) bool {
 	return err == nil
 }
 
+// Decode wrappers ///////////////////////////////////////////////////
+
 func Unmarshal(data []byte, ptr any) error {
 	return NewDecoder(bytes.NewReader(data)).Decode(ptr)
 }
 
-/////////////////////////////////////////////////////////////////////
-
 type Decoder struct {
 	*lowmemjson.Decoder
 	buf *bufio.Reader