diff --git a/package.json b/package.json index 54b5e5b..ea9ccd2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "simple-valley", - "version": "1.0.0-rc.1", + "version": "1.0.0-rc.2", "description": "Simple Validations for objects", "homepage": "https://github.com/gregors/simple-valley", "main": "src/index.js", diff --git a/src/index.js b/src/index.js index cf1fd23..e505cea 100644 --- a/src/index.js +++ b/src/index.js @@ -7,3 +7,4 @@ export { default as validateNumber } from './validateNumber.js' export { default as validateInclusion } from './validateInclusion.js' export { default as validateLength } from './validateLength.js' export { default as validateFormat } from './validateFormat.js' +export { default as updateValidator } from './updateValidator.js' diff --git a/src/updateValidator.js b/src/updateValidator.js new file mode 100644 index 0000000..0f0f500 --- /dev/null +++ b/src/updateValidator.js @@ -0,0 +1,7 @@ +export default function updateValidator(v, messages) { + v.messages = v.messages.concat(messages) + const valid = messages.length == 0 + v.isValid = v.isValid && valid + + return v +} \ No newline at end of file diff --git a/src/validateFormat.js b/src/validateFormat.js index 6233c2c..c9071c1 100644 --- a/src/validateFormat.js +++ b/src/validateFormat.js @@ -1,5 +1,5 @@ import { addMessage } from './message.js' -import { updateValidator } from './validator.js' +import updateValidator from './updateValidator.js' import { dig } from './dig.js' export default function validateFormat(v, fields, options) { diff --git a/src/validateInclusion.js b/src/validateInclusion.js index de87688..5cc2afd 100644 --- a/src/validateInclusion.js +++ b/src/validateInclusion.js @@ -1,5 +1,5 @@ import { addMessage } from './message.js' -import { updateValidator } from './validator.js' +import updateValidator from './updateValidator.js' import { dig } from './dig.js' export default function validateInclusion(v, fields, options) { diff --git a/src/validateIsNumber.js b/src/validateIsNumber.js index fcd39ac..8057060 100644 --- a/src/validateIsNumber.js +++ b/src/validateIsNumber.js @@ -1,5 +1,5 @@ import { addMessage } from './message.js' -import { updateValidator } from './validator.js' +import updateValidator from './updateValidator.js' import { dig } from './dig.js' export default function validateIsNumber(v, fields, options) { diff --git a/src/validateMaxLength.js b/src/validateMaxLength.js index f7d2aee..dc3ad44 100644 --- a/src/validateMaxLength.js +++ b/src/validateMaxLength.js @@ -1,5 +1,5 @@ import { addMessage } from './message.js' -import { updateValidator } from './validator.js' +import updateValidator from './updateValidator.js' import { dig } from './dig.js' export default function validateMaxLength(v, fields, options) { diff --git a/src/validateMaxNumber.js b/src/validateMaxNumber.js index 2831adc..f3ad3ab 100644 --- a/src/validateMaxNumber.js +++ b/src/validateMaxNumber.js @@ -1,5 +1,5 @@ import { addMessage } from './message.js' -import { updateValidator } from './validator.js' +import updateValidator from './updateValidator.js' import { dig } from './dig.js' export default function validateMaxNumber(v, fields, options) { diff --git a/src/validateMinLength.js b/src/validateMinLength.js index 3cdf7db..c2c8e05 100644 --- a/src/validateMinLength.js +++ b/src/validateMinLength.js @@ -1,5 +1,5 @@ import { addMessage } from './message.js' -import { updateValidator } from './validator.js' +import updateValidator from './updateValidator.js' import { dig } from './dig.js' export default function validateMinLength(v, fields, options) { diff --git a/src/validateMinNumber.js b/src/validateMinNumber.js index e12ccfc..c4683e9 100644 --- a/src/validateMinNumber.js +++ b/src/validateMinNumber.js @@ -1,5 +1,5 @@ import { addMessage } from './message.js' -import { updateValidator } from './validator.js' +import updateValidator from './updateValidator.js' import { dig } from './dig.js' export default function validateMinNumber(v, fields, options) { diff --git a/src/validateNotBlank.js b/src/validateNotBlank.js index 1ddae7a..eb33707 100644 --- a/src/validateNotBlank.js +++ b/src/validateNotBlank.js @@ -1,5 +1,5 @@ import { addMessage } from './message.js' -import { updateValidator } from './validator.js' +import updateValidator from './updateValidator.js' import { dig } from './dig.js' export default function validateNotBlank(v, fields, options) { diff --git a/src/validateRequired.js b/src/validateRequired.js index 55e10a3..55099d8 100644 --- a/src/validateRequired.js +++ b/src/validateRequired.js @@ -1,5 +1,5 @@ import { addMessage } from './message.js' -import { updateValidator } from './validator.js' +import updateValidator from './updateValidator.js' import { dig } from './dig.js' export default function validateRequired(v, fields, options) { diff --git a/src/validateUrl.js b/src/validateUrl.js index e612f18..eb18678 100644 --- a/src/validateUrl.js +++ b/src/validateUrl.js @@ -1,5 +1,5 @@ import { addMessage } from './message.js' -import { updateValidator } from './validator.js' +import updateValidator from './updateValidator.js' import { dig } from './dig.js' export default function validateUrl(v, fields, options) { diff --git a/src/validator.js b/src/validator.js index 35dfcd3..51a0860 100644 --- a/src/validator.js +++ b/src/validator.js @@ -1,16 +1,7 @@ - export default function newValidator(data) { if(!data) { data = {} } return {data, isValid: true, messages: []} -} - -export function updateValidator(v, messages) { - v.messages = v.messages.concat(messages) - const valid = messages.length == 0 - v.isValid = v.isValid && valid - - return v -} +} \ No newline at end of file