react-cron-generator 2.0.3 → 2.0.5

package/build/index.js

@@ -336,15 +336,15 @@ var cronstrueI18n = {exports: {}};
 	        var description = this.getSegmentDescription(this.expressionParts[0], this.i18n.everySecond(), function (s) {
 	            return s;
 	        }, function (s) {
-	            return stringUtilities_1.StringUtilities.format(_this.i18n.everyX0Seconds(), s);
+	            return stringUtilities_1.StringUtilities.format(_this.i18n.everyX0Seconds(s), s);
 	        }, function (s) {
 	            return _this.i18n.secondsX0ThroughX1PastTheMinute();
 	        }, function (s) {
 	            return s == "0"
 	                ? ""
 	                : parseInt(s) < 20
-	                    ? _this.i18n.atX0SecondsPastTheMinute()
-	                    : _this.i18n.atX0SecondsPastTheMinuteGt20() || _this.i18n.atX0SecondsPastTheMinute();
+	                    ? _this.i18n.atX0SecondsPastTheMinute(s)
+	                    : _this.i18n.atX0SecondsPastTheMinuteGt20() || _this.i18n.atX0SecondsPastTheMinute(s);
 	        });
 	        return description;
 	    };
@@ -355,7 +355,7 @@ var cronstrueI18n = {exports: {}};
 	        var description = this.getSegmentDescription(this.expressionParts[1], this.i18n.everyMinute(), function (s) {
 	            return s;
 	        }, function (s) {
-	            return stringUtilities_1.StringUtilities.format(_this.i18n.everyX0Minutes(), s);
+	            return stringUtilities_1.StringUtilities.format(_this.i18n.everyX0Minutes(s), s);
 	        }, function (s) {
 	            return _this.i18n.minutesX0ThroughX1PastTheHour();
 	        }, function (s) {
@@ -363,11 +363,11 @@ var cronstrueI18n = {exports: {}};
 	                return s == "0" && hourExpression.indexOf("/") == -1 && secondsExpression == ""
 	                    ? _this.i18n.everyHour()
 	                    : parseInt(s) < 20
-	                        ? _this.i18n.atX0MinutesPastTheHour()
-	                        : _this.i18n.atX0MinutesPastTheHourGt20() || _this.i18n.atX0MinutesPastTheHour();
+	                        ? _this.i18n.atX0MinutesPastTheHour(s)
+	                        : _this.i18n.atX0MinutesPastTheHourGt20() || _this.i18n.atX0MinutesPastTheHour(s);
 	            }
 	            catch (e) {
-	                return _this.i18n.atX0MinutesPastTheHour();
+	                return _this.i18n.atX0MinutesPastTheHour(s);
 	            }
 	        });
 	        return description;
@@ -378,7 +378,7 @@ var cronstrueI18n = {exports: {}};
 	        var description = this.getSegmentDescription(expression, this.i18n.everyHour(), function (s) {
 	            return _this.formatTime(s, "0", "");
 	        }, function (s) {
-	            return stringUtilities_1.StringUtilities.format(_this.i18n.everyX0Hours(), s);
+	            return stringUtilities_1.StringUtilities.format(_this.i18n.everyX0Hours(s), s);
 	        }, function (s) {
 	            return _this.i18n.betweenX0AndX1();
 	        }, function (s) {
@@ -388,7 +388,10 @@ var cronstrueI18n = {exports: {}};
 	            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);
+	                description =
+	                    description.substring(0, lastAtTheHourMatchIndex) +
+	                        ":59" +
+	                        description.substring(lastAtTheHourMatchIndex + 3);
 	            }
 	        }
 	        return description;
@@ -401,7 +404,7 @@ var cronstrueI18n = {exports: {}};
 	            description = "";
 	        }
 	        else {
-	            description = this.getSegmentDescription(this.expressionParts[5], this.i18n.commaEveryDay(), function (s) {
+	            description = this.getSegmentDescription(this.expressionParts[5], this.i18n.commaEveryDay(), function (s, form) {
 	                var exp = s;
 	                if (s.indexOf("#") > -1) {
 	                    exp = s.substr(0, s.indexOf("#"));
@@ -409,47 +412,54 @@ var cronstrueI18n = {exports: {}};
 	                else if (s.indexOf("L") > -1) {
 	                    exp = exp.replace("L", "");
 	                }
-	                return daysOfWeekNames[parseInt(exp)];
+	                return _this.i18n.daysOfTheWeekInCase
+	                    ? _this.i18n.daysOfTheWeekInCase(form)[parseInt(exp)]
+	                    : daysOfWeekNames[parseInt(exp)];
 	            }, function (s) {
 	                if (parseInt(s) == 1) {
 	                    return "";
 	                }
 	                else {
-	                    return stringUtilities_1.StringUtilities.format(_this.i18n.commaEveryX0DaysOfTheWeek(), s);
+	                    return stringUtilities_1.StringUtilities.format(_this.i18n.commaEveryX0DaysOfTheWeek(s), s);
 	                }
 	            }, function (s) {
+	                var beginFrom = s.substring(0, s.indexOf("-"));
 	                var domSpecified = _this.expressionParts[3] != "*";
-	                return domSpecified ? _this.i18n.commaAndX0ThroughX1() : _this.i18n.commaX0ThroughX1();
+	                return domSpecified ? _this.i18n.commaAndX0ThroughX1(beginFrom) : _this.i18n.commaX0ThroughX1(beginFrom);
 	            }, function (s) {
 	                var format = null;
 	                if (s.indexOf("#") > -1) {
 	                    var dayOfWeekOfMonthNumber = s.substring(s.indexOf("#") + 1);
+	                    var dayOfWeekNumber = s.substring(0, s.indexOf("#"));
 	                    var dayOfWeekOfMonthDescription = null;
 	                    switch (dayOfWeekOfMonthNumber) {
 	                        case "1":
-	                            dayOfWeekOfMonthDescription = _this.i18n.first();
+	                            dayOfWeekOfMonthDescription = _this.i18n.first(dayOfWeekNumber);
 	                            break;
 	                        case "2":
-	                            dayOfWeekOfMonthDescription = _this.i18n.second();
+	                            dayOfWeekOfMonthDescription = _this.i18n.second(dayOfWeekNumber);
 	                            break;
 	                        case "3":
-	                            dayOfWeekOfMonthDescription = _this.i18n.third();
+	                            dayOfWeekOfMonthDescription = _this.i18n.third(dayOfWeekNumber);
 	                            break;
 	                        case "4":
-	                            dayOfWeekOfMonthDescription = _this.i18n.fourth();
+	                            dayOfWeekOfMonthDescription = _this.i18n.fourth(dayOfWeekNumber);
 	                            break;
 	                        case "5":
-	                            dayOfWeekOfMonthDescription = _this.i18n.fifth();
+	                            dayOfWeekOfMonthDescription = _this.i18n.fifth(dayOfWeekNumber);
 	                            break;
 	                    }
-	                    format = _this.i18n.commaOnThe() + dayOfWeekOfMonthDescription + _this.i18n.spaceX0OfTheMonth();
+	                    format =
+	                        _this.i18n.commaOnThe(dayOfWeekOfMonthNumber) +
+	                            dayOfWeekOfMonthDescription +
+	                            _this.i18n.spaceX0OfTheMonth();
 	                }
 	                else if (s.indexOf("L") > -1) {
-	                    format = _this.i18n.commaOnTheLastX0OfTheMonth();
+	                    format = _this.i18n.commaOnTheLastX0OfTheMonth(s.replace("L", ""));
 	                }
 	                else {
 	                    var domSpecified = _this.expressionParts[3] != "*";
-	                    format = domSpecified ? _this.i18n.commaAndOnX0() : _this.i18n.commaOnlyOnX0();
+	                    format = domSpecified ? _this.i18n.commaAndOnX0() : _this.i18n.commaOnlyOnX0(s);
 	                }
 	                return format;
 	            });
@@ -459,14 +469,16 @@ var cronstrueI18n = {exports: {}};
 	    ExpressionDescriptor.prototype.getMonthDescription = function () {
 	        var _this = this;
 	        var monthNames = this.i18n.monthsOfTheYear();
-	        var description = this.getSegmentDescription(this.expressionParts[4], "", function (s) {
-	            return monthNames[parseInt(s) - 1];
+	        var description = this.getSegmentDescription(this.expressionParts[4], "", function (s, form) {
+	            return form && _this.i18n.monthsOfTheYearInCase
+	                ? _this.i18n.monthsOfTheYearInCase(form)[parseInt(s) - 1]
+	                : monthNames[parseInt(s) - 1];
 	        }, function (s) {
 	            if (parseInt(s) == 1) {
 	                return "";
 	            }
 	            else {
-	                return stringUtilities_1.StringUtilities.format(_this.i18n.commaEveryX0Months(), s);
+	                return stringUtilities_1.StringUtilities.format(_this.i18n.commaEveryX0Months(s), s);
 	            }
 	        }, function (s) {
 	            return _this.i18n.commaMonthX0ThroughMonthX1() || _this.i18n.commaX0ThroughX1();
@@ -501,7 +513,7 @@ var cronstrueI18n = {exports: {}};
 	                    var lastDayOffSetMatches = expression.match(/L-(\d{1,2})/);
 	                    if (lastDayOffSetMatches) {
 	                        var offSetDays = lastDayOffSetMatches[1];
-	                        description = stringUtilities_1.StringUtilities.format(this.i18n.commaDaysBeforeTheLastDayOfTheMonth(), offSetDays);
+	                        description = stringUtilities_1.StringUtilities.format(this.i18n.commaDaysBeforeTheLastDayOfTheMonth(offSetDays), offSetDays);
 	                        break;
 	                    }
 	                    else if (expression == "*" && this.expressionParts[5] != "*") {
@@ -515,11 +527,11 @@ var cronstrueI18n = {exports: {}};
 	                                    ? stringUtilities_1.StringUtilities.format(_this.i18n.dayX0(), s)
 	                                    : s;
 	                        }, function (s) {
-	                            return s == "1" ? _this.i18n.commaEveryDay() : _this.i18n.commaEveryX0Days();
+	                            return s == "1" ? _this.i18n.commaEveryDay() : _this.i18n.commaEveryX0Days(s);
 	                        }, function (s) {
-	                            return _this.i18n.commaBetweenDayX0AndX1OfTheMonth();
+	                            return _this.i18n.commaBetweenDayX0AndX1OfTheMonth(s);
 	                        }, function (s) {
-	                            return _this.i18n.commaOnDayX0OfTheMonth();
+	                            return _this.i18n.commaOnDayX0OfTheMonth(s);
 	                        });
 	                    }
 	                    break;
@@ -532,7 +544,7 @@ var cronstrueI18n = {exports: {}};
 	        var description = this.getSegmentDescription(this.expressionParts[6], "", function (s) {
 	            return /^\d+$/.test(s) ? new Date(parseInt(s), 1).getFullYear().toString() : s;
 	        }, function (s) {
-	            return stringUtilities_1.StringUtilities.format(_this.i18n.commaEveryX0Years(), s);
+	            return stringUtilities_1.StringUtilities.format(_this.i18n.commaEveryX0Years(s), s);
 	        }, function (s) {
 	            return _this.i18n.commaYearX0ThroughYearX1() || _this.i18n.commaX0ThroughX1();
 	        }, function (s) {
@@ -613,8 +625,8 @@ var cronstrueI18n = {exports: {}};
 	    ExpressionDescriptor.prototype.generateRangeSegmentDescription = function (rangeExpression, getRangeDescriptionFormat, getSingleItemDescription) {
 	        var description = "";
 	        var rangeSegments = rangeExpression.split("-");
-	        var rangeSegment1Description = getSingleItemDescription(rangeSegments[0]);
-	        var rangeSegment2Description = getSingleItemDescription(rangeSegments[1]);
+	        var rangeSegment1Description = getSingleItemDescription(rangeSegments[0], 1);
+	        var rangeSegment2Description = getSingleItemDescription(rangeSegments[1], 2);
 	        var rangeDescriptionFormat = getRangeDescriptionFormat(rangeExpression);
 	        description += stringUtilities_1.StringUtilities.format(rangeDescriptionFormat, rangeSegment1Description, rangeSegment2Description);
 	        return description;
@@ -5029,6 +5041,18 @@ var cronstrueI18n = {exports: {}};
 
 	Object.defineProperty(exports, "__esModule", ({ value: true }));
 	exports.ru = void 0;
+	var getPhraseByNumber = function (str, words) {
+	    var number = Number(str);
+	    return number !== undefined
+	        ? words[number % 100 > 4 && number % 100 < 20 ? 2 : [2, 0, 1, 1, 1, 2][number % 10 < 5 ? Math.abs(number) % 10 : 5]]
+	        : words[2];
+	};
+	var getPhraseByDayOfWeek = function (str, words) {
+	    var number = Number(str);
+	    return number !== undefined
+	        ? words[number === 0 ? 0 : number === 1 || number === 2 || number === 4 ? 1 : 2]
+	        : words[1];
+	};
 	var ru = (function () {
 	    function ru() {
 	    }
@@ -5071,26 +5095,26 @@ var cronstrueI18n = {exports: {}};
 	    ru.prototype.everySecond = function () {
 	        return "каждую секунду";
 	    };
-	    ru.prototype.everyX0Seconds = function () {
-	        return "каждые %s секунд";
+	    ru.prototype.everyX0Seconds = function (s) {
+	        return getPhraseByNumber(s, ["каждую %s секунду", "каждые %s секунды", "каждые %s секунд"]);
 	    };
 	    ru.prototype.secondsX0ThroughX1PastTheMinute = function () {
 	        return "секунды с %s по %s";
 	    };
-	    ru.prototype.atX0SecondsPastTheMinute = function () {
-	        return "в %s секунд";
+	    ru.prototype.atX0SecondsPastTheMinute = function (s) {
+	        return getPhraseByNumber(s, ["в %s секунду", "в %s секунды", "в %s секунд"]);
 	    };
-	    ru.prototype.everyX0Minutes = function () {
-	        return "каждые %s минут";
+	    ru.prototype.everyX0Minutes = function (s) {
+	        return getPhraseByNumber(s, ["каждую %s минуту", "каждые %s минуты", "каждые %s минут"]);
 	    };
 	    ru.prototype.minutesX0ThroughX1PastTheHour = function () {
 	        return "минуты с %s по %s";
 	    };
-	    ru.prototype.atX0MinutesPastTheHour = function () {
-	        return "в %s минут";
+	    ru.prototype.atX0MinutesPastTheHour = function (s) {
+	        return getPhraseByNumber(s, ["в %s минуту", "в %s минуты", "в %s минут"]);
 	    };
-	    ru.prototype.everyX0Hours = function () {
-	        return "каждые %s часов";
+	    ru.prototype.everyX0Hours = function (s) {
+	        return getPhraseByNumber(s, ["каждый %s час", "каждые %s часа", "каждые %s часов"]);
 	    };
 	    ru.prototype.betweenX0AndX1 = function () {
 	        return "с %s по %s";
@@ -5101,32 +5125,32 @@ var cronstrueI18n = {exports: {}};
 	    ru.prototype.commaEveryDay = function () {
 	        return ", каждый день";
 	    };
-	    ru.prototype.commaEveryX0DaysOfTheWeek = function () {
-	        return ", каждые %s дней недели";
+	    ru.prototype.commaEveryX0DaysOfTheWeek = function (s) {
+	        return getPhraseByNumber(s, ["", ", каждые %s дня недели", ", каждые %s дней недели"]);
 	    };
-	    ru.prototype.commaX0ThroughX1 = function () {
-	        return ", %s по %s";
+	    ru.prototype.commaX0ThroughX1 = function (s) {
+	        return s && (s[0] == "2" || s[0] == "3") ? ", со %s по %s" : ", с %s по %s";
 	    };
-	    ru.prototype.commaAndX0ThroughX1 = function () {
-	        return ", и %s по %s";
+	    ru.prototype.commaAndX0ThroughX1 = function (s) {
+	        return s && (s[0] == "2" || s[0] == "3") ? " и со %s по %s" : " и с %s по %s";
 	    };
-	    ru.prototype.first = function () {
-	        return "первый";
+	    ru.prototype.first = function (s) {
+	        return getPhraseByDayOfWeek(s, ["первое", "первый", "первую"]);
 	    };
-	    ru.prototype.second = function () {
-	        return "второй";
+	    ru.prototype.second = function (s) {
+	        return getPhraseByDayOfWeek(s, ["второе", "второй", "вторую"]);
 	    };
-	    ru.prototype.third = function () {
-	        return "третий";
+	    ru.prototype.third = function (s) {
+	        return getPhraseByDayOfWeek(s, ["третье", "третий", "третью"]);
 	    };
-	    ru.prototype.fourth = function () {
-	        return "четвертый";
+	    ru.prototype.fourth = function (s) {
+	        return getPhraseByDayOfWeek(s, ["четвертое", "четвертый", "четвертую"]);
 	    };
-	    ru.prototype.fifth = function () {
-	        return "пятый";
+	    ru.prototype.fifth = function (s) {
+	        return getPhraseByDayOfWeek(s, ["пятое", "пятый", "пятую"]);
 	    };
-	    ru.prototype.commaOnThe = function () {
-	        return ", в ";
+	    ru.prototype.commaOnThe = function (s) {
+	        return s === "2" ? ", во " : ", в ";
 	    };
 	    ru.prototype.spaceX0OfTheMonth = function () {
 	        return " %s месяца";
@@ -5134,17 +5158,20 @@ var cronstrueI18n = {exports: {}};
 	    ru.prototype.lastDay = function () {
 	        return "последний день";
 	    };
-	    ru.prototype.commaOnTheLastX0OfTheMonth = function () {
-	        return ", в последний %s месяца";
+	    ru.prototype.commaOnTheLastX0OfTheMonth = function (s) {
+	        return getPhraseByDayOfWeek(s, [", в последнее %s месяца", ", в последний %s месяца", ", в последнюю %s месяца"]);
 	    };
-	    ru.prototype.commaOnlyOnX0 = function () {
-	        return ", только в %s";
+	    ru.prototype.commaOnlyOnX0 = function (s) {
+	        return s && s[0] === "2" ? ", только во %s" : ", только в %s";
 	    };
 	    ru.prototype.commaAndOnX0 = function () {
-	        return ", и в %s";
+	        return ", и %s";
 	    };
-	    ru.prototype.commaEveryX0Months = function () {
-	        return ", каждые %s месяцев";
+	    ru.prototype.commaEveryX0Months = function (s) {
+	        return getPhraseByNumber(s, ["", " каждые %s месяца", " каждые %s месяцев"]);
+	    };
+	    ru.prototype.commaOnlyInMonthX0 = function () {
+	        return ", только %s";
 	    };
 	    ru.prototype.commaOnlyInX0 = function () {
 	        return ", только в %s";
@@ -5155,29 +5182,33 @@ var cronstrueI18n = {exports: {}};
 	    ru.prototype.commaOnTheLastWeekdayOfTheMonth = function () {
 	        return ", в последний будний день месяца";
 	    };
-	    ru.prototype.commaDaysBeforeTheLastDayOfTheMonth = function () {
-	        return ", %s дней до последнего дня месяца";
+	    ru.prototype.commaDaysBeforeTheLastDayOfTheMonth = function (s) {
+	        return getPhraseByNumber(s, [
+	            ", за %s день до конца месяца",
+	            ", за %s дня до конца месяца",
+	            ", за %s дней до конца месяца",
+	        ]);
 	    };
 	    ru.prototype.firstWeekday = function () {
 	        return "первый будний день";
 	    };
 	    ru.prototype.weekdayNearestDayX0 = function () {
-	        return "ближайший будний день к %s";
+	        return "ближайший будний день к %s числу";
 	    };
 	    ru.prototype.commaOnTheX0OfTheMonth = function () {
 	        return ", в %s месяца";
 	    };
-	    ru.prototype.commaEveryX0Days = function () {
-	        return ", каждые %s дней";
+	    ru.prototype.commaEveryX0Days = function (s) {
+	        return getPhraseByNumber(s, [", каждый %s день", ", каждые %s дня", ", каждые %s дней"]);
 	    };
-	    ru.prototype.commaBetweenDayX0AndX1OfTheMonth = function () {
-	        return ", с %s по %s число месяца";
+	    ru.prototype.commaBetweenDayX0AndX1OfTheMonth = function (s) {
+	        return s && s.substring(0, s.indexOf("-")) == "2" ? ", со %s по %s число месяца" : ", с %s по %s число месяца";
 	    };
-	    ru.prototype.commaOnDayX0OfTheMonth = function () {
-	        return ", в %s число месяца";
+	    ru.prototype.commaOnDayX0OfTheMonth = function (s) {
+	        return s && s[0] == "2" ? ", во %s число месяца" : ", в %s число месяца";
 	    };
-	    ru.prototype.commaEveryX0Years = function () {
-	        return ", каждые %s лет";
+	    ru.prototype.commaEveryX0Years = function (s) {
+	        return getPhraseByNumber(s, [", каждый %s год", ", каждые %s года", ", каждые %s лет"]);
 	    };
 	    ru.prototype.commaStartingX0 = function () {
 	        return ", начало %s";
@@ -5185,6 +5216,12 @@ var cronstrueI18n = {exports: {}};
 	    ru.prototype.daysOfTheWeek = function () {
 	        return ["воскресенье", "понедельник", "вторник", "среда", "четверг", "пятница", "суббота"];
 	    };
+	    ru.prototype.daysOfTheWeekInCase = function (f) {
+	        if (f === void 0) { f = 2; }
+	        return f == 1
+	            ? ["воскресенья", "понедельника", "вторника", "среды", "четверга", "пятницы", "субботы"]
+	            : ["воскресенье", "понедельник", "вторник", "среду", "четверг", "пятницу", "субботу"];
+	    };
 	    ru.prototype.monthsOfTheYear = function () {
 	        return [
 	            "январь",
@@ -5201,6 +5238,24 @@ var cronstrueI18n = {exports: {}};
 	            "декабрь",
 	        ];
 	    };
+	    ru.prototype.monthsOfTheYearInCase = function (f) {
+	        return f == 1
+	            ? [
+	                "января",
+	                "февраля",
+	                "марта",
+	                "апреля",
+	                "мая",
+	                "июня",
+	                "июля",
+	                "августа",
+	                "сентября",
+	                "октября",
+	                "ноября",
+	                "декабря",
+	            ]
+	            : this.monthsOfTheYear();
+	    };
 	    return ru;
 	}());
 	exports.ru = ru;