Update data type validation process

Author: zhossain-info

JsonSchema/JsonSchema.csproj

@@ -5,9 +5,9 @@
         <Description>A simplified, concise, intuitive, and extensible JSON Schema</Description>
         <Authors>Relogic Labs</Authors>
         <Company>Relogic Labs</Company>
-        <Version>1.4.0</Version>
-        <PackageVersion>1.4.0</PackageVersion>
-        <AssemblyVersion>1.4.0</AssemblyVersion>
+        <Version>1.5.0</Version>
+        <PackageVersion>1.5.0</PackageVersion>
+        <AssemblyVersion>1.5.0</AssemblyVersion>
         <PackageTags>JsonSchema;Schema;Json;Validation;Assert;Test</PackageTags>
         <Copyright>Copyright © Relogic Labs. All rights reserved.</Copyright>
         <NeutralLanguage>en</NeutralLanguage>

JsonSchema/RelogicLabs/JsonSchema/Tree/RuntimeContext.cs

@@ -9,6 +9,7 @@ public class RuntimeContext
 {
     private readonly FunctionManager _functionManager;
     private readonly PragmaManager _pragmaManager;
+    private int _disableCount;
 
     internal MessageFormatter MessageFormatter { get; set; }
     public bool ThrowException { get; set; }
@@ -59,10 +60,23 @@ public JDefinition AddDefinition(JDefinition definition)
     internal bool AreEqual(double value1, double value2)
         => Math.Abs(value1 - value2) < FloatingPointTolerance;
 
+    internal T TryMatch<T>(Func<T> function)
+    {
+        try
+        {
+            _disableCount += 1;
+            return function();
+        }
+        finally
+        {
+            _disableCount -= 1;
+        }
+    }
+
     internal bool FailWith(Exception exception)
     {
-        if(ThrowException) throw exception;
-        Exceptions.Enqueue(exception);
+        if(ThrowException && _disableCount == 0) throw exception;
+        if(_disableCount == 0) Exceptions.Enqueue(exception);
         return false;
     }
 }

JsonSchema/RelogicLabs/JsonSchema/Types/JDataType.cs

@@ -4,6 +4,7 @@
 using RelogicLabs.JsonSchema.Utilities;
 using static RelogicLabs.JsonSchema.Message.ErrorCode;
 using static RelogicLabs.JsonSchema.Message.ErrorDetail;
+using static RelogicLabs.JsonSchema.Message.MatchReport;
 
 namespace RelogicLabs.JsonSchema.Types;
 
@@ -14,7 +15,7 @@ public class JDataType : JBranch, INestedMode
     public required JAlias? Alias { get; init; }
     public required bool Nested { get; init; }
     public override IEnumerable<JNode> Children => _children;
-    
+
     internal JDataType(IDictionary<JNode, JNode> relations) : base(relations) { }
 
     internal override JNode Initialize()
@@ -27,51 +28,60 @@ internal override JNode Initialize()
 
     public override bool Match(JNode node)
     {
-        if(!Nested) return JsonType.Match(node);
-        if(node is not JComposite composite) return FailWith(
-            new JsonSchemaException(
-                new ErrorDetail(DTYP02, InvalidNestedDataType),
-                ExpectedDetail.AsInvalidDataType(this),
-                ActualDetail.AsInvalidDataType(node)));
+        if(!Nested) return _MatchCurrent(node);
+        if(node is not JComposite composite) return false;
         IList<JNode> components = composite.GetComponents();
-        return components.Select(MatchCurrent).AllTrue();
+        return components.Select(_MatchCurrent).AllTrue();
     }
 
-    private bool MatchCurrent(JNode node)
+    private bool _MatchCurrent(JNode node)
+        => MatchCurrent(node) == Success;
+
+    private MatchReport MatchCurrent(JNode node)
     {
-        bool result = true;
-        result &= JsonType.Match(node);
-        if(Alias == null) return result;
+        var result = JsonType.Match(node) ? Success : TypeError;
+        if(Alias == null || result != Success) return result;
         Runtime.Definitions.TryGetValue(Alias, out var validator);
-        if(validator == null) return FailWith(new DefinitionNotFoundException(
-            MessageFormatter.FormatForSchema(DEFI03, Alias.Name, Context)));
-        result &= validator.Match(node);
+        if(validator == null) return AliasError;
+        result = validator.Match(node) ? Success : ArgumentError;
         return result;
     }
 
     internal bool MatchForReport(JNode node)
     {
-        if(!Nested && !JsonType.Match(node)) return FailWith(
-            new JsonSchemaException(new ErrorDetail(DTYP04, DataTypeMismatch),
-            ExpectedDetail.AsDataTypeMismatch(this),
-            ActualDetail.AsDataTypeMismatch(node)));
+        if(!Nested) return MatchForReport(node, false);
         if(node is not JComposite composite) return FailWith(
             new JsonSchemaException(
-                new ErrorDetail(DTYP05, InvalidNestedDataType),
-                ExpectedDetail.AsInvalidDataType(this),
-                ActualDetail.AsInvalidDataType(node)));
+                new ErrorDetail(DTYP03, InvalidNestedDataType),
+                ExpectedDetail.AsInvalidNestedDataType(this),
+                ActualDetail.AsInvalidNestedDataType(node)));
         IList<JNode> components = composite.GetComponents();
         bool result = true;
-        foreach(var c in components)
-        {
-            if(!MatchCurrent(c)) result &= FailWith(new JsonSchemaException(
-                new ErrorDetail(DTYP06, DataTypeMismatch),
-                ExpectedDetail.AsDataTypeMismatch(this),
-                ActualDetail.AsDataTypeMismatch(c)));
-        }
+        foreach(var c in components) result &= MatchForReport(c, true);
         return result;
     }
 
+    private bool MatchForReport(JNode node, bool nested)
+    {
+        var result = MatchCurrent(node);
+        if(ReferenceEquals(result, TypeError)) return FailWith(
+            new JsonSchemaException(
+                new ErrorDetail(TypeError.GetCode(nested), DataTypeMismatch),
+                ExpectedDetail.AsDataTypeMismatch(this),
+                ActualDetail.AsDataTypeMismatch(node)));
+        if(ReferenceEquals(result, AliasError)) return FailWith(
+            new DefinitionNotFoundException(
+                MessageFormatter.FormatForSchema(AliasError.GetCode(nested),
+                    $"No definition found for {Alias!.Name}", Context)));
+        if(ReferenceEquals(result, ArgumentError)) return FailWith(
+            new JsonSchemaException(
+                new ErrorDetail(ArgumentError.GetCode(nested),
+                    DataTypeArgumentFailed),
+                ExpectedDetail.AsDataTypeArgumentFailed(this),
+                ActualDetail.AsDataTypeArgumentFailed(node)));
+        return true;
+    }
+
     public override bool Equals(object? obj)
     {
         if(ReferenceEquals(null, obj)) return false;

JsonSchema/RelogicLabs/JsonSchema/Types/JValidator.cs

@@ -40,21 +40,28 @@ public override bool Match(JNode node)
             ExpectedDetail.AsValueMismatch(Value!),
             ActualDetail.AsValueMismatch(node)));
         var rDataType = MatchDataType(node);
-        if(!rDataType) DataTypes.ForEach(d => d.MatchForReport(node));
         var fDataType = rDataType && DataTypes.Count != 0;
         bool rFunction = Functions.Where(f => f.IsApplicable(node) || !fDataType)
             .Select(f => f.Match(node)).ForEachTrue() || Functions.Count == 0;
         return rValue & rDataType & rFunction;
     }
 
     private bool MatchDataType(JNode node)
+    {
+        if(Runtime.TryMatch(() => CheckDataType(node))) return true;
+        DataTypes.Where(d => !d.Nested).ForEach(d => d.MatchForReport(node));
+        DataTypes.Where(d => d.Nested).ForEach(d => d.MatchForReport(node));
+        return false;
+    }
+
+    private bool CheckDataType(JNode node)
     {
         var list1 = DataTypes.Where(d => !d.Nested).Select(d => d.Match(node)).ToList();
-        var result1 = list1.AnyTrue() || list1.Count == 0;
+        var result1 = list1.AnyTrue();
         var list2 = DataTypes.Where(d => d.Nested && (d.IsApplicable(node) || !result1))
             .Select(d => d.Match(node)).ToList();
         var result2 = list2.AnyTrue() || list2.Count == 0;
-        return result1 && result2;
+        return (result1 || list1.Count == 0) && result2;
     }
 
     public override string ToString() => (

README.md

@@ -68,7 +68,7 @@ The next example represents an expanded version of the previous one, which bring
 %title: "Extended User Profile Dashboard API Response"
 %version: 2.0.0
 %include: RelogicLabs.JsonSchema.Tests.Positive.ExternalFunctions,
-            RelogicLabs.JsonSchema.Tests
+          RelogicLabs.JsonSchema.Tests
 
 %pragma IgnoreUndefinedProperties: true
 
@@ -92,7 +92,7 @@ The next example represents an expanded version of the previous one, which bring
     } #object #null
 }
 
-%define $tags: @length(1, 10) #array($tag)
+%define $tags: @length(1, 10) #string*($tag) #array
 %define $tag: @length(3, 20) @regex("[A-Za-z_]+") #string
 
 %schema: 
@@ -101,10 +101,9 @@ The next example represents an expanded version of the previous one, which bring
         "id": @range(1, 10000) #integer,
         /*username does not allow special characters*/
         "username": @regex("[a-z_]{3,30}") #string,
-        /*currently only one role is allowed by system*/
-        "role": "user" #string,
+        "role": @enum("user", "admin") #string,
         "isActive": #boolean, //user account current status
-        "registeredAt": #time,
+        "registeredAt": @time("DD-MM-YYYY hh:mm:ss") #string,
         "profile": {
             "firstName": @regex("[A-Za-z]{3,50}") #string,
             "lastName": @regex("[A-Za-z]{3,50}") #string,
@@ -139,9 +138,9 @@ The subsequent JSON sample is an illustrative example that successfully validate
     "user": {
         "id": 1234,
         "username": "johndoe",
-        "role": "user",
+        "role": "admin",
         "isActive": true,
-        "registeredAt": "2023-09-06T15:10:30.639Z",
+        "registeredAt": "06-09-2023 15:10:30",
         "profile": {
             "firstName": "John",
             "lastName": "Doe",
@@ -209,9 +208,9 @@ The subsequent JSON sample is an illustrative example that successfully validate
             "price": 1299.99,
             "inStock": false,
             "specs": {
-                "cpu": "Intel i7",
-                "ram": "16GB",
-                "storage": "512GB SSD"
+                "cpu": "Intel i11",
+                "ram": "11GB",
+                "storage": "11GB SSD"
             }
         }
     ],
@@ -222,4 +221,4 @@ The subsequent JSON sample is an illustrative example that successfully validate
     }
 }
 ```
-For more information about the schema syntax format and library functionalities, please refer to the reference documentation [here](https://relogiclabs.github.io/JsonSchema-DotNet/api/index.html).
+For more information about the schema syntax format and library functionalities, please refer to the reference documentation [here](https://relogiclabs.github.io/JsonSchema-DotNet/api/index.html).