investira.sdk 2.3.21 → 2.3.22

package/CHANGELOG.md

@@ -537,3 +537,7 @@ O contrutor para a criação das mensagem foi alterado.
 # 2.3.20
 
 -   [tasks] Substituido this por self
+
+# 2.3.22
+
+-   [dates] scheduleToDate com seleção do dia da semana, no tipo 'M' e 'Y'.

package/lib/utils/dates.js

@@ -769,8 +769,12 @@ const dates = {
         //Ajusta datafim: Se dia inicial for maior que dia final,
         //indica que próximo tem um total de dias menor que o atual.
         //Adiciona 1 dia para considerar integralmente próximo mês.
-        if (pDate.getUTCDate() > xDataFim.getUTCDate()) {
-            xDataFim = dates.addDays(xDataFim, 1);
+        try {
+            if (pDate.getUTCDate() > xDataFim.getUTCDate()) {
+                xDataFim = dates.addDays(xDataFim, 1);
+            }
+        } catch (rErr) {
+            // console.log(rErr);
         }
         return xDataFim;
     },
@@ -874,7 +878,7 @@ const dates = {
      */
     dateToObject: pDate => {
         if (!isDate(pDate)) {
-            throw Error('dateToObject: invalid date');
+            throw Error(`dateToObject: invalid date ${pDate}`);
         }
         return {
             year: String(pDate.getFullYear()),
@@ -923,95 +927,119 @@ const dates = {
      * @returns {Date} Próxima Data
      */
     scheduleToDate: (pSchedule, pBaseDate = null) => {
-        if (
-            !pSchedule ||
-            !pSchedule.type ||
-            !pSchedule.time ||
-            !dates.SCHEDULE_TYPE.includes(pSchedule.type) ||
-            !dates.isTime(pSchedule.time)
-        ) {
-            throw Error('scheduleToDate: parameters not informed');
-        }
-        const xCurrentDate = pBaseDate || dates.toDate();
-        const xNow = dates.dateToObject(xCurrentDate);
-
-        let xNextDate = null;
-        pSchedule.type = pSchedule.type.toUpperCase();
-        if (pSchedule.type === 'D') {
-            xNextDate = dates.toDate(`${xNow.year}${xNow.month}${xNow.day}${pSchedule.time}`, SCHEDULE_FORMAT);
-            if (xNextDate < xCurrentDate) {
-                //Incrementa um dia
-                xNextDate = dates.addDays(xNextDate, 1);
+        try {
+            if (
+                !pSchedule ||
+                !pSchedule.type ||
+                !pSchedule.time ||
+                !dates.SCHEDULE_TYPE.includes(pSchedule.type) ||
+                !dates.isTime(pSchedule.time)
+            ) {
+                throw Error('scheduleToDate: parameters not informed');
             }
-        } else if (pSchedule.type === 'W') {
-            if (!pSchedule.weekday) {
-                pSchedule.weekday = 0;
-            } else {
-                const xWeekday = numbers.toNumber(pSchedule.weekday);
-                if (xWeekday === null || xWeekday < 0 || xWeekday > 6) {
-                    throw Error('scheduleToDate: invalid weekday');
+            const xCurrentDate = pBaseDate || dates.toDate();
+            const xNow = dates.dateToObject(xCurrentDate);
+
+            let xNextDate = null;
+            pSchedule.type = pSchedule.type.toUpperCase();
+            if (pSchedule.type === 'D') {
+                xNextDate = dates.toDate(`${xNow.year}${xNow.month}${xNow.day}${pSchedule.time}`, SCHEDULE_FORMAT);
+                if (!xNextDate) {
+                    return null;
                 }
-            }
-            let xDif = pSchedule.weekday - xCurrentDate.getDay();
-            //Adiciona os dias até ser o dia da semana desejado
-            if (xDif < 0) {
-                xDif = 7 - Math.abs(xDif);
-            }
-            xNextDate = dates.addDays(xCurrentDate, xDif);
-            // const xNextDataObject = dates.dateToObject(new Date(xNextDate.tl()));
-            xNextDate = dates.toDate(
-                `${xNextDate.getFullYear()}${String(xNextDate.getMonth() + 1).padStart(2, '0')}${String(
-                    xNextDate.getDate()
-                ).padStart(2, '0')}${pSchedule.time}`,
-                SCHEDULE_FORMAT
-            );
-            //Adiciona uma semana se data já tiver passado
-            if (xNextDate < xCurrentDate) {
-                //Incrementa uma semana
-                xNextDate = dates.addDays(xNextDate, 7);
-            }
-        } else if (pSchedule.type === 'M') {
-            if (!pSchedule.day) {
-                pSchedule.day = 1;
-            }
-            let xNextDay = numbers.toNumber(pSchedule.day);
-            if (xNextDay === null || xNextDay < 0 || (xNextDay > 31 && xNextDay !== 99)) {
-                throw Error('scheduleToDate: invalid day');
-            }
-            xNextDay = ('0' + xNextDay).slice(-2);
-            xNextDate = dates.toDate(`${xNow.year}${xNow.month}${xNextDay}${pSchedule.time}`, SCHEDULE_FORMAT);
-            // @ts-ignore
-            if (xNextDay === 99 || isNaN(xNextDate)) {
-                const xTmpDate = dates.dateToObject(dates.endOf('month', xCurrentDate));
+                if (xNextDate < xCurrentDate) {
+                    //Incrementa um dia
+                    xNextDate = dates.addDays(xNextDate, 1);
+                }
+            } else if (pSchedule.type === 'W') {
+                if (!pSchedule.weekday) {
+                    pSchedule.weekday = 0;
+                } else {
+                    const xWeekday = numbers.toNumber(pSchedule.weekday);
+                    if (xWeekday === null || xWeekday < 0 || xWeekday > 6) {
+                        throw Error('scheduleToDate: invalid weekday');
+                    }
+                }
+                let xDif = pSchedule.weekday - xCurrentDate.getDay();
+                //Adiciona os dias até ser o dia da semana desejado
+                if (xDif < 0) {
+                    xDif = 7 - Math.abs(xDif);
+                }
+                xNextDate = dates.addDays(xCurrentDate, xDif);
+                if (!xNextDate) {
+                    return null;
+                }
+                // const xNextDataObject = dates.dateToObject(new Date(xNextDate.tl()));
                 xNextDate = dates.toDate(
-                    `${xTmpDate.year}${xTmpDate.month}${xTmpDate.day}${pSchedule.time}`,
+                    `${xNextDate.getFullYear()}${String(xNextDate.getMonth() + 1).padStart(2, '0')}${String(
+                        xNextDate.getDate()
+                    ).padStart(2, '0')}${pSchedule.time}`,
                     SCHEDULE_FORMAT
                 );
+                //Adiciona uma semana se data já tiver passado
+                if (xNextDate < xCurrentDate) {
+                    //Incrementa uma semana
+                    xNextDate = dates.addDays(xNextDate, 7);
+                }
+            } else if (pSchedule.type === 'M') {
+                if (!pSchedule.day) {
+                    pSchedule.day = 1;
+                }
+                let xNextDay = numbers.toNumber(pSchedule.day);
+                if (xNextDay === null || xNextDay < 0 || (xNextDay > 31 && xNextDay !== 99)) {
+                    throw Error('scheduleToDate: invalid day');
+                }
+                xNextDay = ('0' + xNextDay).slice(-2);
+                xNextDate = dates.toDate(`${xNow.year}${xNow.month}${xNextDay}${pSchedule.time}`, SCHEDULE_FORMAT);
+                if (!xNextDate) {
+                    return null;
+                }
+                // @ts-ignore
+                if (xNextDay === 99 || isNaN(xNextDate)) {
+                    const xTmpDate = dates.dateToObject(dates.endOf('month', xCurrentDate));
+                    xNextDate = dates.toDate(
+                        `${xTmpDate.year}${xTmpDate.month}${xTmpDate.day}${pSchedule.time}`,
+                        SCHEDULE_FORMAT
+                    );
+                }
+                if (xNextDate < xCurrentDate) {
+                    //Incrementa um mês
+                    xNextDate = dates.nextMonthAnniversary(xNextDate);
+                }
+                //Se dia da semana estive configurado, ajusta data para o dia da semana informado
+                if (pSchedule.weekday) {
+                    xNextDate = dates.scheduleToDate({ ...pSchedule, type: 'W' }, xNextDate);
+                }
+            } else if (pSchedule.type === 'Y') {
+                if (!pSchedule.month) {
+                    pSchedule.month = 1;
+                }
+                let xNextMonth = numbers.toNumber(pSchedule.month);
+                if (xNextMonth === null || xNextMonth < 0 || xNextMonth > 12) {
+                    throw Error('scheduleToDate: invalid month');
+                }
+                xNextMonth = ('0' + xNextMonth).slice(-2);
+                //Calcula data do primeiro dia no mês/ano selecionado
+                xNextDate = dates.toDate(`${xNow.year}${xNextMonth}${'01'}${pSchedule.time}`, SCHEDULE_FORMAT);
+                if (!xNextDate) {
+                    return null;
+                }
+                if (xNextDate < xCurrentDate) {
+                    //Incrementa um ano
+                    xNextDate = dates.addYears(xNextDate, 1);
+                }
+                //Se dia da semana estive configurado, ajusta data para o dia da semana informado
+                if (pSchedule.weekday) {
+                    xNextDate = dates.scheduleToDate({ ...pSchedule, type: 'W' }, xNextDate);
+                }
             }
-            if (xNextDate < xCurrentDate) {
-                //Incrementa um mês
-                xNextDate = dates.nextMonthAnniversary(xNextDate);
-            }
-        } else if (pSchedule.type === 'Y') {
-            if (!pSchedule.month) {
-                pSchedule.month = 1;
-            }
-            let xNextMonth = numbers.toNumber(pSchedule.month);
-            if (xNextMonth === null || xNextMonth < 0 || xNextMonth > 12) {
-                throw Error('scheduleToDate: invalid month');
-            }
-            xNextMonth = ('0' + xNextMonth).slice(-2);
-            //Calcula data do primeiro dia no mês/ano selecionado
-            xNextDate = dates.toDate(`${xNow.year}${xNextMonth}${'01'}${pSchedule.time}`, SCHEDULE_FORMAT);
-            if (xNextDate < xCurrentDate) {
-                //Incrementa um ano
-                xNextDate = dates.addYears(xNextDate, 1);
+            if (pSchedule.workingDay) {
+                xNextDate = dates.addWorkingDays(xNextDate, 0);
             }
+            return xNextDate;
+        } catch (rErr) {
+            console.log(rErr);
         }
-        if (pSchedule.workingDay) {
-            xNextDate = dates.addWorkingDays(xNextDate, 0);
-        }
-        return xNextDate;
     },
     /**
      * Retorna inteiro relativo a semana do mês

package/lib/utils/formats.js

@@ -63,7 +63,7 @@ const formats = {
      * @param {number} pValue Elemento a ser verificado
      * @param {number} [pDecimalPlaces=0] Quantidade de casas decimais
      * @param {boolean} [pShowCurrency=false] Se exibe o símbolo da moeda do país definido em formats.CURRENCY.
-     * @param {string} [pBase=null] Base
+     * @param {string} [pBase=null] Base. Fixa a base 'mil', 'mi', 'bi', 'tri', 'quatri', 'quint', 'sext'
      * @return {string} Número formatado
      */
     friendlyNumber: (pValue, pDecimalPlaces = 0, pShowCurrency = false, pBase = null) => {

package/package.json

@@ -1,16 +1,16 @@
 {
     "name": "investira.sdk",
-    "version": "2.3.21",
+    "version": "2.3.22",
     "author": "Investira",
     "description": "Investira SDK",
     "main": "index.js",
     "type": "commonjs",
     "registry": true,
-    "raw": "investira.sdk@2.3.21",
+    "raw": "investira.sdk@2.3.22",
     "escapedName": "investira.sdk",
-    "rawSpec": "2.3.21",
+    "rawSpec": "2.3.22",
     "saveSpec": null,
-    "fetchSpec": "2.3.21",
+    "fetchSpec": "2.3.22",
     "homepage": "https://investira.com.br/",
     "engines": {
         "node": ">=11.11.0 <=18.12",