@hyper.software/common-helpers 1.0.15 → 1.0.16

package/lib/helpers/moment.d.ts

@@ -1,3 +1,6 @@
+import baseMoment from 'moment';
+import 'moment/locale/de';
+import 'moment/locale/ro';
 export declare const DATE_FORMATS: {
     SHORT_DATE: string;
     LONG_DATE: string;
@@ -28,21 +31,10 @@ export interface IFormatDate {
     offset?: number;
     tz?: string;
 }
-export declare function formatDate({ date, locale, format, // equivalent to 'DAY_DATE' in luxon
-offset, tz, }: {
-    date: any;
-    locale?: string;
-    format?: string;
-    offset?: number;
-    tz?: string;
-}): any;
+export declare function formatDate({ date, locale, format, offset, tz, }: IFormatDate): string;
 export interface IGetDateWithTimezone {
     date: any;
     locale?: string;
     tz?: string;
 }
-export declare function getDateWithTimezone({ date, locale, tz }: {
-    date: any;
-    locale?: string;
-    tz?: string;
-}): any;
+export declare function getDateWithTimezone({ date, locale, tz }: IGetDateWithTimezone): baseMoment.Moment;

package/lib/helpers/moment.js

@@ -1,4 +1,8 @@
-import { DateTime } from 'luxon';
+import baseMoment from 'moment';
+import mtz from 'moment-timezone';
+import 'moment/locale/de';
+import 'moment/locale/ro';
+import { LANGUAGE } from '../interfaces';
 export var DATE_FORMATS = {
     SHORT_DATE: 'L',
     LONG_DATE: 'LL',
@@ -22,20 +26,54 @@ export var DATE_FORMATS = {
     YYYY_MM_DD: 'YYYY-MM-DD',
     CALENDAR_ICS: 'YYYY-MM-DD HH:mm:ss',
 };
-export function formatDate(_a) {
-    var date = _a.date, _b = _a.locale, locale = _b === void 0 ? 'en-US' : _b, _c = _a.format, format = _c === void 0 ? 'DDDD' : _c, // equivalent to 'DAY_DATE' in luxon
-    _d = _a.offset, // equivalent to 'DAY_DATE' in luxon
-    offset = _d === void 0 ? 0 : _d, _e = _a.tz, tz = _e === void 0 ? '' : _e;
-    var actualTimezone = tz || DateTime.local().zoneName;
-    var dateTime = DateTime.fromJSDate(date, { zone: actualTimezone, locale: locale });
-    if (offset !== 0) {
-        dateTime = dateTime.setZone('utc+0').plus({ hours: offset });
+var getCustomDateFormat = function (dateFormat, locale) {
+    if (locale === LANGUAGE.EN_US && dateFormat === DATE_FORMATS.DAY_MON_YEAR) {
+        return DATE_FORMATS.DAY_MON_YEAR;
+    }
+    if (locale === LANGUAGE.DE_DE && dateFormat === DATE_FORMATS.DAY_MON_YEAR) {
+        return 'DD. MMM YYYY';
+    }
+    if (locale === LANGUAGE.EN_US && dateFormat === DATE_FORMATS.DD_DAY_MON_YEAR) {
+        return DATE_FORMATS.DD_DAY_MON_YEAR;
+    }
+    if (locale === LANGUAGE.DE_DE && dateFormat === DATE_FORMATS.DD_DAY_MON_YEAR) {
+        return 'dd DD. MMM YYYY';
+    }
+    return null;
+};
+function getDate(date) {
+    if (Object.prototype.toString.call(date) === '[object Date]') {
+        return date;
     }
-    return dateTime.toFormat(format);
+    return new Date(date);
+}
+export function formatDate(_a) {
+    var date = _a.date, _b = _a.locale, locale = _b === void 0 ? LANGUAGE.EN_US : _b, _c = _a.format, format = _c === void 0 ? DATE_FORMATS.DAY_DATE : _c, _d = _a.offset, offset = _d === void 0 ? 0 : _d, _e = _a.tz, tz = _e === void 0 ? '' : _e;
+    mtz.locale(locale);
+    var actualTimezone = tz || Intl.DateTimeFormat().resolvedOptions().timeZone;
+    var dt = getDate(date);
+    var momentDate = mtz(dt);
+    var actualOffset = offset || momentDate.tz(actualTimezone).utcOffset() / 60;
+    return momentDate.utcOffset(actualOffset).format(getCustomDateFormat(format, locale) || format);
 }
 export function getDateWithTimezone(_a) {
     var date = _a.date, _b = _a.locale, locale = _b === void 0 ? 'en' : _b, _c = _a.tz, tz = _c === void 0 ? '' : _c;
-    var actualTimezone = tz || DateTime.local().zoneName;
-    return DateTime.fromJSDate(new Date(date), { zone: actualTimezone }).setLocale(locale);
+    mtz.locale(locale);
+    var actualTimezone = tz || Intl.DateTimeFormat().resolvedOptions().timeZone;
+    var dt = getDate(date);
+    var momentDate = mtz(dt);
+    return momentDate.tz(actualTimezone);
 }
+var copyLocaleData = function (source, dest) {
+    var installedLocales = dest.locales();
+    for (var _i = 0, _a = source.locales(); _i < _a.length; _i++) {
+        var locale = _a[_i];
+        if (!installedLocales.includes(locale)) {
+            var localeData = source.localeData(locale);
+            var localeSpec = localeData._config;
+            dest.defineLocale(locale, localeSpec);
+        }
+    }
+};
+copyLocaleData(baseMoment, mtz);
 //# sourceMappingURL=moment.js.map

package/lib/helpers/moment.js.map

@@ -1 +1 @@
-{"version":3,"file":"moment.js","sourceRoot":"","sources":["../../src/helpers/moment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,MAAM,CAAC,IAAM,YAAY,GAAG;IAC1B,UAAU,EAAE,GAAG;IACf,SAAS,EAAE,IAAI;IACf,oBAAoB,EAAE,KAAK;IAC3B,uBAAuB,EAAE,MAAM;IAC/B,IAAI,EAAE,IAAI;IACV,QAAQ,EAAE,UAAU;IACpB,cAAc,EAAE,QAAQ;IACxB,SAAS,EAAE,QAAQ;IACnB,mBAAmB,EAAE,WAAW;IAChC,aAAa,EAAE,eAAe;IAC9B,YAAY,EAAE,aAAa;IAC3B,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE,UAAU;IACpB,UAAU,EAAE,WAAW;IACvB,eAAe,EAAE,gBAAgB;IACjC,UAAU,EAAE,YAAY;IACxB,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,QAAQ;IAChB,UAAU,EAAE,YAAY;IACxB,YAAY,EAAE,qBAAqB;CACpC,CAAA;AASD,MAAM,UAAU,UAAU,CAAC,EAM1B;QALC,IAAI,UAAA,EACJ,cAAgB,EAAhB,MAAM,mBAAG,OAAO,KAAA,EAChB,cAAe,EAAf,MAAM,mBAAG,MAAM,KAAA,EAAE,oCAAoC;IACrD,cAAU,EADO,oCAAoC;IACrD,MAAM,mBAAG,CAAC,KAAA,EACV,UAAO,EAAP,EAAE,mBAAG,EAAE,KAAA;IAEP,IAAM,cAAc,GAAG,EAAE,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAA;IACtD,IAAI,QAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,QAAA,EAAE,CAAC,CAAA;IAE1E,IAAI,MAAM,KAAK,CAAC,EAAE;QAChB,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;KAC7D;IAED,OAAO,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;AAClC,CAAC;AAOD,MAAM,UAAU,mBAAmB,CAAC,EAAgC;QAA9B,IAAI,UAAA,EAAE,cAAa,EAAb,MAAM,mBAAG,IAAI,KAAA,EAAE,UAAO,EAAP,EAAE,mBAAG,EAAE,KAAA;IAChE,IAAM,cAAc,GAAG,EAAE,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAA;IACtD,OAAO,QAAQ,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;AACxF,CAAC"}
+{"version":3,"file":"moment.js","sourceRoot":"","sources":["../../src/helpers/moment.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyper.software/common-helpers",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "author": "Raul Tomescu <tomescu.raul+hyper@gmail.com>",
   "description": "Hyper Software Common Javascript Helpers",
   "main": "lib/index.js",
@@ -53,6 +53,8 @@
     "glob": "^10.3.10",
     "lodash.isequal": "^4.5.0",
     "luxon": "^3.4.3",
+    "moment": "2.29.4",
+    "moment-timezone": "0.5.43",
     "node-cache": "^5.1.2",
     "numeral": "^2.0.6",
     "prettier-eslint-cli": "^8.0.1",