Comparing version 1.0.2 to 1.0.3
@@ -34,2 +34,3 @@ //TODO: i18n | ||
} | ||
this.parse(); | ||
} | ||
@@ -47,4 +48,9 @@ error(data) { | ||
for (let k in this.rules) { | ||
let rule = this.rules[k]; | ||
if (_.isNumber(data[k]) || this.rules.hasOwnProperty(k) && !_.isEmptyObject(data[k])) { | ||
res[k] = data[k]; | ||
if (rule.boolean && ['true', '1', 'false', '0'].indexOf(data[k] !== -1)) { | ||
res[k] = data[k] === 'true' || data[k] === '1' ? true : false; | ||
} else { | ||
res[k] = data[k]; | ||
} | ||
} | ||
@@ -192,3 +198,2 @@ } | ||
check(data) { | ||
this.parse(); | ||
/** | ||
@@ -283,7 +288,3 @@ * k 字段 | ||
if (rule.boolean) { | ||
if (v === 'true' || v === true) { | ||
data[k] = true; | ||
} else if (v === 'false' || v === false) { | ||
data[k] = false; | ||
} else { | ||
if (typeof data[k] !== 'boolean') { | ||
this.error({ | ||
@@ -290,0 +291,0 @@ filed: k, |
{ | ||
"name": "utils2", | ||
"version": "1.0.2", | ||
"version": "1.0.3", | ||
"description": "validator,_,IO,string,date,numer,array", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -32,3 +32,7 @@ const assert = require('assert'); | ||
md5: 'required|string|length:32', | ||
time: 'required|date' | ||
time: 'required|date', | ||
status1: 'required|boolean', | ||
status2: 'required|boolean', | ||
status3: 'required|boolean', | ||
status4: 'required|boolean' | ||
} | ||
@@ -41,3 +45,7 @@ }); | ||
size: 123, | ||
time: t | ||
time: t, | ||
status1: '0', | ||
status2: '1', | ||
status3: 'false', | ||
status4: 'true', | ||
}); | ||
@@ -48,5 +56,9 @@ assert.deepEqual(input, { | ||
size: 123, | ||
time: t | ||
time: t, | ||
status1: false, | ||
status2: true, | ||
status3: false, | ||
status4: true, | ||
}); | ||
}); | ||
}); |
51307
16
1420