cronli5 0.1.6 → 0.1.7

package/dist/lang/de.js

@@ -36,6 +36,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()];
 }
@@ -96,6 +116,9 @@ function everyUnit(unit) {
 function everyN(interval, unit) {
   return "alle " + interval + " " + unit.plural;
 }
+function withAnchor(clause, anchor) {
+  return anchor ? clause + " " + anchor : clause;
+}
 function stepSegment(segments) {
   return segments[0];
 }
@@ -119,7 +142,10 @@ function stepClause(segment, unit, anchor) {
   const start = segment.startToken === "*" ? 0 : +segment.startToken;
   const short = start !== 0 && segment.fires.length <= 3;
   if (segment.startToken.indexOf("-") !== -1 || short) {
-    return "in den " + unit.plural + " " + joinList(segment.fires.map(String)) + " " + anchor;
+    return withAnchor(
+      "in den " + unit.plural + " " + joinList(segment.fires.map(String)),
+      anchor
+    );
   }
   return renderStride({
     interval: segment.interval,
@@ -180,7 +206,7 @@ function weekdayRange(bounds) {
   return weekdayName(bounds[0]) + " bis " + weekdayName(bounds[1]);
 }
 function weekdayQualifier(ir) {
-  const segments = flattenSteps(fieldSegments(ir, "weekday"));
+  const segments = orderWeekdaysForDisplay(fieldSegments(ir, "weekday"));
   if (segments.length === 1 && segments[0].kind === "range") {
     return weekdayRange(segments[0].bounds);
   }
@@ -320,8 +346,11 @@ function countedPhrase(ir, field, singular, plural) {
   }
   return "in den " + plural + " " + joinList(fieldValues(ir, field));
 }
+function minuteAnchor(ir) {
+  return ir.pattern.minute === "*" ? "jeder Minute" : "";
+}
 function secondsLead(ir) {
-  return secondsClause(ir, "jeder Minute");
+  return secondsClause(ir, minuteAnchor(ir));
 }
 function secondsClause(ir, anchor) {
   if (ir.pattern.second === "*") {
@@ -331,7 +360,7 @@ function secondsClause(ir, anchor) {
   if (ir.shapes.second === "step") {
     return stepClause(stepSegment(segments), UNITS.second, anchor);
   }
-  return strideFromSegments(segments, UNITS.second, anchor) ?? countedPhrase(ir, "second", "Sekunde", "Sekunden") + " " + anchor;
+  return strideFromSegments(segments, UNITS.second, anchor) ?? withAnchor(countedPhrase(ir, "second", "Sekunde", "Sekunden"), anchor);
 }
 function spanTime(hour, minute, sep) {
   return hour + sep + pad(minute);
@@ -506,16 +535,22 @@ function renderMinuteFrequency(ir, plan, opts) {
   const segment = stepSegment(ir.analyses.segments.minute);
   const sep = opts.style.sep;
   const clean = cleanStep(segment, 60);
-  const base = stepClause(segment, UNITS.minute, "jeder Stunde");
   if (plan.hours.kind === "window") {
+    const singleHour = plan.hours.from === plan.hours.to;
+    const base2 = stepClause(
+      segment,
+      UNITS.minute,
+      singleHour ? "" : "jeder Stunde"
+    );
     const window = hourWindow(
       plan.hours.from,
       plan.hours.to,
       plan.hours.last,
       sep
     );
-    return clean ? base + " " + window : base + ", " + window;
+    return clean ? base2 + " " + window : base2 + ", " + window;
   }
+  const base = stepClause(segment, UNITS.minute, "jeder Stunde");
   if (plan.hours.kind === "during") {
     const cadence = unevenHourCadence(ir);
     return cadence ? base + ", " + cadence : base + " " + duringHours(ir, plan.hours.times, sep);
@@ -531,7 +566,18 @@ function hourStepPhrase(ir) {
     return cadence;
   }
   const segment = stepSegment(ir.analyses.segments.hour);
-  return cleanStep(segment, 24) ? everyN(segment.interval, UNITS.hour) : atHours(segment.fires);
+  if (cleanStep(segment, 24)) {
+    return everyN(segment.interval, UNITS.hour);
+  }
+  const stride = openOffsetCleanStride(ir, segment);
+  return stride ? hourStrideCadence(stride) : atHours(segment.fires);
+}
+function openOffsetCleanStride(ir, segment) {
+  if (segment.startToken.indexOf("-") !== -1) {
+    return null;
+  }
+  const stride = hourStride(ir);
+  return stride && offsetCleanStride(stride) ? stride : null;
 }
 function hourStrideCadence(stride) {
   const { start, interval, last } = stride;
@@ -595,7 +641,7 @@ function subMinuteSecond(ir) {
 function hourCadenceLead(ir, minute) {
   if (minute === 0) {
     if (subMinuteSecond(ir)) {
-      return secondsClause(ir, "jeder Minute") + " f\xFCr eine Minute";
+      return withAnchor(secondsClause(ir, minuteAnchor(ir)), "f\xFCr eine Minute");
     }
     return secondsClause(ir, "jeder Stunde");
   }
@@ -603,7 +649,7 @@ function hourCadenceLead(ir, minute) {
   if (ir.pattern.second === "0") {
     return minutePhrase;
   }
-  return secondsClause(ir, "jeder Minute") + ", " + minutePhrase;
+  return secondsClause(ir, minuteAnchor(ir)) + ", " + minutePhrase;
 }
 function hourCadence(ir, minute) {
   const stride = hourStride(ir);
@@ -617,7 +663,7 @@ function hourCadence(ir, minute) {
   const segment = fieldSegments(ir, "hour")[0];
   const confined = minute === 0 && subMinuteSecond(ir) && fieldSegments(ir, "hour").length === 1 && segment.kind === "step" && confinedHourStride(segment);
   if (confined) {
-    return secondsClause(ir, "jeder Minute") + " f\xFCr eine Minute " + everyNthHour(segment);
+    return withAnchor(secondsClause(ir, minuteAnchor(ir)), "f\xFCr eine Minute") + " " + everyNthHour(segment);
   }
   if (minute === 0 && ir.pattern.second === "0") {
     return hourStrideCadence(stride);
@@ -647,12 +693,8 @@ function hourRangeWindowTail(ir) {
   return joinList(hourSegmentParts(ir, 0, 0, ":"));
 }
 function renderHourRange(ir, plan, opts) {
-  const window = hourWindow(
-    plan.from,
-    plan.to,
-    plan.boundMinute ?? 0,
-    opts.style.sep
-  );
+  const last = plan.minuteForm === "wildcard" ? plan.boundMinute ?? 0 : 0;
+  const window = hourWindow(plan.from, plan.to, last, opts.style.sep);
   if (plan.minuteForm === "wildcard") {
     return "jede Minute " + window;
   }
@@ -728,7 +770,11 @@ function needsDailyFrame(ir) {
   if (ir.plan.kind === "clockTimes" || isComposeMinuteZero(ir)) {
     return true;
   }
-  return ir.plan.kind === "hourStep" && !cleanStep(stepSegment(ir.analyses.segments.hour), 24);
+  if (ir.plan.kind !== "hourStep") {
+    return false;
+  }
+  const segment = stepSegment(ir.analyses.segments.hour);
+  return !cleanStep(segment, 24) && !openOffsetCleanStride(ir, segment);
 }
 function render(ir, plan, opts) {
   return renderers[plan.kind](

package/dist/lang/en.cjs

@@ -40,6 +40,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];
+  });
+}
 
 // src/core/specs.ts
 var maxClockTimes = 6;
@@ -417,7 +437,8 @@ function renderHourStep(ir, plan, opts) {
   return stepHours(ir.analyses.segments.hour[0], 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 "from " + getTime({ hour: window.from, minute: 0 }, opts) + through(opts) + getTime({ hour: window.to, minute: window.last }, opts);
@@ -872,17 +893,27 @@ function monthFoldsIntoDate(ir) {
 function dateOrWeekday(ir, opts) {
   const pattern = ir.pattern;
   const weekdayPart = quartzWeekdayPhrase(pattern.weekday, opts) || "on " + weekdayPhrase(ir, opts);
+  if (pattern.month !== "*" && monthFoldsIntoDate(ir) && !quartzDatePhrase(pattern.date, opts) && !isOpenStep(pattern.date)) {
+    return "on " + monthDatePhrase(ir, opts) + " or " + weekdayPart + " in " + monthName(ir, opts);
+  }
+  return datePart(ir, opts) + " or " + weekdayPart + orMonthScope(ir, opts);
+}
+function datePart(ir, opts) {
+  const pattern = ir.pattern;
   const quartzDate = quartzDatePhrase(pattern.date, opts);
   if (quartzDate) {
-    return quartzDate + monthScope(ir, opts) + " or " + weekdayPart;
+    return quartzDate;
   }
   if (isOpenStep(pattern.date)) {
-    return stepDates(pattern.date) + monthScope(ir, opts) + " or " + weekdayPart;
+    return stepDates(pattern.date);
   }
-  if (pattern.month !== "*" && monthFoldsIntoDate(ir)) {
-    return "on " + monthDatePhrase(ir, opts) + " or " + weekdayPart + " in " + monthName(ir, opts);
+  return "on the " + dateOrdinals(ir, opts);
+}
+function orMonthScope(ir, opts) {
+  if (ir.pattern.month === "*") {
+    return "";
   }
-  return "on the " + dateOrdinals(ir, opts) + " or " + weekdayPart + monthScope(ir, opts);
+  return ", in " + monthName(ir, opts);
 }
 function quartzDatePhrase(dateField, opts) {
   if (dateField === "L") {
@@ -964,7 +995,8 @@ function oddEvenMonth(monthField) {
   return start === "2" ? "every even-numbered month" : null;
 }
 function weekdayPhrase(ir, opts) {
-  return renderSegments(ir.analyses.segments.weekday, function name(value) {
+  const segments = orderWeekdaysForDisplay(ir.analyses.segments.weekday);
+  return renderSegments(segments, function name(value) {
     return getWeekday(value, opts);
   }, opts);
 }

package/dist/lang/en.js

@@ -14,6 +14,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];
+  });
+}
 
 // src/core/specs.ts
 var maxClockTimes = 6;
@@ -391,7 +411,8 @@ function renderHourStep(ir, plan, opts) {
   return stepHours(ir.analyses.segments.hour[0], 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 "from " + getTime({ hour: window.from, minute: 0 }, opts) + through(opts) + getTime({ hour: window.to, minute: window.last }, opts);
@@ -846,17 +867,27 @@ function monthFoldsIntoDate(ir) {
 function dateOrWeekday(ir, opts) {
   const pattern = ir.pattern;
   const weekdayPart = quartzWeekdayPhrase(pattern.weekday, opts) || "on " + weekdayPhrase(ir, opts);
+  if (pattern.month !== "*" && monthFoldsIntoDate(ir) && !quartzDatePhrase(pattern.date, opts) && !isOpenStep(pattern.date)) {
+    return "on " + monthDatePhrase(ir, opts) + " or " + weekdayPart + " in " + monthName(ir, opts);
+  }
+  return datePart(ir, opts) + " or " + weekdayPart + orMonthScope(ir, opts);
+}
+function datePart(ir, opts) {
+  const pattern = ir.pattern;
   const quartzDate = quartzDatePhrase(pattern.date, opts);
   if (quartzDate) {
-    return quartzDate + monthScope(ir, opts) + " or " + weekdayPart;
+    return quartzDate;
   }
   if (isOpenStep(pattern.date)) {
-    return stepDates(pattern.date) + monthScope(ir, opts) + " or " + weekdayPart;
+    return stepDates(pattern.date);
   }
-  if (pattern.month !== "*" && monthFoldsIntoDate(ir)) {
-    return "on " + monthDatePhrase(ir, opts) + " or " + weekdayPart + " in " + monthName(ir, opts);
+  return "on the " + dateOrdinals(ir, opts);
+}
+function orMonthScope(ir, opts) {
+  if (ir.pattern.month === "*") {
+    return "";
   }
-  return "on the " + dateOrdinals(ir, opts) + " or " + weekdayPart + monthScope(ir, opts);
+  return ", in " + monthName(ir, opts);
 }
 function quartzDatePhrase(dateField, opts) {
   if (dateField === "L") {
@@ -938,7 +969,8 @@ function oddEvenMonth(monthField) {
   return start === "2" ? "every even-numbered month" : null;
 }
 function weekdayPhrase(ir, opts) {
-  return renderSegments(ir.analyses.segments.weekday, function name(value) {
+  const segments = orderWeekdaysForDisplay(ir.analyses.segments.weekday);
+  return renderSegments(segments, function name(value) {
     return getWeekday(value, opts);
   }, opts);
 }

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()];
 }
@@ -224,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;
@@ -437,7 +457,8 @@ function renderHourStep(ir, plan, 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(
@@ -481,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";
   });
@@ -705,7 +726,7 @@ function renderCompactClockTimes(ir, plan, opts) {
     return leadingQualifier(ir, opts) + hourSegmentTimes(ir, plan.minute, ir.analyses.clockSecond, opts);
   }
   const cadence = unevenHourCadence(ir, opts);
-  const phrase = cadence ? minutesList(ir, opts) + ", " + cadence + trailingQualifier(ir, opts) : minutesList(ir, opts) + ", " + hourSegmentTimes(ir, 0, null, opts) + trailingQualifier(ir, opts);
+  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 = {
@@ -896,6 +917,48 @@ function hourRangeCadence(ir, minute, 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));
@@ -1158,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()];
 }
@@ -198,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;
@@ -411,7 +431,8 @@ function renderHourStep(ir, plan, 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 +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";
   });
@@ -679,7 +700,7 @@ function renderCompactClockTimes(ir, plan, opts) {
     return leadingQualifier(ir, opts) + hourSegmentTimes(ir, plan.minute, ir.analyses.clockSecond, opts);
   }
   const cadence = unevenHourCadence(ir, opts);
-  const phrase = cadence ? minutesList(ir, opts) + ", " + cadence + trailingQualifier(ir, opts) : minutesList(ir, opts) + ", " + hourSegmentTimes(ir, 0, null, opts) + trailingQualifier(ir, opts);
+  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 = {
@@ -870,6 +891,48 @@ function hourRangeCadence(ir, minute, 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));
@@ -1132,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";
   });

package/dist/lang/fi.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()];
 }
@@ -965,7 +985,7 @@ function weekdayQualifier(ir) {
   if (quartz) {
     return quartz;
   }
-  const segments = flattenSteps(ir.analyses.segments.weekday);
+  const segments = orderWeekdaysForDisplay(ir.analyses.segments.weekday);
   return joinList(segments.map(function piece(segment) {
     if (segment.kind === "range") {
       return weekdays[weekdayNumber(segment.bounds[0])].ela + " " + weekdays[weekdayNumber(segment.bounds[1])].ill;

package/dist/lang/fi.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()];
 }
@@ -939,7 +959,7 @@ function weekdayQualifier(ir) {
   if (quartz) {
     return quartz;
   }
-  const segments = flattenSteps(ir.analyses.segments.weekday);
+  const segments = orderWeekdaysForDisplay(ir.analyses.segments.weekday);
   return joinList(segments.map(function piece(segment) {
     if (segment.kind === "range") {
       return weekdays[weekdayNumber(segment.bounds[0])].ela + " " + weekdays[weekdayNumber(segment.bounds[1])].ill;