From 83504549812f2ca0fc4884c6f5995b2fe803ff8b Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin Date: Sun, 10 Feb 2019 10:25:01 +0000 Subject: [PATCH] refactor: return boolean schema true instead of empty schema {} --- keywords/anyRequired.js | 8 ++++---- keywords/deepProperties.js | 2 +- keywords/prohibited.js | 8 ++++---- package.json | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/keywords/anyRequired.js b/keywords/anyRequired.js index 4cc973b..acc55a9 100644 --- a/keywords/anyRequired.js +++ b/keywords/anyRequired.js @@ -4,12 +4,12 @@ module.exports = function defFunc(ajv) { defFunc.definition = { type: 'object', macro: function (schema) { - if (schema.length == 0) return {}; - if (schema.length == 1) return { required: schema }; + if (schema.length == 0) return true; + if (schema.length == 1) return {required: schema}; var schemas = schema.map(function (prop) { - return { required: [prop] }; + return {required: [prop]}; }); - return { anyOf: schemas }; + return {anyOf: schemas}; }, metaSchema: { type: 'array', diff --git a/keywords/deepProperties.js b/keywords/deepProperties.js index 3dac5fb..e5aff60 100644 --- a/keywords/deepProperties.js +++ b/keywords/deepProperties.js @@ -9,7 +9,7 @@ module.exports = function defFunc(ajv) { var schemas = []; for (var pointer in schema) schemas.push(getSchema(pointer, schema[pointer])); - return { 'allOf': schemas }; + return {'allOf': schemas}; }, metaSchema: { type: 'object', diff --git a/keywords/prohibited.js b/keywords/prohibited.js index e01e481..775e138 100644 --- a/keywords/prohibited.js +++ b/keywords/prohibited.js @@ -4,12 +4,12 @@ module.exports = function defFunc(ajv) { defFunc.definition = { type: 'object', macro: function (schema) { - if (schema.length == 0) return {}; - if (schema.length == 1) return { not: { required: schema } }; + if (schema.length == 0) return true; + if (schema.length == 1) return {not: {required: schema}}; var schemas = schema.map(function (prop) { - return { required: [prop] }; + return {required: [prop]}; }); - return { not: { anyOf: schemas } }; + return {not: {anyOf: schemas}}; }, metaSchema: { type: 'array', diff --git a/package.json b/package.json index d4441c8..bfa3efe 100644 --- a/package.json +++ b/package.json @@ -31,10 +31,10 @@ }, "homepage": "https://github.com/epoberezkin/ajv-keywords#readme", "peerDependencies": { - "ajv": "^6.0.0" + "ajv": "^6.9.1" }, "devDependencies": { - "ajv": "^6.8.1", + "ajv": "^6.9.1", "ajv-pack": "^0.3.0", "chai": "^4.2.0", "coveralls": "^3.0.2",