cronli5 0.1.5 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cronli5",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Cron Like I'm Five: A Cron to English Utility",
   "repository": {
     "type": "git",
@@ -70,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/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
 };