refactor: "properties" keyword to typescript (WIP - 2 tests fail)

ajv-validator · Aug 22, 2020 · e82d0f1 · e82d0f1
1 parent 5f1b665
commit e82d0f1
Show file tree

Hide file tree

Showing 17 changed files with 69 additions and 203 deletions.
diff --git a/lib/compile/rules.ts b/lib/compile/rules.ts
@@ -56,7 +56,7 @@ export default function rules(): ValidationRules {
       {type: "array", rules: []},
       {
         type: "object",
-        rules: [{properties: ["additionalProperties"]}],
+        rules: ["additionalProperties"],
       },
       {rules: ["$ref"]},
     ],

diff --git a/lib/compile/validate/keywords.ts b/lib/compile/validate/keywords.ts
@@ -26,31 +26,29 @@ export function schemaKeywords(
     if (!allErrors) gen.code("}")
     return
   }
-  let closeBlocks = ""
   const ruleGroups = RULES.rules.filter((group) => shouldUseGroup(schema, group))
   const last = ruleGroups.length - 1
-  ruleGroups.forEach((group, i) => {
-    if (group.type) {
-      // TODO refactor `data${dataLevel || ""}`
-      const checkType = checkDataType(group.type, `data${dataLevel || ""}`, strictNumbers)
-      // TODO refactor ifs
-      gen.if(checkType)
-      iterateKeywords(it, group)
-      if (types.length === 1 && types[0] === group.type && typeErrors) {
-        gen.else()
-        reportTypeError(it)
+  gen.block(() =>
+    ruleGroups.forEach((group, i) => {
+      if (group.type) {
+        // TODO refactor `data${dataLevel || ""}`
+        const checkType = checkDataType(group.type, `data${dataLevel || ""}`, strictNumbers)
+        gen.if(checkType)
+        iterateKeywords(it, group)
+        if (types.length === 1 && types[0] === group.type && typeErrors) {
+          gen.else()
+          reportTypeError(it)
+        }
+        gen.endIf()
+      } else {
+        iterateKeywords(it, group)
       }
-      gen.endIf()
-    } else {
-      iterateKeywords(it, group)
-    }
-    if (!allErrors && i < last) {
-      const errCount = top ? "0" : `errs_${level}`
-      gen.code(`if (errors === ${errCount}) {`)
-      closeBlocks += "}"
-    }
-  })
-  if (!allErrors) gen.code(closeBlocks)
+      if (!allErrors && i < last) {
+        const errCount = top ? "0" : `errs_${level}`
+        gen.if(`errors === ${errCount}`)
+      }
+    })
+  )
 }
 
 function iterateKeywords(it: CompilationContext, group: RuleGroup) {

diff --git a/lib/dot/properties.jst b/lib/dot/properties.jst
@@ -1,3 +1,5 @@
+{{ $keyword = "properties"; }}
+
 {{# def.definitions }}
 {{# def.errors }}
 {{# def.setupKeyword }}
@@ -123,60 +125,6 @@ var {{=$nextValid}} = true;
   {{# def.ifResultValid }}
 {{?}}
 
-{{ var $useDefaults = it.opts.useDefaults && !it.compositeRule; }}
-
-{{? $schemaKeys.length }}
-  {{~ $schemaKeys:$propertyKey }}
-    {{ var $sch = $schema[$propertyKey]; }}
-
-    {{? {{# def.nonEmptySchema:$sch}} }}
-      {{
-        var $prop = it.util.getProperty($propertyKey)
-          , $passData = $data + $prop
-          , $hasDefault = $useDefaults && $sch.default !== undefined;
-        $it.schema = $sch;
-        $it.schemaPath = $schemaPath + $prop;
-        $it.errSchemaPath = $errSchemaPath + '/' + it.util.escapeFragment($propertyKey);
-        $it.errorPath = it.util.getPath(it.errorPath, $propertyKey, it.opts.jsonPointers);
-        $it.dataPathArr[$dataNxt] = it.util.toQuotedString($propertyKey);
-      }}
-
-      {{# def.generateSubschemaCode }}
-
-      {{? {{# def.willOptimize }} }}
-        {{
-          $code = {{# def._optimizeValidate }};
-          var $useData = $passData;
-        }}
-      {{??}}
-        {{ var $useData = $nextData; }}
-        var {{=$nextData}} = {{=$passData}};
-      {{?}}
-
-      {{? $hasDefault }}
-        {{= $code }}
-      {{??}}
-        {{? $breakOnError }}
-          if ({{# def.noPropertyInData }}) {
-            {{=$nextValid}} = true;
-          } else {
-        {{??}}
-          if ({{=$useData}} !== undefined
-            {{? $ownProperties }}
-              && {{# def.isOwnProperty }}
-            {{?}}
-          ) {
-        {{?}}
-
-          {{= $code }}
-        }
-      {{?}}  {{ /* $hasDefault */ }}
-    {{?}} {{ /* def.nonEmptySchema */ }}
-
-    {{# def.ifResultValid }}
-  {{~}}
-{{?}}
-
 {{? $breakOnError }}
   {{= $closingBraces }}
   if ({{=$errs}} == errors) {

diff --git a/lib/dotjs/index.js b/lib/dotjs/index.js
@@ -4,5 +4,5 @@
 module.exports = {
   $ref: require("./ref"),
   format: require("./format"),
-  properties: require("./properties"),
+  additionalProperties: require("./properties"),
 }
diff --git a/lib/keyword.ts b/lib/keyword.ts
@@ -190,8 +190,10 @@ function ruleCode(it: CompilationContext, keyword: string /*, ruleType */): void
   }
 
   function ok(condition?: string): void {
-    if (condition) fail(`!(${condition})`)
-    else if (!allErrors) gen.code("if (true) {")
+    if (!allErrors) {
+      if (condition) gen.code(`if (${condition}) {`)
+      else gen.code("if (true) {")
+    }
   }
 
   function errorParams(obj: KeywordContextParams, assign?: true) {

diff --git a/lib/vocabularies/applicator/allOf.ts b/lib/vocabularies/applicator/allOf.ts
@@ -8,22 +8,17 @@ const def: KeywordDefinition = {
   code({gen, ok, schema, it}) {
     let emptySchemas = true
     const valid = gen.name("valid")
-    let count = 0
-    schema.forEach((sch: object | boolean, i: number) => {
-      if (alwaysValidSchema(it, sch)) return
-      emptySchemas = false
-      applySubschema(it, {keyword: "allOf", schemaProp: i}, valid)
-      if (!it.allErrors) {
-        if (count === 1) gen.block()
-        count++
-        gen.if(valid)
-      }
-    })
+    gen.block(() =>
+      schema.forEach((sch: object | boolean, i: number) => {
+        if (alwaysValidSchema(it, sch)) return
+        emptySchemas = false
+        applySubschema(it, {keyword: "allOf", schemaProp: i}, valid)
+        if (!it.allErrors) gen.if(valid)
+      })
+    )
 
-    if (!it.allErrors) {
-      if (emptySchemas) ok()
-      else if (count > 1) gen.endBlock(count - 1)
-    }
+    if (emptySchemas) ok()
+    else ok(valid)
 
     // TODO possibly add allOf error
   },

diff --git a/lib/vocabularies/applicator/anyOf.ts b/lib/vocabularies/applicator/anyOf.ts
@@ -9,10 +9,8 @@ const def: KeywordDefinition = {
   code(cxt) {
     const {gen, ok, schema, it} = cxt
     const alwaysValid = schema.some((sch: object | boolean) => alwaysValidSchema(it, sch))
-    if (alwaysValid) {
-      ok()
-      return
-    }
+    if (alwaysValid) return ok()
+
     const valid = gen.name("valid")
     const schValid = gen.name("_valid")
     const errsCount = gen.name("_errs")

diff --git a/lib/vocabularies/applicator/contains.ts b/lib/vocabularies/applicator/contains.ts
@@ -13,10 +13,7 @@ const def: KeywordDefinition = {
     const errsCount = gen.name("_errs")
     gen.code(`const ${errsCount} = errors;`)
 
-    if (alwaysValidSchema(it, schema)) {
-      fail(`${data}.length === 0`)
-      return
-    }
+    if (alwaysValidSchema(it, schema)) return fail(`${data}.length === 0`)
 
     const valid = gen.name("valid")
     const i = gen.name("i")

diff --git a/lib/vocabularies/applicator/dependencies.ts b/lib/vocabularies/applicator/dependencies.ts
@@ -16,7 +16,7 @@ const def: KeywordDefinition = {
   type: "object",
   schemaType: "object",
   code(cxt) {
-    const {gen, errorParams, schema, data, it} = cxt
+    const {gen, ok, errorParams, schema, data, it} = cxt
 
     const [propDeps, schDeps] = splitDependencies()
 
@@ -29,8 +29,7 @@ const def: KeywordDefinition = {
       validateSchemaDeps(schDeps)
     })
 
-    // TODO refactor ifs
-    if (!it.allErrors) gen.code(`if (${errsCount} === errors) {`)
+    ok(`${errsCount} === errors`)
 
     function splitDependencies(): [PropertyDependencies, SchemaDependencies] {
       const propertyDeps: PropertyDependencies = {}

diff --git a/lib/vocabularies/applicator/index.ts b/lib/vocabularies/applicator/index.ts
@@ -7,7 +7,7 @@ const applicator: Vocabulary = [
   // object
   require("./dependencies"),
   require("./propertyNames"),
-  // require("./properties"),
+  require("./properties"),
   require("./patternProperties"),
   // any
   require("./not"),

diff --git a/lib/vocabularies/applicator/items.ts b/lib/vocabularies/applicator/items.ts
@@ -13,21 +13,15 @@ const def: KeywordDefinition = {
   code(cxt) {
     // TODO strict mode: fail or warning if "additionalItems" is present without "items"
 
-    const {gen, /* fail, */ schema, parentSchema, data, it} = cxt
+    const {gen, ok, schema, parentSchema, data, it} = cxt
     const errsCount = gen.name("_errs")
     const len = gen.name("len")
     gen.code(
       `const ${errsCount} = errors;
       const ${len} = ${data}.length;`
     )
-
-    if (it.allErrors) {
-      validateItemsKeyword()
-    } else {
-      gen.block(validateItemsKeyword)
-      // TODO refactor ifs
-      gen.code(`if (${errsCount} === errors) {`)
-    }
+    gen.block(validateItemsKeyword)
+    ok(`${errsCount} === errors`)
 
     function validateItemsKeyword(): void {
       if (Array.isArray(schema)) {

diff --git a/lib/vocabularies/applicator/not.ts b/lib/vocabularies/applicator/not.ts
@@ -8,10 +8,7 @@ const def: KeywordDefinition = {
   schemaType: ["object", "boolean"],
   code(cxt) {
     const {gen, fail, schema, it} = cxt
-    if (alwaysValidSchema(it, schema)) {
-      fail()
-      return
-    }
+    if (alwaysValidSchema(it, schema)) return fail()
 
     const valid = gen.name("valid")
     const errsCount = gen.name("_errs")

diff --git a/lib/vocabularies/applicator/patternProperties.ts b/lib/vocabularies/applicator/patternProperties.ts
@@ -9,19 +9,14 @@ const def: KeywordDefinition = {
   code(cxt) {
     const {gen, ok, schema, it} = cxt
     const patterns = schemaProperties(it, schema)
-    if (patterns.length === 0) {
-      ok()
-      return
-    }
+    if (patterns.length === 0) return ok()
 
     const valid = gen.name("valid")
     const errsCount = gen.name("_errs")
     gen.code(`const ${errsCount} = errors;`)
 
     gen.block(validatePatternProperties)
-
-    // TODO refactor ifs
-    if (!it.allErrors) gen.code(`if (${errsCount} === errors) {`)
+    ok(`${errsCount} === errors`)
 
     function validatePatternProperties() {
       for (const pat of patterns) {

diff --git a/lib/vocabularies/applicator/properties.ts b/lib/vocabularies/applicator/properties.ts
@@ -9,19 +9,14 @@ const def: KeywordDefinition = {
   code(cxt) {
     const {gen, ok, schema, data, it} = cxt
     const properties = schemaProperties(it, schema)
-    if (properties.length === 0) {
-      ok()
-      return
-    }
+    if (properties.length === 0) return ok()
 
     const valid = gen.name("valid")
     const errsCount = gen.name("_errs")
     gen.code(`const ${errsCount} = errors;`)
 
     gen.block(validateProperties)
-
-    // TODO refactor ifs
-    if (!it.allErrors) gen.code(`if (${errsCount} === errors) {`)
+    ok(`${errsCount} === errors`)
 
     function validateProperties() {
       for (const prop of properties) {

diff --git a/lib/vocabularies/applicator/propertyNames.ts b/lib/vocabularies/applicator/propertyNames.ts
@@ -9,10 +9,7 @@ const def: KeywordDefinition = {
   schemaType: ["object", "boolean"],
   code(cxt) {
     const {gen, ok, errorParams, schema, it} = cxt
-    if (alwaysValidSchema(it, schema)) {
-      ok()
-      return
-    }
+    if (alwaysValidSchema(it, schema)) return ok()
 
     const valid = gen.name("valid")
     const errsCount = gen.name("_errs")

diff --git a/lib/vocabularies/validation/required.ts b/lib/vocabularies/validation/required.ts
@@ -21,10 +21,7 @@ const def: KeywordDefinition = {
   $data: true,
   code(cxt) {
     const {gen, ok, fail, errorParams, schema, schemaCode, data, $data, it} = cxt
-    if (!$data && schema.length === 0) {
-      ok()
-      return
-    }
+    if (!$data && schema.length === 0) return ok()
 
     const loopRequired = $data || schema.length >= <number>it.opts.loopRequired