cronli5 0.1.6 → 0.2.0

package/dist/lang/es.cjs

@@ -72,6 +72,26 @@ function arithmeticStep(values) {
   }
   return { start: values[0], interval, last: values[values.length - 1] };
 }
+function weekdayDisplayKey(value) {
+  return value === 0 ? 7 : value;
+}
+function orderWeekdaysForDisplay(segments) {
+  const flattened = segments.flatMap(function flat(segment) {
+    return segment.kind === "step" ? segment.fires.map(function single(value) {
+      return { kind: "single", value: "" + value };
+    }) : [segment];
+  });
+  function key(segment) {
+    return segment.kind === "range" ? weekdayDisplayKey(+segment.bounds[0]) : weekdayDisplayKey(+segment.value);
+  }
+  return flattened.map(function index(segment, position) {
+    return [segment, position];
+  }).sort(function byDisplayKey(a, b) {
+    return key(a[0]) - key(b[0]) || a[1] - b[1];
+  }).map(function unwrap(pair) {
+    return pair[0];
+  });
+}
 function toFieldNumber(token, numberMap) {
   return isNonNegativeInteger(token) ? +token : numberMap[token.toUpperCase()];
 }
@@ -224,7 +244,7 @@ function renderComposeSeconds(ir, plan, opts) {
   }
   if (plan.rest.kind === "hourRange" && ir.shapes.second === "step" && ir.pattern.weekday !== "*") {
     const restNode = plan.rest;
-    const window = hourWindow(restNode, opts);
+    const window = hourWindow(boundedWindow(restNode), opts);
     const dayFrame = weekdayQualifier(ir) + monthScope(ir);
     const cadence = "cada " + numero(stepSegment(ir.analyses.segments.second).interval, opts) + " segundos del minuto " + ir.pattern.minute;
     return dayFrame + ", " + window + ", " + cadence;
@@ -437,7 +457,8 @@ function renderHourStep(ir, plan, opts) {
   return stepHours(stepSegment(ir.analyses.segments.hour), opts) + trailingQualifier(ir, opts);
 }
 function boundedWindow(plan) {
-  return { from: plan.from, last: plan.boundMinute ?? 0, to: plan.to };
+  const last = plan.minuteForm === "wildcard" ? plan.boundMinute ?? 0 : 0;
+  return { from: plan.from, last, to: plan.to };
 }
 function hourWindow(window, opts) {
   return timeRange(
@@ -481,7 +502,7 @@ function dowArm(ir) {
   if (quartz) {
     return quartz;
   }
-  const segments = flattenSteps(fieldSegments(ir, "weekday"));
+  const segments = orderWeekdaysForDisplay(fieldSegments(ir, "weekday"));
   const allSingles = segments.every(function single(segment) {
     return segment.kind === "single";
   });
@@ -705,7 +726,7 @@ function renderCompactClockTimes(ir, plan, opts) {
     return leadingQualifier(ir, opts) + hourSegmentTimes(ir, plan.minute, ir.analyses.clockSecond, opts);
   }
   const cadence = unevenHourCadence(ir, opts);
-  const phrase = cadence ? minutesList(ir, opts) + ", " + cadence + trailingQualifier(ir, opts) : minutesList(ir, opts) + ", " + hourSegmentTimes(ir, 0, null, opts) + trailingQualifier(ir, opts);
+  const phrase = cadence ? minutesList(ir, opts) + ", " + cadence + trailingQualifier(ir, opts) : minutesList(ir, opts) + ", " + hourContextTimes(ir, opts) + trailingQualifier(ir, opts);
   return ir.analyses.clockSecond ? secondsLeadClause(ir, opts) + ", " + phrase : phrase;
 }
 var renderers = {
@@ -896,6 +917,48 @@ function hourRangeCadence(ir, minute, opts) {
   }
   return hourCadenceLead(ir, minute, opts) + ", " + hourSegmentTimes(ir, 0, null, opts) + trailingQualifier(ir, opts);
 }
+function hourContextTimes(ir, opts) {
+  const segments = hourSegments(ir);
+  const points = [];
+  const hasRange = segments.some(function range(segment) {
+    return segment.kind === "range";
+  });
+  segments.forEach(function collect(segment) {
+    if (segment.kind === "step") {
+      points.push(...segment.fires);
+    } else if (segment.kind === "single") {
+      points.push(+segment.value);
+    }
+  });
+  function isWord(hour) {
+    return !opts.ampm && (hour === 0 || hour === 12);
+  }
+  if (!hasRange && points.every(isWord)) {
+    return joinList(points.map(function each(hour) {
+      return atTime(bareHourPhrase(hour, opts));
+    }));
+  }
+  function wholeHour(hour) {
+    return "de la hora " + fromTime(explicitTimePhrase(hour, 0, opts));
+  }
+  const pieces = [];
+  segments.forEach(function place(segment) {
+    if (segment.kind === "range") {
+      pieces.push(timeRange(
+        { hour: +segment.bounds[0], minute: 0 },
+        { hour: +segment.bounds[1], minute: 0 },
+        opts
+      ));
+    } else if (segment.kind === "step") {
+      segment.fires.forEach(function each(hour) {
+        pieces.push(wholeHour(hour));
+      });
+    } else {
+      pieces.push(wholeHour(+segment.value));
+    }
+  });
+  return joinList(pieces);
+}
 function atTimes(hours, opts) {
   return hours.map(function each(hour) {
     return atTime(timePhrase(hour, 0, null, opts));
@@ -1158,7 +1221,7 @@ function weekdayQualifier(ir) {
   if (quartz) {
     return quartz;
   }
-  const segments = flattenSteps(fieldSegments(ir, "weekday"));
+  const segments = orderWeekdaysForDisplay(fieldSegments(ir, "weekday"));
   const allSingles = segments.every(function single(segment) {
     return segment.kind === "single";
   });

package/dist/lang/es.js

@@ -46,6 +46,26 @@ function arithmeticStep(values) {
   }
   return { start: values[0], interval, last: values[values.length - 1] };
 }
+function weekdayDisplayKey(value) {
+  return value === 0 ? 7 : value;
+}
+function orderWeekdaysForDisplay(segments) {
+  const flattened = segments.flatMap(function flat(segment) {
+    return segment.kind === "step" ? segment.fires.map(function single(value) {
+      return { kind: "single", value: "" + value };
+    }) : [segment];
+  });
+  function key(segment) {
+    return segment.kind === "range" ? weekdayDisplayKey(+segment.bounds[0]) : weekdayDisplayKey(+segment.value);
+  }
+  return flattened.map(function index(segment, position) {
+    return [segment, position];
+  }).sort(function byDisplayKey(a, b) {
+    return key(a[0]) - key(b[0]) || a[1] - b[1];
+  }).map(function unwrap(pair) {
+    return pair[0];
+  });
+}
 function toFieldNumber(token, numberMap) {
   return isNonNegativeInteger(token) ? +token : numberMap[token.toUpperCase()];
 }
@@ -198,7 +218,7 @@ function renderComposeSeconds(ir, plan, opts) {
   }
   if (plan.rest.kind === "hourRange" && ir.shapes.second === "step" && ir.pattern.weekday !== "*") {
     const restNode = plan.rest;
-    const window = hourWindow(restNode, opts);
+    const window = hourWindow(boundedWindow(restNode), opts);
     const dayFrame = weekdayQualifier(ir) + monthScope(ir);
     const cadence = "cada " + numero(stepSegment(ir.analyses.segments.second).interval, opts) + " segundos del minuto " + ir.pattern.minute;
     return dayFrame + ", " + window + ", " + cadence;
@@ -411,7 +431,8 @@ function renderHourStep(ir, plan, opts) {
   return stepHours(stepSegment(ir.analyses.segments.hour), opts) + trailingQualifier(ir, opts);
 }
 function boundedWindow(plan) {
-  return { from: plan.from, last: plan.boundMinute ?? 0, to: plan.to };
+  const last = plan.minuteForm === "wildcard" ? plan.boundMinute ?? 0 : 0;
+  return { from: plan.from, last, to: plan.to };
 }
 function hourWindow(window, opts) {
   return timeRange(
@@ -455,7 +476,7 @@ function dowArm(ir) {
   if (quartz) {
     return quartz;
   }
-  const segments = flattenSteps(fieldSegments(ir, "weekday"));
+  const segments = orderWeekdaysForDisplay(fieldSegments(ir, "weekday"));
   const allSingles = segments.every(function single(segment) {
     return segment.kind === "single";
   });
@@ -679,7 +700,7 @@ function renderCompactClockTimes(ir, plan, opts) {
     return leadingQualifier(ir, opts) + hourSegmentTimes(ir, plan.minute, ir.analyses.clockSecond, opts);
   }
   const cadence = unevenHourCadence(ir, opts);
-  const phrase = cadence ? minutesList(ir, opts) + ", " + cadence + trailingQualifier(ir, opts) : minutesList(ir, opts) + ", " + hourSegmentTimes(ir, 0, null, opts) + trailingQualifier(ir, opts);
+  const phrase = cadence ? minutesList(ir, opts) + ", " + cadence + trailingQualifier(ir, opts) : minutesList(ir, opts) + ", " + hourContextTimes(ir, opts) + trailingQualifier(ir, opts);
   return ir.analyses.clockSecond ? secondsLeadClause(ir, opts) + ", " + phrase : phrase;
 }
 var renderers = {
@@ -870,6 +891,48 @@ function hourRangeCadence(ir, minute, opts) {
   }
   return hourCadenceLead(ir, minute, opts) + ", " + hourSegmentTimes(ir, 0, null, opts) + trailingQualifier(ir, opts);
 }
+function hourContextTimes(ir, opts) {
+  const segments = hourSegments(ir);
+  const points = [];
+  const hasRange = segments.some(function range(segment) {
+    return segment.kind === "range";
+  });
+  segments.forEach(function collect(segment) {
+    if (segment.kind === "step") {
+      points.push(...segment.fires);
+    } else if (segment.kind === "single") {
+      points.push(+segment.value);
+    }
+  });
+  function isWord(hour) {
+    return !opts.ampm && (hour === 0 || hour === 12);
+  }
+  if (!hasRange && points.every(isWord)) {
+    return joinList(points.map(function each(hour) {
+      return atTime(bareHourPhrase(hour, opts));
+    }));
+  }
+  function wholeHour(hour) {
+    return "de la hora " + fromTime(explicitTimePhrase(hour, 0, opts));
+  }
+  const pieces = [];
+  segments.forEach(function place(segment) {
+    if (segment.kind === "range") {
+      pieces.push(timeRange(
+        { hour: +segment.bounds[0], minute: 0 },
+        { hour: +segment.bounds[1], minute: 0 },
+        opts
+      ));
+    } else if (segment.kind === "step") {
+      segment.fires.forEach(function each(hour) {
+        pieces.push(wholeHour(hour));
+      });
+    } else {
+      pieces.push(wholeHour(+segment.value));
+    }
+  });
+  return joinList(pieces);
+}
 function atTimes(hours, opts) {
   return hours.map(function each(hour) {
     return atTime(timePhrase(hour, 0, null, opts));
@@ -1132,7 +1195,7 @@ function weekdayQualifier(ir) {
   if (quartz) {
     return quartz;
   }
-  const segments = flattenSteps(fieldSegments(ir, "weekday"));
+  const segments = orderWeekdaysForDisplay(fieldSegments(ir, "weekday"));
   const allSingles = segments.every(function single(segment) {
     return segment.kind === "single";
   });

package/dist/lang/fi.cjs

@@ -72,6 +72,26 @@ function arithmeticStep(values) {
   }
   return { start: values[0], interval, last: values[values.length - 1] };
 }
+function weekdayDisplayKey(value) {
+  return value === 0 ? 7 : value;
+}
+function orderWeekdaysForDisplay(segments) {
+  const flattened = segments.flatMap(function flat(segment) {
+    return segment.kind === "step" ? segment.fires.map(function single(value) {
+      return { kind: "single", value: "" + value };
+    }) : [segment];
+  });
+  function key(segment) {
+    return segment.kind === "range" ? weekdayDisplayKey(+segment.bounds[0]) : weekdayDisplayKey(+segment.value);
+  }
+  return flattened.map(function index(segment, position) {
+    return [segment, position];
+  }).sort(function byDisplayKey(a, b) {
+    return key(a[0]) - key(b[0]) || a[1] - b[1];
+  }).map(function unwrap(pair) {
+    return pair[0];
+  });
+}
 function toFieldNumber(token, numberMap) {
   return isNonNegativeInteger(token) ? +token : numberMap[token.toUpperCase()];
 }
@@ -965,7 +985,7 @@ function weekdayQualifier(ir) {
   if (quartz) {
     return quartz;
   }
-  const segments = flattenSteps(ir.analyses.segments.weekday);
+  const segments = orderWeekdaysForDisplay(ir.analyses.segments.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;

package/dist/lang/fi.js

@@ -46,6 +46,26 @@ function arithmeticStep(values) {
   }
   return { start: values[0], interval, last: values[values.length - 1] };
 }
+function weekdayDisplayKey(value) {
+  return value === 0 ? 7 : value;
+}
+function orderWeekdaysForDisplay(segments) {
+  const flattened = segments.flatMap(function flat(segment) {
+    return segment.kind === "step" ? segment.fires.map(function single(value) {
+      return { kind: "single", value: "" + value };
+    }) : [segment];
+  });
+  function key(segment) {
+    return segment.kind === "range" ? weekdayDisplayKey(+segment.bounds[0]) : weekdayDisplayKey(+segment.value);
+  }
+  return flattened.map(function index(segment, position) {
+    return [segment, position];
+  }).sort(function byDisplayKey(a, b) {
+    return key(a[0]) - key(b[0]) || a[1] - b[1];
+  }).map(function unwrap(pair) {
+    return pair[0];
+  });
+}
 function toFieldNumber(token, numberMap) {
   return isNonNegativeInteger(token) ? +token : numberMap[token.toUpperCase()];
 }
@@ -939,7 +959,7 @@ function weekdayQualifier(ir) {
   if (quartz) {
     return quartz;
   }
-  const segments = flattenSteps(ir.analyses.segments.weekday);
+  const segments = orderWeekdaysForDisplay(ir.analyses.segments.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;

package/dist/lang/zh.cjs

@@ -44,6 +44,26 @@ function arithmeticStep(values) {
   }
   return { start: values[0], interval, last: values[values.length - 1] };
 }
+function weekdayDisplayKey(value) {
+  return value === 0 ? 7 : value;
+}
+function orderWeekdaysForDisplay(segments) {
+  const flattened = segments.flatMap(function flat(segment) {
+    return segment.kind === "step" ? segment.fires.map(function single(value) {
+      return { kind: "single", value: "" + value };
+    }) : [segment];
+  });
+  function key(segment) {
+    return segment.kind === "range" ? weekdayDisplayKey(+segment.bounds[0]) : weekdayDisplayKey(+segment.value);
+  }
+  return flattened.map(function index(segment, position) {
+    return [segment, position];
+  }).sort(function byDisplayKey(a, b) {
+    return key(a[0]) - key(b[0]) || a[1] - b[1];
+  }).map(function unwrap(pair) {
+    return pair[0];
+  });
+}
 function toFieldNumber(token, numberMap) {
   return isNonNegativeInteger(token) ? +token : numberMap[token.toUpperCase()];
 }
@@ -384,6 +404,15 @@ function hourCadencePhrase(ir) {
     anchor: ""
   });
 }
+function minuteZeroConfinement(ir, stride, prefix) {
+  if (stride.interval === 2 && stride.start === 0) {
+    return "\u5728\u5076\u6570\u5C0F\u65F60\u5206" + secondTail(ir);
+  }
+  if (prefix.indexOf("\u4ECE") !== -1) {
+    return prefix + "0\u5206" + secondTail(ir);
+  }
+  return null;
+}
 function hourCadence(ir) {
   const stride = hourStride(ir);
   if (!stride) {
@@ -400,7 +429,7 @@ function hourCadence(ir) {
   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;
+    return minuteZeroConfinement(ir, stride, prefix);
   }
   if (minute === 0) {
     return prefix + "0\u5206" + secondTail(ir);
@@ -634,7 +663,7 @@ function quartzDate(token, monthPrefix) {
   if (token.startsWith("L-")) {
     return monthPrefix + "\u6700\u540E\u7B2C" + token.slice(2) + "\u5929";
   }
-  return "\u6700\u63A5\u8FD1" + token.slice(0, -1) + "\u65E5\u7684\u5DE5\u4F5C\u65E5";
+  return monthPrefix + "\u6700\u63A5\u8FD1" + token.slice(0, -1) + "\u65E5\u7684\u5DE5\u4F5C\u65E5";
 }
 function datePhrase(ir) {
   const month = monthPhrase(ir);
@@ -648,7 +677,11 @@ function datePhrase(ir) {
   if (ir.shapes.date === "step") {
     return month + cadence(stepSegment(ir, "date").interval, "\u5929");
   }
-  return month ? month + dayList(ir) : "\u6BCF\u6708" + dayList(ir);
+  if (!month) {
+    return "\u6BCF\u6708" + dayList(ir);
+  }
+  const monthMulti = ir.shapes.month === "range" || ir.shapes.month === "list";
+  return month + (monthMulti ? "\uFF0C" : "") + dayList(ir);
 }
 function dateCore(ir, quartzPrefix) {
   if (ir.shapes.date === "quartz") {
@@ -690,10 +723,8 @@ function weekdayPhrase(ir, orContext, monthPrefix) {
     return "\u6BCF" + weekdayName(from) + "\u81F3" + weekdayName(to);
   }
   const days = [];
-  segs.forEach(function expand(seg) {
-    if (seg.kind === "step") {
-      days.push(...seg.fires);
-    } else if (seg.kind === "single") {
+  orderWeekdaysForDisplay(segs).forEach(function expand(seg) {
+    if (seg.kind === "single") {
       days.push(toFieldNumber(seg.value, weekdayNumbers));
     }
   });

package/dist/lang/zh.js

@@ -18,6 +18,26 @@ function arithmeticStep(values) {
   }
   return { start: values[0], interval, last: values[values.length - 1] };
 }
+function weekdayDisplayKey(value) {
+  return value === 0 ? 7 : value;
+}
+function orderWeekdaysForDisplay(segments) {
+  const flattened = segments.flatMap(function flat(segment) {
+    return segment.kind === "step" ? segment.fires.map(function single(value) {
+      return { kind: "single", value: "" + value };
+    }) : [segment];
+  });
+  function key(segment) {
+    return segment.kind === "range" ? weekdayDisplayKey(+segment.bounds[0]) : weekdayDisplayKey(+segment.value);
+  }
+  return flattened.map(function index(segment, position) {
+    return [segment, position];
+  }).sort(function byDisplayKey(a, b) {
+    return key(a[0]) - key(b[0]) || a[1] - b[1];
+  }).map(function unwrap(pair) {
+    return pair[0];
+  });
+}
 function toFieldNumber(token, numberMap) {
   return isNonNegativeInteger(token) ? +token : numberMap[token.toUpperCase()];
 }
@@ -358,6 +378,15 @@ function hourCadencePhrase(ir) {
     anchor: ""
   });
 }
+function minuteZeroConfinement(ir, stride, prefix) {
+  if (stride.interval === 2 && stride.start === 0) {
+    return "\u5728\u5076\u6570\u5C0F\u65F60\u5206" + secondTail(ir);
+  }
+  if (prefix.indexOf("\u4ECE") !== -1) {
+    return prefix + "0\u5206" + secondTail(ir);
+  }
+  return null;
+}
 function hourCadence(ir) {
   const stride = hourStride(ir);
   if (!stride) {
@@ -374,7 +403,7 @@ function hourCadence(ir) {
   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;
+    return minuteZeroConfinement(ir, stride, prefix);
   }
   if (minute === 0) {
     return prefix + "0\u5206" + secondTail(ir);
@@ -608,7 +637,7 @@ function quartzDate(token, monthPrefix) {
   if (token.startsWith("L-")) {
     return monthPrefix + "\u6700\u540E\u7B2C" + token.slice(2) + "\u5929";
   }
-  return "\u6700\u63A5\u8FD1" + token.slice(0, -1) + "\u65E5\u7684\u5DE5\u4F5C\u65E5";
+  return monthPrefix + "\u6700\u63A5\u8FD1" + token.slice(0, -1) + "\u65E5\u7684\u5DE5\u4F5C\u65E5";
 }
 function datePhrase(ir) {
   const month = monthPhrase(ir);
@@ -622,7 +651,11 @@ function datePhrase(ir) {
   if (ir.shapes.date === "step") {
     return month + cadence(stepSegment(ir, "date").interval, "\u5929");
   }
-  return month ? month + dayList(ir) : "\u6BCF\u6708" + dayList(ir);
+  if (!month) {
+    return "\u6BCF\u6708" + dayList(ir);
+  }
+  const monthMulti = ir.shapes.month === "range" || ir.shapes.month === "list";
+  return month + (monthMulti ? "\uFF0C" : "") + dayList(ir);
 }
 function dateCore(ir, quartzPrefix) {
   if (ir.shapes.date === "quartz") {
@@ -664,10 +697,8 @@ function weekdayPhrase(ir, orContext, monthPrefix) {
     return "\u6BCF" + weekdayName(from) + "\u81F3" + weekdayName(to);
   }
   const days = [];
-  segs.forEach(function expand(seg) {
-    if (seg.kind === "step") {
-      days.push(...seg.fires);
-    } else if (seg.kind === "single") {
+  orderWeekdaysForDisplay(segs).forEach(function expand(seg) {
+    if (seg.kind === "single") {
       days.push(toFieldNumber(seg.value, weekdayNumbers));
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cronli5",
-  "version": "0.1.6",
+  "version": "0.2.0",
   "description": "Cron Like I'm Five: A Cron to English Utility",
   "repository": {
     "type": "git",

package/src/core/ir.ts

@@ -132,6 +132,11 @@ export interface DialectStyle {
   sep: string;
   serialComma: boolean;
   through: string;
+  // Whether a contiguous hour range reads as an up-to-but-not-including
+  // window ("from 9 a.m. until 6 p.m.") rather than a "through <last fire>"
+  // span. Set only on the default English dialect; other dialects and custom
+  // styles keep the "through" span.
+  untilWindow?: boolean;
 }
 
 /**

package/src/core/util.ts

@@ -1,5 +1,7 @@
 // Small shared utilities for the core.
 
+import type {Segment} from './ir.js';
+
 function includes(str: string | number, sub: string): boolean {
   return ('' + str).indexOf(sub) !== -1;
 }
@@ -44,6 +46,54 @@ function arithmeticStep(values: number[]):
   return {start: values[0], interval, last: values[values.length - 1]};
 }
 
+// The display sort key for a canonical weekday number: Monday (1) first,
+// Sunday (0) last. The IR keeps Sunday=0 canonical; this is display-only.
+function weekdayDisplayKey(value: number): number {
+  return value === 0 ? 7 : value;
+}
+
+// A weekday display segment: a single day or a (possibly wrap) range. Steps
+// are flattened away into singles before sorting, so the result is only these
+// two kinds; each renderer turns them into names exactly as it does today.
+type WeekdaySegment =
+  | {kind: 'single'; value: string}
+  | {kind: 'range'; bounds: [string, string]};
+
+// Reorder weekday segments Monday-first (Sunday last) for display, so a weekend
+// list reads "Saturday and Sunday" rather than the canonical Sunday-first
+// "Sunday and Saturday". Display-only: the IR / canonical order is unchanged (a
+// fresh array is returned). A step expands to its fires as singles so the days
+// sort into the list; a range stays one unit and keeps its own bounds order (a
+// wrap range is not reordered into a list), sorting by its opening bound — so a
+// lone range sorts to a one-element list and is unchanged. The sort is stable,
+// so equal opening days keep input order.
+function orderWeekdaysForDisplay(segments: Segment[]): WeekdaySegment[] {
+  const flattened: WeekdaySegment[] = segments.flatMap(function flat(segment) {
+    return segment.kind === 'step' ?
+      segment.fires.map(function single(value): WeekdaySegment {
+        return {kind: 'single', value: '' + value};
+      }) :
+      [segment];
+  });
+
+  function key(segment: WeekdaySegment): number {
+    return segment.kind === 'range' ?
+      weekdayDisplayKey(+segment.bounds[0]) :
+      weekdayDisplayKey(+segment.value);
+  }
+
+  return flattened
+    .map(function index(segment, position): [WeekdaySegment, number] {
+      return [segment, position];
+    })
+    .sort(function byDisplayKey(a, b): number {
+      return key(a[0]) - key(b[0]) || a[1] - b[1];
+    })
+    .map(function unwrap(pair): WeekdaySegment {
+      return pair[0];
+    });
+}
+
 // Resolve a numeric or named field token (e.g. '5' or 'FRI') to its number.
 function toFieldNumber(
   token: string,
@@ -54,5 +104,6 @@ function toFieldNumber(
   return isNonNegativeInteger(token) ? +token : numberMap![token.toUpperCase()];
 }
 export {
-  arithmeticStep, includes, isNonNegativeInteger, toFieldNumber, unique
+  arithmeticStep, includes, isNonNegativeInteger, orderWeekdaysForDisplay,
+  toFieldNumber, unique
 };