cronli5 0.2.0 → 0.2.1

package/dist/lang/fi.js

@@ -69,6 +69,48 @@ function orderWeekdaysForDisplay(segments) {
 function toFieldNumber(token, numberMap) {
   return isNonNegativeInteger(token) ? +token : numberMap[token.toUpperCase()];
 }
+function segmentsOf(ir, field) {
+  return ir.analyses.segments[field] ?? [];
+}
+function stepSegment(ir, field) {
+  return segmentsOf(ir, field)[0];
+}
+function singleValues(segments) {
+  const values = [];
+  for (const segment of segments) {
+    if (segment.kind !== "single") {
+      return null;
+    }
+    values.push(+segment.value);
+  }
+  return values;
+}
+function offsetCleanStride(stride) {
+  return stride.start < stride.interval && 24 % stride.interval === 0;
+}
+function hourListStride(values) {
+  if (values.length < 2) {
+    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;
+    }
+  }
+  if (values[0] !== 0 && values.length < 5) {
+    return null;
+  }
+  return { interval, last: values[values.length - 1], start: values[0] };
+}
+
+// src/core/shapes.ts
+function isOpenStep(field) {
+  return field.indexOf("/") !== -1 && field.indexOf("-") === -1 && field.indexOf(",") === -1;
+}
 
 // src/lang/fi/dialects.ts
 var dialects = {
@@ -87,9 +129,6 @@ function resolveDialect(dialect) {
 }
 
 // src/lang/fi/index.ts
-function stepSegment(segments) {
-  return segments[0];
-}
 var genitives = [
   null,
   "yhden",
@@ -265,7 +304,7 @@ function renderSecondsWithinMinute(ir, plan, opts) {
   return secondsLeadClause(ir, opts) + ", " + atMarks(minuteField, units.minute, true) + trailingQualifier(ir, opts);
 }
 function composeSecondsOverMinuteStep(ir, freq, opts) {
-  const seg = stepSegment(ir.analyses.segments.minute);
+  const seg = stepSegment(ir, "minute");
   const stepPhrase = stepCycle60(seg, units.minute, opts);
   if (freq.hours.kind === "during" && minuteStepIsAnchored(seg)) {
     const bareHours = kloFromTimes(ir, freq.hours.times, opts);
@@ -277,7 +316,7 @@ function composeSecondsOverMinuteStep(ir, freq, opts) {
   } else if (freq.hours.kind === "window") {
     hourClause = " " + hourWindow(freq.hours, opts);
   } else if (freq.hours.kind === "step") {
-    hourClause = " " + everyNthHour(stepSegment(ir.analyses.segments.hour), opts);
+    hourClause = " " + everyNthHour(stepSegment(ir, "hour"), opts);
   }
   return stepPhrase + ", " + secondsLeadClause(ir, opts) + hourClause + trailingQualifier(ir, opts);
 }
@@ -311,7 +350,7 @@ function isEveryOtherMinuteSeconds(ir, plan) {
   if (plan.rest.kind !== "minuteFrequency" || ir.pattern.second !== "*" || ir.shapes.hour !== "wildcard") {
     return false;
   }
-  const seg = stepSegment(ir.analyses.segments.minute);
+  const seg = stepSegment(ir, "minute");
   return seg.startToken === "*" && seg.interval === 2;
 }
 function composeMinuteZero(ir, rest, opts) {
@@ -333,7 +372,7 @@ function secondsLeadClause(ir, opts) {
   }
   if (shape === "step") {
     return stepCycle60(
-      stepSegment(ir.analyses.segments.second),
+      stepSegment(ir, "second"),
       units.second,
       opts
     );
@@ -342,8 +381,8 @@ function secondsLeadClause(ir, opts) {
   if (shape === "single") {
     return atMarks(secondField, units.second, marked);
   }
-  return strideFromSegments(ir.analyses.segments.second, units.second, opts) ?? atMarks(
-    joinList(segmentWords(ir.analyses.segments.second)),
+  return strideFromSegments(segmentsOf(ir, "second"), units.second, opts) ?? atMarks(
+    joinList(segmentWords(segmentsOf(ir, "second"))),
     units.second,
     marked
   );
@@ -361,15 +400,15 @@ function renderMultipleMinutes(ir, plan, opts) {
   return minutesList(ir, opts) + trailingQualifier(ir, opts);
 }
 function minutesList(ir, opts) {
-  return strideFromSegments(ir.analyses.segments.minute, units.minute, opts) ?? atMarks(
-    joinList(segmentWords(ir.analyses.segments.minute)),
+  return strideFromSegments(segmentsOf(ir, "minute"), units.minute, opts) ?? atMarks(
+    joinList(segmentWords(segmentsOf(ir, "minute"))),
     units.minute,
     true
   );
 }
 function bareMinutes(ir, opts) {
-  return strideFromSegments(ir.analyses.segments.minute, units.minute, opts) ?? atMarks(
-    joinList(segmentWords(ir.analyses.segments.minute)),
+  return strideFromSegments(segmentsOf(ir, "minute"), units.minute, opts) ?? atMarks(
+    joinList(segmentWords(segmentsOf(ir, "minute"))),
     units.minute,
     false
   );
@@ -400,15 +439,15 @@ function hoursAreRangeIsolated(segments) {
   return hasRange && hasSingle;
 }
 function hoursFirstMinutes(hoursStr, ir, opts) {
-  const stride = strideFromSegments(ir.analyses.segments.minute, units.minute, opts);
+  const stride = strideFromSegments(segmentsOf(ir, "minute"), units.minute, opts);
   if (stride) {
     return hoursStr + " aina " + stride;
   }
-  return hoursStr + " aina minuuttien " + joinList(segmentWords(ir.analyses.segments.minute)) + " kohdalla";
+  return hoursStr + " aina minuuttien " + joinList(segmentWords(segmentsOf(ir, "minute"))) + " kohdalla";
 }
 function hourSegmentTimesWithSeka(ir, minute, second, opts) {
   const pieces = [];
-  ir.analyses.segments.hour.forEach(function clock(segment) {
+  segmentsOf(ir, "hour").forEach(function clock(segment) {
     if (segment.kind === "range") {
       pieces.push(rangeDigits(
         { hour: +segment.bounds[0], minute, second },
@@ -422,7 +461,7 @@ function hourSegmentTimesWithSeka(ir, minute, second, opts) {
   return "klo " + pieces.slice(0, -1).join(", ") + " sek\xE4 klo " + pieces[pieces.length - 1];
 }
 function renderMinuteFrequency(ir, plan, opts) {
-  const seg = stepSegment(ir.analyses.segments.minute);
+  const seg = stepSegment(ir, "minute");
   if (plan.hours.kind === "during") {
     const cadence = unevenHourCadence(ir, opts);
     if (cadence !== null) {
@@ -438,7 +477,7 @@ function renderMinuteFrequency(ir, plan, opts) {
   if (plan.hours.kind === "window") {
     phrase += " " + hourWindow(plan.hours, opts);
   } else if (plan.hours.kind === "step") {
-    phrase += " " + everyNthHour(stepSegment(ir.analyses.segments.hour), opts);
+    phrase += " " + everyNthHour(stepSegment(ir, "hour"), opts);
   }
   return phrase + trailingQualifier(ir, opts);
 }
@@ -460,14 +499,14 @@ function renderMinutesAcrossHours(ir, plan, opts) {
   if (cadence !== null) {
     return bareMinutes(ir, opts) + ", " + cadence + trailingQualifier(ir, opts);
   }
-  if (hoursAreRangeIsolated(ir.analyses.segments.hour)) {
+  if (hoursAreRangeIsolated(segmentsOf(ir, "hour"))) {
     return bareMinutes(ir, opts) + " " + hourSegmentTimesWithSeka(ir, 0, null, opts) + trailingQualifier(ir, opts);
   }
   const hoursStr = kloFromTimes(ir, plan.times, opts);
   return hoursFirstMinutes(hoursStr, ir, opts) + trailingQualifier(ir, opts);
 }
 function renderMinuteSpanAcrossHourStep(ir, plan, opts) {
-  const segment = stepSegment(ir.analyses.segments.hour);
+  const segment = stepSegment(ir, "hour");
   const cadence = unevenHourCadence(ir, opts);
   if (plan.form === "wildcard") {
     return "joka minuutti " + everyNthHour(segment, opts) + trailingQualifier(ir, opts);
@@ -552,7 +591,7 @@ function renderHourStep(ir, plan, opts) {
   if (cadence !== null) {
     return cadence + trailingQualifier(ir, opts);
   }
-  return stepHours(stepSegment(ir.analyses.segments.hour), opts) + trailingQualifier(ir, opts);
+  return stepHours(stepSegment(ir, "hour"), opts) + trailingQualifier(ir, opts);
 }
 function boundedWindow(plan) {
   return { from: plan.from, last: plan.boundMinute ?? 0, to: plan.to };
@@ -588,7 +627,7 @@ function renderCompactClockTimes(ir, plan, opts) {
       return cadence2;
     }
   }
-  const hourSegs = ir.analyses.segments.hour;
+  const hourSegs = segmentsOf(ir, "hour");
   if (hoursAreRangeIsolated(hourSegs)) {
     if (plan.fold) {
       return leadingQualifier(ir, opts) + hourSegmentTimesWithSeka(
@@ -649,16 +688,6 @@ function strideFromSegments(segments, unit, opts) {
   const step = values && arithmeticStep(values);
   return step ? renderStride({ ...step, cycle: 60, unit }, opts) : null;
 }
-function singleValues(segments) {
-  const values = [];
-  for (const segment of segments) {
-    if (segment.kind !== "single") {
-      return null;
-    }
-    values.push(+segment.value);
-  }
-  return values;
-}
 function stepCycle60(segment, unit, opts) {
   if (segment.startToken.indexOf("-") !== -1) {
     return atMarks(joinList(wordList(segment.fires)), unit, true);
@@ -702,27 +731,6 @@ function hourStrideCadence(stride, opts) {
   }
   return cadence + " " + kloRange({ hour: start, minute: 0 }, { hour: last, minute: 0 }, opts);
 }
-function hourListStride(values) {
-  if (values.length < 2) {
-    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;
-    }
-  }
-  if (values[0] !== 0 && values.length < 5) {
-    return null;
-  }
-  return { interval, last: values[values.length - 1], start: values[0] };
-}
-function offsetCleanStride(stride) {
-  return stride.start < stride.interval && 24 % stride.interval === 0;
-}
 function hourStride(ir) {
   const segments = ir.analyses.segments.hour;
   if (!segments) {
@@ -771,8 +779,8 @@ function hourCadence(ir, minute, opts) {
   if (ir.pattern.second === "0" && fires <= maxClockTimes && offsetCleanStride(stride)) {
     return null;
   }
-  const segment = ir.analyses.segments.hour[0];
-  const confined = minute === 0 && subMinuteSecond(ir) && ir.analyses.segments.hour.length === 1 && segment.kind === "step" && cleanHourStride(segment);
+  const segment = segmentsOf(ir, "hour")[0];
+  const confined = minute === 0 && subMinuteSecond(ir) && segmentsOf(ir, "hour").length === 1 && segment.kind === "step" && cleanHourStride(segment);
   if (confined) {
     return secondsLeadClause(ir, opts) + " minuutin ajan " + everyNthHour(segment, opts) + trailingQualifier(ir, opts);
   }
@@ -795,7 +803,7 @@ function hasHourWindow(ir) {
   });
 }
 function hourRangeWindowTail(ir, opts) {
-  return ir.analyses.segments.hour.length === 1 ? hourSegmentTimes(ir, 0, null, opts) : hourSegmentTimesWithSeka(ir, 0, null, opts);
+  return segmentsOf(ir, "hour").length === 1 ? hourSegmentTimes(ir, 0, null, opts) : hourSegmentTimesWithSeka(ir, 0, null, opts);
 }
 function hourRangeCadence(ir, minute, opts) {
   if (minute !== 0 || !hasHourWindow(ir) || ir.pattern.second === "0") {
@@ -823,7 +831,7 @@ function hourWindowsFromTimes(ir, times, opts) {
   if (times.kind === "fires") {
     return kloList(times.fires, opts);
   }
-  const segments = ir.analyses.segments.hour;
+  const segments = segmentsOf(ir, "hour");
   if (!segments.some(function ranged(segment) {
     return segment.kind === "range";
   })) {
@@ -863,7 +871,7 @@ function hourWindowDigits(hour, opts) {
 }
 function hourSegmentTimes(ir, minute, second, opts) {
   const pieces = [];
-  ir.analyses.segments.hour.forEach(function clock(segment) {
+  segmentsOf(ir, "hour").forEach(function clock(segment) {
     if (segment.kind === "step") {
       pieces.push(...segment.fires.map(function each(hour) {
         return timeDigits(hour, minute, second, opts);
@@ -959,7 +967,7 @@ function weekdayQualifier(ir) {
   if (quartz) {
     return quartz;
   }
-  const segments = orderWeekdaysForDisplay(ir.analyses.segments.weekday);
+  const segments = orderWeekdaysForDisplay(segmentsOf(ir, "weekday"));
   return joinList(segments.map(function piece(segment) {
     if (segment.kind === "range") {
       return weekdays[weekdayNumber(segment.bounds[0])].ela + " " + weekdays[weekdayNumber(segment.bounds[1])].ill;
@@ -968,7 +976,7 @@ function weekdayQualifier(ir) {
   }));
 }
 function monthPhrase(ir) {
-  const segments = flattenSteps(ir.analyses.segments.month);
+  const segments = flattenSteps(segmentsOf(ir, "month"));
   return joinList(segments.map(function piece(segment) {
     if (segment.kind === "range") {
       return monthStems[monthNumber(segment.bounds[0])] + "kuusta " + monthStems[monthNumber(segment.bounds[1])] + "kuuhun";
@@ -1018,7 +1026,7 @@ function monthAnchor(ir, opts) {
   if (isOpenStep(monthField)) {
     return stepMonths(monthField, opts);
   }
-  const segments = flattenSteps(ir.analyses.segments.month);
+  const segments = flattenSteps(segmentsOf(ir, "month"));
   return joinList(segments.map(function genitiveOf(segment) {
     const single = segment;
     return monthStems[monthNumber(single.value)] + "kuun";
@@ -1028,12 +1036,12 @@ function rangedMonthScope(ir) {
   return monthRanged(ir) ? " " + monthPhrase(ir) : "";
 }
 function monthRanged(ir) {
-  return ir.pattern.month !== "*" && ir.analyses.segments.month.some(function range(segment) {
+  return ir.pattern.month !== "*" && segmentsOf(ir, "month").some(function range(segment) {
     return segment.kind === "range";
   });
 }
 function dateWords(ir) {
-  return joinList(ir.analyses.segments.date.flatMap(
+  return joinList(segmentsOf(ir, "date").flatMap(
     function word(segment) {
       if (segment.kind === "range") {
         return [segment.bounds[0] + ".\u2013" + segment.bounds[1] + "."];
@@ -1135,9 +1143,6 @@ function segmentWords(segments) {
     return [segment.value];
   });
 }
-function isOpenStep(field) {
-  return field.indexOf("/") !== -1 && field.indexOf("-") === -1 && field.indexOf(",") === -1;
-}
 function wordList(fires) {
   return fires.map(function digit(value) {
     return "" + value;

package/dist/lang/zh.cjs

@@ -67,6 +67,22 @@ function orderWeekdaysForDisplay(segments) {
 function toFieldNumber(token, numberMap) {
   return isNonNegativeInteger(token) ? +token : numberMap[token.toUpperCase()];
 }
+function segmentsOf(ir, field) {
+  return ir.analyses.segments[field] ?? [];
+}
+function stepSegment(ir, field) {
+  return segmentsOf(ir, field)[0];
+}
+function singleValues(segments) {
+  const values = [];
+  for (const segment of segments) {
+    if (segment.kind !== "single") {
+      return null;
+    }
+    values.push(+segment.value);
+  }
+  return values;
+}
 
 // src/core/specs.ts
 var weekdayNumbers = {
@@ -114,12 +130,6 @@ function joinAnd(items) {
   }
   return items.slice(0, -1).join("\u3001") + "\u548C" + items[items.length - 1];
 }
-function fieldSegments(ir, field) {
-  return ir.analyses.segments[field] || [];
-}
-function stepSegment(ir, field) {
-  return fieldSegments(ir, field)[0];
-}
 function cadence(interval, unit) {
   return interval === 1 ? "\u6BCF" + unit : "\u6BCF" + interval + unit;
 }
@@ -132,16 +142,6 @@ function renderStride(stride) {
   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);
@@ -205,7 +205,7 @@ function hourWord(hour) {
 }
 function hourFires(ir) {
   const fires = [];
-  fieldSegments(ir, "hour").forEach(function expand(segment) {
+  segmentsOf(ir, "hour").forEach(function expand(segment) {
     if (segment.kind === "step") {
       fires.push(...segment.fires);
     } else if (segment.kind === "range") {
@@ -260,7 +260,7 @@ function renderEveryHour() {
   return "\u6BCF\u5C0F\u65F6";
 }
 function minuteHourClause(ir) {
-  const segments = fieldSegments(ir, "minute");
+  const segments = segmentsOf(ir, "minute");
   if (ir.shapes.minute === "step") {
     return stepClause(stepSegment(ir, "minute"), "\u5206\u949F", "\u5206", "\u6BCF\u5C0F\u65F6");
   }
@@ -279,12 +279,12 @@ function hourSegmentWords(segment) {
   return [hourWord(+segment.value)];
 }
 function hourList(ir) {
-  const words = fieldSegments(ir, "hour").flatMap(hourSegmentWords);
+  const words = segmentsOf(ir, "hour").flatMap(hourSegmentWords);
   return joinAnd(words);
 }
 function hourFrame(ir) {
   if (ir.shapes.hour === "range") {
-    const [from, to] = fieldSegments(ir, "hour")[0].bounds;
+    const [from, to] = segmentsOf(ir, "hour")[0].bounds;
     return "\u5728" + hourWord(+from) + "\u81F3" + hourWord(+to) + "\u4E4B\u95F4\uFF0C";
   }
   return "\u5728" + hourList(ir) + "\uFF0C";
@@ -355,7 +355,7 @@ function renderCompactClockTimes(ir, plan) {
     return cad;
   }
   const compact = plan;
-  const secs = fieldSegments(ir, "second");
+  const secs = segmentsOf(ir, "second");
   const tail = secs.length && ir.pattern.second !== "0" ? "\uFF0C\u7B2C" + valueText(secs) + "\u79D2" : "";
   if (!compact.fold) {
     const hourCad = hourCadencePhrase(ir);
@@ -369,12 +369,12 @@ function renderCompactClockTimes(ir, plan) {
 function renderHourRange(ir, plan) {
   const range = plan;
   if (range.minuteForm === "lead") {
-    const minuteSegs = fieldSegments(ir, "minute");
+    const minuteSegs = segmentsOf(ir, "minute");
     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") {
-    return "\u5728" + hourWord(range.from) + "\u81F3" + hourWord(range.to) + "\u4E4B\u95F4\uFF0C\u6BCF\u5C0F\u65F6" + valueList(fieldSegments(ir, "minute"), "\u5206") + "\uFF0C\u6BCF\u5206\u949F";
+    return "\u5728" + hourWord(range.from) + "\u81F3" + hourWord(range.to) + "\u4E4B\u95F4\uFF0C\u6BCF\u5C0F\u65F6" + valueList(segmentsOf(ir, "minute"), "\u5206") + "\uFF0C\u6BCF\u5206\u949F";
   }
   return "\u5728" + hourWord(range.from) + "\u81F3" + range.to + "\u70B9" + range.last + "\u5206\u4E4B\u95F4\uFF0C\u6BCF\u5206\u949F";
 }
@@ -386,7 +386,7 @@ function renderHourStep(ir) {
   return hourCadencePhrase(ir);
 }
 function hourStride(ir) {
-  const segments = fieldSegments(ir, "hour");
+  const segments = segmentsOf(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] };
@@ -453,7 +453,7 @@ function renderRangeOfMinutes(ir) {
   return minuteHourClause(ir) + "\uFF0C\u6BCF\u5206\u949F";
 }
 function renderStandaloneSeconds(ir) {
-  const segs = fieldSegments(ir, "second");
+  const segs = segmentsOf(ir, "second");
   const first = segs[0];
   if (segs.length === 1 && first.kind === "step" && first.startToken === "*") {
     return cadence(first.interval, UNITS.second);
@@ -461,11 +461,11 @@ function renderStandaloneSeconds(ir) {
   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";
+  return "\u6BCF\u5206\u949F\u7B2C" + valueText(segmentsOf(ir, "second")) + "\u79D2";
 }
 function renderSecondsWithinMinute(ir) {
   const base = "\u6BCF\u5C0F\u65F6" + ir.pattern.minute + "\u5206";
-  const segs = fieldSegments(ir, "second");
+  const segs = segmentsOf(ir, "second");
   const first = segs[0];
   if (segs.length === 1 && first.kind === "step" && first.startToken === "*") {
     return base + "\uFF0C" + cadence(first.interval, UNITS.second);
@@ -473,7 +473,7 @@ function renderSecondsWithinMinute(ir) {
   return base + "\u7B2C" + valueText(segs) + "\u79D2";
 }
 function secondClause(ir) {
-  const segs = fieldSegments(ir, "second");
+  const segs = segmentsOf(ir, "second");
   if (!segs.length) {
     return "\u6BCF\u79D2";
   }
@@ -490,7 +490,7 @@ function minuteClause(ir) {
   if (ir.shapes.minute === "step") {
     return cadence(stepSegment(ir, "minute").interval, UNITS.minute);
   }
-  return valueList(fieldSegments(ir, "minute"), "\u5206");
+  return valueList(segmentsOf(ir, "minute"), "\u5206");
 }
 function clockRestCarriesSecond(rest) {
   return rest.kind === "clockTimes" && rest.times.some((time) => Boolean(time.second));
@@ -525,13 +525,13 @@ function composeMinuteZeroClocks(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 nested = strideFromSegments(segmentsOf(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 segmentsOf(ir, "hour").some(function range(segment) {
     return segment.kind === "range";
   });
 }
@@ -567,7 +567,7 @@ function composeSecondsListed(ir) {
   const sec = secondClause(ir);
   const minutes = minuteHourClause(ir);
   if (ir.shapes.hour === "single" && sec === "\u6BCF\u79D2") {
-    const minuteSegs = fieldSegments(ir, "minute");
+    const minuteSegs = segmentsOf(ir, "minute");
     const minuteCad = strideFromSegments(minuteSegs, "\u5206\u949F", "\u5206", "") ?? valueList(minuteSegs, "\u5206");
     return hourWord(hourFires(ir)[0]) + minuteCad + "\u7684\u6BCF\u4E00\u79D2";
   }
@@ -623,7 +623,7 @@ function monthPhrase(ir) {
   if (ir.pattern.month === "*") {
     return "";
   }
-  const segs = fieldSegments(ir, "month");
+  const segs = segmentsOf(ir, "month");
   const first = segs[0];
   if (segs.length === 1 && first.kind === "step" && first.interval === 2) {
     return "\u6BCF\u4E2A" + (first.fires[0] % 2 ? "\u5947" : "\u5076") + "\u6570\u6708";
@@ -642,7 +642,7 @@ function monthPhrase(ir) {
   return nums.join("\u3001") + "\u6708";
 }
 function dayList(ir) {
-  const segs = fieldSegments(ir, "date");
+  const segs = segmentsOf(ir, "date");
   if (segs.every((seg) => seg.kind === "single")) {
     return segs.map((seg) => seg.value).join("\u3001") + "\u65E5";
   }
@@ -717,7 +717,7 @@ function weekdayPhrase(ir, orContext, monthPrefix) {
   if (ir.shapes.weekday === "quartz") {
     return quartzWeekday(ir.pattern.weekday, monthPrefix);
   }
-  const segs = fieldSegments(ir, "weekday");
+  const segs = segmentsOf(ir, "weekday");
   if (segs.length === 1 && segs[0].kind === "range") {
     const [from, to] = segs[0].bounds;
     return "\u6BCF" + weekdayName(from) + "\u81F3" + weekdayName(to);
@@ -811,7 +811,7 @@ function describe(ir, opts) {
   if (ir.pattern.year === "*") {
     return composed;
   }
-  const year = fieldSegments(ir, "year").map(function part(seg) {
+  const year = segmentsOf(ir, "year").map(function part(seg) {
     if (seg.kind === "range") {
       return seg.bounds[0] + "\u5E74\u81F3" + seg.bounds[1] + "\u5E74";
     }