validno 0.2.3 → 0.2.4

package/dist/ValidnoResult.js

@@ -8,7 +8,6 @@ class ValidnoResult {
         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) || {};
     }
     setKeyStatus(key, result) {
         this.byKeys[key] = result;
@@ -76,5 +75,16 @@ class ValidnoResult {
         this.clearEmptyErrorsByKeys();
         return this;
     }
+    data() {
+        return {
+            ok: this.ok,
+            missed: this.missed,
+            failed: this.failed,
+            passed: this.passed,
+            errors: this.errors,
+            byKeys: this.byKeys,
+            errorsByKeys: this.errorsByKeys,
+        };
+    }
 }
 export default ValidnoResult;

package/dist/dev.js

@@ -1,91 +1,51 @@
 import { Schema } from "./Schema.js";
 const validateConfig = (cfg) => {
     const cfgSchema = new Schema({
-        methods: {
-            create: {
-                type: Object,
-                required: false,
-            },
-            createMany: {
-                type: Object,
-                required: false,
-            },
-            get: {
-                type: Object,
-                required: false,
-            },
-            getAll: {
-                type: Object,
-                required: false,
-            },
-            update: {
-                type: Object,
-                required: false,
-            },
-            delete: {
-                type: Object,
-                required: false,
-            },
-            deleteMany: {
-                type: Object,
-                required: false,
-            },
-            export: {
-                type: Object,
-                required: false,
-            },
-            distinct: {
-                type: Object,
-                required: false,
-            },
-            custom: {
-                type: Array,
-                required: false,
-                rules: {},
-            },
-        },
+        str1: {
+            type: String,
+            required: true
+        },
+        str2: {
+            deep1: {
+                type: String,
+                required: true,
+            }
+        }
     });
     const res = cfgSchema.validate(cfg);
     console.log(res);
-    if (res.ok !== true) {
-        const errorsMsg = res.errors.join('; ');
-        throw new Error(errorsMsg);
-    }
 };
 const uniTestService = {
-    methods: {
-        getAll: {
-            isActive: true,
-            sort: {
-                default: 'createdAt',
-            },
-            search: {
-                fields: ['title'],
-            },
-        },
-        export: {
-            isActive: false,
-        },
-        get: {
-            isActive: true,
-        },
-        create: null,
-        createMany: {
-            isActive: true,
-        },
-        update: {
-            isActive: true,
-        },
-        delete: {
-            isActive: true,
-        },
-        deleteMany: {
-            isActive: true,
-        },
-        distinct: {
-            isActive: true,
-            fields: ['title', '_id'],
-        },
-    },
+    str1: 'xxxx'
 };
 validateConfig(uniTestService);
+console.log(uniTestService);
+console.log(uniTestService);
+const obj = {
+    top: {
+        mid1: {
+            low1a: false,
+            low1b: false
+        },
+        mid2: {
+            low2a: false
+        }
+    },
+    top2: false
+};
+const setNestedValue = (linkedObj, keysLevels, curLevel, valueToSet) => {
+    const lvKey = keysLevels[curLevel];
+    if (curLevel < keysLevels.length - 1) {
+        if (!linkedObj[lvKey] || typeof linkedObj[lvKey] !== 'object') {
+            linkedObj[lvKey] = {};
+        }
+        return setNestedValue(linkedObj[lvKey], keysLevels, curLevel + 1, valueToSet);
+    }
+    else {
+        linkedObj[lvKey] = valueToSet;
+    }
+};
+const setDeepValue = (obj, keysChain, valueToSet) => {
+    const keysLevels = keysChain.split('.');
+    setNestedValue(obj, keysLevels, 0, valueToSet);
+};

package/dist/utils/errors.js

@@ -1,5 +1,5 @@
 const _errors = {};
-_errors.getMissingError = (key) => `Ключ '${key}' отсутствует`;
+_errors.getMissingError = (key = 'na') => `Отсутствует значение '${key}'`;
 _errors.getErrorDetails = (key, expectedType, receivedValue) => {
     var _a;
     let receivedType = '';
@@ -9,7 +9,11 @@ _errors.getErrorDetails = (key, expectedType, receivedValue) => {
         receivedType = 'null';
     else
         receivedType = ((_a = receivedValue.constructor) === null || _a === void 0 ? void 0 : _a.name) || typeof receivedValue || 'na';
-    return `Проверьте тип "${key}": ожидался ${(expectedType === null || expectedType === void 0 ? void 0 : expectedType.name) || expectedType}, получен ${receivedType || 'unknown'}`;
+    const expectedOutput = (expectedType === null || expectedType === void 0 ? void 0 : expectedType.name) || expectedType;
+    const receivedOutput = receivedType || 'na';
+    if (String(expectedOutput) === String(receivedOutput))
+        return '';
+    return `Проверьте тип '${key}': ожидался ${expectedOutput}, получен ${receivedOutput}`;
 };
 _errors.joinErrors = (errorsArr, separator = '; ') => {
     return (errorsArr === null || errorsArr === void 0 ? void 0 : errorsArr.join(`${separator}`)) || '';

package/dist/utils/helpers.js

@@ -1,5 +1,4 @@
 import { defaultSchemaKeys } from "../Schema.js";
-import ValidnoResult from "../ValidnoResult.js";
 import _validations from "./validations.js";
 const _helpers = {};
 _helpers.checkIsNested = (obj) => {
@@ -13,16 +12,6 @@ _helpers.checkIsNested = (obj) => {
         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;
@@ -45,4 +34,36 @@ _helpers.hasMissing = (input) => {
     const missingData = (data === undefined || key in data === false || data[key] === undefined);
     return isRequired && missingData;
 };
+_helpers.compareArrs = (v1, v2) => {
+    if (v1.length !== v2.length)
+        return false;
+    return v1.every((el, i) => {
+        if (_validations.isObject(el)) {
+            return JSON.stringify(el) === JSON.stringify(v2[i]);
+        }
+        return v2[i] === el;
+    });
+};
+_helpers.compareObjs = (obj1, obj2) => {
+    function deepEqual(obj1, obj2) {
+        if (obj1 === obj2) {
+            return true;
+        }
+        if (typeof obj1 !== 'object' || obj1 === null || typeof obj2 !== 'object' || obj2 === null) {
+            return false;
+        }
+        const keys1 = Object.keys(obj1);
+        const keys2 = Object.keys(obj2);
+        if (keys1.length !== keys2.length) {
+            return false;
+        }
+        for (let key of keys1) {
+            if (!keys2.includes(key) || !deepEqual(obj1[key], obj2[key])) {
+                return false;
+            }
+        }
+        return true;
+    }
+    return deepEqual(obj1, obj2);
+};
 export default _helpers;

package/dist/utils/validations.js

@@ -1,3 +1,4 @@
+import _helpers from "./helpers.js";
 const _validations = {};
 _validations.isString = (value) => {
     return typeof value === 'string';
@@ -73,37 +74,55 @@ _validations.lengthMax = (value, max) => {
 _validations.isNumberGte = (value, gte) => {
     return typeof value === 'number' && value >= gte;
 };
+_validations.isNumberGt = (value, gt) => {
+    return typeof value === 'number' && value > gt;
+};
 _validations.isNumberLte = (value, lte) => {
     return typeof value === 'number' && value <= lte;
 };
+_validations.isNumberLt = (value, lt) => {
+    return typeof value === 'number' && value < lt;
+};
+_validations.isDateGte = (date1, date2) => {
+    if (!_validations.isDate(date1) || !_validations.isDate(date2)) {
+        return false;
+    }
+    return date1 >= date2;
+};
+_validations.isDateGt = (date1, date2) => {
+    if (!_validations.isDate(date1) || !_validations.isDate(date2)) {
+        return false;
+    }
+    return date1 > date2;
+};
+_validations.isDateLte = (date1, date2) => {
+    if (!_validations.isDate(date1) || !_validations.isDate(date2)) {
+        return false;
+    }
+    return date1 <= date2;
+};
+_validations.isDateLt = (date1, date2) => {
+    if (!_validations.isDate(date1) || !_validations.isDate(date2)) {
+        return false;
+    }
+    return date1 < date2;
+};
 _validations.hasKey = (obj, key) => {
     if (_validations.isObject(obj) === false)
         return false;
     return key in obj;
 };
-const compareArrs = (v1, v2) => {
-    if (v1.length !== v2.length)
-        return false;
-    return v1.every((el, i) => {
-        if (_validations.isObject(el)) {
-            return JSON.stringify(el) === JSON.stringify(v2[i]);
-        }
-        return v2[i] === el;
-    });
-};
 _validations.is = (value, compareTo) => {
     if (value === compareTo) {
         return true;
     }
     const bothArrays = _validations.isArray(value) && _validations.isArray(compareTo);
     if (bothArrays) {
-        return compareArrs(value, compareTo);
+        return _helpers.compareArrs(value, compareTo);
     }
     const bothObjects = _validations.isObject(value) && _validations.isObject(compareTo);
     if (bothObjects) {
-        const valueStr = JSON.stringify(value);
-        const compareToStr = JSON.stringify(compareTo);
-        return valueStr === compareToStr;
+        return _helpers.compareObjs(value, compareTo);
     }
     const bothDates = _validations.isDate(value) && _validations.isDate(compareTo);
     if (bothDates) {
@@ -114,14 +133,21 @@ _validations.is = (value, compareTo) => {
 _validations.not = (value, not) => {
     return !_validations.is(value, not);
 };
-_validations.isNot = _validations.not;
-_validations.ne = _validations.not;
 _validations.regexTested = (value, regexp) => {
     if (!regexp || regexp instanceof RegExp !== true) {
         throw new Error('regexp argument is incorrect');
     }
     return regexp.test(value);
 };
+_validations.gt = _validations.isNumberGt;
+_validations.gte = _validations.isNumberGte;
+_validations.lte = _validations.isNumberLte;
+_validations.lt = _validations.isNumberLt;
+_validations.eq = _validations.is;
+_validations.isNot = _validations.not;
+_validations.ne = _validations.not;
+_validations.neq = _validations.not;
+_validations.regexpTested = _validations.regexpTested;
 _validations.regex = _validations.regexTested;
 _validations.regexp = _validations.regexTested;
 _validations.test = _validations.regexTested;

package/dist/validate.js

@@ -5,21 +5,20 @@ import _helpers from "./utils/helpers.js";
 import { ErrorKeywords } from "./constants/details.js";
 import ValidnoResult from "./ValidnoResult.js";
 function generateMsg(input) {
-    let { results, key, deepKey, data, reqs } = input;
+    let { 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;
-    }
-    return _errors.getMissingError(keyForMsg);
+    if (!reqs.customMessage)
+        return _errors.getMissingError(keyForMsg);
+    const errMsg = reqs.customMessage({
+        keyword: ErrorKeywords.Missing,
+        value: data[key],
+        key: keyForMsg,
+        title: keyTitle,
+        reqs: reqs,
+        schema: this.schema
+    });
+    return errMsg;
 }
 function handleDeepKey(input) {
     const { results, key, deepKey, data, reqs } = input;
@@ -98,7 +97,7 @@ export function handleKey(input) {
     return results.finish();
 }
 function validate(schema, data, keysToCheck) {
-    const results = new ValidnoResult();
+    const output = new ValidnoResult();
     const hasKeysToCheck = _helpers.areKeysLimited(keysToCheck);
     const schemaKeys = Object.entries(schema.schema);
     for (const [key, reqs] of schemaKeys) {
@@ -106,10 +105,10 @@ function validate(schema, data, keysToCheck) {
         if (!toBeValidated)
             continue;
         const keyResult = handleKey.call(this, { key, data, reqs });
-        results.merge(keyResult);
+        output.merge(keyResult);
     }
-    results.finish();
-    return results;
+    output.finish();
+    return output;
 }
 ;
 export default validate;

package/package.json

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

package/.eslintrc.cjs

@@ -1,13 +0,0 @@
-module.exports = {
-    "env": {
-        "browser": true,
-        "es2021": true
-    },
-    "extends": "eslint:recommended",
-    "parserOptions": {
-        "ecmaVersion": "latest",
-        "sourceType": "module"
-    },
-    "rules": {
-    }
-}

package/.eslintrc.json

@@ -1,16 +0,0 @@
-{
-    "env": {
-        "browser": true,
-        "commonjs": true,
-        "es2021": true,
-        "node": true
-    },
-    "extends": [
-        "eslint:recommended"
-    ],
-    "parserOptions": {
-        "ecmaVersion": 12
-    },
-    "rules": {
-    }
-}

package/jest.config.ts

@@ -1,199 +0,0 @@
-/**
- * For a detailed explanation regarding each configuration property, visit:
- * https://jestjs.io/docs/configuration
- */
-
-import type {Config} from 'jest';
-
-const config: Config = {
-  // All imported modules in your tests should be mocked automatically
-  // automock: false,
-
-  // Stop running tests after `n` failures
-  // bail: 0,
-
-  // The directory where Jest should store its cached dependency information
-  // cacheDirectory: "C:\\Users\\lesha\\AppData\\Local\\Temp\\jest",
-
-  // Automatically clear mock calls, instances, contexts and results before every test
-  clearMocks: true,
-
-  // Indicates whether the coverage information should be collected while executing the test
-  collectCoverage: false,
-
-  // An array of glob patterns indicating a set of files for which coverage information should be collected
-  // collectCoverageFrom: undefined,
-
-  // The directory where Jest should output its coverage files
-  coverageDirectory: "coverage",
-
-  // An array of regexp pattern strings used to skip coverage collection
-  // coveragePathIgnorePatterns: [
-  //   "\\\\node_modules\\\\"
-  // ],
-
-  // Indicates which provider should be used to instrument code for coverage
-  coverageProvider: "v8",
-
-  // A list of reporter names that Jest uses when writing coverage reports
-  // coverageReporters: [
-  //   "json",
-  //   "text",
-  //   "lcov",
-  //   "clover"
-  // ],
-
-  // An object that configures minimum threshold enforcement for coverage results
-  // coverageThreshold: undefined,
-
-  // A path to a custom dependency extractor
-  // dependencyExtractor: undefined,
-
-  // Make calling deprecated APIs throw helpful error messages
-  // errorOnDeprecated: false,
-
-  // The default configuration for fake timers
-  // fakeTimers: {
-  //   "enableGlobally": false
-  // },
-
-  // Force coverage collection from ignored files using an array of glob patterns
-  // forceCoverageMatch: [],
-
-  // A path to a module which exports an async function that is triggered once before all test suites
-  // globalSetup: undefined,
-
-  // A path to a module which exports an async function that is triggered once after all test suites
-  // globalTeardown: undefined,
-
-  // A set of global variables that need to be available in all test environments
-  // globals: {},
-
-  // The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
-  // maxWorkers: "50%",
-
-  // An array of directory names to be searched recursively up from the requiring module's location
-  // moduleDirectories: [
-  //   "node_modules"
-  // ],
-
-  // An array of file extensions your modules use
-  // moduleFileExtensions: [
-  //   "js",
-  //   "mjs",
-  //   "cjs",
-  //   "jsx",
-  //   "ts",
-  //   "tsx",
-  //   "json",
-  //   "node"
-  // ],
-
-  // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
-  // moduleNameMapper: {},
-
-  // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
-  // modulePathIgnorePatterns: [],
-
-  // Activates notifications for test results
-  // notify: false,
-
-  // An enum that specifies notification mode. Requires { notify: true }
-  // notifyMode: "failure-change",
-
-  // A preset that is used as a base for Jest's configuration
-  // preset: undefined,
-
-  // Run tests from one or more projects
-  // projects: undefined,
-
-  // Use this configuration option to add custom reporters to Jest
-  // reporters: undefined,
-
-  // Automatically reset mock state before every test
-  // resetMocks: false,
-
-  // Reset the module registry before running each individual test
-  // resetModules: false,
-
-  // A path to a custom resolver
-  // resolver: undefined,
-
-  // Automatically restore mock state and implementation before every test
-  // restoreMocks: false,
-
-  // The root directory that Jest should scan for tests and modules within
-  // rootDir: undefined,
-
-  // A list of paths to directories that Jest should use to search for files in
-  // roots: [
-  //   "<rootDir>"
-  // ],
-
-  // Allows you to use a custom runner instead of Jest's default test runner
-  // runner: "jest-runner",
-
-  // The paths to modules that run some code to configure or set up the testing environment before each test
-  // setupFiles: [],
-
-  // A list of paths to modules that run some code to configure or set up the testing framework before each test
-  // setupFilesAfterEnv: [],
-
-  // The number of seconds after which a test is considered as slow and reported as such in the results.
-  // slowTestThreshold: 5,
-
-  // A list of paths to snapshot serializer modules Jest should use for snapshot testing
-  // snapshotSerializers: [],
-
-  // The test environment that will be used for testing
-  // testEnvironment: "jest-environment-node",
-
-  // Options that will be passed to the testEnvironment
-  // testEnvironmentOptions: {},
-
-  // Adds a location field to test results
-  // testLocationInResults: false,
-
-  // The glob patterns Jest uses to detect test files
-  // testMatch: [
-  //   "**/__tests__/**/*.[jt]s?(x)",
-  //   "**/?(*.)+(spec|test).[tj]s?(x)"
-  // ],
-
-  // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
-  // testPathIgnorePatterns: [
-  //   "\\\\node_modules\\\\"
-  // ],
-
-  // The regexp pattern or array of patterns that Jest uses to detect test files
-  // testRegex: [],
-
-  // This option allows the use of a custom results processor
-  // testResultsProcessor: undefined,
-
-  // This option allows use of a custom test runner
-  // testRunner: "jest-circus/runner",
-
-  // A map from regular expressions to paths to transformers
-  // transform: undefined,
-
-  // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
-  // transformIgnorePatterns: [
-  //   "\\\\node_modules\\\\",
-  //   "\\.pnp\\.[^\\\\]+$"
-  // ],
-
-  // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
-  // unmockedModulePathPatterns: undefined,
-
-  // Indicates whether each individual test should be reported during the run
-  // verbose: undefined,
-
-  // An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
-  // watchPathIgnorePatterns: [],
-
-  // Whether to use watchman for file crawling
-  // watchman: true,
-};
-
-export default config;