cronli5 0.1.0 → 0.1.2

package/src/lang/fi/index.ts

@@ -62,7 +62,6 @@ interface UnitForms {
   anchor: string;
   ela: string;
   gen: string;
-  restart: string;
 }
 
 // Genitive numerals for the "N <unit>in välein" construction, spelled
@@ -179,15 +178,13 @@ const units: {minute: UnitForms; second: UnitForms} = {
     mark: 'joka tunti',
     anchor: 'jokaisen tunnin',
     ela: 'minuutista',
-    gen: 'minuutin',
-    restart: 'tasatunnista alkaen'
+    gen: 'minuutin'
   },
   second: {
     mark: 'joka minuutti',
     anchor: 'jokaisen minuutin',
     ela: 'sekunnista',
-    gen: 'sekunnin',
-    restart: 'joka minuutti'
+    gen: 'sekunnin'
   }
 };
 
@@ -686,7 +683,7 @@ function renderHourRange(
   plan: Extract<PlanNode, {kind: 'hourRange'}>,
   opts: NormalizedOptions
 ): string {
-  const window = hourWindow(plan, opts);
+  const window = hourWindow(boundedWindow(plan), opts);
 
   if (plan.minuteForm === 'wildcard') {
     return 'joka minuutti ' + window + trailingQualifier(ir, opts);
@@ -726,6 +723,16 @@ function renderHourStep(
     trailingQualifier(ir, opts);
 }
 
+// The hour-range plan as a window whose closing minute honors `boundMinute`:
+// a bare close (`null`) lands on the top of the final hour (minute 0), so
+// `kloRange` renders the bare "klo 9–17" form, with the minutes stated
+// separately; a single fire or wildcard names an exact closing minute.
+function boundedWindow(
+  plan: Extract<PlanNode, {kind: 'hourRange'}>
+): HourWindow {
+  return {from: plan.from, last: plan.boundMinute ?? 0, to: plan.to};
+}
+
 // "klo 9.00–17.45": a window from the top of the first hour to the
 // minute field's last fire within the final hour.
 function hourWindow(window: HourWindow, opts: NormalizedOptions): string {
@@ -848,15 +855,9 @@ function stepCycle60(
       ' alkaen';
   }
 
-  if (60 % interval === 0) {
-    return cadence;
-  }
-
-  if (segment.fires.length <= 2) {
-    return atMarks(joinList(wordList(segment.fires)), unit, true);
-  }
-
-  return cadence + ' ' + unit.restart;
+  // A clean stride from the top of the cycle is the bare cadence. (An uneven
+  // stride is rewritten to its fires upstream and never reaches here.)
+  return cadence;
 }
 
 // "kahden tunnin välein", "klo 0, 10 ja 20", or "viiden tunnin välein
@@ -870,7 +871,9 @@ function stepHours(segment: StepSegment, opts: NormalizedOptions): string {
   const interval = segment.interval;
   const cadence = genitive(interval, opts) + ' tunnin välein';
 
-  if (start === 0 && 24 % interval === 0) {
+  // A clean stride from midnight is the bare cadence. (An uneven stride is
+  // rewritten to its fires upstream and never reaches here.)
+  if (start === 0) {
     return cadence;
   }
 
@@ -878,10 +881,6 @@ function stepHours(segment: StepSegment, opts: NormalizedOptions): string {
     return kloList(segment.fires, opts);
   }
 
-  if (start === 0) {
-    return cadence + ' keskiyöstä alkaen';
-  }
-
   return cadence + ' klo ' + hourElatives[start] + ' alkaen';
 }
 

package/src/lang/zh/index.ts

@@ -217,7 +217,12 @@ function hourFrame(ir: IR): string {
 
 // A repeating minute step, optionally confined to active hours.
 function renderMinuteFrequency(ir: IR, plan: PlanNode): string {
-  const base = cadence(stepSegment(ir, 'minute').interval, UNITS.minute);
+  const minuteStep = stepSegment(ir, 'minute');
+  // A "每N分钟" cadence is only faithful from the top of the hour; an offset
+  // step (5/6 fires at :05,:11,…) enumerates its fires instead.
+  const base = minuteStep.startToken === '*' ?
+    cadence(minuteStep.interval, UNITS.minute) :
+    renderMinutePast(ir);
   const {hours} = plan as Extract<PlanNode, {kind: 'minuteFrequency'}>;
 
   if (hours.kind === 'step') {
@@ -323,8 +328,9 @@ function renderHourRange(ir: IR, plan: PlanNode): string {
     range.last + '分之间，每分钟';
 }
 
-// A stepped hour field: "每2小时", or "从凌晨0点起，每5小时" when the step does not
-// divide 24 (the cadence wraps), or its discrete fires as clock words.
+// A stepped hour field: "每2小时", or its two fires as clock words when the
+// stride fires only twice. An uneven stride (one that does not divide 24) is
+// rewritten to its fire list upstream and never reaches here.
 function renderHourStep(ir: IR): string {
   const segment = stepSegment(ir, 'hour');
 
@@ -332,16 +338,11 @@ function renderHourStep(ir: IR): string {
     return hourList(ir);
   }
 
-  // A step that fires only twice reads as two clock times ("凌晨0点和13点").
+  // A step that fires only twice reads as two clock times ("凌晨0点和正午").
   if (segment.fires.length <= 2) {
     return joinAnd(segment.fires.map(hourWord));
   }
 
-  if (24 % segment.interval !== 0) {
-    return '从' + hourWord(segment.fires[0]) + '起，' +
-      cadence(segment.interval, UNITS.hour);
-  }
-
   return cadence(segment.interval, UNITS.hour);
 }
 
@@ -423,19 +424,17 @@ function composeSecondsOnHour(ir: IR, plan: PlanNode, opts: Opts): string {
   const {rest} = plan as Extract<PlanNode, {kind: 'composeSeconds'}>;
   const restText = render(ir, rest, opts);
 
-  if (rest.kind === 'everyHour') {
-    return sec + '，每小时';
-  }
-
-  if (rest.kind === 'hourStep') {
-    return sec + '，' + restText;
-  }
-
   if ((rest.kind === 'clockTimes' || rest.kind === 'compactClockTimes') &&
     isDaily(ir)) {
     return '每天' + restText + sec;
   }
 
+  // A stated minute (e.g. minute 0 under a sub-minute second) takes the same
+  // "，" connector the listed-minute path uses.
+  if (rest.kind === 'singleMinute') {
+    return restText + '，' + sec;
+  }
+
   return restText + sec;
 }
 
@@ -460,10 +459,12 @@ function composeSecondsCadence(ir: IR): string {
 }
 
 // Listed/ranged minute: "每小时<minutes>，每秒", confined by any hour frame.
+// A minute list or range under an hour range closes on the bare hour frame
+// ("在9点至17点之间"), stating its minutes separately, rather than gluing its
+// last fire onto the window end ("…17点30分") and reading as a continuous span.
 function composeSecondsListed(ir: IR): string {
   const sec = secondClause(ir);
   const minutes = '每小时' + valueList(fieldSegments(ir, 'minute'), '分');
-  const minuteSegs = fieldSegments(ir, 'minute');
 
   if (ir.shapes.hour === 'wildcard') {
     return minutes + '，' + sec;
@@ -474,16 +475,6 @@ function composeSecondsListed(ir: IR): string {
       minutes + '，' + sec;
   }
 
-  // A minute range under an hour range folds into the window end ("…17点30分").
-  if (ir.shapes.hour === 'range' && minuteSegs.length === 1 &&
-    minuteSegs[0].kind === 'range') {
-    const [from, to] = (fieldSegments(ir, 'hour')[0] as
-      Extract<Segment, {kind: 'range'}>).bounds;
-
-    return '在' + hourWord(+from) + '至' + to + '点' +
-      minuteSegs[0].bounds[1] + '分之间，' + sec;
-  }
-
   return hourFrame(ir) + minutes + '，' + sec;
 }
 

package/types/core/ir.d.ts

@@ -101,6 +101,7 @@ export type PlanNode = {
     from: number;
     to: number;
     last: number;
+    boundMinute: number | null;
     minuteForm: 'lead' | 'wildcard' | 'range';
 } | {
     kind: 'hourStep';