Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
"ecmaVersion": 2020,
"sourceType": "module"
},
"parser": "@babel/eslint-parser",
"plugins": [
"@babel"
],
"rules": {
"semi": ["error", "never"],
"quotes": ["error", "single"],
Expand Down
6 changes: 4 additions & 2 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
.DS_Store
node_modules
src
tests
coverage
jest.config.js
babel.config.js
README.md
.git
*.log
.eslintcache
.eslintrc.json
console.sh
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,6 @@ validator = validateFormat(validator, 'name', {withFormat: /[a-z]+/})
validator.isValid // false
validator.messages[0] // { field: 'name', type: 'invalid_format', message: 'name is invalid' }
```


https://stackoverflow.com/questions/57915921/how-do-i-get-jest-to-to-work-with-es6-dependencies
6 changes: 0 additions & 6 deletions babel.config.js

This file was deleted.

8 changes: 8 additions & 0 deletions console.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
node --experimental-vm-modules -i -e "
let sv;
import('./src/index.js').then(module => sv = module)

console.log('example:')
console.log('let val = sv.newValidator({age: 34})')
console.log('sv.validateNumber(val, \'age\', {min: 35})')
"
197 changes: 0 additions & 197 deletions jest.config.js

This file was deleted.

29 changes: 11 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,30 @@
{
"name": "simple-valley",
"version": "0.16.0",
"version": "1.0.0-rc.1",
"description": "Simple Validations for objects",
"homepage": "https://github.com/gregors/simple-valley",
"main": "dist/index.js",
"author": "",
"main": "src/index.js",
"type": "module",
"author": "Gregory Ostermayr",
"keywords": [
"validation",
"validator"
"form validation",
"input validation",
"validator",
"library"
],
"license": "ISC",
"repository": {
"type": "git",
"url": "git+https://@github.com:gregors/simple-valley.git"
},
"scripts": {
"build": "babel --out-dir dist src --verbose",
"prepublish": "yarn run build",
"test": "jest",
"console": "./console.sh",
"test": "node --experimental-vm-modules node_modules/.bin/jest",
"lint": "eslint --cache ./src"
},
"devDependencies": {
"@babel/cli": "^7.14.8",
"@babel/core": "^7.14.8",
"@babel/eslint-parser": "^7.16.3",
"@babel/eslint-plugin": "^7.14.5",
"@babel/node": "^7.14.7",
"@babel/plugin-transform-runtime": "^7.14.5",
"@babel/preset-env": "^7.14.8",
"eslint": "^8.3.0",
"jest": "^26.6.3"
},
"dependencies": {
"@babel/runtime": "^7.14.8"
"jest": "^29.3.1"
}
}
18 changes: 9 additions & 9 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
export { default as newValidator } from './validator'
export { default as validateEmail } from './validateEmail'
export { default as validateNotBlank } from './validateNotBlank'
export { default as validateRequired } from './validateRequired'
export { default as validateUrl } from './validateUrl'
export { default as validateNumber } from './validateNumber'
export { default as validateInclusion } from './validateInclusion'
export { default as validateLength } from './validateLength'
export { default as validateFormat } from './validateFormat'
export { default as newValidator } from './validator.js'
export { default as validateEmail } from './validateEmail.js'
export { default as validateNotBlank } from './validateNotBlank.js'
export { default as validateRequired } from './validateRequired.js'
export { default as validateUrl } from './validateUrl.js'
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'
2 changes: 1 addition & 1 deletion src/validateEmail.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import validateFormat from './validateFormat'
import validateFormat from './validateFormat.js'

export default function validateEmail(v, fields, options) {
const { message='invalid email' } = options || {}
Expand Down
6 changes: 3 additions & 3 deletions src/validateFormat.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { addMessage } from './message'
import { updateValidator } from './validator'
import { dig } from './dig'
import { addMessage } from './message.js'
import { updateValidator } from './validator.js'
import { dig } from './dig.js'

export default function validateFormat(v, fields, options) {
const { withFormat,
Expand Down
6 changes: 3 additions & 3 deletions src/validateInclusion.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { addMessage } from './message'
import { updateValidator } from './validator'
import { dig } from './dig'
import { addMessage } from './message.js'
import { updateValidator } from './validator.js'
import { dig } from './dig.js'

export default function validateInclusion(v, fields, options) {
const { message='{key} is not a valid choice', choices=[] } = options || {}
Expand Down
8 changes: 4 additions & 4 deletions src/validateIsNumber.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { addMessage } from './message'
import { updateValidator } from './validator'
import { dig } from './dig'
import { addMessage } from './message.js'
import { updateValidator } from './validator.js'
import { dig } from './dig.js'

export default function validateIsNumber(v, fields, options) {
const { message='{key} is not a number' } = options || {}

const messages = [fields]
.flat()
.filter(field => invalid(dig(v.data,field)))
.filter(field => invalid(dig(v.data, field)))
.map(field => addMessage(field, message, 'is_number'))

return updateValidator(v, messages)
Expand Down
4 changes: 2 additions & 2 deletions src/validateLength.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import validateMaxLength from './validateMaxLength'
import validateMinLength from './validateMinLength'
import validateMaxLength from './validateMaxLength.js'
import validateMinLength from './validateMinLength.js'

export default function validateLength(v, fields, options) {
const { max, min } = options || {}
Expand Down
6 changes: 3 additions & 3 deletions src/validateMaxLength.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { addMessage } from './message'
import { updateValidator } from './validator'
import { dig } from './dig'
import { addMessage } from './message.js'
import { updateValidator } from './validator.js'
import { dig } from './dig.js'

export default function validateMaxLength(v, fields, options) {
const { message='{key} over max length', max } = options || {}
Expand Down
6 changes: 3 additions & 3 deletions src/validateMaxNumber.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { addMessage } from './message'
import { updateValidator } from './validator'
import { dig } from './dig'
import { addMessage } from './message.js'
import { updateValidator } from './validator.js'
import { dig } from './dig.js'

export default function validateMaxNumber(v, fields, options) {
const { message='{key} too large', max } = options || {}
Expand Down
6 changes: 3 additions & 3 deletions src/validateMinLength.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { addMessage } from './message'
import { updateValidator } from './validator'
import { dig } from './dig'
import { addMessage } from './message.js'
import { updateValidator } from './validator.js'
import { dig } from './dig.js'

export default function validateMinLength(v, fields, options) {
const { message='{key} not min length', min } = options || {}
Expand Down
Loading