@ptsecurity/mosaic 13.7.1 → 13.9.0

package/fesm2015/ptsecurity-mosaic-core.mjs

@@ -933,13 +933,13 @@ class DateFormatter {
      * @param datetime - should time be shown as well
      * @param seconds - should time with seconds be shown as well
      * @param milliseconds - should time with milliseconds be shown as well
-     * @returns absolute date in common format
+     * @param currYear - should current year be shown as well
      */
-    absoluteDate(date, params, datetime = false, seconds = false, milliseconds = false) {
+    absoluteDate(date, params, datetime = false, seconds = false, milliseconds = false, currYear = false) {
         if (!this.adapter.isDateInstance(date)) {
             throw new Error(this.invalidDateErrorText);
         }
-        const variables = this.compileVariables(date, Object.assign(Object.assign({}, this.adapter.config.variables), params.variables));
+        const variables = this.compileVariables(date, Object.assign(Object.assign({}, this.adapter.config.variables), params.variables), currYear);
         variables.SHOW_SECONDS = seconds ? 'yes' : 'no';
         variables.SHOW_MILLISECONDS = milliseconds ? 'yes' : 'no';
         const template = datetime ? params.DATETIME : params.DATE;
@@ -947,10 +947,11 @@ class DateFormatter {
     }
     /**
      * @param date - date
+     * @param currYear - should the year be shown forced
      * @returns absolute date in short format
      */
-    absoluteShortDate(date) {
-        return this.absoluteDate(date, this.config.absoluteTemplates.short);
+    absoluteShortDate(date, currYear = false) {
+        return this.absoluteDate(date, this.config.absoluteTemplates.short, false, false, false, currYear);
     }
     /**
      * @param date - date
@@ -958,14 +959,15 @@ class DateFormatter {
      * @returns absolute date in short format with time
      */
     absoluteShortDateTime(date, options) {
-        return this.absoluteDate(date, this.config.absoluteTemplates.short, true, options === null || options === void 0 ? void 0 : options.seconds, options === null || options === void 0 ? void 0 : options.milliseconds);
+        return this.absoluteDate(date, this.config.absoluteTemplates.short, true, options === null || options === void 0 ? void 0 : options.seconds, options === null || options === void 0 ? void 0 : options.milliseconds, options === null || options === void 0 ? void 0 : options.currYear);
     }
     /**
      * @param date - date
+     * @param currYear - should the year be shown forced
      * @returns absolute date in long format
      */
-    absoluteLongDate(date) {
-        return this.absoluteDate(date, this.config.absoluteTemplates.long);
+    absoluteLongDate(date, currYear = false) {
+        return this.absoluteDate(date, this.config.absoluteTemplates.long, false, false, false, currYear);
     }
     /**
      * @param date - date
@@ -973,7 +975,7 @@ class DateFormatter {
      * @returns absolute date in long format with time
      */
     absoluteLongDateTime(date, options) {
-        return this.absoluteDate(date, this.config.absoluteTemplates.long, true, options === null || options === void 0 ? void 0 : options.seconds, options === null || options === void 0 ? void 0 : options.milliseconds);
+        return this.absoluteDate(date, this.config.absoluteTemplates.long, true, options === null || options === void 0 ? void 0 : options.seconds, options === null || options === void 0 ? void 0 : options.milliseconds, options === null || options === void 0 ? void 0 : options.currYear);
     }
     /**
      * @param startDate - start date
@@ -1135,7 +1137,13 @@ class DateFormatter {
     rangeMiddleDateTime(startDate, endDate, options) {
         return this.rangeDateTime(startDate, endDate, this.config.rangeTemplates.closedRange.middle, options === null || options === void 0 ? void 0 : options.seconds, options === null || options === void 0 ? void 0 : options.milliseconds);
     }
-    compileVariables(date, variables) {
+    /**
+     * @param date
+     * @param variables - date template variables
+     * @param currYearForced - param for absolute days formatting
+     * @private
+     */
+    compileVariables(date, variables, currYearForced = false) {
         const compiledVariables = {};
         // tslint:disable-next-line:no-for-in
         for (const key in variables) {
@@ -1145,22 +1153,20 @@ class DateFormatter {
             const value = variables[key];
             compiledVariables[key] = this.adapter.format(date, value);
         }
-        compiledVariables.CURRENT_YEAR = this.hasSame(date, this.adapter.today(), 'year');
+        compiledVariables.CURRENT_YEAR = (currYearForced && 'no') || this.hasSame(date, this.adapter.today(), 'year');
         return compiledVariables;
     }
     isBeforeYesterday(date) {
         return this.adapter.daysFromToday(date) <= -2;
     }
     isYesterday(date) {
-        const interval = this.adapter.daysFromToday(date);
-        return interval > -2 && interval <= -1;
+        return this.adapter.daysFromToday(date) === -1;
     }
     isToday(date) {
         return this.adapter.daysFromToday(date) === 0;
     }
     isTomorrow(date) {
-        const interval = this.adapter.daysFromToday(date);
-        return interval >= 1 && interval < 2;
+        return this.adapter.daysFromToday(date) === 1;
     }
     isAfterTomorrow(date) {
         return this.adapter.daysFromToday(date) >= 2;