cronli5 0.1.5 → 0.1.6

package/dist/lang/es.js

@@ -176,14 +176,21 @@ function secondsListAtClock(ir, rest, 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 isPinnedMinuteSeconds(ir, plan) {
+  return plan.rest.kind === "clockTimes" && (ir.shapes.second === "wildcard" || ir.shapes.second === "step");
 }
 function renderComposeSeconds(ir, plan, opts) {
   const hourCad = composeHourCadence(ir, plan, opts);
   if (hourCad !== null) {
     return hourCad;
   }
-  if (plan.rest.kind === "clockTimes" && (ir.shapes.second === "wildcard" || ir.shapes.second === "step")) {
+  if (isPinnedMinuteSeconds(ir, plan)) {
     return pinnedMinuteSeconds(ir, plan.rest, opts);
   }
   if (plan.rest.kind === "clockTimes" && ir.shapes.second === "list") {
@@ -199,7 +206,9 @@ function renderComposeSeconds(ir, plan, opts) {
   if (isEveryOtherMinuteSeconds(ir, plan)) {
     return secondsLeadClause(ir, opts) + " de " + render(ir, plan.rest, 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 isEveryOtherMinuteSeconds(ir, plan) {
   if (plan.rest.kind !== "minuteFrequency" || ir.shapes.second !== "wildcard" || ir.shapes.hour !== "wildcard") {
@@ -211,7 +220,7 @@ function isEveryOtherMinuteSeconds(ir, plan) {
 function pinnedMinuteSeconds(ir, rest, opts) {
   const dayTrail = leadingQualifier(ir, opts).trimEnd();
   const trail = dayTrail ? ", " + dayTrail : "";
-  if (+rest.times[0].minute === 0) {
+  if (+rest.times[0].minute === 0 && ir.shapes.minute === "single") {
     return secondsLeadClause(ir, opts) + " durante un minuto " + durationHourList(rest.times, opts) + trail;
   }
   return secondsLeadClause(ir, opts) + " de " + explicitClockList(rest.times, opts) + trail;
@@ -328,7 +337,12 @@ function renderMinuteFrequency(ir, plan, opts) {
     opts
   );
   if (plan.hours.kind === "during") {
-    phrase += singleHourStep(ir.analyses.segments.hour) ? ", " + stepHourSpan(stepSegment(ir.analyses.segments.hour), opts) : " " + hourSpanFromTimes(ir, plan.hours.times, opts);
+    const cadence = unevenHourCadence(ir, opts);
+    if (cadence) {
+      phrase += ", " + cadence;
+    } else {
+      phrase += singleHourStep(ir.analyses.segments.hour) ? ", " + stepHourSpan(stepSegment(ir.analyses.segments.hour), opts) : " " + hourSpanFromTimes(ir, plan.hours.times, opts);
+    }
   } else if (plan.hours.kind === "window") {
     phrase += " " + hourWindow(plan.hours, opts);
   } else if (plan.hours.kind === "step") {
@@ -347,22 +361,30 @@ function renderMinuteSpanInHour(ir, plan, opts) {
   ) + trailingQualifier(ir, opts);
 }
 function renderMinutesAcrossHours(ir, plan, opts) {
+  const cadence = unevenHourCadence(ir, opts);
   if (plan.form === "wildcard") {
+    if (cadence !== null) {
+      return "cada minuto, " + cadence + trailingQualifier(ir, opts);
+    }
     if (singleHourStep(ir.analyses.segments.hour)) {
       return "cada minuto, " + stepHourSpan(stepSegment(ir.analyses.segments.hour), opts) + trailingQualifier(ir, opts);
     }
     return "cada minuto " + hourSpanFromTimes(ir, plan.times, opts) + trailingQualifier(ir, opts);
   }
   const lead = plan.form === "range" ? minuteRangeLead(ir.pattern.minute) : minutesList(ir, opts);
+  if (cadence !== null) {
+    return lead + ", " + cadence + trailingQualifier(ir, opts);
+  }
   return lead + ", " + atHourTimes(ir, plan.times, 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 "cada minuto, " + stepHourSpan(segment, opts) + trailingQualifier(ir, opts);
   }
   const lead = plan.form === "list" ? minutesList(ir, opts) : minuteRangeLead(ir.pattern.minute);
-  return lead + ", " + stepHours(segment, opts) + trailingQualifier(ir, opts);
+  return lead + ", " + (cadence ?? stepHours(segment, opts)) + trailingQualifier(ir, opts);
 }
 function renderEveryHour(ir, plan, opts) {
   return "cada hora" + trailingQualifier(ir, opts);
@@ -382,6 +404,10 @@ function renderHourRange(ir, plan, opts) {
   return lead + ", " + window + 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) {
@@ -453,7 +479,8 @@ function unionYaseaSuffix(ir, 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;
     }
@@ -639,9 +666,9 @@ function groupClockTimesByArticle(phrases) {
 }
 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 ranged = hourSegments(ir).some(function range(segment) {
       return segment.kind === "range";
@@ -651,7 +678,8 @@ function renderCompactClockTimes(ir, plan, opts) {
     }
     return leadingQualifier(ir, opts) + hourSegmentTimes(ir, plan.minute, ir.analyses.clockSecond, opts);
   }
-  const phrase = minutesList(ir, opts) + ", " + hourSegmentTimes(ir, 0, null, opts) + trailingQualifier(ir, opts);
+  const cadence = unevenHourCadence(ir, opts);
+  const phrase = cadence ? minutesList(ir, opts) + ", " + cadence + trailingQualifier(ir, opts) : minutesList(ir, opts) + ", " + hourSegmentTimes(ir, 0, null, opts) + trailingQualifier(ir, opts);
   return ir.analyses.clockSecond ? secondsLeadClause(ir, opts) + ", " + phrase : phrase;
 }
 var renderers = {
@@ -745,16 +773,46 @@ function hourStrideCadence(stride, opts) {
   }
   return cadence + " de " + timePhrase(start, 0, null, opts) + " a " + timePhrase(last, 0, null, 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 = fieldSegments(ir, "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";
@@ -778,13 +836,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, "minuto", opts) + " durante un minuto, " + stepHourSpan(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) {
@@ -795,6 +856,20 @@ function cleanStrideSegment(ir) {
   }
   return segment;
 }
+function hasHourWindow(ir) {
+  return hourSegments(ir).some(function range(segment) {
+    return segment.kind === "range";
+  });
+}
+function hourRangeCadence(ir, minute, opts) {
+  if (minute !== 0 || !hasHourWindow(ir) || ir.pattern.second === "0") {
+    return null;
+  }
+  if (subMinuteSecond(ir)) {
+    return secondsClause(ir, "minuto", opts) + " durante un minuto, durante las horas " + hourSegmentTimes(ir, 0, null, opts) + trailingQualifier(ir, opts);
+  }
+  return hourCadenceLead(ir, minute, opts) + ", " + hourSegmentTimes(ir, 0, null, opts) + trailingQualifier(ir, opts);
+}
 function atTimes(hours, opts) {
   return hours.map(function each(hour) {
     return atTime(timePhrase(hour, 0, null, opts));

package/dist/lang/fi.cjs

@@ -289,7 +289,11 @@ function composeSecondsOverMinuteStep(ir, freq, 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 renderComposeSeconds(ir, plan, opts) {
   const cadence = composeHourCadence(ir, plan, opts);
@@ -305,7 +309,9 @@ function renderComposeSeconds(ir, plan, opts) {
   if (isEveryOtherMinuteSeconds(ir, plan)) {
     return secondsLeadClause(ir, opts) + " joka toisena minuuttina";
   }
-  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 isEveryOtherMinuteSeconds(ir, plan) {
   if (plan.rest.kind !== "minuteFrequency" || ir.pattern.second !== "*" || ir.shapes.hour !== "wildcard") {
@@ -424,6 +430,10 @@ 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, opts) + trailingQualifier(ir, opts);
@@ -449,8 +459,12 @@ 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, opts) + " " + hourSegmentTimesWithSeka(ir, 0, null, opts) + trailingQualifier(ir, opts);
@@ -460,12 +474,12 @@ function renderMinutesAcrossHours(ir, plan, 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, opts) + trailingQualifier(ir, opts);
+  if (cadence !== null) {
+    return bareMinutes(ir, opts) + ", " + cadence + trailingQualifier(ir, opts);
   }
   return bareMinutes(ir, opts) + hourStepTail(segment, opts) + trailingQualifier(ir, opts);
 }
@@ -540,6 +554,10 @@ function renderHourRange(ir, plan, 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) {
@@ -554,7 +572,8 @@ function hourWindow(window, 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;
     }
@@ -570,9 +589,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 hourSegs = ir.analyses.segments.hour;
@@ -591,8 +610,12 @@ function renderCompactClockTimes(ir, plan, opts) {
   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, opts) + 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 = {
@@ -685,6 +708,27 @@ function hourStrideCadence(stride, opts) {
   }
   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) {
@@ -692,12 +736,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, 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";
@@ -721,7 +774,7 @@ 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 segment = ir.analyses.segments.hour[0];
@@ -729,6 +782,9 @@ function hourCadence(ir, minute, opts) {
   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) {
@@ -738,6 +794,23 @@ function cleanHourStride(segment) {
   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);
@@ -754,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 },
@@ -776,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);
 }