structure-verifier 0.0.15 → 0.0.17

package/dist/src/verifiers/uuid/v_uuid.js

@@ -4,62 +4,99 @@ exports.VUUID = exports.VUUIDNotNull = void 0;
 const verifier_1 = require("../verifier");
 const v_error_1 = require("../../error/v_error");
 const message_1 = require("../../languages/message");
-function vUUID(data, badTypeMessage, conds) {
+const conditionMessage_1 = require("../helpers/conditionMessage");
+const UUID_MESSAGES = {
+    missingHyphens: {
+        es: () => `UUID debe incluir guiones`,
+        en: () => `UUID must include hyphens`,
+    },
+    invalidHyphenFormat: {
+        es: () => `UUID debe tener formato 8-4-4-4-12`,
+        en: () => `UUID must follow 8-4-4-4-12 format`,
+    },
+    invalidLength: {
+        es: () => `UUID inválido, longitud incorrecta`,
+        en: () => `Invalid UUID, wrong length`,
+    },
+};
+const UUID_REGEX_CACHE = new Map();
+function throwUUIDError(condition, badTypeMessage) {
+    throw new v_error_1.VerificationError([
+        {
+            key: "",
+            message: (0, message_1.getMessage)(condition, undefined, badTypeMessage),
+        },
+    ]);
+}
+function ensureUUIDType(data, badTypeMessage, conds) {
     var _a;
     if ((0, message_1.getValue)(conds === null || conds === void 0 ? void 0 : conds.strictMode) === true && typeof data !== "string") {
-        throw new v_error_1.VerificationError([
-            {
-                key: "",
-                message: (0, message_1.getMessage)(conds === null || conds === void 0 ? void 0 : conds.badTypeMessage, undefined, badTypeMessage),
-            },
-        ]);
+        throwUUIDError((_a = conds === null || conds === void 0 ? void 0 : conds.strictMode) !== null && _a !== void 0 ? _a : conds === null || conds === void 0 ? void 0 : conds.badTypeMessage, badTypeMessage);
     }
-    let uuid = String(data);
+}
+function ensureUUIDHyphenPolicy(uuid, conds) {
     const hasHyphens = uuid.includes("-");
-    if (!(conds === null || conds === void 0 ? void 0 : conds.allowNoHyphens) && !hasHyphens) {
-        throw new v_error_1.VerificationError([
-            {
-                key: "",
-                message: (0, message_1.getMessage)(undefined, undefined, {
-                    es: () => `UUID debe incluir guiones`,
-                    en: () => `UUID must include hyphens`,
-                }),
-            },
-        ]);
+    if (conds === null || conds === void 0 ? void 0 : conds.allowNoHyphens) {
+        return;
     }
-    const normalized = uuid.replace(/-/g, "");
-    if (normalized.length !== 32) {
-        throw new v_error_1.VerificationError([
-            {
-                key: "",
-                message: (0, message_1.getMessage)(undefined, undefined, {
-                    es: () => `UUID inválido, longitud incorrecta`,
-                    en: () => `Invalid UUID, wrong length`,
-                }),
-            },
-        ]);
+    if (!hasHyphens) {
+        throwUUIDError(undefined, UUID_MESSAGES.missingHyphens);
+    }
+    const hyphenatedFormat = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+    if (!hyphenatedFormat.test(uuid)) {
+        throwUUIDError(undefined, UUID_MESSAGES.invalidHyphenFormat);
+    }
+}
+function normalizeUUID(uuid) {
+    return uuid.replace(/-/g, "");
+}
+function ensureUUIDLength(normalizedUuid) {
+    if (normalizedUuid.length !== 32) {
+        throwUUIDError(undefined, UUID_MESSAGES.invalidLength);
+    }
+}
+function getUUIDRegex(version) {
+    const cacheKey = version === undefined ? "any" : String(version);
+    const cached = UUID_REGEX_CACHE.get(cacheKey);
+    if (cached) {
+        return cached;
     }
-    const versionPattern = (_a = conds === null || conds === void 0 ? void 0 : conds.version) !== null && _a !== void 0 ? _a : "[1-5]";
-    const regex = new RegExp(`^[0-9a-f]{8}[0-9a-f]{4}${versionPattern}[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12}$`, "i");
-    if (!regex.test(normalized)) {
+    const versionPattern = version !== null && version !== void 0 ? version : "[1-5]";
+    const created = new RegExp(`^[0-9a-f]{8}[0-9a-f]{4}${versionPattern}[0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12}$`, "i");
+    UUID_REGEX_CACHE.set(cacheKey, created);
+    return created;
+}
+function ensureUUIDVersion(normalizedUuid, conds) {
+    const regex = getUUIDRegex(conds === null || conds === void 0 ? void 0 : conds.version);
+    if (!regex.test(normalizedUuid)) {
         throw new v_error_1.VerificationError([
             {
                 key: "",
                 message: (0, message_1.getMessage)(undefined, undefined, {
-                    es: (values) => `UUID inválido${(conds === null || conds === void 0 ? void 0 : conds.version) ? ` para versión ${conds.version}` : ""}`,
-                    en: (values) => `Invalid UUID${(conds === null || conds === void 0 ? void 0 : conds.version) ? ` for version ${conds.version}` : ""}`,
+                    es: () => `UUID inválido${(conds === null || conds === void 0 ? void 0 : conds.version) ? ` para versión ${conds.version}` : ""}`,
+                    en: () => `Invalid UUID${(conds === null || conds === void 0 ? void 0 : conds.version) ? ` for version ${conds.version}` : ""}`,
                 }),
             },
         ]);
     }
-    const formatted = [
-        normalized.slice(0, 8),
-        normalized.slice(8, 12),
-        normalized.slice(12, 16),
-        normalized.slice(16, 20),
-        normalized.slice(20, 32),
+}
+function formatUUID(normalizedUuid) {
+    return [
+        normalizedUuid.slice(0, 8),
+        normalizedUuid.slice(8, 12),
+        normalizedUuid.slice(12, 16),
+        normalizedUuid.slice(16, 20),
+        normalizedUuid.slice(20, 32),
     ].join("-");
-    return formatted.toLowerCase();
+}
+function vUUID(data, badTypeMessage, conds) {
+    ensureUUIDType(data, badTypeMessage, conds);
+    const uuid = String(data);
+    ensureUUIDHyphenPolicy(uuid, conds);
+    const normalizedUuid = normalizeUUID(uuid);
+    ensureUUIDLength(normalizedUuid);
+    ensureUUIDVersion(normalizedUuid, conds);
+    return formatUUID(normalizedUuid).toLowerCase();
 }
 class VUUIDNotNull extends verifier_1.Verifier {
     constructor(cond) {
@@ -74,6 +111,15 @@ class VUUIDNotNull extends verifier_1.Verifier {
         var _a;
         return vUUID(this.isRequired(data, true, (_a = this.cond) === null || _a === void 0 ? void 0 : _a.defaultValue), this.badTypeMessage, this.cond);
     }
+    version(v) {
+        return new VUUIDNotNull(Object.assign(Object.assign({}, this.cond), { version: v }));
+    }
+    allowNoHyphens(enabled = true) {
+        return new VUUIDNotNull(Object.assign(Object.assign({}, this.cond), { allowNoHyphens: enabled }));
+    }
+    strictMode(enabled = true, message) {
+        return new VUUIDNotNull(Object.assign(Object.assign({}, this.cond), { strictMode: (0, conditionMessage_1.conditionWithValue)(enabled, message) }));
+    }
 }
 exports.VUUIDNotNull = VUUIDNotNull;
 class VUUID extends verifier_1.Verifier {
@@ -92,6 +138,18 @@ class VUUID extends verifier_1.Verifier {
             return null;
         return vUUID(val, this.badTypeMessage, this.cond);
     }
+    version(v) {
+        return new VUUID(Object.assign(Object.assign({}, this.cond), { version: v }));
+    }
+    allowNoHyphens(enabled = true) {
+        return new VUUID(Object.assign(Object.assign({}, this.cond), { allowNoHyphens: enabled }));
+    }
+    strictMode(enabled = true, message) {
+        return new VUUID(Object.assign(Object.assign({}, this.cond), { strictMode: (0, conditionMessage_1.conditionWithValue)(enabled, message) }));
+    }
+    required() {
+        return new VUUIDNotNull(this.cond);
+    }
 }
 exports.VUUID = VUUID;
 //# sourceMappingURL=v_uuid.js.map

package/dist/src/verifiers/uuid/v_uuid.js.map

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

package/dist/src/verifiers/verifier.d.ts

@@ -5,5 +5,6 @@ export declare abstract class Verifier<T> {
     constructor(cond?: VVCIsRequired | undefined);
     abstract check(data: any): T;
     protected badTypeMessage: IMessageLanguage<void>;
+    transform<R>(mapper: (value: T) => R): Verifier<R>;
     protected isRequired(data: any, isRequired?: boolean, defaultValue?: T): T;
 }

package/dist/src/verifiers/verifier.js

@@ -8,6 +8,14 @@ class Verifier {
     constructor(cond) {
         this.cond = cond;
     }
+    transform(mapper) {
+        const baseVerifier = this;
+        return new (class extends Verifier {
+            check(data) {
+                return mapper(baseVerifier.check(data));
+            }
+        })();
+    }
     isRequired(data, isRequired, defaultValue) {
         var _a, _b;
         let mReq = {
@@ -39,7 +47,7 @@ class Verifier {
                 reqVal = isRequired;
             }
         }
-        if (isRequired && (data === null || data === undefined)) {
+        if ((0, message_1.getValue)(reqVal) === true && (data === null || data === undefined)) {
             throw new v_error_1.VerificationError([
                 {
                     key: "",

package/dist/src/verifiers/verifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"verifier.js","sourceRoot":"","sources":["../../../src/src/verifiers/verifier.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAC1D,8CAAqD;AAErD,kDAI8B;AAE9B,MAAsB,QAAQ;IAC5B,YAAsB,IAAoB;QAApB,SAAI,GAAJ,IAAI,CAAgB;IAAG,CAAC;IAGpC,UAAU,CAAC,IAAS,EAAE,UAAoB,EAAE,YAAgB;;QACpE,IAAI,IAAI,GAA2B;YACjC,EAAE,EAAE,GAAG,EAAE,CAAC,gBAAgB;YAC1B,EAAE,EAAE,GAAG,EAAE,CAAC,iBAAiB;SAC5B,CAAC;QACF,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,YAAY,KAAK,SAAS,CAAC,EAAE,CAAC;YACxE,IAAI,GAAG,YAAY,CAAC;QACtB,CAAC;QACD,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,WAAW,MAAK,IAAI,EAAE,CAAC;YAChE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACtB,IAAI,GAAG,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QACD,IAAI,MAAM,GAA+B,KAAK,CAAC;QAC/C,IAAI,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,UAAU,MAAK,SAAS,EAAE,CAAC;YACxC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;YAC9B,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC7B,IAAI,OAAO,MAAM,KAAK,SAAS,EAAE,CAAC;oBAChC,MAAM,GAAG,UAAU,CAAC;gBACtB,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,GAAG,GAAG,UAAU,CAAC;gBAC1B,CAAC;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC7B,MAAM,GAAG,UAAU,CAAC;YACtB,CAAC;QACH,CAAC;QACD,IAAI,UAAU,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,CAAC,EAAE,CAAC;YACxD,MAAM,IAAI,2BAAiB,CAAC;gBAC1B;oBACE,GAAG,EAAE,EAAE;oBACP,OAAO,EAAE,GAAG,IAAA,oBAAU,EAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,+BAAc,CAAC,IAAI,CAAC,EAAE,EAAE;oBAC/F,OAAO,EAAE,IAAI;iBACd;aACF,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAS,CAAC;IACnB,CAAC;CACF;AA3CD,4BA2CC"}
+{"version":3,"file":"verifier.js","sourceRoot":"","sources":["../../../src/src/verifiers/verifier.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAC1D,8CAAqD;AAErD,kDAK8B;AAE9B,MAAsB,QAAQ;IAC5B,YAAsB,IAAoB;QAApB,SAAI,GAAJ,IAAI,CAAgB;IAAG,CAAC;IAI9C,SAAS,CAAI,MAAuB;QAClC,MAAM,YAAY,GAAG,IAAI,CAAC;QAE1B,OAAO,IAAI,CAAC,KAAM,SAAQ,QAAW;YACnC,KAAK,CAAC,IAAS;gBACb,OAAO,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YAC1C,CAAC;SACF,CAAC,EAAE,CAAC;IACP,CAAC;IAES,UAAU,CAAC,IAAS,EAAE,UAAoB,EAAE,YAAgB;;QACpE,IAAI,IAAI,GAA2B;YACjC,EAAE,EAAE,GAAG,EAAE,CAAC,gBAAgB;YAC1B,EAAE,EAAE,GAAG,EAAE,CAAC,iBAAiB;SAC5B,CAAC;QACF,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,YAAY,KAAK,SAAS,CAAC,EAAE,CAAC;YACxE,IAAI,GAAG,YAAY,CAAC;QACtB,CAAC;QACD,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,WAAW,MAAK,IAAI,EAAE,CAAC;YAChE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACtB,IAAI,GAAG,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QACD,IAAI,MAAM,GAA+B,KAAK,CAAC;QAC/C,IAAI,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,UAAU,MAAK,SAAS,EAAE,CAAC;YACxC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;YAC9B,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC7B,IAAI,OAAO,MAAM,KAAK,SAAS,EAAE,CAAC;oBAChC,MAAM,GAAG,UAAU,CAAC;gBACtB,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,GAAG,GAAG,UAAU,CAAC;gBAC1B,CAAC;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC7B,MAAM,GAAG,UAAU,CAAC;YACtB,CAAC;QACH,CAAC;QACD,IAAI,IAAA,kBAAQ,EAAC,MAAM,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,CAAC,EAAE,CAAC;YACvE,MAAM,IAAI,2BAAiB,CAAC;gBAC1B;oBACE,GAAG,EAAE,EAAE;oBACP,OAAO,EAAE,GAAG,IAAA,oBAAU,EAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,+BAAc,CAAC,IAAI,CAAC,EAAE,EAAE;oBAC/F,OAAO,EAAE,IAAI;iBACd;aACF,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAS,CAAC;IACnB,CAAC;CACF;AAtDD,4BAsDC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "structure-verifier",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "",
   "main": "dist/index.js",
   "repository": {