Update exception handlers and messages

Author: zhossain-info

JsonSchema/RelogicLabs/JsonSchema/Message/ContextDetail.cs

@@ -28,4 +28,10 @@ internal static string GetTypeName(JNode node)
             ? jsonNode.Type.Name
             : node.GetType().Name;
     }
+
+    internal static string GetTypeName(Type type)
+    {
+        var jsonType = JsonType.From(type);
+        return jsonType != null ? jsonType.Name : type.Name;
+    }
 }

JsonSchema/RelogicLabs/JsonSchema/Tree/FunctionManager.cs

@@ -4,8 +4,8 @@
 using RelogicLabs.JsonSchema.Message;
 using RelogicLabs.JsonSchema.Types;
 using RelogicLabs.JsonSchema.Utilities;
+using static RelogicLabs.JsonSchema.Message.ContextDetail;
 using static RelogicLabs.JsonSchema.Message.ErrorCode;
-using static RelogicLabs.JsonSchema.Tree.MethodPointer;
 
 namespace RelogicLabs.JsonSchema.Tree;
 
@@ -121,8 +121,8 @@ public bool InvokeFunction(JFunction function, JNode target)
             if(!IsMatch(_parameters[0], target))
             {
                 mismatchMessage = $"Function {function.GetOutline()} is applicable on {
-                    _parameters[0].ParameterType.Name} but applied on {
-                        target.GetType().Name} of {target}";
+                    GetTypeName(_parameters[0].ParameterType)} but applied on {
+                        GetTypeName(target.GetType())} of {target}";
                 continue;
             }
             return method.Invoke(function, AddTarget(schemaArgs, target));

JsonSchema/RelogicLabs/JsonSchema/Types/JValidator.cs

@@ -10,13 +10,13 @@ public class JValidator : JBranch
 {
     public const string OptionalMarker = "?";
     private IEnumerable<JNode> _children = Enumerable.Empty<JNode>()!;
-    
+
     public JNode? Value { get; init; }
     public required IList<JFunction> Functions { get; init; }
     public required IList<JDataType> DataTypes { get; init; }
     public bool Optional { get; init; }
     public override IEnumerable<JNode> Children => _children;
-    
+
     internal JValidator(IDictionary<JNode, JNode> relations) : base(relations) { }
 
     internal override JValidator Initialize()
@@ -59,8 +59,8 @@ private bool MatchDataType(JNode node)
 
     public override string ToString() => (
         $"{Value?.ToString() ?? string.Empty}"
-        + $"{Functions.ToString(" ", " ")}"
-        + $"{DataTypes.ToString(" ", " ")}"
+        + $"{Functions.Join(" ", " ")}"
+        + $"{DataTypes.Join(" ", " ")}"
         + $"{(Optional? $" {OptionalMarker}" : string.Empty)}"
     ).Trim();
 }

JsonSchema/RelogicLabs/JsonSchema/Types/JsonType.cs

@@ -3,16 +3,18 @@
 using RelogicLabs.JsonSchema.Message;
 using RelogicLabs.JsonSchema.Time;
 using RelogicLabs.JsonSchema.Tree;
+using RelogicLabs.JsonSchema.Utilities;
 using static RelogicLabs.JsonSchema.Message.ErrorCode;
 
 namespace RelogicLabs.JsonSchema.Types;
 
 public class JsonType
 {
-    private static readonly Dictionary<string, JsonType> _DataTypes = new();
+    private static readonly Dictionary<string, JsonType> _StringMapTypes = new();
+    private static readonly Dictionary<Type, JsonType> _ClassMapTypes = new();
     private static readonly DateTimeValidator _Iso8601Date = new(DateTimeValidator.ISO_8601_DATE);
     private static readonly DateTimeValidator _Iso8601Time = new(DateTimeValidator.ISO_8601_TIME);
-    
+
     public static readonly JsonType BOOLEAN = new("#boolean", typeof(JBoolean));
     public static readonly JsonType STRING = new("#string", typeof(JString));
     public static readonly JsonType INTEGER = new("#integer", typeof(JInteger));
@@ -25,17 +27,18 @@ public class JsonType
     public static readonly JsonType DATE = new("#date", typeof(JString));
     public static readonly JsonType TIME = new("#time", typeof(JString));
     public static readonly JsonType ANY = new("#any", typeof(IJsonType));
-    
+
     public string Name { get; }
     public Type Type { get; }
 
 
-    internal static JsonType From(ITerminalNode node) 
+    internal static JsonType? From(Type type) => _ClassMapTypes.GetValue(type);
+    internal static JsonType From(ITerminalNode node)
         => From(node.GetText(), Location.From(node.Symbol));
-    
+
     internal static JsonType From(string name, Location location)
     {
-        var result = _DataTypes.TryGetValue(name, out var type);
+        var result = _StringMapTypes.TryGetValue(name, out var type);
         if(!result) throw new InvalidDataTypeException(MessageFormatter.FormatForSchema(
                 DTYP01, $"Invalid data type {name}", location));
         return type!;
@@ -45,7 +48,8 @@ private JsonType(string name, Type type)
     {
         Name = name;
         Type = type;
-        _DataTypes[name] = this;
+        _StringMapTypes[name] = this;
+        _ClassMapTypes.TryAdd(type, this);
     }
 
     public override string ToString() => Name;

JsonSchema/RelogicLabs/JsonSchema/Utilities/CollectionExtension.cs

@@ -5,8 +5,12 @@ namespace RelogicLabs.JsonSchema.Utilities;
 
 internal static class CollectionExtension
 {
-    public static string Join(this IEnumerable<string> source, string separator)
-        => string.Join(separator, source);
+    public static string Join(this IEnumerable<object> source, string separator,
+        string prefix = "", string suffix = "")
+    {
+        var result = string.Join(separator, source);
+        return string.IsNullOrEmpty(result) ? result : $"{prefix}{result}{suffix}";
+    }
 
     public static string ToString(this IEnumerable<JNode> source, string separator,
         string prefix = "", string suffix = "")
@@ -76,4 +80,7 @@ public static IEnumerable<JNode> ContainsValues(
         source.ForEach(p => _values.Remove(p.Value));
         return _values;
     }
+
+    public static TV? GetValue<TK, TV>(this IDictionary<TK, TV> dict, TK key)
+        => dict.TryGetValue(key, out var value) ? value : default;
 }

JsonSchema/RelogicLabs/JsonSchema/Utilities/StringExtension.cs

@@ -4,21 +4,21 @@ namespace RelogicLabs.JsonSchema.Utilities;
 
 internal static class StringExtension
 {
-    public static string Affix(this string source, string prefix = "", string suffix = "") 
+    public static string Affix(this string source, string prefix = "", string suffix = "")
         => $"{prefix}{source}{suffix}";
-    
-    public static string ToUpperFirstLetter(this string source) 
+
+    public static string ToUpperFirstLetter(this string source)
         => source[..1].ToUpper() + source[1..];
-    
-    public static string ToLowerFirstLetter(this string source) 
+
+    public static string ToLowerFirstLetter(this string source)
         => source[..1].ToLower() + source[1..];
-    
+
     public static string ToEncoded(this string source)
     {
         StringBuilder builder = new();
-        if(source.StartsWith('"') && source.EndsWith('"')) 
+        if(source.StartsWith('"') && source.EndsWith('"'))
             source = source[1..^1];
-        
+
         for(int i = 0; i < source.Length; i++)
         {
             char current = source[i];
@@ -42,7 +42,7 @@ public static string ToEncoded(this string source)
         }
         return builder.ToString();
     }
-    
+
     public static string Quote(this string source)
         => $"\"{source}\"";
 }