short-circuit evaluation of boolean schemas in "not", "then"/"else"

..which also removes a redundant error for then/else

Author: karenetheridge

lib/JSON/Schema/Modern/Vocabulary/Applicator.pm

@@ -134,6 +134,8 @@ sub _eval_keyword_oneOf ($class, $data, $schema, $state) {
 sub _traverse_keyword_not { shift->traverse_subschema(@_) }
 
 sub _eval_keyword_not ($class, $data, $schema, $state) {
+  return !$schema->{not} || E($state, 'subschema is true') if is_type('boolean', $schema->{not});
+
   return 1 if not $class->eval($data, $schema->{not},
     +{ %$state, schema_path => $state->{schema_path}.'/not',
       short_circuit_suggested => 1, # errors do not propagate upward from this subschema
@@ -158,6 +160,10 @@ sub _eval_keyword_if ($class, $data, $schema, $state) {
     ? 'then' : 'else';
 
   return 1 if not exists $schema->{$keyword};
+
+  return $schema->{$keyword} || E({ %$state, keyword => $keyword }, 'subschema is false')
+    if is_type('boolean', $schema->{$keyword});
+
   return 1 if $class->eval($data, $schema->{$keyword},
     +{ %$state, schema_path => $state->{schema_path}.'/'.$keyword });
   return E({ %$state, keyword => $keyword }, 'subschema is not valid');

t/errors.t

@@ -180,7 +180,7 @@ subtest 'anyOf keeps all errors for false paths when invalid, discards errors fo
         {
           instanceLocation => '',
           keywordLocation => '/not',
-          error => 'subschema is valid',
+          error => 'subschema is true',
         },
       ],
     },
@@ -376,7 +376,7 @@ subtest 'applicators with non-boolean subschemas, discarding intermediary errors
         {
           instanceLocation => '',
           keywordLocation => '/not',
-          error => 'subschema is valid',
+          error => 'subschema is true',
         },
         # these errors are discarded because /contains passes on instance /1
         #{
@@ -402,7 +402,7 @@ subtest 'applicators with non-boolean subschemas, discarding intermediary errors
         {
           instanceLocation => '',
           keywordLocation => '/not',
-          error => 'subschema is valid',
+          error => 'subschema is true',
         },
       ],
     },
@@ -695,7 +695,7 @@ subtest 'errors after crossing multiple $refs using $id and $anchor' => sub {
           instanceLocation => '',
           keywordLocation => '/$ref/$ref/$ref/not',
           absoluteKeywordLocation => 'base.json#/$defs/mynot/not',
-          error => 'subschema is valid',
+          error => 'subschema is true',
         },
         {
           instanceLocation => '',
@@ -757,7 +757,7 @@ subtest 'errors after crossing multiple $refs using $id and $anchor' => sub {
           instanceLocation => '',
           keywordLocation => '/$ref/not',
           absoluteKeywordLocation => 'http://localhost:1234/a/b.json#/$defs/bar/$defs/baz/not',
-          error => 'subschema is valid',
+          error => 'subschema is true',
         },
       ],
     },
@@ -1385,7 +1385,7 @@ subtest 'effective_base_uri and overriding starting locations' => sub {
           instanceLocation => '',
           keywordLocation => '/not',
           absoluteKeywordLocation => 'https://example.com/foo#/not',
-          error => 'subschema is valid',
+          error => 'subschema is true',
         },
       ],
     },
@@ -1423,7 +1423,7 @@ subtest 'effective_base_uri and overriding starting locations' => sub {
           instanceLocation => '/html/body/div/div/h1/div/p/0',
           keywordLocation => '/some/other/document/$ref/items/$ref/not',
           absoluteKeywordLocation => 'https://example.com/api#/$defs/beta/not',
-          error => 'subschema is valid',
+          error => 'subschema is true',
         },
         {
           instanceLocation => '/html/body/div/div/h1/div/p',

t/find-identifiers.t

@@ -128,7 +128,7 @@ subtest 'anchors' => sub {
           instanceLocation => '',
           keywordLocation => '/allOf/1/$ref/not',
           absoluteKeywordLocation => 'http://localhost:4242#/$defs/bar/not',
-          error => 'subschema is valid',
+          error => 'subschema is true',
         },
         {
           instanceLocation => '',

t/output_format.t

@@ -108,7 +108,7 @@ cmp_result(
       {
         instanceLocation => '',
         keywordLocation => '/not',
-        error => 'subschema is valid',
+        error => 'subschema is true',
       },
       {
         instanceLocation => '',
@@ -252,7 +252,7 @@ cmp_result(
       {
         instanceLocation => '',
         keywordLocation => '/not',
-        error => 'subschema is valid',
+        error => 'subschema is true',
       },
       {
         instanceLocation => '',