Add sortKeys: Boolean flag to ujson/upickle APIs

build.sc

@@ -26,7 +26,7 @@ val sourcecode = "0.3.0"
 val dottyCustomVersion = Option(sys.props("dottyVersion"))
 
 val scala2JVMVersions = Seq(scala212, scala213)
-val scalaVersions = scala2JVMVersions ++ Seq(scala3) ++ dottyCustomVersion
+val scalaVersions = scala2JVMVersions// ++ Seq(scala3) ++ dottyCustomVersion
 
 trait CommonPlatformModule extends ScalaModule with PlatformScalaModule{
 

ujson/src/ujson/AstTransformer.scala

@@ -5,7 +5,7 @@ import upickle.core.compat._
 
 import scala.language.higherKinds
 
-trait AstTransformer[I] extends Transformer[I] with JsVisitor[I, I]{
+trait AstTransformer[I] extends ujson.Transformer[I] with JsVisitor[I, I]{
   def apply(t: Readable): I = t.transform(this)
 
   def transformArray[T](f: Visitor[_, T], items: Iterable[I]) = {

ujson/src/ujson/IndexedValue.scala

@@ -10,10 +10,12 @@ import upickle.core.{Visitor, ObjVisitor, ArrVisitor, Abort, AbortException}
   * want to work with an AST but still provide source-index error positions if
   * something goes wrong
   */
+@deprecated("Left for binary compatibility, use upickle.core.BufferedValue instead", "upickle after 3.1.4")
 sealed trait IndexedValue {
   def index: Int
 }
 
+@deprecated("Left for binary compatibility, use upickle.core.BufferedValue instead", "upickle after 3.1.4")
 object IndexedValue extends Transformer[IndexedValue]{
 
   case class Str(index: Int, value0: java.lang.CharSequence) extends IndexedValue

ujson/src/ujson/Readable.scala

@@ -10,7 +10,10 @@ trait Readable {
   def transform[T](f: Visitor[_, T]): T
 }
 
-object Readable extends ReadableLowPri{
+object Readable extends ReadableLowPri with Transformer[Readable]{
+  def transform[T](j: ujson.Readable, f: upickle.core.Visitor[_, T]): T = {
+    j.transform(f) 
+  }
   case class fromTransformer[T](t: T, w: Transformer[T]) extends Readable{
     def transform[T](f: Visitor[_, T]): T = {
       w.transform(t, f)

ujson/src/ujson/Transformer.scala

@@ -1,7 +1,6 @@
 package ujson
 import upickle.core.Visitor
 
-trait Transformer[I] {
-  def transform[T](j: I, f: Visitor[_, T]): T
+trait Transformer[I] extends upickle.core.Transformer[I]{
   def transformable[T](j: I) = Readable.fromTransformer(j, this)
 }

ujson/src/ujson/package.scala

@@ -1,8 +1,16 @@
 import upickle.core.NoOpVisitor
+import upickle.core.BufferedValue
 
 package object ujson{
-  def transform[T](t: Readable, v: upickle.core.Visitor[_, T]) = t.transform(v)
+  def transform[T](t: Readable,
+                   v: upickle.core.Visitor[_, T],
+                   sortKeys: Boolean = false): T = {
+    BufferedValue.maybeSortKeysTransform(Readable, t, sortKeys, v)
+  }
 
+//  @deprecated("Binary Compatibility Stub", "upickle after 3.1.4")
+  def transform[T](t: Readable,
+                   v: upickle.core.Visitor[_, T]): T = transform(t, v, sortKeys = false)
   /**
     * Read the given JSON input as a JSON struct
     */
@@ -16,36 +24,71 @@ package object ujson{
     */
   def write(t: Value.Value,
             indent: Int = -1,
-            escapeUnicode: Boolean = false): String = {
+            escapeUnicode: Boolean = false,
+            sortKeys: Boolean = false): String = {
     val writer = new java.io.StringWriter
-    writeTo(t, writer, indent, escapeUnicode)
+    writeTo(t, writer, indent, escapeUnicode, sortKeys)
     writer.toString
   }
 
+  // @deprecated("Binary Compatibility Stub", "upickle after 3.1.4")
+  def write(t: Value.Value,
+            indent: Int,
+            escapeUnicode: Boolean): String = {
+    write(t, indent, escapeUnicode, sortKeys = false)
+  }
+
   /**
     * Write the given JSON struct as a JSON String to the given Writer
     */
   def writeTo(t: Value.Value,
               out: java.io.Writer,
               indent: Int = -1,
-              escapeUnicode: Boolean = false): Unit = {
-    transform(t, Renderer(out, indent, escapeUnicode))
+              escapeUnicode: Boolean = false,
+              sortKeys: Boolean = false): Unit = {
+    transform(t, Renderer(out, indent, escapeUnicode), sortKeys)
+  }
+
+  // @deprecated("Binary Compatibility Stub", "upickle after 3.1.4")
+  def writeTo(t: Value.Value,
+              out: java.io.Writer,
+              indent: Int,
+              escapeUnicode: Boolean): Unit = {
+    writeTo(t, out, indent, escapeUnicode, sortKeys = false)
   }
+
   def writeToOutputStream(t: Value.Value,
                           out: java.io.OutputStream,
                           indent: Int = -1,
-                          escapeUnicode: Boolean = false): Unit = {
-    transform(t, new BaseByteRenderer(out, indent, escapeUnicode))
+                          escapeUnicode: Boolean = false,
+                          sortKeys: Boolean = false): Unit = {
+    transform(t, new BaseByteRenderer(out, indent, escapeUnicode), sortKeys)
+  }
+
+  // @deprecated("Binary Compatibility Stub", "upickle after 3.1.4")
+  def writeToOutputStream(t: Value.Value,
+                          out: java.io.OutputStream,
+                          indent: Int,
+                          escapeUnicode: Boolean): Unit = {
+    writeToOutputStream(t, out, indent, escapeUnicode, sortKeys = false)
   }
 
   def writeToByteArray(t: Value.Value,
                        indent: Int = -1,
-                       escapeUnicode: Boolean = false) = {
+                       escapeUnicode: Boolean = false,
+                       sortKeys: Boolean = false): Array[Byte] = {
     val baos = new java.io.ByteArrayOutputStream
-    writeToOutputStream(t, baos, indent, escapeUnicode)
+    writeToOutputStream(t, baos, indent, escapeUnicode, sortKeys)
     baos.toByteArray
   }
 
+  // @deprecated("Binary Compatibility Stub", "upickle after 3.1.4")
+  def writeToByteArray(t: Value.Value,
+                       indent: Int,
+                       escapeUnicode: Boolean): Array[Byte] = {
+    writeToByteArray(t, indent, escapeUnicode, sortKeys = false)
+  }
+
   /**
     * Parse the given JSON input, failing if it is invalid
     */
@@ -54,17 +97,39 @@ package object ujson{
     * Parse the given JSON input and write it to a string with
     * the configured formatting
     */
-  def reformat(s: Readable, indent: Int = -1, escapeUnicode: Boolean = false): String = {
+  def reformat(s: Readable,
+               indent: Int = -1,
+               escapeUnicode: Boolean = false,
+               sortKeys: Boolean = false): String = {
     val writer = new java.io.StringWriter()
-    reformatTo(s, writer, indent, escapeUnicode)
+    reformatTo(s, writer, indent, escapeUnicode, sortKeys)
     writer.toString
   }
+
+  // @deprecated("Binary Compatibility Stub", "upickle after 3.1.4")
+  def reformat(s: Readable,
+               indent: Int,
+               escapeUnicode: Boolean): String = {
+    reformat(s, indent, escapeUnicode, sortKeys = false)
+  }
   /**
     * Parse the given JSON input and write it to a string with
     * the configured formatting to the given Writer
     */
-  def reformatTo(s: Readable, out: java.io.Writer, indent: Int = -1, escapeUnicode: Boolean = false): Unit = {
-    transform(s, Renderer(out, indent, escapeUnicode))
+  def reformatTo(s: Readable,
+                 out: java.io.Writer,
+                 indent: Int = -1,
+                 escapeUnicode: Boolean = false,
+                 sortKeys: Boolean = false): Unit = {
+    transform(s, Renderer(out, indent, escapeUnicode), sortKeys)
+  }
+
+  // @deprecated("Binary Compatibility Stub", "upickle after 3.1.4")
+  def reformatTo(s: Readable,
+                 out: java.io.Writer,
+                 indent: Int,
+                 escapeUnicode: Boolean): Unit = {
+    reformatTo(s, out, indent, escapeUnicode, sortKeys = false)
   }
   /**
     * Parse the given JSON input and write it to a string with
@@ -73,16 +138,34 @@ package object ujson{
   def reformatToOutputStream(s: Readable,
                              out: java.io.OutputStream,
                              indent: Int = -1,
-                             escapeUnicode: Boolean = false): Unit = {
-    transform(s, new BaseByteRenderer(out, indent, escapeUnicode))
+                             escapeUnicode: Boolean = false,
+                             sortKeys: Boolean = false): Unit = {
+    transform(s, new BaseByteRenderer(out, indent, escapeUnicode), sortKeys)
+  }
+
+  // @deprecated("Binary Compatibility Stub", "upickle after 3.1.4")
+  def reformatToOutputStream(s: Readable,
+                             out: java.io.OutputStream,
+                             indent: Int,
+                             escapeUnicode: Boolean): Unit = {
+    reformatToOutputStream(s, out, indent, escapeUnicode, sortKeys = false)
   }
+
   def reformatToByteArray(s: Readable,
                           indent: Int = -1,
-                          escapeUnicode: Boolean = false) = {
+                          escapeUnicode: Boolean = false,
+                          sortKeys: Boolean = false): Array[Byte] = {
     val baos = new java.io.ByteArrayOutputStream
-    reformatToOutputStream(s, baos, indent, escapeUnicode)
+    reformatToOutputStream(s, baos, indent, escapeUnicode, sortKeys)
     baos.toByteArray
   }
+
+  // @deprecated("Binary Compatibility Stub", "upickle after 3.1.4")
+  def reformatToByteArray(s: Readable,
+                          indent: Int,
+                          escapeUnicode: Boolean): Array[Byte] = {
+    reformatToByteArray(s, indent, escapeUnicode, sortKeys = false)
+  }
   // End ujson
   @deprecated("use ujson.Value")
   type Js = Value

ujson/test/src/ujson/JsonTests.scala

@@ -114,5 +114,32 @@ object JsonTests extends TestSuite {
       reader.getBufferCopyCount() ==> 0
       reader.getBufferLength() ==> bytes.length
     }
+    test("sortKeys"){
+      val raw = """{"d": [{"c": 0, "b": 1}], "a": 2}"""
+      val sorted = """{
+                     |    "a": 2,
+                     |    "d": [
+                     |        {
+                     |            "b": 1,
+                     |            "c": 0
+                     |        }
+                     |    ]
+                     |}""".stripMargin
+      ujson.reformat(raw, indent = 4, sortKeys = true) ==> sorted
+
+      ujson.write(ujson.read(raw), indent = 4, sortKeys = true) ==> sorted
+
+      val baos = new java.io.ByteArrayOutputStream
+      ujson.writeToOutputStream(ujson.read(raw), baos, indent = 4, sortKeys = true)
+      baos.toString ==> sorted
+
+      val writer = new java.io.StringWriter
+      ujson.writeTo(ujson.read(raw), writer, indent = 4, sortKeys = true)
+      writer.toString ==> sorted
+
+      new String(ujson.writeToByteArray(ujson.read(raw), indent = 4, sortKeys = true)) ==> sorted
+
+      new String(ujson.reformatToByteArray(raw, indent = 4, sortKeys = true)) ==> sorted
+    }
   }
 }

upickle/core/src-2.12/upickle/core/compat/SortInPlace.scala

@@ -0,0 +1,9 @@
+package upickle.core.compat
+
+object SortInPlace {
+  def apply[T, B: Ordering](t: collection.mutable.ArrayBuffer[T])(f: T => B): Unit = {
+    val sorted = t.sortBy(f)
+    t.clear()
+    t.appendAll(sorted)
+  }
+}

upickle/core/src-2.13+/upickle/core/LinkedHashMapCompat.scala → upickle/core/src-2.13+/upickle/core/compat/LinkedHashMapCompat.scala

@@ -1,7 +1,7 @@
 package upickle.core.compat
 
-import upickle.core.compat.Factory
 import upickle.core.LinkedHashMap
+import upickle.core.compat.Factory
 
 import scala.collection.mutable
 

upickle/core/src-2.13+/upickle/core/compat/SortInPlace.scala

@@ -0,0 +1,7 @@
+package upickle.core.compat
+
+object SortInPlace {
+  def apply[T, B: scala.Ordering](t: collection.mutable.ArrayBuffer[T])(f: T => B): Unit = {
+    t.sortInPlaceBy(f)
+  }
+}