Commit 58a9b62

committed

rewrite if/then/else as oneOf: [allOf: [X, Y], allOf: [not: X, Z]]

1 parent 17e4ffc commit 58a9b62Copy full SHA for 58a9b62

File tree

+48

-0

lines changed

+48

-0

lines changed

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ function convertSchema(schema, path, parent, parentPath) {`
`30`	`30`	`schema = stripIllegalKeywords(schema);`
`31`	`31`	`schema = convertTypes(schema);`
`32`	`32`	`schema = convertDependencies(schema);`
	`33`	`+ schema = rewriteIfThenElse(schema);`
`33`	`34`
`34`	`35`	`if (typeof schema['patternProperties'] === 'object') {`
`35`	`36`	`schema = convertPatternProperties(schema);`
`@@ -140,4 +141,27 @@ function convertPatternProperties(schema) {`
`140`	`141`	`return schema;`
`141`	`142`	`}`
`142`	`143`
	`144`	`+function rewriteIfThenElse(schema) {`
	`145`	`+/* @handrews https://github.com/OAI/OpenAPI-Specification/pull/1766#issuecomment-442652805`
	`146`	`+if and the *Of keywords`
	`147`	`+`
	`148`	`+There is a really easy solution for implementations, which is that`
	`149`	`+`
	`150`	`+if: X, then: Y, else: Z`
	`151`	`+`
	`152`	`+is equivalent to`
	`153`	`+`
	`154`	`+oneOf: [allOf: [X, Y], allOf: [not: X, Z]]`
	`155`	`+*/`
	`156`	`+ if (schema.if && schema.then) {`
	`157`	`+ schema.oneOf = [ { allOf: [ schema.if, schema.then ] },`
	`158`	`+ { allOf: [ { not: schema.if }, schema.else ] } ];`
	`159`	`+ delete schema.if;`
	`160`	`+ delete schema.then;`
	`161`	`+ delete schema.else;`
	`162`	`+ }`
	`163`	`+ return schema;`
	`164`	`+}`
	`165`	`+`
`143`	`166`	`module.exports = convert;`
	`167`	`+`

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,24 @@`
	`1`	`+'use strict';`
	`2`	`+`
	`3`	`+const convert = require('../');`
	`4`	`+const should = require('should');`
	`5`	`+`
	`6`	`+it('if-then-else', () => {`
	`7`	`+ const schema = {`
	`8`	`+ $schema: 'http://json-schema.org/draft-04/schema#',`
	`9`	`+ if: { type: 'object' },`
	`10`	`+ then: { properties: { id: { type: 'string' } } },`
	`11`	`+ else: { format: 'uuid' }`
	`12`	`+ };`
	`13`	`+`
	`14`	`+ const result = convert(schema);`
	`15`	`+`
	`16`	`+ const expected = {`
	`17`	`+ oneOf: [`
	`18`	`+ { allOf: [ { type: 'object' }, { properties: { id: { type: 'string' } } } ] },`
	`19`	`+ { allOf: [ { not: { type: 'object' } }, { format: 'uuid' } ] }`
	`20`	`+ ]`
	`21`	`+ };`
	`22`	`+`
	`23`	`+ should(result).deepEqual(expected, 'converted');`
	`24`	`+});`

Comments

(0)