@molopos/shared 2.1.0 → 2.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/date/index.d.ts +1 -1
  2. package/date/index.js +9 -11
  3. package/package.json +1 -1
package/date/index.d.ts CHANGED
@@ -6,6 +6,7 @@ interface PropsRecurrence {
6
6
  isRecurrence: boolean;
7
7
  recurrence: RecurrenceEnum;
8
8
  }
9
+ export declare const dateTimeNowUtc: () => Date;
9
10
  /**
10
11
  * @example
11
12
  * formateDate("2026-01-01", "en-US"); // "1 Jan 2026 00:00"
@@ -36,7 +37,6 @@ export declare const formatDateFnsToDdMMYYYY: (date: Date) => string;
36
37
  * formatDateFnsToDdMMYYYYHHmmss("2026-01-01"); // "01-01-2026 00:00:00"
37
38
  */
38
39
  export declare const formatDateFnsToDdMMYYYYHHmm: (date: Date) => string;
39
- export declare const dateTimeNowUtc: () => Date;
40
40
  /**
41
41
  * @example
42
42
  * formateToyyyy("2026-01-01"); // 2026
package/date/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.recurrenceDate = exports.formateDateUnixInteger = exports.dateTimeNowUtcUnixInteger = exports.addDaysToTimeNowUtcDate = exports.formateToyyyy = exports.dateTimeNowUtc = exports.formatDateFnsToDdMMYYYYHHmm = exports.formatDateFnsToDdMMYYYY = exports.formatDateDDMMYYToUtc = exports.formateHHmm = exports.formateddLLLyyyy = exports.formateDate = void 0;
3
+ exports.recurrenceDate = exports.formateDateUnixInteger = exports.dateTimeNowUtcUnixInteger = exports.addDaysToTimeNowUtcDate = exports.formateToyyyy = exports.formatDateFnsToDdMMYYYYHHmm = exports.formatDateFnsToDdMMYYYY = exports.formatDateDDMMYYToUtc = exports.formateHHmm = exports.formateddLLLyyyy = exports.formateDate = exports.dateTimeNowUtc = void 0;
4
4
  const date_fns_1 = require("date-fns");
5
5
  const locale_1 = require("date-fns/locale");
6
6
  const enum_1 = require("../enum");
@@ -9,16 +9,20 @@ const dataFnsLocale = {
9
9
  ru: locale_1.ru,
10
10
  it: locale_1.it,
11
11
  fr: locale_1.fr,
12
- en: locale_1.enUS,
12
+ en: locale_1.enGB,
13
+ enUS: locale_1.enUS,
13
14
  de: locale_1.de,
14
15
  };
16
+ const dateTimeNowUtc = () => new Date();
17
+ exports.dateTimeNowUtc = dateTimeNowUtc;
15
18
  /**
16
19
  * @example
17
20
  * formateDate("2026-01-01", "en-US"); // "1 Jan 2026 00:00"
18
21
  */
19
22
  const formateDate = (date, locale) => {
20
- const formatString = locale !== "en" ? "dd MMM p" : "MMM dd p";
21
- return (0, date_fns_1.format)(date, (0, date_fns_1.isThisYear)(date) ? formatString : "P", {
23
+ const localeFormat = locale !== "en" ? "dd MMM p" : "MMM dd, p";
24
+ const isYearControle = (0, date_fns_1.getYear)((0, exports.dateTimeNowUtc)()) >= (0, date_fns_1.getYear)(date);
25
+ return (0, date_fns_1.format)(date, isYearControle ? localeFormat : "P", {
22
26
  locale: dataFnsLocale[locale],
23
27
  });
24
28
  };
@@ -57,8 +61,6 @@ exports.formatDateFnsToDdMMYYYY = formatDateFnsToDdMMYYYY;
57
61
  */
58
62
  const formatDateFnsToDdMMYYYYHHmm = (date) => (0, date_fns_1.format)(date, "dd-MM-yyyy HH:mm");
59
63
  exports.formatDateFnsToDdMMYYYYHHmm = formatDateFnsToDdMMYYYYHHmm;
60
- const dateTimeNowUtc = () => new Date();
61
- exports.dateTimeNowUtc = dateTimeNowUtc;
62
64
  /**
63
65
  * @example
64
66
  * formateToyyyy("2026-01-01"); // 2026
@@ -117,11 +119,7 @@ const recurrenceDate = ({ date, recurrence, duration = 1, isRecurrence = false,
117
119
  if (isFutureDate) {
118
120
  return (0, date_fns_1.addYears)(dateNowInit, duration);
119
121
  }
120
- const now = (0, exports.dateTimeNowUtc)();
121
- let nextOccurrence = (0, date_fns_1.set)(now, {
122
- month: dateInit.getMonth(),
123
- date: dateInit.getDate(),
124
- });
122
+ let nextOccurrence = (0, date_fns_1.addYears)(dateInit, duration);
125
123
  if ((0, exports.formateDateUnixInteger)(nextOccurrence) <= dateNowUnix) {
126
124
  nextOccurrence = (0, date_fns_1.addYears)(nextOccurrence, duration);
127
125
  }
package/package.json CHANGED
@@ -1 +1 @@
1
- {"name":"@molopos/shared","publishConfig":{"access":"public"},"version":"2.1.0","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"}}
1
+ {"name":"@molopos/shared","publishConfig":{"access":"public"},"version":"2.1.1","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"}}