cronli5 0.7.2 → 0.8.2

package/dist/cronli5.js

@@ -26,10 +26,10 @@ var fieldSpecs = {
   second: { cyclic: true, max: 59, min: 0, top: 59 },
   minute: { cyclic: true, max: 59, min: 0, top: 59 },
   hour: { cyclic: true, max: 23, min: 0, top: 23 },
-  date: { aliases: { "?": "*" }, cyclic: true, max: 31, min: 1, top: 31 },
+  date: { cyclic: true, max: 31, min: 1, top: 31 },
   month: { cyclic: true, max: 12, min: 1, numbers: monthNumbers, top: 12 },
   weekday: {
-    aliases: { "?": "*", L: "6" },
+    aliases: { L: "6" },
     cyclic: true,
     max: 7,
     min: 0,
@@ -326,6 +326,53 @@ function firstFire(segment, spec) {
   return start === "*" ? spec.min : toFieldNumber(start, spec.numbers);
 }
 
+// src/core/quartz.ts
+var quartzTokenMessage = "`?` is a Quartz token \u2014 pass { quartz: true } to enable Quartz semantics.";
+function applyQuartz(cronPattern, quartz) {
+  if (!quartz) {
+    rejectQuartzToken(cronPattern.date);
+    rejectQuartzToken(cronPattern.weekday);
+    return;
+  }
+  if ("" + cronPattern.date === "?") {
+    cronPattern.date = "*";
+  }
+  if ("" + cronPattern.weekday === "?") {
+    cronPattern.weekday = "*";
+    return;
+  }
+  cronPattern.weekday = reindexWeekday("" + cronPattern.weekday);
+}
+function rejectQuartzToken(value) {
+  if ("" + value === "?") {
+    throw new Error(quartzTokenMessage);
+  }
+}
+function reindexWeekday(value) {
+  if (value === "*") {
+    return value;
+  }
+  return value.split(",").map(reindexSegment).join(",");
+}
+function reindexSegment(segment) {
+  const operator = /(#\d+|L)$/.exec(segment);
+  const suffix = operator ? operator[0] : "";
+  const core = suffix ? segment.slice(0, -suffix.length) : segment;
+  const step = core.split("/");
+  const range = step[0].split("-").map(reindexNumber).join("-");
+  const head = step.length === 2 ? range + "/" + step[1] : range;
+  return head + suffix;
+}
+function reindexNumber(token) {
+  if (!isNonNegativeInteger(token)) {
+    return token;
+  }
+  if (token === "0") {
+    throw new Error('`cronli5` was passed an invalid Quartz day-of-week value "0"; Quartz numbers weekdays 1 (Sunday) through 7 (Saturday).');
+  }
+  return "" + (+token - 1);
+}
+
 // src/core/parse.ts
 function parseCronPattern(cronPattern, opts) {
   const isArray = cronPattern instanceof Array;
@@ -866,6 +913,7 @@ function hourTimesPlan(hourField) {
 // src/core/index.ts
 function prepare(cronPattern, opts) {
   const pattern = parseCronPattern(cronPattern, opts);
+  applyQuartz(pattern, opts.quartz);
   applyQuartzAliases(pattern);
   validateCronPattern(pattern);
   return normalizeCronPattern(pattern);
@@ -994,6 +1042,7 @@ function normalizeOptions(options) {
   return {
     ampm: typeof options.ampm === "boolean" ? options.ampm : true,
     lenient: !!options.lenient,
+    quartz: !!options.quartz,
     seconds: !!options.seconds,
     short: !!options.short,
     style: resolveDialect(options.dialect),
@@ -1211,7 +1260,8 @@ function renderMinuteFrequency(schedule, plan, opts) {
       to: plan.hours.to
     }, opts);
   } else if (plan.hours.kind === "step") {
-    phrase += " " + everyNthHour(stepSegment(schedule, "hour"), opts);
+    const bound = withoutHourAnchor(phrase);
+    phrase = bound + (bound === phrase ? " " : ", ") + everyNthHour(stepSegment(schedule, "hour"), opts);
   }
   return phrase + trailingQualifier(schedule, opts);
 }
@@ -1274,7 +1324,7 @@ function renderMinuteSpanAcrossHourStep(schedule, plan, opts) {
   if (plan.form === "wildcard") {
     return "every minute " + everyNthHour(segment, opts) + trailingQualifier(schedule, opts);
   }
-  const lead = plan.form === "list" ? strideFromSegments(
+  const lead = withoutHourAnchor(plan.form === "list" ? strideFromSegments(
     segmentsOf(schedule, "minute"),
     "minute",
     "hour",
@@ -1284,7 +1334,7 @@ function renderMinuteSpanAcrossHourStep(schedule, plan, opts) {
     "minute",
     "hour",
     opts
-  ) : minuteRangeLead(schedule.pattern.minute, opts);
+  ) : minuteRangeLead(schedule.pattern.minute, opts));
   const cadence = unevenHourCadence(schedule, opts);
   return lead + ", " + (cadence ?? stepHours(segment, opts)) + trailingQualifier(schedule, opts);
 }
@@ -1403,7 +1453,7 @@ function renderCompactClockTimes(schedule, plan, opts) {
     )
   );
   const cadence = unevenHourCadence(schedule, opts);
-  const phrase = cadence ? minuteLead + ", " + cadence + trailingQualifier(schedule, opts) : minuteLead + ", at " + hourSegmentTimes(schedule, { minute: 0, second: null }, true, opts) + trailingQualifier(schedule, opts);
+  const phrase = cadence ? withoutHourAnchor(minuteLead) + ", " + cadence + trailingQualifier(schedule, opts) : minuteLead + ", at " + hourSegmentTimes(schedule, { minute: 0, second: null }, true, opts) + trailingQualifier(schedule, opts);
   return schedule.analyses.clockSecond ? secondsLeadClause(schedule, opts) + ", " + phrase : phrase;
 }
 function foldedHourWindows(schedule, plan, opts) {
@@ -1777,6 +1827,9 @@ function segmentWords(segments, opts) {
 function listPastThe(words, unit, anchor, opts) {
   return "at " + joinList(words, opts) + " " + unit + "s past the " + anchor;
 }
+function withoutHourAnchor(lead) {
+  return lead.replace(/ past the hour$/, "");
+}
 function wordTime(hour, minute, second) {
   return (+hour === 0 || +hour === 12) && +minute === 0 && !(typeof second === "number" && second > 0);
 }
@@ -2296,7 +2349,14 @@ function interpretCronPattern(cronPattern, lang, opts) {
   const plan = lang.plan ? lang.plan(schedule, schedule.plan) : schedule.plan;
   return lang.describe({ ...schedule, plan }, opts);
 }
-var cronli5_default = cronli5;
+function sentence(cronPattern, options) {
+  return cronli5(cronPattern, { ...options, sentence: true });
+}
+function fragment(cronPattern, options) {
+  return cronli5(cronPattern, { ...options, sentence: false });
+}
+var callable = Object.assign(cronli5, { sentence, fragment });
+var cronli5_default = callable;
 export {
   cronli5_default as default
 };

package/dist/lang/de.cjs

@@ -563,7 +563,7 @@ function renderComposeSeconds(schedule, plan, opts) {
       return cadence;
     }
   }
-  if (composeMinuteZero(schedule, plan)) {
+  if (composeSingleMinute(schedule, plan)) {
     return secondsLead(schedule) + " " + clockMinuteGenitive(plan.rest.times, opts.style.sep);
   }
   if (isEveryOtherMinuteSeconds(schedule, plan)) {
@@ -573,8 +573,8 @@ function renderComposeSeconds(schedule, plan, opts) {
   const lead = restOwnsLead ? "" : secondsLead(schedule) + ", ";
   return lead + render(schedule, plan.rest, opts);
 }
-function composeMinuteZero(schedule, plan) {
-  return plan.rest.kind === "clockTimes" && plan.rest.times.every((time) => +time.minute === 0);
+function composeSingleMinute(schedule, plan) {
+  return plan.rest.kind === "clockTimes" && schedule.shapes.minute === "single";
 }
 function clockMinuteGenitive(times, sep) {
   const clocks = times.map(function clock(time) {
@@ -645,10 +645,10 @@ function renderMinuteFrequency(schedule, plan, opts) {
   const base = stepClause(segment, UNITS.minute, "jeder Stunde");
   if (plan.hours.kind === "during") {
     const cadence = unevenHourCadence(schedule);
-    return cadence ? base + ", " + cadence : base + " " + duringHours(schedule, plan.hours.times, sep);
+    return cadence ? stepClause(segment, UNITS.minute, "") + ", " + cadence : base + " " + duringHours(schedule, plan.hours.times, sep);
   }
   if (plan.hours.kind === "step") {
-    return base + " " + everyNthHour(stepSegment(schedule, "hour"));
+    return stepClause(segment, UNITS.minute, "") + " " + everyNthHour(stepSegment(schedule, "hour"));
   }
   return base;
 }
@@ -859,16 +859,16 @@ function qualifier(schedule, months2) {
 }
 var LEADING_PLANS = /* @__PURE__ */ new Set(["clockTimes"]);
 function leadsQualifier(schedule) {
-  return LEADING_PLANS.has(schedule.plan.kind) || isComposeMinuteZero(schedule);
+  return LEADING_PLANS.has(schedule.plan.kind) || isComposeSingleMinute(schedule);
 }
-function isComposeMinuteZero(schedule) {
-  return schedule.plan.kind === "composeSeconds" && composeMinuteZero(schedule, schedule.plan);
+function isComposeSingleMinute(schedule) {
+  return schedule.plan.kind === "composeSeconds" && composeSingleMinute(schedule, schedule.plan);
 }
 function needsDailyFrame(schedule) {
   if (hourCadenceApplies(schedule)) {
     return false;
   }
-  if (schedule.plan.kind === "clockTimes" || isComposeMinuteZero(schedule)) {
+  if (schedule.plan.kind === "clockTimes" || isComposeSingleMinute(schedule)) {
     return true;
   }
   if (schedule.plan.kind !== "hourStep") {
@@ -890,6 +890,7 @@ function normalizeOptions(options) {
   return {
     ampm: typeof options.ampm === "boolean" ? options.ampm : false,
     lenient: !!options.lenient,
+    quartz: !!options.quartz,
     seconds: !!options.seconds,
     short: !!options.short,
     style,

package/dist/lang/de.js

@@ -537,7 +537,7 @@ function renderComposeSeconds(schedule, plan, opts) {
       return cadence;
     }
   }
-  if (composeMinuteZero(schedule, plan)) {
+  if (composeSingleMinute(schedule, plan)) {
     return secondsLead(schedule) + " " + clockMinuteGenitive(plan.rest.times, opts.style.sep);
   }
   if (isEveryOtherMinuteSeconds(schedule, plan)) {
@@ -547,8 +547,8 @@ function renderComposeSeconds(schedule, plan, opts) {
   const lead = restOwnsLead ? "" : secondsLead(schedule) + ", ";
   return lead + render(schedule, plan.rest, opts);
 }
-function composeMinuteZero(schedule, plan) {
-  return plan.rest.kind === "clockTimes" && plan.rest.times.every((time) => +time.minute === 0);
+function composeSingleMinute(schedule, plan) {
+  return plan.rest.kind === "clockTimes" && schedule.shapes.minute === "single";
 }
 function clockMinuteGenitive(times, sep) {
   const clocks = times.map(function clock(time) {
@@ -619,10 +619,10 @@ function renderMinuteFrequency(schedule, plan, opts) {
   const base = stepClause(segment, UNITS.minute, "jeder Stunde");
   if (plan.hours.kind === "during") {
     const cadence = unevenHourCadence(schedule);
-    return cadence ? base + ", " + cadence : base + " " + duringHours(schedule, plan.hours.times, sep);
+    return cadence ? stepClause(segment, UNITS.minute, "") + ", " + cadence : base + " " + duringHours(schedule, plan.hours.times, sep);
   }
   if (plan.hours.kind === "step") {
-    return base + " " + everyNthHour(stepSegment(schedule, "hour"));
+    return stepClause(segment, UNITS.minute, "") + " " + everyNthHour(stepSegment(schedule, "hour"));
   }
   return base;
 }
@@ -833,16 +833,16 @@ function qualifier(schedule, months2) {
 }
 var LEADING_PLANS = /* @__PURE__ */ new Set(["clockTimes"]);
 function leadsQualifier(schedule) {
-  return LEADING_PLANS.has(schedule.plan.kind) || isComposeMinuteZero(schedule);
+  return LEADING_PLANS.has(schedule.plan.kind) || isComposeSingleMinute(schedule);
 }
-function isComposeMinuteZero(schedule) {
-  return schedule.plan.kind === "composeSeconds" && composeMinuteZero(schedule, schedule.plan);
+function isComposeSingleMinute(schedule) {
+  return schedule.plan.kind === "composeSeconds" && composeSingleMinute(schedule, schedule.plan);
 }
 function needsDailyFrame(schedule) {
   if (hourCadenceApplies(schedule)) {
     return false;
   }
-  if (schedule.plan.kind === "clockTimes" || isComposeMinuteZero(schedule)) {
+  if (schedule.plan.kind === "clockTimes" || isComposeSingleMinute(schedule)) {
     return true;
   }
   if (schedule.plan.kind !== "hourStep") {
@@ -864,6 +864,7 @@ function normalizeOptions(options) {
   return {
     ampm: typeof options.ampm === "boolean" ? options.ampm : false,
     lenient: !!options.lenient,
+    quartz: !!options.quartz,
     seconds: !!options.seconds,
     short: !!options.short,
     style,

package/dist/lang/en.cjs

@@ -249,6 +249,7 @@ function normalizeOptions(options) {
   return {
     ampm: typeof options.ampm === "boolean" ? options.ampm : true,
     lenient: !!options.lenient,
+    quartz: !!options.quartz,
     seconds: !!options.seconds,
     short: !!options.short,
     style: resolveDialect(options.dialect),
@@ -466,7 +467,8 @@ function renderMinuteFrequency(schedule, plan, opts) {
       to: plan.hours.to
     }, opts);
   } else if (plan.hours.kind === "step") {
-    phrase += " " + everyNthHour(stepSegment(schedule, "hour"), opts);
+    const bound = withoutHourAnchor(phrase);
+    phrase = bound + (bound === phrase ? " " : ", ") + everyNthHour(stepSegment(schedule, "hour"), opts);
   }
   return phrase + trailingQualifier(schedule, opts);
 }
@@ -529,7 +531,7 @@ function renderMinuteSpanAcrossHourStep(schedule, plan, opts) {
   if (plan.form === "wildcard") {
     return "every minute " + everyNthHour(segment, opts) + trailingQualifier(schedule, opts);
   }
-  const lead = plan.form === "list" ? strideFromSegments(
+  const lead = withoutHourAnchor(plan.form === "list" ? strideFromSegments(
     segmentsOf(schedule, "minute"),
     "minute",
     "hour",
@@ -539,7 +541,7 @@ function renderMinuteSpanAcrossHourStep(schedule, plan, opts) {
     "minute",
     "hour",
     opts
-  ) : minuteRangeLead(schedule.pattern.minute, opts);
+  ) : minuteRangeLead(schedule.pattern.minute, opts));
   const cadence = unevenHourCadence(schedule, opts);
   return lead + ", " + (cadence ?? stepHours(segment, opts)) + trailingQualifier(schedule, opts);
 }
@@ -658,7 +660,7 @@ function renderCompactClockTimes(schedule, plan, opts) {
     )
   );
   const cadence = unevenHourCadence(schedule, opts);
-  const phrase = cadence ? minuteLead + ", " + cadence + trailingQualifier(schedule, opts) : minuteLead + ", at " + hourSegmentTimes(schedule, { minute: 0, second: null }, true, opts) + trailingQualifier(schedule, opts);
+  const phrase = cadence ? withoutHourAnchor(minuteLead) + ", " + cadence + trailingQualifier(schedule, opts) : minuteLead + ", at " + hourSegmentTimes(schedule, { minute: 0, second: null }, true, opts) + trailingQualifier(schedule, opts);
   return schedule.analyses.clockSecond ? secondsLeadClause(schedule, opts) + ", " + phrase : phrase;
 }
 function foldedHourWindows(schedule, plan, opts) {
@@ -1032,6 +1034,9 @@ function segmentWords(segments, opts) {
 function listPastThe(words, unit, anchor, opts) {
   return "at " + joinList(words, opts) + " " + unit + "s past the " + anchor;
 }
+function withoutHourAnchor(lead) {
+  return lead.replace(/ past the hour$/, "");
+}
 function wordTime(hour, minute, second) {
   return (+hour === 0 || +hour === 12) && +minute === 0 && !(typeof second === "number" && second > 0);
 }

package/dist/lang/en.js

@@ -223,6 +223,7 @@ function normalizeOptions(options) {
   return {
     ampm: typeof options.ampm === "boolean" ? options.ampm : true,
     lenient: !!options.lenient,
+    quartz: !!options.quartz,
     seconds: !!options.seconds,
     short: !!options.short,
     style: resolveDialect(options.dialect),
@@ -440,7 +441,8 @@ function renderMinuteFrequency(schedule, plan, opts) {
       to: plan.hours.to
     }, opts);
   } else if (plan.hours.kind === "step") {
-    phrase += " " + everyNthHour(stepSegment(schedule, "hour"), opts);
+    const bound = withoutHourAnchor(phrase);
+    phrase = bound + (bound === phrase ? " " : ", ") + everyNthHour(stepSegment(schedule, "hour"), opts);
   }
   return phrase + trailingQualifier(schedule, opts);
 }
@@ -503,7 +505,7 @@ function renderMinuteSpanAcrossHourStep(schedule, plan, opts) {
   if (plan.form === "wildcard") {
     return "every minute " + everyNthHour(segment, opts) + trailingQualifier(schedule, opts);
   }
-  const lead = plan.form === "list" ? strideFromSegments(
+  const lead = withoutHourAnchor(plan.form === "list" ? strideFromSegments(
     segmentsOf(schedule, "minute"),
     "minute",
     "hour",
@@ -513,7 +515,7 @@ function renderMinuteSpanAcrossHourStep(schedule, plan, opts) {
     "minute",
     "hour",
     opts
-  ) : minuteRangeLead(schedule.pattern.minute, opts);
+  ) : minuteRangeLead(schedule.pattern.minute, opts));
   const cadence = unevenHourCadence(schedule, opts);
   return lead + ", " + (cadence ?? stepHours(segment, opts)) + trailingQualifier(schedule, opts);
 }
@@ -632,7 +634,7 @@ function renderCompactClockTimes(schedule, plan, opts) {
     )
   );
   const cadence = unevenHourCadence(schedule, opts);
-  const phrase = cadence ? minuteLead + ", " + cadence + trailingQualifier(schedule, opts) : minuteLead + ", at " + hourSegmentTimes(schedule, { minute: 0, second: null }, true, opts) + trailingQualifier(schedule, opts);
+  const phrase = cadence ? withoutHourAnchor(minuteLead) + ", " + cadence + trailingQualifier(schedule, opts) : minuteLead + ", at " + hourSegmentTimes(schedule, { minute: 0, second: null }, true, opts) + trailingQualifier(schedule, opts);
   return schedule.analyses.clockSecond ? secondsLeadClause(schedule, opts) + ", " + phrase : phrase;
 }
 function foldedHourWindows(schedule, plan, opts) {
@@ -1006,6 +1008,9 @@ function segmentWords(segments, opts) {
 function listPastThe(words, unit, anchor, opts) {
   return "at " + joinList(words, opts) + " " + unit + "s past the " + anchor;
 }
+function withoutHourAnchor(lead) {
+  return lead.replace(/ past the hour$/, "");
+}
 function wordTime(hour, minute, second) {
   return (+hour === 0 || +hour === 12) && +minute === 0 && !(typeof second === "number" && second > 0);
 }

package/dist/lang/es.cjs

@@ -231,6 +231,7 @@ function normalizeOptions(options) {
     // 12-hour for Mexico/US); an explicit `{ampm}` option overrides it.
     ampm: typeof options.ampm === "boolean" ? options.ampm : style.ampm,
     lenient: !!options.lenient,
+    quartz: !!options.quartz,
     seconds: !!options.seconds,
     short: !!options.short,
     style,
@@ -377,6 +378,9 @@ function minutesList(schedule, opts) {
     opts
   ) ?? "en los minutos " + joinList(segmentWords(segmentsOf(schedule, "minute"))) + " de cada hora";
 }
+function withoutHourAnchor(lead) {
+  return lead.replace(/ de cada hora$/, "");
+}
 function minuteRangeLead(minuteField) {
   const bounds = minuteField.split("-");
   return "cada minuto del " + bounds[0] + " al " + bounds[1];
@@ -447,7 +451,7 @@ function renderMinuteFrequency(schedule, plan, opts) {
   } else if (plan.hours.kind === "window") {
     phrase += " " + hourWindow(plan.hours, opts);
   } else if (plan.hours.kind === "step") {
-    phrase += ", " + stepHourSpan(stepSegment(schedule, "hour"), opts);
+    phrase = withoutHourAnchor(phrase) + ", " + stepHourSpan(stepSegment(schedule, "hour"), opts);
   }
   return phrase + trailingQualifier(schedule, opts);
 }
@@ -484,7 +488,7 @@ function renderMinuteSpanAcrossHourStep(schedule, plan, opts) {
   if (plan.form === "wildcard") {
     return "cada minuto, " + stepHourSpan(segment, opts) + trailingQualifier(schedule, opts);
   }
-  const lead = plan.form === "list" ? minutesList(schedule, opts) : minuteRangeLead(schedule.pattern.minute);
+  const lead = withoutHourAnchor(plan.form === "list" ? minutesList(schedule, opts) : minuteRangeLead(schedule.pattern.minute));
   return lead + ", " + (cadence ?? stepHours(segment, opts)) + trailingQualifier(schedule, opts);
 }
 function renderEveryHour(schedule, plan, opts) {
@@ -795,7 +799,7 @@ function renderCompactClockTimes(schedule, plan, opts) {
     );
   }
   const cadence = unevenHourCadence(schedule, opts);
-  const phrase = cadence ? minutesList(schedule, opts) + ", " + cadence + trailingQualifier(schedule, opts) : minutesList(schedule, opts) + ", " + hourContextTimes(schedule, opts) + trailingQualifier(schedule, opts);
+  const phrase = cadence ? withoutHourAnchor(minutesList(schedule, opts)) + ", " + cadence + trailingQualifier(schedule, opts) : minutesList(schedule, opts) + ", " + hourContextTimes(schedule, opts) + trailingQualifier(schedule, opts);
   return schedule.analyses.clockSecond ? secondsLeadClause(schedule, opts) + ", " + phrase : phrase;
 }
 var renderers = {

package/dist/lang/es.js

@@ -205,6 +205,7 @@ function normalizeOptions(options) {
     // 12-hour for Mexico/US); an explicit `{ampm}` option overrides it.
     ampm: typeof options.ampm === "boolean" ? options.ampm : style.ampm,
     lenient: !!options.lenient,
+    quartz: !!options.quartz,
     seconds: !!options.seconds,
     short: !!options.short,
     style,
@@ -351,6 +352,9 @@ function minutesList(schedule, opts) {
     opts
   ) ?? "en los minutos " + joinList(segmentWords(segmentsOf(schedule, "minute"))) + " de cada hora";
 }
+function withoutHourAnchor(lead) {
+  return lead.replace(/ de cada hora$/, "");
+}
 function minuteRangeLead(minuteField) {
   const bounds = minuteField.split("-");
   return "cada minuto del " + bounds[0] + " al " + bounds[1];
@@ -421,7 +425,7 @@ function renderMinuteFrequency(schedule, plan, opts) {
   } else if (plan.hours.kind === "window") {
     phrase += " " + hourWindow(plan.hours, opts);
   } else if (plan.hours.kind === "step") {
-    phrase += ", " + stepHourSpan(stepSegment(schedule, "hour"), opts);
+    phrase = withoutHourAnchor(phrase) + ", " + stepHourSpan(stepSegment(schedule, "hour"), opts);
   }
   return phrase + trailingQualifier(schedule, opts);
 }
@@ -458,7 +462,7 @@ function renderMinuteSpanAcrossHourStep(schedule, plan, opts) {
   if (plan.form === "wildcard") {
     return "cada minuto, " + stepHourSpan(segment, opts) + trailingQualifier(schedule, opts);
   }
-  const lead = plan.form === "list" ? minutesList(schedule, opts) : minuteRangeLead(schedule.pattern.minute);
+  const lead = withoutHourAnchor(plan.form === "list" ? minutesList(schedule, opts) : minuteRangeLead(schedule.pattern.minute));
   return lead + ", " + (cadence ?? stepHours(segment, opts)) + trailingQualifier(schedule, opts);
 }
 function renderEveryHour(schedule, plan, opts) {
@@ -769,7 +773,7 @@ function renderCompactClockTimes(schedule, plan, opts) {
     );
   }
   const cadence = unevenHourCadence(schedule, opts);
-  const phrase = cadence ? minutesList(schedule, opts) + ", " + cadence + trailingQualifier(schedule, opts) : minutesList(schedule, opts) + ", " + hourContextTimes(schedule, opts) + trailingQualifier(schedule, opts);
+  const phrase = cadence ? withoutHourAnchor(minutesList(schedule, opts)) + ", " + cadence + trailingQualifier(schedule, opts) : minutesList(schedule, opts) + ", " + hourContextTimes(schedule, opts) + trailingQualifier(schedule, opts);
   return schedule.analyses.clockSecond ? secondsLeadClause(schedule, opts) + ", " + phrase : phrase;
 }
 var renderers = {

package/dist/lang/fi.cjs

@@ -308,6 +308,7 @@ function normalizeOptions(options) {
   return {
     ampm: false,
     lenient: !!options.lenient,
+    quartz: !!options.quartz,
     seconds: !!options.seconds,
     short: !!options.short,
     style: resolveDialect(options.dialect),
@@ -398,8 +399,8 @@ function renderComposeSeconds(schedule, plan, opts) {
   if (plan.rest.kind === "minuteFrequency" && schedule.pattern.second !== "*") {
     return composeSecondsOverMinuteStep(schedule, plan.rest, opts);
   }
-  if (plan.rest.kind === "clockTimes" && plan.rest.times.every((time) => +time.minute === 0)) {
-    return composeMinuteZero(schedule, plan.rest, opts);
+  if (plan.rest.kind === "clockTimes" && schedule.shapes.minute === "single") {
+    return composeSingleMinute(schedule, plan.rest, opts);
   }
   if (isEveryOtherMinuteSeconds(schedule, plan)) {
     return secondsLeadClause(schedule, opts) + " joka toisena minuuttina";
@@ -415,7 +416,7 @@ function isEveryOtherMinuteSeconds(schedule, plan) {
   const seg = stepSegment(schedule, "minute");
   return seg.startToken === "*" && seg.interval === 2;
 }
-function composeMinuteZero(schedule, rest, opts) {
+function composeSingleMinute(schedule, rest, opts) {
   const clocks = rest.times.map(function clock(time) {
     return clockDigits(
       { hour: time.hour, minute: time.minute },
@@ -539,7 +540,7 @@ function renderMinuteFrequency(schedule, plan, opts) {
   if (plan.hours.kind === "during") {
     const cadence = unevenHourCadence(schedule, opts);
     if (cadence !== null) {
-      return stepCycle60(seg, units.minute, opts) + ", " + cadence + trailingQualifier(schedule, opts);
+      return withoutHourAnchor(stepCycle60(seg, units.minute, opts)) + ", " + cadence + trailingQualifier(schedule, opts);
     }
     if (minuteStepIsAnchored(seg)) {
       const bareHours = kloFromTimes(schedule, plan.hours.times, opts);
@@ -547,11 +548,12 @@ function renderMinuteFrequency(schedule, plan, opts) {
     }
     return stepCycle60(seg, units.minute, opts) + " " + hourWindowsFromTimes(schedule, plan.hours.times, opts) + trailingQualifier(schedule, opts);
   }
-  let phrase = stepCycle60(seg, units.minute, opts);
+  const phraseBase = stepCycle60(seg, units.minute, opts);
+  let phrase = phraseBase;
   if (plan.hours.kind === "window") {
     phrase += " " + hourWindow(plan.hours, opts);
   } else if (plan.hours.kind === "step") {
-    phrase += " " + everyNthHour(stepSegment(schedule, "hour"), opts);
+    phrase = withoutHourAnchor(phraseBase) + " " + everyNthHour(stepSegment(schedule, "hour"), opts);
   }
   return phrase + trailingQualifier(schedule, opts);
 }
@@ -784,6 +786,9 @@ function stepCycle60(segment, unit, opts) {
     unit
   }, opts);
 }
+function withoutHourAnchor(lead) {
+  return lead.replace(" " + units.minute.anchor + " ", " ");
+}
 function stepHours(segment, opts) {
   if (segment.startToken.indexOf("-") !== -1) {
     return kloList(segment.fires, opts);

package/dist/lang/fi.js

@@ -282,6 +282,7 @@ function normalizeOptions(options) {
   return {
     ampm: false,
     lenient: !!options.lenient,
+    quartz: !!options.quartz,
     seconds: !!options.seconds,
     short: !!options.short,
     style: resolveDialect(options.dialect),
@@ -372,8 +373,8 @@ function renderComposeSeconds(schedule, plan, opts) {
   if (plan.rest.kind === "minuteFrequency" && schedule.pattern.second !== "*") {
     return composeSecondsOverMinuteStep(schedule, plan.rest, opts);
   }
-  if (plan.rest.kind === "clockTimes" && plan.rest.times.every((time) => +time.minute === 0)) {
-    return composeMinuteZero(schedule, plan.rest, opts);
+  if (plan.rest.kind === "clockTimes" && schedule.shapes.minute === "single") {
+    return composeSingleMinute(schedule, plan.rest, opts);
   }
   if (isEveryOtherMinuteSeconds(schedule, plan)) {
     return secondsLeadClause(schedule, opts) + " joka toisena minuuttina";
@@ -389,7 +390,7 @@ function isEveryOtherMinuteSeconds(schedule, plan) {
   const seg = stepSegment(schedule, "minute");
   return seg.startToken === "*" && seg.interval === 2;
 }
-function composeMinuteZero(schedule, rest, opts) {
+function composeSingleMinute(schedule, rest, opts) {
   const clocks = rest.times.map(function clock(time) {
     return clockDigits(
       { hour: time.hour, minute: time.minute },
@@ -513,7 +514,7 @@ function renderMinuteFrequency(schedule, plan, opts) {
   if (plan.hours.kind === "during") {
     const cadence = unevenHourCadence(schedule, opts);
     if (cadence !== null) {
-      return stepCycle60(seg, units.minute, opts) + ", " + cadence + trailingQualifier(schedule, opts);
+      return withoutHourAnchor(stepCycle60(seg, units.minute, opts)) + ", " + cadence + trailingQualifier(schedule, opts);
     }
     if (minuteStepIsAnchored(seg)) {
       const bareHours = kloFromTimes(schedule, plan.hours.times, opts);
@@ -521,11 +522,12 @@ function renderMinuteFrequency(schedule, plan, opts) {
     }
     return stepCycle60(seg, units.minute, opts) + " " + hourWindowsFromTimes(schedule, plan.hours.times, opts) + trailingQualifier(schedule, opts);
   }
-  let phrase = stepCycle60(seg, units.minute, opts);
+  const phraseBase = stepCycle60(seg, units.minute, opts);
+  let phrase = phraseBase;
   if (plan.hours.kind === "window") {
     phrase += " " + hourWindow(plan.hours, opts);
   } else if (plan.hours.kind === "step") {
-    phrase += " " + everyNthHour(stepSegment(schedule, "hour"), opts);
+    phrase = withoutHourAnchor(phraseBase) + " " + everyNthHour(stepSegment(schedule, "hour"), opts);
   }
   return phrase + trailingQualifier(schedule, opts);
 }
@@ -758,6 +760,9 @@ function stepCycle60(segment, unit, opts) {
     unit
   }, opts);
 }
+function withoutHourAnchor(lead) {
+  return lead.replace(" " + units.minute.anchor + " ", " ");
+}
 function stepHours(segment, opts) {
   if (segment.startToken.indexOf("-") !== -1) {
     return kloList(segment.fires, opts);

package/dist/lang/fr.cjs

@@ -219,6 +219,7 @@ function normalizeOptions(options) {
     // satisfied without the 12-hour machinery the es donor carried.
     ampm: false,
     lenient: !!options.lenient,
+    quartz: !!options.quartz,
     seconds: !!options.seconds,
     short: !!options.short,
     style,
@@ -364,6 +365,9 @@ function minutesList(schedule, opts) {
     opts
   ) ?? "aux minutes " + joinList(segmentWords(segmentsOf(schedule, "minute"))) + " de chaque heure";
 }
+function withoutHourAnchor(lead) {
+  return lead.replace(/ de chaque heure$/, "");
+}
 function minuteRangeLead(minuteField) {
   const bounds = minuteField.split("-");
   return "chaque minute de " + bounds[0] + " \xE0 " + bounds[1];
@@ -401,7 +405,7 @@ function renderMinuteFrequency(schedule, plan, opts) {
   } else if (plan.hours.kind === "window") {
     phrase += " " + hourWindow(plan.hours, opts);
   } else if (plan.hours.kind === "step") {
-    phrase += ", " + stepHourSpan(stepSegment(schedule, "hour"), opts);
+    phrase = withoutHourAnchor(phrase) + ", " + stepHourSpan(stepSegment(schedule, "hour"), opts);
   }
   return phrase + trailingQualifier(schedule, opts);
 }
@@ -438,7 +442,7 @@ function renderMinuteSpanAcrossHourStep(schedule, plan, opts) {
   if (plan.form === "wildcard") {
     return "chaque minute, " + stepHourSpan(segment, opts) + trailingQualifier(schedule, opts);
   }
-  const lead = plan.form === "list" ? minutesList(schedule, opts) : minuteRangeLead(schedule.pattern.minute);
+  const lead = withoutHourAnchor(plan.form === "list" ? minutesList(schedule, opts) : minuteRangeLead(schedule.pattern.minute));
   return lead + ", " + (cadence ?? stepHours(segment, opts)) + trailingQualifier(schedule, opts);
 }
 function renderEveryHour(schedule, plan, opts) {
@@ -611,7 +615,7 @@ function renderCompactClockTimes(schedule, plan, opts) {
     );
   }
   const cadence = unevenHourCadence(schedule, opts);
-  const phrase = cadence ? minutesList(schedule, opts) + ", " + cadence + trailingQualifier(schedule, opts) : minutesList(schedule, opts) + ", " + hourContextTimes(schedule, opts) + trailingQualifier(schedule, opts);
+  const phrase = cadence ? withoutHourAnchor(minutesList(schedule, opts)) + ", " + cadence + trailingQualifier(schedule, opts) : minutesList(schedule, opts) + ", " + hourContextTimes(schedule, opts) + trailingQualifier(schedule, opts);
   return schedule.analyses.clockSecond ? secondsLeadClause(schedule, opts) + ", " + phrase : phrase;
 }
 var renderers = {