vitalif-js
/
ajv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

allow reversal and add more tests

master
will Farrell 2016-07-24 19:03:27 -06:00
parent 4d1aa5fe31
commit ec09c3c735
3 changed files with 117 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
COERCION.md
View File

@ -11,8 +11,6 @@ Type coercion only happens if there is `type` keyword and if without coercion th
If there are multiple types allowed in `type` keyword the coercion will only happen if none of the types match the data and some of the scalar types are present (coercion to/from `object`/`array` is not possible). In this case the validating function will try coercing the data to each type in order until some of them succeeds.
If `coerceTypes` is set to `array`
Possible type coercions:
|from&nbsp;type&nbsp;&rarr;<br>to&nbsp;type&nbsp;&darr;|string|number|boolean|null|

29
lib/dot/coerce.def
View File

@ -4,6 +4,10 @@
, $coerced = 'coerced' + $lvl;
}}
var {{=$dataType}} = typeof {{=$data}};
{{? it.opts.coerceTypes === 'array'}}
if ({{=$dataType}} === 'object' && Array.isArray({{=$data}})) {{=$dataType}} = 'array';
{{?}}
var {{=$coerced}} = undefined;
{{ var $bracesCoercion = ''; }}
@ -13,25 +17,32 @@
{{ $bracesCoercion += '}'; }}
{{?}}
{{? it.opts.coerceTypes === 'array' && $type !== 'array' }}
if ({{=$dataType}} === 'array' && {{=$data}}.length === 1) {
{{=$coerced}} = {{=$data}} = {{=$data}}[0];
{{=$dataType}} = typeof {{=$data}};
/*if ({{=$dataType}} === 'object' && Array.isArray({{=$data}})) {{=$dataType}} = 'array';*/
}
{{?}}
{{? $type == 'string' }}
if ({{=$dataType}} == 'number' || {{=$dataType}} == 'boolean')
{{? $type === 'string' }}
if ({{=$dataType}} === 'number' || {{=$dataType}} === 'boolean')
{{=$coerced}} = '' + {{=$data}};
else if ({{=$data}} === null) {{=$coerced}} = '';
{{?? $type == 'number' || $type == 'integer' }}
if ({{=$dataType}} == 'boolean' || {{=$data}} === null
|| ({{=$dataType}} == 'string' && {{=$data}} && {{=$data}} == +{{=$data}}
{{? $type == 'integer' }} && !({{=$data}} % 1){{?}}))
{{?? $type === 'number' || $type === 'integer' }}
if ({{=$dataType}} === 'boolean' || {{=$data}} === null
|| ({{=$dataType}} === 'string' && {{=$data}} && {{=$data}} == +{{=$data}}
{{? $type === 'integer' }} && !({{=$data}} % 1){{?}}))
{{=$coerced}} = +{{=$data}};
{{?? $type == 'boolean' }}
{{?? $type === 'boolean' }}
if ({{=$data}} === 'false' || {{=$data}} === 0 || {{=$data}} === null)
{{=$coerced}} = false;
else if ({{=$data}} === 'true' || {{=$data}} === 1)
{{=$coerced}} = true;
{{?? $type == 'null' }}
{{?? $type === 'null' }}
if ({{=$data}} === '' || {{=$data}} === 0 || {{=$data}} === false)
{{=$coerced}} = null;
{{?? $type === 'array' }}
{{?? it.opts.coerceTypes === 'array' && $type === 'array' }}
if ({{=$dataType}} !== 'array')
{{=$coerced}} = [{{=$data}}];
{{?}}

172
spec/coercion.spec.js
View File

@ -22,7 +22,8 @@ var coercionRules = {
{ from: {}, to: undefined }
],
'array': [
{ from: [], to: undefined }
{ from: [], to: undefined },
{ from: [1], to: undefined }
]
},
'number': {
@ -45,7 +46,8 @@ var coercionRules = {
{ from: {}, to: undefined }
],
'array': [
{ from: [], to: undefined }
{ from: [], to: undefined },
{ from: [true], to: undefined }
]
},
'integer': {
@ -68,32 +70,34 @@ var coercionRules = {
{ from: {}, to: undefined }
],
'array': [
{ from: [], to: undefined }
{ from: [], to: undefined },
{ from: ['1'], to: undefined }
]
},
'boolean': {
'string': [
{ from: 'false', to: false },
{ from: 'true', to: true },
{ from: '', to: undefined },
{ from: 'abc', to: undefined }
],
'number': [
{ from: 0, to: false },
{ from: 1, to: true },
{ from: 2, to: undefined },
{ from: 2.5, to: undefined }
],
'null': [
{ from: null, to: false }
],
'object': [
{ from: {}, to: undefined }
],
'array': [
{ from: [], to: undefined },
{ from: [0], to: undefined }
]
},
'boolean': {
'string': [
{ from: 'false', to: false },
{ from: 'true', to: true },
{ from: '', to: undefined },
{ from: 'abc', to: undefined },
],
'number': [
{ from: 0, to: false },
{ from: 1, to: true },
{ from: 2, to: undefined },
{ from: 2.5, to: undefined }
],
'null': [
{ from: null, to: false }
],
'object': [
{ from: {}, to: undefined }
],
'array': [
{ from: [], to: undefined }
]
},
'null': {
'string': [
{ from: '', to: null },
@ -112,17 +116,18 @@ var coercionRules = {
{ from: {}, to: undefined }
],
'array': [
{ from: [], to: undefined }
{ from: [], to: undefined },
{ from: [null], to: undefined }
]
},
'array': {
'all': [
{ type: 'string', from: 'abc', to: undefined },
{ type: 'number', from: 1, to: undefined },
{ type: 'boolean', from: true, to: undefined },
{ type: 'null', from: null, to: undefined },
{ type: 'object', from: {}, to: undefined }
]
'all': [
{ type: 'string', from: 'abc', to: undefined },
{ type: 'number', from: 1, to: undefined },
{ type: 'boolean', from: true, to: undefined },
{ type: 'null', from: null, to: undefined },
{ type: 'object', from: {}, to: undefined }
]
},
'object': {
'all': [
@ -135,24 +140,42 @@ var coercionRules = {
}
};
var coercionArrayRules = {
'array': {
'string': [
{ from: 'abc', to: ['abc'] }
],
'number': [
{ from: 1, to: [1] }
],
'boolean': [
{ from: true, to: [true] }
],
'null': [
{ from: null, to: [null] }
],
'object': [
{ from: {}, to: [{}] }
]
}
var coercionArrayRules = JSON.parse(JSON.stringify(coercionRules));
coercionArrayRules.string.array = [
{ from: ['abc'], to: 'abc' }
];
coercionArrayRules.number.array = [
{ from: [1.5], to: 1.5 }
];
coercionArrayRules.integer.array = [
{ from: [1], to: 1 }
];
coercionArrayRules.boolean.array = [
{ from: [true], to: true }
];
coercionArrayRules.null.array = [
{ from: [null], to: null }
];
/*coercionArrayRules.object.array = [
{ from: [{}], to: {} }
];*/
coercionArrayRules.array = {
'string': [
{from: 'abc', to: ['abc']}
],
'number': [
{from: 1, to: [1]}
],
'boolean': [
{from: true, to: [true]}
],
'null': [
{from: null, to: [null]}
],
'object': [
{from: {}, to: [{}]}
]
};
describe('Type coercion', function () {
@ -175,19 +198,19 @@ describe('Type coercion', function () {
});
});
it('should coerce scalar values in array', function() {
ajv = new Ajv({ coerceTypes: 'array', verbose: true });
fullAjv = new Ajv({ coerceTypes: 'array', verbose: true, allErrors: true });
instances = [ ajv, fullAjv ];
it('should coerce scalar values (coerceTypes = array)', function() {
ajv = new Ajv({ coerceTypes: 'array', verbose: true });
fullAjv = new Ajv({ coerceTypes: 'array', verbose: true, allErrors: true });
instances = [ ajv, fullAjv ];
testRules(coercionArrayRules, function (test, schema, canCoerce, toType, fromType) {
instances.forEach(function (ajv) {
var valid = ajv.validate(schema, test.from);
//if (valid !== canCoerce) console.log('array', toType, fromType, test, ajv.errors);
valid. should.equal(canCoerce);
});
});
});
testRules(coercionArrayRules, function (test, schema, canCoerce, toType, fromType) {
instances.forEach(function (ajv) {
var valid = ajv.validate(schema, test.from);
//if (valid !== canCoerce) console.log(toType, '.', fromType, test, schema, ajv.errors);
valid. should.equal(canCoerce);
});
});
});
it('should coerce values in objects/arrays and update properties/items', function() {
testRules(coercionRules, function (test, schema, canCoerce, toType, fromType) {
@ -217,7 +240,7 @@ describe('Type coercion', function () {
function testCoercion(schema, fromData, toData) {
var valid = ajv.validate(schema, fromData);
// if (valid !== canCoerce) console.log(schema, fromData, toData);
//if (valid !== canCoerce) console.log(schema, fromData, toData);
valid. should.equal(canCoerce);
if (valid) fromData.should.eql(toData);
}
@ -366,19 +389,18 @@ describe('Type coercion', function () {
for (var toType in rules) {
for (var fromType in rules[toType]) {
var tests = rules[toType][fromType];
//if (toType === 'array') { console.log(toType, fromType, tests); }
tests.forEach(function (test) {
var canCoerce = test.to !== undefined;
var schema;
if (canCoerce) {
if (Array.isArray(test.to)) {
schema = {type: toType, "items": { "type": fromType, "enum":[test.from] }};
} else {
schema = {type: toType, "enum": [test.to]};
}
} else {
schema = { type: toType };
}
if (canCoerce) {
if (Array.isArray(test.to)) {
schema = {type: toType, "items": { "type": fromType, "enum":[test.from] }};
} else {
schema = {type: toType, "enum": [test.to]};
}
} else {
schema = { type: toType };
}
cb(test, schema, canCoerce, toType, fromType);
});
}