cronli5 0.1.5 → 0.1.6

package/dist/lang/fi.js

@@ -263,7 +263,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);
@@ -279,7 +283,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") {
@@ -398,6 +404,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);
@@ -423,8 +433,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);
@@ -434,12 +448,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);
 }
@@ -514,6 +528,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) {
@@ -528,7 +546,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;
     }
@@ -544,9 +563,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;
@@ -565,8 +584,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 = {
@@ -659,6 +682,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) {
@@ -666,12 +710,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";
@@ -695,7 +748,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];
@@ -703,6 +756,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) {
@@ -712,6 +768,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);
@@ -728,12 +801,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 },
@@ -750,6 +827,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);
 }

package/dist/lang/zh.cjs

@@ -249,8 +249,18 @@ function minuteHourClause(ir) {
 function renderMinutePast(ir) {
   return minuteHourClause(ir);
 }
+function hourSegmentWords(segment) {
+  if (segment.kind === "range") {
+    return [hourWord(+segment.bounds[0]) + "\u81F3" + hourWord(+segment.bounds[1])];
+  }
+  if (segment.kind === "step") {
+    return segment.fires.map(hourWord);
+  }
+  return [hourWord(+segment.value)];
+}
 function hourList(ir) {
-  return joinAnd(hourFires(ir).map(hourWord));
+  const words = fieldSegments(ir, "hour").flatMap(hourSegmentWords);
+  return joinAnd(words);
 }
 function hourFrame(ir) {
   if (ir.shapes.hour === "range") {
@@ -263,9 +273,11 @@ function renderMinuteFrequency(ir, plan) {
   const minuteStep = stepSegment(ir, "minute");
   const base = stepClause(minuteStep, UNITS.minute, "\u5206", "\u6BCF\u5C0F\u65F6");
   const { hours } = plan;
-  if (hours.kind === "step") {
-    const hourStep = stepSegment(ir, "hour");
-    return hourStep.startToken === "*" ? cadence(hourStep.interval, UNITS.hour) + base : "\u5728" + hourList(ir) + "\uFF0C" + base;
+  if (hours.kind === "step" || hours.kind === "during") {
+    const hourCad = hourCadencePhrase(ir);
+    if (hourCad !== null) {
+      return hourCad + (hourCad.indexOf("\u81F3") === -1 ? "" : "\uFF0C") + base;
+    }
   }
   if (hours.kind === "single" || hours.kind === "window" && hours.from === hours.to) {
     return "\u5728" + hourWord(hours.from) + "\u81F3" + hours.from + "\u70B9" + hours.last + "\u5206\u4E4B\u95F4\uFF0C" + base;
@@ -287,20 +299,21 @@ function renderMinuteSpanInHour(ir, plan) {
 }
 function renderMinutesAcrossHours(ir, plan) {
   const { form } = plan;
+  const hourCad = hourCadencePhrase(ir);
   if (form === "wildcard") {
-    return "\u5728" + hourList(ir) + "\uFF0C\u6BCF\u5206\u949F";
+    return hourCad === null ? "\u5728" + hourList(ir) + "\uFF0C\u6BCF\u5206\u949F" : hourCad + "\uFF0C\u6BCF\u5206\u949F";
   }
-  return hourList(ir) + "\uFF0C" + minuteHourClause(ir) + "\uFF0C\u6BCF\u5206\u949F";
+  return (hourCad ?? hourList(ir)) + "\uFF0C" + minuteHourClause(ir) + "\uFF0C\u6BCF\u5206\u949F";
 }
 function renderMinuteSpanAcrossHourStep(ir, plan) {
   const hourStep = stepSegment(ir, "hour");
   const { form } = plan;
   if (form === "list") {
-    return renderMinutePast(ir) + "\uFF0C\u5728" + hourList(ir);
+    return hourCadencePhrase(ir) + "\uFF0C" + renderMinutePast(ir);
   }
   const minuteTail = form === "wildcard" ? "\u6BCF\u5206\u949F" : minuteHourClause(ir) + "\uFF0C\u6BCF\u5206\u949F";
   if (hourStep.startToken !== "*") {
-    return form === "wildcard" ? "\u5728" + hourList(ir) + "\uFF0C" + minuteTail : hourList(ir) + "\uFF0C" + minuteTail;
+    return hourCadencePhrase(ir) + "\uFF0C" + minuteTail;
   }
   if (hourStep.interval === 2 && form === "wildcard") {
     return "\u5728\u5076\u6570\u5C0F\u65F6\uFF0C" + minuteTail;
@@ -309,26 +322,26 @@ function renderMinuteSpanAcrossHourStep(ir, plan) {
   return form === "wildcard" ? cad + "\u5185\uFF0C" + minuteTail : cad + "\uFF0C" + minuteTail;
 }
 function renderClockTimes(ir, plan, opts) {
-  if (ir.shapes.minute === "single") {
-    const cad = hourCadence(ir);
-    if (cad !== null) {
-      return cad;
-    }
+  const cad = hourCadenceText(ir);
+  if (cad !== null) {
+    return cad;
   }
   const { times } = plan;
   return joinAnd(times.map((t) => clockTime(t.hour, t.minute, t.second, opts)));
 }
 function renderCompactClockTimes(ir, plan) {
-  if (ir.shapes.minute === "single") {
-    const cad = hourCadence(ir);
-    if (cad !== null) {
-      return cad;
-    }
+  const cad = hourCadenceText(ir);
+  if (cad !== null) {
+    return cad;
   }
-  const { minute } = plan;
+  const compact = plan;
   const secs = fieldSegments(ir, "second");
   const tail = secs.length && ir.pattern.second !== "0" ? "\uFF0C\u7B2C" + valueText(secs) + "\u79D2" : "";
-  if (minute > 0) {
+  if (!compact.fold) {
+    const hourCad = hourCadencePhrase(ir);
+    return hourCad === null ? minuteHourClause(ir) + "\uFF0C\u5728" + hourList(ir) + tail : hourCad + "\uFF0C" + minuteHourClause(ir) + tail;
+  }
+  if (compact.minute > 0) {
     return minuteHourClause(ir) + "\uFF0C\u5728" + hourList(ir) + tail;
   }
   return hourList(ir) + tail;
@@ -347,54 +360,62 @@ function renderHourRange(ir, plan) {
 }
 function renderHourStep(ir) {
   const segment = stepSegment(ir, "hour");
-  if (segment.startToken !== "*") {
-    return hourList(ir);
-  }
   if (segment.fires.length <= 2) {
     return joinAnd(segment.fires.map(hourWord));
   }
-  return cadence(segment.interval, UNITS.hour);
+  return hourCadencePhrase(ir);
 }
 function hourStride(ir) {
   const segments = fieldSegments(ir, "hour");
   if (segments.length === 1 && segments[0].kind === "step") {
-    const segment = segments[0];
-    const start = segment.startToken === "*" ? 0 : +segment.startToken;
-    if (start !== 0 || 24 % segment.interval !== 0) {
-      return null;
-    }
-    return {
-      interval: segment.interval,
-      last: segment.fires[segment.fires.length - 1]
-    };
+    const { fires, interval } = segments[0];
+    return { interval, start: fires[0], last: fires[fires.length - 1] };
   }
   const values = singleValues(segments);
-  const step = values && arithmeticStep(values);
-  if (!step || step.start !== 0 || 24 % step.interval !== 0) {
-    return null;
-  }
-  return { interval: step.interval, last: step.last };
+  return values && arithmeticStep(values);
+}
+function hourCadencePhrase(ir) {
+  const stride = hourStride(ir);
+  return stride && renderStride({
+    ...stride,
+    cycle: 24,
+    unit: UNITS.hour,
+    mark: "\u70B9",
+    anchor: ""
+  });
 }
 function hourCadence(ir) {
   const stride = hourStride(ir);
   if (!stride) {
     return null;
   }
-  const fires = stride.last / stride.interval + 1;
+  const fires = (stride.last - stride.start) / stride.interval + 1;
   if (ir.pattern.second === "0" && fires <= maxClockTimes) {
     return null;
   }
-  const prefix = cadence(stride.interval, UNITS.hour);
+  const prefix = hourCadencePhrase(ir);
+  if (prefix.indexOf("\u81F3") !== -1) {
+    return null;
+  }
   const minute = +ir.pattern.minute;
   const subMinute = ir.pattern.second === "*" || ir.shapes.second === "step";
   if (minute === 0 && subMinute) {
-    return stride.interval === 2 ? "\u5728\u5076\u6570\u5C0F\u65F60\u5206" + secondTail(ir) : null;
+    return stride.interval === 2 && stride.start === 0 ? "\u5728\u5076\u6570\u5C0F\u65F60\u5206" + secondTail(ir) : null;
   }
   if (minute === 0) {
     return prefix + "0\u5206" + secondTail(ir);
   }
   return ir.pattern.second === "0" ? prefix + minute + "\u5206" : prefix + minute + "\u5206" + secondTail(ir);
 }
+function hourCadenceText(ir) {
+  if (ir.shapes.minute !== "single") {
+    return null;
+  }
+  if (+ir.pattern.minute === 0 && ir.pattern.second === "0") {
+    return hourCadencePhrase(ir);
+  }
+  return hourCadence(ir);
+}
 function secondTail(ir) {
   const sec = secondClause(ir);
   return sec === "\u6BCF\u79D2" ? "\u7684\u6BCF\u4E00\u79D2" : "\u7684" + sec;
@@ -442,8 +463,8 @@ function minuteClause(ir) {
   }
   return valueList(fieldSegments(ir, "minute"), "\u5206");
 }
-function isHourCadence(ir) {
-  return ir.shapes.hour === "step" && stepSegment(ir, "hour").startToken === "*";
+function clockRestCarriesSecond(rest) {
+  return rest.kind === "clockTimes" && rest.times.some((time) => Boolean(time.second));
 }
 function composeSecondsOnHour(ir, plan, opts) {
   const sec = secondClause(ir);
@@ -459,17 +480,19 @@ function composeSecondsOnHour(ir, plan, opts) {
     return composeMinuteZeroClocks(ir, sec);
   }
   const restText = render(ir, rest, opts);
-  if (rest.kind === "clockTimes" || rest.kind === "compactClockTimes") {
-    if (isDaily(ir)) {
-      return "\u6BCF\u5929" + restText + sec;
-    }
+  const secTail = clockRestCarriesSecond(rest) ? "" : sec;
+  if (composedClock && isDaily(ir)) {
+    return "\u6BCF\u5929" + restText + secTail;
   }
   if (rest.kind === "singleMinute") {
     return restText + "\uFF0C" + sec;
   }
-  return restText + sec;
+  return restText + secTail;
 }
 function composeMinuteZeroClocks(ir, sec) {
+  if (hasHourWindow(ir)) {
+    return isDaily(ir) ? "\u6BCF\u5929" + hourRangeWindow(ir, sec) : hourRangeWindow(ir, sec);
+  }
   const clocks = hourFires(ir).map(function clock(hour) {
     return hour === 12 ? "\u6B63\u5348" : hourWord(hour) + "0\u5206";
   });
@@ -478,11 +501,24 @@ function composeMinuteZeroClocks(ir, sec) {
   const core = joinAnd(clocks) + tail;
   return isDaily(ir) ? "\u6BCF\u5929" + core : core;
 }
+function hasHourWindow(ir) {
+  return fieldSegments(ir, "hour").some(function range(segment) {
+    return segment.kind === "range";
+  });
+}
+function hourRangeWindow(ir, sec) {
+  const span = hourList(ir);
+  if (ir.pattern.second === "*" || ir.shapes.second === "step") {
+    return span + "0\u5206" + (sec === "\u6BCF\u79D2" ? "\u7684\u6BCF\u4E00\u79D2" : "\u7684" + sec);
+  }
+  return span + "\uFF0C" + sec;
+}
 function composeSecondsCadence(ir) {
   const sec = secondClause(ir);
   const tail = minuteClause(ir) + sec;
-  if (isHourCadence(ir)) {
-    return cadence(stepSegment(ir, "hour").interval, UNITS.hour) + "\u7684" + tail;
+  const hourCad = hourCadencePhrase(ir);
+  if (hourCad !== null) {
+    return hourCad + (hourCad.indexOf("\u81F3") === -1 ? "\u7684" : "\uFF0C") + tail;
   }
   if (ir.shapes.hour === "single") {
     return hourWord(hourFires(ir)[0]) + "\u7684" + tail;
@@ -509,8 +545,9 @@ function composeSecondsListed(ir) {
   if (ir.shapes.hour === "wildcard") {
     return minutes + "\uFF0C" + sec;
   }
-  if (isHourCadence(ir)) {
-    return cadence(stepSegment(ir, "hour").interval, UNITS.hour) + "\uFF0C" + minutes + "\uFF0C" + sec;
+  const hourCad = hourCadencePhrase(ir);
+  if (hourCad !== null) {
+    return hourCad + "\uFF0C" + minutes + "\uFF0C" + sec;
   }
   return hourFrame(ir) + minutes + "\uFF0C" + sec;
 }
@@ -722,7 +759,7 @@ function composeWindow(ir, core) {
   return qualifier(ir) + core;
 }
 function hourCadenceApplies(ir) {
-  return ir.shapes.minute === "single" && hourCadence(ir) !== null;
+  return hourCadenceText(ir) !== null;
 }
 function describe(ir, opts) {
   const { kind } = ir.plan;