feat: context data$Error method, separate error definition for $data …

…errors
ajv-validator · Aug 29, 2020 · cd2aeb7 · cd2aeb7
1 parent 057cdfc
commit cd2aeb7
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/lib/compile/context.ts b/lib/compile/context.ts
@@ -87,6 +87,10 @@ export default class KeywordContext implements KeywordErrorContext {
     ;(append ? reportExtraError : reportError)(this, this.def.error || keywordError)
   }
 
+  $dataError(): void {
+    reportError(this, this.def.$dataError || this.def.error || keywordError)
+  }
+
   reset(): void {
     if (this.errsCount === undefined) throw new Error('add "trackErrors" to keyword definition')
     resetErrorsCount(this.gen, this.errsCount)

diff --git a/lib/types.ts b/lib/types.ts
@@ -156,7 +156,8 @@ interface _KeywordDef {
   metaSchema?: object
   validateSchema?: ValidateFunction // compiled keyword metaSchema - should not be passed
   dependencies?: string[] // keywords that must be present in the same schema
-  error?: KeywordErrorDefinition // TODO all keyword types should support error
+  error?: KeywordErrorDefinition
+  $dataError?: KeywordErrorDefinition
 }
 
 export interface CodeKeywordDefinition extends _KeywordDef {

diff --git a/lib/vocabularies/validation/required.ts b/lib/vocabularies/validation/required.ts
@@ -20,7 +20,7 @@ const def: CodeKeywordDefinition = {
       if (loopRequired) {
         if ($data) {
           gen.if(_`${schemaCode} !== undefined`, () => {
-            gen.if(_`!Array.isArray(${schemaCode})`, () => cxt.error(), loopAllRequired)
+            gen.if(_`Array.isArray(${schemaCode})`, loopAllRequired, () => cxt.$dataError())
           })
         } else {
           loopAllRequired()
@@ -40,7 +40,7 @@ const def: CodeKeywordDefinition = {
           gen.if(_`${schemaCode} === undefined`)
           gen.assign(valid, true)
           gen.elseIf(_`!Array.isArray(${schemaCode})`)
-          cxt.error()
+          cxt.$dataError()
           gen.assign(valid, false)
           gen.else()
           loopUntilMissing(missing, valid)
@@ -76,13 +76,12 @@ const def: CodeKeywordDefinition = {
     }
   },
   error: {
-    message: ({params: {missingProperty}}) => {
-      return missingProperty
-        ? str`should have required property '${missingProperty}'`
-        : str`"required" keyword value must be array`
-    },
-    params: ({params: {missingProperty}}) =>
-      missingProperty ? _`{missingProperty: ${missingProperty}}` : _`{}`,
+    message: ({params: {missingProperty}}) =>
+      str`should have required property '${missingProperty}'`,
+    params: ({params: {missingProperty}}) => _`{missingProperty: ${missingProperty}}`,
+  },
+  $dataError: {
+    message: '"required" keyword value must be array',
   },
 }
 

diff --git a/lib/vocabularies/validation/uniqueItems.ts b/lib/vocabularies/validation/uniqueItems.ts
@@ -18,7 +18,7 @@ const def: CodeKeywordDefinition = {
       gen.if(_`${schemaCode} === false || ${schemaCode} === undefined`)
       gen.assign(valid, true)
       gen.elseIf(_`typeof ${schemaCode} != "boolean"`)
-      cxt.error()
+      cxt.$dataError()
       gen.assign(valid, false)
       gen.else()
       validateUniqueItems()
@@ -78,10 +78,11 @@ const def: CodeKeywordDefinition = {
   },
   error: {
     message: ({params: {i, j}}) =>
-      i
-        ? str`should NOT have duplicate items (items ## ${j} and ${i} are identical)`
-        : str`uniqueItems must be boolean ($data)`,
-    params: ({params: {i, j}}) => (i ? _`{i: ${i}, j: ${j}}` : _`{}`),
+      str`should NOT have duplicate items (items ## ${j} and ${i} are identical)`,
+    params: ({params: {i, j}}) => _`{i: ${i}, j: ${j}}`,
+  },
+  $dataError: {
+    message: "uniqueItems must be boolean ($data)",
   },
 }