cronli5 0.1.4 → 0.1.6

package/dist/lang/de.js

@@ -14,12 +14,28 @@ var weekdayNumbers = {
   FRI: 5,
   SAT: 6
 };
+var maxClockTimes = 6;
 
 // src/core/util.ts
 function isNonNegativeInteger(value) {
   const digits = /^\d+$/;
   return digits.test(value);
 }
+function arithmeticStep(values) {
+  if (values.length < 5) {
+    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;
+    }
+  }
+  return { start: values[0], interval, last: values[values.length - 1] };
+}
 function toFieldNumber(token, numberMap) {
   return isNonNegativeInteger(token) ? +token : numberMap[token.toUpperCase()];
 }
@@ -86,6 +102,49 @@ function stepSegment(segments) {
 function cleanStep(segment, cycle) {
   return (segment.startToken === "*" || +segment.startToken === 0) && cycle % segment.interval === 0;
 }
+function renderStride(stride) {
+  const { interval, start, last, cycle, unit, anchor } = stride;
+  const cadence = everyN(interval, unit);
+  const tiles = cycle % interval === 0;
+  if (start === 0 && tiles) {
+    return cadence;
+  }
+  const tail = anchor ? " " + anchor : "";
+  if (start < interval && tiles) {
+    return cadence + " ab " + unit.singular + " " + start + tail;
+  }
+  return cadence + " von " + unit.singular + " " + start + " bis " + last + tail;
+}
+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 renderStride({
+    interval: segment.interval,
+    start,
+    last: segment.fires[segment.fires.length - 1],
+    cycle: 60,
+    unit,
+    anchor
+  });
+}
+function singleValues(segments) {
+  const values = [];
+  for (const segment of segments) {
+    if (segment.kind !== "single") {
+      return null;
+    }
+    values.push(+segment.value);
+  }
+  return values;
+}
+function strideFromSegments(segments, unit, anchor) {
+  const values = singleValues(segments);
+  const step = values && arithmeticStep(values);
+  return step ? renderStride({ ...step, cycle: 60, unit, anchor }) : null;
+}
 var weekdayNames = [
   "sonntags",
   "montags",
@@ -152,6 +211,13 @@ function everyNthHour(segment) {
   const start = segment.startToken === "*" ? 0 : +segment.startToken;
   return start === 0 ? base : base + " ab " + start + " Uhr";
 }
+function confinedHourStride(segment) {
+  if (segment.startToken.indexOf("-") !== -1) {
+    return false;
+  }
+  const start = segment.startToken === "*" ? 0 : +segment.startToken;
+  return 24 % segment.interval === 0 && start < segment.interval;
+}
 function weekdayNoun(token) {
   return weekdayNouns[toFieldNumber(token, weekdayNumbers)];
 }
@@ -255,14 +321,17 @@ function countedPhrase(ir, field, singular, plural) {
   return "in den " + plural + " " + joinList(fieldValues(ir, field));
 }
 function secondsLead(ir) {
+  return secondsClause(ir, "jeder Minute");
+}
+function secondsClause(ir, anchor) {
   if (ir.pattern.second === "*") {
     return "jede Sekunde";
   }
   const segments = ir.analyses.segments.second;
-  if (ir.shapes.second === "step" && cleanStep(stepSegment(segments), 60)) {
-    return everyN(stepSegment(segments).interval, UNITS.second);
+  if (ir.shapes.second === "step") {
+    return stepClause(stepSegment(segments), UNITS.second, anchor);
   }
-  return countedPhrase(ir, "second", "Sekunde", "Sekunden") + " jeder Minute";
+  return strideFromSegments(segments, UNITS.second, anchor) ?? countedPhrase(ir, "second", "Sekunde", "Sekunden") + " " + anchor;
 }
 function spanTime(hour, minute, sep) {
   return hour + sep + pad(minute);
@@ -331,8 +400,15 @@ function renderEveryHour() {
 function renderSeconds(ir) {
   return secondsLead(ir);
 }
+function minutePastClause(ir) {
+  return strideFromSegments(
+    fieldSegments(ir, "minute"),
+    UNITS.minute,
+    "jeder Stunde"
+  ) ?? countedPhrase(ir, "minute", "Minute", "Minuten") + " jeder Stunde";
+}
 function renderMinutePast(ir) {
-  return countedPhrase(ir, "minute", "Minute", "Minuten") + " jeder Stunde";
+  return minutePastClause(ir);
 }
 function renderSecondsWithinMinute(ir, plan) {
   if (plan.singleSecond) {
@@ -356,11 +432,30 @@ 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 minute = +ir.pattern.minute;
+    const cadence = hourCadence(ir, minute) ?? hourRangeCadence(ir, minute);
+    if (cadence !== null) {
+      return cadence;
+    }
+  }
   if (composeMinuteZero(ir, plan)) {
     return secondsLead(ir) + " " + clockMinuteGenitive(plan.rest.times, opts.style.sep);
   }
-  return secondsLead(ir) + ", " + render(ir, plan.rest, opts);
+  if (isEveryOtherMinuteSeconds(ir, plan)) {
+    return secondsLead(ir) + " jeder zweiten Minute";
+  }
+  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);
@@ -373,33 +468,45 @@ 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 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));
   }
-  return countedPhrase(ir, "minute", "Minute", "Minuten") + ", " + hourStepPhrase(ir);
+  const segment = stepSegment(ir.analyses.segments.hour);
+  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) ?? 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 + countedPhrase(ir, "minute", "Minute", "Minuten") + ", " + hours;
+  return lead + (strideFromSegments(fieldSegments(ir, "minute"), UNITS.minute, "") ?? countedPhrase(ir, "minute", "Minute", "Minuten")) + ", " + hours;
 }
 function renderMinuteFrequency(ir, plan, opts) {
   const segment = stepSegment(ir.analyses.segments.minute);
   const sep = opts.style.sep;
   const clean = cleanStep(segment, 60);
-  const base = clean ? everyN(segment.interval, UNITS.minute) : countedPhrase(ir, "minute", "Minute", "Minuten") + " jeder Stunde";
+  const base = stepClause(segment, UNITS.minute, "jeder Stunde");
   if (plan.hours.kind === "window") {
     const window = hourWindow(
       plan.hours.from,
@@ -410,7 +517,8 @@ function renderMinuteFrequency(ir, plan, opts) {
     return clean ? base + " " + window : base + ", " + window;
   }
   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));
@@ -418,9 +526,126 @@ 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);
 }
+function hourStrideCadence(stride) {
+  const { start, interval, last } = stride;
+  const cadence = everyN(interval, UNITS.hour);
+  const tiles = 24 % interval === 0;
+  if (start === 0 && tiles) {
+    return cadence;
+  }
+  if (start < interval && tiles) {
+    return cadence + " ab " + start + " Uhr";
+  }
+  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) {
+    return null;
+  }
+  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);
+  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";
+}
+function hourCadenceLead(ir, minute) {
+  if (minute === 0) {
+    if (subMinuteSecond(ir)) {
+      return secondsClause(ir, "jeder Minute") + " f\xFCr eine Minute";
+    }
+    return secondsClause(ir, "jeder Stunde");
+  }
+  const minutePhrase = "in Minute " + minute;
+  if (ir.pattern.second === "0") {
+    return minutePhrase;
+  }
+  return secondsClause(ir, "jeder Minute") + ", " + minutePhrase;
+}
+function hourCadence(ir, minute) {
+  const stride = hourStride(ir);
+  if (!stride) {
+    return null;
+  }
+  const fires = (stride.last - stride.start) / stride.interval + 1;
+  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);
+  }
+  if (minute === 0 && ir.pattern.second === "0") {
+    return hourStrideCadence(stride);
+  }
+  return hourCadenceLead(ir, minute) + ", " + hourStrideCadence(stride);
+}
+function hourCadenceApplies(ir) {
+  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,
@@ -434,9 +659,20 @@ function renderHourRange(ir, plan, opts) {
   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 minute = +ir.pattern.minute;
+    const cadence = hourCadence(ir, minute) ?? hourRangeCadence(ir, minute);
+    if (cadence !== null) {
+      return cadence;
+    }
+  }
   return "um " + timesPhrase(plan.times, opts.style.sep);
 }
 var renderers = {
@@ -486,6 +722,9 @@ function isComposeMinuteZero(ir) {
   return ir.plan.kind === "composeSeconds" && composeMinuteZero(ir, ir.plan);
 }
 function needsDailyFrame(ir) {
+  if (hourCadenceApplies(ir)) {
+    return false;
+  }
   if (ir.plan.kind === "clockTimes" || isComposeMinuteZero(ir)) {
     return true;
   }