cronli5 0.1.5 → 0.1.7

package/dist/lang/zh.cjs

@@ -44,6 +44,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()];
 }
@@ -249,8 +269,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 +293,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 +319,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 +342,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 +380,71 @@ 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 values && arithmeticStep(values);
+}
+function hourCadencePhrase(ir) {
+  const stride = hourStride(ir);
+  return stride && renderStride({
+    ...stride,
+    cycle: 24,
+    unit: UNITS.hour,
+    mark: "\u70B9",
+    anchor: ""
+  });
+}
+function minuteZeroConfinement(ir, stride, prefix) {
+  if (stride.interval === 2 && stride.start === 0) {
+    return "\u5728\u5076\u6570\u5C0F\u65F60\u5206" + secondTail(ir);
+  }
+  if (prefix.indexOf("\u4ECE") !== -1) {
+    return prefix + "0\u5206" + secondTail(ir);
   }
-  return { interval: step.interval, last: step.last };
+  return null;
 }
 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 minuteZeroConfinement(ir, stride, prefix);
   }
   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 +492,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 +509,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 +530,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 +574,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;
 }
@@ -597,7 +663,7 @@ function quartzDate(token, monthPrefix) {
   if (token.startsWith("L-")) {
     return monthPrefix + "\u6700\u540E\u7B2C" + token.slice(2) + "\u5929";
   }
-  return "\u6700\u63A5\u8FD1" + token.slice(0, -1) + "\u65E5\u7684\u5DE5\u4F5C\u65E5";
+  return monthPrefix + "\u6700\u63A5\u8FD1" + token.slice(0, -1) + "\u65E5\u7684\u5DE5\u4F5C\u65E5";
 }
 function datePhrase(ir) {
   const month = monthPhrase(ir);
@@ -611,7 +677,11 @@ function datePhrase(ir) {
   if (ir.shapes.date === "step") {
     return month + cadence(stepSegment(ir, "date").interval, "\u5929");
   }
-  return month ? month + dayList(ir) : "\u6BCF\u6708" + dayList(ir);
+  if (!month) {
+    return "\u6BCF\u6708" + dayList(ir);
+  }
+  const monthMulti = ir.shapes.month === "range" || ir.shapes.month === "list";
+  return month + (monthMulti ? "\uFF0C" : "") + dayList(ir);
 }
 function dateCore(ir, quartzPrefix) {
   if (ir.shapes.date === "quartz") {
@@ -653,10 +723,8 @@ function weekdayPhrase(ir, orContext, monthPrefix) {
     return "\u6BCF" + weekdayName(from) + "\u81F3" + weekdayName(to);
   }
   const days = [];
-  segs.forEach(function expand(seg) {
-    if (seg.kind === "step") {
-      days.push(...seg.fires);
-    } else if (seg.kind === "single") {
+  orderWeekdaysForDisplay(segs).forEach(function expand(seg) {
+    if (seg.kind === "single") {
       days.push(toFieldNumber(seg.value, weekdayNumbers));
     }
   });
@@ -722,7 +790,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;

package/dist/lang/zh.js

@@ -18,6 +18,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()];
 }
@@ -223,8 +243,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") {
@@ -237,9 +267,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;
@@ -261,20 +293,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;
@@ -283,26 +316,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;
@@ -321,54 +354,71 @@ 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 values && arithmeticStep(values);
+}
+function hourCadencePhrase(ir) {
+  const stride = hourStride(ir);
+  return stride && renderStride({
+    ...stride,
+    cycle: 24,
+    unit: UNITS.hour,
+    mark: "\u70B9",
+    anchor: ""
+  });
+}
+function minuteZeroConfinement(ir, stride, prefix) {
+  if (stride.interval === 2 && stride.start === 0) {
+    return "\u5728\u5076\u6570\u5C0F\u65F60\u5206" + secondTail(ir);
+  }
+  if (prefix.indexOf("\u4ECE") !== -1) {
+    return prefix + "0\u5206" + secondTail(ir);
   }
-  return { interval: step.interval, last: step.last };
+  return null;
 }
 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 minuteZeroConfinement(ir, stride, prefix);
   }
   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;
@@ -416,8 +466,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);
@@ -433,17 +483,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";
   });
@@ -452,11 +504,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;
@@ -483,8 +548,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;
 }
@@ -571,7 +637,7 @@ function quartzDate(token, monthPrefix) {
   if (token.startsWith("L-")) {
     return monthPrefix + "\u6700\u540E\u7B2C" + token.slice(2) + "\u5929";
   }
-  return "\u6700\u63A5\u8FD1" + token.slice(0, -1) + "\u65E5\u7684\u5DE5\u4F5C\u65E5";
+  return monthPrefix + "\u6700\u63A5\u8FD1" + token.slice(0, -1) + "\u65E5\u7684\u5DE5\u4F5C\u65E5";
 }
 function datePhrase(ir) {
   const month = monthPhrase(ir);
@@ -585,7 +651,11 @@ function datePhrase(ir) {
   if (ir.shapes.date === "step") {
     return month + cadence(stepSegment(ir, "date").interval, "\u5929");
   }
-  return month ? month + dayList(ir) : "\u6BCF\u6708" + dayList(ir);
+  if (!month) {
+    return "\u6BCF\u6708" + dayList(ir);
+  }
+  const monthMulti = ir.shapes.month === "range" || ir.shapes.month === "list";
+  return month + (monthMulti ? "\uFF0C" : "") + dayList(ir);
 }
 function dateCore(ir, quartzPrefix) {
   if (ir.shapes.date === "quartz") {
@@ -627,10 +697,8 @@ function weekdayPhrase(ir, orContext, monthPrefix) {
     return "\u6BCF" + weekdayName(from) + "\u81F3" + weekdayName(to);
   }
   const days = [];
-  segs.forEach(function expand(seg) {
-    if (seg.kind === "step") {
-      days.push(...seg.fires);
-    } else if (seg.kind === "single") {
+  orderWeekdaysForDisplay(segs).forEach(function expand(seg) {
+    if (seg.kind === "single") {
       days.push(toFieldNumber(seg.value, weekdayNumbers));
     }
   });
@@ -696,7 +764,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;