@excofy/utils 2.3.0 → 2.3.2

package/dist/index.cjs

@@ -154,11 +154,11 @@ function sanitizeValue(value, allowedTags) {
   });
   return filter.process(value);
 }
-function htmlEntityDecode(value) {
-  if (!value) {
-    return "";
-  }
-  return value.replace(/&gt;/g, ">").replace(/&lt;/g, "<").replace(/&amp;/g, "&").replace(/&quot;/g, '"').replace(/&#39;/g, "'");
+function htmlEntityDecode(str = "") {
+  return str.replace(/&#(\d+);/g, (_, code) => String.fromCharCode(code)).replace(
+    /&#x([0-9a-f]+);/gi,
+    (_, code) => String.fromCharCode(Number.parseInt(code, 16))
+  ).replace(/&amp;/g, "&").replace(/&quot;/g, '"').replace(/&apos;/g, "'").replace(/&lt;/g, "<").replace(/&gt;/g, ">");
 }
 
 // src/helpers/video.ts
@@ -234,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 {
@@ -259,7 +257,9 @@ function createValidator() {
         current.pushError(message);
         return validator;
       }
-      const match = value.match(/^data:([A-Za-z-+\/]+);base64,/);
+      const match = value.match(
+        /^data:([A-Za-z-+\/]+);(?:charset=utf-8;)?base64,/
+      );
       if (!match) {
         current.pushError(message);
         return validator;

package/dist/index.d.cts

@@ -6,14 +6,14 @@ type AllowedTag = Tag | {
     tag: Tag;
     attributes?: Attributes[];
 };
-declare function htmlEntityDecode(value?: string): string;
+declare function htmlEntityDecode(str?: string): string;
 
 type TMessage = {
     message: string;
 };
 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[];
 }

package/dist/index.d.ts

@@ -6,14 +6,14 @@ type AllowedTag = Tag | {
     tag: Tag;
     attributes?: Attributes[];
 };
-declare function htmlEntityDecode(value?: string): string;
+declare function htmlEntityDecode(str?: string): string;
 
 type TMessage = {
     message: string;
 };
 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[];
 }

package/dist/index.js

@@ -116,11 +116,11 @@ function sanitizeValue(value, allowedTags) {
   });
   return filter.process(value);
 }
-function htmlEntityDecode(value) {
-  if (!value) {
-    return "";
-  }
-  return value.replace(/&gt;/g, ">").replace(/&lt;/g, "<").replace(/&amp;/g, "&").replace(/&quot;/g, '"').replace(/&#39;/g, "'");
+function htmlEntityDecode(str = "") {
+  return str.replace(/&#(\d+);/g, (_, code) => String.fromCharCode(code)).replace(
+    /&#x([0-9a-f]+);/gi,
+    (_, code) => String.fromCharCode(Number.parseInt(code, 16))
+  ).replace(/&amp;/g, "&").replace(/&quot;/g, '"').replace(/&apos;/g, "'").replace(/&lt;/g, "<").replace(/&gt;/g, ">");
 }
 
 // src/helpers/video.ts
@@ -196,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 {
@@ -221,7 +219,9 @@ function createValidator() {
         current.pushError(message);
         return validator;
       }
-      const match = value.match(/^data:([A-Za-z-+\/]+);base64,/);
+      const match = value.match(
+        /^data:([A-Za-z-+\/]+);(?:charset=utf-8;)?base64,/
+      );
       if (!match) {
         current.pushError(message);
         return validator;

package/package.json

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

package/src/helpers/sanitize.ts

@@ -101,15 +101,15 @@ export function sanitizeValue(
   return filter.process(value);
 }
 
-export function htmlEntityDecode(value?: string): string {
-  if (!value) {
-    return '';
-  }
-
-  return value
-    .replace(/>/g, '>')
-    .replace(/&lt;/g, '<')
+export function htmlEntityDecode(str = ''): string {
+  return str
+    .replace(/&#(\d+);/g, (_, code) => String.fromCharCode(code))
+    .replace(/&#x([0-9a-f]+);/gi, (_, code) =>
+      String.fromCharCode(Number.parseInt(code, 16))
+    )
     .replace(/&amp;/g, '&')
     .replace(/&quot;/g, '"')
-    .replace(/&#39;/g, "'");
+    .replace(/&apos;/g, "'")
+    .replace(/&lt;/g, '<')
+    .replace(/&gt;/g, '>');
 }

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 {
@@ -143,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());
@@ -187,7 +181,9 @@ export function createValidator<
         return validator;
       }
 
-      const match = value.match(/^data:([A-Za-z-+\/]+);base64,/);
+      const match = value.match(
+        /^data:([A-Za-z-+\/]+);(?:charset=utf-8;)?base64,/
+      );
       if (!match) {
         current.pushError(message);
         return validator;