chronolizer 0.2.0 → 0.4.0

package/dist/locales/en.mjs

@@ -1,10 +1,9 @@
-import { isIsoDate } from "../ast/schemas.mjs";
 import { BaseLanguageContribution } from "../language/model.mjs";
 import { normalizeNaturalText } from "../natural/text.mjs";
 import { defineLanguagePlugin, languagePluginsLayer } from "../language/registry.mjs";
 import { correctWhitespaceSeparatedText } from "../natural/correction.mjs";
 import { completeNaturalPhrases, fixedCalendarPeriodPhrases, naturalCount, prefixNaturalPhrases } from "../natural/suggestion.mjs";
-import { calendarPeriodOffset, candidate, datedPeriods, datedQuarterPeriods, fixedDatePeriod, fixedMonthPeriod, fixedQuarterPeriod, fixedYearPeriod, fromNowRange, futurePeriod, futureRange, joinedNowCandidate, joinedPeriodCandidate, monthOfRelativeYear, namedDatePeriod, openBoundaryCandidate, parseTrailingCount, periodEndDay, periodRange, periodStartDay, periodToDateRange, periodsFromPhrases, quarterOfRelativeYear, relativePeriod, relativeWeekend, remainingPeriodRange, renderPeriodRange, textAt, trailingPeriod, trailingRange, untilNowRange, validYear } from "./shared.mjs";
+import { absoluteDatePeriod, calendarPeriodOffset, candidate, compileCountAliasNormalizer, compoundCountAliases, countAliasVocabulary, currentYearDatePeriods, datedPeriods, datedQuarterPeriods, decimalTens, decomposeShiftedPeriodRange, fixedMonthPeriod, fixedQuarterPeriod, fixedYearPeriod, fromNowRange, futurePeriod, futureRange, joinedNowCandidate, joinedPeriodCandidate, monthOfRelativeYear, namedCurrentYearDatePeriod, namedDatePeriod, openBoundaryCandidate, parseTrailingCount, periodEndDay, periodPreviousDay, periodRange, periodStartDay, periodToDateRange, periodsFromPhrases, quarterOfRelativeYear, relativePeriod, relativeWeekday, relativeWeekend, remainingPeriodRange, renderPeriodRange, sequentialCountAliases, shiftPeriod, textAt, trailingPeriod, trailingRange, untilNowRange, validYear } from "./shared.mjs";
 import { Effect, Option, String as String$1 } from "effect";
 //#region src/locales/en.ts
 const months = [
@@ -35,12 +34,59 @@ const monthAbbreviations = [
 	["nov"],
 	["dec"]
 ];
+const weekdays = [
+	"monday",
+	"tuesday",
+	"wednesday",
+	"thursday",
+	"friday",
+	"saturday",
+	"sunday"
+];
+const nextWeekdayPhrases = weekdays.map((weekday) => `next ${weekday}`);
 const quarterNames = [
 	"first",
 	"second",
 	"third",
 	"fourth"
 ];
+const englishCountWords = [
+	"one",
+	"two",
+	"three",
+	"four",
+	"five",
+	"six",
+	"seven",
+	"eight",
+	"nine",
+	"ten",
+	"eleven",
+	"twelve",
+	"thirteen",
+	"fourteen",
+	"fifteen",
+	"sixteen",
+	"seventeen",
+	"eighteen",
+	"nineteen",
+	"twenty"
+];
+const englishCountOnes = englishCountWords.slice(0, 9).map((word, index) => [index + 1, word]);
+const englishCountAliases = [...sequentialCountAliases(englishCountWords.map((word) => [word]), 1), ...compoundCountAliases(decimalTens([
+	"twenty",
+	"thirty",
+	"forty",
+	"fifty",
+	"sixty",
+	"seventy",
+	"eighty",
+	"ninety"
+]), englishCountOnes, (ten, one) => [`${ten} ${one}`, `${ten}-${one}`])];
+const normalizeEnglishCounts = compileCountAliasNormalizer(englishCountAliases);
+const englishCountVocabulary = new Set(countAliasVocabulary(englishCountAliases));
+const correctEnglish = (input, vocabulary) => correctWhitespaceSeparatedText(input, vocabulary, englishCountVocabulary);
+const normalizeEnglish = (input, locale) => normalizeEnglishCounts(normalizeNaturalText(input, locale));
 const units = [
 	[
 		"day",
@@ -159,19 +205,25 @@ const parseQuarter = (input) => {
 	const quarter = quarterNumber(textAt(standaloneMatch.value, 1));
 	return quarter === void 0 ? Option.none() : Option.some(quarterOfRelativeYear(quarter, 0, `Q${quarter}`));
 };
+const currentDateLabel = (day, month) => `${day} ${title(textAt(months, month - 1))}`;
 const parseNamedDate = (input) => {
-	const dayFirst = String$1.match(/^([0-3]?\d)(?:st|nd|rd|th)? ([a-z]+\.?) (\d{4})$/u)(input);
+	const dayFirst = String$1.match(/^(?:the )?([0-3]?\d)(?:st|nd|rd|th)?(?: of)? ([a-z]+\.?),? (\d{4})$/u)(input);
 	if (Option.isSome(dayFirst)) return namedDatePeriod(textAt(dayFirst.value, 3), textAt(dayFirst.value, 2), textAt(dayFirst.value, 1), monthNumber, (day, month, year) => `${day} ${title(textAt(months, month - 1))} ${year}`);
-	const monthFirst = String$1.match(/^([a-z]+\.?) ([0-3]?\d)(?:st|nd|rd|th)?,? (\d{4})$/u)(input);
+	const monthFirst = String$1.match(/^([a-z]+\.?) (?:the )?([0-3]?\d)(?:st|nd|rd|th)?,? (\d{4})$/u)(input);
 	if (Option.isSome(monthFirst)) return namedDatePeriod(textAt(monthFirst.value, 3), textAt(monthFirst.value, 1), textAt(monthFirst.value, 2), monthNumber, (day, month, year) => `${day} ${title(textAt(months, month - 1))} ${year}`);
-	return Option.none();
+	const currentDayFirst = String$1.match(/^(?:the )?([0-3]?\d)(?:st|nd|rd|th)?(?: of)? ([a-z]+\.?)$/u)(input);
+	const currentMonthFirst = String$1.match(/^([a-z]+\.?) (?:the )?([0-3]?\d)(?:st|nd|rd|th)?$/u)(input);
+	const current = Option.firstSomeOf([currentDayFirst, currentMonthFirst]);
+	if (Option.isNone(current)) return Option.none();
+	return Option.isSome(currentDayFirst) ? namedCurrentYearDatePeriod(textAt(current.value, 2), textAt(current.value, 1), monthNumber, currentDateLabel) : namedCurrentYearDatePeriod(textAt(current.value, 1), textAt(current.value, 2), monthNumber, currentDateLabel);
 };
-const parseBasePeriod = (input) => {
-	if (isIsoDate(input) && input !== "9999-12-31") return Option.some(fixedDatePeriod(input, input));
-	const namedDate = parseNamedDate(input);
-	if (Option.isSome(namedDate)) return namedDate;
-	const quarter = parseQuarter(input);
-	if (Option.isSome(quarter)) return quarter;
+const parseDatedPeriod = (input) => {
+	const knownPeriod = Option.firstSomeOf([
+		absoluteDatePeriod(input, "en"),
+		parseNamedDate(input),
+		parseQuarter(input)
+	]);
+	if (Option.isSome(knownPeriod)) return knownPeriod;
 	const yearMatch = String$1.match(/^(?:(?:the )?(?:calendar )?year )?(\d{4})$/u)(input);
 	if (Option.isSome(yearMatch)) {
 		const year = validYear(textAt(yearMatch.value, 1));
@@ -183,6 +235,15 @@ const parseBasePeriod = (input) => {
 		const year = validYear(textAt(monthYear.value, 2));
 		if (month !== void 0 && year !== void 0) return Option.some(fixedMonthPeriod(year, month, `${title(textAt(months, month - 1))} ${year}`));
 	}
+	return Option.none();
+};
+const parseRelativeMonth = (input) => {
+	const prefixedRelativeMonth = String$1.match(/^(last|this|next) ([a-z]+\.?)$/u)(input);
+	if (Option.isSome(prefixedRelativeMonth)) {
+		const directionText = textAt(prefixedRelativeMonth.value, 1);
+		const month = monthNumber(textAt(prefixedRelativeMonth.value, 2));
+		if (month !== void 0) return Option.some(monthOfRelativeYear(month, relativeDirection(directionText), `${directionText} ${title(textAt(months, month - 1))}`));
+	}
 	const relativeMonth = String$1.match(/^([a-z]+\.?) (?:of )?(last|this|next) year$/u)(input);
 	if (Option.isSome(relativeMonth)) {
 		const directionText = textAt(relativeMonth.value, 2);
@@ -192,14 +253,9 @@ const parseBasePeriod = (input) => {
 	}
 	const standaloneMonth = monthNumber(input);
 	if (standaloneMonth !== void 0) return Option.some(monthOfRelativeYear(standaloneMonth, 0, title(textAt(months, standaloneMonth - 1))));
-	if (input === "today") return Option.some(relativePeriod("day", 0, "today"));
-	if (input === "yesterday") return Option.some(relativePeriod("day", -1, "yesterday"));
-	if (input === "tomorrow") return Option.some(relativePeriod("day", 1, "tomorrow"));
-	if (input === "weekend" || input === "the weekend" || input === "this weekend") return Option.some(relativeWeekend(0, "this weekend"));
-	if (input === "last weekend" || input === "previous weekend") return Option.some(relativeWeekend(-1, "last weekend"));
-	if (input === "next weekend" || input === "coming weekend") return Option.some(relativeWeekend(1, "next weekend"));
-	if (input === "the weekend before last") return Option.some(relativeWeekend(-2, "the weekend before last"));
-	if (input === "the weekend after next") return Option.some(relativeWeekend(2, "the weekend after next"));
+	return Option.none();
+};
+const parseRelativeUnit = (input) => {
 	const articlePeriod = String$1.match(/^the (day|week|month|quarter|year)$/u)(input);
 	if (Option.isSome(articlePeriod)) {
 		const entry = units.find((unit) => unit[0] === textAt(articlePeriod.value, 1));
@@ -213,7 +269,7 @@ const parseBasePeriod = (input) => {
 			return Option.some(relativePeriod(entry[1], direction, input));
 		}
 	}
-	const relative = String$1.match(/^(?:the )?(last|previous|this|current|next|coming|upcoming) ([a-z]+)$/u)(input);
+	const relative = String$1.match(/^(?:the )?(last|previous|this|current|next|coming|upcoming) (?:calendar )?([a-z]+)$/u)(input);
 	if (Option.isSome(relative)) {
 		const unitText = textAt(relative.value, 2);
 		const unit = units.find((entry) => entry[0] === unitText)?.[1];
@@ -225,17 +281,69 @@ const parseBasePeriod = (input) => {
 	}
 	return Option.none();
 };
-const parsePeriod = (input) => {
+const parseBasePeriod = (input) => {
+	const knownPeriod = Option.firstSomeOf([parseDatedPeriod(input), parseRelativeMonth(input)]);
+	if (Option.isSome(knownPeriod)) return knownPeriod;
+	if (input === "today") return Option.some(relativePeriod("day", 0, "today"));
+	if (input === "yesterday") return Option.some(relativePeriod("day", -1, "yesterday"));
+	if (input === "tomorrow") return Option.some(relativePeriod("day", 1, "tomorrow"));
+	if (input === "weekend" || input === "the weekend" || input === "this weekend") return Option.some(relativeWeekend(0, "this weekend"));
+	if (input === "last weekend" || input === "previous weekend") return Option.some(relativeWeekend(-1, "last weekend"));
+	if (input === "next weekend" || input === "coming weekend") return Option.some(relativeWeekend(1, "next weekend"));
+	if (input === "the weekend before last") return Option.some(relativeWeekend(-2, "the weekend before last"));
+	if (input === "the weekend after next") return Option.some(relativeWeekend(2, "the weekend after next"));
+	const weekday = nextWeekdayPhrases.indexOf(input);
+	if (weekday !== -1) return Option.some(relativeWeekday(weekday, 1, `next ${title(textAt(weekdays, weekday))}`));
+	return parseRelativeUnit(input);
+};
+const parsePeriodEdge = (input) => {
 	const edge = String$1.match(/^(?:the )?(start|beginning|end) of (.+)$/u)(input);
-	if (Option.isSome(edge)) {
-		const period = parseBasePeriod(textAt(edge.value, 2));
-		if (Option.isSome(period)) {
-			const edgeName = textAt(edge.value, 1);
-			const name = edgeName === "beginning" ? "start" : edgeName;
-			const canonical = `${name} of ${period.value.canonical}`;
-			return Option.some(name === "end" ? periodEndDay(period.value, canonical) : periodStartDay(period.value, canonical));
+	if (Option.isNone(edge)) return Option.none();
+	const periodText = textAt(edge.value, 2);
+	const basePeriod = parseBasePeriod(periodText);
+	const implicit = units.find((entry) => entry[0] === periodText);
+	const period = Option.isSome(basePeriod) || implicit === void 0 ? basePeriod : Option.some(relativePeriod(implicit[1], 0, currentPeriod(implicit[0])));
+	if (Option.isNone(period)) return Option.none();
+	const edgeName = textAt(edge.value, 1);
+	const name = edgeName === "beginning" ? "start" : edgeName;
+	const canonical = `${name} of ${period.value.canonical}`;
+	return Option.some(name === "end" ? periodEndDay(period.value, canonical) : periodStartDay(period.value, canonical));
+};
+const parsePeriod = (input) => {
+	const shifted = String$1.match(/^(.+) ([1-9]\d*) (day|days|week|weeks|month|months|quarter|quarters|year|years) (ago|prior|from now)$/u)(input);
+	if (Option.isSome(shifted)) {
+		const amount = parseTrailingCount(textAt(shifted.value, 2));
+		const unitText = textAt(shifted.value, 3);
+		const period = parsePeriod(textAt(shifted.value, 1));
+		if (Option.isSome(amount) && Option.isSome(period)) {
+			const entry = countedUnit(unitText, amount.value);
+			if (entry !== void 0) {
+				const past = textAt(shifted.value, 4) !== "from now";
+				const direction = past ? -amount.value : amount.value;
+				const suffix = past ? "ago" : "from now";
+				const canonical = `${period.value.canonical} ${amount.value} ${unitText} ${suffix}`;
+				return Option.some(shiftPeriod(period.value, direction, entry[1], canonical));
+			}
+		}
+	}
+	const relativeShift = String$1.match(/^([1-9]\d*) (day|days|week|weeks|month|months|quarter|quarters|year|years) (before|after) (.+)$/u)(input);
+	if (Option.isSome(relativeShift)) {
+		const amount = parseTrailingCount(textAt(relativeShift.value, 1));
+		const unitText = textAt(relativeShift.value, 2);
+		const period = parsePeriod(textAt(relativeShift.value, 4));
+		if (Option.isSome(amount) && Option.isSome(period)) {
+			const entry = countedUnit(unitText, amount.value);
+			if (entry !== void 0) {
+				const direction = textAt(relativeShift.value, 3) === "before" ? -amount.value : amount.value;
+				return Option.some(shiftPeriod(period.value, direction, entry[1], input));
+			}
 		}
 	}
+	const previousDay = String$1.match(/^(?:the )?day before (.+)$/u)(input);
+	if (Option.isSome(previousDay)) {
+		const period = parseBasePeriod(textAt(previousDay.value, 1));
+		if (Option.isSome(period)) return Option.some(periodPreviousDay(period.value, `the day before ${period.value.canonical}`));
+	}
 	const wrapper = [
 		"during ",
 		"in ",
@@ -243,10 +351,16 @@ const parsePeriod = (input) => {
 		"all of ",
 		"the whole of "
 	].find((prefix) => input.startsWith(prefix));
-	return parseBasePeriod(wrapper === void 0 ? input : input.slice(wrapper.length));
+	return Option.firstSomeOf([
+		parsePeriodEdge(input),
+		parseBasePeriod(wrapper === void 0 ? input : input.slice(wrapper.length)),
+		parseCalendarOffset(input)
+	]);
 };
 const boundaryCandidate = (input) => openBoundaryCandidate(input, [
 	["up to and including ", "through"],
+	["on or before ", "through"],
+	["on or after ", "since"],
 	["up to including ", "through"],
 	["since the beginning of ", "since"],
 	["since the start of ", "since"],
@@ -263,6 +377,8 @@ const boundaryCandidate = (input) => openBoundaryCandidate(input, [
 	["before start of ", "before"],
 	["starting ", "since"],
 	["through ", "through"],
+	["earlier than ", "before"],
+	["later than ", "after"],
 	["before ", "before"],
 	["since ", "since"],
 	["after ", "after"],
@@ -282,7 +398,7 @@ const parseCalendarOffset = (input) => {
 			const isPast = directionText === "ago" || directionText === "prior";
 			const direction = isPast ? -1 : 1;
 			const canonical = isPast ? `1 ${entry[0]} ago` : `in 1 ${entry[0]}`;
-			return Option.some(candidate(periodRange(relativePeriod(entry[1], direction, canonical)), canonical));
+			return Option.some(relativePeriod(entry[1], direction, canonical));
 		}
 	}
 	const past = String$1.match(/^([1-9]\d*) (day|days|week|weeks|month|months|quarter|quarters|year|years) (?:ago|prior)$/u)(input);
@@ -301,26 +417,51 @@ const parseCalendarOffset = (input) => {
 	if (entry === void 0) return Option.none();
 	const direction = Option.isSome(past) ? -amount.value : amount.value;
 	const canonical = direction < 0 ? `${amount.value} ${unitText} ago` : `in ${amount.value} ${unitText}`;
-	return Option.some(candidate(periodRange(relativePeriod(entry[1], direction, canonical)), canonical));
+	return Option.some(relativePeriod(entry[1], direction, canonical));
 };
 const parseRollingPeriod = (input) => {
 	const past = String$1.match(/^(?:(?:last|previous|past) |(?:in|over) the (?:last|previous|past) )?([1-9]\d*) (day|days|week|weeks|month|months|quarter|quarters|year|years)$/u)(input);
+	const singularPast = String$1.match(/^(?:past|the past|in the past|over the past|this past) (day|week|month|quarter|year)$/u)(input);
 	const future = String$1.match(/^(?:(?:next|coming|within) |(?:in|over|within) the (?:next|coming) )([1-9]\d*) (day|days|week|weeks|month|months|quarter|quarters|year|years)$/u)(input);
-	const match = Option.firstSomeOf([past, future]);
+	const singularFuture = String$1.match(/^(?:in|over|within) the (?:next|coming) (day|week|month|quarter|year)$/u)(input);
+	const match = Option.firstSomeOf([
+		past,
+		singularPast,
+		future,
+		singularFuture
+	]);
 	if (Option.isNone(match)) return Option.none();
-	const amount = parseTrailingCount(textAt(match.value, 1));
+	const singular = Option.isSome(singularPast) || Option.isSome(singularFuture);
+	const amount = parseTrailingCount(singular ? "1" : textAt(match.value, 1));
 	if (Option.isNone(amount)) return Option.none();
-	const entry = countedUnit(textAt(match.value, 2), amount.value);
+	const unitText = textAt(match.value, singular ? 1 : 2);
+	const entry = countedUnit(unitText, amount.value);
 	if (entry === void 0) return Option.none();
-	const isFuture = Option.isSome(future);
+	const isFuture = Option.isSome(future) || Option.isSome(singularFuture);
 	const range = isFuture ? futureRange(amount.value, entry[1]) : trailingRange(amount.value, entry[1]);
+	if (amount.value === 1) {
+		const canonical = isFuture ? `within the next ${entry[0]}` : `past ${entry[0]}`;
+		return Option.some(candidate(range, canonical));
+	}
 	const direction = isFuture ? "next" : "last";
-	const noun = amount.value === 1 ? entry[0] : entry[2];
-	return Option.some(candidate(range, `${direction} ${amount.value} ${noun}`));
+	return Option.some(candidate(range, `${direction} ${amount.value} ${entry[2]}`));
+};
+const parseElidedDateRange = (input) => {
+	const monthFirst = String$1.match(/^([a-z]+\.?) ([0-3]?\d)(?:st|nd|rd|th)?(?: (?:to|through) |[–—-])([0-3]?\d)(?:st|nd|rd|th)?,?(?: (\d{4}))?$/u)(input);
+	const dayFirst = String$1.match(/^([0-3]?\d)(?:st|nd|rd|th)?(?: (?:to|through) |[–—-])([0-3]?\d)(?:st|nd|rd|th)? ([a-z]+\.?)(?: (\d{4}))?$/u)(input);
+	const match = Option.firstSomeOf([monthFirst, dayFirst]);
+	if (Option.isNone(match)) return Option.none();
+	const isMonthFirst = Option.isSome(monthFirst);
+	const month = textAt(match.value, isMonthFirst ? 1 : 3);
+	const lowerDay = textAt(match.value, isMonthFirst ? 2 : 1);
+	const upperDay = textAt(match.value, isMonthFirst ? 3 : 2);
+	const year = textAt(match.value, 4);
+	const suffix = year.length === 0 ? "" : ` ${year}`;
+	return joinedPeriodCandidate(`from ${lowerDay} ${month}${suffix} to ${upperDay} ${month}${suffix}`, [["from ", " to "]], parsePeriod, (lower, upper) => `from ${lower} to ${upper}`);
 };
 const parseEnglish = (input) => {
 	const remaining = remainingPeriodPhrases.find((entry) => entry.phrase === input);
-	if (remaining !== void 0) return Option.some(candidate(remainingPeriodRange(remaining.entry[1]), `rest of ${remaining.entry[0]}`));
+	if (remaining !== void 0) return Option.some(candidate(remainingPeriodRange(remaining.entry[1]), `rest of the ${remaining.entry[0]}`));
 	if ([
 		"until now",
 		"till now",
@@ -332,22 +473,24 @@ const parseEnglish = (input) => {
 		"from now on",
 		"starting now"
 	].includes(input)) return Option.some(candidate(fromNowRange(), "from now"));
-	const offset = parseCalendarOffset(input);
-	if (Option.isSome(offset)) return offset;
 	const rolling = parseRollingPeriod(input);
 	if (Option.isSome(rolling)) return rolling;
 	const toDate = toDatePhrases.find((entry) => entry.phrase === input);
 	if (toDate !== void 0) return Option.some(candidate(periodToDateRange(toDate.entry[1]), `${toDate.entry[0]} to date`));
+	const elided = parseElidedDateRange(input);
+	if (Option.isSome(elided)) return elided;
 	const nowBounded = joinedNowCandidate(input, [
 		["from ", " to now"],
 		["from ", " until now"],
 		["from ", " through now"],
+		["from ", " to date"],
 		["between ", " and now"]
 	], [
 		"from now to ",
 		"from now until ",
 		"from now through ",
-		"between now and "
+		"between now and ",
+		"now to "
 	], parsePeriod, (period) => `from ${period} to now`, (period) => `from now to ${period}`);
 	if (Option.isSome(nowBounded)) return nowBounded;
 	const bounded = joinedPeriodCandidate(input, [
@@ -380,18 +523,19 @@ const parseEnglish = (input) => {
 	if (Option.isSome(bounded)) return bounded;
 	const boundary = boundaryCandidate(input);
 	if (Option.isSome(boundary)) return boundary;
-	return Option.map(parsePeriod(input), (period) => candidate(periodRange(period), period.canonical));
+	return parsePeriod(input).pipe(Option.map((period) => candidate(periodRange(period), period.canonical)));
 };
 const staticPeriodPhrases = [
 	"today",
 	"yesterday",
+	"the day before yesterday",
 	"tomorrow",
 	"this weekend",
 	"last weekend",
 	"next weekend",
 	"the weekend before last",
 	"the weekend after next",
-	...units.flatMap((entry) => [
+	...units.filter((entry) => entry[1] !== "day").flatMap((entry) => [
 		`this ${entry[0]}`,
 		`last ${entry[0]}`,
 		`next ${entry[0]}`,
@@ -414,9 +558,12 @@ const staticPeriodPhrases = [
 	]),
 	...months.flatMap((month) => [
 		month,
+		`last ${month}`,
+		`next ${month}`,
 		`${month} of last year`,
 		`${month} of next year`
-	])
+	]),
+	...nextWeekdayPhrases
 ];
 const staticPeriods = periodsFromPhrases(staticPeriodPhrases, parsePeriod);
 const boundaryPrefixes = [
@@ -441,7 +588,8 @@ const countedSuggestions = (input) => {
 };
 const englishSuggestionPhrases = [
 	...units.map((entry) => `${entry[0]} to date`),
-	...units.map((entry) => `rest of ${entry[0]}`),
+	...remainingPeriodPhrases.map((entry) => entry.phrase),
+	...units.flatMap((entry) => [`past ${entry[0]}`, `within the next ${entry[0]}`]),
 	...staticPeriodPhrases,
 	...prefixNaturalPhrases(staticPeriodPhrases, boundaryPrefixes),
 	"until now",
@@ -457,6 +605,17 @@ const suggestEnglish = (input, limit) => {
 	], limit);
 };
 const renderEnglish = (range) => {
+	const shifted = decomposeShiftedPeriodRange(range);
+	if (Option.isSome(shifted)) {
+		const base = renderEnglish(shifted.value.baseRange);
+		const entry = units.find((unit) => unit[1] === shifted.value.unit);
+		if (Option.isSome(base) && entry !== void 0) {
+			const amount = Math.abs(shifted.value.amount);
+			const noun = amount === 1 ? entry[0] : entry[2];
+			const suffix = shifted.value.amount < 0 ? "ago" : "from now";
+			return Option.some(`${base.value} ${amount} ${noun} ${suffix}`);
+		}
+	}
 	const offset = calendarPeriodOffset(range);
 	if (Option.isSome(offset) && Math.abs(offset.value.amount) > 1) {
 		const entry = units.find((unit) => unit[1] === offset.value.unit);
@@ -468,20 +627,25 @@ const renderEnglish = (range) => {
 	const future = futurePeriod(range);
 	if (Option.isSome(future)) {
 		const entry = units.find((unit) => unit[1] === future.value.unit);
-		if (entry !== void 0) return Option.some(`next ${future.value.amount} ${future.value.amount === 1 ? entry[0] : entry[2]}`);
+		if (entry !== void 0) return Option.some(future.value.amount === 1 ? `within the next ${entry[0]}` : `next ${future.value.amount} ${entry[2]}`);
 	}
 	const trailing = trailingPeriod(range);
 	if (Option.isSome(trailing)) {
 		const entry = units.find((unit) => unit[1] === trailing.value.unit);
-		if (entry !== void 0) return Option.some(trailing.value.amount === 1 ? `1 ${entry[0]}` : `last ${trailing.value.amount} ${entry[2]}`);
+		if (entry !== void 0) return Option.some(trailing.value.amount === 1 ? `past ${entry[0]}` : `last ${trailing.value.amount} ${entry[2]}`);
 	}
-	const periods = [...staticPeriods, ...periodsFromPhrases([...datedPeriods(range, months), ...datedQuarterPeriods(range)], parsePeriod)];
-	return renderPeriodRange(range, [...units.map((entry) => candidate(periodToDateRange(entry[1]), `${entry[0]} to date`)), ...units.map((entry) => candidate(remainingPeriodRange(entry[1]), `rest of ${entry[0]}`))], periods, (period) => `since ${period}`, (period) => `before ${period}`, (period) => `through ${period}`, (period) => `after ${period}`, (lower, upper) => `from ${lower} to ${upper}`, (period) => `from ${period} to now`, (period) => `from now to ${period}`, () => "until now", () => "from now");
+	const periods = [
+		...staticPeriods,
+		...currentYearDatePeriods(range, currentDateLabel),
+		...periodsFromPhrases([...datedPeriods(range, months), ...datedQuarterPeriods(range)], parsePeriod)
+	];
+	return renderPeriodRange(range, [...units.map((entry) => candidate(periodToDateRange(entry[1]), `${entry[0]} to date`)), ...units.map((entry) => candidate(remainingPeriodRange(entry[1]), `rest of the ${entry[0]}`))], periods, (period) => `since ${period}`, (period) => `before ${period}`, (period) => `through ${period}`, (period) => `after ${period}`, (lower, upper) => `from ${lower} to ${upper}`, (period) => `from ${period} to now`, (period) => `from now to ${period}`, () => "until now", () => "from now");
 };
 const EnglishContribution = new BaseLanguageContribution({
 	locale: "en",
 	vocabulary: [
 		...months,
+		...weekdays,
 		...quarterNames,
 		"q1",
 		"q2",
@@ -535,8 +699,8 @@ const EnglishContribution = new BaseLanguageContribution({
 		"weekend",
 		"yesterday"
 	],
-	normalize: normalizeNaturalText,
-	correct: correctWhitespaceSeparatedText,
+	normalize: normalizeEnglish,
+	correct: correctEnglish,
 	parseExact: parseEnglish,
 	suggest: suggestEnglish,
 	render: renderEnglish