XXX: REMOVE: Ugly fix to test sorting

Author: apelisse

pkg/internal/third_party/go-json-experiment/json/arshal_any.go

@@ -4,7 +4,10 @@
 
 package json
 
-import "reflect"
+import (
+	"reflect"
+	"sort"
+)
 
 // This files contains an optimized marshal and unmarshal implementation
 // for the any type. This type is often used when the Go program has
@@ -94,16 +97,22 @@ func marshalObjectAny(mo MarshalOptions, enc *Encoder, obj map[string]any) error
 	if err := enc.WriteToken(ObjectStart); err != nil {
 		return err
 	}
+	// XXX: Do we need this part? Probably ...
+	keys := make([]string, 0, len(obj))
+	for key := range obj {
+		keys = append(keys, key)
+	}
+	sort.Strings(keys)
 	// A Go map guarantees that each entry has a unique key
 	// The only possibility of duplicates is due to invalid UTF-8.
 	if !enc.options.AllowInvalidUTF8 {
 		enc.tokens.last.disableNamespace()
 	}
-	for name, val := range obj {
+	for _, name := range keys {
 		if err := enc.WriteToken(String(name)); err != nil {
 			return err
 		}
-		if err := marshalValueAny(mo, enc, val); err != nil {
+		if err := marshalValueAny(mo, enc, obj[name]); err != nil {
 			return err
 		}
 	}

pkg/internal/third_party/go-json-experiment/json/arshal_default.go

@@ -12,6 +12,7 @@ import (
 	"fmt"
 	"math"
 	"reflect"
+	"sort"
 	"strconv"
 	"sync"
 )
@@ -648,15 +649,20 @@ func makeMapArshaler(t reflect.Type) *arshaler {
 			// See https://go.dev/cl/400675.
 			iter := getMapIter(va.Value)
 			defer putMapIter(iter)
-			for iter.Next() {
-				k.SetIterKey(iter)
+			// XXX: SAD SAD SAD, I have to allocate, cache and sort ...
+			keys := va.Value.MapKeys()
+			sort.Slice(keys, func(i, j int) bool {
+				return keys[i].String() < keys[j].String()
+			})
+			for _, key := range keys {
+				k.Set(key)
 				if err := marshalKey(mko, enc, k); err != nil {
 					// TODO: If err is errMissingName, then wrap it as a
 					// SemanticError since this key type cannot be serialized
 					// as a JSON string.
 					return err
 				}
-				v.SetIterValue(iter)
+				v.Set(va.MapIndex(key))
 				if err := marshalVal(mo, enc, v); err != nil {
 					return err
 				}

pkg/internal/third_party/go-json-experiment/json/arshal_inlined.go

@@ -7,6 +7,7 @@ package json
 import (
 	"errors"
 	"reflect"
+	"sort"
 )
 
 // This package supports "inlining" a Go struct field, where the contents
@@ -94,8 +95,13 @@ func marshalInlinedFallbackAll(mo MarshalOptions, enc *Encoder, va addressableVa
 		}
 		m := v
 		mv := newAddressableValue(m.Type().Elem())
-		for iter := m.MapRange(); iter.Next(); {
-			b, err := appendString(enc.UnusedBuffer(), iter.Key().String(), !enc.options.AllowInvalidUTF8, nil)
+
+		keys := m.MapKeys()
+		sort.Slice(keys, func(i, j int) bool {
+			return keys[i].String() < keys[j].String()
+		})
+		for _, key := range keys {
+			b, err := appendString(enc.UnusedBuffer(), key.String(), !enc.options.AllowInvalidUTF8, nil)
 			if err != nil {
 				return err
 			}
@@ -110,7 +116,7 @@ func marshalInlinedFallbackAll(mo MarshalOptions, enc *Encoder, va addressableVa
 				return err
 			}
 
-			mv.Set(iter.Value())
+			mv.Set(m.MapIndex(key))
 			marshal := f.fncs.marshal
 			if mo.Marshalers != nil {
 				marshal, _ = mo.Marshalers.lookup(marshal, mv.Type())