cronli5 0.8.3 → 0.8.5

package/dist/lang/es.cjs

@@ -277,7 +277,10 @@ function renderSecondsWithinMinute(schedule, plan, opts) {
   if (plan.singleSecond) {
     return "en el minuto " + minuteField + " y el segundo " + schedule.pattern.second + " de cada hora" + trailingQualifier(schedule, opts);
   }
-  return secondsLeadClause(schedule, opts) + ", en el minuto " + minuteField + " de cada hora" + trailingQualifier(schedule, opts);
+  if (secondsConfinesMinute(schedule)) {
+    return secondsBareLead(schedule) + " " + confinedMinutePhrase(schedule, opts) + trailingQualifier(schedule, opts);
+  }
+  return secondsLeadClause(schedule, opts) + " en el minuto " + minuteField + " de cada hora" + trailingQualifier(schedule, opts);
 }
 function secondsListAtClock(schedule, rest, opts) {
   const clockPhrases = rest.times.map(function clock(time) {
@@ -323,6 +326,66 @@ function minuteStepConfinement(schedule, stride, opts) {
 function isSteppedMinuteSeconds(schedule, plan) {
   return (plan.rest.kind === "minuteFrequency" || plan.rest.kind === "multipleMinutes") && (schedule.shapes.second === "wildcard" || schedule.shapes.second === "step") && schedule.shapes.hour === "wildcard" && schedule.pattern.minute !== "*/2" && minuteStride(schedule) !== null;
 }
+function secondsBareLead(schedule) {
+  const secondField = schedule.pattern.second;
+  const shape = schedule.shapes.second;
+  if (shape === "range") {
+    const bounds = secondField.split("-");
+    return "cada segundo del " + bounds[0] + " al " + bounds[1];
+  }
+  if (shape === "single") {
+    return "en el segundo " + secondField;
+  }
+  return "en los segundos " + joinList(segmentWords(segmentsOf(schedule, "second")));
+}
+function confinedMinutePhrase(schedule, opts) {
+  const stride = minuteStride(schedule);
+  if (stride && schedule.pattern.minute !== "*/2") {
+    const ordinal = stepOrdinals[stride.interval];
+    const head = ordinal ? "cada " + ordinal + " minuto" : "cada " + numero(stride.interval, opts) + " minutos";
+    const tail = renderStride({ ...stride, cycle: 60 }, {
+      bare: () => "",
+      offset: () => " a partir del minuto " + stride.start,
+      bounded: () => " del minuto " + stride.start + " al " + stride.last
+    });
+    return "de " + head + tail + " de cada hora";
+  }
+  if (schedule.shapes.minute === "range") {
+    return "de " + minuteRangeLead(schedule.pattern.minute) + " de cada hora";
+  }
+  if (schedule.shapes.minute === "list") {
+    return "de los minutos " + joinList(segmentWords(segmentsOf(schedule, "minute"))) + " de cada hora";
+  }
+  return "del minuto " + schedule.pattern.minute + " de cada hora";
+}
+function minuteConfinementRender(plan, schedule, opts) {
+  if (isSteppedMinuteSeconds(schedule, plan)) {
+    return minuteStepConfinement(schedule, minuteStride(schedule), opts);
+  }
+  const minuteRest = plan.rest.kind === "minuteFrequency" || plan.rest.kind === "multipleMinutes" || plan.rest.kind === "rangeOfMinutes";
+  if (minuteRest && secondsConfinesMinute(schedule)) {
+    return secondsBareLead(schedule) + " " + confinedMinutePhrase(schedule, opts) + trailingQualifier(schedule, opts);
+  }
+  return null;
+}
+function secondsConfinesMinute(schedule) {
+  const { second, minute, hour } = schedule.shapes;
+  if (second === "list") {
+    const values = singleValues(segmentsOf(schedule, "second"));
+    if (values && arithmeticStep(values)) {
+      return false;
+    }
+  }
+  const clockPoint = second === "single" || second === "range" || second === "list";
+  return clockPoint && minute !== "wildcard" && hour === "wildcard" && !(second === "single" && minute === "single");
+}
+function composeConnector(schedule, plan, opts) {
+  if (plan.rest.kind === "compactClockTimes" && schedule.analyses.clockSecond) {
+    return "";
+  }
+  const locative = (plan.rest.kind === "multipleMinutes" || plan.rest.kind === "singleMinute") && schedule.shapes.hour === "wildcard";
+  return secondsLeadClause(schedule, opts) + (locative ? " " : ", ");
+}
 function renderComposeSeconds(schedule, plan, opts) {
   const hourCad = composeHourCadence(schedule, plan, opts);
   if (hourCad !== null) {
@@ -341,14 +404,14 @@ function renderComposeSeconds(schedule, plan, opts) {
     const cadence = "cada " + numero(stepSegment(schedule, "second").interval, opts) + " segundos del minuto " + schedule.pattern.minute;
     return dayFrame + ", " + window + ", " + cadence;
   }
-  if (isSteppedMinuteSeconds(schedule, plan)) {
-    return minuteStepConfinement(schedule, minuteStride(schedule), opts);
+  const confined = minuteConfinementRender(plan, schedule, opts);
+  if (confined !== null) {
+    return confined;
   }
   if (isEveryOtherMinuteSeconds(schedule, plan)) {
     return secondsLeadClause(schedule, opts) + " de " + render(schedule, plan.rest, opts);
   }
-  const restOwnsLead = plan.rest.kind === "compactClockTimes" && schedule.analyses.clockSecond;
-  const lead = restOwnsLead ? "" : secondsLeadClause(schedule, opts) + ", ";
+  const lead = composeConnector(schedule, plan, opts);
   return lead + render(schedule, plan.rest, opts);
 }
 function isEveryOtherMinuteSeconds(schedule, plan) {

package/dist/lang/es.js

@@ -251,7 +251,10 @@ function renderSecondsWithinMinute(schedule, plan, opts) {
   if (plan.singleSecond) {
     return "en el minuto " + minuteField + " y el segundo " + schedule.pattern.second + " de cada hora" + trailingQualifier(schedule, opts);
   }
-  return secondsLeadClause(schedule, opts) + ", en el minuto " + minuteField + " de cada hora" + trailingQualifier(schedule, opts);
+  if (secondsConfinesMinute(schedule)) {
+    return secondsBareLead(schedule) + " " + confinedMinutePhrase(schedule, opts) + trailingQualifier(schedule, opts);
+  }
+  return secondsLeadClause(schedule, opts) + " en el minuto " + minuteField + " de cada hora" + trailingQualifier(schedule, opts);
 }
 function secondsListAtClock(schedule, rest, opts) {
   const clockPhrases = rest.times.map(function clock(time) {
@@ -297,6 +300,66 @@ function minuteStepConfinement(schedule, stride, opts) {
 function isSteppedMinuteSeconds(schedule, plan) {
   return (plan.rest.kind === "minuteFrequency" || plan.rest.kind === "multipleMinutes") && (schedule.shapes.second === "wildcard" || schedule.shapes.second === "step") && schedule.shapes.hour === "wildcard" && schedule.pattern.minute !== "*/2" && minuteStride(schedule) !== null;
 }
+function secondsBareLead(schedule) {
+  const secondField = schedule.pattern.second;
+  const shape = schedule.shapes.second;
+  if (shape === "range") {
+    const bounds = secondField.split("-");
+    return "cada segundo del " + bounds[0] + " al " + bounds[1];
+  }
+  if (shape === "single") {
+    return "en el segundo " + secondField;
+  }
+  return "en los segundos " + joinList(segmentWords(segmentsOf(schedule, "second")));
+}
+function confinedMinutePhrase(schedule, opts) {
+  const stride = minuteStride(schedule);
+  if (stride && schedule.pattern.minute !== "*/2") {
+    const ordinal = stepOrdinals[stride.interval];
+    const head = ordinal ? "cada " + ordinal + " minuto" : "cada " + numero(stride.interval, opts) + " minutos";
+    const tail = renderStride({ ...stride, cycle: 60 }, {
+      bare: () => "",
+      offset: () => " a partir del minuto " + stride.start,
+      bounded: () => " del minuto " + stride.start + " al " + stride.last
+    });
+    return "de " + head + tail + " de cada hora";
+  }
+  if (schedule.shapes.minute === "range") {
+    return "de " + minuteRangeLead(schedule.pattern.minute) + " de cada hora";
+  }
+  if (schedule.shapes.minute === "list") {
+    return "de los minutos " + joinList(segmentWords(segmentsOf(schedule, "minute"))) + " de cada hora";
+  }
+  return "del minuto " + schedule.pattern.minute + " de cada hora";
+}
+function minuteConfinementRender(plan, schedule, opts) {
+  if (isSteppedMinuteSeconds(schedule, plan)) {
+    return minuteStepConfinement(schedule, minuteStride(schedule), opts);
+  }
+  const minuteRest = plan.rest.kind === "minuteFrequency" || plan.rest.kind === "multipleMinutes" || plan.rest.kind === "rangeOfMinutes";
+  if (minuteRest && secondsConfinesMinute(schedule)) {
+    return secondsBareLead(schedule) + " " + confinedMinutePhrase(schedule, opts) + trailingQualifier(schedule, opts);
+  }
+  return null;
+}
+function secondsConfinesMinute(schedule) {
+  const { second, minute, hour } = schedule.shapes;
+  if (second === "list") {
+    const values = singleValues(segmentsOf(schedule, "second"));
+    if (values && arithmeticStep(values)) {
+      return false;
+    }
+  }
+  const clockPoint = second === "single" || second === "range" || second === "list";
+  return clockPoint && minute !== "wildcard" && hour === "wildcard" && !(second === "single" && minute === "single");
+}
+function composeConnector(schedule, plan, opts) {
+  if (plan.rest.kind === "compactClockTimes" && schedule.analyses.clockSecond) {
+    return "";
+  }
+  const locative = (plan.rest.kind === "multipleMinutes" || plan.rest.kind === "singleMinute") && schedule.shapes.hour === "wildcard";
+  return secondsLeadClause(schedule, opts) + (locative ? " " : ", ");
+}
 function renderComposeSeconds(schedule, plan, opts) {
   const hourCad = composeHourCadence(schedule, plan, opts);
   if (hourCad !== null) {
@@ -315,14 +378,14 @@ function renderComposeSeconds(schedule, plan, opts) {
     const cadence = "cada " + numero(stepSegment(schedule, "second").interval, opts) + " segundos del minuto " + schedule.pattern.minute;
     return dayFrame + ", " + window + ", " + cadence;
   }
-  if (isSteppedMinuteSeconds(schedule, plan)) {
-    return minuteStepConfinement(schedule, minuteStride(schedule), opts);
+  const confined = minuteConfinementRender(plan, schedule, opts);
+  if (confined !== null) {
+    return confined;
   }
   if (isEveryOtherMinuteSeconds(schedule, plan)) {
     return secondsLeadClause(schedule, opts) + " de " + render(schedule, plan.rest, opts);
   }
-  const restOwnsLead = plan.rest.kind === "compactClockTimes" && schedule.analyses.clockSecond;
-  const lead = restOwnsLead ? "" : secondsLeadClause(schedule, opts) + ", ";
+  const lead = composeConnector(schedule, plan, opts);
   return lead + render(schedule, plan.rest, opts);
 }
 function isEveryOtherMinuteSeconds(schedule, plan) {

package/dist/lang/fi.cjs

@@ -378,6 +378,9 @@ function renderSecondsWithinMinute(schedule, plan, opts) {
   if (plan.singleSecond) {
     return units.minute.mark + " " + minuteField + " " + units.minute.gen + " ja " + schedule.pattern.second + " " + units.second.gen + " kohdalla" + trailingQualifier(schedule, opts);
   }
+  if (secondsConfinesMinute(schedule)) {
+    return secondsConfinement(schedule, opts);
+  }
   return secondsLeadClause(schedule, opts) + ", " + atMarks(minuteField, units.minute, true) + trailingQualifier(schedule, opts);
 }
 function composeSecondsOverMinuteStep(schedule, freq, opts) {
@@ -428,6 +431,30 @@ function minuteStepConfinement(schedule, stride, opts) {
 function isSteppedMinuteSeconds(schedule, plan) {
   return (plan.rest.kind === "minuteFrequency" || plan.rest.kind === "multipleMinutes") && (schedule.pattern.second === "*" || schedule.shapes.second === "step") && schedule.shapes.hour === "wildcard" && schedule.pattern.minute !== "*/2" && minuteStride(schedule) !== null;
 }
+function secondsConfinesMinute(schedule) {
+  const { second, minute, hour } = schedule.shapes;
+  if (second === "list") {
+    const values = singleValues(segmentsOf(schedule, "second"));
+    if (values && arithmeticStep(values)) {
+      return false;
+    }
+  }
+  const clockPoint = second === "single" || second === "range" || second === "list";
+  return clockPoint && minute !== "wildcard" && hour === "wildcard" && !(second === "single" && minute === "single");
+}
+function composeConfinesMinute(plan, schedule) {
+  const minuteRest = plan.rest.kind === "minuteFrequency" || plan.rest.kind === "multipleMinutes" || plan.rest.kind === "rangeOfMinutes";
+  return minuteRest && secondsConfinesMinute(schedule);
+}
+function secondsConfinement(schedule, opts) {
+  const stride = minuteStride(schedule);
+  if (stride && schedule.pattern.minute !== "*/2") {
+    return minuteStepConfinement(schedule, stride, opts);
+  }
+  const minuteDigits = joinList(segmentWords(segmentsOf(schedule, "minute")));
+  const secondDigits = joinList(segmentWords(segmentsOf(schedule, "second")));
+  return units.minute.mark + " " + minuteDigits + " " + units.minute.gen + " ja " + secondDigits + " " + units.second.gen + " kohdalla" + trailingQualifier(schedule, opts);
+}
 function renderComposeSeconds(schedule, plan, opts) {
   const cadence = composeHourCadence(schedule, plan, opts);
   if (cadence !== null) {
@@ -436,6 +463,9 @@ function renderComposeSeconds(schedule, plan, opts) {
   if (isSteppedMinuteSeconds(schedule, plan)) {
     return minuteStepConfinement(schedule, minuteStride(schedule), opts);
   }
+  if (composeConfinesMinute(plan, schedule)) {
+    return secondsConfinement(schedule, opts);
+  }
   if (plan.rest.kind === "minuteFrequency" && schedule.pattern.second !== "*") {
     return composeSecondsOverMinuteStep(schedule, plan.rest, opts);
   }

package/dist/lang/fi.js

@@ -352,6 +352,9 @@ function renderSecondsWithinMinute(schedule, plan, opts) {
   if (plan.singleSecond) {
     return units.minute.mark + " " + minuteField + " " + units.minute.gen + " ja " + schedule.pattern.second + " " + units.second.gen + " kohdalla" + trailingQualifier(schedule, opts);
   }
+  if (secondsConfinesMinute(schedule)) {
+    return secondsConfinement(schedule, opts);
+  }
   return secondsLeadClause(schedule, opts) + ", " + atMarks(minuteField, units.minute, true) + trailingQualifier(schedule, opts);
 }
 function composeSecondsOverMinuteStep(schedule, freq, opts) {
@@ -402,6 +405,30 @@ function minuteStepConfinement(schedule, stride, opts) {
 function isSteppedMinuteSeconds(schedule, plan) {
   return (plan.rest.kind === "minuteFrequency" || plan.rest.kind === "multipleMinutes") && (schedule.pattern.second === "*" || schedule.shapes.second === "step") && schedule.shapes.hour === "wildcard" && schedule.pattern.minute !== "*/2" && minuteStride(schedule) !== null;
 }
+function secondsConfinesMinute(schedule) {
+  const { second, minute, hour } = schedule.shapes;
+  if (second === "list") {
+    const values = singleValues(segmentsOf(schedule, "second"));
+    if (values && arithmeticStep(values)) {
+      return false;
+    }
+  }
+  const clockPoint = second === "single" || second === "range" || second === "list";
+  return clockPoint && minute !== "wildcard" && hour === "wildcard" && !(second === "single" && minute === "single");
+}
+function composeConfinesMinute(plan, schedule) {
+  const minuteRest = plan.rest.kind === "minuteFrequency" || plan.rest.kind === "multipleMinutes" || plan.rest.kind === "rangeOfMinutes";
+  return minuteRest && secondsConfinesMinute(schedule);
+}
+function secondsConfinement(schedule, opts) {
+  const stride = minuteStride(schedule);
+  if (stride && schedule.pattern.minute !== "*/2") {
+    return minuteStepConfinement(schedule, stride, opts);
+  }
+  const minuteDigits = joinList(segmentWords(segmentsOf(schedule, "minute")));
+  const secondDigits = joinList(segmentWords(segmentsOf(schedule, "second")));
+  return units.minute.mark + " " + minuteDigits + " " + units.minute.gen + " ja " + secondDigits + " " + units.second.gen + " kohdalla" + trailingQualifier(schedule, opts);
+}
 function renderComposeSeconds(schedule, plan, opts) {
   const cadence = composeHourCadence(schedule, plan, opts);
   if (cadence !== null) {
@@ -410,6 +437,9 @@ function renderComposeSeconds(schedule, plan, opts) {
   if (isSteppedMinuteSeconds(schedule, plan)) {
     return minuteStepConfinement(schedule, minuteStride(schedule), opts);
   }
+  if (composeConfinesMinute(plan, schedule)) {
+    return secondsConfinement(schedule, opts);
+  }
   if (plan.rest.kind === "minuteFrequency" && schedule.pattern.second !== "*") {
     return composeSecondsOverMinuteStep(schedule, plan.rest, opts);
   }

package/dist/lang/fr.cjs

@@ -210,20 +210,6 @@ var weekdayNames = [
   "samedi"
 ];
 var nthWeekdayMasculine = [null, "premier", "deuxi\xE8me", "troisi\xE8me", "quatri\xE8me", "cinqui\xE8me"];
-var stepOrdinals = {
-  3: "troisi\xE8me",
-  4: "quatri\xE8me",
-  5: "cinqui\xE8me",
-  6: "sixi\xE8me",
-  7: "septi\xE8me",
-  8: "huiti\xE8me",
-  9: "neuvi\xE8me",
-  10: "dixi\xE8me",
-  12: "douzi\xE8me",
-  15: "quinzi\xE8me",
-  20: "vingti\xE8me",
-  30: "trenti\xE8me"
-};
 function normalizeOptions(options) {
   options = options || {};
   const style = resolveDialect(options.dialect);
@@ -265,6 +251,9 @@ function renderSecondsWithinMinute(schedule, plan, opts) {
   if (plan.singleSecond) {
     return "\xE0 la minute " + minuteField + " et \xE0 la seconde " + schedule.pattern.second + " de chaque heure" + trailingQualifier(schedule, opts);
   }
+  if (secondsConfinesMinute(schedule)) {
+    return secondsBareLead(schedule) + " " + confinedMinutePhrase(schedule) + trailingQualifier(schedule, opts);
+  }
   return secondsLeadClause(schedule, opts) + ", \xE0 la minute " + minuteField + " de chaque heure" + trailingQualifier(schedule, opts);
 }
 function secondsListAtClock(schedule, rest, opts) {
@@ -297,19 +286,67 @@ function minuteStride(schedule) {
   const values = singleValues(segmentsOf(schedule, "minute"));
   return values && arithmeticStep(values);
 }
-function minuteStepConfinement(schedule, stride, opts) {
-  const ordinal = stepOrdinals[stride.interval];
-  const head = ordinal ? "\xE0 la " + ordinal + " minute" : "\xE0 la minute toutes les " + numero(stride.interval, opts);
-  const tail = renderStride({ ...stride, cycle: 60 }, {
-    bare: () => "",
-    offset: () => " \xE0 partir de la minute " + stride.start,
-    bounded: () => " de la minute " + stride.start + " \xE0 " + stride.last
-  });
-  return secondsLeadClause(schedule, opts) + " " + head + tail + " de chaque heure" + trailingQualifier(schedule, opts);
+function steppedMinuteConfinement(schedule, plan, lead, opts) {
+  return lead + ", " + render(schedule, plan.rest, opts) + trailingQualifier(schedule, opts);
 }
 function isSteppedMinuteSeconds(schedule, plan) {
   return (plan.rest.kind === "minuteFrequency" || plan.rest.kind === "multipleMinutes") && (schedule.shapes.second === "wildcard" || schedule.shapes.second === "step") && schedule.shapes.hour === "wildcard" && schedule.pattern.minute !== "*/2" && minuteStride(schedule) !== null;
 }
+function secondsBareLead(schedule) {
+  const secondField = schedule.pattern.second;
+  const shape = schedule.shapes.second;
+  if (shape === "range") {
+    const bounds = secondField.split("-");
+    return "chaque seconde de " + bounds[0] + " \xE0 " + bounds[1];
+  }
+  if (shape === "single") {
+    return "\xE0 la seconde " + secondField;
+  }
+  return "aux secondes " + joinList(segmentWords(segmentsOf(schedule, "second")));
+}
+function confinedMinutePhrase(schedule) {
+  if (schedule.shapes.minute === "range") {
+    return "de " + minuteRangeLead(schedule.pattern.minute) + " de chaque heure";
+  }
+  if (schedule.shapes.minute === "list") {
+    return "des minutes " + joinList(segmentWords(segmentsOf(schedule, "minute"))) + " de chaque heure";
+  }
+  return "de la minute " + schedule.pattern.minute + " de chaque heure";
+}
+function secondsConfinesMinute(schedule) {
+  const { second, minute, hour } = schedule.shapes;
+  if (second === "list") {
+    const values = singleValues(segmentsOf(schedule, "second"));
+    if (values && arithmeticStep(values)) {
+      return false;
+    }
+  }
+  const clockPoint = second === "single" || second === "range" || second === "list";
+  return clockPoint && minute !== "wildcard" && hour === "wildcard" && !(second === "single" && minute === "single");
+}
+function minuteConfinementRender(plan, schedule, opts) {
+  if (isSteppedMinuteSeconds(schedule, plan)) {
+    return steppedMinuteConfinement(
+      schedule,
+      plan,
+      secondsLeadClause(schedule, opts),
+      opts
+    );
+  }
+  const minuteRest = plan.rest.kind === "minuteFrequency" || plan.rest.kind === "multipleMinutes" || plan.rest.kind === "rangeOfMinutes";
+  if (minuteRest && secondsConfinesMinute(schedule)) {
+    if (minuteStride(schedule) && schedule.pattern.minute !== "*/2") {
+      return steppedMinuteConfinement(
+        schedule,
+        plan,
+        secondsBareLead(schedule),
+        opts
+      );
+    }
+    return secondsBareLead(schedule) + " " + confinedMinutePhrase(schedule) + trailingQualifier(schedule, opts);
+  }
+  return null;
+}
 function renderComposeSeconds(schedule, plan, opts) {
   const hourCad = composeHourCadence(schedule, plan, opts);
   if (hourCad !== null) {
@@ -328,8 +365,9 @@ function renderComposeSeconds(schedule, plan, opts) {
     const cadence = "toutes les " + numero(stepSegment(schedule, "second").interval, opts) + " secondes de la minute " + schedule.pattern.minute;
     return dayFrame + ", " + window + ", " + cadence;
   }
-  if (isSteppedMinuteSeconds(schedule, plan)) {
-    return minuteStepConfinement(schedule, minuteStride(schedule), opts);
+  const confined = minuteConfinementRender(plan, schedule, opts);
+  if (confined !== null) {
+    return confined;
   }
   if (isEveryOtherMinuteSeconds(schedule, plan)) {
     return secondsLeadClause(schedule, opts) + " de " + render(schedule, plan.rest, opts).replace(/^toutes les /u, "chaque ");

package/dist/lang/fr.js

@@ -184,20 +184,6 @@ var weekdayNames = [
   "samedi"
 ];
 var nthWeekdayMasculine = [null, "premier", "deuxi\xE8me", "troisi\xE8me", "quatri\xE8me", "cinqui\xE8me"];
-var stepOrdinals = {
-  3: "troisi\xE8me",
-  4: "quatri\xE8me",
-  5: "cinqui\xE8me",
-  6: "sixi\xE8me",
-  7: "septi\xE8me",
-  8: "huiti\xE8me",
-  9: "neuvi\xE8me",
-  10: "dixi\xE8me",
-  12: "douzi\xE8me",
-  15: "quinzi\xE8me",
-  20: "vingti\xE8me",
-  30: "trenti\xE8me"
-};
 function normalizeOptions(options) {
   options = options || {};
   const style = resolveDialect(options.dialect);
@@ -239,6 +225,9 @@ function renderSecondsWithinMinute(schedule, plan, opts) {
   if (plan.singleSecond) {
     return "\xE0 la minute " + minuteField + " et \xE0 la seconde " + schedule.pattern.second + " de chaque heure" + trailingQualifier(schedule, opts);
   }
+  if (secondsConfinesMinute(schedule)) {
+    return secondsBareLead(schedule) + " " + confinedMinutePhrase(schedule) + trailingQualifier(schedule, opts);
+  }
   return secondsLeadClause(schedule, opts) + ", \xE0 la minute " + minuteField + " de chaque heure" + trailingQualifier(schedule, opts);
 }
 function secondsListAtClock(schedule, rest, opts) {
@@ -271,19 +260,67 @@ function minuteStride(schedule) {
   const values = singleValues(segmentsOf(schedule, "minute"));
   return values && arithmeticStep(values);
 }
-function minuteStepConfinement(schedule, stride, opts) {
-  const ordinal = stepOrdinals[stride.interval];
-  const head = ordinal ? "\xE0 la " + ordinal + " minute" : "\xE0 la minute toutes les " + numero(stride.interval, opts);
-  const tail = renderStride({ ...stride, cycle: 60 }, {
-    bare: () => "",
-    offset: () => " \xE0 partir de la minute " + stride.start,
-    bounded: () => " de la minute " + stride.start + " \xE0 " + stride.last
-  });
-  return secondsLeadClause(schedule, opts) + " " + head + tail + " de chaque heure" + trailingQualifier(schedule, opts);
+function steppedMinuteConfinement(schedule, plan, lead, opts) {
+  return lead + ", " + render(schedule, plan.rest, opts) + trailingQualifier(schedule, opts);
 }
 function isSteppedMinuteSeconds(schedule, plan) {
   return (plan.rest.kind === "minuteFrequency" || plan.rest.kind === "multipleMinutes") && (schedule.shapes.second === "wildcard" || schedule.shapes.second === "step") && schedule.shapes.hour === "wildcard" && schedule.pattern.minute !== "*/2" && minuteStride(schedule) !== null;
 }
+function secondsBareLead(schedule) {
+  const secondField = schedule.pattern.second;
+  const shape = schedule.shapes.second;
+  if (shape === "range") {
+    const bounds = secondField.split("-");
+    return "chaque seconde de " + bounds[0] + " \xE0 " + bounds[1];
+  }
+  if (shape === "single") {
+    return "\xE0 la seconde " + secondField;
+  }
+  return "aux secondes " + joinList(segmentWords(segmentsOf(schedule, "second")));
+}
+function confinedMinutePhrase(schedule) {
+  if (schedule.shapes.minute === "range") {
+    return "de " + minuteRangeLead(schedule.pattern.minute) + " de chaque heure";
+  }
+  if (schedule.shapes.minute === "list") {
+    return "des minutes " + joinList(segmentWords(segmentsOf(schedule, "minute"))) + " de chaque heure";
+  }
+  return "de la minute " + schedule.pattern.minute + " de chaque heure";
+}
+function secondsConfinesMinute(schedule) {
+  const { second, minute, hour } = schedule.shapes;
+  if (second === "list") {
+    const values = singleValues(segmentsOf(schedule, "second"));
+    if (values && arithmeticStep(values)) {
+      return false;
+    }
+  }
+  const clockPoint = second === "single" || second === "range" || second === "list";
+  return clockPoint && minute !== "wildcard" && hour === "wildcard" && !(second === "single" && minute === "single");
+}
+function minuteConfinementRender(plan, schedule, opts) {
+  if (isSteppedMinuteSeconds(schedule, plan)) {
+    return steppedMinuteConfinement(
+      schedule,
+      plan,
+      secondsLeadClause(schedule, opts),
+      opts
+    );
+  }
+  const minuteRest = plan.rest.kind === "minuteFrequency" || plan.rest.kind === "multipleMinutes" || plan.rest.kind === "rangeOfMinutes";
+  if (minuteRest && secondsConfinesMinute(schedule)) {
+    if (minuteStride(schedule) && schedule.pattern.minute !== "*/2") {
+      return steppedMinuteConfinement(
+        schedule,
+        plan,
+        secondsBareLead(schedule),
+        opts
+      );
+    }
+    return secondsBareLead(schedule) + " " + confinedMinutePhrase(schedule) + trailingQualifier(schedule, opts);
+  }
+  return null;
+}
 function renderComposeSeconds(schedule, plan, opts) {
   const hourCad = composeHourCadence(schedule, plan, opts);
   if (hourCad !== null) {
@@ -302,8 +339,9 @@ function renderComposeSeconds(schedule, plan, opts) {
     const cadence = "toutes les " + numero(stepSegment(schedule, "second").interval, opts) + " secondes de la minute " + schedule.pattern.minute;
     return dayFrame + ", " + window + ", " + cadence;
   }
-  if (isSteppedMinuteSeconds(schedule, plan)) {
-    return minuteStepConfinement(schedule, minuteStride(schedule), opts);
+  const confined = minuteConfinementRender(plan, schedule, opts);
+  if (confined !== null) {
+    return confined;
   }
   if (isEveryOtherMinuteSeconds(schedule, plan)) {
     return secondsLeadClause(schedule, opts) + " de " + render(schedule, plan.rest, opts).replace(/^toutes les /u, "chaque ");

package/dist/lang/pt.cjs

@@ -232,20 +232,6 @@ function weekdayFeminine(number) {
 }
 var nthWeekdayMasculine = [null, "primeiro", "segundo", "terceiro", "quarto", "quinto"];
 var nthWeekdayFeminine = [null, "primeira", "segunda", "terceira", "quarta", "quinta"];
-var stepOrdinals = {
-  3: "terceiro",
-  4: "quarto",
-  5: "quinto",
-  6: "sexto",
-  7: "s\xE9timo",
-  8: "oitavo",
-  9: "nono",
-  10: "d\xE9cimo",
-  12: "d\xE9cimo segundo",
-  15: "d\xE9cimo quinto",
-  20: "vig\xE9simo",
-  30: "trig\xE9simo"
-};
 function noonMidnightArticle(phrase) {
   if (phrase === "meio-dia") {
     return "o";
@@ -351,6 +337,9 @@ function renderSecondsWithinMinute(schedule, plan, opts) {
   if (plan.singleSecond) {
     return "no minuto " + minuteField + " e no segundo " + schedule.pattern.second + " de cada hora" + trailingQualifier(schedule, opts);
   }
+  if (secondsConfinesMinute(schedule)) {
+    return secondsBareLead(schedule) + " " + confinedMinutePhrase(schedule) + trailingQualifier(schedule, opts);
+  }
   return secondsLeadClause(schedule, opts) + ", no minuto " + minuteField + " de cada hora" + trailingQualifier(schedule, opts);
 }
 function secondsListAtClock(schedule, rest, opts) {
@@ -384,19 +373,68 @@ function minuteStride(schedule) {
   const values = singleValues(segmentsOf(schedule, "minute"));
   return values && arithmeticStep(values);
 }
-function minuteStepConfinement(schedule, stride, opts) {
-  const ordinal = stepOrdinals[stride.interval];
-  const head = ordinal ? "no " + ordinal + " minuto" : "a cada " + numero(stride.interval, opts) + " minutos";
-  const tail = renderStride({ ...stride, cycle: 60 }, {
-    bare: () => "",
-    offset: () => " a partir do minuto " + stride.start,
-    bounded: () => " do minuto " + stride.start + " ao " + stride.last
-  });
-  return secondsLeadClause(schedule, opts) + " " + head + tail + " de cada hora" + trailingQualifier(schedule, opts);
+function steppedMinuteConfinement(schedule, plan, lead, opts) {
+  return lead + ", " + render(schedule, plan.rest, opts) + trailingQualifier(schedule, opts);
 }
 function isSteppedMinuteSeconds(schedule, plan) {
   return (plan.rest.kind === "minuteFrequency" || plan.rest.kind === "multipleMinutes") && (schedule.shapes.second === "wildcard" || schedule.shapes.second === "step") && schedule.shapes.hour === "wildcard" && schedule.pattern.minute !== "*/2" && minuteStride(schedule) !== null;
 }
+function secondsBareLead(schedule) {
+  const secondField = schedule.pattern.second;
+  const shape = schedule.shapes.second;
+  if (shape === "range") {
+    const bounds = secondField.split("-");
+    return "a cada segundo do " + bounds[0] + " ao " + bounds[1];
+  }
+  if (shape === "single") {
+    return "no segundo " + secondField;
+  }
+  return "nos segundos " + joinList(segmentWords(segmentsOf(schedule, "second")));
+}
+function confinedMinutePhrase(schedule) {
+  if (schedule.shapes.minute === "range") {
+    const range = minuteRangeLead(schedule.pattern.minute).replace(/^a /u, "");
+    return "de " + range + " de cada hora";
+  }
+  if (schedule.shapes.minute === "list") {
+    return "dos minutos " + joinList(segmentWords(segmentsOf(schedule, "minute"))) + " de cada hora";
+  }
+  return "do minuto " + schedule.pattern.minute + " de cada hora";
+}
+function secondsConfinesMinute(schedule) {
+  const { second, minute, hour } = schedule.shapes;
+  if (second === "list") {
+    const values = singleValues(segmentsOf(schedule, "second"));
+    if (values && arithmeticStep(values)) {
+      return false;
+    }
+  }
+  const clockPoint = second === "single" || second === "range" || second === "list";
+  return clockPoint && minute !== "wildcard" && hour === "wildcard" && !(second === "single" && minute === "single");
+}
+function minuteConfinementRender(plan, schedule, opts) {
+  if (isSteppedMinuteSeconds(schedule, plan)) {
+    return steppedMinuteConfinement(
+      schedule,
+      plan,
+      secondsLeadClause(schedule, opts),
+      opts
+    );
+  }
+  const minuteRest = plan.rest.kind === "minuteFrequency" || plan.rest.kind === "multipleMinutes" || plan.rest.kind === "rangeOfMinutes";
+  if (minuteRest && secondsConfinesMinute(schedule)) {
+    if (minuteStride(schedule) && schedule.pattern.minute !== "*/2") {
+      return steppedMinuteConfinement(
+        schedule,
+        plan,
+        secondsBareLead(schedule),
+        opts
+      );
+    }
+    return secondsBareLead(schedule) + " " + confinedMinutePhrase(schedule) + trailingQualifier(schedule, opts);
+  }
+  return null;
+}
 function renderComposeSeconds(schedule, plan, opts) {
   const hourCad = composeHourCadence(schedule, plan, opts);
   if (hourCad !== null) {
@@ -415,8 +453,9 @@ function renderComposeSeconds(schedule, plan, opts) {
     const cadence = "a cada " + numero(stepSegment(schedule, "second").interval, opts) + " segundos do minuto " + schedule.pattern.minute;
     return dayFrame + ", " + window + ", " + cadence;
   }
-  if (isSteppedMinuteSeconds(schedule, plan)) {
-    return minuteStepConfinement(schedule, minuteStride(schedule), opts);
+  const confined = minuteConfinementRender(plan, schedule, opts);
+  if (confined !== null) {
+    return confined;
   }
   if (isEveryOtherMinuteSeconds(schedule, plan)) {
     const rest = render(schedule, plan.rest, opts).replace(/^a /u, "");