Merge pull request #120 from fauna/revert-to-string

Revert ToString

Author: Eduardo V. Bruno

CHANGELOG.md

@@ -3,7 +3,6 @@
 - Add `Reverse` function
 - Add new Fauna attributes annotations:`FaunaString`, `FaunaTime`, and `FaunaDate`
 - implicit `BytesV` conversion from `bytes[]`
-- Improve `ToString` for Fauna types
 - Support versioned lambdas
 
 ## 2.12.0

FaunaDB.Client.Test/EncoderTest.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using FaunaDB.Query;
 using FaunaDB.Types;
 using NUnit.Framework;
 
@@ -398,49 +397,5 @@ public void TestStringOverride()
                 Encode(new StringOverride(testUri, testGuid))
             );
         }
-
-        [Test]
-        public void TestToStringTypes()
-        {
-            Assert.AreEqual(
-                "SetRef({\"match\": Ref(id=\"spells_by_element\", collection=Ref(id=\"indexes\")), \"terms\": \"water\"})",
-                new SetRefV(new Dictionary<string, Value>() {
-                    { "terms", StringV.Of("water") },
-                    { "match", new RefV("spells_by_element", new RefV("indexes")) }
-                }).ToString()
-            );
-
-            Assert.AreEqual("true", BooleanV.Of(true).ToString());
-            Assert.AreEqual("3.14", DoubleV.Of(3.14).ToString());
-            Assert.AreEqual("42", LongV.Of(42).ToString());
-            Assert.AreEqual("null", NullV.Instance.ToString());
-            Assert.AreEqual("Date(\"2001-01-01\")", new DateV("2001-01-01").ToString());
-            Assert.AreEqual("Time(\"2000-01-01T01:10:30.123Z\")", new TimeV("2000-01-01T01:10:30.123Z").ToString());
-            Assert.AreEqual(@"[1, 3.14, true, ""foo bar"", ""my \""quote""]", ArrayV.Of(1, 3.14, true, "foo bar", "my \"quote").ToString());
-            Assert.AreEqual("Bytes(0x01, 0x02, 0x03)", BytesV.Of(0x1, 0x2, 0x3).ToString());
-
-            Assert.AreEqual("{\"answer\": 42, \"question\": \"meaning\"}",
-                ObjectV.With("answer", 42, "question", "meaning").ToString());
-            Assert.AreEqual("{\"answer\": 42, \"question\": \"meaning\"}",
-                ObjectV.With("question", "meaning", "answer", 42).ToString());
-
-            Assert.AreEqual(
-               "Query({\"api_version\": \"3\", \"expr\": {\"add\": [{\"var\": \"x\"}, 1]}, \"lambda\": \"x\"})",
-                new QueryV(new Dictionary<string, Expr>() {
-                     {"lambda", StringV.Of("x")},
-                     {"expr", ObjectV.With("add", ArrayV.Of(ObjectV.With("var", "x"), 1))},
-                     { "api_version", StringV.Of("3") }
-               }).ToString()
-           );
-
-            Assert.AreEqual(
-               "Query({\"api_version\": \"3\", \"expr\": {\"add\": [{\"var\": \"x\"}, 1, 3.14]}, \"lambda\": \"x\"})",
-                new QueryV(new Dictionary<string, Expr>() {
-                         {"lambda", "x"},
-                         {"expr", Add(Var("x"), 1, 3.14)},
-                         { "api_version", "3" }
-               }).ToString()
-           );
-        }
     }
 }

FaunaDB.Client/Collections/DictionaryExtension.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Linq;
+using System.Linq;
 using System.Collections.Generic;
 
 namespace FaunaDB.Collections
@@ -26,24 +25,6 @@ public static bool DictEquals<TKey, TValue>(this IReadOnlyDictionary<TKey, TValu
 
         public static Dictionary<TKey, TValue> FilterNulls<TKey, TValue>(this Dictionary<TKey, TValue> dict) =>
             dict.Where(kv => kv.Value != null).ToDictionary(kv => kv.Key, kv => kv.Value);
-
-        public static string Debug<TKey, TValue>(this IReadOnlyDictionary<TKey, TValue> source)
-            where TKey: IComparable
-        {
-            List<TKey> elements = source.Keys.ToList();
-            elements.Sort();
-
-            string[] result = new string[elements.Count];
-
-            for (int i = 0; i < result.Length; i++)
-            {
-                var key = elements[i];
-                var value = source[key].ToString();
-                result[i] = $"\"{key}\": {value}";
-            }
-
-            return string.Join(", ", result);
-        }
     }
 }
 

FaunaDB.Client/Query/Unescaped.cs

@@ -36,8 +36,8 @@ protected internal override void WriteJson(JsonWriter writer) =>
 
         public override string ToString()
         {
-            var props = Values.Debug();
-            return $"{{{props}}}";
+            var props = string.Join(",", from kv in Values select $"{kv.Key}: {kv.Value}");
+            return $"UObject({props})";
         }
 
         public static UnescapedObject With(Dictionary<string, Expr> exprs) =>
@@ -101,6 +101,6 @@ protected internal override void WriteJson(JsonWriter writer) =>
             writer.WriteArray(Value);
 
         public override string ToString() =>
-            $"[{string.Join(", ", Value)}]";
+            $"UArr({string.Join(", ", Value)})";
     }
 }

FaunaDB.Client/Types/ArrayV.cs

@@ -81,7 +81,7 @@ protected override int HashCode() =>
             HashUtil.Hash(Value);
 
         public override string ToString() =>
-            $"[{string.Join(", ", Value)}]";
+            $"Arr({string.Join(", ", Value)})";
         #endregion
     }
 }

FaunaDB.Client/Types/BytesV.cs

@@ -48,7 +48,7 @@ protected internal override void WriteJson(JsonWriter writer)
         public override string ToString()
         {
             var str = Value.Select(b => string.Format("0x{0:x2}", b));
-            return "Bytes(" + string.Join(", ", str) + ")";
+            return "BytesV(" + string.Join(", ", str) + ")";
         }
 
         /// <summary>

FaunaDB.Client/Types/NullV.cs

@@ -22,7 +22,7 @@ public override bool Equals(Expr v) =>
             object.ReferenceEquals(this, v);
 
         public override string ToString() =>
-            "null";
+            "NullV";
 
         protected override int HashCode() =>
             0;

FaunaDB.Client/Types/ObjectV.cs

@@ -78,8 +78,8 @@ protected override int HashCode() =>
 
         public override string ToString()
         {
-            var props = Value.Debug();
-            return $"{{{props}}}";
+            var props = string.Join(",", from kv in Value select $"{kv.Key}: {kv.Value}");
+            return $"ObjectV({props})";
         }
         #endregion
 

FaunaDB.Client/Types/QueryV.cs

@@ -30,11 +30,5 @@ public override bool Equals(Expr v)
             var w = v as QueryV;
             return w != null && Value.DictEquals(w.Value);
         }
-
-        public override string ToString()
-        {
-            var content = Value.Debug();
-            return $"Query({{{content}}})";
-        }
     }
 }

FaunaDB.Client/Types/RefV.cs

@@ -62,10 +62,10 @@ protected override int HashCode() =>
 
         public override string ToString()
         {
-            var cls = Collection != null ? $", collection={Collection}" : string.Empty;
-            var db = Database != null ? $", database={Database}" : string.Empty;
+            var cls = Collection != null ? $", collection = {Collection}" : string.Empty;
+            var db = Database != null ? $", database = {Database}" : string.Empty;
 
-            return $"Ref(id=\"{Id}\"{cls}{db})";
+            return $"RefV(id = \"{Id}\"{cls}{db})";
         }
     }