fix pretty printing

emberjson/array.mojo

@@ -63,15 +63,15 @@ struct Array(Sized, JsonValue):
                 (",").write_to(writer)
         ("]").write_to(writer)
 
-    fn pretty_to[W: Writer](self, mut writer: W, indent: String):
+    fn pretty_to[W: Writer](self, mut writer: W, indent: String, *, curr_depth: Int = 0):
         writer.write("[\n")
-        self._pretty_write_items(writer, indent)
+        self._pretty_write_items(writer, indent, curr_depth + 1)
         writer.write("]")
 
-    fn _pretty_write_items[W: Writer](self, mut writer: W, indent: String):
+    fn _pretty_write_items[W: Writer](self, mut writer: W, indent: String, curr_depth: Int):
         for i in range(len(self._data)):
-            writer.write(indent)
-            self._data[i]._pretty_to_as_element(writer, indent)
+            writer.write(indent * curr_depth)
+            self._data[i]._pretty_to_as_element(writer, indent, curr_depth)
             if i < len(self._data) - 1:
                 writer.write(",")
             writer.write("\n")

emberjson/json.mojo

@@ -168,7 +168,7 @@ struct JSON(JsonValue, Sized, PrettyPrintable):
         else:
             writer.write(self.array())
 
-    fn pretty_to[W: Writer](self, mut writer: W, indent: String):
+    fn pretty_to[W: Writer](self, mut writer: W, indent: String, *, curr_depth: Int = 0):
         """Write the pretty representation to a writer.
 
         Args:
@@ -177,9 +177,9 @@ struct JSON(JsonValue, Sized, PrettyPrintable):
                     if a string then use the given string to indent.
         """
         if self.is_object():
-            self.object().pretty_to(writer, indent)
+            self.object().pretty_to(writer, indent, curr_depth=curr_depth)
         else:
-            self.array().pretty_to(writer, indent)
+            self.array().pretty_to(writer, indent, curr_depth=curr_depth)
 
     @always_inline
     fn __str__(self) -> String:

emberjson/object.mojo

@@ -79,17 +79,17 @@ struct Object(Sized, JsonValue, PrettyPrintable):
 
         ("}").write_to(writer)
 
-    fn pretty_to[W: Writer](self, mut writer: W, indent: String):
+    fn pretty_to[W: Writer](self, mut writer: W, indent: String, *, curr_depth: Int = 0):
         writer.write("{\n")
-        self._pretty_write_items(writer, indent)
+        self._pretty_write_items(writer, indent, curr_depth + 1)
         writer.write("}")
 
-    fn _pretty_write_items[W: Writer](self, mut writer: W, indent: String):
+    fn _pretty_write_items[W: Writer](self, mut writer: W, indent: String, curr_depth: Int):
         try:
             var done = 0
             for k in self._data:
-                writer.write(indent, '"', k[], '"', ": ")
-                self[k[]]._pretty_to_as_element(writer, indent)
+                writer.write(indent * curr_depth, '"', k[], '"', ": ")
+                self[k[]]._pretty_to_as_element(writer, indent, curr_depth)
                 if done < len(self._data) - 1:
                     writer.write(",")
                 writer.write("\n")

emberjson/parser_helper.mojo

@@ -113,7 +113,7 @@ fn copy_to_string(out s: String, p: BytePtr, length: Int):
     memcpy(l.unsafe_ptr(), p, length)
     l.size = length
     l.append(0)
-    s = l^
+    s = String(l^)
 
 
 @always_inline

emberjson/traits.mojo

@@ -2,7 +2,7 @@ from utils import Variant
 
 
 trait PrettyPrintable:
-    fn pretty_to[W: Writer](self, mut writer: W, indent: String):
+    fn pretty_to[W: Writer](self, mut writer: W, indent: String, *, curr_depth: Int = 0):
         ...
 
 

emberjson/value.mojo

@@ -52,6 +52,13 @@ struct Value(JsonValue):
     fn __init__(out self, owned v: Self.Type):
         self._data = v^
 
+    @implicit
+    fn __init__(out self, owned j: JSON):
+        if j.is_object():
+            self._data = j.object()
+        else:
+            self._data = j.array()
+
     @implicit
     fn __init__(out self, v: Int):
         self._data = v
@@ -170,23 +177,23 @@ struct Value(JsonValue):
         elif self.isa[Array]():
             writer.write(self.array())
 
-    fn _pretty_to_as_element[W: Writer](self, mut writer: W, indent: String):
+    fn _pretty_to_as_element[W: Writer](self, mut writer: W, indent: String, curr_depth: Int):
         if self.isa[Object]():
             writer.write("{\n")
-            self.object()._pretty_write_items(writer, indent * 2)
-            writer.write(indent, "}")
+            self.object()._pretty_write_items(writer, indent, curr_depth + 1)
+            writer.write(indent * curr_depth, "}")
         elif self.isa[Array]():
             writer.write("[\n")
-            self.array()._pretty_write_items(writer, indent * 2)
-            writer.write(indent, "]")
+            self.array()._pretty_write_items(writer, indent, curr_depth + 1)
+            writer.write(indent * curr_depth, "]")
         else:
             self.write_to(writer)
 
-    fn pretty_to[W: Writer](self, mut writer: W, indent: String):
+    fn pretty_to[W: Writer](self, mut writer: W, indent: String, *, curr_depth: Int = 0):
         if self.isa[Object]():
-            self.object().pretty_to(writer, indent)
+            self.object().pretty_to(writer, indent, curr_depth=curr_depth)
         elif self.isa[Array]():
-            self.array().pretty_to(writer, indent)
+            self.array().pretty_to(writer, indent, curr_depth=curr_depth)
         else:
             self.write_to(writer)