chronolizer 0.2.0 → 0.4.0

package/dist/locales/nl.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, 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, periodDay, 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/nl.ts
 const months = [
@@ -21,6 +21,54 @@ const months = [
 	"november",
 	"december"
 ];
+const weekdays = [
+	"maandag",
+	"dinsdag",
+	"woensdag",
+	"donderdag",
+	"vrijdag",
+	"zaterdag",
+	"zondag"
+];
+const nextWeekdayPhrases = weekdays.map((weekday) => `volgende ${weekday}`);
+const dutchCountWords = [
+	"twee",
+	"drie",
+	"vier",
+	"vijf",
+	"zes",
+	"zeven",
+	"acht",
+	"negen",
+	"tien",
+	"elf",
+	"twaalf",
+	"dertien",
+	"veertien",
+	"vijftien",
+	"zestien",
+	"zeventien",
+	"achttien",
+	"negentien",
+	"twintig"
+];
+const dutchCountOnes = [[1, "een"], ...dutchCountWords.slice(0, 8).map((word, index) => [index + 2, word])];
+const dutchCountAliases = [...sequentialCountAliases(dutchCountWords.map((word) => [word]), 2), ...compoundCountAliases(decimalTens([
+	"twintig",
+	"dertig",
+	"veertig",
+	"vijftig",
+	"zestig",
+	"zeventig",
+	"tachtig",
+	"negentig"
+]), dutchCountOnes, (ten, one) => {
+	return [`${one === "twee" || one === "drie" ? `${one}ën` : `${one}en`}${ten}`];
+})];
+const normalizeDutchCounts = compileCountAliasNormalizer(dutchCountAliases);
+const dutchCountVocabulary = new Set(countAliasVocabulary(dutchCountAliases));
+const correctDutch = (input, vocabulary) => correctWhitespaceSeparatedText(input, vocabulary, dutchCountVocabulary);
+const normalizeDutch = (input, locale) => normalizeDutchCounts(normalizeNaturalText(input, locale));
 const monthAbbreviations = [
 	["jan"],
 	["feb"],
@@ -40,6 +88,7 @@ const units = [
 		unit: "day",
 		singular: "dag",
 		plural: "dagen",
+		article: "de",
 		current: "vandaag",
 		previous: "gisteren",
 		next: "morgen",
@@ -50,6 +99,7 @@ const units = [
 		unit: "week",
 		singular: "week",
 		plural: "weken",
+		article: "de",
 		current: "deze week",
 		previous: "vorige week",
 		next: "volgende week",
@@ -60,6 +110,7 @@ const units = [
 		unit: "month",
 		singular: "maand",
 		plural: "maanden",
+		article: "de",
 		current: "deze maand",
 		previous: "vorige maand",
 		next: "volgende maand",
@@ -70,6 +121,7 @@ const units = [
 		unit: "quarter",
 		singular: "kwartaal",
 		plural: "kwartalen",
+		article: "het",
 		current: "dit kwartaal",
 		previous: "vorig kwartaal",
 		next: "volgend kwartaal",
@@ -80,6 +132,7 @@ const units = [
 		unit: "year",
 		singular: "jaar",
 		plural: "jaar",
+		article: "het",
 		current: "dit jaar",
 		previous: "vorig jaar",
 		next: "volgend jaar",
@@ -87,18 +140,58 @@ const units = [
 		remaining: "rest van het jaar"
 	}
 ];
-const title = (value) => `${value.slice(0, 1).toLocaleUpperCase("nl")}${value.slice(1)}`;
+const afterVan = (period) => period.startsWith("van ") ? period.slice(4) : period;
 const unitAliases = [
-	["dag", "day"],
-	["dagen", "day"],
-	["week", "week"],
-	["weken", "week"],
-	["maand", "month"],
-	["maanden", "month"],
-	["kwartaal", "quarter"],
-	["kwartalen", "quarter"],
-	["jaar", "year"],
-	["jaren", "year"]
+	[
+		"dag",
+		"day",
+		"singular"
+	],
+	[
+		"dagen",
+		"day",
+		"plural"
+	],
+	[
+		"week",
+		"week",
+		"singular"
+	],
+	[
+		"weken",
+		"week",
+		"plural"
+	],
+	[
+		"maand",
+		"month",
+		"singular"
+	],
+	[
+		"maanden",
+		"month",
+		"plural"
+	],
+	[
+		"kwartaal",
+		"quarter",
+		"singular"
+	],
+	[
+		"kwartalen",
+		"quarter",
+		"plural"
+	],
+	[
+		"jaar",
+		"year",
+		"both"
+	],
+	[
+		"jaren",
+		"year",
+		"plural"
+	]
 ];
 const periodAliases = [
 	...units.flatMap((entry) => [
@@ -300,17 +393,30 @@ const monthNumber = (value) => {
 	return short === -1 ? void 0 : short + 1;
 };
 const dateLabel = (day, month, year) => `${day} ${textAt(months, month - 1)} ${year}`;
+const currentDateLabel = (day, month) => `${day} ${textAt(months, month - 1)}`;
 const parseNamedDate = (input) => {
 	const named = String$1.match(/^(?:de )?([0-3]?\d)(?:e|ste|de)?(?: van)? ([a-z]+\.?)(?: van)? (\d{4})$/u)(input);
 	if (Option.isSome(named)) return namedDatePeriod(textAt(named.value, 3), textAt(named.value, 2), textAt(named.value, 1), monthNumber, dateLabel);
 	const numeric = String$1.match(/^([0-3]?\d)[./-]([01]?\d)[./-](\d{4})$/u)(input);
-	if (Option.isNone(numeric)) return Option.none();
-	const year = validYear(textAt(numeric.value, 3));
-	const month = Number(textAt(numeric.value, 2));
-	const day = Number(textAt(numeric.value, 1));
-	if (year === void 0 || month < 1 || month > 12) return Option.none();
-	const value = isoDate(year, month, day);
-	return isIsoDate(value) && value !== "9999-12-31" ? Option.some(fixedDatePeriod(value, dateLabel(day, month, year))) : Option.none();
+	if (Option.isSome(numeric)) {
+		const year = validYear(textAt(numeric.value, 3));
+		const month = Number(textAt(numeric.value, 2));
+		const day = Number(textAt(numeric.value, 1));
+		if (year !== void 0 && month >= 1 && month <= 12) {
+			const value = isoDate(year, month, day);
+			if (isIsoDate(value) && value !== "9999-12-31") return Option.some(fixedDatePeriod(value, dateLabel(day, month, year)));
+		}
+	}
+	const current = String$1.match(/^(?:de )?([0-3]?\d)(?:e|ste|de)?(?: van)? ([a-z]+\.?)$/u)(input);
+	if (Option.isSome(current)) return namedCurrentYearDatePeriod(textAt(current.value, 2), textAt(current.value, 1), monthNumber, currentDateLabel);
+	const relative = String$1.match(/^(?:de )?([0-3]?\d)(?:e|ste|de)? van (.+)$/u)(input);
+	if (Option.isNone(relative)) return Option.none();
+	const periodText = textAt(relative.value, 2);
+	const alias = periodAliases.find((entry) => entry[0] === periodText && entry[1] === "month");
+	if (alias === void 0) return Option.none();
+	const day = Number(textAt(relative.value, 1));
+	const month = relativePeriod(alias[1], alias[2], alias[3]);
+	return periodDay(month, day, `${day} van ${alias[3]}`);
 };
 const quarterNumber = (value) => {
 	if ((value.startsWith("q") || value.startsWith("k")) && value.length === 2) return Number(value.slice(1));
@@ -337,12 +443,13 @@ const parseQuarter = (input) => {
 	const quarter = quarterNumber(textAt(standalone.value, 1));
 	return quarter === void 0 ? Option.none() : Option.some(quarterOfRelativeYear(quarter, 0, `K${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, "nl"),
+		parseNamedDate(input),
+		parseQuarter(input)
+	]);
+	if (Option.isSome(knownPeriod)) return knownPeriod;
 	const yearMatch = String$1.match(/^(?:het jaar |jaar )?(\d{4})$/u)(input);
 	if (Option.isSome(yearMatch)) {
 		const year = validYear(textAt(yearMatch.value, 1));
@@ -352,7 +459,21 @@ const parseBasePeriod = (input) => {
 	if (Option.isSome(monthYear)) {
 		const month = monthNumber(textAt(monthYear.value, 1));
 		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}`));
+		if (month !== void 0 && year !== void 0) return Option.some(fixedMonthPeriod(year, month, `${textAt(months, month - 1)} ${year}`));
+	}
+	return Option.none();
+};
+const parseBasePeriod = (input) => {
+	const datedPeriod = parseDatedPeriod(input);
+	if (Option.isSome(datedPeriod)) return datedPeriod;
+	const prefixedRelativeMonth = String$1.match(/^(vorige|deze|volgende) ([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 = relativeYearDirection(modifier);
+			return Option.some(monthOfRelativeYear(month, direction, `${modifier} ${textAt(months, month - 1)}`));
+		}
 	}
 	const relativeMonth = String$1.match(/^([a-z]+\.?)(?: van)? (vorig jaar|volgend jaar|dit jaar)$/u)(input);
 	const relativeMonthYearFirst = String$1.match(/^(vorig jaar|volgend jaar|dit jaar) ([a-z]+\.?)$/u)(input);
@@ -363,10 +484,10 @@ const parseBasePeriod = (input) => {
 		const yearText = textAt(relativeMatch.value, yearFirst ? 1 : 2);
 		const month = monthNumber(monthText);
 		const direction = relativeYearDirection(yearText);
-		if (month !== void 0) return Option.some(monthOfRelativeYear(month, direction, `${title(textAt(months, month - 1))} ${relativeYearName(direction)}`));
+		if (month !== void 0) return Option.some(monthOfRelativeYear(month, direction, `${textAt(months, month - 1)} ${relativeYearName(direction)}`));
 	}
 	const standaloneMonth = monthNumber(input);
-	if (standaloneMonth !== void 0) return Option.some(monthOfRelativeYear(standaloneMonth, 0, title(textAt(months, standaloneMonth - 1))));
+	if (standaloneMonth !== void 0) return Option.some(monthOfRelativeYear(standaloneMonth, 0, textAt(months, standaloneMonth - 1)));
 	const alias = periodAliases.find((entry) => entry[0] === input);
 	if (alias !== void 0) return Option.some(relativePeriod(alias[1], alias[2], alias[3]));
 	if ([
@@ -386,13 +507,33 @@ const parseBasePeriod = (input) => {
 	].includes(input)) return Option.some(relativeWeekend(1, "volgend weekend"));
 	if (input === "het weekend voor het vorige") return Option.some(relativeWeekend(-2, input));
 	if (input === "het weekend na het volgende") return Option.some(relativeWeekend(2, input));
-	return Option.none();
+	const weekday = nextWeekdayPhrases.indexOf(input);
+	return weekday === -1 ? Option.none() : Option.some(relativeWeekday(weekday, 1, nextWeekdayPhrases[weekday] ?? input));
 };
 const parsePeriod = (input) => {
+	const shifted = String$1.match(/^(.+) (?:(?:over|binnen) ([1-9]\d*) (dag|dagen|week|weken|maand|maanden|kwartaal|kwartalen|jaar|jaren)|([1-9]\d*) (dag|dagen|week|weken|maand|maanden|kwartaal|kwartalen|jaar|jaren) (geleden|later))$/u)(input);
+	if (Option.isSome(shifted)) {
+		const suffixAmount = textAt(shifted.value, 4);
+		const amount = parseTrailingCount(suffixAmount || textAt(shifted.value, 2));
+		const unitText = textAt(shifted.value, suffixAmount.length > 0 ? 5 : 3);
+		const alias = unitAliases.find((unit) => unit[0] === unitText);
+		const entry = alias === void 0 ? void 0 : units.find((unit) => unit.unit === alias[1]);
+		const period = parsePeriod(textAt(shifted.value, 1));
+		if (Option.isSome(amount) && entry !== void 0 && Option.isSome(period)) {
+			const past = textAt(shifted.value, 6) === "geleden";
+			const direction = past ? -amount.value : amount.value;
+			const noun = amount.value === 1 ? entry.singular : entry.plural;
+			const canonical = past ? `${period.value.canonical} ${amount.value} ${noun} geleden` : `${period.value.canonical} over ${amount.value} ${noun}`;
+			return Option.some(shiftPeriod(period.value, direction, entry.unit, canonical));
+		}
+	}
 	const edge = String$1.match(/^(?:het )?(begin|eind|einde)(?: van)? (.+)$/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 = units.find((entry) => `${entry.article} ${entry.singular}` === periodText);
+		const period = Option.isSome(basePeriod) || implicit === void 0 ? basePeriod : Option.some(relativePeriod(implicit.unit, 0, implicit.current));
 		if (Option.isSome(period)) {
 			const isEnd = edgeName === "eind" || edgeName === "einde";
 			const canonical = `${isEnd ? "eind" : "begin"} van ${period.value.canonical}`;
@@ -406,34 +547,90 @@ const parsePeriod = (input) => {
 		"de hele ",
 		"het hele "
 	].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 countedUnit = (value, amount) => {
+	const expected = amount === 1 ? "singular" : "plural";
+	const alias = unitAliases.find((entry) => entry[0] === value && (entry[2] === expected || entry[2] === "both"));
+	return alias === void 0 ? void 0 : units.find((entry) => entry.unit === alias[1]);
 };
-const countedUnit = (value) => unitAliases.find((entry) => entry[0] === value)?.[1];
 const countedUnitPattern = "dag|dagen|week|weken|maand|maanden|kwartaal|kwartalen|jaar|jaren";
 const countedPattern = (source) => new RegExp(source.replace("UNIT", countedUnitPattern), "u");
 const calendarPastPattern = countedPattern("^([1-9]\\d*) (UNIT) geleden$");
 const calendarFuturePatterns = [countedPattern("^(?:over|binnen) ([1-9]\\d*) (UNIT)$"), countedPattern("^([1-9]\\d*) (UNIT) later$")];
-const rollingPastPatterns = [countedPattern("^(?:de )?(?:afgelopen|laatste|vorige) ([1-9]\\d*) (UNIT)$"), countedPattern("^([1-9]\\d*) (?:afgelopen|laatste|vorige) (UNIT)$")];
-const rollingFuturePatterns = [countedPattern("^(?:de )?(?:komende|volgende|aankomende) ([1-9]\\d*) (UNIT)$"), countedPattern("^([1-9]\\d*) (?:komende|volgende|aankomende) (UNIT)$")];
+const rollingPastPatterns = [countedPattern("^(?:(?:de|in de) )?(?:afgelopen|laatste|vorige) ([1-9]\\d*) (UNIT)$"), countedPattern("^([1-9]\\d*) (?:afgelopen|laatste|vorige) (UNIT)$")];
+const rollingFuturePatterns = [countedPattern("^(?:(?:de|in de|binnen de) )?(?:komende|volgende|aankomende) ([1-9]\\d*) (UNIT)$"), countedPattern("^([1-9]\\d*) (?:komende|volgende|aankomende) (UNIT)$")];
 const rollingSincePattern = countedPattern("^(?:sinds|gedurende) ([1-9]\\d*) (UNIT)$");
 const rollingBarePattern = countedPattern("^([1-9]\\d*) (UNIT)$");
 const firstPatternMatch = (input, patterns) => Option.firstSomeOf(patterns.map((pattern) => String$1.match(pattern)(input)));
+const singularRollingCanonical = (entry, future) => future ? `vanaf nu gedurende een ${entry.singular}` : `sinds een ${entry.singular}`;
+const singularRollingPhrases = units.flatMap((entry) => [
+	{
+		phrase: `${entry.article} afgelopen ${entry.singular}`,
+		entry,
+		future: false
+	},
+	{
+		phrase: `${entry.article} laatste ${entry.singular}`,
+		entry,
+		future: false
+	},
+	{
+		phrase: `sinds een ${entry.singular}`,
+		entry,
+		future: false
+	},
+	{
+		phrase: `gedurende ${entry.article} komende ${entry.singular}`,
+		entry,
+		future: true
+	},
+	{
+		phrase: `vanaf nu gedurende een ${entry.singular}`,
+		entry,
+		future: true
+	}
+]);
+const singularCalendarOffsets = units.flatMap((entry) => [
+	{
+		phrase: `een ${entry.singular} geleden`,
+		entry,
+		direction: -1
+	},
+	{
+		phrase: `over een ${entry.singular}`,
+		entry,
+		direction: 1
+	},
+	{
+		phrase: `binnen een ${entry.singular}`,
+		entry,
+		direction: 1
+	}
+]);
 const parseCalendarOffset = (input) => {
+	const singular = singularCalendarOffsets.find((entry) => entry.phrase === input);
+	if (singular !== void 0) return Option.some(relativePeriod(singular.entry.unit, singular.direction, singular.phrase));
 	const past = String$1.match(calendarPastPattern)(input);
 	const future = firstPatternMatch(input, calendarFuturePatterns);
 	const match = Option.firstSomeOf([past, future]);
 	if (Option.isNone(match)) return Option.none();
 	const amount = parseTrailingCount(textAt(match.value, 1));
-	const unit = countedUnit(textAt(match.value, 2));
-	if (Option.isNone(amount) || unit === void 0) return Option.none();
-	const entry = units.find((item) => item.unit === unit);
+	if (Option.isNone(amount)) return Option.none();
+	const entry = countedUnit(textAt(match.value, 2), amount.value);
 	if (entry === void 0) return Option.none();
 	const direction = Option.isSome(past) ? -amount.value : amount.value;
 	const noun = amount.value === 1 ? entry.singular : entry.plural;
 	const canonical = direction < 0 ? `${amount.value} ${noun} geleden` : `over ${amount.value} ${noun}`;
-	return Option.some(candidate(periodRange(relativePeriod(unit, direction, canonical)), canonical));
+	return Option.some(relativePeriod(entry.unit, direction, canonical));
 };
 const parseRollingPeriod = (input) => {
+	const singular = singularRollingPhrases.find((entry) => entry.phrase === input);
+	if (singular !== void 0) {
+		const range = singular.future ? futureRange(1, singular.entry.unit) : trailingRange(1, singular.entry.unit);
+		return Option.some(candidate(range, singularRollingCanonical(singular.entry, singular.future)));
+	}
 	const since = String$1.match(rollingSincePattern)(input);
 	const past = firstPatternMatch(input, rollingPastPatterns);
 	const bare = String$1.match(rollingBarePattern)(input);
@@ -446,15 +643,26 @@ const parseRollingPeriod = (input) => {
 	]);
 	if (Option.isNone(match)) return Option.none();
 	const amount = parseTrailingCount(textAt(match.value, 1));
-	const unit = countedUnit(textAt(match.value, 2));
-	if (Option.isNone(amount) || unit === void 0) return Option.none();
-	const entry = units.find((item) => item.unit === unit);
+	if (Option.isNone(amount)) return Option.none();
+	const entry = countedUnit(textAt(match.value, 2), amount.value);
 	if (entry === void 0) return Option.none();
 	const isFuture = Option.isSome(future);
-	const range = isFuture ? futureRange(amount.value, unit) : trailingRange(amount.value, unit);
+	const range = isFuture ? futureRange(amount.value, entry.unit) : trailingRange(amount.value, entry.unit);
+	if (amount.value === 1) return Option.some(candidate(range, singularRollingCanonical(entry, isFuture)));
 	const modifier = isFuture ? "komende" : "afgelopen";
-	const noun = amount.value === 1 ? entry.singular : entry.plural;
-	return Option.some(candidate(range, `de ${modifier} ${amount.value} ${noun}`));
+	return Option.some(candidate(range, `de ${modifier} ${amount.value} ${entry.plural}`));
+};
+const parseElidedDateRange = (input) => {
+	const joined = String$1.match(/^(?:van ([0-3]?\d) tot(?: en met)?|tussen (?:de )?([0-3]?\d)(?:e)? en(?: de)?) ([0-3]?\d)(?:e)? (.+)$/u)(input);
+	const dashed = String$1.match(/^([0-3]?\d)[–—-]([0-3]?\d) (.+)$/u)(input);
+	const match = Option.firstSomeOf([joined, dashed]);
+	if (Option.isNone(match)) return Option.none();
+	const isJoined = Option.isSome(joined);
+	const lowerDay = textAt(match.value, 1) || textAt(match.value, 2);
+	const upperDay = textAt(match.value, isJoined ? 3 : 2);
+	const period = afterVan(textAt(match.value, isJoined ? 4 : 3));
+	const suffix = periodAliases.some((entry) => entry[0] === period && entry[1] === "month") ? `van ${period}` : period;
+	return joinedPeriodCandidate(`van ${lowerDay} ${suffix} tot en met ${upperDay} ${suffix}`, [["van ", " tot en met "]], parsePeriod, (lower, upper) => `van ${lower} tot en met ${upper}`);
 };
 const boundaryCandidate = (input) => openBoundaryCandidate(input, [
 	["tot voor ", "before"],
@@ -479,12 +687,12 @@ const parseDutch = (input) => {
 		"sinds nu",
 		"voortaan"
 	].includes(input)) return Option.some(candidate(fromNowRange(), "vanaf nu"));
-	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), toDate.entry.toDate));
+	const elided = parseElidedDateRange(input);
+	if (Option.isSome(elided)) return elided;
 	const nowBounded = joinedNowCandidate(input, [
 		["vanaf ", " tot nu toe"],
 		["sinds ", " tot nu toe"],
@@ -492,7 +700,8 @@ const parseDutch = (input) => {
 	], [
 		"vanaf nu tot en met ",
 		"van vandaag tot en met ",
-		"tussen vandaag en "
+		"tussen vandaag en ",
+		"nu tot en met "
 	], parsePeriod, (period) => `vanaf ${period} tot nu toe`, (period) => `vanaf nu tot en met ${period}`);
 	if (Option.isSome(nowBounded)) return nowBounded;
 	const bounded = joinedPeriodCandidate(input, [
@@ -508,16 +717,28 @@ const parseDutch = (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 = [
-	...periodAliases.map((entry) => entry[0]),
+const weekendPhrases = [
 	"dit weekend",
 	"vorig weekend",
 	"volgend weekend",
 	"het weekend voor het vorige",
-	"het weekend na het volgende",
-	...periodAliases.flatMap((entry) => [`begin van ${entry[0]}`, `eind van ${entry[0]}`]),
+	"het weekend na het volgende"
+];
+const edgePeriodPhrases = [
+	...units.filter((entry) => entry.unit !== "day").flatMap((entry) => [
+		entry.current,
+		entry.previous,
+		entry.next
+	]),
+	...weekendPhrases,
+	...months
+].flatMap((period) => [`begin van ${period}`, `eind van ${period}`]);
+const staticPeriodPhrases = [
+	...periodAliases.map((entry) => entry[0]),
+	...weekendPhrases,
+	...edgePeriodPhrases,
 	...[
 		1,
 		2,
@@ -531,9 +752,12 @@ const staticPeriodPhrases = [
 	]),
 	...months.flatMap((month) => [
 		month,
+		`vorige ${month}`,
+		`volgende ${month}`,
 		`${month} vorig jaar`,
 		`${month} volgend jaar`
-	])
+	]),
+	...nextWeekdayPhrases
 ];
 const staticPeriods = periodsFromPhrases(staticPeriodPhrases, parsePeriod);
 const boundaryPrefixes = [
@@ -563,6 +787,8 @@ const countedSuggestions = (input) => {
 const dutchSuggestionPhrases = [
 	...units.map((entry) => entry.toDate),
 	...units.map((entry) => entry.remaining),
+	...singularRollingPhrases.map((entry) => entry.phrase),
+	...singularCalendarOffsets.map((entry) => entry.phrase),
 	...staticPeriodPhrases,
 	...prefixNaturalPhrases(staticPeriodPhrases, boundaryPrefixes),
 	"tot nu toe",
@@ -578,6 +804,16 @@ const suggestDutch = (input, limit) => {
 	], limit);
 };
 const renderDutch = (range) => {
+	const shifted = decomposeShiftedPeriodRange(range);
+	if (Option.isSome(shifted)) {
+		const base = renderDutch(shifted.value.baseRange);
+		const entry = units.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.singular : entry.plural;
+			return Option.some(shifted.value.amount < 0 ? `${base.value} ${amount} ${noun} geleden` : `${base.value} over ${amount} ${noun}`);
+		}
+	}
 	const offset = calendarPeriodOffset(range);
 	if (Option.isSome(offset) && Math.abs(offset.value.amount) > 1) {
 		const entry = units.find((unit) => unit.unit === offset.value.unit);
@@ -590,26 +826,25 @@ const renderDutch = (range) => {
 	const future = futurePeriod(range);
 	if (Option.isSome(future)) {
 		const entry = units.find((unit) => unit.unit === future.value.unit);
-		if (entry !== void 0) {
-			const noun = future.value.amount === 1 ? entry.singular : entry.plural;
-			return Option.some(`de komende ${future.value.amount} ${noun}`);
-		}
+		if (entry !== void 0) return Option.some(future.value.amount === 1 ? singularRollingCanonical(entry, true) : `de komende ${future.value.amount} ${entry.plural}`);
 	}
 	const trailing = trailingPeriod(range);
 	if (Option.isSome(trailing)) {
 		const entry = units.find((unit) => unit.unit === trailing.value.unit);
-		if (entry !== void 0) {
-			const noun = trailing.value.amount === 1 ? entry.singular : entry.plural;
-			return Option.some(`de afgelopen ${trailing.value.amount} ${noun}`);
-		}
+		if (entry !== void 0) return Option.some(trailing.value.amount === 1 ? singularRollingCanonical(entry, false) : `de afgelopen ${trailing.value.amount} ${entry.plural}`);
 	}
-	const periods = [...staticPeriods, ...periodsFromPhrases([...datedPeriods(range, months), ...datedQuarterPeriods(range).map((phrase) => phrase.startsWith("Q") ? `K${phrase.slice(1)}` : phrase)], parsePeriod)];
+	const periods = [
+		...staticPeriods,
+		...currentYearDatePeriods(range, currentDateLabel),
+		...periodsFromPhrases([...datedPeriods(range, months), ...datedQuarterPeriods(range).map((phrase) => phrase.startsWith("Q") ? `K${phrase.slice(1)}` : phrase)], parsePeriod)
+	];
 	return renderPeriodRange(range, [...units.map((entry) => candidate(periodToDateRange(entry.unit), entry.toDate)), ...units.map((entry) => candidate(remainingPeriodRange(entry.unit), entry.remaining))], periods, (period) => `vanaf ${period}`, (period) => `voor ${period}`, (period) => `tot en met ${period}`, (period) => `na ${period}`, (lower, upper) => `van ${lower} tot en met ${upper}`, (period) => `vanaf ${period} tot nu toe`, (period) => `vanaf nu tot en met ${period}`, () => "tot nu toe", () => "vanaf nu");
 };
 const DutchContribution = new BaseLanguageContribution({
 	locale: "nl",
 	vocabulary: [
 		...months,
+		...weekdays,
 		...monthAbbreviations.flatMap((aliases) => aliases),
 		...units.flatMap((entry) => [
 			entry.singular,
@@ -624,10 +859,13 @@ const DutchContribution = new BaseLanguageContribution({
 		"begin",
 		"binnen",
 		"eind",
+		"en",
 		"geleden",
 		"komende",
 		"laatste",
+		"met",
 		"na",
+		"nu",
 		"over",
 		"rest",
 		"sinds",
@@ -637,8 +875,8 @@ const DutchContribution = new BaseLanguageContribution({
 		"volgend",
 		"voor"
 	],
-	normalize: normalizeNaturalText,
-	correct: correctWhitespaceSeparatedText,
+	normalize: normalizeDutch,
+	correct: correctDutch,
 	parseExact: parseDutch,
 	suggest: suggestDutch,
 	render: renderDutch