cronli5 0.1.2 → 0.1.4

package/dist/lang/es.cjs

@@ -40,6 +40,26 @@ function clockDigits(time, { sep, pad: padHour, lean }) {
   return head + sep + pad(time.minute) + (time.second ? sep + pad(time.second) : "");
 }
 
+// src/core/specs.ts
+var weekdayNumbers = {
+  SUN: 0,
+  MON: 1,
+  TUE: 2,
+  WED: 3,
+  THU: 4,
+  FRI: 5,
+  SAT: 6
+};
+
+// src/core/util.ts
+function isNonNegativeInteger(value) {
+  const digits = /^\d+$/;
+  return digits.test(value);
+}
+function toFieldNumber(token, numberMap) {
+  return isNonNegativeInteger(token) ? +token : numberMap[token.toUpperCase()];
+}
+
 // src/lang/es/dialects.ts
 var es = {
   ampm: false,
@@ -111,29 +131,6 @@ var weekdayNames = [
   "viernes",
   "s\xE1bado"
 ];
-var monthTokens = {
-  JAN: 1,
-  FEB: 2,
-  MAR: 3,
-  APR: 4,
-  MAY: 5,
-  JUN: 6,
-  JUL: 7,
-  AUG: 8,
-  SEP: 9,
-  OCT: 10,
-  NOV: 11,
-  DEC: 12
-};
-var weekdayTokens = {
-  SUN: 0,
-  MON: 1,
-  TUE: 2,
-  WED: 3,
-  THU: 4,
-  FRI: 5,
-  SAT: 6
-};
 var nthWeekdayNames = [null, "primer", "segundo", "tercer", "cuarto", "quinto"];
 function normalizeOptions(options) {
   options = options || {};
@@ -177,6 +174,9 @@ function renderSecondsWithinMinute(ir, plan, opts) {
   return secondsLeadClause(ir, opts) + ", en el minuto " + minuteField + " de cada hora" + trailingQualifier(ir, opts);
 }
 function renderComposeSeconds(ir, plan, opts) {
+  if (plan.rest.kind === "clockTimes" && (ir.shapes.second === "wildcard" || ir.shapes.second === "step")) {
+    return pinnedMinuteSeconds(ir, plan.rest, opts);
+  }
   if (plan.rest.kind === "clockTimes" && ir.shapes.second === "list") {
     const clockPhrases = plan.rest.times.map(function clock(time) {
       return atTime(timePhrase(time.hour, time.minute, null, opts));
@@ -196,6 +196,14 @@ function renderComposeSeconds(ir, plan, opts) {
   }
   return secondsLeadClause(ir, opts) + ", " + render(ir, plan.rest, opts);
 }
+function pinnedMinuteSeconds(ir, rest, opts) {
+  const dayTrail = leadingQualifier(ir, opts).trimEnd();
+  const trail = dayTrail ? ", " + dayTrail : "";
+  if (+rest.times[0].minute === 0) {
+    return secondsLeadClause(ir, opts) + " durante un minuto " + durationHourList(rest.times, opts) + trail;
+  }
+  return secondsLeadClause(ir, opts) + " de " + explicitClockList(rest.times, opts) + trail;
+}
 function secondsLeadClause(ir, opts) {
   const secondField = ir.pattern.second;
   const shape = ir.shapes.second;
@@ -304,6 +312,9 @@ function renderMinuteFrequency(ir, plan, opts) {
   return phrase + trailingQualifier(ir, opts);
 }
 function renderMinuteSpanInHour(ir, plan, opts) {
+  if (ir.pattern.minute === "*") {
+    return "cada minuto de la hora " + fromTime(timePhrase(plan.hour, 0, null, opts)) + trailingQualifier(ir, opts);
+  }
   return "cada minuto " + timeRange(
     { hour: plan.hour, minute: plan.span[0] },
     { hour: plan.hour, minute: plan.span[1] },
@@ -420,6 +431,45 @@ function renderClockTimes(ir, plan, opts) {
   });
   return leadingQualifier(ir, opts) + groupClockTimes(phrases);
 }
+function explicitClockList(times, opts) {
+  const phrases = times.map(function clock(time) {
+    return atTime(explicitTimePhrase(time.hour, time.minute, opts));
+  });
+  const grouped = groupClockTimes(phrases);
+  return grouped.startsWith("a ") ? grouped.slice(2) : grouped;
+}
+function durationHourList(times, opts) {
+  const phrases = times.map(function clock(time) {
+    return atTime(bareHourPhrase(time.hour, opts));
+  });
+  return groupClockTimes(phrases);
+}
+function bareHourPhrase(hour, opts) {
+  if (opts.ampm) {
+    return timePhrase(hour, 0, null, opts);
+  }
+  if (+hour === 0) {
+    return "medianoche";
+  }
+  if (+hour === 12) {
+    return "mediod\xEDa";
+  }
+  return (+hour === 1 ? "la " : "las ") + hour;
+}
+function explicitTimePhrase(hour, minute, opts) {
+  if (!opts.ampm) {
+    const article = +hour === 1 ? "la " : "las ";
+    const suffix = opts.style.hSuffix ? " h" : "";
+    return article + clockDigits(
+      { hour, minute, second: 0 },
+      { pad: true, sep: opts.style.sep }
+    ) + suffix;
+  }
+  const display = hour % 12 || 12;
+  const time = (display === 1 ? "la " : "las ") + clockDigits({ hour: display, minute, second: 0 }, { sep: opts.style.sep });
+  const period = opts.style.meridiem === "english" ? meridiemMark(hour) : dayPeriod(hour, opts);
+  return time + " " + period;
+}
 function groupClockTimes(phrases) {
   if (phrases.length < 2) {
     return joinList(phrases);
@@ -992,17 +1042,15 @@ function numero(n, opts) {
   return numeral(n, numeros, opts);
 }
 function weekdayName(token) {
-  if (token === "7" || token === 7) {
-    return weekdayNames[0];
-  }
-  return weekdayNames[token] || weekdayNames[weekdayTokens[token]];
+  const number = toFieldNumber("" + token, weekdayNumbers);
+  return weekdayNames[number === 7 ? 0 : number];
 }
 function pluralWeekday(token) {
   const name = weekdayName(token);
   return name.endsWith("s") ? name : name + "s";
 }
 function monthName(token) {
-  return monthNames[token] || monthNames[monthTokens[token]];
+  return monthNames[+token];
 }
 function isOpenStep(field) {
   return field.indexOf("/") !== -1 && field.indexOf("-") === -1 && field.indexOf(",") === -1;
@@ -1012,7 +1060,9 @@ var es2 = {
   fallback: "un patr\xF3n cron irreconocible",
   options: normalizeOptions,
   reboot: "al arrancar el sistema",
-  sentence: (description) => "Se ejecuta " + description + "."
+  // A description ending in a period already carries it, so closing the
+  // sentence must not double it.
+  sentence: (description) => "Se ejecuta " + description + (description.endsWith(".") ? "" : ".")
 };
 var index_default = es2;
 module.exports = module.exports.default;

package/dist/lang/es.js

@@ -14,6 +14,26 @@ function clockDigits(time, { sep, pad: padHour, lean }) {
   return head + sep + pad(time.minute) + (time.second ? sep + pad(time.second) : "");
 }
 
+// src/core/specs.ts
+var weekdayNumbers = {
+  SUN: 0,
+  MON: 1,
+  TUE: 2,
+  WED: 3,
+  THU: 4,
+  FRI: 5,
+  SAT: 6
+};
+
+// src/core/util.ts
+function isNonNegativeInteger(value) {
+  const digits = /^\d+$/;
+  return digits.test(value);
+}
+function toFieldNumber(token, numberMap) {
+  return isNonNegativeInteger(token) ? +token : numberMap[token.toUpperCase()];
+}
+
 // src/lang/es/dialects.ts
 var es = {
   ampm: false,
@@ -85,29 +105,6 @@ var weekdayNames = [
   "viernes",
   "s\xE1bado"
 ];
-var monthTokens = {
-  JAN: 1,
-  FEB: 2,
-  MAR: 3,
-  APR: 4,
-  MAY: 5,
-  JUN: 6,
-  JUL: 7,
-  AUG: 8,
-  SEP: 9,
-  OCT: 10,
-  NOV: 11,
-  DEC: 12
-};
-var weekdayTokens = {
-  SUN: 0,
-  MON: 1,
-  TUE: 2,
-  WED: 3,
-  THU: 4,
-  FRI: 5,
-  SAT: 6
-};
 var nthWeekdayNames = [null, "primer", "segundo", "tercer", "cuarto", "quinto"];
 function normalizeOptions(options) {
   options = options || {};
@@ -151,6 +148,9 @@ function renderSecondsWithinMinute(ir, plan, opts) {
   return secondsLeadClause(ir, opts) + ", en el minuto " + minuteField + " de cada hora" + trailingQualifier(ir, opts);
 }
 function renderComposeSeconds(ir, plan, opts) {
+  if (plan.rest.kind === "clockTimes" && (ir.shapes.second === "wildcard" || ir.shapes.second === "step")) {
+    return pinnedMinuteSeconds(ir, plan.rest, opts);
+  }
   if (plan.rest.kind === "clockTimes" && ir.shapes.second === "list") {
     const clockPhrases = plan.rest.times.map(function clock(time) {
       return atTime(timePhrase(time.hour, time.minute, null, opts));
@@ -170,6 +170,14 @@ function renderComposeSeconds(ir, plan, opts) {
   }
   return secondsLeadClause(ir, opts) + ", " + render(ir, plan.rest, opts);
 }
+function pinnedMinuteSeconds(ir, rest, opts) {
+  const dayTrail = leadingQualifier(ir, opts).trimEnd();
+  const trail = dayTrail ? ", " + dayTrail : "";
+  if (+rest.times[0].minute === 0) {
+    return secondsLeadClause(ir, opts) + " durante un minuto " + durationHourList(rest.times, opts) + trail;
+  }
+  return secondsLeadClause(ir, opts) + " de " + explicitClockList(rest.times, opts) + trail;
+}
 function secondsLeadClause(ir, opts) {
   const secondField = ir.pattern.second;
   const shape = ir.shapes.second;
@@ -278,6 +286,9 @@ function renderMinuteFrequency(ir, plan, opts) {
   return phrase + trailingQualifier(ir, opts);
 }
 function renderMinuteSpanInHour(ir, plan, opts) {
+  if (ir.pattern.minute === "*") {
+    return "cada minuto de la hora " + fromTime(timePhrase(plan.hour, 0, null, opts)) + trailingQualifier(ir, opts);
+  }
   return "cada minuto " + timeRange(
     { hour: plan.hour, minute: plan.span[0] },
     { hour: plan.hour, minute: plan.span[1] },
@@ -394,6 +405,45 @@ function renderClockTimes(ir, plan, opts) {
   });
   return leadingQualifier(ir, opts) + groupClockTimes(phrases);
 }
+function explicitClockList(times, opts) {
+  const phrases = times.map(function clock(time) {
+    return atTime(explicitTimePhrase(time.hour, time.minute, opts));
+  });
+  const grouped = groupClockTimes(phrases);
+  return grouped.startsWith("a ") ? grouped.slice(2) : grouped;
+}
+function durationHourList(times, opts) {
+  const phrases = times.map(function clock(time) {
+    return atTime(bareHourPhrase(time.hour, opts));
+  });
+  return groupClockTimes(phrases);
+}
+function bareHourPhrase(hour, opts) {
+  if (opts.ampm) {
+    return timePhrase(hour, 0, null, opts);
+  }
+  if (+hour === 0) {
+    return "medianoche";
+  }
+  if (+hour === 12) {
+    return "mediod\xEDa";
+  }
+  return (+hour === 1 ? "la " : "las ") + hour;
+}
+function explicitTimePhrase(hour, minute, opts) {
+  if (!opts.ampm) {
+    const article = +hour === 1 ? "la " : "las ";
+    const suffix = opts.style.hSuffix ? " h" : "";
+    return article + clockDigits(
+      { hour, minute, second: 0 },
+      { pad: true, sep: opts.style.sep }
+    ) + suffix;
+  }
+  const display = hour % 12 || 12;
+  const time = (display === 1 ? "la " : "las ") + clockDigits({ hour: display, minute, second: 0 }, { sep: opts.style.sep });
+  const period = opts.style.meridiem === "english" ? meridiemMark(hour) : dayPeriod(hour, opts);
+  return time + " " + period;
+}
 function groupClockTimes(phrases) {
   if (phrases.length < 2) {
     return joinList(phrases);
@@ -966,17 +1016,15 @@ function numero(n, opts) {
   return numeral(n, numeros, opts);
 }
 function weekdayName(token) {
-  if (token === "7" || token === 7) {
-    return weekdayNames[0];
-  }
-  return weekdayNames[token] || weekdayNames[weekdayTokens[token]];
+  const number = toFieldNumber("" + token, weekdayNumbers);
+  return weekdayNames[number === 7 ? 0 : number];
 }
 function pluralWeekday(token) {
   const name = weekdayName(token);
   return name.endsWith("s") ? name : name + "s";
 }
 function monthName(token) {
-  return monthNames[token] || monthNames[monthTokens[token]];
+  return monthNames[+token];
 }
 function isOpenStep(field) {
   return field.indexOf("/") !== -1 && field.indexOf("-") === -1 && field.indexOf(",") === -1;
@@ -986,7 +1034,9 @@ var es2 = {
   fallback: "un patr\xF3n cron irreconocible",
   options: normalizeOptions,
   reboot: "al arrancar el sistema",
-  sentence: (description) => "Se ejecuta " + description + "."
+  // A description ending in a period already carries it, so closing the
+  // sentence must not double it.
+  sentence: (description) => "Se ejecuta " + description + (description.endsWith(".") ? "" : ".")
 };
 var index_default = es2;
 export {

package/dist/lang/fi.cjs

@@ -40,6 +40,26 @@ function clockDigits(time, { sep, pad: padHour, lean }) {
   return head + sep + pad(time.minute) + (time.second ? sep + pad(time.second) : "");
 }
 
+// src/core/specs.ts
+var weekdayNumbers = {
+  SUN: 0,
+  MON: 1,
+  TUE: 2,
+  WED: 3,
+  THU: 4,
+  FRI: 5,
+  SAT: 6
+};
+
+// src/core/util.ts
+function isNonNegativeInteger(value) {
+  const digits = /^\d+$/;
+  return digits.test(value);
+}
+function toFieldNumber(token, numberMap) {
+  return isNonNegativeInteger(token) ? +token : numberMap[token.toUpperCase()];
+}
+
 // src/lang/fi/dialects.ts
 var dialects = {
   fi: {
@@ -166,29 +186,6 @@ var monthStems = [
   "marras",
   "joulu"
 ];
-var monthTokens = {
-  JAN: 1,
-  FEB: 2,
-  MAR: 3,
-  APR: 4,
-  MAY: 5,
-  JUN: 6,
-  JUL: 7,
-  AUG: 8,
-  SEP: 9,
-  OCT: 10,
-  NOV: 11,
-  DEC: 12
-};
-var weekdayTokens = {
-  SUN: 0,
-  MON: 1,
-  TUE: 2,
-  WED: 3,
-  THU: 4,
-  FRI: 5,
-  SAT: 6
-};
 var units = {
   minute: {
     mark: "joka tunti",
@@ -273,8 +270,22 @@ function renderComposeSeconds(ir, plan, opts) {
     }
     return stepPhrase + ", " + secondsLeadClause(ir, opts) + hourClause + trailingQualifier(ir, 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);
 }
+function composeMinuteZero(ir, rest, opts) {
+  const clocks = rest.times.map(function clock(time) {
+    return clockDigits(
+      { hour: time.hour, minute: time.minute },
+      { sep: opts.style.sep }
+    );
+  });
+  const frame = clocks.length === 1 ? "minuutin " + clocks[0] : "minuuttien " + joinList(clocks);
+  const dayTrail = leadingQualifier(ir, opts).trimEnd();
+  return secondsLeadClause(ir, opts) + " " + frame + " aikana" + (dayTrail ? ", " + dayTrail : "");
+}
 function secondsLeadClause(ir, opts) {
   const secondField = ir.pattern.second;
   const shape = ir.shapes.second;
@@ -385,6 +396,9 @@ function renderMinuteFrequency(ir, plan, opts) {
   return phrase + trailingQualifier(ir, opts);
 }
 function renderMinuteSpanInHour(ir, plan, opts) {
+  if (ir.pattern.minute === "*") {
+    return "joka minuutti kello " + plan.hour + " aikana" + trailingQualifier(ir, opts);
+  }
   return "joka minuutti " + kloRange(
     { hour: plan.hour, minute: plan.span[0] },
     { hour: plan.hour, minute: plan.span[1] },
@@ -840,13 +854,10 @@ function quartzWeekdayPhrase(weekdayField) {
   }
 }
 function weekdayNumber(token) {
-  if (token in weekdayTokens) {
-    return weekdayTokens[token];
-  }
-  return +token % 7;
+  return toFieldNumber("" + token, weekdayNumbers) % 7;
 }
 function monthNumber(token) {
-  return monthTokens[token] || +token;
+  return +token;
 }
 function applyYear(description, ir, opts) {
   const yearField = ir.pattern.year;
@@ -928,7 +939,9 @@ var fi = {
   fallback: "tunnistamaton cron-lauseke",
   options: normalizeOptions,
   reboot: "j\xE4rjestelm\xE4n k\xE4ynnistyess\xE4",
-  sentence: (description) => "Suoritetaan " + description + "."
+  // A description ending in a period already carries it, so closing the
+  // sentence must not double it.
+  sentence: (description) => "Suoritetaan " + description + (description.endsWith(".") ? "" : ".")
 };
 var index_default = fi;
 module.exports = module.exports.default;

package/dist/lang/fi.js

@@ -14,6 +14,26 @@ function clockDigits(time, { sep, pad: padHour, lean }) {
   return head + sep + pad(time.minute) + (time.second ? sep + pad(time.second) : "");
 }
 
+// src/core/specs.ts
+var weekdayNumbers = {
+  SUN: 0,
+  MON: 1,
+  TUE: 2,
+  WED: 3,
+  THU: 4,
+  FRI: 5,
+  SAT: 6
+};
+
+// src/core/util.ts
+function isNonNegativeInteger(value) {
+  const digits = /^\d+$/;
+  return digits.test(value);
+}
+function toFieldNumber(token, numberMap) {
+  return isNonNegativeInteger(token) ? +token : numberMap[token.toUpperCase()];
+}
+
 // src/lang/fi/dialects.ts
 var dialects = {
   fi: {
@@ -140,29 +160,6 @@ var monthStems = [
   "marras",
   "joulu"
 ];
-var monthTokens = {
-  JAN: 1,
-  FEB: 2,
-  MAR: 3,
-  APR: 4,
-  MAY: 5,
-  JUN: 6,
-  JUL: 7,
-  AUG: 8,
-  SEP: 9,
-  OCT: 10,
-  NOV: 11,
-  DEC: 12
-};
-var weekdayTokens = {
-  SUN: 0,
-  MON: 1,
-  TUE: 2,
-  WED: 3,
-  THU: 4,
-  FRI: 5,
-  SAT: 6
-};
 var units = {
   minute: {
     mark: "joka tunti",
@@ -247,8 +244,22 @@ function renderComposeSeconds(ir, plan, opts) {
     }
     return stepPhrase + ", " + secondsLeadClause(ir, opts) + hourClause + trailingQualifier(ir, 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);
 }
+function composeMinuteZero(ir, rest, opts) {
+  const clocks = rest.times.map(function clock(time) {
+    return clockDigits(
+      { hour: time.hour, minute: time.minute },
+      { sep: opts.style.sep }
+    );
+  });
+  const frame = clocks.length === 1 ? "minuutin " + clocks[0] : "minuuttien " + joinList(clocks);
+  const dayTrail = leadingQualifier(ir, opts).trimEnd();
+  return secondsLeadClause(ir, opts) + " " + frame + " aikana" + (dayTrail ? ", " + dayTrail : "");
+}
 function secondsLeadClause(ir, opts) {
   const secondField = ir.pattern.second;
   const shape = ir.shapes.second;
@@ -359,6 +370,9 @@ function renderMinuteFrequency(ir, plan, opts) {
   return phrase + trailingQualifier(ir, opts);
 }
 function renderMinuteSpanInHour(ir, plan, opts) {
+  if (ir.pattern.minute === "*") {
+    return "joka minuutti kello " + plan.hour + " aikana" + trailingQualifier(ir, opts);
+  }
   return "joka minuutti " + kloRange(
     { hour: plan.hour, minute: plan.span[0] },
     { hour: plan.hour, minute: plan.span[1] },
@@ -814,13 +828,10 @@ function quartzWeekdayPhrase(weekdayField) {
   }
 }
 function weekdayNumber(token) {
-  if (token in weekdayTokens) {
-    return weekdayTokens[token];
-  }
-  return +token % 7;
+  return toFieldNumber("" + token, weekdayNumbers) % 7;
 }
 function monthNumber(token) {
-  return monthTokens[token] || +token;
+  return +token;
 }
 function applyYear(description, ir, opts) {
   const yearField = ir.pattern.year;
@@ -902,7 +913,9 @@ var fi = {
   fallback: "tunnistamaton cron-lauseke",
   options: normalizeOptions,
   reboot: "j\xE4rjestelm\xE4n k\xE4ynnistyess\xE4",
-  sentence: (description) => "Suoritetaan " + description + "."
+  // A description ending in a period already carries it, so closing the
+  // sentence must not double it.
+  sentence: (description) => "Suoritetaan " + description + (description.endsWith(".") ? "" : ".")
 };
 var index_default = fi;
 export {

package/dist/lang/zh.cjs

@@ -201,7 +201,8 @@ function renderMinuteFrequency(ir, plan) {
   const base = minuteStep.startToken === "*" ? cadence(minuteStep.interval, UNITS.minute) : renderMinutePast(ir);
   const { hours } = plan;
   if (hours.kind === "step") {
-    return cadence(stepSegment(ir, "hour").interval, UNITS.hour) + base;
+    const hourStep = stepSegment(ir, "hour");
+    return hourStep.startToken === "*" ? cadence(hourStep.interval, UNITS.hour) + base : "\u5728" + hourList(ir) + "\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;
@@ -216,6 +217,9 @@ function renderMinuteFrequency(ir, plan) {
 }
 function renderMinuteSpanInHour(ir, plan) {
   const span = plan;
+  if (ir.pattern.minute === "*") {
+    return hourWord(span.hour) + "\u7684\u6BCF\u4E00\u5206\u949F";
+  }
   return "\u5728" + hourWord(span.hour) + "\u81F3" + span.hour + "\u70B9" + span.span[1] + "\u5206\u4E4B\u95F4\uFF0C\u6BCF\u5206\u949F";
 }
 function renderMinutesAcrossHours(ir, plan) {
@@ -226,12 +230,17 @@ function renderMinutesAcrossHours(ir, plan) {
   return hourList(ir) + "\uFF0C\u6BCF\u5C0F\u65F6" + valueList(fieldSegments(ir, "minute"), "\u5206") + "\uFF0C\u6BCF\u5206\u949F";
 }
 function renderMinuteSpanAcrossHourStep(ir, plan) {
-  const cad = cadence(stepSegment(ir, "hour").interval, UNITS.hour);
+  const hourStep = stepSegment(ir, "hour");
   const { form } = plan;
-  if (form === "wildcard") {
-    return cad + "\u5185\uFF0C\u6BCF\u5206\u949F";
+  const minuteTail = form === "wildcard" ? "\u6BCF\u5206\u949F" : "\u6BCF\u5C0F\u65F6" + valueList(fieldSegments(ir, "minute"), "\u5206") + "\uFF0C\u6BCF\u5206\u949F";
+  if (hourStep.startToken !== "*") {
+    return form === "wildcard" ? "\u5728" + hourList(ir) + "\uFF0C" + minuteTail : hourList(ir) + "\uFF0C" + minuteTail;
   }
-  return cad + "\uFF0C\u6BCF\u5C0F\u65F6" + valueList(fieldSegments(ir, "minute"), "\u5206") + "\uFF0C\u6BCF\u5206\u949F";
+  if (hourStep.interval === 2 && form === "wildcard") {
+    return "\u5728\u5076\u6570\u5C0F\u65F6\uFF0C" + minuteTail;
+  }
+  const cad = cadence(hourStep.interval, UNITS.hour);
+  return form === "wildcard" ? cad + "\u5185\uFF0C" + minuteTail : cad + "\uFF0C" + minuteTail;
 }
 function renderClockTimes(ir, plan, opts) {
   const { times } = plan;
@@ -317,9 +326,19 @@ function isHourCadence(ir) {
 function composeSecondsOnHour(ir, plan, opts) {
   const sec = secondClause(ir);
   const { rest } = plan;
+  if ((rest.kind === "clockTimes" || rest.kind === "compactClockTimes") && ir.pattern.minute === "0") {
+    const clocks = hourFires(ir).map(function clock(hour) {
+      return hourWord(hour) + "0\u5206";
+    });
+    const tail = sec === "\u6BCF\u79D2" ? "\u7684\u6BCF\u4E00\u79D2" : "\u7684" + sec;
+    const core = joinAnd(clocks) + tail;
+    return isDaily(ir) ? "\u6BCF\u5929" + core : core;
+  }
   const restText = render(ir, rest, opts);
-  if ((rest.kind === "clockTimes" || rest.kind === "compactClockTimes") && isDaily(ir)) {
-    return "\u6BCF\u5929" + restText + sec;
+  if (rest.kind === "clockTimes" || rest.kind === "compactClockTimes") {
+    if (isDaily(ir)) {
+      return "\u6BCF\u5929" + restText + sec;
+    }
   }
   if (rest.kind === "singleMinute") {
     return restText + "\uFF0C" + sec;
@@ -343,6 +362,9 @@ function composeSecondsCadence(ir) {
 function composeSecondsListed(ir) {
   const sec = secondClause(ir);
   const minutes = "\u6BCF\u5C0F\u65F6" + valueList(fieldSegments(ir, "minute"), "\u5206");
+  if (ir.shapes.hour === "single" && sec === "\u6BCF\u79D2") {
+    return hourWord(hourFires(ir)[0]) + valueList(fieldSegments(ir, "minute"), "\u5206") + "\u7684\u6BCF\u4E00\u79D2";
+  }
   if (ir.shapes.hour === "wildcard") {
     return minutes + "\uFF0C" + sec;
   }
@@ -352,10 +374,13 @@ function composeSecondsListed(ir) {
   return hourFrame(ir) + minutes + "\uFF0C" + sec;
 }
 function renderComposeSeconds(ir, plan, opts) {
-  if (ir.pattern.minute === "0") {
+  const { rest } = plan;
+  const composedClock = rest.kind === "clockTimes" || rest.kind === "compactClockTimes";
+  if (ir.pattern.minute === "0" || composedClock && ir.shapes.minute === "single") {
     return composeSecondsOnHour(ir, plan, opts);
   }
-  if (ir.pattern.minute === "*" || ir.shapes.minute === "step") {
+  const minuteCadence = ir.pattern.minute === "*" || ir.shapes.minute === "step" && stepSegment(ir, "minute").startToken === "*";
+  if (minuteCadence) {
     return composeSecondsCadence(ir);
   }
   return composeSecondsListed(ir);