cronli5 0.1.4 → 0.1.6

package/dist/lang/zh.js

@@ -3,6 +3,21 @@ 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()];
 }
@@ -31,6 +46,7 @@ var monthNumbers = {
   NOV: 11,
   DEC: 12
 };
+var maxClockTimes = 6;
 
 // src/lang/zh/dialects.ts
 var zh = { variant: "Hans" };
@@ -61,6 +77,46 @@ function stepSegment(ir, field) {
 function cadence(interval, unit) {
   return interval === 1 ? "\u6BCF" + unit : "\u6BCF" + interval + unit;
 }
+function renderStride(stride) {
+  const { interval, start, last, cycle, unit, mark, anchor } = stride;
+  const tiles = cycle % interval === 0;
+  if (start === 0 && tiles) {
+    return cadence(interval, unit);
+  }
+  const lead = anchor + "\u4ECE" + start + mark + "\u8D77" + cadence(interval, unit);
+  return start < interval && tiles ? lead : lead + "\uFF0C\u81F3" + last + mark;
+}
+function singleValues(segments) {
+  const values = [];
+  for (const segment of segments) {
+    if (segment.kind !== "single") {
+      return null;
+    }
+    values.push(+segment.value);
+  }
+  return values;
+}
+function strideFromSegments(segments, unit, mark, anchor) {
+  const values = singleValues(segments);
+  const step = values && arithmeticStep(values);
+  return step ? renderStride({ ...step, cycle: 60, unit, mark, anchor }) : null;
+}
+function stepClause(segment, unit, mark, anchor) {
+  const start = segment.startToken === "*" ? 0 : +segment.startToken;
+  const short = start !== 0 && segment.fires.length <= 3;
+  if (segment.startToken.indexOf("-") !== -1 || short) {
+    return anchor + segment.fires.join("\u3001") + mark;
+  }
+  return renderStride({
+    interval: segment.interval,
+    start,
+    last: segment.fires[segment.fires.length - 1],
+    cycle: 60,
+    unit,
+    mark,
+    anchor
+  });
+}
 function dayPeriod(hour) {
   if (hour < 6) {
     return "\u51CC\u6668";
@@ -157,11 +213,28 @@ function renderEveryMinute() {
 function renderEveryHour() {
   return "\u6BCF\u5C0F\u65F6";
 }
+function minuteHourClause(ir) {
+  const segments = fieldSegments(ir, "minute");
+  if (ir.shapes.minute === "step") {
+    return stepClause(stepSegment(ir, "minute"), "\u5206\u949F", "\u5206", "\u6BCF\u5C0F\u65F6");
+  }
+  return strideFromSegments(segments, "\u5206\u949F", "\u5206", "\u6BCF\u5C0F\u65F6") ?? "\u6BCF\u5C0F\u65F6" + valueList(segments, "\u5206");
+}
 function renderMinutePast(ir) {
-  return "\u6BCF\u5C0F\u65F6" + valueList(fieldSegments(ir, "minute"), "\u5206");
+  return minuteHourClause(ir);
+}
+function hourSegmentWords(segment) {
+  if (segment.kind === "range") {
+    return [hourWord(+segment.bounds[0]) + "\u81F3" + hourWord(+segment.bounds[1])];
+  }
+  if (segment.kind === "step") {
+    return segment.fires.map(hourWord);
+  }
+  return [hourWord(+segment.value)];
 }
 function hourList(ir) {
-  return joinAnd(hourFires(ir).map(hourWord));
+  const words = fieldSegments(ir, "hour").flatMap(hourSegmentWords);
+  return joinAnd(words);
 }
 function hourFrame(ir) {
   if (ir.shapes.hour === "range") {
@@ -172,11 +245,13 @@ function hourFrame(ir) {
 }
 function renderMinuteFrequency(ir, plan) {
   const minuteStep = stepSegment(ir, "minute");
-  const base = minuteStep.startToken === "*" ? cadence(minuteStep.interval, UNITS.minute) : renderMinutePast(ir);
+  const base = stepClause(minuteStep, UNITS.minute, "\u5206", "\u6BCF\u5C0F\u65F6");
   const { hours } = plan;
-  if (hours.kind === "step") {
-    const hourStep = stepSegment(ir, "hour");
-    return hourStep.startToken === "*" ? cadence(hourStep.interval, UNITS.hour) + base : "\u5728" + hourList(ir) + "\uFF0C" + base;
+  if (hours.kind === "step" || hours.kind === "during") {
+    const hourCad = hourCadencePhrase(ir);
+    if (hourCad !== null) {
+      return hourCad + (hourCad.indexOf("\u81F3") === -1 ? "" : "\uFF0C") + base;
+    }
   }
   if (hours.kind === "single" || hours.kind === "window" && hours.from === hours.to) {
     return "\u5728" + hourWord(hours.from) + "\u81F3" + hours.from + "\u70B9" + hours.last + "\u5206\u4E4B\u95F4\uFF0C" + base;
@@ -198,17 +273,21 @@ function renderMinuteSpanInHour(ir, plan) {
 }
 function renderMinutesAcrossHours(ir, plan) {
   const { form } = plan;
+  const hourCad = hourCadencePhrase(ir);
   if (form === "wildcard") {
-    return "\u5728" + hourList(ir) + "\uFF0C\u6BCF\u5206\u949F";
+    return hourCad === null ? "\u5728" + hourList(ir) + "\uFF0C\u6BCF\u5206\u949F" : hourCad + "\uFF0C\u6BCF\u5206\u949F";
   }
-  return hourList(ir) + "\uFF0C\u6BCF\u5C0F\u65F6" + valueList(fieldSegments(ir, "minute"), "\u5206") + "\uFF0C\u6BCF\u5206\u949F";
+  return (hourCad ?? hourList(ir)) + "\uFF0C" + minuteHourClause(ir) + "\uFF0C\u6BCF\u5206\u949F";
 }
 function renderMinuteSpanAcrossHourStep(ir, plan) {
   const hourStep = stepSegment(ir, "hour");
   const { form } = plan;
-  const minuteTail = form === "wildcard" ? "\u6BCF\u5206\u949F" : "\u6BCF\u5C0F\u65F6" + valueList(fieldSegments(ir, "minute"), "\u5206") + "\uFF0C\u6BCF\u5206\u949F";
+  if (form === "list") {
+    return hourCadencePhrase(ir) + "\uFF0C" + renderMinutePast(ir);
+  }
+  const minuteTail = form === "wildcard" ? "\u6BCF\u5206\u949F" : minuteHourClause(ir) + "\uFF0C\u6BCF\u5206\u949F";
   if (hourStep.startToken !== "*") {
-    return form === "wildcard" ? "\u5728" + hourList(ir) + "\uFF0C" + minuteTail : hourList(ir) + "\uFF0C" + minuteTail;
+    return hourCadencePhrase(ir) + "\uFF0C" + minuteTail;
   }
   if (hourStep.interval === 2 && form === "wildcard") {
     return "\u5728\u5076\u6570\u5C0F\u65F6\uFF0C" + minuteTail;
@@ -217,15 +296,27 @@ function renderMinuteSpanAcrossHourStep(ir, plan) {
   return form === "wildcard" ? cad + "\u5185\uFF0C" + minuteTail : cad + "\uFF0C" + minuteTail;
 }
 function renderClockTimes(ir, plan, opts) {
+  const cad = hourCadenceText(ir);
+  if (cad !== null) {
+    return cad;
+  }
   const { times } = plan;
   return joinAnd(times.map((t) => clockTime(t.hour, t.minute, t.second, opts)));
 }
 function renderCompactClockTimes(ir, plan) {
-  const { minute } = plan;
+  const cad = hourCadenceText(ir);
+  if (cad !== null) {
+    return cad;
+  }
+  const compact = plan;
   const secs = fieldSegments(ir, "second");
   const tail = secs.length && ir.pattern.second !== "0" ? "\uFF0C\u7B2C" + valueText(secs) + "\u79D2" : "";
-  if (minute > 0) {
-    return "\u6BCF\u5C0F\u65F6" + valueList(fieldSegments(ir, "minute"), "\u5206") + "\uFF0C\u5728" + hourList(ir) + tail;
+  if (!compact.fold) {
+    const hourCad = hourCadencePhrase(ir);
+    return hourCad === null ? minuteHourClause(ir) + "\uFF0C\u5728" + hourList(ir) + tail : hourCad + "\uFF0C" + minuteHourClause(ir) + tail;
+  }
+  if (compact.minute > 0) {
+    return minuteHourClause(ir) + "\uFF0C\u5728" + hourList(ir) + tail;
   }
   return hourList(ir) + tail;
 }
@@ -233,7 +324,7 @@ function renderHourRange(ir, plan) {
   const range = plan;
   if (range.minuteForm === "lead") {
     const minuteSegs = fieldSegments(ir, "minute");
-    const past = minuteSegs.length && ir.pattern.minute !== "0" ? "\u6BCF\u5C0F\u65F6" + valueList(minuteSegs, "\u5206") : "\u6BCF\u5C0F\u65F6";
+    const past = minuteSegs.length && ir.pattern.minute !== "0" ? minuteHourClause(ir) : "\u6BCF\u5C0F\u65F6";
     return "\u5728" + hourWord(range.from) + "\u81F3" + hourWord(range.to) + "\u4E4B\u95F4\uFF0C" + past;
   }
   if (range.minuteForm === "range") {
@@ -243,16 +334,68 @@ function renderHourRange(ir, plan) {
 }
 function renderHourStep(ir) {
   const segment = stepSegment(ir, "hour");
-  if (segment.startToken !== "*") {
-    return hourList(ir);
-  }
   if (segment.fires.length <= 2) {
     return joinAnd(segment.fires.map(hourWord));
   }
-  return cadence(segment.interval, UNITS.hour);
+  return hourCadencePhrase(ir);
+}
+function hourStride(ir) {
+  const segments = fieldSegments(ir, "hour");
+  if (segments.length === 1 && segments[0].kind === "step") {
+    const { fires, interval } = segments[0];
+    return { interval, start: fires[0], last: fires[fires.length - 1] };
+  }
+  const values = singleValues(segments);
+  return values && arithmeticStep(values);
+}
+function hourCadencePhrase(ir) {
+  const stride = hourStride(ir);
+  return stride && renderStride({
+    ...stride,
+    cycle: 24,
+    unit: UNITS.hour,
+    mark: "\u70B9",
+    anchor: ""
+  });
+}
+function hourCadence(ir) {
+  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 prefix = hourCadencePhrase(ir);
+  if (prefix.indexOf("\u81F3") !== -1) {
+    return null;
+  }
+  const minute = +ir.pattern.minute;
+  const subMinute = ir.pattern.second === "*" || ir.shapes.second === "step";
+  if (minute === 0 && subMinute) {
+    return stride.interval === 2 && stride.start === 0 ? "\u5728\u5076\u6570\u5C0F\u65F60\u5206" + secondTail(ir) : null;
+  }
+  if (minute === 0) {
+    return prefix + "0\u5206" + secondTail(ir);
+  }
+  return ir.pattern.second === "0" ? prefix + minute + "\u5206" : prefix + minute + "\u5206" + secondTail(ir);
+}
+function hourCadenceText(ir) {
+  if (ir.shapes.minute !== "single") {
+    return null;
+  }
+  if (+ir.pattern.minute === 0 && ir.pattern.second === "0") {
+    return hourCadencePhrase(ir);
+  }
+  return hourCadence(ir);
+}
+function secondTail(ir) {
+  const sec = secondClause(ir);
+  return sec === "\u6BCF\u79D2" ? "\u7684\u6BCF\u4E00\u79D2" : "\u7684" + sec;
 }
 function renderRangeOfMinutes(ir) {
-  return "\u6BCF\u5C0F\u65F6" + valueList(fieldSegments(ir, "minute"), "\u5206") + "\uFF0C\u6BCF\u5206\u949F";
+  return minuteHourClause(ir) + "\uFF0C\u6BCF\u5206\u949F";
 }
 function renderStandaloneSeconds(ir) {
   const segs = fieldSegments(ir, "second");
@@ -260,7 +403,7 @@ function renderStandaloneSeconds(ir) {
   if (segs.length === 1 && first.kind === "step" && first.startToken === "*") {
     return cadence(first.interval, UNITS.second);
   }
-  return "\u6BCF\u5206\u949F\u7B2C" + valueText(segs) + "\u79D2";
+  return strideFromSegments(segs, "\u79D2", "\u79D2", "\u6BCF\u5206\u949F") ?? "\u6BCF\u5206\u949F\u7B2C" + valueText(segs) + "\u79D2";
 }
 function renderSecondPastMinute(ir) {
   return "\u6BCF\u5206\u949F\u7B2C" + valueText(fieldSegments(ir, "second")) + "\u79D2";
@@ -283,7 +426,7 @@ function secondClause(ir) {
   if (segs.length === 1 && first.kind === "step" && first.startToken === "*") {
     return cadence(first.interval, UNITS.second);
   }
-  return "\u7B2C" + valueText(segs) + "\u79D2";
+  return strideFromSegments(segs, "\u79D2", "\u79D2", "\u6BCF\u5206\u949F") ?? "\u7B2C" + valueText(segs) + "\u79D2";
 }
 function minuteClause(ir) {
   if (ir.pattern.minute === "*") {
@@ -294,56 +437,91 @@ function minuteClause(ir) {
   }
   return valueList(fieldSegments(ir, "minute"), "\u5206");
 }
-function isHourCadence(ir) {
-  return ir.shapes.hour === "step" && stepSegment(ir, "hour").startToken === "*";
+function clockRestCarriesSecond(rest) {
+  return rest.kind === "clockTimes" && rest.times.some((time) => Boolean(time.second));
 }
 function composeSecondsOnHour(ir, plan, opts) {
   const sec = secondClause(ir);
   const { rest } = plan;
-  if ((rest.kind === "clockTimes" || rest.kind === "compactClockTimes") && ir.pattern.minute === "0") {
-    const clocks = hourFires(ir).map(function clock(hour) {
-      return hourWord(hour) + "0\u5206";
-    });
-    const tail = sec === "\u6BCF\u79D2" ? "\u7684\u6BCF\u4E00\u79D2" : "\u7684" + sec;
-    const core = joinAnd(clocks) + tail;
-    return isDaily(ir) ? "\u6BCF\u5929" + core : core;
+  const composedClock = rest.kind === "clockTimes" || rest.kind === "compactClockTimes";
+  if (composedClock) {
+    const hourCad = hourCadence(ir);
+    if (hourCad !== null) {
+      return hourCad;
+    }
+  }
+  if (composedClock && ir.pattern.minute === "0") {
+    return composeMinuteZeroClocks(ir, sec);
   }
   const restText = render(ir, rest, opts);
-  if (rest.kind === "clockTimes" || rest.kind === "compactClockTimes") {
-    if (isDaily(ir)) {
-      return "\u6BCF\u5929" + restText + sec;
-    }
+  const secTail = clockRestCarriesSecond(rest) ? "" : sec;
+  if (composedClock && isDaily(ir)) {
+    return "\u6BCF\u5929" + restText + secTail;
   }
   if (rest.kind === "singleMinute") {
     return restText + "\uFF0C" + sec;
   }
-  return restText + sec;
+  return restText + secTail;
+}
+function composeMinuteZeroClocks(ir, sec) {
+  if (hasHourWindow(ir)) {
+    return isDaily(ir) ? "\u6BCF\u5929" + hourRangeWindow(ir, sec) : hourRangeWindow(ir, sec);
+  }
+  const clocks = hourFires(ir).map(function clock(hour) {
+    return hour === 12 ? "\u6B63\u5348" : hourWord(hour) + "0\u5206";
+  });
+  const nested = strideFromSegments(fieldSegments(ir, "second"), "\u79D2", "\u79D2", "");
+  const tail = sec === "\u6BCF\u79D2" ? "\u7684\u6BCF\u4E00\u79D2" : "\u7684" + (nested ?? sec);
+  const core = joinAnd(clocks) + tail;
+  return isDaily(ir) ? "\u6BCF\u5929" + core : core;
+}
+function hasHourWindow(ir) {
+  return fieldSegments(ir, "hour").some(function range(segment) {
+    return segment.kind === "range";
+  });
+}
+function hourRangeWindow(ir, sec) {
+  const span = hourList(ir);
+  if (ir.pattern.second === "*" || ir.shapes.second === "step") {
+    return span + "0\u5206" + (sec === "\u6BCF\u79D2" ? "\u7684\u6BCF\u4E00\u79D2" : "\u7684" + sec);
+  }
+  return span + "\uFF0C" + sec;
 }
 function composeSecondsCadence(ir) {
   const sec = secondClause(ir);
   const tail = minuteClause(ir) + sec;
-  if (isHourCadence(ir)) {
-    return cadence(stepSegment(ir, "hour").interval, UNITS.hour) + "\u7684" + tail;
+  const hourCad = hourCadencePhrase(ir);
+  if (hourCad !== null) {
+    return hourCad + (hourCad.indexOf("\u81F3") === -1 ? "\u7684" : "\uFF0C") + tail;
   }
   if (ir.shapes.hour === "single") {
     return hourWord(hourFires(ir)[0]) + "\u7684" + tail;
   }
   if (ir.shapes.hour === "wildcard") {
+    if (ir.shapes.minute === "step" && sec === "\u6BCF\u79D2") {
+      const minuteStep = stepSegment(ir, "minute");
+      if (minuteStep.startToken === "*" && minuteStep.interval === 2) {
+        return "\u6BCF\u5076\u6570\u5206\u949F\u7684\u6BCF\u4E00\u79D2";
+      }
+    }
     return sec + "\uFF0C" + minuteClause(ir);
   }
   return hourFrame(ir) + tail;
 }
 function composeSecondsListed(ir) {
   const sec = secondClause(ir);
-  const minutes = "\u6BCF\u5C0F\u65F6" + valueList(fieldSegments(ir, "minute"), "\u5206");
+  const minutes = minuteHourClause(ir);
   if (ir.shapes.hour === "single" && sec === "\u6BCF\u79D2") {
-    return hourWord(hourFires(ir)[0]) + valueList(fieldSegments(ir, "minute"), "\u5206") + "\u7684\u6BCF\u4E00\u79D2";
+    const minuteSegs = fieldSegments(ir, "minute");
+    const minuteCad = strideFromSegments(minuteSegs, "\u5206\u949F", "\u5206", "") ?? valueList(minuteSegs, "\u5206");
+    return hourWord(hourFires(ir)[0]) + minuteCad + "\u7684\u6BCF\u4E00\u79D2";
   }
   if (ir.shapes.hour === "wildcard") {
     return minutes + "\uFF0C" + sec;
   }
-  if (isHourCadence(ir)) {
-    return cadence(stepSegment(ir, "hour").interval, UNITS.hour) + "\uFF0C" + minutes + "\uFF0C" + sec;
+  const hourCad = hourCadencePhrase(ir);
+  if (hourCad !== null) {
+    return hourCad + "\uFF0C" + minutes + "\uFF0C" + sec;
   }
   return hourFrame(ir) + minutes + "\uFF0C" + sec;
 }
@@ -554,11 +732,16 @@ function composeCadence(ir, core) {
 function composeWindow(ir, core) {
   return qualifier(ir) + core;
 }
+function hourCadenceApplies(ir) {
+  return hourCadenceText(ir) !== null;
+}
 function describe(ir, opts) {
   const { kind } = ir.plan;
   const core = render(ir, ir.plan, opts);
   let composed = core;
-  if (kind === "clockTimes" || kind === "compactClockTimes" && ir.pattern.minute === "0") {
+  if (hourCadenceApplies(ir)) {
+    composed = composeCadence(ir, core);
+  } else if (kind === "clockTimes" || kind === "compactClockTimes" && ir.pattern.minute === "0") {
     composed = composePoint(ir, core);
   } else if (kind === "hourStep" || kind === "minuteFrequency" || kind === "minuteSpanAcrossHourStep" || kind === "compactClockTimes") {
     composed = composeCadence(ir, core);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cronli5",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Cron Like I'm Five: A Cron to English Utility",
   "repository": {
     "type": "git",
@@ -60,6 +60,7 @@
   "scripts": {
     "build": "node scripts/build.mjs && npm run types",
     "docs": "node --import tsx scripts/docs.mjs",
+    "conciseness": "node --import tsx tooling/scripts/conciseness.mjs",
     "fuzz": "node --import tsx scripts/fuzz-lang.mjs",
     "lint": "eslint src test cli.js eslint.config.js scripts tooling/scripts",
     "metamorphic": "node --import tsx tooling/scripts/metamorphic.mjs",
@@ -69,7 +70,7 @@
     "test:types": "npm run types && tsd",
     "typecheck": "tsc -p tsconfig.json",
     "coverage": "c8 mocha",
-    "verify": "npm run lint && npm run typecheck && npm run test:types && npm test && npm run coverage && npm run docs -- --check && npm run build",
+    "verify": "npm run lint && npm run typecheck && npm run test:types && npm test && npm run coverage && npm run conciseness && npm run docs -- --check && npm run build",
     "prepare": "node scripts/install-hooks.mjs",
     "prepublishOnly": "npm run lint && npm run typecheck && npm run test:types && npm run build && npm test"
   },

package/src/core/analyze.ts

@@ -376,6 +376,13 @@ function planMinuteUnderHourStep(
     return {form: 'range', kind: 'minuteSpanAcrossHourStep'};
   }
 
+  // A minute list under a clean stride keeps the cadence too, so the hour
+  // reads the same whatever the minute's shape. An unclean stride falls
+  // through to compactClockTimes and enumerates its hours.
+  if (shapes.minute === 'list' && cleanHourStride(pattern.hour)) {
+    return {form: 'list', kind: 'minuteSpanAcrossHourStep'};
+  }
+
   return null;
 }
 

package/src/core/ir.ts

@@ -71,7 +71,7 @@ export type PlanNode =
       form: 'wildcard' | 'range' | 'list';
       times: HourTimesPlan;
     }
-  | {kind: 'minuteSpanAcrossHourStep'; form: 'wildcard' | 'range'}
+  | {kind: 'minuteSpanAcrossHourStep'; form: 'wildcard' | 'range' | 'list'}
   | {kind: 'everyHour'}
   | {
       kind: 'hourRange';

package/src/core/util.ts

@@ -16,6 +16,34 @@ function isNonNegativeInteger(value: string): boolean {
   return digits.test(value);
 }
 
+// Recognize an arithmetic progression in a sorted, distinct numeric set: a
+// run of length >= 5 whose consecutive gaps are all equal and >= 2. Returns
+// its {start, interval, last}; null for anything shorter, with a gap of one
+// (a plain run, which reads as a range), or irregular. Output-neutral and
+// language-agnostic: renderers use it to speak a bounded/offset step cadence
+// ("every N from M [through K]") instead of enumerating the fires. The set is
+// the field's full value list, which the core has already sorted and deduped.
+function arithmeticStep(values: number[]):
+  {start: number; interval: number; last: number} | null {
+  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]};
+}
+
 // Resolve a numeric or named field token (e.g. '5' or 'FRI') to its number.
 function toFieldNumber(
   token: string,
@@ -25,4 +53,6 @@ function toFieldNumber(
   // weekday) reach here. They always have an associated `numberMap`.
   return isNonNegativeInteger(token) ? +token : numberMap![token.toUpperCase()];
 }
-export {includes, isNonNegativeInteger, toFieldNumber, unique};
+export {
+  arithmeticStep, includes, isNonNegativeInteger, toFieldNumber, unique
+};