JTD: improve error reporting, remove extra error for properties

ajv-validator · Feb 10, 2021 · 9e5f247 · 9e5f247
1 parent d6acee4
commit 9e5f247
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 26 deletions.
diff --git a/lib/compile/context.ts b/lib/compile/context.ts
@@ -8,13 +8,7 @@ import {SchemaCxt, SchemaObjCxt} from "./index"
 import {JSONType} from "./rules"
 import {checkDataTypes, DataType} from "./validate/dataType"
 import {schemaRefOrVal, unescapeJsonPointer, mergeEvaluated} from "./util"
-import {
-  reportError,
-  reportExtraError,
-  resetErrorsCount,
-  keywordError,
-  keyword$DataError,
-} from "./errors"
+import {reportError, reportExtraError, resetErrorsCount, keyword$DataError} from "./errors"
 import {CodeGen, _, nil, or, not, getProperty, Code, Name} from "./codegen"
 import N from "./names"
 import {applySubschema, SubschemaArgs} from "./subschema"
@@ -102,7 +96,7 @@ export default class KeywordCxt implements KeywordErrorCxt {
   }
 
   error(append?: true): void {
-    ;(append ? reportExtraError : reportError)(this, this.def.error || keywordError)
+    ;(append ? reportExtraError : reportError)(this, this.def.error)
   }
 
   $dataError(): void {

diff --git a/lib/compile/errors.ts b/lib/compile/errors.ts
@@ -17,7 +17,7 @@ export const keyword$DataError: KeywordErrorDefinition = {
 
 export function reportError(
   cxt: KeywordErrorCxt,
-  error: KeywordErrorDefinition,
+  error: KeywordErrorDefinition = keywordError,
   overrideAllErrors?: boolean
 ): void {
   const {it} = cxt
@@ -30,7 +30,10 @@ export function reportError(
   }
 }
 
-export function reportExtraError(cxt: KeywordErrorCxt, error: KeywordErrorDefinition): void {
+export function reportExtraError(
+  cxt: KeywordErrorCxt,
+  error: KeywordErrorDefinition = keywordError
+): void {
   const {it} = cxt
   const {gen, compositeRule, allErrors} = it
   const errObj = errorObjectCode(cxt, error)
@@ -110,7 +113,7 @@ const E = {
 function errorObjectCode(cxt: KeywordErrorCxt, error: KeywordErrorDefinition): Code {
   const {createErrors, opts} = cxt.it
   if (createErrors === false) return _`{}`
-  return opts.jtd && !opts.ajvErrors ? jtdErrorObject(cxt, error) : ajvErrorObject(cxt, error)
+  return (opts.jtd && !opts.ajvErrors ? jtdErrorObject : ajvErrorObject)(cxt, error)
 }
 
 function jtdErrorObject(cxt: KeywordErrorCxt, {message}: KeywordErrorDefinition): Code {

diff --git a/lib/vocabularies/jtd/properties.ts b/lib/vocabularies/jtd/properties.ts
@@ -60,18 +60,27 @@ export function validateProperties(cxt: KeywordCxt): void {
   }
 
   function validateProps(props: string[], keyword: string, required?: boolean): void {
+    const _valid = gen.var("valid")
     for (const prop of props) {
       gen.if(
         propertyInData(data, prop, it.opts.ownProperties),
-        () => gen.assign(valid, and(valid, applyPropertySchema(prop, keyword))),
-        required ? () => gen.assign(valid, false) : undefined
+        () => applyPropertySchema(prop, keyword, _valid),
+        missingProperty
       )
-      cxt.ok(valid)
+      cxt.ok(_valid)
+    }
+
+    function missingProperty(): void {
+      if (required) {
+        gen.assign(_valid, false)
+        cxt.error()
+      } else {
+        gen.assign(_valid, true)
+      }
     }
   }
 
-  function applyPropertySchema(prop: string, keyword: string): Name {
-    const _valid = gen.name("valid")
+  function applyPropertySchema(prop: string, keyword: string, _valid: Name): void {
     cxt.subschema(
       {
         keyword,
@@ -80,7 +89,6 @@ export function validateProperties(cxt: KeywordCxt): void {
       },
       _valid
     )
-    return _valid
   }
 
   function validateAdditional(): void {
@@ -97,7 +105,6 @@ export function validateProperties(cxt: KeywordCxt): void {
         } else {
           // cxt.setParams({additionalProperty: key})
           cxt.error()
-          gen.assign(valid, false)
           if (!it.opts.allErrors) gen.break()
         }
       })

diff --git a/lib/vocabularies/jtd/ref.ts b/lib/vocabularies/jtd/ref.ts
@@ -24,7 +24,7 @@ const def: CodeKeywordDefinition = {
       gen.var(valid, false)
       validateJtdRef()
     }
-    cxt.pass(valid)
+    cxt.ok(valid)
 
     function validateJtdRef(): void {
       const refSchema = (root.schema as AnySchemaObject).definitions?.[ref]
@@ -52,7 +52,7 @@ const def: CodeKeywordDefinition = {
           dataTypes: [],
           schemaPath: nil,
           topSchemaRef: schName,
-          errSchemaPath: `#/definitions/${ref}`,
+          errSchemaPath: `/definitions/${ref}`,
         },
         valid
       )

diff --git a/spec/jtd-schema.spec.ts b/spec/jtd-schema.spec.ts
@@ -70,12 +70,10 @@ describe("JSON Type Definition", () => {
     }
 
     // function convertErrors(errors: TestCaseError[]): JTDError[] {
-    //   return errors.map((e) =>
-    //     ({
-    //       instancePath: jsonPointer(e.instancePath),
-    //       schemaPath: jsonPointer(e.schemaPath)
-    //     })
-    //   )
+    //   return errors.map((e) => ({
+    //     instancePath: jsonPointer(e.instancePath),
+    //     schemaPath: jsonPointer(e.schemaPath),
+    //   }))
     // }
 
     // function jsonPointer(error: string[]): string {