validno 0.2.1 → 0.2.2

package/dist/ValidnoResult.js

@@ -0,0 +1,61 @@
+import _errors from "./utils/errors.js";
+class ValidnoResult {
+    constructor(results) {
+        this.ok = (results === null || results === void 0 ? void 0 : results.ok) !== undefined ? results.ok : null;
+        this.missed = (results === null || results === void 0 ? void 0 : results.missed) || [];
+        this.failed = (results === null || results === void 0 ? void 0 : results.failed) || [];
+        this.passed = (results === null || results === void 0 ? void 0 : results.passed) || [];
+        this.errors = (results === null || results === void 0 ? void 0 : results.errors) || [];
+        this.byKeys = (results === null || results === void 0 ? void 0 : results.byKeys) || {};
+        this.errorsByKeys = (results === null || results === void 0 ? void 0 : results.errorsByKeys) || {};
+        this.byKeys = (results === null || results === void 0 ? void 0 : results.byKeys) || {};
+    }
+    fixByKey(key, result) {
+        this.byKeys[key] = result;
+        if (result === true)
+            this.passed.push(key);
+        else
+            this.failed.push(key);
+    }
+    pushMissing(key, errMsg) {
+        this.missed.push(key);
+        this.fixByKey(key, false);
+        const error = errMsg || _errors.getMissingError(key);
+        this.pushError(key, error);
+    }
+    pushError(key, msg) {
+        if (key in this.errorsByKeys === false) {
+            this.errorsByKeys[key] = [];
+        }
+        this.byKeys[key] = false;
+        this.errors.push(msg);
+        this.errorsByKeys[key].push(msg);
+    }
+    joinErrors(separator = '; ') {
+        return _errors.joinErrors(this.errors, separator);
+    }
+    merge(resultsNew) {
+        this.failed = [...this.failed, ...resultsNew.failed];
+        this.errors = [...this.errors, ...resultsNew.errors];
+        this.missed = [...this.missed, ...resultsNew.missed];
+        this.passed = [...this.passed, ...resultsNew.passed];
+        this.byKeys = Object.assign(Object.assign({}, this.byKeys), resultsNew.byKeys);
+        for (const key in resultsNew.errorsByKeys) {
+            if (key in this.errorsByKeys === false)
+                this.errorsByKeys[key] = [];
+            this.errorsByKeys[key] = [
+                ...this.errorsByKeys[key],
+                ...resultsNew.errorsByKeys[key]
+            ];
+        }
+        return this;
+    }
+    finish() {
+        if (this.failed.length)
+            this.ok = false;
+        else
+            this.ok = true;
+        return this;
+    }
+}
+export default ValidnoResult;

package/dist/utils/helpers.js

@@ -0,0 +1,48 @@
+import { defaultSchemaKeys } from "../Schema.js";
+import ValidnoResult from "../ValidnoResult.js";
+import _validations from "./validations.js";
+const _helpers = {};
+_helpers.checkIsNested = (obj) => {
+    if (!_validations.isObject(obj))
+        return false;
+    const objKeys = Object.keys(obj);
+    if (objKeys.every((k) => defaultSchemaKeys.includes(k))) {
+        return false;
+    }
+    else {
+        return true;
+    }
+};
+_helpers.mergeResults = (resultsOld, resultsNew) => {
+    const output = new ValidnoResult();
+    output.failed = [...resultsOld.failed, ...resultsNew.failed];
+    output.errors = [...resultsOld.errors, ...resultsNew.errors];
+    output.missed = [...resultsOld.missed, ...resultsNew.missed];
+    output.passed = [...resultsOld.passed, ...resultsNew.passed];
+    output.byKeys = Object.assign(Object.assign({}, resultsOld.byKeys), resultsNew.byKeys);
+    output.errorsByKeys = Object.assign(Object.assign({}, resultsOld.errorsByKeys), resultsNew.errorsByKeys);
+    return output;
+};
+_helpers.checkNestedIsMissing = (reqs, data) => {
+    const isRequired = reqs.required;
+    const isUndef = data === undefined;
+    const isEmpty = _validations.isObject(data) && !Object.keys(data).length;
+    return isRequired && (isUndef || isEmpty);
+};
+_helpers.areKeysLimited = (onlyKeys) => {
+    const hasArrayOfKeys = (Array.isArray(onlyKeys) && onlyKeys.length > 0);
+    const hasStringKey = (typeof onlyKeys === 'string' && onlyKeys.length > 0);
+    return hasArrayOfKeys || hasStringKey;
+};
+_helpers.needValidation = (key, hasLimits, onlyKeys) => {
+    const noLimits = !hasLimits;
+    const keyIsInList = (key === onlyKeys || Array.isArray(onlyKeys) && (onlyKeys === null || onlyKeys === void 0 ? void 0 : onlyKeys.includes(key)));
+    return noLimits || keyIsInList;
+};
+_helpers.hasMissing = (input) => {
+    const { reqs, data, key } = input;
+    const isRequired = reqs.required === true;
+    const missingData = (data === undefined || key in data === false || data[key] === undefined);
+    return isRequired && missingData;
+};
+export default _helpers;

package/dist/utils/nested.js

@@ -0,0 +1 @@
+"use strict";

package/dist/validate.js

@@ -1,89 +1,67 @@
 import checkType from "./checkType.js";
 import _errors from "./utils/errors.js";
 import checkRules from "./checkRules.js";
-import _validations from "./utils/validations.js";
+import _helpers from "./utils/helpers.js";
 import { ErrorKeywords } from "./constants/details.js";
-import { defaultSchemaKeys } from "./Schema.js";
-export const getResultDefaults = () => {
-    return {
-        ok: null,
-        missed: [],
-        failed: [],
-        passed: [],
-        errors: [],
-        byKeys: {},
-        errorsByKeys: {},
-    };
-};
-const checkIsNested = (obj) => {
-    if (!_validations.isObject(obj))
-        return false;
-    const objKeys = Object.keys(obj);
-    if (objKeys.every((k) => defaultSchemaKeys.includes(k))) {
-        return false;
+import ValidnoResult from "./ValidnoResult.js";
+function generateMsg(input) {
+    let { results, key, deepKey, data, reqs } = input;
+    const keyForMsg = deepKey || key;
+    const keyTitle = 'title' in reqs ? reqs.title : keyForMsg;
+    if (reqs.customMessage && typeof reqs.customMessage === 'function') {
+        const errMsg = reqs.customMessage({
+            keyword: ErrorKeywords.Missing,
+            value: data[key],
+            key: keyForMsg,
+            title: keyTitle,
+            reqs: reqs,
+            schema: this.schema
+        });
+        return errMsg;
     }
-    else {
-        return true;
+    return _errors.getMissingError(keyForMsg);
+}
+function handleDeepKey(input) {
+    const { results, key, deepKey, data, reqs } = input;
+    const nesctedKeys = Object.keys(reqs);
+    results.fixByKey(deepKey, false);
+    let i = 0;
+    while (i < nesctedKeys.length) {
+        const nestedKey = nesctedKeys[i];
+        const deepParams = {
+            key: nestedKey,
+            data: data[key],
+            reqs: reqs[nestedKey],
+            deepKey: `${deepKey}.${nestedKey}`
+        };
+        const deepResults = handleKey.call(this, deepParams);
+        results.merge(deepResults);
+        i++;
     }
-};
-export const mergeResults = (resultsOld, resultsNew) => {
-    const output = getResultDefaults();
-    output.failed = [...resultsOld.failed, ...resultsNew.failed];
-    output.errors = [...resultsOld.errors, ...resultsNew.errors];
-    output.missed = [...resultsOld.missed, ...resultsNew.missed];
-    output.passed = [...resultsOld.passed, ...resultsNew.passed];
-    output.byKeys = Object.assign(Object.assign({}, resultsOld.byKeys), resultsNew.byKeys);
-    output.errorsByKeys = Object.assign(Object.assign({}, resultsOld.errorsByKeys), resultsNew.errorsByKeys);
-    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;
+    return results;
+}
+export function handleKey(input) {
+    let { results, key, deepKey, data, reqs } = input;
+    if (!results)
+        results = new ValidnoResult();
+    if (!deepKey)
+        deepKey = key;
+    const hasNested = _helpers.checkIsNested(reqs);
+    const hasMissing = _helpers.hasMissing(input);
     const missedCheck = [];
     const typeChecked = [];
     const rulesChecked = [];
-    if (reqs.required && (data === undefined ||
-        (_validations.isObject(data) && !Object.keys(data).length))) {
-        results.missed.push(deepKey);
-        results.failed.push(deepKey);
-        results.byKeys[deepKey] = false;
+    if (_helpers.checkNestedIsMissing(reqs, data)) {
+        results.pushMissing(deepKey);
         return results;
     }
     if (hasNested) {
-        const nestedReqKeys = Object.keys(reqs);
-        results.byKeys[deepKey] = true;
-        let i = 0;
-        while (i < nestedReqKeys.length) {
-            const reqKeyI = nestedReqKeys[i];
-            const deepResults = handleReqKey.call(this, reqKeyI, data[key], reqs[reqKeyI], deepKey + '.' + reqKeyI);
-            results = mergeResults(results, deepResults);
-            i++;
-        }
-        return results;
+        return handleDeepKey.call(this, { results, key, data, reqs, deepKey });
     }
-    if (reqs.required === true &&
-        (key in data === false || data === undefined || data[key] === undefined)) {
-        console.log(data);
-        let errMsg = _errors.getMissingError(deepKey);
-        if (reqs.customMessage && typeof reqs.customMessage === 'function') {
-            errMsg = reqs.customMessage({
-                keyword: ErrorKeywords.Missing,
-                value: data[key],
-                key: deepKey,
-                title: keyTitle,
-                reqs: reqs,
-                schema: this.schema
-            });
-        }
+    if (hasMissing) {
+        let errMsg = generateMsg.call(this, input);
         missedCheck.push(false);
-        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;
+        results.pushMissing(deepKey, errMsg);
         return results;
     }
     const typeCheck = checkType(key, data[key], reqs, deepKey);
@@ -104,52 +82,27 @@ export function handleReqKey(key, data, reqs, deepKey = key) {
         });
     }
     if (missedCheck.length)
-        results.missed.push(deepKey);
-    if (typeChecked.length || rulesChecked.length) {
-        results.failed.push(deepKey);
-    }
-    else {
-        results.passed.push(deepKey);
-    }
+        results.pushMissing(deepKey);
+    const isPassed = (!typeChecked.length && !rulesChecked.length && !missedCheck.length);
+    results.fixByKey(deepKey, isPassed);
     results.errorsByKeys[deepKey] = [
         ...results.errors
     ];
-    results.byKeys[deepKey] = (missedCheck.length + typeChecked.length + rulesChecked.length) === 0;
-    return results;
+    return results.finish();
 }
-const checkIfValidationIsNeeded = (key, hasLimits, onlyKeys) => {
-    return !hasLimits || (key === onlyKeys || Array.isArray(onlyKeys) && (onlyKeys === null || onlyKeys === void 0 ? void 0 : onlyKeys.includes(key)));
-};
-function validate(schema, data, onlyKeys) {
-    let results = getResultDefaults();
-    const areKeysLimited = (Array.isArray(onlyKeys) && onlyKeys.length > 0) || (typeof onlyKeys === 'string' && onlyKeys.length > 0);
-    for (const [key, reqs] of Object.entries(schema.schema)) {
-        const isValidationRequired = checkIfValidationIsNeeded(key, areKeysLimited, onlyKeys);
-        if (isValidationRequired) {
-            const keyResult = handleReqKey.call(this, key, data, reqs);
-            results = mergeResults(results, keyResult);
-        }
+function validate(schema, data, keysToCheck) {
+    const results = new ValidnoResult();
+    const hasKeysToCheck = _helpers.areKeysLimited(keysToCheck);
+    const schemaKeys = Object.entries(schema.schema);
+    for (const [key, reqs] of schemaKeys) {
+        const toBeValidated = _helpers.needValidation(key, hasKeysToCheck, keysToCheck);
+        if (!toBeValidated)
+            continue;
+        const keyResult = handleKey.call(this, { key, data, reqs });
+        results.merge(keyResult);
     }
-    if (results.failed.length)
-        results.ok = false;
-    else
-        results.ok = true;
-    return new ValidnoResult(results);
+    results.finish();
+    return 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 = '; ') {
-        return _errors.joinErrors(this.errors, separator);
-    }
-}
 export default validate;

package/package.json

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