@gustavo-valsechi/utils 1.0.24 → 1.0.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/index.js +7 -3
  2. package/dist/index.mjs +7 -3
  3. package/dist/src/mask/index.js +7 -3
  4. package/dist/src/mask/index.mjs +7 -3
  5. package/package.json +1 -1
package/dist/index.js CHANGED
@@ -127,9 +127,13 @@ var Mask = {
127
127
  },
128
128
  money(valor, nosign, integer) {
129
129
  if (!valor) return "";
130
- valor = String(valor).replace("R$ ", "").replace(",", ".").replace(/\.(?=.*\.)/g, "");
131
- valor = Number(valor).toFixed(2);
132
- valor = String(valor).replace(/[\D]+/g, "");
130
+ valor = String(valor);
131
+ if ((valor.includes(".") || valor.includes(",")) && !valor.includes("R$")) {
132
+ valor = valor.replace("R$ ", "").replace(",", ".").replace(/\.(?=.*\.)/g, "");
133
+ valor = Number(valor).toFixed(2);
134
+ }
135
+ valor = valor.replace(/[\D]+/g, "");
136
+ valor = String(Number(valor));
133
137
  if (!nosign) valor = "R$ " + valor;
134
138
  if (!integer) {
135
139
  if (!nosign ? valor.length <= 4 : valor.length <= 1) {
package/dist/index.mjs CHANGED
@@ -91,9 +91,13 @@ var Mask = {
91
91
  },
92
92
  money(valor, nosign, integer) {
93
93
  if (!valor) return "";
94
- valor = String(valor).replace("R$ ", "").replace(",", ".").replace(/\.(?=.*\.)/g, "");
95
- valor = Number(valor).toFixed(2);
96
- valor = String(valor).replace(/[\D]+/g, "");
94
+ valor = String(valor);
95
+ if ((valor.includes(".") || valor.includes(",")) && !valor.includes("R$")) {
96
+ valor = valor.replace("R$ ", "").replace(",", ".").replace(/\.(?=.*\.)/g, "");
97
+ valor = Number(valor).toFixed(2);
98
+ }
99
+ valor = valor.replace(/[\D]+/g, "");
100
+ valor = String(Number(valor));
97
101
  if (!nosign) valor = "R$ " + valor;
98
102
  if (!integer) {
99
103
  if (!nosign ? valor.length <= 4 : valor.length <= 1) {
package/dist/src/mask/index.js CHANGED
@@ -61,9 +61,13 @@ var Mask = {
61
61
  },
62
62
  money(valor, nosign, integer) {
63
63
  if (!valor) return "";
64
- valor = String(valor).replace("R$ ", "").replace(",", ".").replace(/\.(?=.*\.)/g, "");
65
- valor = Number(valor).toFixed(2);
66
- valor = String(valor).replace(/[\D]+/g, "");
64
+ valor = String(valor);
65
+ if ((valor.includes(".") || valor.includes(",")) && !valor.includes("R$")) {
66
+ valor = valor.replace("R$ ", "").replace(",", ".").replace(/\.(?=.*\.)/g, "");
67
+ valor = Number(valor).toFixed(2);
68
+ }
69
+ valor = valor.replace(/[\D]+/g, "");
70
+ valor = String(Number(valor));
67
71
  if (!nosign) valor = "R$ " + valor;
68
72
  if (!integer) {
69
73
  if (!nosign ? valor.length <= 4 : valor.length <= 1) {
package/dist/src/mask/index.mjs CHANGED
@@ -27,9 +27,13 @@ var Mask = {
27
27
  },
28
28
  money(valor, nosign, integer) {
29
29
  if (!valor) return "";
30
- valor = String(valor).replace("R$ ", "").replace(",", ".").replace(/\.(?=.*\.)/g, "");
31
- valor = Number(valor).toFixed(2);
32
- valor = String(valor).replace(/[\D]+/g, "");
30
+ valor = String(valor);
31
+ if ((valor.includes(".") || valor.includes(",")) && !valor.includes("R$")) {
32
+ valor = valor.replace("R$ ", "").replace(",", ".").replace(/\.(?=.*\.)/g, "");
33
+ valor = Number(valor).toFixed(2);
34
+ }
35
+ valor = valor.replace(/[\D]+/g, "");
36
+ valor = String(Number(valor));
33
37
  if (!nosign) valor = "R$ " + valor;
34
38
  if (!integer) {
35
39
  if (!nosign ? valor.length <= 4 : valor.length <= 1) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gustavo-valsechi/utils",
3
- "version": "1.0.24",
3
+ "version": "1.0.25",
4
4
  "main": "dist/index.js",
5
5
  "module": "dist/index.js",
6
6
  "types": "dist/index.d.ts",