investira.sdk 2.2.10 → 2.2.13

package/CHANGELOG.md

@@ -429,3 +429,15 @@ O contrutor para a criação das mensagem foi alterado.
 # 2.2.10
 
 -   [moment] Atualização da versão "2.24.0" versão para "2.29.4"
+
+# 2.2.11
+
+-   [investira.data] Atualização
+
+# 2.2.12
+
+-   [investira.data] Atualização
+
+# 2.2.13
+
+-   [investira.data] Controle de vigência do feriado

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();
@@ -131,13 +131,13 @@ test('\ndates workingDaysBetween', t => {
     t.equal(dates.workingDaysBetween(xData1, xData2), 1);
     xData1 = dates.toDate('1995-12-31');
     xData2 = dates.toDate('2018-12-31');
-    t.equal(dates.workingDaysBetween(xData1, xData2), 5774);
+    t.equal(dates.workingDaysBetween(xData1, xData2), 5775);
     xData1 = dates.toDate('1995-01-01');
     xData2 = dates.toDate('2018-12-31');
-    t.equal(dates.workingDaysBetween(xData1, xData2), 6022);
+    t.equal(dates.workingDaysBetween(xData1, xData2), 6023);
     xData1 = dates.toDate('1995-01-03');
     xData2 = dates.toDate('2070-01-03');
-    t.equal(dates.workingDaysBetween(xData1, xData2), 18835);
+    t.equal(dates.workingDaysBetween(xData1, xData2), 18836);
     xData1 = dates.toDate('2019-08-05');
     xData2 = dates.toDate('2019-08-04');
     t.equal(dates.workingDaysBetween(xData1, xData2), 0);

package/lib/tests/test_formats.js

@@ -14,26 +14,26 @@ test('\nformats.formatPhone', t => {
 });
 
 test('\nformats.friendlyNumber', t => {
-    t.equal(formats.friendlyNumber(123, 0, true), 'R$123');
+    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$ 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$ 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(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$ 0,91');
     t.end();
 });
 

package/lib/utils/dates.js

@@ -50,11 +50,17 @@ 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)
+                        ) {
+                            xHolidayString = x + xMMDD;
+                            pvLoadDataPush(xHolidays, xKey, xHolidayString);
+                        }
                     }
                 } else {
                     pvLoadDataPush(xHolidays, xKey, xHolidayString);

package/package.json

@@ -1,16 +1,16 @@
 {
     "name": "investira.sdk",
-    "version": "2.2.10",
+    "version": "2.2.13",
     "author": "Investira",
     "description": "Investira SDK",
     "main": "index.js",
     "type": "commonjs",
     "registry": true,
-    "raw": "investira.sdk@2.2.10",
+    "raw": "investira.sdk@2.2.13",
     "escapedName": "investira.sdk",
-    "rawSpec": "2.2.10",
+    "rawSpec": "2.2.13",
     "saveSpec": null,
-    "fetchSpec": "2.2.10",
+    "fetchSpec": "2.2.13",
     "homepage": "https://investira.com.br/",
     "engines": {
         "node": ">=11.11.0 <=14.17.5",
@@ -37,7 +37,7 @@
         "axios": "0.25.0",
         "deep-diff": "1.0.2",
         "flatted": "3.2.2",
-        "investira.data": "^1.1.13",
+        "investira.data": "^1.2.0",
         "moment": "^2.29.4"
     },
     "devDependencies": {