cronli5 0.1.5 → 0.1.7

package/dist/lang/es.cjs

@@ -72,6 +72,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()];
 }
@@ -202,14 +222,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") {
@@ -217,7 +244,7 @@ function renderComposeSeconds(ir, plan, opts) {
   }
   if (plan.rest.kind === "hourRange" && ir.shapes.second === "step" && ir.pattern.weekday !== "*") {
     const restNode = plan.rest;
-    const window = hourWindow(restNode, opts);
+    const window = hourWindow(boundedWindow(restNode), opts);
     const dayFrame = weekdayQualifier(ir) + monthScope(ir);
     const cadence = "cada " + numero(stepSegment(ir.analyses.segments.second).interval, opts) + " segundos del minuto " + ir.pattern.minute;
     return dayFrame + ", " + window + ", " + cadence;
@@ -225,7 +252,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") {
@@ -237,7 +266,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;
@@ -354,7 +383,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") {
@@ -373,22 +407,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);
@@ -408,10 +450,15 @@ 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) {
-  return { from: plan.from, last: plan.boundMinute ?? 0, to: plan.to };
+  const last = plan.minuteForm === "wildcard" ? plan.boundMinute ?? 0 : 0;
+  return { from: plan.from, last, to: plan.to };
 }
 function hourWindow(window, opts) {
   return timeRange(
@@ -455,7 +502,7 @@ function dowArm(ir) {
   if (quartz) {
     return quartz;
   }
-  const segments = flattenSteps(fieldSegments(ir, "weekday"));
+  const segments = orderWeekdaysForDisplay(fieldSegments(ir, "weekday"));
   const allSingles = segments.every(function single(segment) {
     return segment.kind === "single";
   });
@@ -479,7 +526,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;
     }
@@ -665,9 +713,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";
@@ -677,7 +725,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) + ", " + hourContextTimes(ir, opts) + trailingQualifier(ir, opts);
   return ir.analyses.clockSecond ? secondsLeadClause(ir, opts) + ", " + phrase : phrase;
 }
 var renderers = {
@@ -771,16 +820,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";
@@ -804,13 +883,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) {
@@ -821,6 +903,62 @@ 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 hourContextTimes(ir, opts) {
+  const segments = hourSegments(ir);
+  const points = [];
+  const hasRange = segments.some(function range(segment) {
+    return segment.kind === "range";
+  });
+  segments.forEach(function collect(segment) {
+    if (segment.kind === "step") {
+      points.push(...segment.fires);
+    } else if (segment.kind === "single") {
+      points.push(+segment.value);
+    }
+  });
+  function isWord(hour) {
+    return !opts.ampm && (hour === 0 || hour === 12);
+  }
+  if (!hasRange && points.every(isWord)) {
+    return joinList(points.map(function each(hour) {
+      return atTime(bareHourPhrase(hour, opts));
+    }));
+  }
+  function wholeHour(hour) {
+    return "de la hora " + fromTime(explicitTimePhrase(hour, 0, opts));
+  }
+  const pieces = [];
+  segments.forEach(function place(segment) {
+    if (segment.kind === "range") {
+      pieces.push(timeRange(
+        { hour: +segment.bounds[0], minute: 0 },
+        { hour: +segment.bounds[1], minute: 0 },
+        opts
+      ));
+    } else if (segment.kind === "step") {
+      segment.fires.forEach(function each(hour) {
+        pieces.push(wholeHour(hour));
+      });
+    } else {
+      pieces.push(wholeHour(+segment.value));
+    }
+  });
+  return joinList(pieces);
+}
 function atTimes(hours, opts) {
   return hours.map(function each(hour) {
     return atTime(timePhrase(hour, 0, null, opts));
@@ -1083,7 +1221,7 @@ function weekdayQualifier(ir) {
   if (quartz) {
     return quartz;
   }
-  const segments = flattenSteps(fieldSegments(ir, "weekday"));
+  const segments = orderWeekdaysForDisplay(fieldSegments(ir, "weekday"));
   const allSingles = segments.every(function single(segment) {
     return segment.kind === "single";
   });

package/dist/lang/es.js

@@ -46,6 +46,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()];
 }
@@ -176,14 +196,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") {
@@ -191,7 +218,7 @@ function renderComposeSeconds(ir, plan, opts) {
   }
   if (plan.rest.kind === "hourRange" && ir.shapes.second === "step" && ir.pattern.weekday !== "*") {
     const restNode = plan.rest;
-    const window = hourWindow(restNode, opts);
+    const window = hourWindow(boundedWindow(restNode), opts);
     const dayFrame = weekdayQualifier(ir) + monthScope(ir);
     const cadence = "cada " + numero(stepSegment(ir.analyses.segments.second).interval, opts) + " segundos del minuto " + ir.pattern.minute;
     return dayFrame + ", " + window + ", " + cadence;
@@ -199,7 +226,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 +240,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 +357,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 +381,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,10 +424,15 @@ 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) {
-  return { from: plan.from, last: plan.boundMinute ?? 0, to: plan.to };
+  const last = plan.minuteForm === "wildcard" ? plan.boundMinute ?? 0 : 0;
+  return { from: plan.from, last, to: plan.to };
 }
 function hourWindow(window, opts) {
   return timeRange(
@@ -429,7 +476,7 @@ function dowArm(ir) {
   if (quartz) {
     return quartz;
   }
-  const segments = flattenSteps(fieldSegments(ir, "weekday"));
+  const segments = orderWeekdaysForDisplay(fieldSegments(ir, "weekday"));
   const allSingles = segments.every(function single(segment) {
     return segment.kind === "single";
   });
@@ -453,7 +500,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 +687,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 +699,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) + ", " + hourContextTimes(ir, opts) + trailingQualifier(ir, opts);
   return ir.analyses.clockSecond ? secondsLeadClause(ir, opts) + ", " + phrase : phrase;
 }
 var renderers = {
@@ -745,16 +794,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 +857,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 +877,62 @@ 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 hourContextTimes(ir, opts) {
+  const segments = hourSegments(ir);
+  const points = [];
+  const hasRange = segments.some(function range(segment) {
+    return segment.kind === "range";
+  });
+  segments.forEach(function collect(segment) {
+    if (segment.kind === "step") {
+      points.push(...segment.fires);
+    } else if (segment.kind === "single") {
+      points.push(+segment.value);
+    }
+  });
+  function isWord(hour) {
+    return !opts.ampm && (hour === 0 || hour === 12);
+  }
+  if (!hasRange && points.every(isWord)) {
+    return joinList(points.map(function each(hour) {
+      return atTime(bareHourPhrase(hour, opts));
+    }));
+  }
+  function wholeHour(hour) {
+    return "de la hora " + fromTime(explicitTimePhrase(hour, 0, opts));
+  }
+  const pieces = [];
+  segments.forEach(function place(segment) {
+    if (segment.kind === "range") {
+      pieces.push(timeRange(
+        { hour: +segment.bounds[0], minute: 0 },
+        { hour: +segment.bounds[1], minute: 0 },
+        opts
+      ));
+    } else if (segment.kind === "step") {
+      segment.fires.forEach(function each(hour) {
+        pieces.push(wholeHour(hour));
+      });
+    } else {
+      pieces.push(wholeHour(+segment.value));
+    }
+  });
+  return joinList(pieces);
+}
 function atTimes(hours, opts) {
   return hours.map(function each(hour) {
     return atTime(timePhrase(hour, 0, null, opts));
@@ -1057,7 +1195,7 @@ function weekdayQualifier(ir) {
   if (quartz) {
     return quartz;
   }
-  const segments = flattenSteps(fieldSegments(ir, "weekday"));
+  const segments = orderWeekdaysForDisplay(fieldSegments(ir, "weekday"));
   const allSingles = segments.every(function single(segment) {
     return segment.kind === "single";
   });