Fixing a bug with JSON marshalling

CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
 
-# 2.1 - Dec 7th 2022
+# 2.1.1 - Dec 9th 2022
+* Fixing a bug with JSON marshalling
+
+# 2.1.0 - Dec 7th 2022
 * Added support for JSON serialization/deserialization

json.go

@@ -1,6 +1,7 @@
 package orderedmap
 
 import (
+	"bytes"
 	"encoding"
 	"encoding/json"
 	"fmt"
@@ -64,7 +65,21 @@ func (om *OrderedMap[K, V]) MarshalJSON() ([]byte, error) {
 
 	writer.RawByte('}')
 
-	return writer.Buffer.Buf, writer.Error
+	return dumpWriter(&writer)
+}
+
+func dumpWriter(writer *jwriter.Writer) ([]byte, error) {
+	if writer.Error != nil {
+		return nil, writer.Error
+	}
+
+	var buf bytes.Buffer
+	buf.Grow(writer.Size())
+	if _, err := writer.DumpTo(&buf); err != nil {
+		return nil, err
+	}
+
+	return buf.Bytes(), nil
 }
 
 // UnmarshalJSON implements the json.Unmarshaler interface.

json_test.go

@@ -46,10 +46,11 @@ func TestMarshalJSON(t *testing.T) {
 		om.Set(6, "100")
 		om.Set(8, "baz")
 		om.Set(8, "baz")
+		om.Set(9, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque auctor augue accumsan mi maximus, quis viverra massa pretium. Phasellus imperdiet sapien a interdum sollicitudin. Duis at commodo lectus, a lacinia sem.")
 
 		b, err := json.Marshal(om)
 		assert.NoError(t, err)
-		assert.Equal(t, `{"1":"bar","7":"baz","2":28,"3":100,"4":"baz","5":"28","6":"100","8":"baz"}`, string(b))
+		assert.Equal(t, `{"1":"bar","7":"baz","2":28,"3":100,"4":"baz","5":"28","6":"100","8":"baz","9":"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque auctor augue accumsan mi maximus, quis viverra massa pretium. Phasellus imperdiet sapien a interdum sollicitudin. Duis at commodo lectus, a lacinia sem."}`, string(b))
 	})
 
 	t.Run("string key", func(t *testing.T) {