cronli5 0.1.4 → 0.1.6

package/dist/lang/fi.cjs

@@ -50,12 +50,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()];
 }
@@ -191,12 +207,14 @@ var units = {
     mark: "joka tunti",
     anchor: "jokaisen tunnin",
     ela: "minuutista",
+    ill: "minuuttiin",
     gen: "minuutin"
   },
   second: {
     mark: "joka minuutti",
     anchor: "jokaisen minuutin",
     ela: "sekunnista",
+    ill: "sekuntiin",
     gen: "sekunnin"
   }
 };
@@ -252,28 +270,55 @@ function renderSecondsWithinMinute(ir, plan, opts) {
   }
   return secondsLeadClause(ir, opts) + ", " + atMarks(minuteField, units.minute, true) + trailingQualifier(ir, opts);
 }
+function composeSecondsOverMinuteStep(ir, freq, opts) {
+  const seg = stepSegment(ir.analyses.segments.minute);
+  const stepPhrase = stepCycle60(seg, units.minute, opts);
+  if (freq.hours.kind === "during" && minuteStepIsAnchored(seg)) {
+    const bareHours = kloFromTimes(ir, freq.hours.times, opts);
+    return hoursFirstMinutes(bareHours, ir, opts) + ", " + secondsLeadClause(ir, opts) + trailingQualifier(ir, opts);
+  }
+  let hourClause = "";
+  if (freq.hours.kind === "during") {
+    hourClause = " " + hourWindowsFromTimes(ir, freq.hours.times, opts);
+  } else if (freq.hours.kind === "window") {
+    hourClause = " " + hourWindow(freq.hours, opts);
+  } else if (freq.hours.kind === "step") {
+    hourClause = " " + everyNthHour(stepSegment(ir.analyses.segments.hour), opts);
+  }
+  return stepPhrase + ", " + secondsLeadClause(ir, opts) + hourClause + trailingQualifier(ir, opts);
+}
+function composeHourCadence(ir, plan, opts) {
+  const clockRest = plan.rest.kind === "clockTimes" || plan.rest.kind === "compactClockTimes";
+  if (!clockRest || ir.shapes.minute !== "single") {
+    return null;
+  }
+  const minute = +ir.pattern.minute;
+  return hourCadence(ir, minute, opts) ?? hourRangeCadence(ir, minute, opts);
+}
 function renderComposeSeconds(ir, plan, opts) {
+  const cadence = composeHourCadence(ir, plan, opts);
+  if (cadence !== null) {
+    return cadence;
+  }
   if (plan.rest.kind === "minuteFrequency" && ir.pattern.second !== "*") {
-    const freq = plan.rest;
-    const seg = stepSegment(ir.analyses.segments.minute);
-    const stepPhrase = stepCycle60(seg, units.minute, opts);
-    let hourClause = "";
-    if (freq.hours.kind === "during" && minuteStepIsAnchored(seg)) {
-      const bareHours = kloFromTimes(ir, freq.hours.times, opts);
-      return hoursFirstMinutes(bareHours, ir) + ", " + secondsLeadClause(ir, opts) + trailingQualifier(ir, opts);
-    } else if (freq.hours.kind === "during" && !minuteStepIsAnchored(seg)) {
-      hourClause = " " + hourWindowsFromTimes(ir, freq.hours.times, opts);
-    } else if (freq.hours.kind === "window") {
-      hourClause = " " + hourWindow(freq.hours, opts);
-    } else if (freq.hours.kind === "step") {
-      hourClause = " " + everyNthHour(stepSegment(ir.analyses.segments.hour), opts);
-    }
-    return stepPhrase + ", " + secondsLeadClause(ir, opts) + hourClause + trailingQualifier(ir, opts);
+    return composeSecondsOverMinuteStep(ir, plan.rest, opts);
   }
   if (plan.rest.kind === "clockTimes" && plan.rest.times.every((time) => +time.minute === 0)) {
     return composeMinuteZero(ir, plan.rest, opts);
   }
-  return secondsLeadClause(ir, opts) + ", " + render(ir, plan.rest, opts);
+  if (isEveryOtherMinuteSeconds(ir, plan)) {
+    return secondsLeadClause(ir, opts) + " joka toisena minuuttina";
+  }
+  const restOwnsLead = plan.rest.kind === "compactClockTimes" && ir.analyses.clockSecond;
+  const lead = restOwnsLead ? "" : secondsLeadClause(ir, opts) + ", ";
+  return lead + render(ir, plan.rest, opts);
+}
+function isEveryOtherMinuteSeconds(ir, plan) {
+  if (plan.rest.kind !== "minuteFrequency" || ir.pattern.second !== "*" || ir.shapes.hour !== "wildcard") {
+    return false;
+  }
+  const seg = stepSegment(ir.analyses.segments.minute);
+  return seg.startToken === "*" && seg.interval === 2;
 }
 function composeMinuteZero(ir, rest, opts) {
   const clocks = rest.times.map(function clock(time) {
@@ -303,7 +348,7 @@ function secondsLeadClause(ir, opts) {
   if (shape === "single") {
     return atMarks(secondField, units.second, marked);
   }
-  return atMarks(
+  return strideFromSegments(ir.analyses.segments.second, units.second, opts) ?? atMarks(
     joinList(segmentWords(ir.analyses.segments.second)),
     units.second,
     marked
@@ -316,20 +361,20 @@ function renderSingleMinute(ir, plan, opts) {
   return atMarks(ir.pattern.minute, units.minute, true) + trailingQualifier(ir, opts);
 }
 function renderRangeOfMinutes(ir, plan, opts) {
-  return minutesList(ir) + trailingQualifier(ir, opts);
+  return minutesList(ir, opts) + trailingQualifier(ir, opts);
 }
 function renderMultipleMinutes(ir, plan, opts) {
-  return minutesList(ir) + trailingQualifier(ir, opts);
+  return minutesList(ir, opts) + trailingQualifier(ir, opts);
 }
-function minutesList(ir) {
-  return atMarks(
+function minutesList(ir, opts) {
+  return strideFromSegments(ir.analyses.segments.minute, units.minute, opts) ?? atMarks(
     joinList(segmentWords(ir.analyses.segments.minute)),
     units.minute,
     true
   );
 }
-function bareMinutes(ir) {
-  return atMarks(
+function bareMinutes(ir, opts) {
+  return strideFromSegments(ir.analyses.segments.minute, units.minute, opts) ?? atMarks(
     joinList(segmentWords(ir.analyses.segments.minute)),
     units.minute,
     false
@@ -360,7 +405,11 @@ function hoursAreRangeIsolated(segments) {
   }
   return hasRange && hasSingle;
 }
-function hoursFirstMinutes(hoursStr, ir) {
+function hoursFirstMinutes(hoursStr, ir, opts) {
+  const stride = strideFromSegments(ir.analyses.segments.minute, units.minute, opts);
+  if (stride) {
+    return hoursStr + " aina " + stride;
+  }
   return hoursStr + " aina minuuttien " + joinList(segmentWords(ir.analyses.segments.minute)) + " kohdalla";
 }
 function hourSegmentTimesWithSeka(ir, minute, second, opts) {
@@ -381,9 +430,13 @@ function hourSegmentTimesWithSeka(ir, minute, second, opts) {
 function renderMinuteFrequency(ir, plan, opts) {
   const seg = stepSegment(ir.analyses.segments.minute);
   if (plan.hours.kind === "during") {
+    const cadence = unevenHourCadence(ir, opts);
+    if (cadence !== null) {
+      return stepCycle60(seg, units.minute, opts) + ", " + cadence + trailingQualifier(ir, opts);
+    }
     if (minuteStepIsAnchored(seg)) {
       const bareHours = kloFromTimes(ir, plan.hours.times, opts);
-      return hoursFirstMinutes(bareHours, ir) + trailingQualifier(ir, opts);
+      return hoursFirstMinutes(bareHours, ir, opts) + trailingQualifier(ir, opts);
     }
     return stepCycle60(seg, units.minute, opts) + " " + hourWindowsFromTimes(ir, plan.hours.times, opts) + trailingQualifier(ir, opts);
   }
@@ -406,25 +459,29 @@ function renderMinuteSpanInHour(ir, plan, opts) {
   ) + trailingQualifier(ir, opts);
 }
 function renderMinutesAcrossHours(ir, plan, opts) {
+  const cadence = unevenHourCadence(ir, opts);
   if (plan.form === "wildcard") {
-    return "joka minuutti " + hourWindowsFromTimes(ir, plan.times, opts) + trailingQualifier(ir, opts);
+    return cadence ? "joka minuutti, " + cadence + trailingQualifier(ir, opts) : "joka minuutti " + hourWindowsFromTimes(ir, plan.times, opts) + trailingQualifier(ir, opts);
+  }
+  if (cadence !== null) {
+    return bareMinutes(ir, opts) + ", " + cadence + trailingQualifier(ir, opts);
   }
   if (hoursAreRangeIsolated(ir.analyses.segments.hour)) {
-    return bareMinutes(ir) + " " + hourSegmentTimesWithSeka(ir, 0, null, opts) + trailingQualifier(ir, opts);
+    return bareMinutes(ir, opts) + " " + hourSegmentTimesWithSeka(ir, 0, null, opts) + trailingQualifier(ir, opts);
   }
   const hoursStr = kloFromTimes(ir, plan.times, opts);
-  return hoursFirstMinutes(hoursStr, ir) + trailingQualifier(ir, opts);
+  return hoursFirstMinutes(hoursStr, ir, opts) + trailingQualifier(ir, opts);
 }
 function renderMinuteSpanAcrossHourStep(ir, plan, opts) {
   const segment = stepSegment(ir.analyses.segments.hour);
+  const cadence = unevenHourCadence(ir, opts);
   if (plan.form === "wildcard") {
     return "joka minuutti " + everyNthHour(segment, opts) + trailingQualifier(ir, opts);
   }
-  if (segment.startToken.indexOf("-") !== -1) {
-    const hoursStr = kloList(segment.fires, opts);
-    return hoursFirstMinutes(hoursStr, ir) + trailingQualifier(ir, opts);
+  if (cadence !== null) {
+    return bareMinutes(ir, opts) + ", " + cadence + trailingQualifier(ir, opts);
   }
-  return bareMinutes(ir) + hourStepTail(segment, opts) + trailingQualifier(ir, opts);
+  return bareMinutes(ir, opts) + hourStepTail(segment, opts) + trailingQualifier(ir, opts);
 }
 function plainHourStep(segment) {
   return segment.startToken === "*" && 24 % segment.interval === 0;
@@ -482,7 +539,7 @@ function renderHourRange(ir, plan, opts) {
     return "joka minuutti " + window + trailingQualifier(ir, opts);
   }
   if (plan.minuteForm === "range") {
-    return hoursFirstMinutes(window, ir) + trailingQualifier(ir, opts);
+    return hoursFirstMinutes(window, ir, opts) + trailingQualifier(ir, opts);
   }
   if (ir.pattern.minute === "0") {
     return "joka tunti " + window + trailingQualifier(ir, opts);
@@ -494,9 +551,13 @@ function renderHourRange(ir, plan, opts) {
       opts
     ) + trailingQualifier(ir, opts);
   }
-  return hoursFirstMinutes(window, ir) + trailingQualifier(ir, opts);
+  return hoursFirstMinutes(window, ir, opts) + trailingQualifier(ir, opts);
 }
 function renderHourStep(ir, plan, opts) {
+  const cadence = unevenHourCadence(ir, opts);
+  if (cadence !== null) {
+    return cadence + trailingQualifier(ir, opts);
+  }
   return stepHours(stepSegment(ir.analyses.segments.hour), opts) + trailingQualifier(ir, opts);
 }
 function boundedWindow(plan) {
@@ -510,6 +571,13 @@ function hourWindow(window, opts) {
   );
 }
 function renderClockTimes(ir, plan, opts) {
+  if (ir.shapes.minute === "single") {
+    const minute = +ir.pattern.minute;
+    const cadence = hourCadence(ir, minute, opts) ?? hourRangeCadence(ir, minute, opts);
+    if (cadence !== null) {
+      return cadence;
+    }
+  }
   if (plan.times.length === 1) {
     const time = plan.times[0];
     return leadingQualifier(ir, opts) + timeWord(time.hour, time.minute, time.second, opts);
@@ -520,6 +588,12 @@ function renderClockTimes(ir, plan, opts) {
   return leadingQualifier(ir, opts) + "klo " + joinList(digits);
 }
 function renderCompactClockTimes(ir, plan, opts) {
+  if (plan.fold) {
+    const cadence2 = hourCadence(ir, plan.minute, opts) ?? hourRangeCadence(ir, plan.minute, opts);
+    if (cadence2 !== null) {
+      return cadence2;
+    }
+  }
   const hourSegs = ir.analyses.segments.hour;
   if (hoursAreRangeIsolated(hourSegs)) {
     if (plan.fold) {
@@ -530,14 +604,18 @@ function renderCompactClockTimes(ir, plan, opts) {
         opts
       );
     }
-    const phrase2 = bareMinutes(ir) + " " + hourSegmentTimesWithSeka(ir, 0, null, opts) + trailingQualifier(ir, opts);
+    const phrase2 = bareMinutes(ir, opts) + " " + hourSegmentTimesWithSeka(ir, 0, null, opts) + trailingQualifier(ir, opts);
     return ir.analyses.clockSecond ? secondsLeadClause(ir, opts) + ", " + phrase2 : phrase2;
   }
   if (plan.fold) {
     return leadingQualifier(ir, opts) + hourSegmentTimes(ir, plan.minute, ir.analyses.clockSecond, opts);
   }
-  const hoursStr = hourSegmentTimes(ir, 0, null, opts);
-  const phrase = hoursFirstMinutes(hoursStr, ir) + trailingQualifier(ir, opts);
+  const cadence = unevenHourCadence(ir, opts);
+  const phrase = cadence ? bareMinutes(ir, opts) + ", " + cadence + trailingQualifier(ir, opts) : (
+    // A minute list over purely enumerated hours (step fires, all singles) —
+    // hours-first, drop "joka tunti".
+    hoursFirstMinutes(hourSegmentTimes(ir, 0, null, opts), ir, opts) + trailingQualifier(ir, opts)
+  );
   return ir.analyses.clockSecond ? secondsLeadClause(ir, opts) + ", " + phrase : phrase;
 }
 var renderers = {
@@ -560,20 +638,48 @@ var renderers = {
   singleMinute: renderSingleMinute,
   standaloneSeconds: renderStandaloneSeconds
 };
+function renderStride(stride, opts) {
+  const { interval, start, last, cycle, unit } = stride;
+  const cadence = genitive(interval, opts) + " " + unit.gen + " v\xE4lein";
+  const tiles = cycle % interval === 0;
+  if (start === 0 && tiles) {
+    return cadence;
+  }
+  if (start < interval && tiles) {
+    return cadence + " " + unit.anchor + " " + unit.ela + " " + start + " alkaen";
+  }
+  return cadence + " " + unit.ela + " " + start + " " + unit.ill + " " + last;
+}
+function strideFromSegments(segments, unit, opts) {
+  const values = singleValues(segments);
+  const step = values && arithmeticStep(values);
+  return step ? renderStride({ ...step, cycle: 60, unit }, opts) : null;
+}
+function singleValues(segments) {
+  const values = [];
+  for (const segment of segments) {
+    if (segment.kind !== "single") {
+      return null;
+    }
+    values.push(+segment.value);
+  }
+  return values;
+}
 function stepCycle60(segment, unit, opts) {
   if (segment.startToken.indexOf("-") !== -1) {
     return atMarks(joinList(wordList(segment.fires)), unit, true);
   }
   const start = segment.startToken === "*" ? 0 : +segment.startToken;
-  const interval = segment.interval;
-  const cadence = genitive(interval, opts) + " " + unit.gen + " v\xE4lein";
-  if (start !== 0) {
-    if (segment.fires.length <= 3) {
-      return atMarks(joinList(wordList(segment.fires)), unit, true);
-    }
-    return cadence + " " + unit.anchor + " " + unit.ela + " " + start + " alkaen";
+  if (start !== 0 && segment.fires.length <= 3) {
+    return atMarks(joinList(wordList(segment.fires)), unit, true);
   }
-  return cadence;
+  return renderStride({
+    interval: segment.interval,
+    start,
+    last: segment.fires[segment.fires.length - 1],
+    cycle: 60,
+    unit
+  }, opts);
 }
 function stepHours(segment, opts) {
   if (segment.startToken.indexOf("-") !== -1) {
@@ -590,6 +696,121 @@ function stepHours(segment, opts) {
   }
   return cadence + " klo " + hourElatives[start] + " alkaen";
 }
+function hourStrideCadence(stride, opts) {
+  const { start, interval, last } = stride;
+  const cadence = genitive(interval, opts) + " tunnin v\xE4lein";
+  const tiles = 24 % interval === 0;
+  if (start === 0 && tiles) {
+    return cadence;
+  }
+  if (start < interval && tiles) {
+    return cadence + " klo " + hourElatives[start] + " alkaen";
+  }
+  return cadence + " " + kloRange({ hour: start, minute: 0 }, { hour: last, minute: 0 }, 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 offsetCleanStride(stride) {
+  return stride.start < stride.interval && 24 % stride.interval === 0;
+}
+function hourStride(ir) {
+  const segments = ir.analyses.segments.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, opts) {
+  const stride = hourStride(ir);
+  if (!stride || offsetCleanStride(stride)) {
+    return null;
+  }
+  return hourStrideCadence(stride, opts);
+}
+function subMinuteSecond(ir) {
+  return ir.pattern.second === "*" || ir.shapes.second === "step";
+}
+function hourCadenceLead(ir, minute, opts) {
+  if (minute === 0) {
+    if (subMinuteSecond(ir)) {
+      return secondsLeadClause(ir, opts) + " minuutin ajan";
+    }
+    return secondsLeadClause(ir, opts);
+  }
+  const minutePhrase = atMarks(String(minute), units.minute, false);
+  if (ir.pattern.second === "0") {
+    return minutePhrase;
+  }
+  return secondsLeadClause(ir, opts) + ", " + minutePhrase;
+}
+function hourCadence(ir, minute, opts) {
+  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 = ir.analyses.segments.hour[0];
+  const confined = minute === 0 && subMinuteSecond(ir) && ir.analyses.segments.hour.length === 1 && segment.kind === "step" && cleanHourStride(segment);
+  if (confined) {
+    return secondsLeadClause(ir, opts) + " minuutin ajan " + everyNthHour(segment, 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 cleanHourStride(segment) {
+  if (segment.startToken.indexOf("-") !== -1) {
+    return false;
+  }
+  const start = segment.startToken === "*" ? 0 : +segment.startToken;
+  return 24 % segment.interval === 0 && start < segment.interval;
+}
+function hasHourWindow(ir) {
+  const segments = ir.analyses.segments.hour;
+  return !!segments && segments.some(function range(segment) {
+    return segment.kind === "range";
+  });
+}
+function hourRangeWindowTail(ir, opts) {
+  return ir.analyses.segments.hour.length === 1 ? hourSegmentTimes(ir, 0, null, opts) : hourSegmentTimesWithSeka(ir, 0, null, opts);
+}
+function hourRangeCadence(ir, minute, opts) {
+  if (minute !== 0 || !hasHourWindow(ir) || ir.pattern.second === "0") {
+    return null;
+  }
+  const tail = hourRangeWindowTail(ir, opts);
+  const joiner = subMinuteSecond(ir) ? " " : ", ";
+  return hourCadenceLead(ir, minute, opts) + joiner + tail + trailingQualifier(ir, opts);
+}
 function kloList(hours, opts) {
   if (hours.length === 1) {
     return timeWord(hours[0], 0, null, opts);
@@ -606,12 +827,16 @@ function kloFromTimes(ir, times, opts) {
 }
 function hourWindowsFromTimes(ir, times, opts) {
   if (times.kind === "fires") {
-    return "klo " + joinList(times.fires.map(function window(hour) {
-      return hourWindowDigits(hour, opts);
-    }));
+    return kloList(times.fires, opts);
+  }
+  const segments = ir.analyses.segments.hour;
+  if (!segments.some(function ranged(segment) {
+    return segment.kind === "range";
+  })) {
+    return kloList(hourSegmentFires(segments), opts);
   }
   const pieces = [];
-  ir.analyses.segments.hour.forEach(function window(segment) {
+  segments.forEach(function window(segment) {
     if (segment.kind === "range") {
       pieces.push(rangeDigits(
         { hour: +segment.bounds[0], minute: 0 },
@@ -628,6 +853,17 @@ function hourWindowsFromTimes(ir, times, opts) {
   });
   return "klo " + joinList(pieces);
 }
+function hourSegmentFires(segments) {
+  const hours = [];
+  segments.forEach(function each(segment) {
+    if (segment.kind === "step") {
+      hours.push(...segment.fires);
+    } else if (segment.kind === "single") {
+      hours.push(+segment.value);
+    }
+  });
+  return hours;
+}
 function hourWindowDigits(hour, opts) {
   return rangeDigits({ hour, minute: 0 }, { hour, minute: 59 }, opts);
 }