ngx-vector-components 5.135.1 → 5.136.0

package/fesm2022/ngx-vector-components.mjs

@@ -870,8 +870,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
 
 class CpfCnpjValidator {
     static validateCpfOrCnpj(taxId) {
-        taxId = taxId.replace(/[^0-9]+/g, '');
-        if (taxId.length == 11) {
+        taxId = taxId.replace(/[^a-zA-Z0-9]/g, '');
+        if (taxId.length == 11 && taxId.match(/^[0-9]+$/)) {
             return this.validateCpf(taxId);
         }
         else if (taxId.length == 14) {
@@ -937,11 +937,18 @@ class CpfCnpjValidator {
         return cpf === cpfAux;
     }
     static validateCnpj(cnpj) {
-        cnpj = cnpj.replace(/[^\d]+/g, '');
-        if (cnpj == '')
+        cnpj = cnpj.replace(/[^a-zA-Z0-9]/g, '');
+        if (!cnpj || cnpj.length !== 14) {
             return false;
-        if (cnpj.length != 14)
+        }
+        const first12 = cnpj.substring(0, 12);
+        if (!first12.match(/^[a-zA-Z0-9]{12}$/)) {
+            return false;
+        }
+        const last2 = cnpj.substring(12, 14);
+        if (!last2.match(/^[0-9]{2}$/)) {
             return false;
+        }
         if ([
             '00000000000000',
             '11111111111111',
@@ -953,33 +960,9 @@ class CpfCnpjValidator {
             '77777777777777',
             '88888888888888',
             '99999999999999',
-        ].includes(cnpj))
-            return false;
-        let size = cnpj.length - 2;
-        let numbers = cnpj.substring(0, size);
-        let digits = cnpj.substring(size);
-        let sum = 0;
-        let pos = size - 7;
-        for (let i = size; i >= 1; i--) {
-            sum += parseInt(numbers.charAt(size - i)) * pos--;
-            if (pos < 2)
-                pos = 9;
-        }
-        let resultado = sum % 11 < 2 ? 0 : 11 - (sum % 11);
-        if (resultado != parseInt(digits.charAt(0)))
-            return false;
-        size = size + 1;
-        numbers = cnpj.substring(0, size);
-        sum = 0;
-        pos = size - 7;
-        for (let i = size; i >= 1; i--) {
-            sum += parseInt(numbers.charAt(size - i)) * pos--;
-            if (pos < 2)
-                pos = 9;
-        }
-        resultado = sum % 11 < 2 ? 0 : 11 - (sum % 11);
-        if (resultado != parseInt(digits.charAt(1)))
+        ].includes(cnpj)) {
             return false;
+        }
         return true;
     }
 }
@@ -1010,7 +993,7 @@ const DNI_PATTERN = '##.###.###';
 const CUIT_PATTERN = '##-########-#';
 class MaskUtil {
     static { this.CPF_TEXT_FIELD_PATTERN = '999.999.999-99'; }
-    static { this.CNPJ_TEXT_FIELD_PATTERN = '99.999.999/9999-99'; }
+    static { this.CNPJ_TEXT_FIELD_PATTERN = '**.***.***/****-99'; }
     static { this.BOLETO_TEXT_FIELD_PATTERN = '99999.99999 99999.999999 99999.999999 9 99999999999999 9'; }
     static { this.CELLPHONE_TEXT_FIELD_PATTERN = '(99) 99999-9999'; }
     static { this.PHONE_TEXT_FIELD_PATTERN = '(99) 9999-9999'; }
@@ -1250,26 +1233,37 @@ class ValidationUtil {
     }
     static isValidCnpj(control) {
         let cnpj = control.value;
-        cnpj = cnpj.replace(/[^\d]+/g, '');
-        if (/^(\d)\1+$/.test(cnpj)) {
+        cnpj = cnpj.replace(/[^a-zA-Z0-9]/g, '');
+        if (!cnpj || cnpj.length !== 14) {
             return { cnpjNotValid: true };
         }
-        let t = cnpj.length - 2, d = cnpj.substring(t), d1 = parseInt(d.charAt(0)), d2 = parseInt(d.charAt(1)), calc = (x) => {
-            let n = cnpj.substring(0, x), y = x - 7, s = 0, r = 0;
-            for (let i = x; i >= 1; i--) {
-                s += n.charAt(x - i) * y--;
-                if (y < 2)
-                    y = 9;
-            }
-            r = 11 - (s % 11);
-            return r > 9 ? 0 : r;
-        };
-        if (calc(t) === d1 && calc(t + 1) === d2) {
-            return null;
+        const first12 = cnpj.substring(0, 12);
+        if (!first12.match(/^[a-zA-Z0-9]{12}$/)) {
+            return { cnpjNotValid: true };
         }
-        else {
+        const last2 = cnpj.substring(12, 14);
+        if (!last2.match(/^[0-9]{2}$/)) {
+            return { cnpjNotValid: true };
+        }
+        if (/^(\d)\1+$/.test(cnpj)) {
             return { cnpjNotValid: true };
         }
+        if (/^[0-9]{14}$/.test(cnpj)) {
+            let t = cnpj.length - 2, d = cnpj.substring(t), d1 = parseInt(d.charAt(0)), d2 = parseInt(d.charAt(1)), calc = (x) => {
+                let n = cnpj.substring(0, x), y = x - 7, s = 0, r = 0;
+                for (let i = x; i >= 1; i--) {
+                    s += n.charAt(x - i) * y--;
+                    if (y < 2)
+                        y = 9;
+                }
+                r = 11 - (s % 11);
+                return r > 9 ? 0 : r;
+            };
+            if (calc(t) !== d1 || calc(t + 1) !== d2) {
+                return { cnpjNotValid: true };
+            }
+        }
+        return null;
     }
     static majorAge(control) {
         if (!control.value) {
@@ -3469,8 +3463,8 @@ class DropdownFieldComponent {
         if (firstDigitIndex === -1)
             return value;
         const prefix = value.slice(0, firstDigitIndex);
-        const suffixWithNumbers = value.slice(firstDigitIndex);
-        const match = suffixWithNumbers.match(/^(\d+)(.*)$/);
+        const remainingValue = value.slice(firstDigitIndex);
+        const match = remainingValue.match(/^([a-zA-Z0-9]+)(.*)$/);
         if (!match)
             return value;
         const rawNumber = match[1];