chronolizer 0.2.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 { 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, 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"],
@@ -45,6 +81,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 +97,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 +113,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 +129,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,11 +145,33 @@ 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"
 	}
 ];
 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(" ");
@@ -141,7 +215,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 +606,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 +633,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",
@@ -442,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) => {
@@ -471,12 +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) => {
-	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, "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));
@@ -488,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);
@@ -497,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;
@@ -514,29 +741,52 @@ 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"} ${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));
-	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);
 	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 +813,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(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);
 	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]);
@@ -584,53 +844,79 @@ 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);
-	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);
 	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);
 	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"],
 		["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 "],
@@ -657,9 +943,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 +956,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,
@@ -688,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 = [
@@ -719,8 +1009,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"));
@@ -734,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);
@@ -742,20 +1056,26 @@ 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",
 	vocabulary: [
 		...months,
+		...weekdays,
 		...quarterNames,
 		"q1",
 		"q2",
@@ -770,7 +1090,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(" ")
@@ -813,8 +1137,8 @@ const GermanContribution = new BaseLanguageContribution({
 		"zwischen",
 		"zuvor"
 	],
-	normalize: normalizeNaturalText,
-	correct: correctWhitespaceSeparatedText,
+	normalize: normalizeGerman,
+	correct: correctGerman,
 	parseExact: parseGerman,
 	suggest: suggestGerman,
 	render: renderGerman