cronli5 0.1.0 → 0.1.2

package/dist/cronli5.js

@@ -168,6 +168,11 @@ function throwInvalidField(value, field) {
 }
 
 // src/core/normalize.ts
+var timeFieldCycle = {
+  hour: 24,
+  minute: 60,
+  second: 60
+};
 function applyQuartzAliases(cronPattern) {
   fieldOrder.forEach(function apply(field) {
     const aliases = fieldSpecs[field].aliases;
@@ -184,21 +189,26 @@ function normalizeCronPattern(cronPattern) {
       cronPattern[field] = value;
       return;
     }
-    cronPattern[field] = normalizeField(value, fieldSpecs[field]);
+    cronPattern[field] = normalizeField(value, field, fieldSpecs[field]);
   });
   return cronPattern;
 }
-function normalizeField(value, spec) {
+function normalizeField(value, field, spec) {
   const stringValue = "" + value;
   if (stringValue === "*") {
     return stringValue;
   }
+  const cycle = timeFieldCycle[field];
   const segments = stringValue.split(",").map(function canonical(segment) {
-    return collapseDegenerateRange(
-      collapseOnceStep(collapseUnitStep(segment, spec), spec),
-      spec
+    return enumerateNonUniformStep(
+      collapseDegenerateRange(
+        collapseOnceStep(collapseUnitStep(segment, spec), spec),
+        spec
+      ),
+      spec,
+      cycle
     );
-  });
+  }).join(",").split(",");
   if (segments.indexOf("*") !== -1) {
     return "*";
   }
@@ -232,6 +242,22 @@ function collapseOnceStep(segment, spec) {
   }
   return start === "*" ? "" + spec.min : start;
 }
+function enumerateNonUniformStep(segment, spec, cycle) {
+  const parts = segment.split("/");
+  if (typeof cycle !== "number" || parts.length !== 2 || includes(parts[0], "-")) {
+    return segment;
+  }
+  const interval = +parts[1];
+  const start = parts[0] === "*" ? spec.min : toFieldNumber(parts[0]);
+  if (cycle % interval === 0 && start < interval) {
+    return segment;
+  }
+  const fires = [];
+  for (let value = start; value <= spec.top; value += interval) {
+    fires.push(value);
+  }
+  return fires.join(",");
+}
 function collapseDegenerateRange(segment, spec) {
   const start = segment.split("/")[0];
   if (!includes(start, "-")) {
@@ -506,7 +532,7 @@ function planSeconds(pattern, shapes, analyses) {
   }
   return {
     kind: "composeSeconds",
-    rest: planMinutes(pattern, shapes, analyses) || planHours(pattern, shapes, analyses)
+    rest: planMinutes(pattern, shapes, analyses, true) || planHours(pattern, shapes, analyses, true)
   };
 }
 function planStandaloneSeconds(pattern, shapes) {
@@ -521,7 +547,7 @@ function planStandaloneSeconds(pattern, shapes) {
   }
   return { kind: "standaloneSeconds" };
 }
-function planMinutes(pattern, shapes, analyses) {
+function planMinutes(pattern, shapes, analyses, subMinuteSecond = false) {
   if (shapes.minute === "step") {
     return {
       hours: planFrequencyHours(pattern, shapes, analyses),
@@ -544,7 +570,7 @@ function planMinutes(pattern, shapes, analyses) {
     return underStep;
   }
   if (pattern.hour === "*") {
-    return planMinutesUnderOpenHour(pattern, shapes);
+    return planMinutesUnderOpenHour(pattern, shapes, subMinuteSecond);
   }
 }
 function cleanHourStride(hourField) {
@@ -614,7 +640,7 @@ function planMinutesAcrossHours(pattern, shapes) {
   }
   return null;
 }
-function planMinutesUnderOpenHour(pattern, shapes) {
+function planMinutesUnderOpenHour(pattern, shapes, subMinuteSecond) {
   if (shapes.minute === "range") {
     return { kind: "rangeOfMinutes" };
   }
@@ -624,39 +650,45 @@ function planMinutesUnderOpenHour(pattern, shapes) {
   if (pattern.minute === "*") {
     return { kind: "everyMinute" };
   }
-  if (pattern.minute !== "0") {
+  if (pattern.minute !== "0" || subMinuteSecond) {
     return { kind: "singleMinute" };
   }
 }
-function planHours(pattern, shapes, analyses) {
-  if (shapes.hour === "range") {
-    const bounds = pattern.hour.split("-");
-    let minuteForm = "lead";
-    if (pattern.minute === "*") {
-      minuteForm = "wildcard";
-    } else if (shapes.minute === "range") {
-      minuteForm = "range";
-    }
-    return {
-      from: +bounds[0],
-      kind: "hourRange",
-      last: analyses.lastMinuteFire,
-      minuteForm,
-      to: +bounds[1]
-    };
+function planHours(pattern, shapes, analyses, subMinuteSecond = false) {
+  const absorbsMinuteZero = subMinuteSecond && pattern.minute === "0";
+  if (shapes.hour === "range" && !absorbsMinuteZero) {
+    return planHourRange(pattern, shapes, analyses);
   }
-  if (shapes.hour === "step" && pattern.minute === "0") {
+  if (shapes.hour === "step" && pattern.minute === "0" && !subMinuteSecond) {
     return { kind: "hourStep" };
   }
-  if (pattern.hour === "*") {
+  if (pattern.hour === "*" && !absorbsMinuteZero) {
     return { kind: "everyHour" };
   }
-  return planClockTimes(pattern, analyses);
+  return planClockTimes(pattern, analyses, absorbsMinuteZero);
+}
+function planHourRange(pattern, shapes, analyses) {
+  const bounds = pattern.hour.split("-");
+  let minuteForm = "lead";
+  if (pattern.minute === "*") {
+    minuteForm = "wildcard";
+  } else if (shapes.minute === "range") {
+    minuteForm = "range";
+  }
+  const multiValued = shapes.minute === "range" || shapes.minute === "list";
+  return {
+    boundMinute: multiValued ? null : analyses.lastMinuteFire,
+    from: +bounds[0],
+    kind: "hourRange",
+    last: analyses.lastMinuteFire,
+    minuteForm,
+    to: +bounds[1]
+  };
 }
-function planClockTimes(pattern, analyses) {
+function planClockTimes(pattern, analyses, enumerate = false) {
   const hours = enumerateFires(pattern.hour, 0, 23);
   const minutes = enumerateValues(pattern.minute);
-  if (hours.length * minutes.length > maxClockTimes) {
+  if (!enumerate && hours.length * minutes.length > maxClockTimes) {
     return {
       fold: minutes.length === 1,
       kind: "compactClockTimes",
@@ -970,7 +1002,7 @@ function renderEveryHour(ir, plan, opts) {
   return "every hour" + trailingQualifier(ir, opts);
 }
 function renderHourRange(ir, plan, opts) {
-  const window = hourWindow(plan, opts);
+  const window = hourWindow(boundedWindow(plan), opts);
   if (plan.minuteForm === "wildcard") {
     return "every minute " + window + trailingQualifier(ir, opts);
   }
@@ -993,6 +1025,9 @@ function rangeMinuteLead(ir, opts) {
 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 };
+}
 function hourWindow(window, opts) {
   return "from " + getTime({ hour: window.from, minute: 0 }, opts) + through(opts) + getTime({ hour: window.to, minute: window.last }, opts);
 }
@@ -1091,13 +1126,7 @@ function stepCycle60(segment, unit, anchor, opts) {
     }
     return "every " + getNumber(interval, opts) + " " + unit + "s from " + getNumber(start, opts) + " " + pluralize(start, unit) + " past the " + anchor;
   }
-  if (60 % interval === 0) {
-    return "every " + getNumber(interval, opts) + " " + unit + "s";
-  }
-  if (segment.fires.length <= 2) {
-    return listPastThe(numberWords(segment.fires, opts), unit, anchor, opts);
-  }
-  return "every " + getNumber(interval, opts) + " " + unit + "s past the " + anchor;
+  return "every " + getNumber(interval, opts) + " " + unit + "s";
 }
 function stepHours(segment, opts) {
   if (segment.startToken.indexOf("-") !== -1) {
@@ -1105,15 +1134,12 @@ function stepHours(segment, opts) {
   }
   const start = segment.startToken === "*" ? 0 : +segment.startToken;
   const interval = segment.interval;
-  if (start === 0 && 24 % interval === 0) {
+  if (start === 0) {
     return "every " + getNumber(interval, opts) + " hours";
   }
   if (segment.fires.length <= 3) {
     return "at " + hourTimes(segment.fires, opts);
   }
-  if (start === 0) {
-    return "every " + getNumber(interval, opts) + " hours from midnight";
-  }
   return "every " + getNumber(interval, opts) + " hours from " + getTime({ hour: start, minute: 0 }, opts);
 }
 function seriesNumber(values, opts) {

package/dist/lang/de.cjs

@@ -352,7 +352,7 @@ function duringHours(ir, times, sep) {
   if (windows.length <= 3 || times.kind !== "fires") {
     return joinList(windows);
   }
-  return "in den Stunden von " + joinList(times.fires.map(String)) + " Uhr";
+  return "in den Stunden " + joinList(times.fires.map(String)) + " Uhr";
 }
 function renderEverySecond() {
   return everyUnit(UNITS.second);
@@ -433,7 +433,12 @@ function hourStepPhrase(ir) {
   return cleanStep(segment, 24) ? everyN(segment.interval, UNITS.hour) : atHours(segment.fires);
 }
 function renderHourRange(ir, plan, opts) {
-  const window = hourWindow(plan.from, plan.to, plan.last, opts.style.sep);
+  const window = hourWindow(
+    plan.from,
+    plan.to,
+    plan.boundMinute ?? 0,
+    opts.style.sep
+  );
   if (plan.minuteForm === "wildcard") {
     return "jede Minute " + window;
   }
@@ -540,7 +545,9 @@ var de2 = {
   fallback: "ein unlesbares Cron-Muster",
   options: normalizeOptions,
   reboot: "beim Systemstart",
-  sentence: (description) => "L\xE4uft " + description + "."
+  // A description ending in a German ordinal already carries its period
+  // ("…am 8."), so closing the sentence must not double it.
+  sentence: (description) => "L\xE4uft " + description + (description.endsWith(".") ? "" : ".")
 };
 var index_default = de2;
 module.exports = module.exports.default;

package/dist/lang/de.js

@@ -326,7 +326,7 @@ function duringHours(ir, times, sep) {
   if (windows.length <= 3 || times.kind !== "fires") {
     return joinList(windows);
   }
-  return "in den Stunden von " + joinList(times.fires.map(String)) + " Uhr";
+  return "in den Stunden " + joinList(times.fires.map(String)) + " Uhr";
 }
 function renderEverySecond() {
   return everyUnit(UNITS.second);
@@ -407,7 +407,12 @@ function hourStepPhrase(ir) {
   return cleanStep(segment, 24) ? everyN(segment.interval, UNITS.hour) : atHours(segment.fires);
 }
 function renderHourRange(ir, plan, opts) {
-  const window = hourWindow(plan.from, plan.to, plan.last, opts.style.sep);
+  const window = hourWindow(
+    plan.from,
+    plan.to,
+    plan.boundMinute ?? 0,
+    opts.style.sep
+  );
   if (plan.minuteForm === "wildcard") {
     return "jede Minute " + window;
   }
@@ -514,7 +519,9 @@ var de2 = {
   fallback: "ein unlesbares Cron-Muster",
   options: normalizeOptions,
   reboot: "beim Systemstart",
-  sentence: (description) => "L\xE4uft " + description + "."
+  // A description ending in a German ordinal already carries its period
+  // ("…am 8."), so closing the sentence must not double it.
+  sentence: (description) => "L\xE4uft " + description + (description.endsWith(".") ? "" : ".")
 };
 var index_default = de2;
 export {

package/dist/lang/en.cjs

@@ -307,7 +307,7 @@ function renderEveryHour(ir, plan, opts) {
   return "every hour" + trailingQualifier(ir, opts);
 }
 function renderHourRange(ir, plan, opts) {
-  const window = hourWindow(plan, opts);
+  const window = hourWindow(boundedWindow(plan), opts);
   if (plan.minuteForm === "wildcard") {
     return "every minute " + window + trailingQualifier(ir, opts);
   }
@@ -330,6 +330,9 @@ function rangeMinuteLead(ir, opts) {
 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 };
+}
 function hourWindow(window, opts) {
   return "from " + getTime({ hour: window.from, minute: 0 }, opts) + through(opts) + getTime({ hour: window.to, minute: window.last }, opts);
 }
@@ -428,13 +431,7 @@ function stepCycle60(segment, unit, anchor, opts) {
     }
     return "every " + getNumber(interval, opts) + " " + unit + "s from " + getNumber(start, opts) + " " + pluralize(start, unit) + " past the " + anchor;
   }
-  if (60 % interval === 0) {
-    return "every " + getNumber(interval, opts) + " " + unit + "s";
-  }
-  if (segment.fires.length <= 2) {
-    return listPastThe(numberWords(segment.fires, opts), unit, anchor, opts);
-  }
-  return "every " + getNumber(interval, opts) + " " + unit + "s past the " + anchor;
+  return "every " + getNumber(interval, opts) + " " + unit + "s";
 }
 function stepHours(segment, opts) {
   if (segment.startToken.indexOf("-") !== -1) {
@@ -442,15 +439,12 @@ function stepHours(segment, opts) {
   }
   const start = segment.startToken === "*" ? 0 : +segment.startToken;
   const interval = segment.interval;
-  if (start === 0 && 24 % interval === 0) {
+  if (start === 0) {
     return "every " + getNumber(interval, opts) + " hours";
   }
   if (segment.fires.length <= 3) {
     return "at " + hourTimes(segment.fires, opts);
   }
-  if (start === 0) {
-    return "every " + getNumber(interval, opts) + " hours from midnight";
-  }
   return "every " + getNumber(interval, opts) + " hours from " + getTime({ hour: start, minute: 0 }, opts);
 }
 function seriesNumber(values, opts) {

package/dist/lang/en.js

@@ -281,7 +281,7 @@ function renderEveryHour(ir, plan, opts) {
   return "every hour" + trailingQualifier(ir, opts);
 }
 function renderHourRange(ir, plan, opts) {
-  const window = hourWindow(plan, opts);
+  const window = hourWindow(boundedWindow(plan), opts);
   if (plan.minuteForm === "wildcard") {
     return "every minute " + window + trailingQualifier(ir, opts);
   }
@@ -304,6 +304,9 @@ function rangeMinuteLead(ir, opts) {
 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 };
+}
 function hourWindow(window, opts) {
   return "from " + getTime({ hour: window.from, minute: 0 }, opts) + through(opts) + getTime({ hour: window.to, minute: window.last }, opts);
 }
@@ -402,13 +405,7 @@ function stepCycle60(segment, unit, anchor, opts) {
     }
     return "every " + getNumber(interval, opts) + " " + unit + "s from " + getNumber(start, opts) + " " + pluralize(start, unit) + " past the " + anchor;
   }
-  if (60 % interval === 0) {
-    return "every " + getNumber(interval, opts) + " " + unit + "s";
-  }
-  if (segment.fires.length <= 2) {
-    return listPastThe(numberWords(segment.fires, opts), unit, anchor, opts);
-  }
-  return "every " + getNumber(interval, opts) + " " + unit + "s past the " + anchor;
+  return "every " + getNumber(interval, opts) + " " + unit + "s";
 }
 function stepHours(segment, opts) {
   if (segment.startToken.indexOf("-") !== -1) {
@@ -416,15 +413,12 @@ function stepHours(segment, opts) {
   }
   const start = segment.startToken === "*" ? 0 : +segment.startToken;
   const interval = segment.interval;
-  if (start === 0 && 24 % interval === 0) {
+  if (start === 0) {
     return "every " + getNumber(interval, opts) + " hours";
   }
   if (segment.fires.length <= 3) {
     return "at " + hourTimes(segment.fires, opts);
   }
-  if (start === 0) {
-    return "every " + getNumber(interval, opts) + " hours from midnight";
-  }
   return "every " + getNumber(interval, opts) + " hours from " + getTime({ hour: start, minute: 0 }, opts);
 }
 function seriesNumber(values, opts) {

package/dist/lang/es.cjs

@@ -331,7 +331,7 @@ function renderEveryHour(ir, plan, opts) {
   return "cada hora" + trailingQualifier(ir, opts);
 }
 function renderHourRange(ir, plan, opts) {
-  const window = hourWindow(plan, opts);
+  const window = hourWindow(boundedWindow(plan), opts);
   if (plan.minuteForm === "wildcard") {
     return "cada minuto " + window + trailingQualifier(ir, opts);
   }
@@ -347,6 +347,9 @@ function renderHourRange(ir, plan, opts) {
 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 };
+}
 function hourWindow(window, opts) {
   return timeRange(
     { hour: window.from, minute: 0 },
@@ -597,13 +600,7 @@ function stepCycle60(segment, unit, anchor, opts) {
     }
     return "cada " + numero(interval, opts) + " " + unit + "s a partir del " + unit + " " + start + " de cada " + anchor;
   }
-  if (60 % interval === 0) {
-    return "cada " + numero(interval, opts) + " " + unit + "s";
-  }
-  if (segment.fires.length <= 2) {
-    return "en los " + unit + "s " + joinList(wordList(segment.fires)) + " de cada " + anchor;
-  }
-  return "cada " + numero(interval, opts) + " " + unit + "s de cada " + anchor;
+  return "cada " + numero(interval, opts) + " " + unit + "s";
 }
 function stepHours(segment, opts) {
   if (segment.startToken.indexOf("-") !== -1) {
@@ -611,15 +608,12 @@ function stepHours(segment, opts) {
   }
   const start = segment.startToken === "*" ? 0 : +segment.startToken;
   const interval = segment.interval;
-  if (start === 0 && 24 % interval === 0) {
+  if (start === 0) {
     return "cada " + numero(interval, opts) + " horas";
   }
   if (segment.fires.length <= 3) {
     return groupClockTimesByArticle(atTimes(segment.fires, opts));
   }
-  if (start === 0) {
-    return "cada " + numero(interval, opts) + " horas desde medianoche";
-  }
   return "cada " + numero(interval, opts) + " horas a partir de " + timePhrase(start, 0, null, opts);
 }
 function atTimes(hours, opts) {

package/dist/lang/es.js

@@ -305,7 +305,7 @@ function renderEveryHour(ir, plan, opts) {
   return "cada hora" + trailingQualifier(ir, opts);
 }
 function renderHourRange(ir, plan, opts) {
-  const window = hourWindow(plan, opts);
+  const window = hourWindow(boundedWindow(plan), opts);
   if (plan.minuteForm === "wildcard") {
     return "cada minuto " + window + trailingQualifier(ir, opts);
   }
@@ -321,6 +321,9 @@ function renderHourRange(ir, plan, opts) {
 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 };
+}
 function hourWindow(window, opts) {
   return timeRange(
     { hour: window.from, minute: 0 },
@@ -571,13 +574,7 @@ function stepCycle60(segment, unit, anchor, opts) {
     }
     return "cada " + numero(interval, opts) + " " + unit + "s a partir del " + unit + " " + start + " de cada " + anchor;
   }
-  if (60 % interval === 0) {
-    return "cada " + numero(interval, opts) + " " + unit + "s";
-  }
-  if (segment.fires.length <= 2) {
-    return "en los " + unit + "s " + joinList(wordList(segment.fires)) + " de cada " + anchor;
-  }
-  return "cada " + numero(interval, opts) + " " + unit + "s de cada " + anchor;
+  return "cada " + numero(interval, opts) + " " + unit + "s";
 }
 function stepHours(segment, opts) {
   if (segment.startToken.indexOf("-") !== -1) {
@@ -585,15 +582,12 @@ function stepHours(segment, opts) {
   }
   const start = segment.startToken === "*" ? 0 : +segment.startToken;
   const interval = segment.interval;
-  if (start === 0 && 24 % interval === 0) {
+  if (start === 0) {
     return "cada " + numero(interval, opts) + " horas";
   }
   if (segment.fires.length <= 3) {
     return groupClockTimesByArticle(atTimes(segment.fires, opts));
   }
-  if (start === 0) {
-    return "cada " + numero(interval, opts) + " horas desde medianoche";
-  }
   return "cada " + numero(interval, opts) + " horas a partir de " + timePhrase(start, 0, null, opts);
 }
 function atTimes(hours, opts) {

package/dist/lang/fi.cjs

@@ -194,15 +194,13 @@ var units = {
     mark: "joka tunti",
     anchor: "jokaisen tunnin",
     ela: "minuutista",
-    gen: "minuutin",
-    restart: "tasatunnista alkaen"
+    gen: "minuutin"
   },
   second: {
     mark: "joka minuutti",
     anchor: "jokaisen minuutin",
     ela: "sekunnista",
-    gen: "sekunnin",
-    restart: "joka minuutti"
+    gen: "sekunnin"
   }
 };
 function atMarks(values, unit, withMark) {
@@ -465,7 +463,7 @@ function renderEveryHour(ir, plan, opts) {
   return "joka tunti" + trailingQualifier(ir, opts);
 }
 function renderHourRange(ir, plan, opts) {
-  const window = hourWindow(plan, opts);
+  const window = hourWindow(boundedWindow(plan), opts);
   if (plan.minuteForm === "wildcard") {
     return "joka minuutti " + window + trailingQualifier(ir, opts);
   }
@@ -487,6 +485,9 @@ function renderHourRange(ir, plan, opts) {
 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 };
+}
 function hourWindow(window, opts) {
   return kloRange(
     { hour: window.from, minute: 0 },
@@ -558,13 +559,7 @@ function stepCycle60(segment, unit, opts) {
     }
     return cadence + " " + unit.anchor + " " + unit.ela + " " + start + " alkaen";
   }
-  if (60 % interval === 0) {
-    return cadence;
-  }
-  if (segment.fires.length <= 2) {
-    return atMarks(joinList(wordList(segment.fires)), unit, true);
-  }
-  return cadence + " " + unit.restart;
+  return cadence;
 }
 function stepHours(segment, opts) {
   if (segment.startToken.indexOf("-") !== -1) {
@@ -573,15 +568,12 @@ function stepHours(segment, opts) {
   const start = segment.startToken === "*" ? 0 : +segment.startToken;
   const interval = segment.interval;
   const cadence = genitive(interval, opts) + " tunnin v\xE4lein";
-  if (start === 0 && 24 % interval === 0) {
+  if (start === 0) {
     return cadence;
   }
   if (segment.fires.length <= 3) {
     return kloList(segment.fires, opts);
   }
-  if (start === 0) {
-    return cadence + " keskiy\xF6st\xE4 alkaen";
-  }
   return cadence + " klo " + hourElatives[start] + " alkaen";
 }
 function kloList(hours, opts) {

package/dist/lang/fi.js

@@ -168,15 +168,13 @@ var units = {
     mark: "joka tunti",
     anchor: "jokaisen tunnin",
     ela: "minuutista",
-    gen: "minuutin",
-    restart: "tasatunnista alkaen"
+    gen: "minuutin"
   },
   second: {
     mark: "joka minuutti",
     anchor: "jokaisen minuutin",
     ela: "sekunnista",
-    gen: "sekunnin",
-    restart: "joka minuutti"
+    gen: "sekunnin"
   }
 };
 function atMarks(values, unit, withMark) {
@@ -439,7 +437,7 @@ function renderEveryHour(ir, plan, opts) {
   return "joka tunti" + trailingQualifier(ir, opts);
 }
 function renderHourRange(ir, plan, opts) {
-  const window = hourWindow(plan, opts);
+  const window = hourWindow(boundedWindow(plan), opts);
   if (plan.minuteForm === "wildcard") {
     return "joka minuutti " + window + trailingQualifier(ir, opts);
   }
@@ -461,6 +459,9 @@ function renderHourRange(ir, plan, opts) {
 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 };
+}
 function hourWindow(window, opts) {
   return kloRange(
     { hour: window.from, minute: 0 },
@@ -532,13 +533,7 @@ function stepCycle60(segment, unit, opts) {
     }
     return cadence + " " + unit.anchor + " " + unit.ela + " " + start + " alkaen";
   }
-  if (60 % interval === 0) {
-    return cadence;
-  }
-  if (segment.fires.length <= 2) {
-    return atMarks(joinList(wordList(segment.fires)), unit, true);
-  }
-  return cadence + " " + unit.restart;
+  return cadence;
 }
 function stepHours(segment, opts) {
   if (segment.startToken.indexOf("-") !== -1) {
@@ -547,15 +542,12 @@ function stepHours(segment, opts) {
   const start = segment.startToken === "*" ? 0 : +segment.startToken;
   const interval = segment.interval;
   const cadence = genitive(interval, opts) + " tunnin v\xE4lein";
-  if (start === 0 && 24 % interval === 0) {
+  if (start === 0) {
     return cadence;
   }
   if (segment.fires.length <= 3) {
     return kloList(segment.fires, opts);
   }
-  if (start === 0) {
-    return cadence + " keskiy\xF6st\xE4 alkaen";
-  }
   return cadence + " klo " + hourElatives[start] + " alkaen";
 }
 function kloList(hours, opts) {