Skip to content

Implement if/then/else #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 3, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 64 additions & 10 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict'

var Ajv = require('ajv')
var merge = require('deepmerge')

var uglify = null
var isLong
Expand Down Expand Up @@ -86,7 +87,7 @@ function build (schema, options) {

var dependencies = []
var dependenciesName = []
if (hasAnyOf(schema) || hasArrayOfTypes(schema)) {
if (hasAnyOf(schema) || hasArrayOfTypes(schema) || hasIf(schema)) {
dependencies.push(new Ajv())
dependenciesName.push('ajv')
}
Expand Down Expand Up @@ -143,6 +144,11 @@ function hasArrayOfTypes (schema) {
return false
}

function hasIf (schema) {
const str = JSON.stringify(schema)
return /"if":{/.test(str) && /"then":{/.test(str)
}

function $asNull () {
return 'null'
}
Expand Down Expand Up @@ -475,21 +481,15 @@ function buildCode (schema, code, laterCode, name, externalSchema, fullSchema) {
return { code: code, laterCode: laterCode }
}

function buildObject (schema, code, name, externalSchema, fullSchema) {
code += `
function ${name} (obj) {
var json = '{'
var addComma = false
`

function buildInnerObject (schema, name, externalSchema, fullSchema) {
var laterCode = ''
var code = ''
if (schema.patternProperties) {
code += addPatternProperties(schema, externalSchema, fullSchema)
} else if (schema.additionalProperties && !schema.patternProperties) {
code += addAdditionalProperties(schema, externalSchema, fullSchema)
}

var laterCode = ''

if (schema.allOf) {
schema.allOf.forEach((ss) => {
var builtCode = buildCode(ss, code, laterCode, name, externalSchema, fullSchema)
Expand All @@ -504,6 +504,60 @@ function buildObject (schema, code, name, externalSchema, fullSchema) {
laterCode = builtCode.laterCode
}

return { code: code, laterCode: laterCode }
}

function buildObject (schema, code, name, externalSchema, fullSchema) {
code += `
function ${name} (obj) {
var json = '{'
var addComma = false
`

var laterCode = ''
var r, merged
if (schema.if && schema.then) {
merged = merge(schema, schema.then)
delete merged.if
delete merged.then
delete merged.else

code += `
var valid = ajv.validate(${require('util').inspect(schema.if, {depth: null})}, obj)
if (valid) {
`

r = buildInnerObject(merged, name, externalSchema, fullSchema)
code += r.code
laterCode = r.laterCode

code += `
}
`
if (schema.else) {
merged = merge(schema, schema.else)
delete merged.if
delete merged.then
delete merged.else

code += `
else {
`

r = buildInnerObject(merged, name, externalSchema, fullSchema)
code += r.code
laterCode = r.laterCode

code += `
}
`
}
} else {
r = buildInnerObject(schema, name, externalSchema, fullSchema)
code += r.code
laterCode = r.laterCode
}

// Removes the comma if is the last element of the string (in case there are not properties)
code += `
json += '}'
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"uglify-es": "^3.3.10"
},
"dependencies": {
"ajv": "^6.4.0"
"ajv": "^6.4.0",
"deepmerge": "^2.1.0"
}
}
85 changes: 85 additions & 0 deletions test/if-then-else.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
'use strict'

const t = require('tap')
const build = require('..')

const schema = {
'type': 'object',
'properties': {
'kind': { 'type': 'string', 'enum': ['foobar', 'greeting'] }
},
'if': {
'properties': {
'kind': { 'type': 'string', 'enum': ['foobar'] }
}
},
'then': {
'properties': {
'foo': { 'type': 'string' },
'bar': { 'type': 'number' }
}
},
'else': {
'properties': {
'hi': { 'type': 'string' },
'hello': { 'type': 'number' }
}
}
}

t.test('if-then-else', t => {
const tests = [
{
name: 'foobar',
schema: schema,
input: {
kind: 'foobar',
foo: 'FOO',
bar: 42,
hi: 'HI',
hello: 'HELLO'
},
expected: JSON.stringify({
kind: 'foobar',
foo: 'FOO',
bar: 42
})
},
{
name: 'greeting',
schema: schema,
input: {
kind: 'greeting',
foo: 'FOO',
bar: 42,
hi: 'HI',
hello: 45
},
expected: JSON.stringify({
kind: 'greeting',
hi: 'HI',
hello: 45
})
}
]

tests.forEach(test => {
t.test(test.name + ' - normal', t => {
t.plan(1)

const stringify = build(test.schema)
const serialized = stringify(test.input)
t.equal(serialized, test.expected)
})

t.test(test.name + ' - uglify', t => {
t.plan(1)

const stringify = build(test.schema, { uglify: true })
const serialized = stringify(test.input)
t.equal(serialized, test.expected)
})
})

t.end()
})