From d3ef97f6922b39d03f480288b725ceadfe0ac332 Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Thu, 6 Dec 2018 21:44:14 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BD=D0=B0=20=D0=BD=D0=B0=D0=BB=D0=B8=D1=87=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4=D0=B8=D1=80=D1=83=D0=B5?= =?UTF-8?q?=D0=BC=D0=BE=D0=B3=D0=BE=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/utils.js | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/core/utils.js b/core/utils.js index db56865..0252ece 100644 --- a/core/utils.js +++ b/core/utils.js @@ -20,21 +20,25 @@ const validateObject = (obj, schema, sObjName) => { //Объявим результат let sRes = ""; if (schema instanceof Schema) { - const objTmp = _.cloneDeep(obj); - const errors = schema.validate(objTmp, { strip: false }); - if (errors && Array.isArray(errors)) { - if (errors.length > 0) { - let a = errors.map(e => { - return e.message; - }); - sRes = - "Объект" + - (sObjName ? " '" + sObjName + "' " : " ") + - "имеет некорректный формат: " + - _.uniq(a).join("; "); + if (obj) { + const objTmp = _.cloneDeep(obj); + const errors = schema.validate(objTmp, { strip: false }); + if (errors && Array.isArray(errors)) { + if (errors.length > 0) { + let a = errors.map(e => { + return e.message; + }); + sRes = + "Объект" + + (sObjName ? " '" + sObjName + "' " : " ") + + "имеет некорректный формат: " + + _.uniq(a).join("; "); + } + } else { + sRes = "Неожиданный ответ валидатора"; } } else { - sRes = "Неожиданный ответ валидатора"; + sRes = "Объект" + (sObjName ? " '" + sObjName + "' " : " ") + "не указан"; } } else { sRes = "Ошибочный формат схемы валидации";