@molopos/shared 2.0.56 → 2.0.58

package/date/index.d.ts

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

package/date/index.js

@@ -167,11 +167,18 @@ const recurrenceDate = ({ date, recurrence, duration = 1, isRecurrence = false,
     if (!isRecurrence) {
         return null;
     }
-    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)());
+    const dateNowUnix = (0, exports.dateTimeNowUtcUnixInteger)();
+    const dateUnix = (0, exports.formateDateUnixInteger)(date);
+    const isFutureDate = dateUnix > dateNowUnix;
+    const preservesDay = recurrence === enum_1.RecurrenceEnum.Monthly ||
+        recurrence === enum_1.RecurrenceEnum.Yearly;
+    const dateNowInit = preservesDay
+        ? 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();

package/date/index.test.js

@@ -58,18 +58,22 @@ describe("Date", () => {
         const dateNow = (0, _1.dateTimeNowUtc)();
         const dateNextMonth = (0, _1.recurrenceDate)({
             date: dateNow,
+            isRecurrence: false,
             recurrence: enum_1.RecurrenceEnum.Monthly,
         });
         const dateNextYear = (0, _1.recurrenceDate)({
             date: dateNow,
+            isRecurrence: false,
             recurrence: enum_1.RecurrenceEnum.Yearly,
         });
         const dateNextWeek = (0, _1.recurrenceDate)({
             date: dateNow,
+            isRecurrence: false,
             recurrence: enum_1.RecurrenceEnum.Weekly,
         });
         const dateNextDay = (0, _1.recurrenceDate)({
             date: dateNow,
+            isRecurrence: false,
             recurrence: enum_1.RecurrenceEnum.Daily,
         });
         expect(dateNextMonth).toBeNull();

package/enum/index.d.ts

@@ -318,3 +318,13 @@ export declare enum RecurrenceEnum {
     Monthly = "MONTHLY",
     Yearly = "YEARLY"
 }
+/**
+ * Provider enum
+ */
+export declare enum ProviderEnum {
+    Apple = "APPLE",
+    Google = "GOOGLE",
+    Github = "GITHUB",
+    Facebook = "FACEBOOK",
+    Microsoft = "MICROSOFT"
+}

package/enum/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RecurrenceEnum = exports.UploadFolderEnum = exports.SectionStatusEnum = exports.StatusEnum = exports.QuoteStatusEnum = exports.PricingTypeEnum = exports.UserStatusEnum = exports.ApplicationSectionModuleEnum = exports.PagesProviderEnum = exports.PrivatePublicEnum = exports.StatusQuoteItemEnum = exports.ContributorRoleEnum = exports.QuoteSignedViewEnum = exports.CurrencyEnum = exports.ExportExtEnum = exports.SortOrderEnum = exports.BooleanStringEnum = exports.TransactionModelEnum = exports.TransactionDirectionEnum = exports.ActivityModelEnum = exports.QueryTypeEnum = exports.ProductTypeEnum = exports.PaymentMethodEnum = exports.DiscountTypeEnum = exports.CustomerTypeEnum = void 0;
+exports.ProviderEnum = exports.RecurrenceEnum = exports.UploadFolderEnum = exports.SectionStatusEnum = exports.StatusEnum = exports.QuoteStatusEnum = exports.PricingTypeEnum = exports.UserStatusEnum = exports.ApplicationSectionModuleEnum = exports.PagesProviderEnum = exports.PrivatePublicEnum = exports.StatusQuoteItemEnum = exports.ContributorRoleEnum = exports.QuoteSignedViewEnum = exports.CurrencyEnum = exports.ExportExtEnum = exports.SortOrderEnum = exports.BooleanStringEnum = exports.TransactionModelEnum = exports.TransactionDirectionEnum = exports.ActivityModelEnum = exports.QueryTypeEnum = exports.ProductTypeEnum = exports.PaymentMethodEnum = exports.DiscountTypeEnum = exports.CustomerTypeEnum = void 0;
 /**
  * Customer type enum
  */
@@ -346,3 +346,14 @@ var RecurrenceEnum;
     RecurrenceEnum["Monthly"] = "MONTHLY";
     RecurrenceEnum["Yearly"] = "YEARLY";
 })(RecurrenceEnum || (exports.RecurrenceEnum = RecurrenceEnum = {}));
+/**
+ * Provider enum
+ */
+var ProviderEnum;
+(function (ProviderEnum) {
+    ProviderEnum["Apple"] = "APPLE";
+    ProviderEnum["Google"] = "GOOGLE";
+    ProviderEnum["Github"] = "GITHUB";
+    ProviderEnum["Facebook"] = "FACEBOOK";
+    ProviderEnum["Microsoft"] = "MICROSOFT";
+})(ProviderEnum || (exports.ProviderEnum = ProviderEnum = {}));

package/package.json

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