Refactor and optimize code for script

Author: zhossain-info

JSchema/RelogicLabs/JSchema/Collections/IIndexMap.cs

@@ -1,4 +1,4 @@
-namespace RelogicLabs.JsonSchema.Collections;
+namespace RelogicLabs.JSchema.Collections;
 
 public interface IIndexMap<TK, TV> : IList<TV>
     where TV : IKeyed<TK> where TK : notnull

JSchema/RelogicLabs/JSchema/Collections/IKeyed.cs

@@ -1,4 +1,4 @@
-namespace RelogicLabs.JsonSchema.Collections;
+namespace RelogicLabs.JSchema.Collections;
 
 public interface IKeyed<out TK>
 {

JSchema/RelogicLabs/JSchema/Collections/IndexHashMap.cs

@@ -1,7 +1,7 @@
 using System.Collections;
 using System.Collections.ObjectModel;
 
-namespace RelogicLabs.JsonSchema.Collections;
+namespace RelogicLabs.JSchema.Collections;
 
 internal sealed class IndexHashMap<TK, TV> : IIndexMap<TK, TV>
     where TV : IKeyed<TK> where TK : notnull
@@ -12,7 +12,7 @@ internal sealed class IndexHashMap<TK, TV> : IIndexMap<TK, TV>
     public IndexHashMap(IEnumerable<TV> source)
     {
         _list = source.ToList();
-        _dictionary = _list.ToDictionary(e => e.Key, e => e);
+        _dictionary = _list.ToDictionary(static e => e.Key, static e => e);
     }
 
     public IEnumerator<TV> GetEnumerator() => _list.GetEnumerator();
@@ -25,7 +25,7 @@ public void Add(TV item)
 
     public bool Remove(TV item)
     {
-        bool result = _list.Remove(item);
+        var result = _list.Remove(item);
         result &= _dictionary.Remove(item.Key);
         return result;
     }
@@ -50,7 +50,7 @@ public void Insert(int index, TV item)
 
     public void RemoveAt(int index)
     {
-        TV item = _list[index];
+        var item = _list[index];
         _list.RemoveAt(index);
         _dictionary.Remove(item.Key);
     }

JSchema/RelogicLabs/JSchema/Exceptions/CommonException.cs

@@ -1,5 +1,6 @@
 using RelogicLabs.JSchema.Message;
 using RelogicLabs.JSchema.Utilities;
+using static System.Environment;
 
 namespace RelogicLabs.JSchema.Exceptions;
 
@@ -56,7 +57,6 @@ private static string CaptureStackTrace()
                                               ?? string.Empty)) end++;
             else break;
         }
-        var newLine = Environment.NewLine;
-        return string.Join(newLine, stackTrace.ToString().Split(newLine)[start..end]) + newLine;
+        return string.Join(NewLine, stackTrace.ToString().Split(NewLine)[start..end]) + NewLine;
     }
 }

JSchema/RelogicLabs/JSchema/Message/ActualDetail.cs

@@ -1,7 +1,7 @@
-using RelogicLabs.JsonSchema.Tree;
-using RelogicLabs.JsonSchema.Types;
+using RelogicLabs.JSchema.Tree;
+using RelogicLabs.JSchema.Nodes;
 
-namespace RelogicLabs.JsonSchema.Message;
+namespace RelogicLabs.JSchema.Message;
 
 public sealed class ActualDetail : ContextDetail
 {

JSchema/RelogicLabs/JSchema/Message/ErrorDetail.cs

@@ -1,14 +1,14 @@
-using RelogicLabs.JsonSchema.Utilities;
+using RelogicLabs.JSchema.Utilities;
 
-namespace RelogicLabs.JsonSchema.Message;
+namespace RelogicLabs.JSchema.Message;
 
 public sealed class ErrorDetail
 {
     internal const string ValidationFailed = "Validation failed";
     internal const string ValueMismatch = "Value mismatch";
     internal const string DataTypeMismatch = "Data type mismatch";
     internal const string InvalidNonCompositeType = "Invalid non-composite value type";
-    internal const string DataTypeArgumentFailed = "Data type argument validation failed";
+    internal const string DataTypeArgumentFailed = "Data type argument failed";
     internal const string InvalidNestedFunction = "Invalid nested function operation";
     internal const string PropertyNotFound = "Mandatory property not found";
     internal const string ArrayElementNotFound = "Mandatory array element not found";

JSchema/RelogicLabs/JSchema/Message/ExpectedDetail.cs

@@ -1,7 +1,7 @@
-using RelogicLabs.JsonSchema.Tree;
-using RelogicLabs.JsonSchema.Types;
+using RelogicLabs.JSchema.Tree;
+using RelogicLabs.JSchema.Nodes;
 
-namespace RelogicLabs.JsonSchema.Message;
+namespace RelogicLabs.JSchema.Message;
 
 public sealed class ExpectedDetail : ContextDetail
 {

JSchema/RelogicLabs/JSchema/Time/DateTimeContext.cs

@@ -1,11 +1,11 @@
 using System.Text;
-using RelogicLabs.JsonSchema.Exceptions;
-using RelogicLabs.JsonSchema.Utilities;
-using static RelogicLabs.JsonSchema.Message.ErrorCode;
+using RelogicLabs.JSchema.Exceptions;
+using RelogicLabs.JSchema.Utilities;
+using static RelogicLabs.JSchema.Message.ErrorCode;
 using static System.DayOfWeek;
-using static RelogicLabs.JsonSchema.Time.JsonDateTime;
+using static RelogicLabs.JSchema.Time.JsonDateTime;
 
-namespace RelogicLabs.JsonSchema.Time;
+namespace RelogicLabs.JSchema.Time;
 
 internal sealed class DateTimeContext
 {

JSchema/RelogicLabs/JSchema/Time/DateTimeParser.cs

@@ -1,12 +1,12 @@
 using Antlr4.Runtime;
-using RelogicLabs.JsonSchema.Antlr;
-using RelogicLabs.JsonSchema.Exceptions;
-using RelogicLabs.JsonSchema.Message;
-using RelogicLabs.JsonSchema.Utilities;
-using static RelogicLabs.JsonSchema.Antlr.DateTimeLexer;
-using static RelogicLabs.JsonSchema.Time.SegmentProcessor;
+using RelogicLabs.JSchema.Antlr;
+using RelogicLabs.JSchema.Exceptions;
+using RelogicLabs.JSchema.Message;
+using RelogicLabs.JSchema.Utilities;
+using static RelogicLabs.JSchema.Antlr.DateTimeLexer;
+using static RelogicLabs.JSchema.Time.SegmentProcessor;
 
-namespace RelogicLabs.JsonSchema.Time;
+namespace RelogicLabs.JSchema.Time;
 
 internal sealed class DateTimeParser
 {
@@ -76,7 +76,7 @@ private JsonDateTime Parse(string input, DateTimeContext context)
             $"Invalid {context.Type} input format");
 
         var dateTime = context.Validate();
-        DebugUtilities.Print(context);
+        LogHelper.Debug(context);
         return dateTime;
     }
 
@@ -92,7 +92,7 @@ public JsonDateTime Parse(string input)
         }
         catch(InvalidDateTimeException ex)
         {
-            DebugUtilities.Print(ex);
+            LogHelper.Debug(ex);
             error = ex.Message;
             return null;
         }

JSchema/RelogicLabs/JSchema/Time/DateTimeType.cs

@@ -1,17 +1,17 @@
-using RelogicLabs.JsonSchema.Types;
-using static RelogicLabs.JsonSchema.Types.JsonType;
+using RelogicLabs.JSchema.Types;
+using static RelogicLabs.JSchema.Types.EType;
 
-namespace RelogicLabs.JsonSchema.Time;
+namespace RelogicLabs.JSchema.Time;
 
 public sealed class DateTimeType
 {
     public static readonly DateTimeType DATE_TYPE = new("date", DATE);
     public static readonly DateTimeType TIME_TYPE = new("time", TIME);
 
     public string Name { get; }
-    public JsonType Type { get; }
+    public EType Type { get; }
 
-    private DateTimeType(string name, JsonType type)
+    private DateTimeType(string name, EType type)
     {
         Name = name;
         Type = type;