validno 0.2.0 → 0.2.1

package/dist/checkType.js

@@ -22,6 +22,7 @@ const checkTypeMultiple = (key, value, requirements, keyName = key) => {
     return result;
 };
 const checkType = (key, value, requirements, keyName = key) => {
+    var _a;
     const isNotNull = value !== null;
     const keyTitle = 'title' in requirements ? requirements.title : keyName;
     const hasCustomMessage = requirements.customMessage && typeof requirements.customMessage === 'function';
@@ -149,7 +150,7 @@ const checkType = (key, value, requirements, keyName = key) => {
             break;
         default:
             const isInstanceOf = value instanceof typeBySchema;
-            const isConstructorSame = value.constructor.name === typeBySchema.name;
+            const isConstructorSame = ((_a = value.constructor) === null || _a === void 0 ? void 0 : _a.name) === (typeBySchema === null || typeBySchema === void 0 ? void 0 : typeBySchema.name);
             const checked = isInstanceOf && isConstructorSame;
             result.push({
                 key: keyName,

package/dist/dev.js

@@ -1,52 +1,105 @@
-import { Schema } from "./Schema.js";
-class Parent {
-    constructor(value) {
-        this.value = value;
-        this.version = 1;
+import { isDeepStrictEqual } from 'node:util';
+import _validations from './utils/validations.js';
+const listSame = [];
+const TEST_MAX = 1 * 1000000;
+const TYPES = [
+    'json',
+    'date',
+    'string',
+    'number',
+    'array',
+    'null',
+    'boolean'
+];
+const str = 'string';
+const date = () => new Date(2025, 0, 1, 0, 0, 0, 0);
+const json = () => {
+    return {
+        "surname": "Иванов",
+        "name": "Иван",
+        "patronymic": "Иванович",
+        "birthdate": "01.01.1990",
+        "birthplace": "Москва",
+        "phone": "8 926 766 48 48"
+    };
+};
+console.time('autofill');
+let i = 0;
+while (i < TEST_MAX) {
+    if (TYPES.includes('null'))
+        listSame.push(null);
+    if (TYPES.includes('boolean'))
+        listSame.push(true);
+    if (TYPES.includes('json'))
+        listSame.push(() => json());
+    if (TYPES.includes('date'))
+        listSame.push(() => date());
+    if (TYPES.includes('string'))
+        listSame.push(str);
+    if (TYPES.includes('number'))
+        listSame.push(Math.random());
+    if (TYPES.includes('array'))
+        listSame.push(() => [{ x: 1, y: { z: 0 } }, { x: 1 }, { x: 1 }]);
+    if (TYPES.includes('array'))
+        listSame.push(() => [1234451, 5535433, 7839262, 2134573, 10239752]);
+    if (TYPES.includes('array'))
+        listSame.push(() => [true, true, false, true, false]);
+    if (TYPES.includes('array'))
+        listSame.push(() => ['true', 'true', 'false', 'true', 'false']);
+    i++;
+}
+console.timeEnd('autofill');
+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;
+    });
+};
+const is = (value, compareTo) => {
+    if (value === compareTo) {
+        return true;
     }
-    getV() {
-        return this.version;
+    const bothArrays = _validations.isArray(value) && _validations.isArray(compareTo);
+    if (bothArrays) {
+        return compareArrs(value, compareTo);
     }
-}
-class Child extends Parent {
-    constructor(value) {
-        super(value);
-        this.isDeep = true;
+    const bothObjects = _validations.isObject(value) && _validations.isObject(compareTo);
+    if (bothObjects) {
+        const valueStr = JSON.stringify(value);
+        const compareToStr = JSON.stringify(compareTo);
+        return valueStr === compareToStr;
     }
-}
-const testCust = new Parent(12345678);
-const testCust2 = new Child(12345678);
-const schema = new Schema({
-    parent1: {
-        type: Parent,
-        required: true,
-        title: 'custom class test',
-    },
-    child1: {
-        type: Child,
-        required: true,
-        title: 'custom class test',
-    },
-    parent2: {
-        type: Parent,
-        required: true
-    },
-    err: {
-        type: Error,
-        required: true,
-        title: 'custom class test',
-    },
-    func: {
-        type: Function,
-        required: false,
+    const bothDates = _validations.isDate(value) && _validations.isDate(compareTo);
+    if (bothDates) {
+        return value.getTime() === compareTo.getTime();
+    }
+    return value === compareTo;
+};
+const is2 = (value, compareTo) => {
+    return true;
+};
+const is3 = (v1, v2) => {
+    return isDeepStrictEqual(v1, v2);
+};
+const doTest = (func) => {
+    console.time('test ' + func.name);
+    let y = 0;
+    while (y < TEST_MAX) {
+        const v1 = typeof listSame[y] === 'function' ? listSame[y]() : listSame[y];
+        const v2 = typeof listSame[y] === 'function' ? listSame[y]() : listSame[y];
+        const result = func(v1, v2);
+        if (result !== true) {
+            console.log(v1);
+            console.log(v2);
+            throw new Error('RESULT != TRUE');
+        }
+        y++;
     }
-});
-const obj = {
-    parent1: testCust,
-    child1: testCust2,
-    parent2: testCust2,
-    err: new Error('ops'),
-    func: () => { console.log('ya tut'); }
+    console.timeEnd('test ' + func.name);
 };
-const res = schema.validate(obj);
-console.log(res);
+doTest(is);
+doTest(is3);

package/dist/utils/validations.js

@@ -2,86 +2,127 @@ const _validations = {};
 _validations.isString = (value) => {
     return typeof value === 'string';
 };
-_validations.isDate = (value) => {
-    return value instanceof Date && String(value) !== 'Invalid Date';
-};
 _validations.isNumber = (value) => {
     return typeof value === 'number';
 };
-_validations.isNumberGte = (value, gte) => {
-    return typeof value === 'number' && value >= gte;
-};
-_validations.isNumberLte = (value, lte) => {
-    return typeof value === 'number' && value <= lte;
-};
 _validations.isArray = (value) => {
     return Array.isArray(value);
 };
 _validations.isObject = (value) => {
-    return typeof value === 'object' && !Array.isArray(value) && value !== null;
+    var _a;
+    return value !== null && typeof value === 'object' && ((_a = value === null || value === void 0 ? void 0 : value.constructor) === null || _a === void 0 ? void 0 : _a.name) === 'Object' && !Array.isArray(value);
+};
+_validations.isDate = (value) => {
+    return value instanceof Date && String(value) !== 'Invalid Date';
+};
+_validations.isRegex = (value) => {
+    return value instanceof RegExp;
+};
+_validations.isBoolean = (value) => {
+    return typeof value === 'boolean';
+};
+_validations.isNull = (value) => {
+    return value === null;
+};
+_validations.isUndefined = (value) => {
+    return value === undefined;
+};
+_validations.isNullOrUndefined = (value) => {
+    return value === undefined || value === null;
+};
+_validations.isEmail = (value) => {
+    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+    return emailRegex.test(value);
+};
+_validations.isDateYYYYMMDD = (value) => {
+    const regex = /^\d{4}-\d{2}-\d{2}$/;
+    return regex.test(value);
+};
+_validations.isHex = (value) => {
+    const regex = /^#(?:[0-9a-fA-F]{3}){1,2}$/;
+    return regex.test(value);
 };
 _validations.lengthIs = (value, length) => {
+    if (typeof value !== 'string' && !Array.isArray(value))
+        return false;
+    if (typeof length !== 'number')
+        return false;
     return value.length === length;
 };
 _validations.lengthNot = (value, length) => {
+    if (typeof value !== 'string' && !Array.isArray(value))
+        return false;
+    if (typeof length !== 'number')
+        return false;
     return value.length !== length;
 };
 _validations.lengthMin = (value, min) => {
+    if (typeof value !== 'string' && !Array.isArray(value))
+        return false;
+    if (typeof min !== 'number')
+        return false;
     return value.length >= min;
 };
 _validations.lengthMax = (value, max) => {
+    if (typeof value !== 'string' && !Array.isArray(value))
+        return false;
+    if (typeof max !== 'number')
+        return false;
     return value.length <= max;
 };
-_validations.isEmail = (value) => {
-    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    return emailRegex.test(value);
+_validations.isNumberGte = (value, gte) => {
+    return typeof value === 'number' && value >= gte;
 };
-_validations.isRegex = (value) => {
-    return value instanceof RegExp;
+_validations.isNumberLte = (value, lte) => {
+    return typeof value === 'number' && value <= lte;
 };
 _validations.hasKey = (obj, key) => {
+    if (_validations.isObject(obj) === false)
+        return false;
     return key in obj;
 };
-_validations.isNot = (value, not) => {
-    if (typeof not === 'object' && Array.isArray(not)) {
-        for (let i = 0; i < not.length; i++) {
-            if (value === not[i])
-                return false;
+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 true;
-    }
-    return value !== not;
+        return v2[i] === el;
+    });
 };
 _validations.is = (value, compareTo) => {
-    if (typeof compareTo === 'object' && Array.isArray(compareTo)) {
-        for (let i = 0; i < compareTo.length; i++) {
-            if (value === compareTo[i])
-                return true;
-        }
-        return false;
+    if (value === compareTo) {
+        return true;
+    }
+    const bothArrays = _validations.isArray(value) && _validations.isArray(compareTo);
+    if (bothArrays) {
+        return 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;
+    }
+    const bothDates = _validations.isDate(value) && _validations.isDate(compareTo);
+    if (bothDates) {
+        return value.getTime() === compareTo.getTime();
     }
     return value === compareTo;
 };
-_validations.isDateYYYYMMDD = (value) => {
-    const regex = /^\d{4}-\d{2}-\d{2}$/;
-    return regex.test(value);
-};
-_validations.regexTested = (value, regex) => {
-    if (!regex)
-        throw new Error('regex argument is not defined');
-    return regex.test(value);
-};
-_validations.isHex = (value) => {
-    const regex = /^#(?:[0-9a-fA-F]{3}){1,2}$/;
-    return regex.test(value);
-};
-_validations.isBoolean = (value) => {
-    return typeof value === 'boolean';
-};
-_validations.isNull = (value) => {
-    return value === null;
+_validations.not = (value, not) => {
+    return !_validations.is(value, not);
 };
-_validations.isUndefined = (value) => {
-    return value === undefined;
+_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.regex = _validations.regexTested;
+_validations.regexp = _validations.regexTested;
+_validations.test = _validations.regexTested;
 export default _validations;

package/package.json

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