validno 0.1.10 → 0.1.11

package/dist/Schema.js

@@ -5,7 +5,8 @@ export const defaultSchemaKeys = [
     "eachType",
     "rules",
     "title",
-    "customMessage"
+    "customMessage",
+    "joinErrors"
 ];
 export class Schema {
     constructor(inputSchema) {

package/dist/dev.js

@@ -1,63 +1,41 @@
 import { Schema } from "./Schema.js";
 const schema = new Schema({
-    wrongType: {
+    ops1: {
         type: Number,
         required: true,
-        title: 'Не по типу',
+        title: 'titl',
         customMessage: (input) => {
-            return 'wrong type 1 msg ' + input.keyword;
+            return 'Wrong type 1 msg ' + input.keyword;
         }
     },
-    missingKey: {
-        type: Date,
-        required: true,
-        title: 'Отсутствующий',
-        customMessage: (input) => {
-            return 'missing msg ' + input.keyword;
-        }
-    },
-    wrongRule1: {
+    ops2: {
         type: String,
         required: true,
-        title: 'Wrong Rule #1',
-        rules: {
-            is: 'xxx'
-        },
+        title: 'titl',
         customMessage: (input) => {
-            return 'wrong rule #1 msg ' + input.keyword;
+            return 'Missing msg ' + input.keyword;
         }
     },
-    wrongRule2: {
+    miss: {
         type: String,
         required: true,
-        title: 'Wrong Rule #2',
-        rules: {
-            lengthMin: 999
-        },
+        title: 'titl',
         customMessage: (input) => {
-            return 'wrong rule #2 msg ' + input.keyword;
+            return 'Missing msg ' + input.keyword;
         }
-    },
-    wrongRule3: {
-        type: String,
-        required: true,
-        title: 'Wrong Rule #3',
-        rules: {
-            lengthMax: 1
-        },
-        customMessage: (input) => {
-            const { keyword, value, key, title, reqs, schema, rules } = input;
-            if (keyword === 'lengthMax') {
-                return `Значение ${value} недопустимо для поля ${title}. Минимальная длина ${rules.lengthMax} символов`;
-            }
-            return 'Проверьте значение, кажется, что-то не в порядке';
-        }
-    },
+    }
 });
 const obj = {
-    wrongType: 'String',
-    wrongRule1: 'qwertyuiop',
-    wrongRule2: 'asdfghjkl',
-    wrongRule3: 'zxcvbnmasd'
+    ops1: 'String',
+    ops2: 123
+};
+const obj2 = {
+    ops1: 222,
+    ops2: 'str',
+    miss: 'here'
 };
-console.log('finalResult', schema.validate(obj));
+const res = schema.validate(obj);
+const res2 = schema.validate(obj2);
+console.log('finalResult');
+console.log(res2);
+console.log(res2.joinErrors());

package/dist/validate.js

@@ -1,9 +1,13 @@
-import checkRules from "./checkRules.js";
 import checkType from "./checkType.js";
 import _errors from "./utils/errors.js";
+import checkRules from "./checkRules.js";
 import _validations from "./utils/validations.js";
-import { defaultSchemaKeys } from "./Schema.js";
 import { ErrorKeywords } from "./constants/details.js";
+import { defaultSchemaKeys } from "./Schema.js";
+function joinErrors(separator = ';') {
+    var _a;
+    return ((_a = this.errors) === null || _a === void 0 ? void 0 : _a.join(`${separator} `)) || '';
+}
 export const getResultDefaults = () => {
     return {
         ok: null,
@@ -78,6 +82,9 @@ export function handleReqKey(key, data, reqs, deepKey = key) {
         results.missed.push(deepKey);
         results.failed.push(deepKey);
         results.errors.push(errMsg);
+        if (deepKey in results.errorsByKeys === false)
+            results.errorsByKeys[deepKey] = [];
+        results.errorsByKeys[deepKey].push(errMsg);
         results.byKeys[deepKey] = false;
         return results;
     }
@@ -129,7 +136,23 @@ function validate(schema, data, onlyKeys) {
         results.ok = false;
     else
         results.ok = true;
-    return results;
+    return new ValidnoResult(results);
 }
 ;
+class ValidnoResult {
+    constructor(results) {
+        this.ok = results.ok;
+        this.missed = results.missed;
+        this.failed = results.failed;
+        this.passed = results.passed;
+        this.errors = results.errors;
+        this.byKeys = results.byKeys;
+        this.errorsByKeys = results.errorsByKeys;
+        this.byKeys = results.byKeys;
+    }
+    joinErrors(separator = '; ') {
+        var _a;
+        return ((_a = this.errors) === null || _a === void 0 ? void 0 : _a.join(`${separator} `)) || '';
+    }
+}
 export default validate;

package/package.json

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