cronstrue 3.3.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
 

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;
             });