cronli5 0.1.2 → 0.1.4

package/dist/lang/de.cjs

@@ -30,6 +30,26 @@ function pad(n) {
   return n.length < 2 ? "0" + n : n;
 }
 
+// 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/de/dialects.ts
 var months = [
   null,
@@ -101,15 +121,6 @@ var weekdayNames = [
   "freitags",
   "samstags"
 ];
-var weekdayTokens = {
-  SUN: 0,
-  MON: 1,
-  TUE: 2,
-  WED: 3,
-  THU: 4,
-  FRI: 5,
-  SAT: 6
-};
 function fieldSegments(ir, field) {
   return ir.analyses.segments[field];
 }
@@ -130,10 +141,7 @@ function joinList(items) {
   return items.slice(0, -1).join(", ") + " und " + items[items.length - 1];
 }
 function weekdayName(token) {
-  if (token === "7" || token === 7) {
-    return weekdayNames[0];
-  }
-  return weekdayNames[token] || weekdayNames[weekdayTokens[token]];
+  return weekdayNames[+token];
 }
 function weekdayRange(bounds) {
   return weekdayName(bounds[0]) + " bis " + weekdayName(bounds[1]);
@@ -171,10 +179,7 @@ function everyNthHour(segment) {
   return start === 0 ? base : base + " ab " + start + " Uhr";
 }
 function weekdayNoun(token) {
-  if (token === "7") {
-    return weekdayNouns[0];
-  }
-  return weekdayNouns[token in weekdayTokens ? weekdayTokens[token] : +token];
+  return weekdayNouns[toFieldNumber(token, weekdayNumbers)];
 }
 function quartzWeekday(field) {
   if (field.indexOf("#") !== -1) {
@@ -198,22 +203,8 @@ function quartzDate(field) {
   }
   return null;
 }
-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
-};
 function monthName(token, months2) {
-  return months2[token] || months2[monthTokens[token]];
+  return months2[+token];
 }
 function monthRange(bounds, months2) {
   return "von " + monthName(bounds[0], months2) + " bis " + monthName(bounds[1], months2);
@@ -375,13 +366,37 @@ function renderSecondsWithinMinute(ir, plan) {
   }
   return secondsLead(ir) + ", in Minute " + ir.pattern.minute + " jeder Stunde";
 }
+function wholeHour(hour) {
+  if (hour === 0) {
+    return "der Mitternachtsstunde";
+  }
+  if (hour === 12) {
+    return "der Mittagsstunde";
+  }
+  return "der " + hour + "-Uhr-Stunde";
+}
 function renderMinuteSpanInHour(ir, plan, opts) {
+  if (ir.pattern.minute === "*") {
+    return "jede Minute " + wholeHour(plan.hour);
+  }
   const sep = opts.style.sep;
   return "jede Minute von " + spanTime(plan.hour, plan.span[0], sep) + " bis " + spanTime(plan.hour, plan.span[1], sep) + " Uhr";
 }
 function renderComposeSeconds(ir, plan, opts) {
+  if (composeMinuteZero(ir, plan)) {
+    return secondsLead(ir) + " " + clockMinuteGenitive(plan.rest.times, opts.style.sep);
+  }
   return secondsLead(ir) + ", " + render(ir, plan.rest, opts);
 }
+function composeMinuteZero(ir, plan) {
+  return plan.rest.kind === "clockTimes" && plan.rest.times.every((time) => +time.minute === 0);
+}
+function clockMinuteGenitive(times, sep) {
+  const clocks = times.map(function clock(time) {
+    return time.hour + sep + pad(time.minute);
+  });
+  return clocks.length === 1 ? "der Minute " + clocks[0] : "der Minuten " + joinList(clocks);
+}
 function renderMinutesAcrossHours(ir, plan, opts) {
   const sep = opts.style.sep;
   if (plan.form === "wildcard") {
@@ -490,8 +505,14 @@ function qualifier(ir, months2) {
   return "";
 }
 var LEADING_PLANS = /* @__PURE__ */ new Set(["clockTimes"]);
+function leadsQualifier(ir) {
+  return LEADING_PLANS.has(ir.plan.kind) || isComposeMinuteZero(ir);
+}
+function isComposeMinuteZero(ir) {
+  return ir.plan.kind === "composeSeconds" && composeMinuteZero(ir, ir.plan);
+}
 function needsDailyFrame(ir) {
-  if (ir.plan.kind === "clockTimes") {
+  if (ir.plan.kind === "clockTimes" || isComposeMinuteZero(ir)) {
     return true;
   }
   return ir.plan.kind === "hourStep" && !cleanStep(stepSegment(ir.analyses.segments.hour), 24);
@@ -534,7 +555,7 @@ function describe(ir, opts) {
   const qual = qualifier(ir, opts.style.months);
   let base = core;
   if (qual) {
-    base = LEADING_PLANS.has(ir.plan.kind) ? qual + " " + core : core + " " + qual;
+    base = leadsQualifier(ir) ? qual + " " + core : core + " " + qual;
   } else if (needsDailyFrame(ir)) {
     base = "t\xE4glich " + core;
   }

package/dist/lang/de.js

@@ -4,6 +4,26 @@ function pad(n) {
   return n.length < 2 ? "0" + n : n;
 }
 
+// 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/de/dialects.ts
 var months = [
   null,
@@ -75,15 +95,6 @@ var weekdayNames = [
   "freitags",
   "samstags"
 ];
-var weekdayTokens = {
-  SUN: 0,
-  MON: 1,
-  TUE: 2,
-  WED: 3,
-  THU: 4,
-  FRI: 5,
-  SAT: 6
-};
 function fieldSegments(ir, field) {
   return ir.analyses.segments[field];
 }
@@ -104,10 +115,7 @@ function joinList(items) {
   return items.slice(0, -1).join(", ") + " und " + items[items.length - 1];
 }
 function weekdayName(token) {
-  if (token === "7" || token === 7) {
-    return weekdayNames[0];
-  }
-  return weekdayNames[token] || weekdayNames[weekdayTokens[token]];
+  return weekdayNames[+token];
 }
 function weekdayRange(bounds) {
   return weekdayName(bounds[0]) + " bis " + weekdayName(bounds[1]);
@@ -145,10 +153,7 @@ function everyNthHour(segment) {
   return start === 0 ? base : base + " ab " + start + " Uhr";
 }
 function weekdayNoun(token) {
-  if (token === "7") {
-    return weekdayNouns[0];
-  }
-  return weekdayNouns[token in weekdayTokens ? weekdayTokens[token] : +token];
+  return weekdayNouns[toFieldNumber(token, weekdayNumbers)];
 }
 function quartzWeekday(field) {
   if (field.indexOf("#") !== -1) {
@@ -172,22 +177,8 @@ function quartzDate(field) {
   }
   return null;
 }
-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
-};
 function monthName(token, months2) {
-  return months2[token] || months2[monthTokens[token]];
+  return months2[+token];
 }
 function monthRange(bounds, months2) {
   return "von " + monthName(bounds[0], months2) + " bis " + monthName(bounds[1], months2);
@@ -349,13 +340,37 @@ function renderSecondsWithinMinute(ir, plan) {
   }
   return secondsLead(ir) + ", in Minute " + ir.pattern.minute + " jeder Stunde";
 }
+function wholeHour(hour) {
+  if (hour === 0) {
+    return "der Mitternachtsstunde";
+  }
+  if (hour === 12) {
+    return "der Mittagsstunde";
+  }
+  return "der " + hour + "-Uhr-Stunde";
+}
 function renderMinuteSpanInHour(ir, plan, opts) {
+  if (ir.pattern.minute === "*") {
+    return "jede Minute " + wholeHour(plan.hour);
+  }
   const sep = opts.style.sep;
   return "jede Minute von " + spanTime(plan.hour, plan.span[0], sep) + " bis " + spanTime(plan.hour, plan.span[1], sep) + " Uhr";
 }
 function renderComposeSeconds(ir, plan, opts) {
+  if (composeMinuteZero(ir, plan)) {
+    return secondsLead(ir) + " " + clockMinuteGenitive(plan.rest.times, opts.style.sep);
+  }
   return secondsLead(ir) + ", " + render(ir, plan.rest, opts);
 }
+function composeMinuteZero(ir, plan) {
+  return plan.rest.kind === "clockTimes" && plan.rest.times.every((time) => +time.minute === 0);
+}
+function clockMinuteGenitive(times, sep) {
+  const clocks = times.map(function clock(time) {
+    return time.hour + sep + pad(time.minute);
+  });
+  return clocks.length === 1 ? "der Minute " + clocks[0] : "der Minuten " + joinList(clocks);
+}
 function renderMinutesAcrossHours(ir, plan, opts) {
   const sep = opts.style.sep;
   if (plan.form === "wildcard") {
@@ -464,8 +479,14 @@ function qualifier(ir, months2) {
   return "";
 }
 var LEADING_PLANS = /* @__PURE__ */ new Set(["clockTimes"]);
+function leadsQualifier(ir) {
+  return LEADING_PLANS.has(ir.plan.kind) || isComposeMinuteZero(ir);
+}
+function isComposeMinuteZero(ir) {
+  return ir.plan.kind === "composeSeconds" && composeMinuteZero(ir, ir.plan);
+}
 function needsDailyFrame(ir) {
-  if (ir.plan.kind === "clockTimes") {
+  if (ir.plan.kind === "clockTimes" || isComposeMinuteZero(ir)) {
     return true;
   }
   return ir.plan.kind === "hourStep" && !cleanStep(stepSegment(ir.analyses.segments.hour), 24);
@@ -508,7 +529,7 @@ function describe(ir, opts) {
   const qual = qualifier(ir, opts.style.months);
   let base = core;
   if (qual) {
-    base = LEADING_PLANS.has(ir.plan.kind) ? qual + " " + core : core + " " + qual;
+    base = leadsQualifier(ir) ? qual + " " + core : core + " " + qual;
   } else if (needsDailyFrame(ir)) {
     base = "t\xE4glich " + core;
   }

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) {
@@ -758,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({
@@ -767,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;
     }
@@ -782,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);
 }
@@ -805,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) {
@@ -818,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) {
@@ -732,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({
@@ -741,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;
     }
@@ -756,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);
 }
@@ -779,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) {
@@ -792,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 {