Commit 08b682e

author

Phil Sturgeon

authored

Merge branch 'master' into if-then-else

2 parents 58a9b62 + 974538d commit 08b682eCopy full SHA for 08b682e

File tree

+63

-0

lines changed

+63

-0

lines changed

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,16 @@ function convertSchema(schema, path, parent, parentPath) {`
`31`	`31`	`schema = convertTypes(schema);`
`32`	`32`	`schema = convertDependencies(schema);`
`33`	`33`	`schema = rewriteIfThenElse(schema);`
	`34`	`+ schema = rewriteExclusiveMinMax(schema);`
`34`	`35`
`35`	`36`	`if (typeof schema['patternProperties'] === 'object') {`
`36`	`37`	`schema = convertPatternProperties(schema);`
`37`	`38`	`}`
`38`	`39`
	`40`	`+ if (schema.type === 'array' && typeof schema.items === 'undefined') {`
	`41`	`+ schema.items = {};`
	`42`	`+ }`
	`43`	`+`
`39`	`44`	`return schema;`
`40`	`45`	`}`
`41`	`46`
`@@ -159,6 +164,18 @@ oneOf: [allOf: [X, Y], allOf: [not: X, Z]]`
`159`	`164`	`delete schema.if;`
`160`	`165`	`delete schema.then;`
`161`	`166`	`delete schema.else;`
	`167`	`+ }`
	`168`	`+ return schema;`
	`169`	`+}`
	`170`	`+`
	`171`	`+function rewriteExclusiveMinMax(schema) {`
	`172`	`+ if (typeof schema.exclusiveMaximum === 'number') {`
	`173`	`+ schema.maximum = schema.exclusiveMaximum;`
	`174`	`+ schema.exclusiveMaximum = true;`
	`175`	`+ }`
	`176`	`+ if (typeof schema.exclusiveMinimum === 'number') {`
	`177`	`+ schema.minimum = schema.exclusiveMinimum;`
	`178`	`+ schema.exclusiveMinimum = true;`
`162`	`179`	`}`
`163`	`180`	`return schema;`
`164`	`181`	`}`

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,21 @@`
	`1`	`+'use strict';`
	`2`	`+`
	`3`	`+const convert = require('../');`
	`4`	`+const should = require('should');`
	`5`	`+`
	`6`	`+it('array-items', () => {`
	`7`	`+ const schema = {`
	`8`	`+ $schema: 'http://json-schema.org/draft-04/schema#',`
	`9`	`+ type: 'array',`
	`10`	`+ };`
	`11`	`+`
	`12`	`+ const result = convert(schema);`
	`13`	`+`
	`14`	`+ const expected = {`
	`15`	`+ type: 'array',`
	`16`	`+ items: {`
	`17`	`+ }`
	`18`	`+ };`
	`19`	`+`
	`20`	`+ should(result).deepEqual(expected, 'converted');`
	`21`	`+});`

Lines changed: 25 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,25 @@`
	`1`	`+'use strict';`
	`2`	`+`
	`3`	`+const convert = require('../');`
	`4`	`+const should = require('should');`
	`5`	`+`
	`6`	`+it('exclusiveMinMax', () => {`
	`7`	`+ const schema = {`
	`8`	`+ $schema: 'http://json-schema.org/draft-04/schema#',`
	`9`	`+ type: 'integer',`
	`10`	`+ exclusiveMaximum: 10,`
	`11`	`+ exclusiveMinimum: 0`
	`12`	`+ };`
	`13`	`+`
	`14`	`+ const result = convert(schema);`
	`15`	`+`
	`16`	`+ const expected = {`
	`17`	`+ type: 'integer',`
	`18`	`+ maximum: 10,`
	`19`	`+ exclusiveMaximum: true,`
	`20`	`+ minimum: 0,`
	`21`	`+ exclusiveMinimum: true`
	`22`	`+ };`
	`23`	`+`
	`24`	`+ should(result).deepEqual(expected, 'converted');`
	`25`	`+});`

Comments

(0)