cronli5 0.1.4 → 0.1.5

package/dist/lang/es.js

@@ -24,12 +24,28 @@ var weekdayNumbers = {
   FRI: 5,
   SAT: 6
 };
+var maxClockTimes = 6;
 
 // src/core/util.ts
 function isNonNegativeInteger(value) {
   const digits = /^\d+$/;
   return digits.test(value);
 }
+function arithmeticStep(values) {
+  if (values.length < 5) {
+    return null;
+  }
+  const interval = values[1] - values[0];
+  if (interval < 2) {
+    return null;
+  }
+  for (let i = 2; i < values.length; i += 1) {
+    if (values[i] - values[i - 1] !== interval) {
+      return null;
+    }
+  }
+  return { start: values[0], interval, last: values[values.length - 1] };
+}
 function toFieldNumber(token, numberMap) {
   return isNonNegativeInteger(token) ? +token : numberMap[token.toUpperCase()];
 }
@@ -147,19 +163,31 @@ function renderSecondsWithinMinute(ir, plan, opts) {
   }
   return secondsLeadClause(ir, opts) + ", en el minuto " + minuteField + " de cada hora" + trailingQualifier(ir, opts);
 }
+function secondsListAtClock(ir, rest, opts) {
+  const clockPhrases = rest.times.map(function clock(time) {
+    return atTime(timePhrase(time.hour, time.minute, null, opts));
+  });
+  const grouped = groupClockTimesByArticle(clockPhrases);
+  const clockList = grouped.startsWith("a ") ? grouped.slice(2) : grouped;
+  const stride = strideFromSegments(fieldSegments(ir, "second"), "segundo", "", opts);
+  const secondsPhrase = stride ?? "en los segundos " + joinList(segmentWords(fieldSegments(ir, "second")));
+  const dayFrame = trailingQualifier(ir, opts);
+  return (dayFrame ? dayFrame.trimStart() + ", " : "") + secondsPhrase + " de " + clockList;
+}
+function composeHourCadence(ir, plan, opts) {
+  const clockRest = plan.rest.kind === "clockTimes" || plan.rest.kind === "compactClockTimes";
+  return clockRest && ir.shapes.minute === "single" ? hourCadence(ir, +ir.pattern.minute, opts) : null;
+}
 function renderComposeSeconds(ir, plan, opts) {
+  const hourCad = composeHourCadence(ir, plan, opts);
+  if (hourCad !== null) {
+    return hourCad;
+  }
   if (plan.rest.kind === "clockTimes" && (ir.shapes.second === "wildcard" || ir.shapes.second === "step")) {
     return pinnedMinuteSeconds(ir, plan.rest, opts);
   }
   if (plan.rest.kind === "clockTimes" && ir.shapes.second === "list") {
-    const clockPhrases = plan.rest.times.map(function clock(time) {
-      return atTime(timePhrase(time.hour, time.minute, null, opts));
-    });
-    const grouped = groupClockTimesByArticle(clockPhrases);
-    const clockList = grouped.startsWith("a ") ? grouped.slice(2) : grouped;
-    const secondsPhrase = "en los segundos " + joinList(segmentWords(fieldSegments(ir, "second")));
-    const dayFrame = trailingQualifier(ir, opts);
-    return (dayFrame ? dayFrame.trimStart() + ", " : "") + secondsPhrase + " de " + clockList;
+    return secondsListAtClock(ir, plan.rest, opts);
   }
   if (plan.rest.kind === "hourRange" && ir.shapes.second === "step" && ir.pattern.weekday !== "*") {
     const restNode = plan.rest;
@@ -168,8 +196,18 @@ function renderComposeSeconds(ir, plan, opts) {
     const cadence = "cada " + numero(stepSegment(ir.analyses.segments.second).interval, opts) + " segundos del minuto " + ir.pattern.minute;
     return dayFrame + ", " + window + ", " + cadence;
   }
+  if (isEveryOtherMinuteSeconds(ir, plan)) {
+    return secondsLeadClause(ir, opts) + " de " + render(ir, plan.rest, opts);
+  }
   return secondsLeadClause(ir, opts) + ", " + render(ir, plan.rest, opts);
 }
+function isEveryOtherMinuteSeconds(ir, plan) {
+  if (plan.rest.kind !== "minuteFrequency" || ir.shapes.second !== "wildcard" || ir.shapes.hour !== "wildcard") {
+    return false;
+  }
+  const minuteStep = stepSegment(ir.analyses.segments.minute);
+  return minuteStep.startToken === "*" && minuteStep.interval === 2;
+}
 function pinnedMinuteSeconds(ir, rest, opts) {
   const dayTrail = leadingQualifier(ir, opts).trimEnd();
   const trail = dayTrail ? ", " + dayTrail : "";
@@ -179,6 +217,9 @@ function pinnedMinuteSeconds(ir, rest, opts) {
   return secondsLeadClause(ir, opts) + " de " + explicitClockList(rest.times, opts) + trail;
 }
 function secondsLeadClause(ir, opts) {
+  return secondsClause(ir, "minuto", opts);
+}
+function secondsClause(ir, anchor, opts) {
   const secondField = ir.pattern.second;
   const shape = ir.shapes.second;
   if (secondField === "*") {
@@ -188,18 +229,23 @@ function secondsLeadClause(ir, opts) {
     return stepCycle60(
       stepSegment(ir.analyses.segments.second),
       "segundo",
-      "minuto",
+      anchor,
       opts
     );
   }
   if (shape === "range") {
     const bounds = secondField.split("-");
-    return "cada segundo del " + bounds[0] + " al " + bounds[1] + " de cada minuto";
+    return "cada segundo del " + bounds[0] + " al " + bounds[1] + " de cada " + anchor;
   }
   if (shape === "single") {
-    return "en el segundo " + secondField + " de cada minuto";
+    return "en el segundo " + secondField + " de cada " + anchor;
   }
-  return "en los segundos " + joinList(segmentWords(fieldSegments(ir, "second"))) + " de cada minuto";
+  return strideFromSegments(
+    fieldSegments(ir, "second"),
+    "segundo",
+    anchor,
+    opts
+  ) ?? "en los segundos " + joinList(segmentWords(fieldSegments(ir, "second"))) + " de cada " + anchor;
 }
 function renderEveryMinute(ir, plan, opts) {
   return "cada minuto" + trailingQualifier(ir, opts);
@@ -211,10 +257,15 @@ function renderRangeOfMinutes(ir, plan, opts) {
   return minuteRangeLead(ir.pattern.minute) + " de cada hora" + trailingQualifier(ir, opts);
 }
 function renderMultipleMinutes(ir, plan, opts) {
-  return minutesList(ir) + trailingQualifier(ir, opts);
+  return minutesList(ir, opts) + trailingQualifier(ir, opts);
 }
-function minutesList(ir) {
-  return "en los minutos " + joinList(segmentWords(fieldSegments(ir, "minute"))) + " de cada hora";
+function minutesList(ir, opts) {
+  return strideFromSegments(
+    fieldSegments(ir, "minute"),
+    "minuto",
+    "hora",
+    opts
+  ) ?? "en los minutos " + joinList(segmentWords(fieldSegments(ir, "minute"))) + " de cada hora";
 }
 function minuteRangeLead(minuteField) {
   const bounds = minuteField.split("-");
@@ -302,7 +353,7 @@ function renderMinutesAcrossHours(ir, plan, opts) {
     }
     return "cada minuto " + hourSpanFromTimes(ir, plan.times, opts) + trailingQualifier(ir, opts);
   }
-  const lead = plan.form === "range" ? minuteRangeLead(ir.pattern.minute) : minutesList(ir);
+  const lead = plan.form === "range" ? minuteRangeLead(ir.pattern.minute) : minutesList(ir, opts);
   return lead + ", " + atHourTimes(ir, plan.times, opts) + trailingQualifier(ir, opts);
 }
 function renderMinuteSpanAcrossHourStep(ir, plan, opts) {
@@ -310,7 +361,8 @@ function renderMinuteSpanAcrossHourStep(ir, plan, opts) {
   if (plan.form === "wildcard") {
     return "cada minuto, " + stepHourSpan(segment, opts) + trailingQualifier(ir, opts);
   }
-  return minuteRangeLead(ir.pattern.minute) + ", " + stepHours(segment, opts) + trailingQualifier(ir, opts);
+  const lead = plan.form === "list" ? minutesList(ir, opts) : minuteRangeLead(ir.pattern.minute);
+  return lead + ", " + stepHours(segment, opts) + trailingQualifier(ir, opts);
 }
 function renderEveryHour(ir, plan, opts) {
   return "cada hora" + trailingQualifier(ir, opts);
@@ -326,7 +378,7 @@ function renderHourRange(ir, plan, opts) {
   if (ir.pattern.minute === "0") {
     return "cada hora " + window + trailingQualifier(ir, opts);
   }
-  const lead = ir.shapes.minute === "single" ? "en el minuto " + ir.pattern.minute + " de cada hora" : minutesList(ir);
+  const lead = ir.shapes.minute === "single" ? "en el minuto " + ir.pattern.minute + " de cada hora" : minutesList(ir, opts);
   return lead + ", " + window + trailingQualifier(ir, opts);
 }
 function renderHourStep(ir, plan, opts) {
@@ -400,6 +452,12 @@ function unionYaseaSuffix(ir, opts) {
   return ", ya sea " + domArm(ir, opts) + " o " + dowArm(ir);
 }
 function renderClockTimes(ir, plan, opts) {
+  if (ir.shapes.minute === "single") {
+    const cadence = hourCadence(ir, +ir.pattern.minute, opts);
+    if (cadence !== null) {
+      return cadence;
+    }
+  }
   const phrases = plan.times.map(function clock(time) {
     return atTime(timePhrase(time.hour, time.minute, time.second, opts));
   });
@@ -581,6 +639,10 @@ function groupClockTimesByArticle(phrases) {
 }
 function renderCompactClockTimes(ir, plan, opts) {
   if (plan.fold) {
+    const cadence = hourCadence(ir, plan.minute, opts);
+    if (cadence !== null) {
+      return cadence;
+    }
     const ranged = hourSegments(ir).some(function range(segment) {
       return segment.kind === "range";
     });
@@ -589,7 +651,7 @@ function renderCompactClockTimes(ir, plan, opts) {
     }
     return leadingQualifier(ir, opts) + hourSegmentTimes(ir, plan.minute, ir.analyses.clockSecond, opts);
   }
-  const phrase = minutesList(ir) + ", " + hourSegmentTimes(ir, 0, null, opts) + trailingQualifier(ir, opts);
+  const phrase = minutesList(ir, opts) + ", " + hourSegmentTimes(ir, 0, null, opts) + trailingQualifier(ir, opts);
   return ir.analyses.clockSecond ? secondsLeadClause(ir, opts) + ", " + phrase : phrase;
 }
 var renderers = {
@@ -612,19 +674,50 @@ var renderers = {
   singleMinute: renderSingleMinute,
   standaloneSeconds: renderStandaloneSeconds
 };
+function renderStride(stride, opts) {
+  const { interval, start, last, cycle, unit, anchor } = stride;
+  const cadence = "cada " + numero(interval, opts) + " " + unit + "s";
+  const tiles = cycle % interval === 0;
+  if (start === 0 && tiles) {
+    return cadence;
+  }
+  const tail = anchor ? " de cada " + anchor : "";
+  if (start < interval && tiles) {
+    return cadence + " a partir del " + unit + " " + start + tail;
+  }
+  return cadence + " del " + unit + " " + start + " al " + last + tail;
+}
 function stepCycle60(segment, unit, anchor, opts) {
   if (segment.startToken.indexOf("-") !== -1) {
     return "en los " + unit + "s " + joinList(wordList(segment.fires)) + " de cada " + anchor;
   }
   const start = segment.startToken === "*" ? 0 : +segment.startToken;
-  const interval = segment.interval;
-  if (start !== 0) {
-    if (segment.fires.length <= 3) {
-      return "en los " + unit + "s " + joinList(wordList(segment.fires)) + " de cada " + anchor;
+  if (start !== 0 && segment.fires.length <= 3) {
+    return "en los " + unit + "s " + joinList(wordList(segment.fires)) + " de cada " + anchor;
+  }
+  return renderStride({
+    interval: segment.interval,
+    start,
+    last: segment.fires[segment.fires.length - 1],
+    cycle: 60,
+    unit,
+    anchor
+  }, opts);
+}
+function strideFromSegments(segments, unit, anchor, opts) {
+  const values = singleValues(segments);
+  const step = values && arithmeticStep(values);
+  return step ? renderStride({ ...step, cycle: 60, unit, anchor }, opts) : null;
+}
+function singleValues(segments) {
+  const values = [];
+  for (const segment of segments) {
+    if (segment.kind !== "single") {
+      return null;
     }
-    return "cada " + numero(interval, opts) + " " + unit + "s a partir del " + unit + " " + start + " de cada " + anchor;
+    values.push(+segment.value);
   }
-  return "cada " + numero(interval, opts) + " " + unit + "s";
+  return values;
 }
 function stepHours(segment, opts) {
   if (segment.startToken.indexOf("-") !== -1) {
@@ -640,6 +733,68 @@ function stepHours(segment, opts) {
   }
   return "cada " + numero(interval, opts) + " horas a partir de " + timePhrase(start, 0, null, opts);
 }
+function hourStrideCadence(stride, opts) {
+  const { start, interval, last } = stride;
+  const cadence = "cada " + numero(interval, opts) + " horas";
+  const tiles = 24 % interval === 0;
+  if (start === 0 && tiles) {
+    return cadence;
+  }
+  if (start < interval && tiles) {
+    return cadence + " a partir de " + timePhrase(start, 0, null, opts);
+  }
+  return cadence + " de " + timePhrase(start, 0, null, opts) + " a " + timePhrase(last, 0, null, opts);
+}
+function hourStride(ir) {
+  const segments = fieldSegments(ir, "hour");
+  if (segments.length === 1 && segments[0].kind === "step") {
+    const segment = segments[0];
+    const start = segment.startToken === "*" ? 0 : +segment.startToken.split("-")[0];
+    return { interval: segment.interval, last: segment.fires[segment.fires.length - 1], start };
+  }
+  const values = singleValues(segments);
+  const step = values && arithmeticStep(values);
+  return step || null;
+}
+function subMinuteSecond(ir) {
+  return ir.pattern.second === "*" || ir.shapes.second === "step";
+}
+function hourCadenceLead(ir, minute, opts) {
+  if (minute === 0) {
+    if (subMinuteSecond(ir)) {
+      return secondsClause(ir, "minuto", opts) + " durante un minuto";
+    }
+    return secondsClause(ir, "hora", opts);
+  }
+  const minutePhrase = "en el minuto " + minute;
+  if (ir.pattern.second === "0") {
+    return minutePhrase;
+  }
+  return secondsClause(ir, "minuto", opts) + ", " + minutePhrase;
+}
+function hourCadence(ir, minute, opts) {
+  const stride = hourStride(ir);
+  if (!stride) {
+    return null;
+  }
+  const fires = (stride.last - stride.start) / stride.interval + 1;
+  if (ir.pattern.second === "0" && fires <= maxClockTimes) {
+    return null;
+  }
+  const confinement = minute === 0 && subMinuteSecond(ir) && cleanStrideSegment(ir);
+  if (confinement) {
+    return secondsClause(ir, "minuto", opts) + " durante un minuto, " + stepHourSpan(confinement, opts) + trailingQualifier(ir, opts);
+  }
+  return hourCadenceLead(ir, minute, opts) + ", " + hourStrideCadence(stride, opts) + trailingQualifier(ir, opts);
+}
+function cleanStrideSegment(ir) {
+  const segments = fieldSegments(ir, "hour");
+  const segment = segments.length === 1 && segments[0];
+  if (!segment || segment.kind !== "step" || segment.startToken.indexOf("-") !== -1) {
+    return null;
+  }
+  return segment;
+}
 function atTimes(hours, opts) {
   return hours.map(function each(hour) {
     return atTime(timePhrase(hour, 0, null, opts));