diff --git a/lib/validator.js b/lib/validator.js index 4eef267..9ad2be4 100644 --- a/lib/validator.js +++ b/lib/validator.js @@ -76,7 +76,7 @@ class Validator { } if (opts.customFunctions) { - for (const customeName in opts.customFunctions) this.addCustomFunction(customeName, opts.customFunctions[customeName]); + for (const customName in opts.customFunctions) this.addCustomFunction(customName, opts.customFunctions[customName]); } if (opts.plugins) { @@ -445,7 +445,7 @@ class Validator { makeCustomValidator({ vName = "value", fnName = "custom", ruleIndex, path, schema, context, messages }) { const ruleVName = "rule" + ruleIndex; const fnCustomErrorsVName = "fnCustomErrors" + ruleIndex; - + if (typeof schema[fnName] == "function" || (Array.isArray(schema[fnName]))) { if (context.customs[ruleIndex]) { context.customs[ruleIndex].messages = messages; @@ -462,9 +462,9 @@ class Validator { if(Array.isArray(schema[fnName])){ for (let i = 0; i < schema[fnName].length; i++) { - + let custom = schema[fnName][i]; - + if (typeof custom === "string") { custom = this.parseShortHand(custom); schema[fnName][i] = custom; @@ -475,9 +475,9 @@ class Validator { ret.push( ` const ${ruleVName}_${i} = context.customs[${customIndex}]; - + `); - + if(custom.type){ ret.push( ` ${vName} = ${context.async ? "await " : ""}context.customFunctions[${ruleVName}.schema.${fnName}[${i}].type].call(this, ${vName}, ${fnCustomErrorsVName} , ${ruleVName}_${i}.schema, "${path}", parent, context);