@molopos/shared 2.0.57 → 2.0.60

package/date/index.js

@@ -167,11 +167,16 @@ const recurrenceDate = ({ date, recurrence, duration = 1, isRecurrence = false,
     if (!isRecurrence) {
         return null;
     }
-    const dateNow = (0, exports.dateTimeNowUtcUnixInteger)();
-    const dateFromRecurrence = (0, exports.formateDateUnixInteger)(date);
-    const dateNowInit = dateFromRecurrence > dateNow
-        ? luxon_1.DateTime.fromJSDate(date)
-        : luxon_1.DateTime.fromJSDate((0, exports.dateTimeNowUtc)());
+    const dateNowUnix = (0, exports.dateTimeNowUtcUnixInteger)();
+    const dateUnix = (0, exports.formateDateUnixInteger)(date);
+    const isFutureDate = dateUnix > dateNowUnix;
+    const dateNowInit = recurrence === enum_1.RecurrenceEnum.Monthly
+        ? isFutureDate
+            ? luxon_1.DateTime.fromJSDate(date)
+            : luxon_1.DateTime.fromJSDate((0, exports.dateTimeNowUtc)()).set({ day: date.getDate() })
+        : isFutureDate
+            ? 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();
@@ -179,8 +184,20 @@ const recurrenceDate = ({ date, recurrence, duration = 1, isRecurrence = false,
             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();
+        case enum_1.RecurrenceEnum.Yearly: {
+            if (isFutureDate) {
+                return dateNowInit.plus({ years: duration }).toJSDate();
+            }
+            const now = luxon_1.DateTime.fromJSDate((0, exports.dateTimeNowUtc)());
+            let nextOccurrence = now.set({
+                month: date.getMonth() + 1,
+                day: date.getDate(),
+            });
+            if (nextOccurrence.toUnixInteger() <= dateNowUnix) {
+                nextOccurrence = nextOccurrence.plus({ years: duration });
+            }
+            return nextOccurrence.toJSDate();
+        }
     }
 };
 exports.recurrenceDate = recurrenceDate;

package/date/index.test.js

@@ -3,28 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const _1 = require(".");
 const enum_1 = require("../enum");
 describe("Date", () => {
-    test("dateTimeNowUtc", () => {
+    it("dateTimeNowUtc", () => {
         const dateNow = (0, _1.dateTimeNowUtc)();
         expect(dateNow).not.toBeNull();
         expect(dateNow).toBeDefined();
     });
-    test("dateTimeNowUtcUnixInteger", () => {
+    it("dateTimeNowUtcUnixInteger", () => {
         const dateNow = (0, _1.dateTimeNowUtcUnixInteger)();
         expect(dateNow).not.toBeNull();
         expect(dateNow).toBeDefined();
     });
-    test("formateDateUnixInteger", () => {
+    it("formateDateUnixInteger", () => {
         const dateNow = (0, _1.formateDateUnixInteger)(new Date());
         expect(dateNow).not.toBeNull();
         expect(dateNow).toBeDefined();
     });
-    test("subtractDaysToDateTimeNowUtc", () => {
+    it("subtractDaysToDateTimeNowUtc", () => {
         const dateNow = (0, _1.subtractDaysToDateTimeNowUtc)(1);
         expect(dateNow).not.toBeNull();
         expect(dateNow).toBeDefined();
     });
-    test("recurrenceDate isRecurrence = true", () => {
-        const dateNow = (0, _1.dateTimeNowUtc)();
+    it("recurrenceDate isRecurrence = true", () => {
+        const dateNow = new Date("2024-08-05T00:00:00.000Z");
         const dateNextMonth = (0, _1.recurrenceDate)({
             date: dateNow,
             isRecurrence: true,
@@ -54,7 +54,7 @@ describe("Date", () => {
         expect(dateNextMonth).toBeDefined();
         expect(dateNextWeek).toBeDefined();
     });
-    test("recurrenceDate isRecurrence = false", () => {
+    it("recurrenceDate isRecurrence = false", () => {
         const dateNow = (0, _1.dateTimeNowUtc)();
         const dateNextMonth = (0, _1.recurrenceDate)({
             date: dateNow,

package/package.json

@@ -1 +1 @@
-{"name":"@molopos/shared","publishConfig":{"access":"public"},"version":"2.0.57","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.60","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"}}