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

oneOf -> anyOf for maybe types

master
Paul Loyd 2018-01-13 20:54:46 +03:00
parent 09f37c29bc
commit 414a3f5186
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/generators/jsonSchema.js
View File

@ -140,7 +140,7 @@ function convert(fund: Fund, type: ?Type): Schema {
}; };
case 'maybe': case 'maybe':
return { return {
oneOf: [convert(fund, type.value), {type: 'null'}], anyOf: [convert(fund, type.value), {type: 'null'}],
}; };
case 'number': case 'number':
const {repr} = type; const {repr} = type;

10
tests/samples/maybe/schema.json
View File

@ -4,8 +4,8 @@
"maybe::X": { "maybe::X": {
"type": "object", "type": "object",
"properties": { "properties": {
"x": {"oneOf": [{"type": "string"}, {"type": "null"}]}, "x": {"anyOf": [{"type": "string"}, {"type": "null"}]},
"xx": {"oneOf": [{"type": "string"}, {"type": "null"}]} "xx": {"anyOf": [{"type": "string"}, {"type": "null"}]}
}, },
"required": ["x", "xx"] "required": ["x", "xx"]
}, },
@ -13,12 +13,12 @@
"type": "object", "type": "object",
"properties": { "properties": {
"y": { "y": {
"oneOf": [ "anyOf": [
{"type": "array", "items": {"type": "string"}}, {"type": "array", "items": {"type": "string"}},
{"type": "null"} {"type": "null"}
] ]
}, },
"yy": {"oneOf": [{"type": "string"}, {"type": "null"}]} "yy": {"anyOf": [{"type": "string"}, {"type": "null"}]}
}, },
"required": ["y", "yy"] "required": ["y", "yy"]
}, },
@ -27,7 +27,7 @@
"properties": { "properties": {
"z": { "z": {
"type": "array", "type": "array",
"items": {"oneOf": [{"type": "string"}, {"type": "null"}]} "items": {"anyOf": [{"type": "string"}, {"type": "null"}]}
} }
}, },
"required": ["z"] "required": ["z"]

2
tests/samples/nonMaybeType/schema.json
View File

@ -1,7 +1,7 @@
{ {
"$schema": "http://json-schema.org/draft-06/schema#", "$schema": "http://json-schema.org/draft-06/schema#",
"definitions": { "definitions": {
"nonMaybeType::X": {"oneOf": [{"type": "string"}, {"type": "null"}]}, "nonMaybeType::X": {"anyOf": [{"type": "string"}, {"type": "null"}]},
"nonMaybeType::Y": {"type": "string"} "nonMaybeType::Y": {"type": "string"}
} }
} }