refactor(codegen): allow passing string as block body

ajv-validator · Aug 21, 2020 · b1da85f · b1da85f
1 parent da74871
commit b1da85f
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 38 deletions.
diff --git a/lib/compile/codegen.ts b/lib/compile/codegen.ts
@@ -4,6 +4,8 @@ enum Block {
   For,
 }
 
+type Code = string | (() => void)
+
 export default class CodeGen {
   #names: {[key: string]: number} = {}
   // TODO make private. Possibly stack?
@@ -17,23 +19,20 @@ export default class CodeGen {
     return `${prefix}_${num}`
   }
 
-  code(str?: string): CodeGen {
+  code(c?: Code): CodeGen {
     // TODO optionally strip whitespace
-    if (str) this._out += str + "\n"
+    if (typeof c == "function") c()
+    else if (c) this._out += c + "\n"
     return this
   }
 
-  if(condition: string, thenBody?: () => void, elseBody?: () => void): CodeGen {
+  if(condition: string, thenBody?: Code, elseBody?: Code): CodeGen {
     this.#blocks.push(Block.If)
     this.code(`if(${condition}){`)
     if (thenBody && elseBody) {
-      thenBody()
-      this.else()
-      elseBody()
-      this.endIf()
+      this.code(thenBody).else().code(elseBody).endIf()
     } else if (thenBody) {
-      thenBody()
-      this.endIf()
+      this.code(thenBody).endIf()
     } else if (elseBody) {
       throw new Error("CodeGen: else body without then body")
     }
@@ -62,13 +61,10 @@ export default class CodeGen {
     return this
   }
 
-  for(iteration: string, forBody?: () => void): CodeGen {
+  for(iteration: string, forBody?: Code): CodeGen {
     this.#blocks.push(Block.For)
     this.code(`for(${iteration}){`)
-    if (forBody) {
-      forBody()
-      this.endFor()
-    }
+    if (forBody) this.code(forBody).endFor()
     return this
   }
 
@@ -80,12 +76,9 @@ export default class CodeGen {
     return this
   }
 
-  block(body?: () => void, expectedToClose?: number): CodeGen {
+  block(body?: Code, expectedToClose?: number): CodeGen {
     this.#blockStarts.push(this.#blocks.length)
-    if (body) {
-      body()
-      this.endBlock(expectedToClose)
-    }
+    if (body) this.code(body).endBlock(expectedToClose)
     return this
   }
 
@@ -103,14 +96,16 @@ export default class CodeGen {
   }
 
   get _lastBlock(): Block {
-    const len = this.#blocks.length
-    if (len === 0) throw new Error("CodeGen: not in block")
-    return this.#blocks[len - 1]
+    return this.#blocks[this._last()]
   }
 
   set _lastBlock(b: Block) {
+    this.#blocks[this._last()] = b
+  }
+
+  _last() {
     const len = this.#blocks.length
-    if (len === 0) throw new Error('CodeGen: not in "if" block')
-    this.#blocks[len - 1] = b
+    if (len === 0) throw new Error("CodeGen: not in block")
+    return len - 1
   }
 }
diff --git a/lib/vocabularies/applicator/contains.ts b/lib/vocabularies/applicator/contains.ts
@@ -31,7 +31,7 @@ const def: KeywordDefinition = {
         },
         valid
       )
-      gen.code(`if (${valid}) break;`)
+      gen.if(valid, "break")
     })
 
     // TODO refactor failCompoundOrReset? It is different from anyOf though

diff --git a/lib/vocabularies/applicator/dependencies.ts b/lib/vocabularies/applicator/dependencies.ts
@@ -77,7 +77,7 @@ const def: KeywordDefinition = {
         gen.if(
           propertyInData(data, prop, Expr.Const, it.opts.ownProperties),
           () => applySubschema(it, {keyword: "dependencies", schemaProp: prop}, valid),
-          () => gen.code(`var ${valid} = true;`) // TODO refactor var
+          `var ${valid} = true;` // TODO refactor var
         )
         if (!it.allErrors) gen.if(valid)
       }

diff --git a/lib/vocabularies/applicator/patternProperties.ts b/lib/vocabularies/applicator/patternProperties.ts
@@ -48,7 +48,7 @@ const def: KeywordDefinition = {
             },
             valid
           )
-          if (!it.allErrors) gen.if(`!${valid}`, () => gen.code("break;"))
+          if (!it.allErrors) gen.if(`!${valid}`, "break")
         })
       })
     }

diff --git a/lib/vocabularies/validation/enum.ts b/lib/vocabularies/validation/enum.ts
@@ -9,13 +9,10 @@ const def: KeywordDefinition = {
     if ($data) {
       const valid = gen.name("valid")
       gen.code(`let ${valid};`)
-      gen.if(
-        `${schemaCode} === undefined`,
-        () => gen.code(`${valid} = true;`),
-        () =>
-          gen
-            .code(`${valid} = false;`)
-            .if(`Array.isArray(${schemaCode})`, () => loopEnum(<string>schemaCode, valid))
+      gen.if(`${schemaCode} === undefined`, `${valid} = true;`, () =>
+        gen
+          .code(`${valid} = false;`)
+          .if(`Array.isArray(${schemaCode})`, () => loopEnum(<string>schemaCode, valid))
       )
       fail(`!${valid}`)
     } else {

diff --git a/lib/vocabularies/validation/required.ts b/lib/vocabularies/validation/required.ts
@@ -94,10 +94,9 @@ const def: KeywordDefinition = {
 
     function loopUntilMissing(missing: string, valid: string): void {
       gen.for(`${missing} of ${schemaCode}`, () =>
-        gen.code(
-          `${valid} = ${propertyInData(data, missing, Expr.Str, it.opts.ownProperties)};
-        if (!${valid}) break;`
-        )
+        gen
+          .code(`${valid} = ${propertyInData(data, missing, Expr.Str, it.opts.ownProperties)};`)
+          .if(`!${valid}`, "break")
       )
     }
   },