@molopos/shared 2.0.55 → 2.0.56

package/date/index.d.ts

@@ -3,8 +3,8 @@ import { DateLike, Numberlike } from "../index";
 interface PropsRecurrence {
     date: Date;
     duration?: number;
-    recurrence: RecurrenceEnum;
     isRecurrence?: boolean;
+    recurrence: RecurrenceEnum;
 }
 /**
  * Format a date to a string

package/date/index.js

@@ -163,26 +163,24 @@ exports.subtractDaysToDateTime = subtractDaysToDateTime;
  * @example
  * recurrenceDate({ date: new Date(), recurrence: RecurrenceEnum.Monthly }) // 23/06/2026
  */
-const recurrenceDate = ({ date, recurrence, duration = 1, isRecurrence = true, }) => {
-    if (isRecurrence) {
-        const dateNow = (0, exports.dateTimeNowUtcUnixInteger)();
-        const dateInit = (0, exports.formateDateUnixInteger)(date);
-        const dateNowInit = dateInit > dateNow
-            ? luxon_1.DateTime.fromJSDate(date)
-            : luxon_1.DateTime.fromJSDate((0, exports.dateTimeNowUtc)());
-        switch (recurrence) {
-            case enum_1.RecurrenceEnum.Daily:
-                return dateNowInit.plus({ days: duration }).toJSDate();
-            case enum_1.RecurrenceEnum.Weekly:
-                return dateNowInit.plus({ weeks: duration }).toJSDate();
-            case enum_1.RecurrenceEnum.Monthly:
-                return dateNowInit.plus({ months: duration }).toJSDate();
-            case enum_1.RecurrenceEnum.Yearly:
-                return dateNowInit.plus({ years: duration }).toJSDate();
-        }
+const recurrenceDate = ({ date, recurrence, duration = 1, isRecurrence = false, }) => {
+    if (!isRecurrence) {
+        return null;
     }
-    else {
-        return date;
+    const dateNow = (0, exports.dateTimeNowUtcUnixInteger)();
+    const dateInit = (0, exports.formateDateUnixInteger)(date);
+    const dateNowInit = dateInit > dateNow
+        ? luxon_1.DateTime.fromJSDate(date)
+        : luxon_1.DateTime.fromJSDate((0, exports.dateTimeNowUtc)());
+    switch (recurrence) {
+        case enum_1.RecurrenceEnum.Daily:
+            return dateNowInit.plus({ days: duration }).toJSDate();
+        case enum_1.RecurrenceEnum.Weekly:
+            return dateNowInit.plus({ weeks: duration }).toJSDate();
+        case enum_1.RecurrenceEnum.Monthly:
+            return dateNowInit.plus({ months: duration }).toJSDate();
+        case enum_1.RecurrenceEnum.Yearly:
+            return dateNowInit.plus({ years: duration }).toJSDate();
     }
 };
 exports.recurrenceDate = recurrenceDate;

package/date/index.test.js

@@ -23,22 +23,26 @@ describe("Date", () => {
         expect(dateNow).not.toBeNull();
         expect(dateNow).toBeDefined();
     });
-    test("recurrenceDate", () => {
+    test("recurrenceDate isRecurrence = true", () => {
         const dateNow = (0, _1.dateTimeNowUtc)();
         const dateNextMonth = (0, _1.recurrenceDate)({
             date: dateNow,
+            isRecurrence: true,
             recurrence: enum_1.RecurrenceEnum.Monthly,
         });
         const dateNextYear = (0, _1.recurrenceDate)({
             date: dateNow,
+            isRecurrence: true,
             recurrence: enum_1.RecurrenceEnum.Yearly,
         });
         const dateNextWeek = (0, _1.recurrenceDate)({
             date: dateNow,
+            isRecurrence: true,
             recurrence: enum_1.RecurrenceEnum.Weekly,
         });
         const dateNextDay = (0, _1.recurrenceDate)({
             date: dateNow,
+            isRecurrence: true,
             recurrence: enum_1.RecurrenceEnum.Daily,
         });
         expect(dateNextDay).not.toBeNull();
@@ -50,4 +54,27 @@ describe("Date", () => {
         expect(dateNextMonth).toBeDefined();
         expect(dateNextWeek).toBeDefined();
     });
+    test("recurrenceDate isRecurrence = false", () => {
+        const dateNow = (0, _1.dateTimeNowUtc)();
+        const dateNextMonth = (0, _1.recurrenceDate)({
+            date: dateNow,
+            recurrence: enum_1.RecurrenceEnum.Monthly,
+        });
+        const dateNextYear = (0, _1.recurrenceDate)({
+            date: dateNow,
+            recurrence: enum_1.RecurrenceEnum.Yearly,
+        });
+        const dateNextWeek = (0, _1.recurrenceDate)({
+            date: dateNow,
+            recurrence: enum_1.RecurrenceEnum.Weekly,
+        });
+        const dateNextDay = (0, _1.recurrenceDate)({
+            date: dateNow,
+            recurrence: enum_1.RecurrenceEnum.Daily,
+        });
+        expect(dateNextMonth).toBeNull();
+        expect(dateNextYear).toBeNull();
+        expect(dateNextWeek).toBeNull();
+        expect(dateNextDay).toBeNull();
+    });
 });

package/package.json

@@ -1 +1 @@
-{"name":"@molopos/shared","publishConfig":{"access":"public"},"version":"2.0.55","description":"Shared between backend and frontend repos","license":"ISC","repository":{"type":"git","url":"https://github.com/unicubate/molopos-shared.git"},"dependencies":{"class-transformer":"^0.5.1","date-fns":"^4.4.0","luxon":"^3.7.2"}}
+{"name":"@molopos/shared","publishConfig":{"access":"public"},"version":"2.0.56","description":"Shared between backend and frontend repos","license":"ISC","repository":{"type":"git","url":"https://github.com/unicubate/molopos-shared.git"},"dependencies":{"class-transformer":"^0.5.1","date-fns":"^4.4.0","luxon":"^3.7.2"}}