cronli5 0.1.5 → 0.1.7

package/dist/cronli5.js

@@ -84,6 +84,26 @@ function arithmeticStep(values) {
   }
   return { start: values[0], interval, last: values[values.length - 1] };
 }
+function weekdayDisplayKey(value) {
+  return value === 0 ? 7 : value;
+}
+function orderWeekdaysForDisplay(segments) {
+  const flattened = segments.flatMap(function flat(segment) {
+    return segment.kind === "step" ? segment.fires.map(function single(value) {
+      return { kind: "single", value: "" + value };
+    }) : [segment];
+  });
+  function key(segment) {
+    return segment.kind === "range" ? weekdayDisplayKey(+segment.bounds[0]) : weekdayDisplayKey(+segment.value);
+  }
+  return flattened.map(function index(segment, position) {
+    return [segment, position];
+  }).sort(function byDisplayKey(a, b) {
+    return key(a[0]) - key(b[0]) || a[1] - b[1];
+  }).map(function unwrap(pair) {
+    return pair[0];
+  });
+}
 function toFieldNumber(token, numberMap) {
   return isNonNegativeInteger(token) ? +token : numberMap[token.toUpperCase()];
 }
@@ -946,7 +966,17 @@ function renderSecondsWithinMinute(ir, plan, opts) {
 }
 function composeHourCadence(ir, plan, opts) {
   const clockRest = plan.rest.kind === "clockTimes" || plan.rest.kind === "compactClockTimes";
-  return clockRest && ir.shapes.minute === "single" ? hourCadence(ir, +ir.pattern.minute, opts) : null;
+  if (!clockRest || ir.shapes.minute !== "single") {
+    return null;
+  }
+  const minute = +ir.pattern.minute;
+  return hourCadence(ir, minute, opts) ?? hourRangeCadence(ir, minute, opts);
+}
+function clockTimesConfinement(ir, rest, opts) {
+  if (+rest.times[0].minute === 0 && ir.shapes.minute === "single") {
+    return secondsLeadClause(ir, opts) + " for one minute at " + durationHours(ir, rest, opts);
+  }
+  return secondsLeadClause(ir, opts) + " of " + clockTimesOf(ir, rest, opts);
 }
 function renderComposeSeconds(ir, plan, opts) {
   const cadence = composeHourCadence(ir, plan, opts);
@@ -954,16 +984,14 @@ function renderComposeSeconds(ir, plan, opts) {
     return cadence;
   }
   if (plan.rest.kind === "clockTimes" && (ir.shapes.second === "wildcard" || ir.shapes.second === "step")) {
-    const minute = plan.rest.times[0].minute;
-    if (+minute === 0) {
-      return secondsLeadClause(ir, opts) + " for one minute at " + durationHours(ir, plan.rest, opts);
-    }
-    return secondsLeadClause(ir, opts) + " of " + clockTimesOf(ir, plan.rest, opts);
+    return clockTimesConfinement(ir, plan.rest, opts);
   }
   if (ir.shapes.second === "wildcard" && plan.rest.kind === "minuteFrequency" && plan.rest.hours.kind === "none" && ir.pattern.minute === "*/2") {
     return "every second of every other minute" + trailingQualifier(ir, opts);
   }
-  return secondsLeadClause(ir, opts) + ", " + render(ir, plan.rest, opts);
+  const restOwnsLead = plan.rest.kind === "compactClockTimes" && ir.analyses.clockSecond;
+  const lead = restOwnsLead ? "" : secondsLeadClause(ir, opts) + ", ";
+  return lead + render(ir, plan.rest, opts);
 }
 function durationHours(ir, plan, opts) {
   const hours = plan.times.map(function clock(time) {
@@ -1046,7 +1074,8 @@ function renderMinuteFrequency(ir, plan, opts) {
     opts
   );
   if (plan.hours.kind === "during") {
-    phrase += " during the " + hourTimesFromPlan(ir, plan.hours.times, false, opts) + " hours";
+    const cadence = unevenHourCadence(ir, opts);
+    phrase += cadence ? ", " + cadence : " during the " + hourTimesFromPlan(ir, plan.hours.times, false, opts) + " hours";
   } else if (plan.hours.kind === "window") {
     phrase += " " + hourWindow(plan.hours, opts);
   } else if (plan.hours.kind === "step") {
@@ -1061,10 +1090,13 @@ function renderMinuteSpanInHour(ir, plan, opts) {
   return "every minute from " + getTime({ hour: plan.hour, minute: plan.span[0] }, opts) + through(opts) + getTime({ hour: plan.hour, minute: plan.span[1] }, opts) + trailingQualifier(ir, opts);
 }
 function renderMinutesAcrossHours(ir, plan, opts) {
+  const cadence = unevenHourCadence(ir, opts);
   if (plan.form === "wildcard") {
+    if (cadence !== null) {
+      return "every minute, " + cadence + trailingQualifier(ir, opts);
+    }
     return "every minute during the " + hourTimesFromPlan(ir, plan.times, false, opts) + " hours" + trailingQualifier(ir, opts);
   }
-  const times = hourTimesFromPlan(ir, plan.times, true, opts);
   const lead = plan.form === "range" ? minuteRangeLead(ir.pattern.minute, opts) : (
     // The 'list' form is a minute list, which has segments; an offset/uneven
     // step enumerated to that list reads as a stride.
@@ -1075,6 +1107,10 @@ function renderMinutesAcrossHours(ir, plan, opts) {
       opts
     )
   );
+  if (cadence !== null) {
+    return lead + ", " + cadence + trailingQualifier(ir, opts);
+  }
+  const times = hourTimesFromPlan(ir, plan.times, true, opts);
   return lead + ", at " + times + trailingQualifier(ir, opts);
 }
 var stepOrdinals = {
@@ -1101,7 +1137,8 @@ function renderMinuteSpanAcrossHourStep(ir, plan, opts) {
     "hour",
     opts
   ) : minuteRangeLead(ir.pattern.minute, opts);
-  return lead + ", " + stepHours(segment, opts) + trailingQualifier(ir, opts);
+  const cadence = unevenHourCadence(ir, opts);
+  return lead + ", " + (cadence ?? stepHours(segment, opts)) + trailingQualifier(ir, opts);
 }
 function minuteRangeLead(minuteField, opts) {
   const bounds = minuteField.split("-");
@@ -1138,17 +1175,23 @@ function rangeMinuteLead(ir, opts) {
   );
 }
 function renderHourStep(ir, plan, opts) {
+  const cadence = unevenHourCadence(ir, opts);
+  if (cadence !== null) {
+    return cadence + trailingQualifier(ir, opts);
+  }
   return stepHours(ir.analyses.segments.hour[0], opts) + trailingQualifier(ir, opts);
 }
 function boundedWindow(plan) {
-  return { from: plan.from, last: plan.boundMinute ?? 0, to: plan.to };
+  const last = plan.minuteForm === "wildcard" ? plan.boundMinute ?? 0 : 0;
+  return { from: plan.from, last, to: plan.to };
 }
 function hourWindow(window, opts) {
   return "from " + getTime({ hour: window.from, minute: 0 }, opts) + through(opts) + getTime({ hour: window.to, minute: window.last }, opts);
 }
 function renderClockTimes(ir, plan, opts) {
   if (ir.shapes.minute === "single") {
-    const cadence = hourCadence(ir, +ir.pattern.minute, opts);
+    const minute = +ir.pattern.minute;
+    const cadence = hourCadence(ir, minute, opts) ?? hourRangeCadence(ir, minute, opts);
     if (cadence !== null) {
       return cadence;
     }
@@ -1166,9 +1209,9 @@ function renderClockTimes(ir, plan, opts) {
 }
 function renderCompactClockTimes(ir, plan, opts) {
   if (plan.fold) {
-    const cadence = hourCadence(ir, +plan.minute, opts);
-    if (cadence !== null) {
-      return cadence;
+    const cadence2 = hourCadence(ir, +plan.minute, opts) ?? hourRangeCadence(ir, +plan.minute, opts);
+    if (cadence2 !== null) {
+      return cadence2;
     }
     const hasRange = ir.analyses.segments.hour.some(function range(segment) {
       return segment.kind === "range";
@@ -1179,16 +1222,18 @@ function renderCompactClockTimes(ir, plan, opts) {
     const fold = { minute: plan.minute, second: ir.analyses.clockSecond };
     return interpretDayQualifier(ir, opts) + "at " + hourSegmentTimes(ir, fold, true, opts);
   }
-  const phrase = (
+  const minuteLead = (
     // The non-fold branch is a minute list, which has segments. An
     // offset/uneven step enumerated to that list reads as a stride.
-    (strideFromSegments(ir.analyses.segments.minute, "minute", "hour", opts) ?? listPastThe(
+    strideFromSegments(ir.analyses.segments.minute, "minute", "hour", opts) ?? listPastThe(
       segmentWords(ir.analyses.segments.minute, opts),
       "minute",
       "hour",
       opts
-    )) + ", at " + hourSegmentTimes(ir, { minute: 0, second: null }, true, opts) + trailingQualifier(ir, opts)
+    )
   );
+  const cadence = unevenHourCadence(ir, opts);
+  const phrase = cadence ? minuteLead + ", " + cadence + trailingQualifier(ir, opts) : minuteLead + ", at " + hourSegmentTimes(ir, { minute: 0, second: null }, true, opts) + trailingQualifier(ir, opts);
   return ir.analyses.clockSecond ? secondsLeadClause(ir, opts) + ", " + phrase : phrase;
 }
 function foldedHourWindows(ir, plan, opts) {
@@ -1306,16 +1351,46 @@ function hourStrideCadence(stride, opts) {
   }
   return cadence + " from " + getTime({ hour: start, minute: 0 }, opts) + through(opts) + getTime({ hour: last, minute: 0 }, opts);
 }
+function offsetCleanStride(stride) {
+  return stride.start < stride.interval && 24 % stride.interval === 0;
+}
+function unevenHourCadence(ir, opts) {
+  const stride = hourStride(ir);
+  if (!stride || offsetCleanStride(stride)) {
+    return null;
+  }
+  return hourStrideCadence(stride, opts);
+}
+function hourListStride(values) {
+  if (values.length < 2) {
+    return null;
+  }
+  const interval = values[1] - values[0];
+  if (interval < 2) {
+    return null;
+  }
+  for (let i = 2; i < values.length; i += 1) {
+    if (values[i] - values[i - 1] !== interval) {
+      return null;
+    }
+  }
+  if (values[0] !== 0 && values.length < 5) {
+    return null;
+  }
+  return { interval, last: values[values.length - 1], start: values[0] };
+}
 function hourStride(ir) {
   const segments = ir.analyses.segments.hour;
   if (segments.length === 1 && segments[0].kind === "step") {
     const segment = segments[0];
+    if (segment.fires.length < 2) {
+      return null;
+    }
     const start = segment.startToken === "*" ? 0 : +segment.startToken.split("-")[0];
     return { interval: segment.interval, last: segment.fires[segment.fires.length - 1], start };
   }
   const values = singleValues(segments);
-  const step = values && arithmeticStep(values);
-  return step || null;
+  return values && hourListStride(values);
 }
 function subMinuteSecond(ir) {
   return ir.pattern.second === "*" || ir.shapes.second === "step";
@@ -1339,13 +1414,16 @@ function hourCadence(ir, minute, opts) {
     return null;
   }
   const fires = (stride.last - stride.start) / stride.interval + 1;
-  if (ir.pattern.second === "0" && fires <= maxClockTimes) {
+  if (ir.pattern.second === "0" && fires <= maxClockTimes && offsetCleanStride(stride)) {
     return null;
   }
   const confinement = minute === 0 && subMinuteSecond(ir) && cleanStrideSegment(ir);
   if (confinement) {
     return secondsClause(ir, "minute", opts) + " for one minute " + everyNthHour(confinement, opts) + trailingQualifier(ir, opts);
   }
+  if (minute === 0 && ir.pattern.second === "0") {
+    return hourStrideCadence(stride, opts) + trailingQualifier(ir, opts);
+  }
   return hourCadenceLead(ir, minute, opts) + ", " + hourStrideCadence(stride, opts) + trailingQualifier(ir, opts);
 }
 function cleanStrideSegment(ir) {
@@ -1356,6 +1434,46 @@ function cleanStrideSegment(ir) {
   }
   return segment;
 }
+function hasHourWindow(ir) {
+  return ir.analyses.segments.hour.some(function range(segment) {
+    return segment.kind === "range";
+  });
+}
+function hourRangeWindowTail(ir, opts) {
+  const windows = [];
+  const singles = [];
+  ir.analyses.segments.hour.forEach(function classify(segment) {
+    if (segment.kind === "range") {
+      windows.push("from " + getTime(
+        { hour: +segment.bounds[0], minute: 0 },
+        opts
+      ) + through(opts) + getTime({ hour: +segment.bounds[1], minute: 0 }, opts));
+    } else if (segment.kind === "step") {
+      singles.push(...segment.fires);
+    } else {
+      singles.push(+segment.value);
+    }
+  });
+  let phrase = "every hour " + joinList(windows, opts);
+  if (singles.length) {
+    phrase += " and at " + joinList(singles.map(function time(hour) {
+      return getTime({ hour, minute: 0 }, opts);
+    }), opts);
+  }
+  return phrase;
+}
+function hourRangeCadence(ir, minute, opts) {
+  if (minute !== 0 || !hasHourWindow(ir)) {
+    return null;
+  }
+  if (ir.pattern.second === "0") {
+    return null;
+  }
+  if (subMinuteSecond(ir)) {
+    return secondsClause(ir, "minute", opts) + " for one minute during the " + hourSegmentTimes(ir, { minute: 0, second: null }, false, opts) + " hours" + trailingQualifier(ir, opts);
+  }
+  return hourCadenceLead(ir, minute, opts) + ", " + hourRangeWindowTail(ir, opts) + trailingQualifier(ir, opts);
+}
 function seriesNumber(values, opts) {
   const anyBig = values.some(function big(v) {
     return +v > 10;
@@ -1520,17 +1638,27 @@ function monthFoldsIntoDate(ir) {
 function dateOrWeekday(ir, opts) {
   const pattern = ir.pattern;
   const weekdayPart = quartzWeekdayPhrase(pattern.weekday, opts) || "on " + weekdayPhrase(ir, opts);
+  if (pattern.month !== "*" && monthFoldsIntoDate(ir) && !quartzDatePhrase(pattern.date, opts) && !isOpenStep(pattern.date)) {
+    return "on " + monthDatePhrase(ir, opts) + " or " + weekdayPart + " in " + monthName(ir, opts);
+  }
+  return datePart(ir, opts) + " or " + weekdayPart + orMonthScope(ir, opts);
+}
+function datePart(ir, opts) {
+  const pattern = ir.pattern;
   const quartzDate = quartzDatePhrase(pattern.date, opts);
   if (quartzDate) {
-    return quartzDate + monthScope(ir, opts) + " or " + weekdayPart;
+    return quartzDate;
   }
   if (isOpenStep(pattern.date)) {
-    return stepDates(pattern.date) + monthScope(ir, opts) + " or " + weekdayPart;
+    return stepDates(pattern.date);
   }
-  if (pattern.month !== "*" && monthFoldsIntoDate(ir)) {
-    return "on " + monthDatePhrase(ir, opts) + " or " + weekdayPart + " in " + monthName(ir, opts);
+  return "on the " + dateOrdinals(ir, opts);
+}
+function orMonthScope(ir, opts) {
+  if (ir.pattern.month === "*") {
+    return "";
   }
-  return "on the " + dateOrdinals(ir, opts) + " or " + weekdayPart + monthScope(ir, opts);
+  return ", in " + monthName(ir, opts);
 }
 function quartzDatePhrase(dateField, opts) {
   if (dateField === "L") {
@@ -1612,7 +1740,8 @@ function oddEvenMonth(monthField) {
   return start === "2" ? "every even-numbered month" : null;
 }
 function weekdayPhrase(ir, opts) {
-  return renderSegments(ir.analyses.segments.weekday, function name(value) {
+  const segments = orderWeekdaysForDisplay(ir.analyses.segments.weekday);
+  return renderSegments(segments, function name(value) {
     return getWeekday(value, opts);
   }, opts);
 }