cronstrue 3.2.0 → 3.9.0

package/README.md

@@ -125,6 +125,7 @@ An options object can be passed as the second parameter to `cronstrue.toString`.
 - **monthStartIndexZero: boolean** - Whether to interpret January as `0` or `1`. (Default: false)
 - **use24HourTimeFormat: boolean** - If true, descriptions will use a [24-hour clock](https://en.wikipedia.org/wiki/24-hour_clock) (Default: false but some translations will default to true)
 - **locale: string** - The locale to use (Default: "en")
+- **logicalAndDayFields: boolean** - If true, descriptions for cron expressions with both day of month and day of week specified will follow a logical-AND wording rather than logical-OR wording; e.g. "...between day 11 and 17 of the month, only on Friday" rather than "...between day 11 and 17 of the month, and on Friday" (Default: false)
 
 ## i18n
 
@@ -177,23 +178,23 @@ cronstrue.toString("*/5 * * * *", { locale: "es" }); // => Cada 5 minutos
 The following locales can be passed in for the `locale` option.  Thank you to the author (shown below) of each translation!
 
 - en - English ([Brady Holt](https://github.com/bradymholt))
-- af - Afrikaans (Michael van Niekerk(https://github.com/mvniekerk))
+- af - Afrikaans ([Michael van Niekerk](https://github.com/mvniekerk))
 - ar - Arabic ([Mohamed Nehad Shalabi](https://github.com/mohamednehad450))
 - be - Belarusian ([Kirill Mikulich](https://github.com/KirillMikulich))
 - bg - Bulgarian ([kamenf](https://github.com/kamenf))
 - ca - Catalan ([Francisco Javier Barrena](https://github.com/fjbarrena))
-- hr - Croatian ([Rok Šekoranja](https://github.com/Rookxc))
 - cs - Czech ([hanbar](https://github.com/hanbar))
-- es - Spanish ([Ivan Santos](https://github.com/ivansg))
 - da - Danish ([Rasmus Melchior Jacobsen](https://github.com/rmja))
 - de - German ([Michael Schuler](https://github.com/mschuler))
+- es - Spanish ([Ivan Santos](https://github.com/ivansg))
+- fa - Farsi ([A. Bahrami](https://github.com/alirezakoo))
 - fi - Finnish ([Mikael Rosenberg](https://github.com/MR77FI))
 - fr - French ([Arnaud TAMAILLON](https://github.com/Greybird))
-- fa - Farsi ([A. Bahrami](https://github.com/alirezakoo))
 - he - Hebrew ([Ilan Firsov](https://github.com/IlanF))
+- hr - Croatian ([Rok Šekoranja](https://github.com/Rookxc))
 - hu - Hungarian ([Orcsity Norbert](https://github.com/Northber), Szabó Dániel)
-- it - Italian ([rinaldihno](https://github.com/rinaldihno))
 - id - Indonesia ([Hasan Basri](https://github.com/hasanbasri1993))
+- it - Italian ([rinaldihno](https://github.com/rinaldihno))
 - ja - Japanese ([Alin Sarivan](https://github.com/asarivan))
 - ko - Korean ([Ion Mincu](https://github.com/ionmincu))
 - my - Malay (Malaysia) ([Ikhwan Abdullah](https://github.com/leychay))
@@ -208,6 +209,7 @@ The following locales can be passed in for the `locale` option.  Thank you to th
 - sl - Slovenian ([Jani Bevk](https://github.com/jenzy))
 - sw - Swahili ([Leylow Lujuo](https://github.com/leyluj))
 - sv - Swedish ([roobin](https://github.com/roobin))
+- sr - Serbian ([Miloš Paunović](https://github.com/MilosPaunovic))
 - th - Thai ([Teerapat Prommarak](https://github.com/xeusteerapat))
 - tr - Turkish ([Mustafa SADEDİL](https://github.com/sadedil))
 - uk - Ukrainian ([Taras](https://github.com/tbudurovych))

package/dist/cronstrue-i18n.js

@@ -287,7 +287,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;
+        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.logicalAndDayFields, logicalAndDayFields = _h === void 0 ? false : _h;
         var options = {
             throwExceptionOnParseError: throwExceptionOnParseError,
             verbose: verbose,
@@ -295,6 +295,7 @@ var ExpressionDescriptor = (function () {
             monthStartIndexZero: monthStartIndexZero,
             use24HourTimeFormat: use24HourTimeFormat,
             locale: locale,
+            logicalAndDayFields: logicalAndDayFields,
         };
         if (options.tzOffset) {
             console.warn("'tzOffset' option has been deprecated and is no longer supported.");
@@ -529,7 +530,15 @@ var ExpressionDescriptor = (function () {
                 }
                 else {
                     var domSpecified = _this.expressionParts[3] != "*";
-                    format = domSpecified ? _this.i18n.commaAndOnX0() : _this.i18n.commaOnlyOnX0(s);
+                    if (!domSpecified) {
+                        format = _this.i18n.commaOnlyOnX0(s);
+                    }
+                    else if (_this.options.logicalAndDayFields) {
+                        format = _this.i18n.commaOnlyOnX0(s);
+                    }
+                    else {
+                        format = _this.i18n.commaAndOnX0();
+                    }
                 }
                 return format;
             });
@@ -769,7 +778,7 @@ exports.ExpressionDescriptor = ExpressionDescriptor;
 
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.hr = exports.bg = exports.my = exports.vi = exports.ar = exports.th = exports.af = exports.hu = exports.be = exports.ca = exports.fa = exports.sw = exports.sl = exports.fi = exports.sk = exports.cs = exports.he = exports.ja = exports.zh_TW = exports.zh_CN = exports.uk = exports.tr = exports.ru = exports.ro = exports.pt_PT = exports.pt_BR = exports.pl = exports.sv = exports.nb = exports.nl = exports.ko = exports.id = exports.it = exports.fr = exports.es = exports.de = exports.da = exports.en = void 0;
+exports.sr = exports.hr = exports.bg = exports.my = exports.vi = exports.ar = exports.th = exports.af = exports.hu = exports.be = exports.ca = exports.fa = exports.sw = exports.sl = exports.fi = exports.sk = exports.cs = exports.he = exports.ja = exports.zh_TW = exports.zh_CN = exports.uk = exports.tr = exports.ru = exports.ro = exports.pt_PT = exports.pt_BR = exports.pl = exports.sv = exports.nb = exports.nl = exports.ko = exports.id = exports.it = exports.fr = exports.es = exports.de = exports.da = exports.en = void 0;
 var en_1 = __webpack_require__(486);
 Object.defineProperty(exports, "en", ({ enumerable: true, get: function () { return en_1.en; } }));
 var da_1 = __webpack_require__(506);
@@ -846,6 +855,8 @@ var bg_1 = __webpack_require__(622);
 Object.defineProperty(exports, "bg", ({ enumerable: true, get: function () { return bg_1.bg; } }));
 var hr_1 = __webpack_require__(131);
 Object.defineProperty(exports, "hr", ({ enumerable: true, get: function () { return hr_1.hr; } }));
+var sr_1 = __webpack_require__(716);
+Object.defineProperty(exports, "sr", ({ enumerable: true, get: function () { return sr_1.sr; } }));
 
 
 /***/ }),
@@ -6504,6 +6515,199 @@ var sl = (function () {
 exports.sl = sl;
 
 
+/***/ }),
+
+/***/ 716:
+/***/ ((__unused_webpack_module, exports) => {
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.sr = void 0;
+var sr = (function () {
+    function sr() {
+    }
+    sr.prototype.use24HourTimeFormatByDefault = function () {
+        return true;
+    };
+    sr.prototype.anErrorOccuredWhenGeneratingTheExpressionD = function () {
+        return "Došlo je do greške pri generisanju izraza. Proverite sintaksu cron izraza.";
+    };
+    sr.prototype.at = function () {
+        return "U";
+    };
+    sr.prototype.atSpace = function () {
+        return "U ";
+    };
+    sr.prototype.atX0 = function () {
+        return "u %s";
+    };
+    sr.prototype.atX0MinutesPastTheHour = function () {
+        return "u %s minuta posle punog sata";
+    };
+    sr.prototype.atX0SecondsPastTheMinute = function () {
+        return "u %s sekundi posle pune minute";
+    };
+    sr.prototype.betweenX0AndX1 = function () {
+        return "između %s i %s";
+    };
+    sr.prototype.commaBetweenDayX0AndX1OfTheMonth = function () {
+        return ", između %s. i %s. dana u mesecu";
+    };
+    sr.prototype.commaEveryDay = function () {
+        return ", svaki dan";
+    };
+    sr.prototype.commaEveryX0Days = function () {
+        return ", svakih %s dana";
+    };
+    sr.prototype.commaEveryX0DaysOfTheWeek = function () {
+        return ", svakih %s dana u nedelji";
+    };
+    sr.prototype.commaEveryX0Months = function () {
+        return ", svakih %s meseci";
+    };
+    sr.prototype.commaEveryX0Years = function () {
+        return ", svakih %s godina";
+    };
+    sr.prototype.commaOnDayX0OfTheMonth = function () {
+        return ", %s. dan u mesecu";
+    };
+    sr.prototype.commaOnlyInX0 = function () {
+        return ", samo u %s";
+    };
+    sr.prototype.commaOnlyOnX0 = function () {
+        return ", samo %s";
+    };
+    sr.prototype.commaAndOnX0 = function () {
+        return ", i %s";
+    };
+    sr.prototype.commaOnThe = function () {
+        return ", ";
+    };
+    sr.prototype.commaOnTheLastDayOfTheMonth = function () {
+        return ", poslednjeg dana u mesecu";
+    };
+    sr.prototype.commaOnTheLastWeekdayOfTheMonth = function () {
+        return ", poslednjeg radnog dana u mesecu";
+    };
+    sr.prototype.commaDaysBeforeTheLastDayOfTheMonth = function () {
+        return ", %s dana pre kraja meseca";
+    };
+    sr.prototype.commaOnTheLastX0OfTheMonth = function () {
+        return ", poslednji %s u mesecu";
+    };
+    sr.prototype.commaOnTheX0OfTheMonth = function () {
+        return ", %s u mesecu";
+    };
+    sr.prototype.commaX0ThroughX1 = function () {
+        return ", od %s do %s";
+    };
+    sr.prototype.commaAndX0ThroughX1 = function () {
+        return ", i od %s do %s";
+    };
+    sr.prototype.everyHour = function () {
+        return "svaki sat";
+    };
+    sr.prototype.everyMinute = function () {
+        return "svakog minuta";
+    };
+    sr.prototype.everyMinuteBetweenX0AndX1 = function () {
+        return "Svakog minuta između %s i %s";
+    };
+    sr.prototype.everySecond = function () {
+        return "svake sekunde";
+    };
+    sr.prototype.everyX0Hours = function () {
+        return "svakih %s sati";
+    };
+    sr.prototype.everyX0Minutes = function () {
+        return "svakih %s minuta";
+    };
+    sr.prototype.everyX0Seconds = function () {
+        return "svakih %s sekundi";
+    };
+    sr.prototype.fifth = function () {
+        return "peti";
+    };
+    sr.prototype.first = function () {
+        return "prvi";
+    };
+    sr.prototype.firstWeekday = function () {
+        return "prvi radni dan";
+    };
+    sr.prototype.fourth = function () {
+        return "četvrti";
+    };
+    sr.prototype.minutesX0ThroughX1PastTheHour = function () {
+        return "minute od %s do %s posle punog sata";
+    };
+    sr.prototype.second = function () {
+        return "drugi";
+    };
+    sr.prototype.secondsX0ThroughX1PastTheMinute = function () {
+        return "sekunde od %s do %s posle pune minute";
+    };
+    sr.prototype.spaceAnd = function () {
+        return " i";
+    };
+    sr.prototype.spaceX0OfTheMonth = function () {
+        return " %s u mesecu";
+    };
+    sr.prototype.lastDay = function () {
+        return "poslednji dan";
+    };
+    sr.prototype.third = function () {
+        return "treći";
+    };
+    sr.prototype.weekdayNearestDayX0 = function () {
+        return "radni dan najbliži %s. danu";
+    };
+    sr.prototype.commaMonthX0ThroughMonthX1 = function () {
+        return null;
+    };
+    sr.prototype.commaYearX0ThroughYearX1 = function () {
+        return null;
+    };
+    sr.prototype.atX0MinutesPastTheHourGt20 = function () {
+        return null;
+    };
+    sr.prototype.atX0SecondsPastTheMinuteGt20 = function () {
+        return null;
+    };
+    sr.prototype.commaStartingX0 = function () {
+        return ", počevši od %s";
+    };
+    sr.prototype.daysOfTheWeek = function () {
+        return [
+            "Nedelja",
+            "Ponedeljak",
+            "Utorak",
+            "Sreda",
+            "Četvrtak",
+            "Petak",
+            "Subota",
+        ];
+    };
+    sr.prototype.monthsOfTheYear = function () {
+        return [
+            "januar",
+            "februar",
+            "mart",
+            "april",
+            "maj",
+            "jun",
+            "jul",
+            "avgust",
+            "septembar",
+            "oktobar",
+            "novembar",
+            "decembar",
+        ];
+    };
+    return sr;
+}());
+exports.sr = sr;
+
+
 /***/ }),
 
 /***/ 544: