Commit aae1805

author

Phil Sturgeon

authored

Merge pull request #15 from MikeRalphson/if-then-else

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

2 parents 974538d + 08b682e commit aae1805Copy full SHA for aae1805

File tree

2 files changed

+48

-0

lines changed

index.js
test
- if-then-else.test.js

2 files changed

+48

-0

lines changed

`‎index.js`

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`	`schema = rewriteExclusiveMinMax(schema);`
`34`	`35`
`35`	`36`	`if (typeof schema['patternProperties'] === 'object') {`
`@@ -145,6 +146,28 @@ function convertPatternProperties(schema) {`
`145`	`146`	`return schema;`
`146`	`147`	`}`
`147`	`148`
	`149`	`+function rewriteIfThenElse(schema) {`
	`150`	`+/* @handrews https://github.com/OAI/OpenAPI-Specification/pull/1766#issuecomment-442652805`
	`151`	`+if and the *Of keywords`
	`152`	`+`
	`153`	`+There is a really easy solution for implementations, which is that`
	`154`	`+`
	`155`	`+if: X, then: Y, else: Z`
	`156`	`+`
	`157`	`+is equivalent to`
	`158`	`+`
	`159`	`+oneOf: [allOf: [X, Y], allOf: [not: X, Z]]`
	`160`	`+*/`
	`161`	`+ if (schema.if && schema.then) {`
	`162`	`+ schema.oneOf = [ { allOf: [ schema.if, schema.then ] },`
	`163`	`+ { allOf: [ { not: schema.if }, schema.else ] } ];`
	`164`	`+ delete schema.if;`
	`165`	`+ delete schema.then;`
	`166`	`+ delete schema.else;`
	`167`	`+ }`
	`168`	`+ return schema;`
	`169`	`+}`
	`170`	`+`
`148`	`171`	`function rewriteExclusiveMinMax(schema) {`
`149`	`172`	`if (typeof schema.exclusiveMaximum === 'number') {`
`150`	`173`	`schema.maximum = schema.exclusiveMaximum;`
`@@ -158,3 +181,4 @@ function rewriteExclusiveMinMax(schema) {`
`158`	`181`	`}`
`159`	`182`
`160`	`183`	`module.exports = convert;`
	`184`	`+`

`‎test/if-then-else.test.js`

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`	`+});`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit aae1805

File tree

2 files changed

2 files changed

`‎index.js`

`‎test/if-then-else.test.js`

0 commit comments