From 28dc29b7b05dc9c7ea1cec577963757f75faa601 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@datawire.io>
Date: Sun, 14 Aug 2022 20:52:33 -0600
Subject: Get the new borrowed tests passing

---
 compat/json/compat.go | 61 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 24 deletions(-)

(limited to 'compat/json')

diff --git a/compat/json/compat.go b/compat/json/compat.go
index 37a0d5b..8dcb266 100644
--- a/compat/json/compat.go
+++ b/compat/json/compat.go
@@ -71,40 +71,46 @@ func Marshal(v any) ([]byte, error) {
 }
 
 type Encoder struct {
-	inner lowmemjson.ReEncoder
+	encoder   lowmemjson.Encoder
+	formatter lowmemjson.ReEncoder
 }
 
 func NewEncoder(w io.Writer) *Encoder {
-	return &Encoder{
-		inner: lowmemjson.ReEncoder{
-			Out:     w,
-			Compact: true,
+	ret := &Encoder{
+		formatter: lowmemjson.ReEncoder{
+			Out: w,
+
+			AllowMultipleValues: true,
+
+			Compact:               true,
+			ForceTrailingNewlines: true,
 		},
 	}
+	ret.encoder.W = &ret.formatter
+	return ret
 }
 
 func (enc *Encoder) Encode(v any) error {
-	if err := convertEncodeError(lowmemjson.Encode(&enc.inner, v)); err != nil {
-		return err
-	}
-	if err := convertEncodeError(enc.inner.Close()); err != nil {
-		return err
+	err := enc.encoder.Encode(v)
+	if err == nil {
+		err = enc.formatter.Close()
 	}
-	return nil
+	return convertEncodeError(err)
 }
 
 func (enc *Encoder) SetEscapeHTML(on bool) {
-	if on {
-		enc.inner.BackslashEscape = nil
-	} else {
-		enc.inner.BackslashEscape = lowmemjson.EscapeJSSafe
+	var escaper lowmemjson.BackslashEscaper
+	if !on {
+		escaper = lowmemjson.EscapeDefaultNonHTMLSafe
 	}
+	enc.encoder.BackslashEscape = escaper
+	enc.formatter.BackslashEscape = escaper
 }
 
 func (enc *Encoder) SetIndent(prefix, indent string) {
-	enc.inner.Compact = prefix == "" && indent == ""
-	enc.inner.Prefix = prefix
-	enc.inner.Indent = indent
+	enc.formatter.Compact = prefix == "" && indent == ""
+	enc.formatter.Prefix = prefix
+	enc.formatter.Indent = indent
 }
 
 // ReEncode wrappers /////////////////////////////////////////////////
@@ -169,12 +175,19 @@ func convertDecodeError(err error) error {
 	if derr, ok := err.(*lowmemjson.DecodeError); ok {
 		switch terr := derr.Err.(type) {
 		case *lowmemjson.DecodeSyntaxError:
-			err = &SyntaxError{
-				msg:    terr.Err.Error(),
-				Offset: terr.Offset,
-			}
-			if errors.Is(terr.Err, io.ErrUnexpectedEOF) {
-				err.(*SyntaxError).msg = "unexpected end of JSON input"
+			switch {
+			case errors.Is(terr.Err, io.EOF):
+				err = io.EOF
+			case errors.Is(terr.Err, io.ErrUnexpectedEOF):
+				err = &SyntaxError{
+					msg:    "unexpected end of JSON input",
+					Offset: terr.Offset,
+				}
+			default:
+				err = &SyntaxError{
+					msg:    terr.Err.Error(),
+					Offset: terr.Offset,
+				}
 			}
 		case *lowmemjson.DecodeTypeError:
 			if typeErr, ok := terr.Err.(*json.UnmarshalTypeError); ok {
-- 
cgit v1.2.3-54-g00ecf