cronli5 0.1.5 → 0.1.7

package/dist/lang/de.js

@@ -36,6 +36,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()];
 }
@@ -96,6 +116,9 @@ function everyUnit(unit) {
 function everyN(interval, unit) {
   return "alle " + interval + " " + unit.plural;
 }
+function withAnchor(clause, anchor) {
+  return anchor ? clause + " " + anchor : clause;
+}
 function stepSegment(segments) {
   return segments[0];
 }
@@ -119,7 +142,10 @@ function stepClause(segment, unit, anchor) {
   const start = segment.startToken === "*" ? 0 : +segment.startToken;
   const short = start !== 0 && segment.fires.length <= 3;
   if (segment.startToken.indexOf("-") !== -1 || short) {
-    return "in den " + unit.plural + " " + joinList(segment.fires.map(String)) + " " + anchor;
+    return withAnchor(
+      "in den " + unit.plural + " " + joinList(segment.fires.map(String)),
+      anchor
+    );
   }
   return renderStride({
     interval: segment.interval,
@@ -180,7 +206,7 @@ function weekdayRange(bounds) {
   return weekdayName(bounds[0]) + " bis " + weekdayName(bounds[1]);
 }
 function weekdayQualifier(ir) {
-  const segments = flattenSteps(fieldSegments(ir, "weekday"));
+  const segments = orderWeekdaysForDisplay(fieldSegments(ir, "weekday"));
   if (segments.length === 1 && segments[0].kind === "range") {
     return weekdayRange(segments[0].bounds);
   }
@@ -320,8 +346,11 @@ function countedPhrase(ir, field, singular, plural) {
   }
   return "in den " + plural + " " + joinList(fieldValues(ir, field));
 }
+function minuteAnchor(ir) {
+  return ir.pattern.minute === "*" ? "jeder Minute" : "";
+}
 function secondsLead(ir) {
-  return secondsClause(ir, "jeder Minute");
+  return secondsClause(ir, minuteAnchor(ir));
 }
 function secondsClause(ir, anchor) {
   if (ir.pattern.second === "*") {
@@ -331,7 +360,7 @@ function secondsClause(ir, anchor) {
   if (ir.shapes.second === "step") {
     return stepClause(stepSegment(segments), UNITS.second, anchor);
   }
-  return strideFromSegments(segments, UNITS.second, anchor) ?? countedPhrase(ir, "second", "Sekunde", "Sekunden") + " " + anchor;
+  return strideFromSegments(segments, UNITS.second, anchor) ?? withAnchor(countedPhrase(ir, "second", "Sekunde", "Sekunden"), anchor);
 }
 function spanTime(hour, minute, sep) {
   return hour + sep + pad(minute);
@@ -432,9 +461,17 @@ function renderMinuteSpanInHour(ir, plan, opts) {
   const sep = opts.style.sep;
   return "jede Minute von " + spanTime(plan.hour, plan.span[0], sep) + " bis " + spanTime(plan.hour, plan.span[1], sep) + " Uhr";
 }
+function isEveryOtherMinuteSeconds(ir, plan) {
+  if (plan.rest.kind !== "minuteFrequency" || ir.shapes.second !== "wildcard" || ir.shapes.hour !== "wildcard") {
+    return false;
+  }
+  const minuteStep = stepSegment(ir.analyses.segments.minute);
+  return minuteStep.startToken === "*" && minuteStep.interval === 2;
+}
 function renderComposeSeconds(ir, plan, opts) {
   if ((plan.rest.kind === "clockTimes" || plan.rest.kind === "compactClockTimes") && ir.shapes.minute === "single") {
-    const cadence = hourCadence(ir, +ir.pattern.minute);
+    const minute = +ir.pattern.minute;
+    const cadence = hourCadence(ir, minute) ?? hourRangeCadence(ir, minute);
     if (cadence !== null) {
       return cadence;
     }
@@ -442,13 +479,12 @@ function renderComposeSeconds(ir, plan, opts) {
   if (composeMinuteZero(ir, plan)) {
     return secondsLead(ir) + " " + clockMinuteGenitive(plan.rest.times, opts.style.sep);
   }
-  if (plan.rest.kind === "minuteFrequency" && ir.shapes.second === "wildcard" && ir.shapes.hour === "wildcard") {
-    const minuteStep = stepSegment(ir.analyses.segments.minute);
-    if (minuteStep.startToken === "*" && minuteStep.interval === 2) {
-      return secondsLead(ir) + " jeder zweiten Minute";
-    }
+  if (isEveryOtherMinuteSeconds(ir, plan)) {
+    return secondsLead(ir) + " jeder zweiten Minute";
   }
-  return secondsLead(ir) + ", " + render(ir, plan.rest, opts);
+  const restOwnsLead = plan.rest.kind === "compactClockTimes" && ir.analyses.clockSecond;
+  const lead = restOwnsLead ? "" : secondsLead(ir) + ", ";
+  return lead + render(ir, plan.rest, opts);
 }
 function composeMinuteZero(ir, plan) {
   return plan.rest.kind === "clockTimes" && plan.rest.times.every((time) => +time.minute === 0);
@@ -461,31 +497,37 @@ function clockMinuteGenitive(times, sep) {
 }
 function renderMinutesAcrossHours(ir, plan, opts) {
   const sep = opts.style.sep;
+  const cadence = unevenHourCadence(ir);
   if (plan.form === "wildcard") {
-    return "jede Minute " + duringHours(ir, plan.times, sep);
+    return cadence ? "jede Minute, " + cadence : "jede Minute " + duringHours(ir, plan.times, sep);
+  }
+  const minuteLead = strideFromSegments(fieldSegments(ir, "minute"), UNITS.minute, "") ?? countedPhrase(ir, "minute", "Minute", "Minuten");
+  if (cadence !== null) {
+    return minuteLead + ", " + cadence;
   }
   const hours = plan.times.kind === "fires" ? atHours(plan.times.fires) : joinList(hourSegmentParts(ir, 0, 0, sep));
-  return (strideFromSegments(fieldSegments(ir, "minute"), UNITS.minute, "") ?? countedPhrase(ir, "minute", "Minute", "Minuten")) + ", " + hours;
+  return minuteLead + ", " + hours;
 }
 function renderMinuteSpanAcrossHourStep(ir, plan) {
+  const cadence = unevenHourCadence(ir);
   if (plan.form === "wildcard") {
     return "jede Minute " + everyNthHour(stepSegment(ir.analyses.segments.hour));
   }
   const segment = stepSegment(ir.analyses.segments.hour);
-  const hours = confinedHourStride(segment) ? everyNthHour(segment) : atHours(segment.fires);
+  const hours = cadence ?? (confinedHourStride(segment) ? everyNthHour(segment) : atHours(segment.fires));
   return (strideFromSegments(fieldSegments(ir, "minute"), UNITS.minute, "") ?? countedPhrase(ir, "minute", "Minute", "Minuten")) + ", " + hours;
 }
 function renderCompactClockTimes(ir, plan, opts) {
   const sep = opts.style.sep;
   if (plan.fold) {
-    const cadence = hourCadence(ir, plan.minute);
+    const cadence = hourCadence(ir, plan.minute) ?? hourRangeCadence(ir, plan.minute);
     if (cadence !== null) {
       return cadence;
     }
     const hourly = fieldSegments(ir, "hour").some((segment) => segment.kind === "range");
     return (hourly ? "st\xFCndlich " : "t\xE4glich ") + joinList(hourSegmentParts(ir, plan.minute, ir.analyses.clockSecond, sep));
   }
-  const hours = fieldSegments(ir, "hour").some((segment) => segment.kind === "range") ? joinList(hourSegmentParts(ir, 0, 0, sep)) : atHours(hourFires(ir));
+  const hours = unevenHourCadence(ir) ?? (fieldSegments(ir, "hour").some((segment) => segment.kind === "range") ? joinList(hourSegmentParts(ir, 0, 0, sep)) : atHours(hourFires(ir)));
   const lead = ir.analyses.clockSecond ? countedPhrase(ir, "second", "Sekunde", "Sekunden") + ", " : "";
   return lead + (strideFromSegments(fieldSegments(ir, "minute"), UNITS.minute, "") ?? countedPhrase(ir, "minute", "Minute", "Minuten")) + ", " + hours;
 }
@@ -493,18 +535,25 @@ function renderMinuteFrequency(ir, plan, opts) {
   const segment = stepSegment(ir.analyses.segments.minute);
   const sep = opts.style.sep;
   const clean = cleanStep(segment, 60);
-  const base = stepClause(segment, UNITS.minute, "jeder Stunde");
   if (plan.hours.kind === "window") {
+    const singleHour = plan.hours.from === plan.hours.to;
+    const base2 = stepClause(
+      segment,
+      UNITS.minute,
+      singleHour ? "" : "jeder Stunde"
+    );
     const window = hourWindow(
       plan.hours.from,
       plan.hours.to,
       plan.hours.last,
       sep
     );
-    return clean ? base + " " + window : base + ", " + window;
+    return clean ? base2 + " " + window : base2 + ", " + window;
   }
+  const base = stepClause(segment, UNITS.minute, "jeder Stunde");
   if (plan.hours.kind === "during") {
-    return base + " " + duringHours(ir, plan.hours.times, sep);
+    const cadence = unevenHourCadence(ir);
+    return cadence ? base + ", " + cadence : base + " " + duringHours(ir, plan.hours.times, sep);
   }
   if (plan.hours.kind === "step") {
     return base + " " + everyNthHour(stepSegment(ir.analyses.segments.hour));
@@ -512,8 +561,23 @@ function renderMinuteFrequency(ir, plan, opts) {
   return base;
 }
 function hourStepPhrase(ir) {
+  const cadence = unevenHourCadence(ir);
+  if (cadence !== null) {
+    return cadence;
+  }
   const segment = stepSegment(ir.analyses.segments.hour);
-  return cleanStep(segment, 24) ? everyN(segment.interval, UNITS.hour) : atHours(segment.fires);
+  if (cleanStep(segment, 24)) {
+    return everyN(segment.interval, UNITS.hour);
+  }
+  const stride = openOffsetCleanStride(ir, segment);
+  return stride ? hourStrideCadence(stride) : atHours(segment.fires);
+}
+function openOffsetCleanStride(ir, segment) {
+  if (segment.startToken.indexOf("-") !== -1) {
+    return null;
+  }
+  const stride = hourStride(ir);
+  return stride && offsetCleanStride(stride) ? stride : null;
 }
 function hourStrideCadence(stride) {
   const { start, interval, last } = stride;
@@ -527,6 +591,27 @@ function hourStrideCadence(stride) {
   }
   return cadence + " von " + start + " bis " + last + " Uhr";
 }
+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 offsetCleanStride(stride) {
+  return stride.start < stride.interval && 24 % stride.interval === 0;
+}
 function hourStride(ir) {
   const segments = fieldSegments(ir, "hour");
   if (!segments) {
@@ -534,12 +619,21 @@ function hourStride(ir) {
   }
   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 unevenHourCadence(ir) {
+  const stride = hourStride(ir);
+  if (!stride || offsetCleanStride(stride)) {
+    return null;
+  }
+  return hourStrideCadence(stride);
 }
 function subMinuteSecond(ir) {
   return ir.pattern.second === "*" || ir.shapes.second === "step";
@@ -547,7 +641,7 @@ function subMinuteSecond(ir) {
 function hourCadenceLead(ir, minute) {
   if (minute === 0) {
     if (subMinuteSecond(ir)) {
-      return secondsClause(ir, "jeder Minute") + " f\xFCr eine Minute";
+      return withAnchor(secondsClause(ir, minuteAnchor(ir)), "f\xFCr eine Minute");
     }
     return secondsClause(ir, "jeder Stunde");
   }
@@ -555,7 +649,7 @@ function hourCadenceLead(ir, minute) {
   if (ir.pattern.second === "0") {
     return minutePhrase;
   }
-  return secondsClause(ir, "jeder Minute") + ", " + minutePhrase;
+  return secondsClause(ir, minuteAnchor(ir)) + ", " + minutePhrase;
 }
 function hourCadence(ir, minute) {
   const stride = hourStride(ir);
@@ -563,37 +657,60 @@ function hourCadence(ir, minute) {
     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 segment = fieldSegments(ir, "hour")[0];
   const confined = minute === 0 && subMinuteSecond(ir) && fieldSegments(ir, "hour").length === 1 && segment.kind === "step" && confinedHourStride(segment);
   if (confined) {
-    return secondsClause(ir, "jeder Minute") + " f\xFCr eine Minute " + everyNthHour(segment);
+    return withAnchor(secondsClause(ir, minuteAnchor(ir)), "f\xFCr eine Minute") + " " + everyNthHour(segment);
+  }
+  if (minute === 0 && ir.pattern.second === "0") {
+    return hourStrideCadence(stride);
   }
   return hourCadenceLead(ir, minute) + ", " + hourStrideCadence(stride);
 }
 function hourCadenceApplies(ir) {
-  return ir.shapes.minute === "single" && hourCadence(ir, +ir.pattern.minute) !== null;
+  if (ir.shapes.minute !== "single") {
+    return false;
+  }
+  const minute = +ir.pattern.minute;
+  return hourCadence(ir, minute) !== null || hourRangeCadence(ir, minute) !== null;
+}
+function hasHourWindow(ir) {
+  const segments = fieldSegments(ir, "hour");
+  return !!segments && segments.some(function range(segment) {
+    return segment.kind === "range";
+  });
+}
+function hourRangeCadence(ir, minute) {
+  if (minute !== 0 || !hasHourWindow(ir) || ir.pattern.second === "0") {
+    return null;
+  }
+  return hourCadenceLead(ir, minute) + ", " + hourRangeWindowTail(ir);
+}
+function hourRangeWindowTail(ir) {
+  return joinList(hourSegmentParts(ir, 0, 0, ":"));
 }
 function renderHourRange(ir, plan, opts) {
-  const window = hourWindow(
-    plan.from,
-    plan.to,
-    plan.boundMinute ?? 0,
-    opts.style.sep
-  );
+  const last = plan.minuteForm === "wildcard" ? plan.boundMinute ?? 0 : 0;
+  const window = hourWindow(plan.from, plan.to, last, opts.style.sep);
   if (plan.minuteForm === "wildcard") {
     return "jede Minute " + window;
   }
   if (plan.minuteForm === "lead" && ir.pattern.minute === "0") {
     return "st\xFCndlich " + window;
   }
-  return countedPhrase(ir, "minute", "Minute", "Minuten") + " jeder Stunde, " + window;
+  return (strideFromSegments(
+    fieldSegments(ir, "minute"),
+    UNITS.minute,
+    "jeder Stunde"
+  ) ?? countedPhrase(ir, "minute", "Minute", "Minuten") + " jeder Stunde") + ", " + window;
 }
 function renderClockTimes(ir, plan, opts) {
   if (ir.shapes.minute === "single") {
-    const cadence = hourCadence(ir, +ir.pattern.minute);
+    const minute = +ir.pattern.minute;
+    const cadence = hourCadence(ir, minute) ?? hourRangeCadence(ir, minute);
     if (cadence !== null) {
       return cadence;
     }
@@ -653,7 +770,11 @@ function needsDailyFrame(ir) {
   if (ir.plan.kind === "clockTimes" || isComposeMinuteZero(ir)) {
     return true;
   }
-  return ir.plan.kind === "hourStep" && !cleanStep(stepSegment(ir.analyses.segments.hour), 24);
+  if (ir.plan.kind !== "hourStep") {
+    return false;
+  }
+  const segment = stepSegment(ir.analyses.segments.hour);
+  return !cleanStep(segment, 24) && !openOffsetCleanStride(ir, segment);
 }
 function render(ir, plan, opts) {
   return renderers[plan.kind](