cronli5 0.8.2 → 0.8.5

package/dist/lang/de.js

@@ -277,6 +277,20 @@ var stepOrdinals = {
   8: "achten",
   12: "zw\xF6lften"
 };
+var minuteStepOrdinals = {
+  3: "dritten",
+  4: "vierten",
+  5: "f\xFCnften",
+  6: "sechsten",
+  7: "siebten",
+  8: "achten",
+  9: "neunten",
+  10: "zehnten",
+  12: "zw\xF6lften",
+  15: "f\xFCnfzehnten",
+  20: "zwanzigsten",
+  30: "drei\xDFigsten"
+};
 function everyNthHour(segment) {
   const base = "in jeder " + stepOrdinals[segment.interval] + " Stunde";
   const start = segment.startToken === "*" ? 0 : +segment.startToken;
@@ -504,7 +518,10 @@ function renderSecondsWithinMinute(schedule, plan) {
   if (plan.singleSecond) {
     return "in Minute " + schedule.pattern.minute + " und Sekunde " + schedule.pattern.second + " jeder Stunde";
   }
-  return secondsLead(schedule) + ", in Minute " + schedule.pattern.minute + " jeder Stunde";
+  if (secondsConfinesMinute(schedule)) {
+    return secondsLead(schedule) + " " + confinedMinutePhrase(schedule);
+  }
+  return secondsLead(schedule) + " in Minute " + schedule.pattern.minute + " jeder Stunde";
 }
 function wholeHour(hour) {
   if (hour === 0) {
@@ -529,6 +546,67 @@ function isEveryOtherMinuteSeconds(schedule, plan) {
   const minuteStep = stepSegment(schedule, "minute");
   return minuteStep.startToken === "*" && minuteStep.interval === 2;
 }
+function minuteStride(schedule) {
+  if (schedule.shapes.minute === "step") {
+    const segment = stepSegment(schedule, "minute");
+    const start = segment.startToken === "*" ? 0 : +segment.startToken;
+    return { interval: segment.interval, last: segment.fires[segment.fires.length - 1], start };
+  }
+  const values = singleValues(segmentsOf(schedule, "minute"));
+  return values && arithmeticStep(values);
+}
+function minuteStepConfinement(schedule, stride) {
+  const ordinal = minuteStepOrdinals[stride.interval];
+  const head = ordinal ? "in jeder " + ordinal + " Minute" : "alle " + stride.interval + " Minuten";
+  const tail = renderStride({ ...stride, cycle: 60 }, {
+    bare: () => "",
+    offset: () => " ab Minute " + stride.start,
+    bounded: () => " von Minute " + stride.start + " bis " + stride.last
+  });
+  return secondsLead(schedule) + " " + head + tail + " jeder Stunde";
+}
+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 confinedMinutePhrase(schedule) {
+  const stride = minuteStride(schedule);
+  if (stride && schedule.pattern.minute !== "*/2") {
+    const ordinal = minuteStepOrdinals[stride.interval];
+    const head = ordinal ? "jeder " + ordinal + " Minute" : "alle " + stride.interval + " Minuten";
+    const tail = renderStride({ ...stride, cycle: 60 }, {
+      bare: () => "",
+      offset: () => " ab Minute " + stride.start,
+      bounded: () => " von Minute " + stride.start + " bis " + stride.last
+    });
+    return head + tail + " jeder Stunde";
+  }
+  const genitive = schedule.shapes.minute === "single" ? "der Minute " + schedule.pattern.minute : "der Minuten " + joinList(fieldValues(schedule, "minute"));
+  return genitive + " jeder Stunde";
+}
+function minuteConfinementRender(plan, schedule) {
+  if (isSteppedMinuteSeconds(schedule, plan)) {
+    return minuteStepConfinement(schedule, minuteStride(schedule));
+  }
+  const minuteRest = plan.rest.kind === "minuteFrequency" || plan.rest.kind === "multipleMinutes" || plan.rest.kind === "rangeOfMinutes";
+  if (minuteRest && secondsConfinesMinute(schedule)) {
+    return secondsLead(schedule) + " " + confinedMinutePhrase(schedule);
+  }
+  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 isLocativeMinuteConfinement(schedule, plan) {
+  return (plan.rest.kind === "multipleMinutes" || plan.rest.kind === "singleMinute") && schedule.shapes.hour === "wildcard";
+}
 function renderComposeSeconds(schedule, plan, opts) {
   if ((plan.rest.kind === "clockTimes" || plan.rest.kind === "compactClockTimes") && schedule.shapes.minute === "single") {
     const minute = +schedule.pattern.minute;
@@ -540,9 +618,16 @@ function renderComposeSeconds(schedule, plan, opts) {
   if (composeSingleMinute(schedule, plan)) {
     return secondsLead(schedule) + " " + clockMinuteGenitive(plan.rest.times, opts.style.sep);
   }
+  const confined = minuteConfinementRender(plan, schedule);
+  if (confined !== null) {
+    return confined;
+  }
   if (isEveryOtherMinuteSeconds(schedule, plan)) {
     return secondsLead(schedule) + " jeder zweiten Minute";
   }
+  if (isLocativeMinuteConfinement(schedule, plan)) {
+    return secondsLead(schedule) + " " + render(schedule, plan.rest, opts);
+  }
   const restOwnsLead = plan.rest.kind === "compactClockTimes" && schedule.analyses.clockSecond;
   const lead = restOwnsLead ? "" : secondsLead(schedule) + ", ";
   return lead + render(schedule, plan.rest, opts);

package/dist/lang/en.cjs

@@ -521,6 +521,45 @@ var stepOrdinals = {
   8: "eighth",
   12: "twelfth"
 };
+var spelledOrdinals = {
+  2: "other",
+  3: "third",
+  4: "fourth",
+  5: "fifth",
+  6: "sixth",
+  7: "seventh",
+  8: "eighth",
+  9: "ninth",
+  10: "tenth",
+  11: "eleventh",
+  12: "twelfth",
+  15: "fifteenth",
+  20: "twentieth",
+  30: "thirtieth"
+};
+function ordinalWord(interval) {
+  return spelledOrdinals[interval] ?? getOrdinal(interval);
+}
+function minuteStrideConfinement(stride, opts) {
+  const base = " during every " + ordinalWord(stride.interval) + " minute";
+  return renderStride({ ...stride, cycle: 60 }, {
+    bare: () => base,
+    offset: () => base + " from " + getNumber(stride.start, opts) + " " + pluralize(stride.start, "minute") + " past the hour",
+    bounded: () => {
+      const num = seriesNumber();
+      return base + " from " + num(stride.start) + through(opts) + num(stride.last) + " " + pluralize(stride.last, "minute") + " past the hour";
+    }
+  });
+}
+function minuteStride(schedule) {
+  if (schedule.shapes.minute === "step") {
+    const segment = stepSegment(schedule, "minute");
+    const start = segment.startToken === "*" ? 0 : +segment.startToken;
+    return { interval: segment.interval, last: segment.fires[segment.fires.length - 1], start };
+  }
+  const values = singleValues(segmentsOf(schedule, "minute"));
+  return values && arithmeticStep(values);
+}
 function everyNthHour(segment, opts) {
   const base = "during every " + stepOrdinals[segment.interval] + " hour";
   const start = segment.startToken === "*" ? 0 : +segment.startToken;
@@ -702,9 +741,27 @@ function outlierTail(times, opts) {
 function isCadenceField(token) {
   return token === "*" || token.startsWith("*/") && token.indexOf("-") === -1;
 }
+function secondLeadsCadence(schedule) {
+  if (isCadenceField(schedule.pattern.second)) {
+    return true;
+  }
+  if (schedule.shapes.second !== "step") {
+    return false;
+  }
+  return isOpenStep(schedule.pattern.second);
+}
+function secondLeadsClockPoint(schedule) {
+  if (schedule.plan.kind !== "composeSeconds" && schedule.plan.kind !== "secondsWithinMinute") {
+    return false;
+  }
+  const { second, minute, hour } = schedule.shapes;
+  const clockPoint = second === "single" || second === "range" || second === "list";
+  const minuteRestricted = minute !== "wildcard";
+  return clockPoint && minuteRestricted && hour === "wildcard" && !(second === "single" && minute === "single");
+}
 function leadingCadence(schedule, opts) {
   const { second, minute } = schedule.pattern;
-  if (isCadenceField(second)) {
+  if (secondLeadsCadence(schedule) || secondLeadsClockPoint(schedule)) {
     return { secondLead: true, text: secondsClause(schedule, "minute", opts) };
   }
   if (second === "0" && isCadenceField(minute)) {
@@ -726,9 +783,13 @@ function minuteConfinement(schedule, opts) {
   if (minute === "*") {
     return "";
   }
-  if (isCadenceField(minute)) {
+  if (minute === "*/2") {
     return " of every other minute";
   }
+  const stride = minuteStride(schedule);
+  if (stride) {
+    return minuteStrideConfinement(stride, opts);
+  }
   const segments = segmentsOf(schedule, "minute");
   if (schedule.shapes.minute === "single") {
     return " during minute :" + pad(minute);
@@ -745,7 +806,7 @@ function minuteConfinement(schedule, opts) {
 function hourConfinement(schedule, opts) {
   const hour = schedule.pattern.hour;
   if (hour === "*") {
-    const minutePinned = schedule.pattern.minute !== "*" && !isCadenceField(schedule.pattern.minute);
+    const minutePinned = schedule.pattern.minute !== "*" && !isCadenceField(schedule.pattern.minute) && !minuteStride(schedule);
     return minutePinned ? " of every hour" : "";
   }
   if (isCadenceField(hour)) {
@@ -794,9 +855,12 @@ function confinementEligible(schedule, lead) {
   }
   if (lead.secondLead) {
     if (minuteStep) {
-      return minute === "*/2" && schedule.shapes.hour !== "range";
+      return minute === "*/2" ? schedule.shapes.hour !== "range" : schedule.pattern.hour === "*";
+    }
+    if (isMinuteStride(schedule)) {
+      return schedule.pattern.hour === "*";
     }
-    if (isMinuteStride(schedule) || schedule.shapes.minute === "list" && schedule.shapes.hour === "list") {
+    if (schedule.shapes.minute === "list" && schedule.shapes.hour === "list") {
       return false;
     }
     return true;

package/dist/lang/en.js

@@ -495,6 +495,45 @@ var stepOrdinals = {
   8: "eighth",
   12: "twelfth"
 };
+var spelledOrdinals = {
+  2: "other",
+  3: "third",
+  4: "fourth",
+  5: "fifth",
+  6: "sixth",
+  7: "seventh",
+  8: "eighth",
+  9: "ninth",
+  10: "tenth",
+  11: "eleventh",
+  12: "twelfth",
+  15: "fifteenth",
+  20: "twentieth",
+  30: "thirtieth"
+};
+function ordinalWord(interval) {
+  return spelledOrdinals[interval] ?? getOrdinal(interval);
+}
+function minuteStrideConfinement(stride, opts) {
+  const base = " during every " + ordinalWord(stride.interval) + " minute";
+  return renderStride({ ...stride, cycle: 60 }, {
+    bare: () => base,
+    offset: () => base + " from " + getNumber(stride.start, opts) + " " + pluralize(stride.start, "minute") + " past the hour",
+    bounded: () => {
+      const num = seriesNumber();
+      return base + " from " + num(stride.start) + through(opts) + num(stride.last) + " " + pluralize(stride.last, "minute") + " past the hour";
+    }
+  });
+}
+function minuteStride(schedule) {
+  if (schedule.shapes.minute === "step") {
+    const segment = stepSegment(schedule, "minute");
+    const start = segment.startToken === "*" ? 0 : +segment.startToken;
+    return { interval: segment.interval, last: segment.fires[segment.fires.length - 1], start };
+  }
+  const values = singleValues(segmentsOf(schedule, "minute"));
+  return values && arithmeticStep(values);
+}
 function everyNthHour(segment, opts) {
   const base = "during every " + stepOrdinals[segment.interval] + " hour";
   const start = segment.startToken === "*" ? 0 : +segment.startToken;
@@ -676,9 +715,27 @@ function outlierTail(times, opts) {
 function isCadenceField(token) {
   return token === "*" || token.startsWith("*/") && token.indexOf("-") === -1;
 }
+function secondLeadsCadence(schedule) {
+  if (isCadenceField(schedule.pattern.second)) {
+    return true;
+  }
+  if (schedule.shapes.second !== "step") {
+    return false;
+  }
+  return isOpenStep(schedule.pattern.second);
+}
+function secondLeadsClockPoint(schedule) {
+  if (schedule.plan.kind !== "composeSeconds" && schedule.plan.kind !== "secondsWithinMinute") {
+    return false;
+  }
+  const { second, minute, hour } = schedule.shapes;
+  const clockPoint = second === "single" || second === "range" || second === "list";
+  const minuteRestricted = minute !== "wildcard";
+  return clockPoint && minuteRestricted && hour === "wildcard" && !(second === "single" && minute === "single");
+}
 function leadingCadence(schedule, opts) {
   const { second, minute } = schedule.pattern;
-  if (isCadenceField(second)) {
+  if (secondLeadsCadence(schedule) || secondLeadsClockPoint(schedule)) {
     return { secondLead: true, text: secondsClause(schedule, "minute", opts) };
   }
   if (second === "0" && isCadenceField(minute)) {
@@ -700,9 +757,13 @@ function minuteConfinement(schedule, opts) {
   if (minute === "*") {
     return "";
   }
-  if (isCadenceField(minute)) {
+  if (minute === "*/2") {
     return " of every other minute";
   }
+  const stride = minuteStride(schedule);
+  if (stride) {
+    return minuteStrideConfinement(stride, opts);
+  }
   const segments = segmentsOf(schedule, "minute");
   if (schedule.shapes.minute === "single") {
     return " during minute :" + pad(minute);
@@ -719,7 +780,7 @@ function minuteConfinement(schedule, opts) {
 function hourConfinement(schedule, opts) {
   const hour = schedule.pattern.hour;
   if (hour === "*") {
-    const minutePinned = schedule.pattern.minute !== "*" && !isCadenceField(schedule.pattern.minute);
+    const minutePinned = schedule.pattern.minute !== "*" && !isCadenceField(schedule.pattern.minute) && !minuteStride(schedule);
     return minutePinned ? " of every hour" : "";
   }
   if (isCadenceField(hour)) {
@@ -768,9 +829,12 @@ function confinementEligible(schedule, lead) {
   }
   if (lead.secondLead) {
     if (minuteStep) {
-      return minute === "*/2" && schedule.shapes.hour !== "range";
+      return minute === "*/2" ? schedule.shapes.hour !== "range" : schedule.pattern.hour === "*";
+    }
+    if (isMinuteStride(schedule)) {
+      return schedule.pattern.hour === "*";
     }
-    if (isMinuteStride(schedule) || schedule.shapes.minute === "list" && schedule.shapes.hour === "list") {
+    if (schedule.shapes.minute === "list" && schedule.shapes.hour === "list") {
       return false;
     }
     return true;

package/dist/lang/es.cjs

@@ -223,6 +223,20 @@ var weekdayNames = [
   "s\xE1bado"
 ];
 var nthWeekdayNames = [null, "primer", "segundo", "tercer", "cuarto", "quinto"];
+var stepOrdinals = {
+  3: "tercer",
+  4: "cuarto",
+  5: "quinto",
+  6: "sexto",
+  7: "s\xE9ptimo",
+  8: "octavo",
+  9: "noveno",
+  10: "d\xE9cimo",
+  12: "duod\xE9cimo",
+  15: "decimoquinto",
+  20: "vig\xE9simo",
+  30: "trig\xE9simo"
+};
 function normalizeOptions(options) {
   options = options || {};
   const style = resolveDialect(options.dialect);
@@ -263,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) {
@@ -287,6 +304,88 @@ function composeHourCadence(schedule, plan, opts) {
 function isPinnedMinuteSeconds(schedule, plan) {
   return plan.rest.kind === "clockTimes" && (schedule.shapes.second === "wildcard" || schedule.shapes.second === "step");
 }
+function minuteStride(schedule) {
+  if (schedule.shapes.minute === "step") {
+    const segment = stepSegment(schedule, "minute");
+    const start = segment.startToken === "*" ? 0 : +segment.startToken;
+    return { interval: segment.interval, last: segment.fires[segment.fires.length - 1], start };
+  }
+  const values = singleValues(segmentsOf(schedule, "minute"));
+  return values && arithmeticStep(values);
+}
+function minuteStepConfinement(schedule, stride, opts) {
+  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 secondsLeadClause(schedule, opts) + " en " + head + tail + " de cada hora" + 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 "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) {
@@ -305,11 +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;
   }
+  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

@@ -197,6 +197,20 @@ var weekdayNames = [
   "s\xE1bado"
 ];
 var nthWeekdayNames = [null, "primer", "segundo", "tercer", "cuarto", "quinto"];
+var stepOrdinals = {
+  3: "tercer",
+  4: "cuarto",
+  5: "quinto",
+  6: "sexto",
+  7: "s\xE9ptimo",
+  8: "octavo",
+  9: "noveno",
+  10: "d\xE9cimo",
+  12: "duod\xE9cimo",
+  15: "decimoquinto",
+  20: "vig\xE9simo",
+  30: "trig\xE9simo"
+};
 function normalizeOptions(options) {
   options = options || {};
   const style = resolveDialect(options.dialect);
@@ -237,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) {
@@ -261,6 +278,88 @@ function composeHourCadence(schedule, plan, opts) {
 function isPinnedMinuteSeconds(schedule, plan) {
   return plan.rest.kind === "clockTimes" && (schedule.shapes.second === "wildcard" || schedule.shapes.second === "step");
 }
+function minuteStride(schedule) {
+  if (schedule.shapes.minute === "step") {
+    const segment = stepSegment(schedule, "minute");
+    const start = segment.startToken === "*" ? 0 : +segment.startToken;
+    return { interval: segment.interval, last: segment.fires[segment.fires.length - 1], start };
+  }
+  const values = singleValues(segmentsOf(schedule, "minute"));
+  return values && arithmeticStep(values);
+}
+function minuteStepConfinement(schedule, stride, opts) {
+  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 secondsLeadClause(schedule, opts) + " en " + head + tail + " de cada hora" + 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 "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) {
@@ -279,11 +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;
   }
+  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) {