validno 0.1.6 → 0.1.8

package/dist/Schema.js

@@ -3,7 +3,9 @@ export const defaultSchemaKeys = [
     "required",
     "type",
     "eachType",
-    "rules"
+    "rules",
+    "title",
+    "customMessage"
 ];
 export class Schema {
     constructor(inputSchema) {

package/dist/checkType.js

@@ -82,10 +82,12 @@ const checkType = (key, value, requirements, keyName = key) => {
             break;
         case Date:
             const isDate = isNotNull && value.constructor === Date;
+            const isValid = isDate && !isNaN(value.getTime());
+            const errorMsg = isValid ? getErrorDetails(keyName, requirements.type, value) : 'Дата невалидна';
             result.push({
                 key: keyName,
-                passed: isDate,
-                details: isDate ? 'Passed' : getErrorDetails(keyName, requirements.type, value)
+                passed: isDate && isValid,
+                details: isDate && isValid ? 'Passed' : errorMsg
             });
             break;
         case Boolean:

package/dist/validate.js

@@ -1,8 +1,8 @@
 import checkRules from "./checkRules.js";
 import checkType from "./checkType.js";
-import { defaultSchemaKeys } from "./Schema.js";
 import _errors from "./utils/errors.js";
 import _validations from "./utils/validations.js";
+import { defaultSchemaKeys } from "./Schema.js";
 export const getResultDefaults = () => {
     return {
         ok: null,
@@ -11,7 +11,9 @@ export const getResultDefaults = () => {
         passed: [],
         errors: [],
         byKeys: {},
-        errorsByKeys: {}
+        byTitles: {},
+        errorsByKeys: {},
+        errorsByTitles: {}
     };
 };
 const checkIsNested = (obj) => {
@@ -32,12 +34,15 @@ export const mergeResults = (resultsOld, resultsNew) => {
     output.missed = [...resultsOld.missed, ...resultsNew.missed];
     output.passed = [...resultsOld.passed, ...resultsNew.passed];
     output.byKeys = Object.assign(Object.assign({}, resultsOld.byKeys), resultsNew.byKeys);
+    output.byTitles = Object.assign(Object.assign({}, resultsOld.byTitles), resultsNew.byTitles);
     output.errorsByKeys = Object.assign(Object.assign({}, resultsOld.errorsByKeys), resultsNew.errorsByKeys);
+    output.errorsByTitles = Object.assign(Object.assign({}, resultsOld.errorsByTitles), resultsNew.errorsByTitles);
     return output;
 };
 export function handleReqKey(key, data, reqs, deepKey = key) {
     let results = getResultDefaults();
     const hasNested = checkIsNested(reqs);
+    const keyTitle = 'title' in reqs ? reqs.title : deepKey;
     const missedCheck = [];
     const typeChecked = [];
     const rulesChecked = [];
@@ -46,11 +51,13 @@ export function handleReqKey(key, data, reqs, deepKey = key) {
         results.missed.push(deepKey);
         results.failed.push(deepKey);
         results.byKeys[deepKey] = false;
+        results.byTitles[keyTitle] = false;
         return results;
     }
     if (hasNested) {
         const nestedReqKeys = Object.keys(reqs);
         results.byKeys[deepKey] = true;
+        results.byTitles[keyTitle] = true;
         let i = 0;
         while (i < nestedReqKeys.length) {
             const reqKeyI = nestedReqKeys[i];
@@ -61,13 +68,20 @@ export function handleReqKey(key, data, reqs, deepKey = key) {
         return results;
     }
     if (reqs.required === true && key in data === false || data === undefined) {
-        const errMsg = _errors.getMissingError(deepKey);
+        let errMsg = _errors.getMissingError(deepKey);
+        if (reqs.customMessage && typeof reqs.customMessage === 'function') {
+            errMsg = reqs.customMessage({
+                value: data[key], key: deepKey, title: keyTitle, reqs: reqs, schema: this.schema
+            });
+        }
         missedCheck.push(false);
         results.missed.push(deepKey);
         results.failed.push(deepKey);
         results.errors.push(errMsg);
         results.byKeys[deepKey] = false;
+        results.byTitles[keyTitle] = false;
         results.errorsByKeys[deepKey] = [errMsg];
+        results.errorsByTitles[keyTitle] = [errMsg];
         return results;
     }
     const typeCheck = checkType(key, data[key], reqs, deepKey);
@@ -83,8 +97,11 @@ export function handleReqKey(key, data, reqs, deepKey = key) {
         ruleCheck.details.forEach((el) => {
             if (deepKey in results.errorsByKeys)
                 results.errorsByKeys[deepKey] = [];
+            if (deepKey in results.errorsByTitles)
+                results.errorsByTitles[keyTitle] = [];
             results.errors.push(el);
             results.errorsByKeys[deepKey] = ['1'];
+            results.errorsByTitles[keyTitle] = ['1'];
         });
     }
     if (missedCheck.length)
@@ -98,7 +115,11 @@ export function handleReqKey(key, data, reqs, deepKey = key) {
     results.errorsByKeys[deepKey] = [
         ...results.errors
     ];
+    results.errorsByTitles[keyTitle] = [
+        ...results.errors
+    ];
     results.byKeys[deepKey] = (missedCheck.length + typeChecked.length + rulesChecked.length) === 0;
+    results.byTitles[keyTitle] = (missedCheck.length + typeChecked.length + rulesChecked.length) === 0;
     return results;
 }
 const isCheckNeeded = (key, hasLimits, onlyKeys) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "validno",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/Schema.ts

@@ -5,6 +5,8 @@ export type TSchemaItem = {
     type: any,
     eachType?: any,
     rules?: {},
+    title?: string,
+    customMessage?: Function
 }
 
 export type TSchemaInput = {
@@ -15,14 +17,18 @@ export const enum ESchemaFields {
     Required = 'required',
     Type = 'type',
     EachType = 'eachType',
-    Rules = 'rules'
+    Rules = 'rules',
+    Title = 'title',
+    CustomMessage = 'customMessage'
 }
 
 export const defaultSchemaKeys = [
     ESchemaFields.Required,
     ESchemaFields.Type,
     ESchemaFields.EachType,
-    ESchemaFields.Rules
+    ESchemaFields.Rules,
+    ESchemaFields.Title,
+    ESchemaFields.CustomMessage
 ]
 
 export type TSchema = TSchemaInput

package/src/checkType.ts

@@ -95,11 +95,13 @@ const checkType = (key: string, value: any, requirements: TSchemaItem | TSchemaI
         break;
       case Date:
         const isDate = isNotNull && value.constructor === Date
+        const isValid = isDate && !isNaN(value.getTime())
+        const errorMsg = isValid ? getErrorDetails(keyName, requirements.type, value) : 'Дата невалидна'
 
         result.push({
           key: keyName,
-          passed: isDate,
-          details: isDate ? 'Passed' : getErrorDetails(keyName, requirements.type, value)
+          passed: isDate && isValid,
+          details: isDate && isValid ? 'Passed' : errorMsg
         })
         break;
       case Boolean:

package/src/validate.ts

@@ -1,8 +1,8 @@
 import checkRules from "./checkRules.js";
 import checkType from "./checkType.js";
-import { defaultSchemaKeys, Schema, TSchemaInput } from "./Schema.js";
 import _errors from "./utils/errors.js";
 import _validations from "./utils/validations.js";
+import { defaultSchemaKeys, Schema, TSchemaInput } from "./Schema.js";
 
 export type TResult = {
     ok: null | boolean,
@@ -10,8 +10,10 @@ export type TResult = {
     failed: string[],
     passed: string[],
     errors: string[],
-    byKeys: {[key: string]: boolean}
-    errorsByKeys: {[key: string]: string[]}
+    byKeys: {[key: string]: boolean},
+    byTitles: {[key: string]: boolean},
+    errorsByKeys: {[key: string]: string[]},
+    errorsByTitles: {[key: string]: string[]}
 };
 
 export const getResultDefaults = (): TResult => {
@@ -22,7 +24,9 @@ export const getResultDefaults = (): TResult => {
     passed: [],
     errors: [],
     byKeys: {},
-    errorsByKeys: {}
+    byTitles: {},
+    errorsByKeys: {},
+    errorsByTitles: {}
   };
 }
 
@@ -46,7 +50,9 @@ export const mergeResults = (resultsOld: TResult, resultsNew: TResult) => {
   output.missed = [...resultsOld.missed, ...resultsNew.missed]
   output.passed = [...resultsOld.passed, ...resultsNew.passed]
   output.byKeys = {...resultsOld.byKeys, ...resultsNew.byKeys}
+  output.byTitles = {...resultsOld.byTitles, ...resultsNew.byTitles}
   output.errorsByKeys = {...resultsOld.errorsByKeys, ...resultsNew.errorsByKeys}
+  output.errorsByTitles = {...resultsOld.errorsByTitles, ...resultsNew.errorsByTitles}
 
   return output
 }
@@ -54,6 +60,7 @@ export const mergeResults = (resultsOld: TResult, resultsNew: TResult) => {
 export function handleReqKey(this: any, key: string, data: any, reqs: TSchemaInput, deepKey = key) {
   let results = getResultDefaults()
   const hasNested = checkIsNested(reqs)
+  const keyTitle = 'title' in reqs ? reqs.title : deepKey
 
   const missedCheck: boolean[] = [];
   const typeChecked: boolean[] = [];
@@ -68,6 +75,8 @@ export function handleReqKey(this: any, key: string, data: any, reqs: TSchemaInp
     results.missed.push(deepKey)
     results.failed.push(deepKey)
     results.byKeys[deepKey] = false
+    // @ts-ignore
+    results.byTitles[keyTitle] = false
     return results
   }
 
@@ -75,6 +84,8 @@ export function handleReqKey(this: any, key: string, data: any, reqs: TSchemaInp
   if (hasNested) {
     const nestedReqKeys: string[] = Object.keys(reqs)
     results.byKeys[deepKey] = true
+        // @ts-ignore
+    results.byTitles[keyTitle] = true
 
     let i = 0;
     while (i < nestedReqKeys.length) {
@@ -100,14 +111,25 @@ export function handleReqKey(this: any, key: string, data: any, reqs: TSchemaInp
   // Check missing keys
   // @ts-ignore
   if (reqs.required === true && key in data === false || data === undefined) {
-    const errMsg = _errors.getMissingError(deepKey)
+    let errMsg = _errors.getMissingError(deepKey)
+
+    if (reqs.customMessage && typeof reqs.customMessage === 'function') {
+      // @ts-ignore
+      errMsg = reqs.customMessage({
+        value: data[key], key: deepKey, title: keyTitle, reqs: reqs, schema: this.schema
+      })
+    }
 
     missedCheck.push(false)
     results.missed.push(deepKey)
     results.failed.push(deepKey)
     results.errors.push(errMsg)
     results.byKeys[deepKey] = false
+    // @ts-ignore
+    results.byTitles[keyTitle] = false
     results.errorsByKeys[deepKey] = [errMsg]
+    // @ts-ignore
+    results.errorsByTitles[keyTitle] = [errMsg]
     return results
   }
 
@@ -129,9 +151,14 @@ export function handleReqKey(this: any, key: string, data: any, reqs: TSchemaInp
     rulesChecked.push(false)
     ruleCheck.details.forEach((el) => {
       if (deepKey in results.errorsByKeys) results.errorsByKeys[deepKey] = []
+      // @ts-ignore
+      if (deepKey in results.errorsByTitles) results.errorsByTitles[keyTitle] = []
+
       results.errors.push(el)
 
       results.errorsByKeys[deepKey] = ['1']
+      // @ts-ignore
+      results.errorsByTitles[keyTitle] = ['1']
     })
   }
 
@@ -148,10 +175,20 @@ export function handleReqKey(this: any, key: string, data: any, reqs: TSchemaInp
     ...results.errors
   ]
 
+  // @ts-ignore
+  results.errorsByTitles[keyTitle] = [
+    ...results.errors
+  ]
+
   results.byKeys[deepKey] = (
     missedCheck.length + typeChecked.length + rulesChecked.length
   ) === 0
 
+  // @ts-ignore
+  results.byTitles[keyTitle] = (
+    missedCheck.length + typeChecked.length + rulesChecked.length
+  ) === 0
+
   return results
 }