cronli5 0.1.1 → 0.1.4

package/dist/cronli5.js

@@ -168,6 +168,11 @@ function throwInvalidField(value, field) {
 }
 
 // src/core/normalize.ts
+var timeFieldCycle = {
+  hour: 24,
+  minute: 60,
+  second: 60
+};
 function applyQuartzAliases(cronPattern) {
   fieldOrder.forEach(function apply(field) {
     const aliases = fieldSpecs[field].aliases;
@@ -184,21 +189,32 @@ function normalizeCronPattern(cronPattern) {
       cronPattern[field] = value;
       return;
     }
-    cronPattern[field] = normalizeField(value, fieldSpecs[field]);
+    cronPattern[field] = normalizeField(value, field, fieldSpecs[field]);
   });
   return cronPattern;
 }
-function normalizeField(value, spec) {
+function normalizeField(value, field, spec) {
   const stringValue = "" + value;
   if (stringValue === "*") {
     return stringValue;
   }
+  const cycle = timeFieldCycle[field];
   const segments = stringValue.split(",").map(function canonical(segment) {
-    return collapseDegenerateRange(
-      collapseOnceStep(collapseUnitStep(segment, spec), spec),
+    return canonicalizeTokens(collapseFullSpanRange(
+      enumerateNonUniformStep(
+        collapseFullSpanStep(
+          collapseDegenerateRange(
+            collapseOnceStep(collapseUnitStep(segment, spec), spec),
+            spec
+          ),
+          spec
+        ),
+        spec,
+        cycle
+      ),
       spec
-    );
-  });
+    ), spec);
+  }).join(",").split(",");
   if (segments.indexOf("*") !== -1) {
     return "*";
   }
@@ -206,6 +222,23 @@ function normalizeField(value, spec) {
     return firstFire(a, spec) - firstFire(b, spec);
   }).join(",");
 }
+function canonicalizeTokens(segment, spec) {
+  if (!spec.numbers) {
+    return segment;
+  }
+  const parts = segment.split("/");
+  const start = parts[0].split("-").map(function fold(token) {
+    return canonicalizeToken(token, spec);
+  }).join("-");
+  return parts.length === 2 ? start + "/" + parts[1] : start;
+}
+function canonicalizeToken(token, spec) {
+  if (token === "*") {
+    return token;
+  }
+  const number = toFieldNumber(token, spec.numbers);
+  return "" + (number > spec.top ? spec.min : number);
+}
 function collapseUnitStep(segment, spec) {
   const parts = segment.split("/");
   if (!spec.cyclic || parts.length !== 2 || +parts[1] !== 1) {
@@ -232,6 +265,51 @@ function collapseOnceStep(segment, spec) {
   }
   return start === "*" ? "" + spec.min : start;
 }
+function enumerateNonUniformStep(segment, spec, cycle) {
+  const parts = segment.split("/");
+  if (typeof cycle !== "number" || parts.length !== 2 || includes(parts[0], "-")) {
+    return segment;
+  }
+  const interval = +parts[1];
+  const start = parts[0] === "*" ? spec.min : toFieldNumber(parts[0]);
+  if (cycle % interval === 0 && start < interval) {
+    return segment;
+  }
+  const fires = [];
+  for (let value = start; value <= spec.top; value += interval) {
+    fires.push(value);
+  }
+  return fires.join(",");
+}
+function collapseFullSpanStep(segment, spec) {
+  const parts = segment.split("/");
+  if (parts.length !== 2 || !includes(parts[0], "-")) {
+    return segment;
+  }
+  return collapseFullSpanRange(parts[0], spec) === "*" ? "*/" + parts[1] : segment;
+}
+function collapseFullSpanRange(segment, spec) {
+  if (typeof spec.top !== "number" || includes(segment, "/") || !includes(segment, "-")) {
+    return segment;
+  }
+  const bounds = segment.split("-");
+  const low = toFieldNumber(bounds[0], spec.numbers);
+  const high = toFieldNumber(bounds[1], spec.numbers);
+  if (low > high) {
+    return segment;
+  }
+  const top = spec.top;
+  const fired = {};
+  for (let value = low; value <= high; value += 1) {
+    fired[value > top ? spec.min : value] = true;
+  }
+  for (let value = spec.min; value <= top; value += 1) {
+    if (!fired[value]) {
+      return segment;
+    }
+  }
+  return "*";
+}
 function collapseDegenerateRange(segment, spec) {
   const start = segment.split("/")[0];
   if (!includes(start, "-")) {
@@ -800,20 +878,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],
@@ -863,8 +927,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;
@@ -929,6 +1022,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) {
@@ -1100,13 +1196,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) {
@@ -1114,15 +1204,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) {
@@ -1436,7 +1523,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({
@@ -1445,12 +1532,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;
     }
@@ -1460,7 +1547,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);
 }
@@ -1483,7 +1570,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) {
@@ -1496,7 +1583,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 en_default = en;
 

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);
@@ -352,7 +343,7 @@ function duringHours(ir, times, sep) {
   if (windows.length <= 3 || times.kind !== "fires") {
     return joinList(windows);
   }
-  return "in den Stunden von " + joinList(times.fires.map(String)) + " Uhr";
+  return "in den Stunden " + joinList(times.fires.map(String)) + " Uhr";
 }
 function renderEverySecond() {
   return everyUnit(UNITS.second);
@@ -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;
   }
@@ -545,7 +566,9 @@ var de2 = {
   fallback: "ein unlesbares Cron-Muster",
   options: normalizeOptions,
   reboot: "beim Systemstart",
-  sentence: (description) => "L\xE4uft " + description + "."
+  // A description ending in a German ordinal already carries its period
+  // ("…am 8."), so closing the sentence must not double it.
+  sentence: (description) => "L\xE4uft " + description + (description.endsWith(".") ? "" : ".")
 };
 var index_default = de2;
 module.exports = module.exports.default;

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);
@@ -326,7 +317,7 @@ function duringHours(ir, times, sep) {
   if (windows.length <= 3 || times.kind !== "fires") {
     return joinList(windows);
   }
-  return "in den Stunden von " + joinList(times.fires.map(String)) + " Uhr";
+  return "in den Stunden " + joinList(times.fires.map(String)) + " Uhr";
 }
 function renderEverySecond() {
   return everyUnit(UNITS.second);
@@ -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;
   }
@@ -519,7 +540,9 @@ var de2 = {
   fallback: "ein unlesbares Cron-Muster",
   options: normalizeOptions,
   reboot: "beim Systemstart",
-  sentence: (description) => "L\xE4uft " + description + "."
+  // A description ending in a German ordinal already carries its period
+  // ("…am 8."), so closing the sentence must not double it.
+  sentence: (description) => "L\xE4uft " + description + (description.endsWith(".") ? "" : ".")
 };
 var index_default = de2;
 export {