cronli5 0.1.1 → 0.1.4

package/dist/lang/en.cjs

@@ -131,20 +131,6 @@ var weekdayNames = [
   ["Friday", "Fri"],
   ["Saturday", "Sat"]
 ];
-var monthAbbreviations = {
-  JAN: monthNames[1],
-  FEB: monthNames[2],
-  MAR: monthNames[3],
-  APR: monthNames[4],
-  MAY: monthNames[5],
-  JUN: monthNames[6],
-  JUL: monthNames[7],
-  AUG: monthNames[8],
-  SEP: monthNames[9],
-  OCT: monthNames[10],
-  NOV: monthNames[11],
-  DEC: monthNames[12]
-};
 var weekdayAbbreviations = {
   SUN: weekdayNames[0],
   MON: weekdayNames[1],
@@ -194,8 +180,37 @@ function renderSecondsWithinMinute(ir, plan, opts) {
   return secondsLeadClause(ir, opts) + ", " + minuteWord + " " + minuteUnit + " past the hour, every hour" + trailingQualifier(ir, opts);
 }
 function renderComposeSeconds(ir, plan, opts) {
+  if (plan.rest.kind === "clockTimes" && (ir.shapes.second === "wildcard" || ir.shapes.second === "step")) {
+    const minute = plan.rest.times[0].minute;
+    if (+minute === 0) {
+      return secondsLeadClause(ir, opts) + " for one minute at " + durationHours(ir, plan.rest, opts);
+    }
+    return secondsLeadClause(ir, opts) + " of " + clockTimesOf(ir, plan.rest, opts);
+  }
+  if (ir.shapes.second === "wildcard" && plan.rest.kind === "minuteFrequency" && plan.rest.hours.kind === "none" && ir.pattern.minute === "*/2") {
+    return "every second of every other minute" + trailingQualifier(ir, opts);
+  }
   return secondsLeadClause(ir, opts) + ", " + render(ir, plan.rest, opts);
 }
+function durationHours(ir, plan, opts) {
+  const hours = plan.times.map(function clock(time) {
+    return getTime({ hour: time.hour, minute: 0 }, opts);
+  });
+  const trail = dayQualifier(ir, leadingWords, opts);
+  return joinList(hours, opts) + (trail && ", " + trail);
+}
+function clockTimesOf(ir, plan, opts) {
+  const times = plan.times.map(function clock(time) {
+    return getTime({
+      hour: time.hour,
+      minute: time.minute,
+      second: time.second,
+      explicit: true
+    }, opts);
+  });
+  const trail = dayQualifier(ir, leadingWords, opts);
+  return joinList(times, opts) + (trail && ", " + trail);
+}
 function secondsLeadClause(ir, opts) {
   const secondField = ir.pattern.second;
   const shape = ir.shapes.second;
@@ -260,6 +275,9 @@ function renderMinuteFrequency(ir, plan, opts) {
   return phrase + trailingQualifier(ir, opts);
 }
 function renderMinuteSpanInHour(ir, plan, opts) {
+  if (ir.pattern.minute === "*") {
+    return "every minute of the " + getTime({ hour: plan.hour, minute: 0 }, opts) + " hour" + trailingQualifier(ir, opts);
+  }
   return "every minute from " + getTime({ hour: plan.hour, minute: plan.span[0] }, opts) + through(opts) + getTime({ hour: plan.hour, minute: plan.span[1] }, opts) + trailingQualifier(ir, opts);
 }
 function renderMinutesAcrossHours(ir, plan, opts) {
@@ -431,13 +449,7 @@ function stepCycle60(segment, unit, anchor, opts) {
     }
     return "every " + getNumber(interval, opts) + " " + unit + "s from " + getNumber(start, opts) + " " + pluralize(start, unit) + " past the " + anchor;
   }
-  if (60 % interval === 0) {
-    return "every " + getNumber(interval, opts) + " " + unit + "s";
-  }
-  if (segment.fires.length <= 2) {
-    return listPastThe(numberWords(segment.fires, opts), unit, anchor, opts);
-  }
-  return "every " + getNumber(interval, opts) + " " + unit + "s past the " + anchor;
+  return "every " + getNumber(interval, opts) + " " + unit + "s";
 }
 function stepHours(segment, opts) {
   if (segment.startToken.indexOf("-") !== -1) {
@@ -445,15 +457,12 @@ function stepHours(segment, opts) {
   }
   const start = segment.startToken === "*" ? 0 : +segment.startToken;
   const interval = segment.interval;
-  if (start === 0 && 24 % interval === 0) {
+  if (start === 0) {
     return "every " + getNumber(interval, opts) + " hours";
   }
   if (segment.fires.length <= 3) {
     return "at " + hourTimes(segment.fires, opts);
   }
-  if (start === 0) {
-    return "every " + getNumber(interval, opts) + " hours from midnight";
-  }
   return "every " + getNumber(interval, opts) + " hours from " + getTime({ hour: start, minute: 0 }, opts);
 }
 function seriesNumber(values, opts) {
@@ -767,7 +776,7 @@ function stepYears(yearField, opts) {
   return phrase;
 }
 function getTime(time, opts) {
-  const { hour, minute, plain } = time;
+  const { hour, minute, plain, explicit } = time;
   const second = typeof time.second === "number" && time.second > 0 ? time.second : 0;
   if (!opts.ampm) {
     return clockDigits({
@@ -776,12 +785,12 @@ function getTime(time, opts) {
       second
     }, { pad: true, sep: opts.style.sep });
   }
-  return twelveHourTime({ hour, minute, second, plain }, opts);
+  return twelveHourTime({ hour, minute, second, plain, explicit }, opts);
 }
 function twelveHourTime(time, opts) {
-  const { hour, minute, second, plain } = time;
+  const { hour, minute, second, plain, explicit } = time;
   const style = opts.style;
-  if (!plain && +minute === 0 && !second) {
+  if (!plain && !explicit && +minute === 0 && !second) {
     if (+hour === 0) {
       return style.midnight;
     }
@@ -791,7 +800,7 @@ function twelveHourTime(time, opts) {
   }
   const digits = clockDigits(
     { hour: hour % 12 || 12, minute, second },
-    { lean: true, sep: style.sep }
+    { lean: !explicit, sep: style.sep }
   );
   return digits + (style.closeUp ? "" : " ") + (hour < 12 ? style.am : style.pm);
 }
@@ -814,7 +823,7 @@ function getOrdinal(n) {
   return n + suffix;
 }
 function getMonth(m, opts) {
-  const month = monthNames[m] || monthAbbreviations[m];
+  const month = monthNames[+m];
   return month && month[opts.short ? 1 : 0];
 }
 function getWeekday(d, opts) {
@@ -827,7 +836,9 @@ var en = {
   fallback: "an unrecognizable cron pattern",
   options: normalizeOptions,
   reboot: "at system startup",
-  sentence: (description) => "Runs " + description + "."
+  // A description ending in an abbreviation already carries its period
+  // ("…9 a.m."), so closing the sentence must not double it.
+  sentence: (description) => "Runs " + description + (description.endsWith(".") ? "" : ".")
 };
 var index_default = en;
 module.exports = module.exports.default;

package/dist/lang/en.js

@@ -105,20 +105,6 @@ var weekdayNames = [
   ["Friday", "Fri"],
   ["Saturday", "Sat"]
 ];
-var monthAbbreviations = {
-  JAN: monthNames[1],
-  FEB: monthNames[2],
-  MAR: monthNames[3],
-  APR: monthNames[4],
-  MAY: monthNames[5],
-  JUN: monthNames[6],
-  JUL: monthNames[7],
-  AUG: monthNames[8],
-  SEP: monthNames[9],
-  OCT: monthNames[10],
-  NOV: monthNames[11],
-  DEC: monthNames[12]
-};
 var weekdayAbbreviations = {
   SUN: weekdayNames[0],
   MON: weekdayNames[1],
@@ -168,8 +154,37 @@ function renderSecondsWithinMinute(ir, plan, opts) {
   return secondsLeadClause(ir, opts) + ", " + minuteWord + " " + minuteUnit + " past the hour, every hour" + trailingQualifier(ir, opts);
 }
 function renderComposeSeconds(ir, plan, opts) {
+  if (plan.rest.kind === "clockTimes" && (ir.shapes.second === "wildcard" || ir.shapes.second === "step")) {
+    const minute = plan.rest.times[0].minute;
+    if (+minute === 0) {
+      return secondsLeadClause(ir, opts) + " for one minute at " + durationHours(ir, plan.rest, opts);
+    }
+    return secondsLeadClause(ir, opts) + " of " + clockTimesOf(ir, plan.rest, opts);
+  }
+  if (ir.shapes.second === "wildcard" && plan.rest.kind === "minuteFrequency" && plan.rest.hours.kind === "none" && ir.pattern.minute === "*/2") {
+    return "every second of every other minute" + trailingQualifier(ir, opts);
+  }
   return secondsLeadClause(ir, opts) + ", " + render(ir, plan.rest, opts);
 }
+function durationHours(ir, plan, opts) {
+  const hours = plan.times.map(function clock(time) {
+    return getTime({ hour: time.hour, minute: 0 }, opts);
+  });
+  const trail = dayQualifier(ir, leadingWords, opts);
+  return joinList(hours, opts) + (trail && ", " + trail);
+}
+function clockTimesOf(ir, plan, opts) {
+  const times = plan.times.map(function clock(time) {
+    return getTime({
+      hour: time.hour,
+      minute: time.minute,
+      second: time.second,
+      explicit: true
+    }, opts);
+  });
+  const trail = dayQualifier(ir, leadingWords, opts);
+  return joinList(times, opts) + (trail && ", " + trail);
+}
 function secondsLeadClause(ir, opts) {
   const secondField = ir.pattern.second;
   const shape = ir.shapes.second;
@@ -234,6 +249,9 @@ function renderMinuteFrequency(ir, plan, opts) {
   return phrase + trailingQualifier(ir, opts);
 }
 function renderMinuteSpanInHour(ir, plan, opts) {
+  if (ir.pattern.minute === "*") {
+    return "every minute of the " + getTime({ hour: plan.hour, minute: 0 }, opts) + " hour" + trailingQualifier(ir, opts);
+  }
   return "every minute from " + getTime({ hour: plan.hour, minute: plan.span[0] }, opts) + through(opts) + getTime({ hour: plan.hour, minute: plan.span[1] }, opts) + trailingQualifier(ir, opts);
 }
 function renderMinutesAcrossHours(ir, plan, opts) {
@@ -405,13 +423,7 @@ function stepCycle60(segment, unit, anchor, opts) {
     }
     return "every " + getNumber(interval, opts) + " " + unit + "s from " + getNumber(start, opts) + " " + pluralize(start, unit) + " past the " + anchor;
   }
-  if (60 % interval === 0) {
-    return "every " + getNumber(interval, opts) + " " + unit + "s";
-  }
-  if (segment.fires.length <= 2) {
-    return listPastThe(numberWords(segment.fires, opts), unit, anchor, opts);
-  }
-  return "every " + getNumber(interval, opts) + " " + unit + "s past the " + anchor;
+  return "every " + getNumber(interval, opts) + " " + unit + "s";
 }
 function stepHours(segment, opts) {
   if (segment.startToken.indexOf("-") !== -1) {
@@ -419,15 +431,12 @@ function stepHours(segment, opts) {
   }
   const start = segment.startToken === "*" ? 0 : +segment.startToken;
   const interval = segment.interval;
-  if (start === 0 && 24 % interval === 0) {
+  if (start === 0) {
     return "every " + getNumber(interval, opts) + " hours";
   }
   if (segment.fires.length <= 3) {
     return "at " + hourTimes(segment.fires, opts);
   }
-  if (start === 0) {
-    return "every " + getNumber(interval, opts) + " hours from midnight";
-  }
   return "every " + getNumber(interval, opts) + " hours from " + getTime({ hour: start, minute: 0 }, opts);
 }
 function seriesNumber(values, opts) {
@@ -741,7 +750,7 @@ function stepYears(yearField, opts) {
   return phrase;
 }
 function getTime(time, opts) {
-  const { hour, minute, plain } = time;
+  const { hour, minute, plain, explicit } = time;
   const second = typeof time.second === "number" && time.second > 0 ? time.second : 0;
   if (!opts.ampm) {
     return clockDigits({
@@ -750,12 +759,12 @@ function getTime(time, opts) {
       second
     }, { pad: true, sep: opts.style.sep });
   }
-  return twelveHourTime({ hour, minute, second, plain }, opts);
+  return twelveHourTime({ hour, minute, second, plain, explicit }, opts);
 }
 function twelveHourTime(time, opts) {
-  const { hour, minute, second, plain } = time;
+  const { hour, minute, second, plain, explicit } = time;
   const style = opts.style;
-  if (!plain && +minute === 0 && !second) {
+  if (!plain && !explicit && +minute === 0 && !second) {
     if (+hour === 0) {
       return style.midnight;
     }
@@ -765,7 +774,7 @@ function twelveHourTime(time, opts) {
   }
   const digits = clockDigits(
     { hour: hour % 12 || 12, minute, second },
-    { lean: true, sep: style.sep }
+    { lean: !explicit, sep: style.sep }
   );
   return digits + (style.closeUp ? "" : " ") + (hour < 12 ? style.am : style.pm);
 }
@@ -788,7 +797,7 @@ function getOrdinal(n) {
   return n + suffix;
 }
 function getMonth(m, opts) {
-  const month = monthNames[m] || monthAbbreviations[m];
+  const month = monthNames[+m];
   return month && month[opts.short ? 1 : 0];
 }
 function getWeekday(d, opts) {
@@ -801,7 +810,9 @@ var en = {
   fallback: "an unrecognizable cron pattern",
   options: normalizeOptions,
   reboot: "at system startup",
-  sentence: (description) => "Runs " + description + "."
+  // A description ending in an abbreviation already carries its period
+  // ("…9 a.m."), so closing the sentence must not double it.
+  sentence: (description) => "Runs " + description + (description.endsWith(".") ? "" : ".")
 };
 var index_default = en;
 export {

package/dist/lang/es.cjs

@@ -40,6 +40,26 @@ function clockDigits(time, { sep, pad: padHour, lean }) {
   return head + sep + pad(time.minute) + (time.second ? sep + pad(time.second) : "");
 }
 
+// src/core/specs.ts
+var weekdayNumbers = {
+  SUN: 0,
+  MON: 1,
+  TUE: 2,
+  WED: 3,
+  THU: 4,
+  FRI: 5,
+  SAT: 6
+};
+
+// src/core/util.ts
+function isNonNegativeInteger(value) {
+  const digits = /^\d+$/;
+  return digits.test(value);
+}
+function toFieldNumber(token, numberMap) {
+  return isNonNegativeInteger(token) ? +token : numberMap[token.toUpperCase()];
+}
+
 // src/lang/es/dialects.ts
 var es = {
   ampm: false,
@@ -111,29 +131,6 @@ var weekdayNames = [
   "viernes",
   "s\xE1bado"
 ];
-var monthTokens = {
-  JAN: 1,
-  FEB: 2,
-  MAR: 3,
-  APR: 4,
-  MAY: 5,
-  JUN: 6,
-  JUL: 7,
-  AUG: 8,
-  SEP: 9,
-  OCT: 10,
-  NOV: 11,
-  DEC: 12
-};
-var weekdayTokens = {
-  SUN: 0,
-  MON: 1,
-  TUE: 2,
-  WED: 3,
-  THU: 4,
-  FRI: 5,
-  SAT: 6
-};
 var nthWeekdayNames = [null, "primer", "segundo", "tercer", "cuarto", "quinto"];
 function normalizeOptions(options) {
   options = options || {};
@@ -177,6 +174,9 @@ function renderSecondsWithinMinute(ir, plan, opts) {
   return secondsLeadClause(ir, opts) + ", en el minuto " + minuteField + " de cada hora" + trailingQualifier(ir, opts);
 }
 function renderComposeSeconds(ir, plan, opts) {
+  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));
@@ -196,6 +196,14 @@ function renderComposeSeconds(ir, plan, opts) {
   }
   return secondsLeadClause(ir, opts) + ", " + render(ir, plan.rest, opts);
 }
+function pinnedMinuteSeconds(ir, rest, opts) {
+  const dayTrail = leadingQualifier(ir, opts).trimEnd();
+  const trail = dayTrail ? ", " + dayTrail : "";
+  if (+rest.times[0].minute === 0) {
+    return secondsLeadClause(ir, opts) + " durante un minuto " + durationHourList(rest.times, opts) + trail;
+  }
+  return secondsLeadClause(ir, opts) + " de " + explicitClockList(rest.times, opts) + trail;
+}
 function secondsLeadClause(ir, opts) {
   const secondField = ir.pattern.second;
   const shape = ir.shapes.second;
@@ -304,6 +312,9 @@ function renderMinuteFrequency(ir, plan, opts) {
   return phrase + trailingQualifier(ir, opts);
 }
 function renderMinuteSpanInHour(ir, plan, opts) {
+  if (ir.pattern.minute === "*") {
+    return "cada minuto de la hora " + fromTime(timePhrase(plan.hour, 0, null, opts)) + trailingQualifier(ir, opts);
+  }
   return "cada minuto " + timeRange(
     { hour: plan.hour, minute: plan.span[0] },
     { hour: plan.hour, minute: plan.span[1] },
@@ -420,6 +431,45 @@ function renderClockTimes(ir, plan, opts) {
   });
   return leadingQualifier(ir, opts) + groupClockTimes(phrases);
 }
+function explicitClockList(times, opts) {
+  const phrases = times.map(function clock(time) {
+    return atTime(explicitTimePhrase(time.hour, time.minute, opts));
+  });
+  const grouped = groupClockTimes(phrases);
+  return grouped.startsWith("a ") ? grouped.slice(2) : grouped;
+}
+function durationHourList(times, opts) {
+  const phrases = times.map(function clock(time) {
+    return atTime(bareHourPhrase(time.hour, opts));
+  });
+  return groupClockTimes(phrases);
+}
+function bareHourPhrase(hour, opts) {
+  if (opts.ampm) {
+    return timePhrase(hour, 0, null, opts);
+  }
+  if (+hour === 0) {
+    return "medianoche";
+  }
+  if (+hour === 12) {
+    return "mediod\xEDa";
+  }
+  return (+hour === 1 ? "la " : "las ") + hour;
+}
+function explicitTimePhrase(hour, minute, opts) {
+  if (!opts.ampm) {
+    const article = +hour === 1 ? "la " : "las ";
+    const suffix = opts.style.hSuffix ? " h" : "";
+    return article + clockDigits(
+      { hour, minute, second: 0 },
+      { pad: true, sep: opts.style.sep }
+    ) + suffix;
+  }
+  const display = hour % 12 || 12;
+  const time = (display === 1 ? "la " : "las ") + clockDigits({ hour: display, minute, second: 0 }, { sep: opts.style.sep });
+  const period = opts.style.meridiem === "english" ? meridiemMark(hour) : dayPeriod(hour, opts);
+  return time + " " + period;
+}
 function groupClockTimes(phrases) {
   if (phrases.length < 2) {
     return joinList(phrases);
@@ -600,13 +650,7 @@ function stepCycle60(segment, unit, anchor, opts) {
     }
     return "cada " + numero(interval, opts) + " " + unit + "s a partir del " + unit + " " + start + " de cada " + anchor;
   }
-  if (60 % interval === 0) {
-    return "cada " + numero(interval, opts) + " " + unit + "s";
-  }
-  if (segment.fires.length <= 2) {
-    return "en los " + unit + "s " + joinList(wordList(segment.fires)) + " de cada " + anchor;
-  }
-  return "cada " + numero(interval, opts) + " " + unit + "s de cada " + anchor;
+  return "cada " + numero(interval, opts) + " " + unit + "s";
 }
 function stepHours(segment, opts) {
   if (segment.startToken.indexOf("-") !== -1) {
@@ -614,15 +658,12 @@ function stepHours(segment, opts) {
   }
   const start = segment.startToken === "*" ? 0 : +segment.startToken;
   const interval = segment.interval;
-  if (start === 0 && 24 % interval === 0) {
+  if (start === 0) {
     return "cada " + numero(interval, opts) + " horas";
   }
   if (segment.fires.length <= 3) {
     return groupClockTimesByArticle(atTimes(segment.fires, opts));
   }
-  if (start === 0) {
-    return "cada " + numero(interval, opts) + " horas desde medianoche";
-  }
   return "cada " + numero(interval, opts) + " horas a partir de " + timePhrase(start, 0, null, opts);
 }
 function atTimes(hours, opts) {
@@ -1001,17 +1042,15 @@ function numero(n, opts) {
   return numeral(n, numeros, opts);
 }
 function weekdayName(token) {
-  if (token === "7" || token === 7) {
-    return weekdayNames[0];
-  }
-  return weekdayNames[token] || weekdayNames[weekdayTokens[token]];
+  const number = toFieldNumber("" + token, weekdayNumbers);
+  return weekdayNames[number === 7 ? 0 : number];
 }
 function pluralWeekday(token) {
   const name = weekdayName(token);
   return name.endsWith("s") ? name : name + "s";
 }
 function monthName(token) {
-  return monthNames[token] || monthNames[monthTokens[token]];
+  return monthNames[+token];
 }
 function isOpenStep(field) {
   return field.indexOf("/") !== -1 && field.indexOf("-") === -1 && field.indexOf(",") === -1;
@@ -1021,7 +1060,9 @@ var es2 = {
   fallback: "un patr\xF3n cron irreconocible",
   options: normalizeOptions,
   reboot: "al arrancar el sistema",
-  sentence: (description) => "Se ejecuta " + description + "."
+  // A description ending in a period already carries it, so closing the
+  // sentence must not double it.
+  sentence: (description) => "Se ejecuta " + description + (description.endsWith(".") ? "" : ".")
 };
 var index_default = es2;
 module.exports = module.exports.default;