structure-verifier 0.0.15 → 0.0.16

package/dist/src/verifiers/date/v_date.js

@@ -27,6 +27,20 @@ const dMessages = {
         en: () => `must be a date`,
     },
 };
+function throwDateError(condition, values, fallbackMessage) {
+    throw new v_error_1.VerificationError([
+        {
+            key: "",
+            message: (0, message_1.getMessage)(condition, values, fallbackMessage),
+        },
+    ]);
+}
+function isSupportedDateInput(data) {
+    return (typeof data === "number" ||
+        typeof data === "string" ||
+        data instanceof Date ||
+        datetime_1.datetime.isDayjs(data));
+}
 function haveTimezone(input) {
     const regexDesplazamiento = /(?:UTC|GMT|[+-]\d{2}:?\d{2})$/;
     const regexIdentificadorZona = /(?:Europe\/|America\/|Asia\/|Africa\/|Australia\/|Antarctica\/|Atlantic\/|Indian\/|Pacific\/)[A-Za-z_]+/;
@@ -35,70 +49,57 @@ function haveTimezone(input) {
 function formatWithTimeZone(format) {
     return /Z{1,2}|z{1,2}/.test(format);
 }
-function vDate(data, badTypeMessage, conds) {
-    let timeZone = (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.timeZone) || "UTC";
-    if (data === "" ||
-        !(typeof data === "number" ||
-            typeof data === "string" ||
-            data instanceof Date ||
-            datetime_1.datetime.isDayjs(data))) {
-        throw new v_error_1.VerificationError([
-            {
-                key: "",
-                message: (0, message_1.getMessage)((conds === null || conds === void 0 ? void 0 : conds.badTypeMessage) != undefined
-                    ? conds === null || conds === void 0 ? void 0 : conds.badTypeMessage
-                    : undefined, undefined, badTypeMessage),
-            },
-        ]);
+function applyDefaultTimezone(date, timeZone) {
+    return datetime_1.datetime.tz(date.format("YYYY-MM-DD HH:mm:ss"), timeZone);
+}
+function parseDateWithFormat(data, format, timeZone, conds) {
+    let date = (0, datetime_1.datetime)(data, format, true);
+    if (!date.isValid()) {
+        throwDateError(conds === null || conds === void 0 ? void 0 : conds.format, { format }, dMessages.format);
     }
-    let date = (0, datetime_1.datetime)();
-    if (conds === null || conds === void 0 ? void 0 : conds.format) {
-        let format = (0, message_1.getValue)(conds.format);
-        date = (0, datetime_1.datetime)(data, format, true);
-        if (!date.isValid()) {
-            throw new v_error_1.VerificationError([
-                {
-                    key: "",
-                    message: (0, message_1.getMessage)(conds.format, { format: format }, dMessages.format),
-                },
-            ]);
-        }
-        if (!formatWithTimeZone(format)) {
-            date = datetime_1.datetime.tz(date.format("YYYY-MM-DD HH:mm:ss"), timeZone);
-        }
+    if (!formatWithTimeZone(format)) {
+        date = applyDefaultTimezone(date, timeZone);
     }
-    else {
-        date = (0, datetime_1.datetime)(data);
-        if (typeof data === "string" && !haveTimezone(data)) {
-            date = datetime_1.datetime.tz(date.format("YYYY-MM-DD HH:mm:ss"), timeZone);
-        }
+    return date;
+}
+function parseDateWithoutFormat(data, timeZone) {
+    let date = (0, datetime_1.datetime)(data);
+    if (typeof data === "string" && !haveTimezone(data)) {
+        date = applyDefaultTimezone(date, timeZone);
     }
+    return date;
+}
+function parseDateInput(data, timeZone, badTypeMessage, conds) {
+    const format = (conds === null || conds === void 0 ? void 0 : conds.format) ? (0, message_1.getValue)(conds.format) : undefined;
+    const date = format
+        ? parseDateWithFormat(data, format, timeZone, conds)
+        : parseDateWithoutFormat(data, timeZone);
     if (!date.isValid()) {
-        throw new v_error_1.VerificationError([
-            {
-                key: "",
-                message: (0, message_1.getMessage)((conds === null || conds === void 0 ? void 0 : conds.badTypeMessage) != undefined
-                    ? conds === null || conds === void 0 ? void 0 : conds.badTypeMessage
-                    : undefined, undefined, badTypeMessage),
-            },
-        ]);
+        throwDateError(conds === null || conds === void 0 ? void 0 : conds.badTypeMessage, undefined, badTypeMessage);
     }
-    if ((conds === null || conds === void 0 ? void 0 : conds.maxDate) && date.isAfter((0, message_1.getValue)(conds.maxDate))) {
-        throw new v_error_1.VerificationError([
-            {
-                key: "",
-                message: (0, message_1.getMessage)(conds.maxDate, { maxDate: (0, message_1.getValue)(conds.maxDate) }, dMessages.maxDate),
-            },
-        ]);
+    return date;
+}
+function validateDateRange(date, conds) {
+    if (conds === null || conds === void 0 ? void 0 : conds.maxDate) {
+        const maxDate = (0, message_1.getValue)(conds.maxDate);
+        if (date.isAfter(maxDate)) {
+            throwDateError(conds.maxDate, { maxDate }, dMessages.maxDate);
+        }
     }
-    if ((conds === null || conds === void 0 ? void 0 : conds.minDate) && date.isBefore((0, message_1.getValue)(conds.minDate))) {
-        throw new v_error_1.VerificationError([
-            {
-                key: "",
-                message: (0, message_1.getMessage)(conds.minDate, { minDate: (0, message_1.getValue)(conds.minDate) }, dMessages.minDate),
-            },
-        ]);
+    if (conds === null || conds === void 0 ? void 0 : conds.minDate) {
+        const minDate = (0, message_1.getValue)(conds.minDate);
+        if (date.isBefore(minDate)) {
+            throwDateError(conds.minDate, { minDate }, dMessages.minDate);
+        }
+    }
+}
+function vDate(data, badTypeMessage, conds) {
+    const timeZone = (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.timeZone) || "UTC";
+    if (data === "" || !isSupportedDateInput(data)) {
+        throwDateError(conds === null || conds === void 0 ? void 0 : conds.badTypeMessage, undefined, badTypeMessage);
     }
+    const date = parseDateInput(data, timeZone, badTypeMessage, conds);
+    validateDateRange(date, conds);
     return date;
 }
 class VDateNotNull extends verifier_1.Verifier {

package/dist/src/verifiers/date/v_date.js.map

@@ -1 +1 @@
-{"version":3,"file":"v_date.js","sourceRoot":"","sources":["../../../../src/src/verifiers/date/v_date.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"v_date.js","sourceRoot":"","sources":["../../../../src/src/verifiers/date/v_date.ts"],"names":[],"mappings":"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"}

package/dist/src/verifiers/number/v_number.d.ts

@@ -1,6 +1,6 @@
 import { IInfo, MessageType, VBadTypeMessage, VDefaultValue, VVCIsRequired } from "../../interfaces/types";
 import { Verifier } from "../verifier";
-interface VNumberConditions extends VBadTypeMessage, VDefaultValue<number>, VVCIsRequired, IInfo<number> {
+export interface VNumberConditions extends VBadTypeMessage, VDefaultValue<number>, VVCIsRequired, IInfo<number> {
     min?: MessageType<number, {
         min: number;
     }>;
@@ -30,4 +30,3 @@ export declare class VNumber extends Verifier<number | null> {
     check(data: any): number | null;
     constructor(cond?: VNumberConditions | undefined);
 }
-export {};

package/dist/src/verifiers/number/v_number.js

@@ -34,79 +34,57 @@ const dMessages = {
         en: () => `must be a number`,
     },
 };
+function throwNumberError(condition, values, fallbackMessage) {
+    throw new v_error_1.VerificationError([
+        {
+            key: "",
+            message: (0, message_1.getMessage)(condition, values, fallbackMessage),
+        },
+    ]);
+}
 function vNumber(data, badTypeMessage, conds) {
     if (data === "" || isNaN(data)) {
-        throw new v_error_1.VerificationError([
-            {
-                key: "",
-                message: (0, message_1.getMessage)((conds === null || conds === void 0 ? void 0 : conds.badTypeMessage) != undefined
-                    ? conds === null || conds === void 0 ? void 0 : conds.badTypeMessage
-                    : undefined, undefined, badTypeMessage),
-            },
-        ]);
+        throwNumberError(conds === null || conds === void 0 ? void 0 : conds.badTypeMessage, undefined, badTypeMessage);
     }
+    const numericValue = Number(data);
+    const decimalPart = String(data).split(".")[1] || "";
     if ((conds === null || conds === void 0 ? void 0 : conds.min) !== undefined) {
-        if (data < (conds === null || conds === void 0 ? void 0 : conds.min)) {
-            throw new v_error_1.VerificationError([
-                {
-                    key: "",
-                    message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.min, { min: (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.min) }, dMessages.min),
-                },
-            ]);
+        const minValue = (0, message_1.getValue)(conds.min);
+        if (numericValue < minValue) {
+            throwNumberError(conds.min, { min: minValue }, dMessages.min);
         }
     }
     if ((conds === null || conds === void 0 ? void 0 : conds.max) !== undefined) {
-        if (data > (conds === null || conds === void 0 ? void 0 : conds.max)) {
-            throw new v_error_1.VerificationError([
-                {
-                    key: "",
-                    message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.max, { max: (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.max) }, dMessages.max),
-                },
-            ]);
+        const maxValue = (0, message_1.getValue)(conds.max);
+        if (numericValue > maxValue) {
+            throwNumberError(conds.max, { max: maxValue }, dMessages.max);
         }
     }
     if ((conds === null || conds === void 0 ? void 0 : conds.in) !== undefined) {
-        if (!(0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.in).includes(data)) {
-            throw new v_error_1.VerificationError([
-                {
-                    key: "",
-                    message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.in, { in: (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.in) }, dMessages.in),
-                },
-            ]);
+        const allowedValues = (0, message_1.getValue)(conds.in);
+        if (!allowedValues.includes(numericValue)) {
+            throwNumberError(conds.in, { in: allowedValues }, dMessages.in);
         }
     }
     if ((conds === null || conds === void 0 ? void 0 : conds.notIn) !== undefined) {
-        if ((0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.notIn).includes(data)) {
-            throw new v_error_1.VerificationError([
-                {
-                    key: "",
-                    message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.notIn, { notIn: (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.notIn) }, dMessages.notIn),
-                },
-            ]);
+        const blockedValues = (0, message_1.getValue)(conds.notIn);
+        if (blockedValues.includes(numericValue)) {
+            throwNumberError(conds.notIn, { notIn: blockedValues }, dMessages.notIn);
         }
     }
-    const decimalPart = data.toString().split(".")[1] || "";
     if ((conds === null || conds === void 0 ? void 0 : conds.maxDecimalPlaces) !== undefined) {
-        if (decimalPart.length > (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.maxDecimalPlaces)) {
-            throw new v_error_1.VerificationError([
-                {
-                    key: "",
-                    message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.maxDecimalPlaces, { maxDecimalPlaces: (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.maxDecimalPlaces) }, dMessages.maxDecimalPlaces),
-                },
-            ]);
+        const maxDecimalPlaces = (0, message_1.getValue)(conds.maxDecimalPlaces);
+        if (decimalPart.length > maxDecimalPlaces) {
+            throwNumberError(conds.maxDecimalPlaces, { maxDecimalPlaces }, dMessages.maxDecimalPlaces);
         }
     }
     if ((conds === null || conds === void 0 ? void 0 : conds.minDecimalPlaces) !== undefined) {
-        if (decimalPart.length < (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.minDecimalPlaces)) {
-            throw new v_error_1.VerificationError([
-                {
-                    key: "",
-                    message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.minDecimalPlaces, { minDecimalPlaces: (0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.minDecimalPlaces) }, dMessages.minDecimalPlaces),
-                },
-            ]);
+        const minDecimalPlaces = (0, message_1.getValue)(conds.minDecimalPlaces);
+        if (decimalPart.length < minDecimalPlaces) {
+            throwNumberError(conds.minDecimalPlaces, { minDecimalPlaces }, dMessages.minDecimalPlaces);
         }
     }
-    return Number(data);
+    return numericValue;
 }
 class VNumberNotNull extends verifier_1.Verifier {
     check(data) {

package/dist/src/verifiers/number/v_number.js.map

@@ -1 +1 @@
-{"version":3,"file":"v_number.js","sourceRoot":"","sources":["../../../../src/src/verifiers/number/v_number.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"v_number.js","sourceRoot":"","sources":["../../../../src/src/verifiers/number/v_number.ts"],"names":[],"mappings":"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"}

package/dist/src/verifiers/object/v_object.d.ts

@@ -1,41 +1,40 @@
 import { MessageType, VBadTypeMessage, VDefaultValue, VVCIsRequired } from "../../interfaces/types";
 import { Verifier } from "../verifier";
-interface VObjectConditions<T extends Record<string, Verifier<any>>> extends VBadTypeMessage, VDefaultValue<T>, VVCIsRequired {
+export interface VObjectConditions<T extends Record<string, Verifier<any>>> extends VBadTypeMessage, VDefaultValue<T>, VVCIsRequired {
     invalidPropertyMessage?: MessageType<void, void>;
     strictMode?: boolean;
     ignoreCase?: boolean;
     takeAllValues?: boolean;
-    properties: T;
     conds?: (val: {
-        [K in keyof T]: ReturnType<T[K]['check']>;
+        [K in keyof T]: ReturnType<T[K]["check"]>;
     } | null) => void;
 }
-interface VObjectConditionsNotNull<T extends Record<string, Verifier<any>>> extends VBadTypeMessage, VDefaultValue<T>, VVCIsRequired {
+export interface VObjectConditionsNotNull<T extends Record<string, Verifier<any>>> extends VBadTypeMessage, VDefaultValue<T>, VVCIsRequired {
     invalidPropertyMessage?: MessageType<void, void>;
     strictMode?: boolean;
     ignoreCase?: boolean;
     takeAllValues?: boolean;
-    properties: T;
     conds?: (val: {
-        [K in keyof T]: ReturnType<T[K]['check']>;
+        [K in keyof T]: ReturnType<T[K]["check"]>;
     }) => void;
 }
 export declare class VObjectNotNull<T extends Record<string, Verifier<any>>> extends Verifier<{
-    [K in keyof T]: ReturnType<T[K]['check']>;
+    [K in keyof T]: ReturnType<T[K]["check"]>;
 }> {
-    protected cond: VObjectConditionsNotNull<T>;
+    protected properties: T;
+    protected conditions: VObjectConditionsNotNull<T>;
+    constructor(properties: T, conditions?: VObjectConditionsNotNull<T>);
     check(data: any): {
-        [K in keyof T]: ReturnType<T[K]['check']>;
+        [K in keyof T]: ReturnType<T[K]["check"]>;
     };
-    constructor(cond: VObjectConditionsNotNull<T>);
 }
 export declare class VObject<T extends Record<string, Verifier<any>>> extends Verifier<{
-    [K in keyof T]: ReturnType<T[K]['check']>;
+    [K in keyof T]: ReturnType<T[K]["check"]>;
 } | null> {
-    protected cond: VObjectConditions<T>;
+    protected properties: T;
+    protected conditions: VObjectConditions<T>;
+    constructor(properties: T, conditions?: VObjectConditions<T>);
     check(data: any): {
-        [K in keyof T]: ReturnType<T[K]['check']>;
+        [K in keyof T]: ReturnType<T[K]["check"]>;
     } | null;
-    constructor(cond: VObjectConditions<T>);
 }
-export {};

package/dist/src/verifiers/object/v_object.js

@@ -6,84 +6,108 @@ const message_1 = require("../../languages/message");
 const v_any_1 = require("../any/v_any");
 const v_array_1 = require("../array/v_array");
 const verifier_1 = require("../verifier");
-function vObject(data, badTypeMessage, conds) {
-    if (typeof data !== 'object' || Array.isArray(data)) {
-        throw new v_error_1.VerificationError([{
+const UNSAFE_OBJECT_KEYS = new Set(["__proto__", "constructor", "prototype"]);
+function setObjectValue(target, key, value) {
+    if (UNSAFE_OBJECT_KEYS.has(key)) {
+        Object.defineProperty(target, key, {
+            value,
+            enumerable: true,
+            configurable: true,
+            writable: true,
+        });
+        return;
+    }
+    target[key] = value;
+}
+function getObjectValue(source, key) {
+    const descriptor = Object.getOwnPropertyDescriptor(source, key);
+    return descriptor ? descriptor.value : source[key];
+}
+function isNestedVerifier(verifier) {
+    return (verifier instanceof VObject ||
+        verifier instanceof VObjectNotNull ||
+        verifier instanceof v_array_1.VArray ||
+        verifier instanceof v_array_1.VArrayNotNull ||
+        verifier instanceof v_any_1.VAny);
+}
+function vObject(data, badTypeMessage, properties, options) {
+    if (data === null || typeof data !== "object" || Array.isArray(data)) {
+        throw new v_error_1.VerificationError([
+            {
                 key: "",
-                message: (0, message_1.getMessage)((conds === null || conds === void 0 ? void 0 : conds.badTypeMessage) != undefined ? conds === null || conds === void 0 ? void 0 : conds.badTypeMessage : undefined, undefined, badTypeMessage)
-            }]);
+                message: (0, message_1.getMessage)((options === null || options === void 0 ? void 0 : options.badTypeMessage) != undefined
+                    ? options === null || options === void 0 ? void 0 : options.badTypeMessage
+                    : undefined, undefined, badTypeMessage),
+            },
+        ]);
     }
-    let keysData = Object.keys(data);
-    let keysValidations = Object.keys(conds.properties);
-    if (conds.strictMode) {
+    const keysData = Object.keys(data);
+    const keysValidations = Object.keys(properties);
+    if (options.strictMode) {
         let dif = [];
-        if (conds.ignoreCase) {
-            let temp = keysValidations.map(v => v.toUpperCase());
-            dif = keysData.filter(v => !temp.includes(v.toUpperCase()));
+        if (options.ignoreCase) {
+            const temp = keysValidations.map((v) => v.toUpperCase());
+            dif = keysData.filter((v) => !temp.includes(v.toUpperCase()));
+        }
+        else {
+            dif = keysData.filter((v) => !keysValidations.includes(v));
         }
-        else
-            dif = keysData.filter(v => !keysValidations.includes(v));
         if (dif.length > 0) {
-            let error = new v_error_1.VerificationError(dif.map(v => {
-                return {
-                    key: v, message: (0, message_1.getMessage)(conds.invalidPropertyMessage, undefined, {
-                        es: () => "no es una propiedad válida",
-                        en: () => "is not a valid property"
-                    })
-                };
-            }));
+            const error = new v_error_1.VerificationError(dif.map((v) => ({
+                key: v,
+                message: (0, message_1.getMessage)(options.invalidPropertyMessage, undefined, {
+                    es: () => "no es una propiedad válida",
+                    en: () => "is not a valid property",
+                }),
+            })));
             if (error.errors.length > 0)
                 throw error;
         }
     }
-    let errors = [];
-    let value = {};
-    let m = [];
-    for (const key in conds.properties) {
-        if (conds.ignoreCase) {
-            let ketTemp = keysData.find(v => v.toLocaleUpperCase() == key.toUpperCase());
-            if (ketTemp) {
-                m.push({
+    const errors = [];
+    const value = {};
+    const keyMap = [];
+    for (const key in properties) {
+        if (options.ignoreCase) {
+            const dataKey = keysData.find((v) => v.toLocaleUpperCase() == key.toUpperCase());
+            if (dataKey) {
+                keyMap.push({
                     keyV: key,
-                    keyD: ketTemp
+                    keyD: dataKey,
                 });
             }
             else {
-                m.push({
+                keyMap.push({
                     keyV: key,
-                    keyD: key
+                    keyD: key,
                 });
             }
         }
         else {
-            m.push({
+            keyMap.push({
                 keyV: key,
-                keyD: key
+                keyD: key,
             });
         }
     }
-    if (conds.takeAllValues) {
-        for (let k of keysData) {
-            if (!m.find(v => v.keyD == k)) {
-                value[k] = data[k];
+    if (options.takeAllValues) {
+        for (const dataKey of keysData) {
+            if (!keyMap.find((v) => v.keyD == dataKey)) {
+                setObjectValue(value, dataKey, getObjectValue(data, dataKey));
             }
         }
     }
-    for (let keys of m) {
+    for (const keys of keyMap) {
         try {
-            const result = conds.properties[keys.keyV].check(data[keys.keyD]);
-            value[keys.keyV] = result;
+            const result = properties[keys.keyV].check(getObjectValue(data, keys.keyD));
+            setObjectValue(value, keys.keyV, result);
         }
         catch (error) {
             if (error instanceof v_error_1.VerificationError) {
-                errors.push(...error.errorsObj.map(v => {
-                    let cond = conds.properties[keys.keyV];
-                    if (cond instanceof VObject
-                        || cond instanceof VObjectNotNull
-                        || cond instanceof v_array_1.VArray
-                        || cond instanceof v_array_1.VArrayNotNull
-                        || cond instanceof v_any_1.VAny) {
-                        v.key = keys.keyV + (v.key ? '.' + v.key : '');
+                errors.push(...error.errorsObj.map((v) => {
+                    const cond = properties[keys.keyV];
+                    if (isNestedVerifier(cond)) {
+                        v.key = keys.keyV + (v.key ? "." + v.key : "");
                     }
                     else {
                         v.key = keys.keyV;
@@ -100,40 +124,46 @@ function vObject(data, badTypeMessage, conds) {
     if (errors.length > 0) {
         throw new v_error_1.VerificationError(errors);
     }
-    if (conds.conds) {
-        conds.conds(value);
+    const typedValue = value;
+    if (options.conds) {
+        options.conds(typedValue);
     }
-    return value;
+    return typedValue;
 }
 class VObjectNotNull extends verifier_1.Verifier {
-    check(data) {
-        return vObject(this.isRequired(data, true), this.badTypeMessage, this.cond);
-    }
-    constructor(cond) {
-        super(cond);
-        this.cond = cond;
+    constructor(properties, conditions = {}) {
+        super(conditions);
+        this.properties = properties;
+        this.conditions = conditions;
         this.badTypeMessage = {
             es: () => `debe ser un objeto`,
-            en: () => `must be a object`
+            en: () => `must be an object`,
         };
     }
+    check(data) {
+        return vObject(this.isRequired(data, true), this.badTypeMessage, this.properties, this.conditions);
+    }
 }
 exports.VObjectNotNull = VObjectNotNull;
 class VObject extends verifier_1.Verifier {
+    constructor(properties, conditions = {}) {
+        super(conditions);
+        this.properties = properties;
+        this.conditions = conditions;
+        this.badTypeMessage = {
+            es: () => `debe ser un objeto`,
+            en: () => `must be an object`,
+        };
+    }
     check(data) {
         let val = this.isRequired(data);
         if (val === null || val === undefined) {
+            if (this.conditions.conds) {
+                this.conditions.conds(null);
+            }
             return null;
         }
-        return vObject(val, this.badTypeMessage, this.cond);
-    }
-    constructor(cond) {
-        super(cond);
-        this.cond = cond;
-        this.badTypeMessage = {
-            es: () => `debe ser un objeto`,
-            en: () => `must be a object`
-        };
+        return vObject(val, this.badTypeMessage, this.properties, this.conditions);
     }
 }
 exports.VObject = VObject;