@excofy/utils 2.2.0 → 2.3.1

package/dist/index.cjs

@@ -96,30 +96,6 @@ function isValidCNPJ(cnpj) {
   return digit1 === digits[1];
 }
 
-// src/helpers/file.ts
-var fileUtils = {
-  base64ToFile: (base64, filename) => {
-    if (!base64 || base64 === "") {
-      return null;
-    }
-    const arr = base64.split(",");
-    if (arr.length !== 2) {
-      return null;
-    }
-    const mime = arr[0].match(/:(.*?);/)?.[1];
-    if (!mime) {
-      return null;
-    }
-    const bstr = atob(arr[1]);
-    let n = bstr.length;
-    const u8arr = new Uint8Array(n);
-    while (n--) {
-      u8arr[n] = bstr.charCodeAt(n);
-    }
-    return new File([u8arr], filename, { type: mime });
-  }
-};
-
 // src/helpers/sanitize.ts
 var import_xss = require("xss");
 var allTags = [
@@ -258,8 +234,6 @@ function createValidator() {
         isValidType = typeof value === "object" && value !== null && !Array.isArray(value);
       } else if (type === "file") {
         isValidType = value instanceof File;
-      } else if (type === "base64") {
-        isValidType = typeof value === "string" && !!value.match(/^data:([A-Za-z-+\/]+);base64,([A-Za-z0-9+/=]+)$/);
       } else if (type === "date") {
         isValidType = typeof value === "string" && !Number.isNaN(new Date(value).getTime());
       } else {
@@ -276,6 +250,44 @@ function createValidator() {
     return !current.required && (current.value === void 0 || current.value === null || current.value === "");
   };
   const validator = {
+    base64Type(validTypes, message) {
+      if (shouldSkipValidation()) return validator;
+      const value = current.value;
+      if (typeof value !== "string") {
+        current.pushError(message);
+        return validator;
+      }
+      const match = value.match(
+        /^data:([A-Za-z-+\/]+);(?:charset=utf-8;)?base64,/
+      );
+      if (!match) {
+        current.pushError(message);
+        return validator;
+      }
+      const mimeType = match[1];
+      if (!validTypes.includes(mimeType)) {
+        current.pushError(message);
+      }
+      return validator;
+    },
+    base64MaxSize(maxSize, message) {
+      if (shouldSkipValidation()) return validator;
+      const value = current.value;
+      if (typeof value !== "string") {
+        current.pushError(message);
+        return validator;
+      }
+      const base64Content = value.split(",")[1];
+      if (!base64Content) {
+        current.pushError(message);
+        return validator;
+      }
+      const sizeInBytes = Math.ceil(base64Content.length * 3 / 4);
+      if (sizeInBytes > maxSize) {
+        current.pushError(message);
+      }
+      return validator;
+    },
     cnpj: (message) => {
       if (shouldSkipValidation()) {
         return validator;
@@ -618,22 +630,6 @@ function createValidator() {
         current.inputs[current.field] = arr;
       }
       return validator;
-    },
-    asFileFromBase64(message, filename) {
-      if (shouldSkipValidation()) return validator;
-      const value = current.value;
-      if (typeof value !== "string") {
-        current.pushError(message);
-        return validator;
-      }
-      if (!value.match(/^data:([A-Za-z-+\/]+);base64,([A-Za-z0-9+/=]+)$/)) {
-        current.pushError(message);
-        return validator;
-      }
-      const file = fileUtils.base64ToFile(value, filename);
-      current.value = file;
-      current.inputs[current.field] = file;
-      return validator;
     }
   };
   return {

package/dist/index.d.cts

@@ -13,11 +13,13 @@ type TMessage = {
 };
 type TValue = string | number | boolean | File | object | null | undefined;
 type TInputValue = TValue;
-type TTypes = 'string' | 'number' | 'boolean' | 'object' | 'array' | 'file' | 'base64' | 'date';
+type TTypes = 'string' | 'number' | 'boolean' | 'object' | 'array' | 'file' | 'date';
 interface IInputErrors {
     [key: string]: TMessage[] | IInputErrors[];
 }
 interface ValidatorField {
+    base64Type(validTypes: string[], message: string): ValidatorField;
+    base64MaxSize(maxSize: number, message: string): ValidatorField;
     cnpj(message: string): ValidatorField;
     cpf(message: string): ValidatorField;
     each(callback: <U extends Record<string, TInputValue>>(item: U, index: number, subValidator: ReturnType<typeof createValidator<U>>) => void): ValidatorField;
@@ -48,7 +50,6 @@ interface ValidatorField {
     asNumber(message: string): ValidatorField;
     asBoolean(message: string): ValidatorField;
     asStringArray(message: string): ValidatorField;
-    asFileFromBase64(message: string, filename: string): ValidatorField;
 }
 /**
  * Cria um validador de inputs com suporte a validações encadeadas, transformação e sanitização.

package/dist/index.d.ts

@@ -13,11 +13,13 @@ type TMessage = {
 };
 type TValue = string | number | boolean | File | object | null | undefined;
 type TInputValue = TValue;
-type TTypes = 'string' | 'number' | 'boolean' | 'object' | 'array' | 'file' | 'base64' | 'date';
+type TTypes = 'string' | 'number' | 'boolean' | 'object' | 'array' | 'file' | 'date';
 interface IInputErrors {
     [key: string]: TMessage[] | IInputErrors[];
 }
 interface ValidatorField {
+    base64Type(validTypes: string[], message: string): ValidatorField;
+    base64MaxSize(maxSize: number, message: string): ValidatorField;
     cnpj(message: string): ValidatorField;
     cpf(message: string): ValidatorField;
     each(callback: <U extends Record<string, TInputValue>>(item: U, index: number, subValidator: ReturnType<typeof createValidator<U>>) => void): ValidatorField;
@@ -48,7 +50,6 @@ interface ValidatorField {
     asNumber(message: string): ValidatorField;
     asBoolean(message: string): ValidatorField;
     asStringArray(message: string): ValidatorField;
-    asFileFromBase64(message: string, filename: string): ValidatorField;
 }
 /**
  * Cria um validador de inputs com suporte a validações encadeadas, transformação e sanitização.

package/dist/index.js

@@ -58,30 +58,6 @@ function isValidCNPJ(cnpj) {
   return digit1 === digits[1];
 }
 
-// src/helpers/file.ts
-var fileUtils = {
-  base64ToFile: (base64, filename) => {
-    if (!base64 || base64 === "") {
-      return null;
-    }
-    const arr = base64.split(",");
-    if (arr.length !== 2) {
-      return null;
-    }
-    const mime = arr[0].match(/:(.*?);/)?.[1];
-    if (!mime) {
-      return null;
-    }
-    const bstr = atob(arr[1]);
-    let n = bstr.length;
-    const u8arr = new Uint8Array(n);
-    while (n--) {
-      u8arr[n] = bstr.charCodeAt(n);
-    }
-    return new File([u8arr], filename, { type: mime });
-  }
-};
-
 // src/helpers/sanitize.ts
 import { FilterXSS } from "xss";
 var allTags = [
@@ -220,8 +196,6 @@ function createValidator() {
         isValidType = typeof value === "object" && value !== null && !Array.isArray(value);
       } else if (type === "file") {
         isValidType = value instanceof File;
-      } else if (type === "base64") {
-        isValidType = typeof value === "string" && !!value.match(/^data:([A-Za-z-+\/]+);base64,([A-Za-z0-9+/=]+)$/);
       } else if (type === "date") {
         isValidType = typeof value === "string" && !Number.isNaN(new Date(value).getTime());
       } else {
@@ -238,6 +212,44 @@ function createValidator() {
     return !current.required && (current.value === void 0 || current.value === null || current.value === "");
   };
   const validator = {
+    base64Type(validTypes, message) {
+      if (shouldSkipValidation()) return validator;
+      const value = current.value;
+      if (typeof value !== "string") {
+        current.pushError(message);
+        return validator;
+      }
+      const match = value.match(
+        /^data:([A-Za-z-+\/]+);(?:charset=utf-8;)?base64,/
+      );
+      if (!match) {
+        current.pushError(message);
+        return validator;
+      }
+      const mimeType = match[1];
+      if (!validTypes.includes(mimeType)) {
+        current.pushError(message);
+      }
+      return validator;
+    },
+    base64MaxSize(maxSize, message) {
+      if (shouldSkipValidation()) return validator;
+      const value = current.value;
+      if (typeof value !== "string") {
+        current.pushError(message);
+        return validator;
+      }
+      const base64Content = value.split(",")[1];
+      if (!base64Content) {
+        current.pushError(message);
+        return validator;
+      }
+      const sizeInBytes = Math.ceil(base64Content.length * 3 / 4);
+      if (sizeInBytes > maxSize) {
+        current.pushError(message);
+      }
+      return validator;
+    },
     cnpj: (message) => {
       if (shouldSkipValidation()) {
         return validator;
@@ -580,22 +592,6 @@ function createValidator() {
         current.inputs[current.field] = arr;
       }
       return validator;
-    },
-    asFileFromBase64(message, filename) {
-      if (shouldSkipValidation()) return validator;
-      const value = current.value;
-      if (typeof value !== "string") {
-        current.pushError(message);
-        return validator;
-      }
-      if (!value.match(/^data:([A-Za-z-+\/]+);base64,([A-Za-z0-9+/=]+)$/)) {
-        current.pushError(message);
-        return validator;
-      }
-      const file = fileUtils.base64ToFile(value, filename);
-      current.value = file;
-      current.inputs[current.field] = file;
-      return validator;
     }
   };
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@excofy/utils",
-  "version": "2.2.0",
+  "version": "2.3.1",
   "description": "Biblioteca de utilitários para o Excofy",
   "main": "dist/index.js",
   "type": "module",

package/src/helpers/validator.ts

@@ -1,5 +1,4 @@
 import { isValidCNPJ, isValidCPF } from './document';
-import { fileUtils } from './file';
 import { sanitizeValue, type AllowedTag } from './sanitize';
 import { video } from './video';
 
@@ -13,7 +12,6 @@ type TTypes =
   | 'object'
   | 'array'
   | 'file'
-  | 'base64'
   | 'date';
 
 interface IInputErrors {
@@ -21,6 +19,8 @@ interface IInputErrors {
 }
 
 interface ValidatorField {
+  base64Type(validTypes: string[], message: string): ValidatorField;
+  base64MaxSize(maxSize: number, message: string): ValidatorField;
   cnpj(message: string): ValidatorField;
   cpf(message: string): ValidatorField;
   each(
@@ -58,7 +58,6 @@ interface ValidatorField {
   asNumber(message: string): ValidatorField;
   asBoolean(message: string): ValidatorField;
   asStringArray(message: string): ValidatorField;
-  asFileFromBase64(message: string, filename: string): ValidatorField;
 }
 
 /**
@@ -142,10 +141,6 @@ export function createValidator<
           typeof value === 'object' && value !== null && !Array.isArray(value);
       } else if (type === 'file') {
         isValidType = value instanceof File;
-      } else if (type === 'base64') {
-        isValidType =
-          typeof value === 'string' &&
-          !!value.match(/^data:([A-Za-z-+\/]+);base64,([A-Za-z0-9+/=]+)$/);
       } else if (type === 'date') {
         isValidType =
           typeof value === 'string' && !Number.isNaN(new Date(value).getTime());
@@ -176,6 +171,57 @@ export function createValidator<
   };
 
   const validator: ValidatorField = {
+    base64Type(validTypes: string[], message: string) {
+      if (shouldSkipValidation()) return validator;
+
+      const value = current.value;
+
+      if (typeof value !== 'string') {
+        current.pushError(message);
+        return validator;
+      }
+
+      const match = value.match(
+        /^data:([A-Za-z-+\/]+);(?:charset=utf-8;)?base64,/
+      );
+      if (!match) {
+        current.pushError(message);
+        return validator;
+      }
+
+      const mimeType = match[1];
+      if (!validTypes.includes(mimeType)) {
+        current.pushError(message);
+      }
+
+      return validator;
+    },
+
+    base64MaxSize(maxSize: number, message: string) {
+      if (shouldSkipValidation()) return validator;
+
+      const value = current.value;
+
+      if (typeof value !== 'string') {
+        current.pushError(message);
+        return validator;
+      }
+
+      const base64Content = value.split(',')[1];
+      if (!base64Content) {
+        current.pushError(message);
+        return validator;
+      }
+
+      // Calcula o tamanho do arquivo em bytes
+      const sizeInBytes = Math.ceil((base64Content.length * 3) / 4);
+      if (sizeInBytes > maxSize) {
+        current.pushError(message);
+      }
+
+      return validator;
+    },
+
     cnpj: (message: string) => {
       if (shouldSkipValidation()) {
         return validator;
@@ -636,28 +682,6 @@ export function createValidator<
 
       return validator;
     },
-
-    asFileFromBase64(message: string, filename: string) {
-      if (shouldSkipValidation()) return validator;
-
-      const value = current.value;
-
-      if (typeof value !== 'string') {
-        current.pushError(message);
-        return validator;
-      }
-
-      if (!value.match(/^data:([A-Za-z-+\/]+);base64,([A-Za-z0-9+/=]+)$/)) {
-        current.pushError(message);
-        return validator;
-      }
-
-      const file = fileUtils.base64ToFile(value, filename);
-      current.value = file;
-      current.inputs[current.field] = file as TRaw[keyof TRaw];
-
-      return validator;
-    },
   };
 
   return {