Refactor and optimize code

Author: zhossain-info

JsonSchema/JsonSchema.csproj

@@ -8,7 +8,7 @@
         <Version>1.1.0</Version>
         <PackageVersion>1.1.0</PackageVersion>
         <AssemblyVersion>1.1.0</AssemblyVersion>
-        <PackageTags>JsonSchema;Schema;Validation;Json</PackageTags>
+        <PackageTags>JsonSchema;Schema;Json;Validation;Assert;Test</PackageTags>
         <Copyright>Copyright © Relogic Labs. All rights reserved.</Copyright>
         <NeutralLanguage>en</NeutralLanguage>
         <AssemblyName>RelogicLabs.JsonSchema</AssemblyName>

JsonSchema/RelogicLabs/JsonSchema/Functions/CoreFunctions1.cs

@@ -16,7 +16,7 @@ public bool Length(JString target, JInteger length)
         if(_length != length) return FailWith(new JsonSchemaException(
                 new ErrorDetail(SLEN01, "Invalid string length"),
                 new ExpectedDetail(Function, $"length {length}"),
-                new ActualDetail(target, $"found {_length} for \"{target}\"")));
+                new ActualDetail(target, $"found {_length} for {target}")));
         return true;
     }
 
@@ -26,7 +26,7 @@ public bool Length(JArray target, JInteger length)
         if(_length != length) return FailWith(new JsonSchemaException(
                 new ErrorDetail(ALEN01, "Invalid array length"),
                 new ExpectedDetail(Function, $"length {length}"),
-                new ActualDetail(target, $"found {_length} for {target.ToOutline()}")));
+                new ActualDetail(target, $"found {_length} for {target.GetOutline()}")));
         return true;
     }
 
@@ -36,7 +36,7 @@ public bool Length(JObject target, JInteger length)
         if(_length != length) return FailWith(new JsonSchemaException(
                 new ErrorDetail(OLEN01, "Invalid object size or length"),
                 new ExpectedDetail(Function, $"length {length}"),
-                new ActualDetail(target, $"found {_length} for {target.ToOutline()}")));
+                new ActualDetail(target, $"found {_length} for {target.GetOutline()}")));
         return true;
     }
 
@@ -45,12 +45,12 @@ public bool Length(JString target, JInteger minimum, JInteger maximum)
         var length = target.Value.Length;
         if(length < minimum)
             return FailWith(new JsonSchemaException(new ErrorDetail(SLEN02, 
-                    $"String \"{target.ToOutline()}\" length is outside of range"),
+                    $"String {target.GetOutline()} length is outside of range"),
                 new ExpectedDetail(Function, $"length in range [{minimum}, {maximum}]"),
                 new ActualDetail(target, $"found {length} that is less than {minimum}")));
         if(length > maximum)
             return FailWith(new JsonSchemaException(new ErrorDetail(SLEN03,
-                    $"String {target.ToOutline()} length is outside of range"),
+                    $"String {target.GetOutline()} length is outside of range"),
                 new ExpectedDetail(Function, $"length in range [{minimum}, {maximum}]"),
                 new ActualDetail(target, $"found {length} that is greater than {maximum}")));
         return true;
@@ -61,7 +61,7 @@ public bool Length(JString target, JInteger minimum, JUndefined undefined)
         var length = target.Value.Length;
         if(length < minimum)
             return FailWith(new JsonSchemaException(new ErrorDetail(SLEN04,
-                    $"String \"{target.ToOutline()}\" length is outside of range"),
+                    $"String {target.GetOutline()} length is outside of range"),
                 new ExpectedDetail(Function, $"length in range [{minimum}, {undefined}]"),
                 new ActualDetail(target, $"found {length} that is less than {minimum}")));
         return true;
@@ -72,7 +72,7 @@ public bool Length(JString target, JUndefined undefined, JInteger maximum)
         var length = target.Value.Length;
         if(length > maximum)
             return FailWith(new JsonSchemaException(new ErrorDetail(SLEN05,
-                    $"String \"{target.ToOutline()}\" length is outside of range"),
+                    $"String {target.GetOutline()} length is outside of range"),
                 new ExpectedDetail(Function, $"length in range [{undefined}, {maximum}]"),
                 new ActualDetail(target, $"found {length} that is greater than {maximum}")));
         return true;
@@ -83,12 +83,12 @@ public bool Length(JArray target, JInteger minimum, JInteger maximum)
         var length = target.Elements.Count;
         if(length < minimum)
             return FailWith(new JsonSchemaException(new ErrorDetail(ALEN02,
-                    $"Array {target.ToOutline()} length is outside of range"),
+                    $"Array {target.GetOutline()} length is outside of range"),
                 new ExpectedDetail(Function, $"length in range [{minimum}, {maximum}]"),
                 new ActualDetail(target, $"found {length} that is less than {minimum}")));
         if(length > maximum)
             return FailWith(new JsonSchemaException(new ErrorDetail(ALEN03,
-                    $"Array {target.ToOutline()} length is outside of range"),
+                    $"Array {target.GetOutline()} length is outside of range"),
                 new ExpectedDetail(Function, $"length in range [{minimum}, {maximum}]"),
                 new ActualDetail(target, $"found {length} that is greater than {maximum}")));
         return true;
@@ -99,7 +99,7 @@ public bool Length(JArray target, JInteger minimum, JUndefined undefined)
         var length = target.Elements.Count;
         if(length < minimum)
             return FailWith(new JsonSchemaException(new ErrorDetail(ALEN04,
-                    $"Array {target.ToOutline()} length is outside of range"),
+                    $"Array {target.GetOutline()} length is outside of range"),
                 new ExpectedDetail(Function, $"length in range [{minimum}, {undefined}]"),
                 new ActualDetail(target, $"found {length} that is less than {minimum}")));
         return true;
@@ -110,7 +110,7 @@ public bool Length(JArray target, JUndefined undefined, JInteger maximum)
         var length = target.Elements.Count;
         if(length > maximum)
             return FailWith(new JsonSchemaException(new ErrorDetail(ALEN05,
-                    $"Array {target.ToOutline()} length is outside of range"),
+                    $"Array {target.GetOutline()} length is outside of range"),
                 new ExpectedDetail(Function, $"length in range [{undefined}, {maximum}]"),
                 new ActualDetail(target, $"found {length} that is greater than {maximum}")));
         return true;
@@ -121,12 +121,12 @@ public bool Length(JObject target, JInteger minimum, JInteger maximum)
         var length = target.Properties.Count;
         if(length < minimum)
             return FailWith(new JsonSchemaException(new ErrorDetail(OLEN02,
-                    $"Object {target.ToOutline()} size or length is outside of range"),
+                    $"Object {target.GetOutline()} size or length is outside of range"),
                 new ExpectedDetail(Function, $"length in range [{minimum}, {maximum}]"),
                 new ActualDetail(target, $"found {length} that is less than {minimum}")));
         if(length > maximum)
             return FailWith(new JsonSchemaException(new ErrorDetail(OLEN03,
-                    $"Object {target.ToOutline()} size or length is outside of range"),
+                    $"Object {target.GetOutline()} size or length is outside of range"),
                 new ExpectedDetail(Function, $"length in range [{minimum}, {maximum}]"),
                 new ActualDetail(target, $"found {length} that is greater than {maximum}")));
         return true;
@@ -137,7 +137,7 @@ public bool Length(JObject target, JInteger minimum, JUndefined undefined)
         var length = target.Properties.Count;
         if(length < minimum)
             return FailWith(new JsonSchemaException(new ErrorDetail(OLEN04,
-                    $"Object {target.ToOutline()} size or length is outside of range"),
+                    $"Object {target.GetOutline()} size or length is outside of range"),
                 new ExpectedDetail(Function, $"length in range [{minimum}, {undefined}]"),
                 new ActualDetail(target, $"found {length} that is less than {minimum}")));
         return true;
@@ -148,7 +148,7 @@ public bool Length(JObject target, JUndefined undefined, JInteger maximum)
         var length = target.Properties.Count;
         if(length > maximum)
             return FailWith(new JsonSchemaException(new ErrorDetail(OLEN05,
-                    $"Object {target.ToOutline()} size or length is outside of range"),
+                    $"Object {target.GetOutline()} size or length is outside of range"),
                 new ExpectedDetail(Function, $"length in range [{undefined}, {maximum}]"),
                 new ActualDetail(target, $"found {length} that is greater than {maximum}")));
         return true;

JsonSchema/RelogicLabs/JsonSchema/Functions/CoreFunctions2.cs

@@ -11,30 +11,28 @@ public partial class CoreFunctions
     public bool Enum(JString target, params JString[] items)
     {
         if(!items.Contains(target))
-            return FailWith(new JsonSchemaException(new ErrorDetail(ENUM01, 
-                    "String is not in enum list"),
-                new ExpectedDetail(Function, $"string in list {items.Select(s => s.ToJson())
-                    .ToString(", ", "[", "]")}"),
-                new ActualDetail(target, $"string {target} is not found in list")));
+            return FailWith(new JsonSchemaException(
+                new ErrorDetail(ENUM01, "String is not in enum list"),
+                new ExpectedDetail(Function, $"string in list {items.ToString(", ", "[", "]")}"),
+                new ActualDetail(target, $"string {target.GetOutline()} is not found in list")));
         return true;
     }
 
     public bool Enum(JNumber target, params JNumber[] items)
     {
         if(!items.Contains(target))
-            return FailWith(new JsonSchemaException(new ErrorDetail(ENUM02, 
-                    "Number is not in enum list"),
-                new ExpectedDetail(Function, $"number in list {items.Select(s => s.ToJson())
-                    .ToString(", ", "[", "]")}"),
+            return FailWith(new JsonSchemaException(
+                new ErrorDetail(ENUM02, "Number is not in enum list"),
+                new ExpectedDetail(Function, $"number in list {items.ToString(", ", "[", "]")}"),
                 new ActualDetail(target, $"number {target} is not found in list")));
         return true;
     }
 
     public bool Positive(JNumber target)
     {
         if(target.Compare(0) <= 0)
-            return FailWith(new JsonSchemaException(new ErrorDetail(POSI01, 
-                    "Number is not positive"),
+            return FailWith(new JsonSchemaException(
+                new ErrorDetail(POSI01, "Number is not positive"),
                 new ExpectedDetail(Function, "a positive number"),
                 new ActualDetail(target, $"number {target} is less than or equal to zero")));
         return true;
@@ -43,8 +41,8 @@ public bool Positive(JNumber target)
     public bool Negative(JNumber target)
     {
         if(target.Compare(0) >= 0)
-            return FailWith(new JsonSchemaException(new ErrorDetail(NEGI01, 
-                    "Number is not negative"),
+            return FailWith(new JsonSchemaException(
+                new ErrorDetail(NEGI01, "Number is not negative"),
                 new ExpectedDetail(Function, "a negative number"),
                 new ActualDetail(target, $"number {target} is greater than or equal to zero")));
         return true;
@@ -53,13 +51,13 @@ public bool Negative(JNumber target)
     public bool Range(JNumber target, JNumber minimum, JNumber maximum)
     {
         if(target.Compare(minimum) < 0)
-            return FailWith(new JsonSchemaException(new ErrorDetail(RANG01, 
-                    "Number is outside of range"),
+            return FailWith(new JsonSchemaException(
+                new ErrorDetail(RANG01, "Number is outside of range"),
                 new ExpectedDetail(Function, $"number in range [{minimum}, {maximum}]"),
                 new ActualDetail(target, $"number {target} is less than {minimum}")));
         if(target.Compare(maximum) > 0)
-            return FailWith(new JsonSchemaException(new ErrorDetail(RANG02,
-                    $"Number is outside of range"),
+            return FailWith(new JsonSchemaException(
+                new ErrorDetail(RANG02, "Number is outside of range"),
                 new ExpectedDetail(Function, $"number in range [{minimum}, {maximum}]"),
                 new ActualDetail(target, $"number {target} is greater than {maximum}")));
         return true;
@@ -68,8 +66,8 @@ public bool Range(JNumber target, JNumber minimum, JNumber maximum)
     public bool Range(JNumber target, JNumber minimum, JUndefined undefined)
     {
         if(target.Compare(minimum) < 0)
-            return FailWith(new JsonSchemaException(new ErrorDetail(RANG03, 
-                    "Number is outside of range"),
+            return FailWith(new JsonSchemaException(
+                new ErrorDetail(RANG03, "Number is outside of range"),
                 new ExpectedDetail(Function, $"number in range [{minimum}, {undefined}]"),
                 new ActualDetail(target, $"number {target} is less than {minimum}")));
         return true;
@@ -78,8 +76,8 @@ public bool Range(JNumber target, JNumber minimum, JUndefined undefined)
     public bool Range(JNumber target, JUndefined undefined, JNumber maximum)
     {
         if(target.Compare(maximum) > 0)
-            return FailWith(new JsonSchemaException(new ErrorDetail(RANG04, 
-                    "Number is outside of range"),
+            return FailWith(new JsonSchemaException(
+                new ErrorDetail(RANG04, "Number is outside of range"),
                 new ExpectedDetail(Function, $"number in range [{undefined}, {maximum}]"),
                 new ActualDetail(target, $"number {target} is greater than {maximum}")));
         return true;