investira.sdk 2.2.12 → 2.2.15

package/CHANGELOG.md

@@ -437,3 +437,16 @@ O contrutor para a criação das mensagem foi alterado.
 # 2.2.12
 
 -   [investira.data] Atualização
+
+# 2.2.13
+
+-   [investira.data] Controle de vigência do feriado
+
+# 2.2.14
+
+-   [investira.data] Controle de vigência do feriado
+
+# 2.2.15
+
+-   [numbers] Aumento da precisão do trunc e do round
+-   [formats] Substituicão do trimRight por trimEnd no friendlyNumber

package/lib/tests/test_dates.js

@@ -89,7 +89,7 @@ test('\ndates addWorkingDays', t => {
 
 test('\ndates weekNames', t => {
     dates.locale('pt-BR');
-    t.equal(dates.weekNames()[0], 'Domingo');
+    t.equal(dates.weekNames()[0], 'domingo');
     dates.locale('en-US');
     t.equal(dates.weekNames()[0], 'Sunday');
     t.end();
@@ -126,6 +126,9 @@ test('\ndates workingDaysBetween', t => {
     xData1 = dates.toDate('2019-04-30');
     xData2 = dates.toDate('2019-05-01');
     t.equal(dates.workingDaysBetween(xData1, xData2), 0);
+    // xData1 = dates.toDate('1988-04-20');
+    // xData2 = dates.toDate('1988-04-21');
+    // t.equal(dates.workingDaysBetween(xData1, xData2), 0);
     xData1 = dates.toDate('2019-04-30');
     xData2 = dates.toDate('2019-05-02');
     t.equal(dates.workingDaysBetween(xData1, xData2), 1);

package/lib/tests/test_formats.js

@@ -14,26 +14,24 @@ test('\nformats.formatPhone', t => {
 });
 
 test('\nformats.friendlyNumber', t => {
-    t.equal(formats.friendlyNumber(123, 0, true), 'R$123');
-    t.equal(formats.friendlyNumber(123, 0, false), '123');
-    t.equal(formats.friendlyNumber(123, 0, true), 'R$123');
+    t.equal(formats.friendlyNumber(123, 0, true), `R$${String.fromCharCode(160)}123`);
     t.equal(formats.friendlyNumber(123, 0, false), '123');
     t.equal(formats.friendlyNumber(1234567, 0, false), '1 mi');
-    t.equal(formats.friendlyNumber(1234567, 1, false), '1.2 mi');
-    t.equal(formats.friendlyNumber(1234567, 2, false), '1.23 mi');
-    t.equal(formats.friendlyNumber(1234567, 3, false), '1.235 mi');
+    t.equal(formats.friendlyNumber(1234567, 1, false), '1,2 mi');
+    t.equal(formats.friendlyNumber(1234567, 2, false), '1,23 mi');
+    t.equal(formats.friendlyNumber(1234567, 3, false), '1,235 mi');
     t.equal(formats.friendlyNumber(1234000, 0, false), '1 mi');
-    t.equal(formats.friendlyNumber(1234000, 1, false), '1.2 mi');
-    t.equal(formats.friendlyNumber(1234000, 2, false), '1.23 mi');
-    t.equal(formats.friendlyNumber(1234000, 3, false), '1.234 mi');
-    t.equal(formats.friendlyNumber(1234000, 0, true), 'R$1 mi');
-    t.equal(formats.friendlyNumber(1234000, 1, true), 'R$1.2 mi');
-    t.equal(formats.friendlyNumber(1234000, 2, true), 'R$1.23 mi');
-    t.equal(formats.friendlyNumber(1234000, 3, true), 'R$1.234 mi');
-    t.equal(formats.friendlyNumber(-1234000, 3, false), '-1.234 mi');
+    t.equal(formats.friendlyNumber(1234000, 1, false), '1,2 mi');
+    t.equal(formats.friendlyNumber(1234000, 2, false), '1,23 mi');
+    t.equal(formats.friendlyNumber(1234000, 3, false), '1,234 mi');
+    t.equal(formats.friendlyNumber(1234000, 0, true), `R$${String.fromCharCode(160)}1 mi`);
+    t.equal(formats.friendlyNumber(1234000, 1, true), `R$${String.fromCharCode(160)}1,2 mi`);
+    t.equal(formats.friendlyNumber(1234000, 2, true), `R$${String.fromCharCode(160)}1,23 mi`);
+    t.equal(formats.friendlyNumber(1234000, 3, true), `R$${String.fromCharCode(160)}1,234 mi`);
+    t.equal(formats.friendlyNumber(-1234000, 3, false), '-1,234 mi');
     t.equal(formats.friendlyNumber(0, 3, false), '0');
-    t.equal(formats.friendlyNumber(0.9123123424, 2, false), '0.91');
-    t.equal(formats.friendlyNumber(0.9123123424, 2, true), 'R$0.91');
+    t.equal(formats.friendlyNumber(0.9123123424, 2, false), '0,91');
+    t.equal(formats.friendlyNumber(0.9123123424, 2, true), `R$${String.fromCharCode(160)}0,91`);
     t.end();
 });
 

package/lib/tests/test_numbers.js

@@ -69,8 +69,8 @@ test('\nnumbers mul', t => {
     t.equal(numbers.mul(4.300000000000001, 5), 21.500000000000004);
     t.equal(numbers.mul(4.0001, 5.0002), 20.00130002);
     t.equal(numbers.mul(4.0001, 5.0002), 20.00130002);
-    t.equal(numbers.mul(2357.12345679, 1234567), 2910026834.6788597); //2910026834.67886 = Se fosse bigDecimal
-    t.equal(numbers.mul(-0.123456789012345678901, -1230.123456789012345678901), 151.86709206351316); //151.86709206393883 = Se fosse bigDecimal
+    t.equal(numbers.mul(2357.12345679, 1234567), 2910026834.6788597);
+    t.equal(numbers.mul(-0.123456789012345678901, -1230.123456789012345678901), 151.86709206393846); //151.86709206393883 = Se fosse bigDecimal
     t.end();
 });
 

package/lib/utils/dates.js

@@ -50,11 +50,16 @@ const dates = {
             //Le todos os feriados cadastrados
             for (let xHolidayString of dataHolidays[xKey].holidays) {
                 //Se for feriado fixo - que se repete todos os anos -  configura o ano
-                if (xHolidayString.startsWith('X')) {
-                    const xMMDD = xHolidayString.substring(4, 12);
-                    for (let x = 1970; x <= 2080; x++) {
-                        xHolidayString = x + xMMDD;
-                        pvLoadDataPush(xHolidays, xKey, xHolidayString);
+                if (xHolidayString.hasOwnProperty('date')) {
+                    const xMMDD = xHolidayString.date.substring(4, 12);
+                    for (let x = 1970; x <= 2090; x++) {
+                        //Verifica se esta dentro do período de validade
+                        if (
+                            (!xHolidayString.since || x >= xHolidayString.since) &&
+                            (!xHolidayString.until || x <= xHolidayString.until)
+                        ) {
+                            pvLoadDataPush(xHolidays, xKey, x + xMMDD);
+                        }
                     }
                 } else {
                     pvLoadDataPush(xHolidays, xKey, xHolidayString);
@@ -131,7 +136,7 @@ const dates = {
      * Isso posto:
      * Se feriado cair em um dia normalmente não útil(fim de semana), retornará false.
      * Para saber se é um dia útil considerando fim de semana, utilize isWorkingDay.
-     * @param {Date} pData
+     * @param {Date} pDate
      * @returns {boolean}
      */
     isHoliday: pDate => {

package/lib/utils/formats.js

@@ -293,7 +293,7 @@ module.exports = formats;
  * @param {*} pValue Valor a ser simplificado
  * @param {number} [pDecimals=2] Quantidade máxima de casas decimais
  * @param {boolean} [pShowCurrency=false] Se exibe o símbolo da moeda do país definido em formats.CURRENCY.
- * @returns Valor formatado de forma simplificada
+ * @returns {String} Valor formatado de forma simplificada
  */
 const pvSimplify = (pDIM, pValue, pDecimals = 2, pShowCurrency = false) => {
     const xOptions = {
@@ -330,5 +330,5 @@ const pvSimplify = (pDIM, pValue, pDecimals = 2, pShowCurrency = false) => {
     xValueInt *= xSign;
     //Configura formatação
 
-    return xValueInt.toLocaleString(formats.LOCALE, xOptions) + xSuf.trimRight();
+    return xValueInt.toLocaleString(formats.LOCALE, xOptions) + xSuf.trimEnd();
 };

package/lib/utils/numbers.js

@@ -17,7 +17,7 @@ const numbers = {
             return null;
         }
         const xP = Math.pow(10, pDecimals);
-        let xValue = Number(Math.round(pValue * xP));
+        let xValue = Number(Math.round(numbers.mul(pValue, xP)));
         xValue = Math[xValue < 0 ? 'ceil' : 'floor'](xValue);
         return xValue / xP;
     },
@@ -34,7 +34,7 @@ const numbers = {
             return null;
         }
         const xP = Math.pow(10, pDecimals);
-        let xValue = Number(pValue * xP);
+        let xValue = numbers.mul(pValue, xP);
         xValue = Math[xValue < 0 ? 'ceil' : 'floor'](xValue);
         return xValue / xP;
     },
@@ -313,14 +313,7 @@ const pvCalc = (pValue1, pValue2, pOperation) => {
     }
     const xValue1Str = numbers.apart(pValue1);
     const xValue2Str = numbers.apart(pValue2);
-    const xMaxInt = Math.max(xValue1Str.int.length, xValue2Str.int.length);
-    let xMaxDec = Math.max(xValue1Str.dec.length, xValue2Str.dec.length);
-    const xOver = xMaxInt + xMaxDec - PRECISION;
-    if (xOver > 0 && xMaxDec > xOver) {
-        xMaxDec -= xOver;
-        xValue1Str.dec = xValue1Str.dec.substring(0, xMaxDec);
-        xValue2Str.dec = xValue2Str.dec.substring(0, xMaxDec);
-    }
+    const xMaxDec = Math.max(xValue1Str.dec.length, xValue2Str.dec.length);
 
     //Como se estivesse multiplicando os valores por 10^xMaxDec,
     //mas concatena os zeros para evitar um possível residuo no cálculo

package/package.json

@@ -1,16 +1,16 @@
 {
     "name": "investira.sdk",
-    "version": "2.2.12",
+    "version": "2.2.15",
     "author": "Investira",
     "description": "Investira SDK",
     "main": "index.js",
     "type": "commonjs",
     "registry": true,
-    "raw": "investira.sdk@2.2.12",
+    "raw": "investira.sdk@2.2.15",
     "escapedName": "investira.sdk",
-    "rawSpec": "2.2.12",
+    "rawSpec": "2.2.15",
     "saveSpec": null,
-    "fetchSpec": "2.2.12",
+    "fetchSpec": "2.2.15",
     "homepage": "https://investira.com.br/",
     "engines": {
         "node": ">=11.11.0 <=14.17.5",
@@ -31,13 +31,14 @@
     },
     "scripts": {
         "start": "node ./lib/tests",
+        "debug": "nodemon ./lib/tests",
         "_test": "nodemon ./_tests/test"
     },
     "dependencies": {
         "axios": "0.25.0",
         "deep-diff": "1.0.2",
         "flatted": "3.2.2",
-        "investira.data": "^1.1.15",
+        "investira.data": "^1.2.2",
         "moment": "^2.29.4"
     },
     "devDependencies": {