chronolizer 0.2.0 → 0.3.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 { calendarPeriodOffset, candidate, datedPeriods, datedQuarterPeriods, fixedDatePeriod, fixedMonthPeriod, fixedQuarterPeriod, fixedYearPeriod, fromNowRange, futurePeriod, futureRange, isoDate, joinedNowCandidate, joinedPeriodCandidate, monthOfRelativeYear, 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, 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 { Effect, Option, String as String$1 } from "effect";
 //#region src/locales/de.ts
 const months = [
@@ -45,6 +45,10 @@ const unitPhrases = [
 		next: "morgen",
 		compound: "tages",
 		currentGenitive: "dieses tages",
+		previousGenitive: "letzten tages",
+		nextGenitive: "nächsten tages",
+		indefiniteDative: "einem tag",
+		indefiniteGenitive: "eines tages",
 		dative: "tagen",
 		genitive: "des tages"
 	},
@@ -57,6 +61,10 @@ const unitPhrases = [
 		next: "nächste woche",
 		compound: "wochen",
 		currentGenitive: "dieser woche",
+		previousGenitive: "letzter woche",
+		nextGenitive: "nächster woche",
+		indefiniteDative: "einer woche",
+		indefiniteGenitive: "einer woche",
 		dative: "wochen",
 		genitive: "der woche"
 	},
@@ -69,6 +77,10 @@ const unitPhrases = [
 		next: "nächster monat",
 		compound: "monats",
 		currentGenitive: "dieses monats",
+		previousGenitive: "letzten monats",
+		nextGenitive: "nächsten monats",
+		indefiniteDative: "einem monat",
+		indefiniteGenitive: "eines monats",
 		dative: "monaten",
 		genitive: "des monats"
 	},
@@ -81,6 +93,10 @@ const unitPhrases = [
 		next: "nächstes quartal",
 		compound: "quartals",
 		currentGenitive: "dieses quartals",
+		previousGenitive: "letzten quartals",
+		nextGenitive: "nächsten quartals",
+		indefiniteDative: "einem quartal",
+		indefiniteGenitive: "eines quartals",
 		dative: "quartalen",
 		genitive: "des quartals"
 	},
@@ -93,6 +109,10 @@ const unitPhrases = [
 		next: "nächstes jahr",
 		compound: "jahres",
 		currentGenitive: "dieses jahres",
+		previousGenitive: "letzten jahres",
+		nextGenitive: "nächsten jahres",
+		indefiniteDative: "einem jahr",
+		indefiniteGenitive: "eines jahres",
 		dative: "jahren",
 		genitive: "des jahres"
 	}
@@ -141,7 +161,125 @@ const currentBoundaryPhrases = unitPhrases.flatMap((entry) => [
 	entry,
 	phrase
 })));
+const declinedBoundaryPeriods = [
+	[
+		"diese woche",
+		"week",
+		0,
+		"dieser woche",
+		"diese woche"
+	],
+	[
+		"letzte woche",
+		"week",
+		-1,
+		"letzter woche",
+		"letzte woche"
+	],
+	[
+		"nächste woche",
+		"week",
+		1,
+		"nächster woche",
+		"nächste woche"
+	],
+	[
+		"dieser monat",
+		"month",
+		0,
+		"diesem monat",
+		"diesen monat"
+	],
+	[
+		"letzter monat",
+		"month",
+		-1,
+		"letztem monat",
+		"letzten monat"
+	],
+	[
+		"nächster monat",
+		"month",
+		1,
+		"nächstem monat",
+		"nächsten monat"
+	],
+	[
+		"dieses quartal",
+		"quarter",
+		0,
+		"diesem quartal",
+		"dieses quartal"
+	],
+	[
+		"letztes quartal",
+		"quarter",
+		-1,
+		"letztem quartal",
+		"letztes quartal"
+	],
+	[
+		"nächstes quartal",
+		"quarter",
+		1,
+		"nächstem quartal",
+		"nächstes quartal"
+	],
+	[
+		"dieses jahr",
+		"year",
+		0,
+		"diesem jahr",
+		"dieses jahr"
+	],
+	[
+		"letztes jahr",
+		"year",
+		-1,
+		"letztem jahr",
+		"letztes jahr"
+	],
+	[
+		"nächstes jahr",
+		"year",
+		1,
+		"nächstem jahr",
+		"nächstes jahr"
+	]
+];
 const relativeAliases = [
+	...unitPhrases.flatMap((entry) => [
+		[
+			entry.currentGenitive,
+			entry.unit,
+			0,
+			entry.current
+		],
+		[
+			entry.previousGenitive,
+			entry.unit,
+			-1,
+			entry.previous
+		],
+		[
+			entry.nextGenitive,
+			entry.unit,
+			1,
+			entry.next
+		]
+	]),
+	...declinedBoundaryPeriods.map(([canonical, unit, direction, dative]) => [
+		dative,
+		unit,
+		direction,
+		canonical
+	]),
+	[
+		"vorgestern",
+		"day",
+		-2,
+		"vorgestern"
+	],
 	[
 		"vorletzten tag",
 		"day",
@@ -414,6 +552,20 @@ const monthNumber = (value) => {
 	const shortIndex = monthAbbreviations.findIndex((aliases) => aliases.some((alias) => alias === normalized));
 	return shortIndex === -1 ? void 0 : shortIndex + 1;
 };
+const currentDateLabel = (day, month) => `${day}. ${title(textAt(months, month - 1))}`;
+const withRelativeCase = (canonical, grammaticalCase) => {
+	const period = declinedBoundaryPeriods.find((entry) => canonical === canonicalRelative(entry[0]));
+	if (period === void 0) return canonical;
+	return canonicalRelative(period[grammaticalCase === "dative" ? 3 : 4]);
+};
+const withRelativeGenitive = (canonical) => {
+	for (const entry of unitPhrases) {
+		if (canonical === canonicalRelative(entry.current)) return canonicalRelative(entry.currentGenitive);
+		if (canonical === canonicalRelative(entry.previous)) return canonicalRelative(entry.previousGenitive);
+		if (canonical === canonicalRelative(entry.next)) return canonicalRelative(entry.nextGenitive);
+	}
+	return canonical;
+};
 const parseNamedDate = (input) => {
 	const named = String$1.match(/^([0-3]?\d)\.? ([a-zäöüß]+\.?) (\d{4})$/u)(input);
 	if (Option.isSome(named)) return namedDatePeriod(textAt(named.value, 3), textAt(named.value, 2), textAt(named.value, 1), monthNumber, (day, month, year) => `${day}. ${title(textAt(months, month - 1))} ${year}`);
@@ -427,7 +579,8 @@ const parseNamedDate = (input) => {
 			if (isIsoDate(value) && value !== "9999-12-31") return Option.some(fixedDatePeriod(value, `${day}. ${title(textAt(months, month - 1))} ${year}`));
 		}
 	}
-	return Option.none();
+	const current = String$1.match(/^([0-3]?\d)\.? ([a-zäöüß]+\.?)$/u)(input);
+	return Option.isSome(current) ? namedCurrentYearDatePeriod(textAt(current.value, 2), textAt(current.value, 1), monthNumber, currentDateLabel) : Option.none();
 };
 const quarterNames = [
 	"erstes",
@@ -472,7 +625,8 @@ const parseQuarter = (input) => {
 	return quarter === void 0 ? Option.none() : Option.some(quarterOfRelativeYear(quarter, 0, `Q${quarter}`));
 };
 const parseBasePeriod = (input) => {
-	if (isIsoDate(input) && input !== "9999-12-31") return Option.some(fixedDatePeriod(input, 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);
@@ -519,12 +673,13 @@ const parsePeriod = (input) => {
 		const edgeName = textAt(edge.value, 1);
 		const period = parseBasePeriod(textAt(edge.value, 2));
 		if (Option.isSome(period)) {
-			const canonical = `${edgeName === "ende" ? "Ende" : "Anfang"} ${period.value.canonical}`;
+			const canonical = `${edgeName === "ende" ? "Ende" : "Anfang"} ${withRelativeGenitive(period.value.canonical)}`;
 			return Option.some(edgeName === "ende" ? periodEndDay(period.value, canonical) : periodStartDay(period.value, canonical));
 		}
 	}
 	const wrapper = [
 		"im ",
+		"am ",
 		"für ",
 		"während "
 	].find((prefix) => input.startsWith(prefix));
@@ -534,9 +689,9 @@ const currentBoundaryCandidate = (input) => {
 	const match = currentBoundaryPhrases.find((entry) => entry.phrase === input);
 	if (match === void 0) return Option.none();
 	const period = relativePeriod(match.entry.unit, 0, match.entry.current);
-	return Option.some(periodBoundaryCandidate(period, match.boundary, match.phrase));
+	return Option.some(periodBoundaryCandidate(period, match.boundary, canonicalRelative(match.phrase)));
 };
-const boundaryCandidate = (input) => openBoundaryCandidate(input, [
+const boundaryCandidate = (input) => Option.map(openBoundaryCandidate(input, [
 	["seit dem beginn von ", "since"],
 	["seit dem anfang von ", "since"],
 	["seit dem jahr ", "since"],
@@ -563,12 +718,22 @@ const boundaryCandidate = (input) => openBoundaryCandidate(input, [
 	["nach ", "after"],
 	["bis ", "before"],
 	["ab ", "since"]
-], parsePeriod);
+], parsePeriod), (result) => candidate(result.range, canonicalRelative(input)));
 const countedUnit = (value, amount, dative = false) => unitPhrases.find((entry) => {
 	if (amount === 1) return value === entry.noun;
 	return value === (dative ? entry.dative : entry.plural);
 });
 const parseCalendarOffset = (input) => {
+	const singular = String$1.match(/^(vor|in) (einem tag|einer woche|einem monat|einem quartal|einem jahr)$/u)(input);
+	if (Option.isSome(singular)) {
+		const entry = unitPhrases.find((unit) => unit.indefiniteDative === textAt(singular.value, 2));
+		if (entry !== void 0) {
+			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));
+		}
+	}
 	const prefixed = String$1.match(/^(vor|in) ([1-9]\d*) (tag|tagen|woche|wochen|monat|monaten|quartal|quartalen|jahr|jahren)$/u)(input);
 	const prior = String$1.match(/^([1-9]\d*) (tag|tage|woche|wochen|monat|monate|quartal|quartale|jahr|jahre) zuvor$/u)(input);
 	const match = Option.firstSomeOf([prefixed, prior]);
@@ -588,30 +753,51 @@ const parseCalendarOffset = (input) => {
 };
 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);
-	const pastDative = String$1.match(/^(?:in den letzten|in den vergangenen|in den vorherigen) ([1-9]\d*) (tag|tagen|woche|wochen|monat|monaten|quartal|quartalen|jahr|jahren)$/u)(input);
+	const pastDative = String$1.match(/^(?:(?:in den letzten|in den vergangenen|in den vorherigen) |seit )([1-9]\d*) (tag|tagen|woche|wochen|monat|monaten|quartal|quartalen|jahr|jahren)$/u)(input);
+	const singularSince = String$1.match(/^seit (einem tag|einer woche|einem monat|einem quartal|einem jahr)$/u)(input);
 	const pastGenitive = String$1.match(/^während der letzten ([1-9]\d*) (tag|tage|woche|wochen|monat|monate|quartal|quartale|jahr|jahre)$/u)(input);
 	const future = String$1.match(/^(?:die nächsten|nächsten|nächste|kommende) ([1-9]\d*) (tag|tage|woche|wochen|monat|monate|quartal|quartale|jahr|jahre)$/u)(input);
 	const futureDative = String$1.match(/^(?:in den nächsten|in den kommenden|innerhalb von) ([1-9]\d*) (tag|tagen|woche|wochen|monat|monaten|quartal|quartalen|jahr|jahren)$/u)(input);
+	const singularFuture = String$1.match(/^innerhalb (eines tages|einer woche|eines monats|eines quartals|eines jahres)$/u)(input);
 	const futureGenitive = String$1.match(/^innerhalb der nächsten ([1-9]\d*) (tag|tage|woche|wochen|monat|monate|quartal|quartale|jahr|jahre)$/u)(input);
 	const match = Option.firstSomeOf([
 		past,
 		pastDative,
+		singularSince,
 		pastGenitive,
 		future,
 		futureDative,
+		singularFuture,
 		futureGenitive
 	]);
 	if (Option.isNone(match)) return Option.none();
-	const amount = parseTrailingCount(textAt(match.value, 1));
+	const isSingular = Option.isSome(singularSince) || Option.isSome(singularFuture);
+	const amount = parseTrailingCount(isSingular ? "1" : textAt(match.value, 1));
 	if (Option.isNone(amount)) return Option.none();
-	const usesDative = Option.isSome(pastDative) || Option.isSome(futureDative);
-	const entry = countedUnit(textAt(match.value, 2), amount.value, usesDative);
+	const usesDative = Option.isSome(pastDative) || Option.isSome(singularSince) || Option.isSome(futureDative);
+	const sinceEntry = Option.isSome(singularSince) ? unitPhrases.find((unit) => unit.indefiniteDative === textAt(match.value, 1)) : void 0;
+	const futureEntry = Option.isSome(singularFuture) ? unitPhrases.find((unit) => unit.indefiniteGenitive === textAt(match.value, 1)) : void 0;
+	const countedEntry = isSingular ? void 0 : countedUnit(textAt(match.value, 2), amount.value, usesDative);
+	const entry = sinceEntry ?? futureEntry ?? countedEntry;
 	if (entry === void 0) return Option.none();
-	const isFuture = Option.isSome(future) || Option.isSome(futureDative) || Option.isSome(futureGenitive);
+	const isFuture = Option.isSome(future) || Option.isSome(futureDative) || Option.isSome(singularFuture) || Option.isSome(futureGenitive);
 	const range = isFuture ? futureRange(amount.value, entry.unit) : trailingRange(amount.value, entry.unit);
+	if (amount.value === 1) {
+		const phrase = isFuture ? `innerhalb ${canonicalRelative(entry.indefiniteGenitive)}` : `seit ${canonicalRelative(entry.indefiniteDative)}`;
+		return Option.some(candidate(range, phrase));
+	}
 	const direction = isFuture ? "nächste" : "letzte";
-	const noun = amount.value === 1 ? entry.noun : entry.plural;
-	return Option.some(candidate(range, `${direction} ${amount.value} ${title(noun)}`));
+	return Option.some(candidate(range, `${direction} ${amount.value} ${title(entry.plural)}`));
+};
+const parseElidedDateRange = (input) => {
+	const match = String$1.match(/^(?:vom )?([0-3]?\d)\.(?: bis |[–—-])(?:zum )?([0-3]?\d)\.? ([a-zäöüß]+\.?)(?: (\d{4}))?$/u)(input);
+	if (Option.isNone(match)) return Option.none();
+	const lowerDay = textAt(match.value, 1);
+	const upperDay = textAt(match.value, 2);
+	const month = textAt(match.value, 3);
+	const year = textAt(match.value, 4);
+	const suffix = year.length === 0 ? "" : ` ${year}`;
+	return joinedPeriodCandidate(`von ${lowerDay}. ${month}${suffix} bis ${upperDay}. ${month}${suffix}`, [["von ", " bis "]], parsePeriod, (lower, upper) => `von ${lower} bis ${upper}`);
 };
 const parseGerman = (input) => {
 	const remaining = remainingPeriodPhrases.find((entry) => entry.phrase === input);
@@ -626,6 +812,8 @@ const parseGerman = (input) => {
 	if (toDate !== void 0) return Option.some(candidate(periodToDateRange(toDate.entry.unit), canonicalToDate(toDate.entry)));
 	const currentBoundary = currentBoundaryCandidate(input);
 	if (Option.isSome(currentBoundary)) return currentBoundary;
+	const elided = parseElidedDateRange(input);
+	if (Option.isSome(elided)) return elided;
 	const nowBounded = joinedNowCandidate(input, [
 		["von ", " bis heute"],
 		["vom ", " bis heute"],
@@ -657,9 +845,10 @@ const parseGerman = (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 = [
+	"vorgestern",
 	"dieses wochenende",
 	"letztes wochenende",
 	"nächstes wochenende",
@@ -669,12 +858,12 @@ const staticPeriodPhrases = [
 		entry.current,
 		entry.previous,
 		entry.next,
-		`anfang ${entry.current}`,
-		`ende ${entry.current}`,
-		`anfang ${entry.previous}`,
-		`ende ${entry.previous}`,
-		`anfang ${entry.next}`,
-		`ende ${entry.next}`
+		`anfang ${entry.currentGenitive}`,
+		`ende ${entry.currentGenitive}`,
+		`anfang ${entry.previousGenitive}`,
+		`ende ${entry.previousGenitive}`,
+		`anfang ${entry.nextGenitive}`,
+		`ende ${entry.nextGenitive}`
 	]),
 	...[
 		1,
@@ -719,8 +908,21 @@ const countedSuggestions = (input) => {
 const germanSuggestionPhrases = [
 	...unitPhrases.map(canonicalToDate),
 	...unitPhrases.map((entry) => `rest ${entry.genitive}`),
+	...unitPhrases.flatMap((entry) => [
+		`seit ${entry.indefiniteDative}`,
+		`innerhalb ${entry.indefiniteGenitive}`,
+		`vor ${entry.indefiniteDative}`,
+		`in ${entry.indefiniteDative}`
+	]),
 	...staticPeriodPhrases,
-	...prefixNaturalPhrases(staticPeriodPhrases, boundaryPrefixes),
+	...currentBoundaryPhrases.map((entry) => entry.phrase),
+	...declinedBoundaryPeriods.flatMap(([, , , dative, accusative]) => [
+		`seit ${dative}`,
+		`vor ${dative}`,
+		`bis einschließlich ${accusative}`,
+		`nach ${dative}`
+	]),
+	...prefixNaturalPhrases(months, boundaryPrefixes),
 	"bis heute",
 	"ab jetzt"
 ].map((phrase) => normalizeNaturalText(phrase, "de"));
@@ -742,15 +944,20 @@ const renderGerman = (range) => {
 	const future = futurePeriod(range);
 	if (Option.isSome(future)) {
 		const entry = unitPhrases.find((unit) => unit.unit === future.value.unit);
-		if (entry !== void 0) return Option.some(`nächste ${future.value.amount} ${title(future.value.amount === 1 ? entry.noun : entry.plural)}`);
+		if (entry !== void 0) return Option.some(future.value.amount === 1 ? `innerhalb ${canonicalRelative(entry.indefiniteGenitive)}` : `nächste ${future.value.amount} ${title(entry.plural)}`);
 	}
 	const trailing = trailingPeriod(range);
 	if (Option.isSome(trailing)) {
 		const entry = unitPhrases.find((unit) => unit.unit === trailing.value.unit);
-		if (entry !== void 0) return Option.some(trailing.value.amount === 1 ? `1 ${title(entry.noun)}` : `letzte ${trailing.value.amount} ${title(entry.plural)}`);
+		if (entry !== void 0) return Option.some(trailing.value.amount === 1 ? `seit ${canonicalRelative(entry.indefiniteDative)}` : `letzte ${trailing.value.amount} ${title(entry.plural)}`);
 	}
-	const periods = [...staticPeriods, ...periodsFromPhrases([...datedPeriods(range, months), ...datedQuarterPeriods(range)], parsePeriod)];
-	return renderPeriodRange(range, [...unitPhrases.map((entry) => candidate(periodToDateRange(entry.unit), canonicalToDate(entry))), ...unitPhrases.map((entry) => candidate(remainingPeriodRange(entry.unit), `Rest ${canonicalRelative(entry.genitive)}`))], periods, (period) => `seit ${period}`, (period) => `vor ${period}`, (period) => `bis einschließlich ${period}`, (period) => `nach ${period}`, (lower, upper) => `von ${lower} bis ${upper}`, (period) => `von ${period} bis heute`, (period) => `von heute bis ${period}`, () => "bis heute", () => "ab jetzt");
+	const dated = [...datedPeriods(range, months), ...datedQuarterPeriods(range)];
+	const periods = [
+		...staticPeriods,
+		...currentYearDatePeriods(range, currentDateLabel),
+		...periodsFromPhrases([...dated, ...dated.flatMap((phrase) => [`anfang ${phrase}`, `ende ${phrase}`])], parsePeriod)
+	];
+	return renderPeriodRange(range, [...unitPhrases.map((entry) => candidate(periodToDateRange(entry.unit), canonicalToDate(entry))), ...unitPhrases.map((entry) => candidate(remainingPeriodRange(entry.unit), `Rest ${canonicalRelative(entry.genitive)}`))], periods, (period) => `seit ${withRelativeCase(period, "dative")}`, (period) => `vor ${withRelativeCase(period, "dative")}`, (period) => `bis einschließlich ${withRelativeCase(period, "accusative")}`, (period) => `nach ${withRelativeCase(period, "dative")}`, (lower, upper) => `von ${lower} bis ${upper}`, (period) => `von ${period} bis heute`, (period) => `von heute bis ${period}`, () => "bis heute", () => "ab jetzt");
 };
 const GermanContribution = new BaseLanguageContribution({
 	locale: "de",
@@ -770,7 +977,11 @@ const GermanContribution = new BaseLanguageContribution({
 			entry.noun,
 			entry.plural,
 			entry.dative,
+			...entry.indefiniteDative.split(" "),
+			...entry.indefiniteGenitive.split(" "),
 			...entry.currentGenitive.split(" "),
+			...entry.previousGenitive.split(" "),
+			...entry.nextGenitive.split(" "),
 			...entry.current.split(" "),
 			...entry.previous.split(" "),
 			...entry.next.split(" ")

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, 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 { Effect, Option, String as String$1 } from "effect";
 //#region src/locales/en.ts
 const months = [
@@ -159,15 +158,21 @@ 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 absoluteDate = absoluteDatePeriod(input, "en");
+	if (Option.isSome(absoluteDate)) return absoluteDate;
 	const namedDate = parseNamedDate(input);
 	if (Option.isSome(namedDate)) return namedDate;
 	const quarter = parseQuarter(input);
@@ -213,7 +218,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];
@@ -226,6 +231,11 @@ const parseBasePeriod = (input) => {
 	return Option.none();
 };
 const parsePeriod = (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));
@@ -247,6 +257,8 @@ const parsePeriod = (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 +275,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"],
@@ -305,22 +319,47 @@ const parseCalendarOffset = (input) => {
 };
 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",
@@ -338,10 +377,13 @@ const parseEnglish = (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 ",
@@ -380,18 +422,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]}`,
@@ -441,7 +484,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",
@@ -468,15 +512,19 @@ 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",