cronli5 0.2.0 → 0.2.1

package/dist/lang/es.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/es/dialects.ts
 var es = {
@@ -95,15 +137,6 @@ function resolveDialect(dialect) {
 }
 
 // src/lang/es/index.ts
-function stepSegment(segments) {
-  return segments[0];
-}
-function hourSegments(ir) {
-  return ir.analyses.segments.hour;
-}
-function fieldSegments(ir, field) {
-  return ir.analyses.segments[field];
-}
 var numeros = [
   "cero",
   "uno",
@@ -189,8 +222,8 @@ function secondsListAtClock(ir, rest, opts) {
   });
   const grouped = groupClockTimesByArticle(clockPhrases);
   const clockList = grouped.startsWith("a ") ? grouped.slice(2) : grouped;
-  const stride = strideFromSegments(fieldSegments(ir, "second"), "segundo", "", opts);
-  const secondsPhrase = stride ?? "en los segundos " + joinList(segmentWords(fieldSegments(ir, "second")));
+  const stride = strideFromSegments(segmentsOf(ir, "second"), "segundo", "", opts);
+  const secondsPhrase = stride ?? "en los segundos " + joinList(segmentWords(segmentsOf(ir, "second")));
   const dayFrame = trailingQualifier(ir, opts);
   return (dayFrame ? dayFrame.trimStart() + ", " : "") + secondsPhrase + " de " + clockList;
 }
@@ -220,7 +253,7 @@ function renderComposeSeconds(ir, plan, opts) {
     const restNode = plan.rest;
     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;
+    const cadence = "cada " + numero(stepSegment(ir, "second").interval, opts) + " segundos del minuto " + ir.pattern.minute;
     return dayFrame + ", " + window + ", " + cadence;
   }
   if (isEveryOtherMinuteSeconds(ir, plan)) {
@@ -234,7 +267,7 @@ function isEveryOtherMinuteSeconds(ir, plan) {
   if (plan.rest.kind !== "minuteFrequency" || ir.shapes.second !== "wildcard" || ir.shapes.hour !== "wildcard") {
     return false;
   }
-  const minuteStep = stepSegment(ir.analyses.segments.minute);
+  const minuteStep = stepSegment(ir, "minute");
   return minuteStep.startToken === "*" && minuteStep.interval === 2;
 }
 function pinnedMinuteSeconds(ir, rest, opts) {
@@ -256,7 +289,7 @@ function secondsClause(ir, anchor, opts) {
   }
   if (shape === "step") {
     return stepCycle60(
-      stepSegment(ir.analyses.segments.second),
+      stepSegment(ir, "second"),
       "segundo",
       anchor,
       opts
@@ -270,11 +303,11 @@ function secondsClause(ir, anchor, opts) {
     return "en el segundo " + secondField + " de cada " + anchor;
   }
   return strideFromSegments(
-    fieldSegments(ir, "second"),
+    segmentsOf(ir, "second"),
     "segundo",
     anchor,
     opts
-  ) ?? "en los segundos " + joinList(segmentWords(fieldSegments(ir, "second"))) + " de cada " + anchor;
+  ) ?? "en los segundos " + joinList(segmentWords(segmentsOf(ir, "second"))) + " de cada " + anchor;
 }
 function renderEveryMinute(ir, plan, opts) {
   return "cada minuto" + trailingQualifier(ir, opts);
@@ -290,11 +323,11 @@ function renderMultipleMinutes(ir, plan, opts) {
 }
 function minutesList(ir, opts) {
   return strideFromSegments(
-    fieldSegments(ir, "minute"),
+    segmentsOf(ir, "minute"),
     "minuto",
     "hora",
     opts
-  ) ?? "en los minutos " + joinList(segmentWords(fieldSegments(ir, "minute"))) + " de cada hora";
+  ) ?? "en los minutos " + joinList(segmentWords(segmentsOf(ir, "minute"))) + " de cada hora";
 }
 function minuteRangeLead(minuteField) {
   const bounds = minuteField.split("-");
@@ -351,7 +384,7 @@ function spanHours(hours) {
 }
 function renderMinuteFrequency(ir, plan, opts) {
   let phrase = stepCycle60(
-    stepSegment(ir.analyses.segments.minute),
+    stepSegment(ir, "minute"),
     "minuto",
     "hora",
     opts
@@ -361,12 +394,12 @@ function renderMinuteFrequency(ir, plan, opts) {
     if (cadence) {
       phrase += ", " + cadence;
     } else {
-      phrase += singleHourStep(ir.analyses.segments.hour) ? ", " + stepHourSpan(stepSegment(ir.analyses.segments.hour), opts) : " " + hourSpanFromTimes(ir, plan.hours.times, opts);
+      phrase += singleHourStep(ir.analyses.segments.hour) ? ", " + stepHourSpan(stepSegment(ir, "hour"), opts) : " " + hourSpanFromTimes(ir, plan.hours.times, opts);
     }
   } else if (plan.hours.kind === "window") {
     phrase += " " + hourWindow(plan.hours, opts);
   } else if (plan.hours.kind === "step") {
-    phrase += ", " + stepHourSpan(stepSegment(ir.analyses.segments.hour), opts);
+    phrase += ", " + stepHourSpan(stepSegment(ir, "hour"), opts);
   }
   return phrase + trailingQualifier(ir, opts);
 }
@@ -387,7 +420,7 @@ function renderMinutesAcrossHours(ir, plan, opts) {
       return "cada minuto, " + cadence + trailingQualifier(ir, opts);
     }
     if (singleHourStep(ir.analyses.segments.hour)) {
-      return "cada minuto, " + stepHourSpan(stepSegment(ir.analyses.segments.hour), opts) + trailingQualifier(ir, opts);
+      return "cada minuto, " + stepHourSpan(stepSegment(ir, "hour"), opts) + trailingQualifier(ir, opts);
     }
     return "cada minuto " + hourSpanFromTimes(ir, plan.times, opts) + trailingQualifier(ir, opts);
   }
@@ -398,7 +431,7 @@ function renderMinutesAcrossHours(ir, plan, opts) {
   return lead + ", " + atHourTimes(ir, plan.times, 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 "cada minuto, " + stepHourSpan(segment, opts) + trailingQualifier(ir, opts);
@@ -428,7 +461,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) {
   const last = plan.minuteForm === "wildcard" ? plan.boundMinute ?? 0 : 0;
@@ -449,7 +482,7 @@ function unionMonthLeadFull(ir) {
     return "";
   }
   const lead = monthPhrase(ir, monthRanged(ir) ? "de " : "en ");
-  const segments = flattenSteps(fieldSegments(ir, "month"));
+  const segments = flattenSteps(segmentsOf(ir, "month"));
   const isEnumeration = !monthRanged(ir) && segments.length >= 2;
   return isEnumeration ? lead + "," : lead;
 }
@@ -462,7 +495,7 @@ function domArm(ir, opts) {
   if (isOpenStep(date)) {
     return stepDates(date, opts);
   }
-  const segments = fieldSegments(ir, "date");
+  const segments = segmentsOf(ir, "date");
   if (segments.length === 1 && segments[0].kind === "range") {
     return "del " + segments[0].bounds[0] + " al " + segments[0].bounds[1] + " del mes";
   }
@@ -476,7 +509,7 @@ function dowArm(ir) {
   if (quartz) {
     return quartz;
   }
-  const segments = orderWeekdaysForDisplay(fieldSegments(ir, "weekday"));
+  const segments = orderWeekdaysForDisplay(segmentsOf(ir, "weekday"));
   const allSingles = segments.every(function single(segment) {
     return segment.kind === "single";
   });
@@ -691,7 +724,7 @@ function renderCompactClockTimes(ir, plan, opts) {
     if (cadence2 !== null) {
       return cadence2;
     }
-    const ranged = hourSegments(ir).some(function range(segment) {
+    const ranged = segmentsOf(ir, "hour").some(function range(segment) {
       return segment.kind === "range";
     });
     if (ranged && !ir.analyses.clockSecond) {
@@ -758,16 +791,6 @@ function strideFromSegments(segments, unit, anchor, opts) {
   const step = values && arithmeticStep(values);
   return step ? renderStride({ ...step, cycle: 60, unit, anchor }, 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 stepHours(segment, opts) {
   if (segment.startToken.indexOf("-") !== -1) {
     return groupClockTimesByArticle(atTimes(segment.fires, opts));
@@ -794,9 +817,6 @@ function hourStrideCadence(stride, opts) {
   }
   return cadence + " de " + timePhrase(start, 0, null, opts) + " a " + timePhrase(last, 0, null, opts);
 }
-function offsetCleanStride(stride) {
-  return stride.start < stride.interval && 24 % stride.interval === 0;
-}
 function unevenHourCadence(ir, opts) {
   const stride = hourStride(ir);
   if (!stride || offsetCleanStride(stride)) {
@@ -804,26 +824,8 @@ function unevenHourCadence(ir, opts) {
   }
   return hourStrideCadence(stride, 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 hourStride(ir) {
-  const segments = fieldSegments(ir, "hour");
+  const segments = segmentsOf(ir, "hour");
   if (segments.length === 1 && segments[0].kind === "step") {
     const segment = segments[0];
     if (segment.fires.length < 2) {
@@ -870,7 +872,7 @@ function hourCadence(ir, minute, opts) {
   return hourCadenceLead(ir, minute, opts) + ", " + hourStrideCadence(stride, opts) + trailingQualifier(ir, opts);
 }
 function cleanStrideSegment(ir) {
-  const segments = fieldSegments(ir, "hour");
+  const segments = segmentsOf(ir, "hour");
   const segment = segments.length === 1 && segments[0];
   if (!segment || segment.kind !== "step" || segment.startToken.indexOf("-") !== -1) {
     return null;
@@ -878,7 +880,7 @@ function cleanStrideSegment(ir) {
   return segment;
 }
 function hasHourWindow(ir) {
-  return hourSegments(ir).some(function range(segment) {
+  return segmentsOf(ir, "hour").some(function range(segment) {
     return segment.kind === "range";
   });
 }
@@ -892,7 +894,7 @@ 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 segments = segmentsOf(ir, "hour");
   const points = [];
   const hasRange = segments.some(function range(segment) {
     return segment.kind === "range";
@@ -956,7 +958,7 @@ function hourWindowsFromTimes(ir, times, opts) {
       return hourAsWindow(hour, opts);
     }));
   }
-  return joinList(hourSegments(ir).map(function window(segment) {
+  return joinList(segmentsOf(ir, "hour").map(function window(segment) {
     if (segment.kind === "range") {
       return timeRange(
         { hour: +segment.bounds[0], minute: 0 },
@@ -975,7 +977,7 @@ function hourWindowsFromTimes(ir, times, opts) {
 function hourSegmentTimes(ir, minute, second, opts) {
   const pieces = [];
   const fromRange = [];
-  hourSegments(ir).forEach(function clock(segment) {
+  segmentsOf(ir, "hour").forEach(function clock(segment) {
     if (segment.kind === "step") {
       segment.fires.forEach(function each(hour) {
         pieces.push(atTime(timePhrase(hour, minute, second, opts)));
@@ -1135,7 +1137,7 @@ function dateClause(ir, monthPart, opts) {
   if (isOpenStep(pattern.date)) {
     return stepDates(pattern.date, opts);
   }
-  const segments = fieldSegments(ir, "date");
+  const segments = segmentsOf(ir, "date");
   if (segments.length === 1 && segments[0].kind === "range") {
     return "del " + segments[0].bounds[0] + " al " + segments[0].bounds[1] + monthPart + foldedYear(ir);
   }
@@ -1145,7 +1147,7 @@ function dateClause(ir, monthPart, opts) {
   return "los d\xEDas " + joinList(segmentWords(segments)) + monthPart + foldedYear(ir);
 }
 function monthRanged(ir) {
-  return ir.pattern.month !== "*" && fieldSegments(ir, "month").some(function range(segment) {
+  return ir.pattern.month !== "*" && segmentsOf(ir, "month").some(function range(segment) {
     return segment.kind === "range";
   });
 }
@@ -1195,7 +1197,7 @@ function weekdayQualifier(ir) {
   if (quartz) {
     return quartz;
   }
-  const segments = orderWeekdaysForDisplay(fieldSegments(ir, "weekday"));
+  const segments = orderWeekdaysForDisplay(segmentsOf(ir, "weekday"));
   const allSingles = segments.every(function single(segment) {
     return segment.kind === "single";
   });
@@ -1222,7 +1224,7 @@ function flattenSteps(segments) {
   });
 }
 function monthPhrase(ir, lead) {
-  const segments = flattenSteps(fieldSegments(ir, "month"));
+  const segments = flattenSteps(segmentsOf(ir, "month"));
   const ranged = segments.some(function range(segment) {
     return segment.kind === "range";
   });
@@ -1319,9 +1321,6 @@ function pluralWeekday(token) {
 function monthName(token) {
   return monthNames[+token];
 }
-function isOpenStep(field) {
-  return field.indexOf("/") !== -1 && field.indexOf("-") === -1 && field.indexOf(",") === -1;
-}
 var es2 = {
   describe,
   fallback: "un patr\xF3n cron irreconocible",

package/dist/lang/fi.cjs

@@ -95,6 +95,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 = {
@@ -113,9 +155,6 @@ function resolveDialect(dialect) {
 }
 
 // src/lang/fi/index.ts
-function stepSegment(segments) {
-  return segments[0];
-}
 var genitives = [
   null,
   "yhden",
@@ -291,7 +330,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);
@@ -303,7 +342,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);
 }
@@ -337,7 +376,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) {
@@ -359,7 +398,7 @@ function secondsLeadClause(ir, opts) {
   }
   if (shape === "step") {
     return stepCycle60(
-      stepSegment(ir.analyses.segments.second),
+      stepSegment(ir, "second"),
       units.second,
       opts
     );
@@ -368,8 +407,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
   );
@@ -387,15 +426,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
   );
@@ -426,15 +465,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 },
@@ -448,7 +487,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) {
@@ -464,7 +503,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);
 }
@@ -486,14 +525,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);
@@ -578,7 +617,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 };
@@ -614,7 +653,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(
@@ -675,16 +714,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);
@@ -728,27 +757,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) {
@@ -797,8 +805,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);
   }
@@ -821,7 +829,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") {
@@ -849,7 +857,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";
   })) {
@@ -889,7 +897,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);
@@ -985,7 +993,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;
@@ -994,7 +1002,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";
@@ -1044,7 +1052,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";
@@ -1054,12 +1062,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] + "."];
@@ -1161,9 +1169,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;