cronstrue 2.58.0 → 2.60.0

package/dist/cronstrue-i18n.js

@@ -282,7 +282,7 @@ var ExpressionDescriptor = (function () {
         }
     }
     ExpressionDescriptor.toString = function (expression, _a) {
-        var _b = _a === void 0 ? {} : _a, _c = _b.throwExceptionOnParseError, throwExceptionOnParseError = _c === void 0 ? true : _c, _d = _b.verbose, verbose = _d === void 0 ? false : _d, _e = _b.dayOfWeekStartIndexZero, dayOfWeekStartIndexZero = _e === void 0 ? true : _e, _f = _b.monthStartIndexZero, monthStartIndexZero = _f === void 0 ? false : _f, use24HourTimeFormat = _b.use24HourTimeFormat, _g = _b.locale, locale = _g === void 0 ? null : _g, _h = _b.tzOffset, tzOffset = _h === void 0 ? 0 : _h;
+        var _b = _a === void 0 ? {} : _a, _c = _b.throwExceptionOnParseError, throwExceptionOnParseError = _c === void 0 ? true : _c, _d = _b.verbose, verbose = _d === void 0 ? false : _d, _e = _b.dayOfWeekStartIndexZero, dayOfWeekStartIndexZero = _e === void 0 ? true : _e, _f = _b.monthStartIndexZero, monthStartIndexZero = _f === void 0 ? false : _f, use24HourTimeFormat = _b.use24HourTimeFormat, _g = _b.locale, locale = _g === void 0 ? null : _g;
         var options = {
             throwExceptionOnParseError: throwExceptionOnParseError,
             verbose: verbose,
@@ -290,10 +290,9 @@ var ExpressionDescriptor = (function () {
             monthStartIndexZero: monthStartIndexZero,
             use24HourTimeFormat: use24HourTimeFormat,
             locale: locale,
-            tzOffset: tzOffset,
         };
         if (options.tzOffset) {
-            console.warn("'tzOffset' option has been deprecated and will be removed in a future release.");
+            console.warn("'tzOffset' option has been deprecated and is no longer supported.");
         }
         var descripter = new ExpressionDescriptor(expression, options);
         return descripter.getFullDescription();
@@ -427,8 +426,24 @@ var ExpressionDescriptor = (function () {
     ExpressionDescriptor.prototype.getHoursDescription = function () {
         var _this = this;
         var expression = this.expressionParts[2];
+        var hourIndex = 0;
+        var rangeEndValues = [];
+        expression
+            .split("/")[0]
+            .split(",")
+            .forEach(function (range) {
+            var rangeParts = range.split("-");
+            if (rangeParts.length === 2) {
+                rangeEndValues.push({ value: rangeParts[1], index: hourIndex + 1 });
+            }
+            hourIndex += rangeParts.length;
+        });
+        var evaluationIndex = 0;
         var description = this.getSegmentDescription(expression, this.i18n.everyHour(), function (s) {
-            return _this.formatTime(s, "0", "");
+            var match = rangeEndValues.find(function (r) { return r.value === s && r.index === evaluationIndex; });
+            var isRangeEndWithNonZeroMinute = match && _this.expressionParts[1] !== "0";
+            evaluationIndex++;
+            return isRangeEndWithNonZeroMinute ? _this.formatTime(s, "59", "") : _this.formatTime(s, "0", "");
         }, function (s) {
             return stringUtilities_1.StringUtilities.format(_this.i18n.everyX0Hours(s), s);
         }, function (s) {
@@ -436,16 +451,6 @@ var ExpressionDescriptor = (function () {
         }, function (s) {
             return _this.i18n.atX0();
         });
-        if (description && expression.includes("-") && this.expressionParts[1] != "0") {
-            var atTheHourMatches = Array.from(description.matchAll(/:00/g));
-            if (atTheHourMatches.length > 1) {
-                var lastAtTheHourMatchIndex = atTheHourMatches[atTheHourMatches.length - 1].index;
-                description =
-                    description.substring(0, lastAtTheHourMatchIndex) +
-                        ":59" +
-                        description.substring(lastAtTheHourMatchIndex + 3);
-            }
-        }
         return description;
     };
     ExpressionDescriptor.prototype.getDayOfWeekDescription = function () {
@@ -465,22 +470,6 @@ var ExpressionDescriptor = (function () {
                     exp = exp.replace("L", "");
                 }
                 var parsedExp = parseInt(exp);
-                if (_this.options.tzOffset) {
-                    var hourExpression = _this.expressionParts[2];
-                    var hour = parseInt(hourExpression) + (_this.options.tzOffset ? _this.options.tzOffset : 0);
-                    if (hour >= 24) {
-                        parsedExp++;
-                    }
-                    else if (hour < 0) {
-                        parsedExp--;
-                    }
-                    if (parsedExp > 6) {
-                        parsedExp = 0;
-                    }
-                    else if (parsedExp < 0) {
-                        parsedExp = 6;
-                    }
-                }
                 var description = _this.i18n.daysOfTheWeekInCase
                     ? _this.i18n.daysOfTheWeekInCase(form)[parsedExp]
                     : daysOfWeekNames[parsedExp];
@@ -706,13 +695,6 @@ var ExpressionDescriptor = (function () {
     ExpressionDescriptor.prototype.formatTime = function (hourExpression, minuteExpression, secondExpression) {
         var hourOffset = 0;
         var minuteOffset = 0;
-        if (this.options.tzOffset) {
-            hourOffset = this.options.tzOffset > 0 ? Math.floor(this.options.tzOffset) : Math.ceil(this.options.tzOffset);
-            minuteOffset = parseFloat((this.options.tzOffset % 1).toFixed(2));
-            if (minuteOffset != 0) {
-                minuteOffset *= 60;
-            }
-        }
         var hour = parseInt(hourExpression) + hourOffset;
         var minute = parseInt(minuteExpression) + minuteOffset;
         if (minute >= 60) {