chronolizer 0.3.0 → 0.4.0

package/dist/locales/de.mjs

@@ -4,7 +4,7 @@ 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 { absoluteDatePeriod, calendarPeriodOffset, candidate, currentYearDatePeriods, datedPeriods, datedQuarterPeriods, fixedDatePeriod, fixedMonthPeriod, fixedQuarterPeriod, fixedYearPeriod, fromNowRange, futurePeriod, futureRange, isoDate, joinedNowCandidate, joinedPeriodCandidate, monthOfRelativeYear, namedCurrentYearDatePeriod, namedDatePeriod, openBoundaryCandidate, parseTrailingCount, periodBoundaryCandidate, 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, fixedDatePeriod, fixedMonthPeriod, fixedQuarterPeriod, fixedYearPeriod, fromNowRange, futurePeriod, futureRange, isoDate, joinedNowCandidate, joinedPeriodCandidate, monthOfRelativeYear, namedCurrentYearDatePeriod, namedDatePeriod, openBoundaryCandidate, parseTrailingCount, periodBoundaryCandidate, periodEndDay, 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/de.ts
 const months = [
@@ -21,6 +21,42 @@ const months = [
 	"november",
 	"dezember"
 ];
+const germanCountWords = [
+	"zwei",
+	"drei",
+	"vier",
+	"fünf",
+	"sechs",
+	"sieben",
+	"acht",
+	"neun",
+	"zehn",
+	"elf",
+	"zwölf",
+	"dreizehn",
+	"vierzehn",
+	"fünfzehn",
+	"sechzehn",
+	"siebzehn",
+	"achtzehn",
+	"neunzehn",
+	"zwanzig"
+];
+const germanCountOnes = [[1, "ein"], ...germanCountWords.slice(0, 8).map((word, index) => [index + 2, word])];
+const germanCountAliases = [...sequentialCountAliases(germanCountWords.map((word) => [word]), 2), ...compoundCountAliases(decimalTens([
+	"zwanzig",
+	"dreißig",
+	"vierzig",
+	"fünfzig",
+	"sechzig",
+	"siebzig",
+	"achtzig",
+	"neunzig"
+]), germanCountOnes, (ten, one) => [`${one}und${ten}`])];
+const normalizeGermanCounts = compileCountAliasNormalizer(germanCountAliases);
+const germanCountVocabulary = new Set(countAliasVocabulary(germanCountAliases));
+const correctGerman = (input, vocabulary) => correctWhitespaceSeparatedText(input, vocabulary, germanCountVocabulary);
+const normalizeGerman = (input, locale) => normalizeGermanCounts(normalizeNaturalText(input, locale));
 const monthAbbreviations = [
 	["jan"],
 	["feb"],
@@ -118,6 +154,24 @@ const unitPhrases = [
 	}
 ];
 const title = (value) => `${value.slice(0, 1).toLocaleUpperCase("de")}${value.slice(1)}`;
+const weekdays = [
+	"montag",
+	"dienstag",
+	"mittwoch",
+	"donnerstag",
+	"freitag",
+	"samstag",
+	"sonntag"
+];
+const nextWeekdays = weekdays.flatMap((weekday, day) => [{
+	phrase: `nächster ${weekday}`,
+	day,
+	canonical: `nächster ${title(weekday)}`
+}, {
+	phrase: `nächsten ${weekday}`,
+	day,
+	canonical: `nächster ${title(weekday)}`
+}]);
 const canonicalToDate = (entry) => `seit ${title(entry.compound)}beginn`;
 const canonicalRelative = (value) => {
 	const separator = value.lastIndexOf(" ");
@@ -595,8 +649,8 @@ const quarterNumber = (value) => {
 	return index === -1 ? void 0 : index + 1;
 };
 const relativeDirection = (value) => {
-	if (value === "letzten") return -1;
-	if (value === "nächsten") return 1;
+	if (value.startsWith("letzt")) return -1;
+	if (value.startsWith("nächst")) return 1;
 	return 0;
 };
 const parseQuarter = (input) => {
@@ -624,13 +678,13 @@ const parseQuarter = (input) => {
 	const quarter = quarterNumber(textAt(standalone.value, 1));
 	return quarter === void 0 ? Option.none() : Option.some(quarterOfRelativeYear(quarter, 0, `Q${quarter}`));
 };
-const parseBasePeriod = (input) => {
-	const absoluteDate = absoluteDatePeriod(input, "de");
-	if (Option.isSome(absoluteDate)) return absoluteDate;
-	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, "de"),
+		parseNamedDate(input),
+		parseQuarter(input)
+	]);
+	if (Option.isSome(knownPeriod)) return knownPeriod;
 	const yearMatch = String$1.match(/^(?:(?:das )?(?:kalender)?jahr )?(\d{4})$/u)(input);
 	if (Option.isSome(yearMatch)) {
 		const year = validYear(textAt(yearMatch.value, 1));
@@ -642,6 +696,18 @@ 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(/^(letzter|dieser|nächster) ([a-zäöüß]+\.?)$/u)(input);
+	if (Option.isSome(prefixedRelativeMonth)) {
+		const month = monthNumber(textAt(prefixedRelativeMonth.value, 2));
+		if (month !== void 0) {
+			const modifier = textAt(prefixedRelativeMonth.value, 1);
+			const direction = relativeDirection(modifier);
+			return Option.some(monthOfRelativeYear(month, direction, `${modifier} ${title(textAt(months, month - 1))}`));
+		}
+	}
 	const relativeMonth = String$1.match(/^([a-zäöüß]+\.?) (letzten|dieses|nächsten) jahres$/u)(input);
 	if (Option.isSome(relativeMonth)) {
 		const directionText = textAt(relativeMonth.value, 2);
@@ -651,11 +717,18 @@ const parseBasePeriod = (input) => {
 	}
 	const standaloneMonth = monthNumber(input);
 	if (standaloneMonth !== void 0) return Option.some(monthOfRelativeYear(standaloneMonth, 0, title(textAt(months, standaloneMonth - 1))));
+	return Option.none();
+};
+const parseBasePeriod = (input) => {
+	const knownPeriod = Option.firstSomeOf([parseDatedPeriod(input), parseRelativeMonth(input)]);
+	if (Option.isSome(knownPeriod)) return knownPeriod;
 	if (input === "wochenende" || input === "dieses wochenende" || input === "am wochenende") return Option.some(relativeWeekend(0, "dieses Wochenende"));
 	if (input === "letztes wochenende" || input === "vergangenes wochenende") return Option.some(relativeWeekend(-1, "letztes Wochenende"));
 	if (input === "nächstes wochenende" || input === "kommendes wochenende") return Option.some(relativeWeekend(1, "nächstes Wochenende"));
 	if (input === "vorletztes wochenende") return Option.some(relativeWeekend(-2, "vorletztes Wochenende"));
 	if (input === "übernächstes wochenende") return Option.some(relativeWeekend(2, "übernächstes Wochenende"));
+	const weekday = nextWeekdays.find((entry) => entry.phrase === input);
+	if (weekday !== void 0) return Option.some(relativeWeekday(weekday.day, 1, weekday.canonical));
 	const relative = unitPhrases.find((entry) => entry.current === input || entry.previous === input || entry.next === input);
 	if (relative !== void 0) {
 		let direction = 0;
@@ -668,10 +741,31 @@ const parseBasePeriod = (input) => {
 	return Option.none();
 };
 const parsePeriod = (input) => {
+	const shifted = String$1.match(/^(.+) (vor|in) ([1-9]\d*) (tag|tagen|woche|wochen|monat|monaten|quartal|quartalen|jahr|jahren)$/u)(input);
+	if (Option.isSome(shifted)) {
+		const amount = parseTrailingCount(textAt(shifted.value, 3));
+		const unitText = textAt(shifted.value, 4);
+		const entry = unitPhrases.find((unit) => [
+			unit.noun,
+			unit.plural,
+			unit.dative
+		].includes(unitText));
+		const period = parsePeriod(textAt(shifted.value, 1));
+		if (Option.isSome(amount) && entry !== void 0 && Option.isSome(period)) {
+			const past = textAt(shifted.value, 2) === "vor";
+			const direction = past ? -amount.value : amount.value;
+			const noun = amount.value === 1 ? entry.noun : entry.dative;
+			const canonical = `${period.value.canonical} ${past ? "vor" : "in"} ${amount.value} ${title(noun)}`;
+			return Option.some(shiftPeriod(period.value, direction, entry.unit, canonical));
+		}
+	}
 	const edge = String$1.match(/^(anfang|beginn|ende) (.+)$/u)(input);
 	if (Option.isSome(edge)) {
 		const edgeName = textAt(edge.value, 1);
-		const period = parseBasePeriod(textAt(edge.value, 2));
+		const periodText = textAt(edge.value, 2);
+		const basePeriod = parseBasePeriod(periodText);
+		const implicit = unitPhrases.find((entry) => entry.genitive === periodText);
+		const period = Option.isSome(basePeriod) || implicit === void 0 ? basePeriod : Option.some(relativePeriod(implicit.unit, 0, implicit.current));
 		if (Option.isSome(period)) {
 			const canonical = `${edgeName === "ende" ? "Ende" : "Anfang"} ${withRelativeGenitive(period.value.canonical)}`;
 			return Option.some(edgeName === "ende" ? periodEndDay(period.value, canonical) : periodStartDay(period.value, canonical));
@@ -683,7 +777,8 @@ const parsePeriod = (input) => {
 		"für ",
 		"während "
 	].find((prefix) => input.startsWith(prefix));
-	return parseBasePeriod(wrapper === void 0 ? input : input.slice(wrapper.length));
+	const base = parseBasePeriod(wrapper === void 0 ? input : input.slice(wrapper.length));
+	return Option.isSome(base) ? base : parseCalendarOffset(input);
 };
 const currentBoundaryCandidate = (input) => {
 	const match = currentBoundaryPhrases.find((entry) => entry.phrase === input);
@@ -731,7 +826,7 @@ const parseCalendarOffset = (input) => {
 			const isPast = textAt(singular.value, 1) === "vor";
 			const direction = isPast ? -1 : 1;
 			const canonical = `${isPast ? "vor" : "in"} ${canonicalRelative(entry.indefiniteDative)}`;
-			return Option.some(candidate(periodRange(relativePeriod(entry.unit, direction, canonical)), canonical));
+			return Option.some(relativePeriod(entry.unit, direction, canonical));
 		}
 	}
 	const prefixed = String$1.match(/^(vor|in) ([1-9]\d*) (tag|tagen|woche|wochen|monat|monaten|quartal|quartalen|jahr|jahren)$/u)(input);
@@ -749,7 +844,7 @@ const parseCalendarOffset = (input) => {
 	const directionName = isPast ? "vor" : "in";
 	const noun = amount.value === 1 ? entry.noun : entry.dative;
 	const canonical = `${directionName} ${amount.value} ${title(noun)}`;
-	return Option.some(candidate(periodRange(relativePeriod(entry.unit, direction, canonical)), canonical));
+	return Option.some(relativePeriod(entry.unit, direction, canonical));
 };
 const parseRollingPeriod = (input) => {
 	const past = String$1.match(/^(?:(?:die letzten|letzten|letzte|vergangene|vorherige) )?([1-9]\d*) (tag|tage|woche|wochen|monat|monate|quartal|quartale|jahr|jahre)$/u)(input);
@@ -804,8 +899,6 @@ const parseGerman = (input) => {
 	if (remaining !== void 0) return Option.some(candidate(remainingPeriodRange(remaining.entry.unit), `Rest ${canonicalRelative(remaining.entry.genitive)}`));
 	if (["bis heute", "bis jetzt"].includes(input)) return Option.some(candidate(untilNowRange(), "bis heute"));
 	if (["ab jetzt", "von jetzt an"].includes(input)) return Option.some(candidate(fromNowRange(), "ab jetzt"));
-	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);
@@ -818,7 +911,12 @@ const parseGerman = (input) => {
 		["von ", " bis heute"],
 		["vom ", " bis heute"],
 		["zwischen ", " und heute"]
-	], ["von heute bis ", "zwischen heute und "], parsePeriod, (period) => `von ${period} bis heute`, (period) => `von heute bis ${period}`);
+	], [
+		"von heute bis ",
+		"zwischen heute und ",
+		"heute bis ",
+		"jetzt bis "
+	], parsePeriod, (period) => `von ${period} bis heute`, (period) => `von heute bis ${period}`);
 	if (Option.isSome(nowBounded)) return nowBounded;
 	const bounded = joinedPeriodCandidate(input, [
 		["von ", " bis einschließlich "],
@@ -877,9 +975,12 @@ const staticPeriodPhrases = [
 	]),
 	...months.flatMap((month) => [
 		month,
+		`letzter ${month}`,
+		`nächster ${month}`,
 		`${month} letzten jahres`,
 		`${month} nächsten jahres`
-	])
+	]),
+	...nextWeekdays.map((entry) => entry.phrase)
 ];
 const staticPeriods = periodsFromPhrases(staticPeriodPhrases, parsePeriod);
 const boundaryPrefixes = [
@@ -936,6 +1037,17 @@ const suggestGerman = (input, limit) => {
 	], limit);
 };
 const renderGerman = (range) => {
+	const shifted = decomposeShiftedPeriodRange(range);
+	if (Option.isSome(shifted)) {
+		const base = renderGerman(shifted.value.baseRange);
+		const entry = unitPhrases.find((unit) => unit.unit === shifted.value.unit);
+		if (Option.isSome(base) && entry !== void 0) {
+			const amount = Math.abs(shifted.value.amount);
+			const noun = amount === 1 ? entry.noun : entry.dative;
+			const direction = shifted.value.amount < 0 ? "vor" : "in";
+			return Option.some(`${base.value} ${direction} ${amount} ${title(noun)}`);
+		}
+	}
 	const offset = calendarPeriodOffset(range);
 	if (Option.isSome(offset) && Math.abs(offset.value.amount) > 1) {
 		const entry = unitPhrases.find((unit) => unit.unit === offset.value.unit);
@@ -963,6 +1075,7 @@ const GermanContribution = new BaseLanguageContribution({
 	locale: "de",
 	vocabulary: [
 		...months,
+		...weekdays,
 		...quarterNames,
 		"q1",
 		"q2",
@@ -1024,8 +1137,8 @@ const GermanContribution = new BaseLanguageContribution({
 		"zwischen",
 		"zuvor"
 	],
-	normalize: normalizeNaturalText,
-	correct: correctWhitespaceSeparatedText,
+	normalize: normalizeGerman,
+	correct: correctGerman,
 	parseExact: parseGerman,
 	suggest: suggestGerman,
 	render: renderGerman

package/dist/locales/en.mjs

@@ -3,7 +3,7 @@ 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 { absoluteDatePeriod, calendarPeriodOffset, candidate, currentYearDatePeriods, datedPeriods, datedQuarterPeriods, fixedMonthPeriod, fixedQuarterPeriod, fixedYearPeriod, fromNowRange, futurePeriod, futureRange, joinedNowCandidate, joinedPeriodCandidate, monthOfRelativeYear, namedCurrentYearDatePeriod, namedDatePeriod, openBoundaryCandidate, parseTrailingCount, periodEndDay, periodPreviousDay, 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 = [
@@ -34,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",
@@ -170,13 +217,13 @@ const parseNamedDate = (input) => {
 	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) => {
-	const absoluteDate = absoluteDatePeriod(input, "en");
-	if (Option.isSome(absoluteDate)) return absoluteDate;
-	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));
@@ -188,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);
@@ -197,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));
@@ -230,22 +281,69 @@ const parseBasePeriod = (input) => {
 	}
 	return Option.none();
 };
+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.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 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));
-		}
-	}
 	const wrapper = [
 		"during ",
 		"in ",
@@ -253,7 +351,11 @@ 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"],
@@ -296,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);
@@ -315,7 +417,7 @@ 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);
@@ -371,8 +473,6 @@ 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);
@@ -389,7 +489,8 @@ const parseEnglish = (input) => {
 		"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, [
@@ -457,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 = [
@@ -501,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);
@@ -530,6 +645,7 @@ const EnglishContribution = new BaseLanguageContribution({
 	locale: "en",
 	vocabulary: [
 		...months,
+		...weekdays,
 		...quarterNames,
 		"q1",
 		"q2",
@@ -583,8 +699,8 @@ const EnglishContribution = new BaseLanguageContribution({
 		"weekend",
 		"yesterday"
 	],
-	normalize: normalizeNaturalText,
-	correct: correctWhitespaceSeparatedText,
+	normalize: normalizeEnglish,
+	correct: correctEnglish,
 	parseExact: parseEnglish,
 	suggest: suggestEnglish,
 	render: renderEnglish