chronolizer 0.3.0 → 0.4.1

package/dist/locales/fr.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 { absoluteDatePeriod, calendarPeriodOffset, candidate, currentYearDatePeriods, datedPeriods, datedQuarterPeriods, fixedDatePeriod, fixedMonthPeriod, fixedQuarterPeriod, fixedYearPeriod, fromNowRange, futurePeriod, futureRange, isoDate, joinedNowCandidate, joinedPeriodCandidate, monthOfRelativeYear, namedCurrentYearDatePeriod, namedDatePeriod, openBoundaryCandidate, parseTrailingCount, periodBoundaryCandidate, periodDay, periodEndDay, periodRange, periodStartDay, periodToDateRange, periodsFromPhrases, quarterOfRelativeYear, relativePeriod, relativeWeekend, remainingPeriodRange, renderPeriodRange, textAt, trailingPeriod, trailingRange, untilNowRange, validYear } from "./shared.mjs";
+import { absoluteDatePeriod, calendarPeriodOffset, candidate, compileCountAliasNormalizer, countAliasVocabulary, currentYearDatePeriods, datedPeriods, datedQuarterPeriods, decomposeShiftedPeriodRange, fixedMonthPeriod, fixedQuarterPeriod, fixedYearPeriod, fromNowRange, futurePeriod, futureRange, joinedNowCandidate, joinedPeriodCandidate, monthOfRelativeYear, namedCurrentYearDatePeriod, namedDatePeriod, openBoundaryCandidate, parseTrailingCount, periodBoundaryCandidate, 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/fr.ts
 const months = [
@@ -21,6 +20,90 @@ const months = [
 	"novembre",
 	"décembre"
 ];
+const weekdays = [
+	"lundi",
+	"mardi",
+	"mercredi",
+	"jeudi",
+	"vendredi",
+	"samedi",
+	"dimanche"
+];
+const nextWeekdayPhrases = weekdays.map((weekday) => `${weekday} prochain`);
+const frenchCountWords = [
+	["deux"],
+	["trois"],
+	["quatre"],
+	["cinq"],
+	["six"],
+	["sept"],
+	["huit"],
+	["neuf"],
+	["dix"],
+	["onze"],
+	["douze"],
+	["treize"],
+	["quatorze"],
+	["quinze"],
+	["seize"],
+	["dix-sept"],
+	["dix-huit"],
+	["dix-neuf"],
+	["vingt"]
+];
+const frenchCompoundCountAliases = () => {
+	const words = [
+		"",
+		"un",
+		"deux",
+		"trois",
+		"quatre",
+		"cinq",
+		"six",
+		"sept",
+		"huit",
+		"neuf",
+		"dix",
+		"onze",
+		"douze",
+		"treize",
+		"quatorze",
+		"quinze",
+		"seize",
+		"dix-sept",
+		"dix-huit",
+		"dix-neuf"
+	];
+	const aliases = [];
+	for (let amount = 21; amount <= 99; amount += 1) {
+		const tens = Math.floor(amount / 10);
+		const remainder = amount % 10;
+		let phrase = "";
+		if (tens <= 6) {
+			const tensWord = [
+				"",
+				"",
+				"vingt",
+				"trente",
+				"quarante",
+				"cinquante",
+				"soixante"
+			][tens];
+			if (tensWord === void 0) continue;
+			if (remainder === 0) phrase = tensWord;
+			else phrase = remainder === 1 ? `${tensWord} et un` : `${tensWord}-${words[remainder] ?? ""}`;
+		} else if (tens === 7) phrase = remainder === 1 ? "soixante et onze" : `soixante-${words[10 + remainder] ?? ""}`;
+		else if (tens === 8) phrase = remainder === 0 ? "quatre-vingts" : `quatre-vingt-${words[remainder] ?? ""}`;
+		else phrase = `quatre-vingt-${words[10 + remainder] ?? ""}`;
+		aliases.push([phrase, amount], [phrase.replaceAll("-", " "), amount]);
+		if (amount % 10 === 1) aliases.push([phrase.replace(/un$/u, "une"), amount]);
+	}
+	return aliases;
+};
+const frenchCountAliases = [...sequentialCountAliases(frenchCountWords, 2), ...frenchCompoundCountAliases()];
+const normalizeFrenchCounts = compileCountAliasNormalizer(frenchCountAliases);
+const frenchCountVocabulary = new Set(countAliasVocabulary(frenchCountAliases));
+const correctFrench = (input, vocabulary) => correctWhitespaceSeparatedText(input, vocabulary, frenchCountVocabulary);
 const monthAbbreviations = [
 	["jan", "janv"],
 	[
@@ -416,15 +499,7 @@ const parseNamedDate = (input) => {
 	const named = String$1.match(/^(?:le )?(1er|[0-3]?\d)(?: de)? ([a-zàâçéèêëîïôûùüÿœ]+\.?),?(?: de)? (\d{4})$/u)(input);
 	if (Option.isSome(named)) return namedDatePeriod(textAt(named.value, 3), textAt(named.value, 2), textAt(named.value, 1).replace(/er$/u, ""), monthNumber, dateLabel);
 	const numeric = String$1.match(/^([0-3]?\d)[./-]([01]?\d)[./-](\d{4})$/u)(input);
-	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)));
-		}
-	}
+	if (Option.isSome(numeric)) return namedDatePeriod(textAt(numeric.value, 3), textAt(numeric.value, 2), textAt(numeric.value, 1), Number, dateLabel);
 	const current = String$1.match(/^(?:le )?(1er|[0-3]?\d)(?: de)? ([a-zàâçéèêëîïôûùüÿœ]+\.?)$/u)(input);
 	if (Option.isSome(current)) return namedCurrentYearDatePeriod(textAt(current.value, 2), textAt(current.value, 1).replace(/er$/u, ""), monthNumber, currentDateLabel);
 	const relative = String$1.match(/^(?:le )?(1er|[0-3]?\d) (de .+|du .+)$/u)(input);
@@ -461,13 +536,13 @@ const parseQuarter = (input) => {
 	const quarter = quarterNumber(textAt(standalone.value, 1));
 	return quarter === void 0 ? Option.none() : Option.some(quarterOfRelativeYear(quarter, 0, `T${quarter}`));
 };
-const parseBasePeriod = (input) => {
-	const absoluteDate = absoluteDatePeriod(input, "fr");
-	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, "fr"),
+		parseNamedDate(input),
+		parseQuarter(input)
+	]);
+	if (Option.isSome(knownPeriod)) return knownPeriod;
 	const yearMatch = String$1.match(/^(?:(?:l')?année |annee )?(\d{4})$/u)(input);
 	if (Option.isSome(yearMatch)) {
 		const year = validYear(textAt(yearMatch.value, 1));
@@ -479,6 +554,20 @@ const parseBasePeriod = (input) => {
 		const year = validYear(textAt(monthYear.value, 2));
 		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 suffixedRelativeMonth = String$1.match(/^([a-zàâçéèêëîïôûùüÿœ]+\.?) (dernier|prochain)$/u)(input);
+	if (Option.isSome(suffixedRelativeMonth)) {
+		const month = monthNumber(textAt(suffixedRelativeMonth.value, 1));
+		if (month !== void 0) {
+			const modifier = textAt(suffixedRelativeMonth.value, 2);
+			const direction = modifier === "dernier" ? -1 : 1;
+			return Option.some(monthOfRelativeYear(month, direction, `${textAt(months, month - 1)} ${modifier}`));
+		}
+	}
 	const relativeMonth = String$1.match(/^([a-zàâçéèêëîïôûùüÿœ]+\.?) de (l'année dernière|l'annee derniere|l'année prochaine|l'annee prochaine|cette année|cette annee)$/u)(input);
 	if (Option.isSome(relativeMonth)) {
 		const month = monthNumber(textAt(relativeMonth.value, 1));
@@ -509,13 +598,32 @@ const parseBasePeriod = (input) => {
 	].includes(input)) return Option.some(relativeWeekend(1, "le week-end prochain"));
 	if (input === "l'avant-dernier week-end") return Option.some(relativeWeekend(-2, input));
 	if (input === "le week-end après le prochain") 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(/^(.+) (il y a|dans) ([1-9]\d*) (jour|jours|semaine|semaines|mois|trimestre|trimestres|an|ans|année|annee|années|annees)$/u)(input);
+	if (Option.isSome(shifted)) {
+		const amount = parseTrailingCount(textAt(shifted.value, 3));
+		const alias = unitAliases.find((unit) => unit[0] === textAt(shifted.value, 4));
+		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, 2) === "il y a";
+			const direction = past ? -amount.value : amount.value;
+			const noun = amount.value === 1 ? entry.singular : entry.plural;
+			const canonical = `${period.value.canonical} ${past ? "il y a" : "dans"} ${amount.value} ${noun}`;
+			return Option.some(shiftPeriod(period.value, direction, entry.unit, canonical));
+		}
+	}
 	const edge = String$1.match(/^(?:le |la |l')?(début|debut|commencement|fin)(?: du | de la | de l'| de )(.+)$/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 implicitUnit = unitAliases.find((entry) => entry[0] === periodText)?.[1];
+		const implicit = units.find((entry) => entry.unit === implicitUnit);
+		const period = Option.isSome(basePeriod) || implicit === void 0 ? basePeriod : Option.some(relativePeriod(implicit.unit, 0, implicit.current));
 		if (Option.isSome(period)) {
 			const isEnd = edgeName === "fin";
 			const canonical = `${isEnd ? "fin" : "début"} ${withDe(period.value.canonical)}`;
@@ -529,7 +637,8 @@ const parsePeriod = (input) => {
 		"tout le ",
 		"toute la "
 	].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 plural = value === "mois" || value.endsWith("s");
@@ -537,36 +646,29 @@ const countedUnit = (value, amount) => {
 	const unit = unitAliases.find((entry) => entry[0] === value)?.[1];
 	return unit === void 0 ? void 0 : units.find((entry) => entry.unit === unit);
 };
+const rollingPastModifierPattern = "derni(?:ers|ères|eres)|pass(?:és|ées|es)|pr[eé]c[eé]dent(?:s|es)";
+const rollingFutureModifierPattern = "prochain(?:s|es)|suivant(?:s|es)";
+const rollingModifierMatchPattern = new RegExp(`(?:^| )(${`${rollingPastModifierPattern}|${rollingFutureModifierPattern}`})(?: |$)`, "u");
 const modifierAgreesWithNoun = (input, noun) => {
-	const match = String$1.match(/(?:^| )(derniers|dernières|dernieres|passés|passées|passes|précédents|précédentes|precedents|precedentes|prochains|prochaines|suivants|suivantes)(?: |$)/u)(input);
+	const match = String$1.match(rollingModifierMatchPattern)(input);
 	if (Option.isNone(match)) return true;
 	const modifier = textAt(match.value, 1);
-	return (noun.startsWith("semaine") || noun.startsWith("année") || noun.startsWith("annee")) === [
-		"dernières",
-		"dernieres",
-		"passées",
-		"passes",
-		"précédentes",
-		"precedentes",
-		"prochaines",
-		"suivantes"
-	].includes(modifier);
+	return (noun.startsWith("semaine") || noun.startsWith("année") || noun.startsWith("annee")) === modifier.endsWith("es");
 };
-const countedUnitPattern = "jour|jours|semaine|semaines|mois|trimestre|trimestres|an|ans|année|annee|années|annees";
-const compileCountedPattern = (source) => new RegExp(source.replace("UNIT", countedUnitPattern), "u");
-const calendarPastPattern = compileCountedPattern("^il y a ([1-9]\\d*) (UNIT)$");
-const calendarFuturePattern = compileCountedPattern("^dans ([1-9]\\d*) (UNIT)$");
-const rollingSincePattern = compileCountedPattern("^depuis ([1-9]\\d*) (UNIT)$");
-const rollingBarePattern = compileCountedPattern("^([1-9]\\d*) (UNIT)$");
+const compilePattern = (source) => new RegExp(source, "u");
+const calendarPastPattern = /^il y a ([1-9]\d*) ([^ ]+)$/u;
+const calendarFuturePattern = /^dans ([1-9]\d*) ([^ ]+)$/u;
+const rollingSincePattern = /^depuis ([1-9]\d*) ([^ ]+)$/u;
+const rollingBarePattern = /^([1-9]\d*) ([^ ]+)$/u;
 const rollingPastPatterns = [
-	compileCountedPattern("^(?:(?:les|la) )?(?:derniers|dernières|dernieres|passés|passées|passes|précédents|précédentes|precedents|precedentes) ([1-9]\\d*) (UNIT)$"),
-	compileCountedPattern("^(?:(?:les|la|au cours des|pendant les) )?([1-9]\\d*) (?:derniers|dernières|dernieres|passés|passées|passes|précédents|précédentes|precedents|precedentes) (UNIT)$"),
-	compileCountedPattern("^([1-9]\\d*) (UNIT) (?:derniers|dernières|dernieres|passés|passées|passes|précédents|précédentes|precedents|precedentes)$")
+	compilePattern(`^(?:(?:les|la) )?(?:${rollingPastModifierPattern}) ([1-9]\\d*) ([^ ]+)$`),
+	compilePattern(`^(?:(?:les|la|au cours des|pendant les) )?([1-9]\\d*) (?:${rollingPastModifierPattern}) ([^ ]+)$`),
+	compilePattern(`^([1-9]\\d*) ([^ ]+) (?:${rollingPastModifierPattern})$`)
 ];
 const rollingFuturePatterns = [
-	compileCountedPattern("^(?:(?:les|la) )?(?:prochains|prochaines|suivants|suivantes) ([1-9]\\d*) (UNIT)$"),
-	compileCountedPattern("^(?:(?:les|la|au cours des|pendant les) )?([1-9]\\d*) (?:prochains|prochaines|suivants|suivantes) (UNIT)$"),
-	compileCountedPattern("^([1-9]\\d*) (UNIT) (?:prochains|prochaines|suivants|suivantes|à venir)$")
+	compilePattern(`^(?:(?:les|la) )?(?:${rollingFutureModifierPattern}) ([1-9]\\d*) ([^ ]+)$`),
+	compilePattern(`^(?:(?:les|la|au cours des|pendant les) )?([1-9]\\d*) (?:${rollingFutureModifierPattern}) ([^ ]+)$`),
+	compilePattern(`^([1-9]\\d*) ([^ ]+) (?:${rollingFutureModifierPattern}|à venir)$`)
 ];
 const firstPatternMatch = (input, patterns) => Option.firstSomeOf(patterns.map((pattern) => String$1.match(pattern)(input)));
 const relativeCountPhrase = (amount, entry, future) => {
@@ -623,7 +725,7 @@ const singularCalendarOffsets = units.flatMap((entry) => {
 });
 const parseCalendarOffset = (input) => {
 	const singular = singularCalendarOffsets.find((entry) => entry.phrase === input);
-	if (singular !== void 0) return Option.some(candidate(periodRange(relativePeriod(singular.entry.unit, singular.direction, singular.phrase)), singular.phrase));
+	if (singular !== void 0) return Option.some(relativePeriod(singular.entry.unit, singular.direction, singular.phrase));
 	const past = String$1.match(calendarPastPattern)(input);
 	const future = String$1.match(calendarFuturePattern)(input);
 	const match = Option.firstSomeOf([past, future]);
@@ -635,7 +737,7 @@ const parseCalendarOffset = (input) => {
 	const direction = Option.isSome(past) ? -amount.value : amount.value;
 	const noun = amount.value === 1 ? entry.singular : entry.plural;
 	const canonical = direction < 0 ? `il y a ${amount.value} ${noun}` : `dans ${amount.value} ${noun}`;
-	return Option.some(candidate(periodRange(relativePeriod(entry.unit, direction, canonical)), canonical));
+	return Option.some(relativePeriod(entry.unit, direction, canonical));
 };
 const parseRollingPeriod = (input) => {
 	const singular = singularRollingPhrases.find((entry) => entry.phrase === input);
@@ -708,8 +810,6 @@ const parseFrench = (input) => {
 		"à partir de maintenant",
 		"désormais"
 	].includes(input)) return Option.some(candidate(fromNowRange(), "depuis maintenant"));
-	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);
@@ -723,7 +823,8 @@ const parseFrench = (input) => {
 	], [
 		"d'aujourd'hui à ",
 		"de maintenant à ",
-		"entre aujourd'hui et "
+		"entre aujourd'hui et ",
+		"maintenant à "
 	], parsePeriod, (period) => `depuis ${period} jusqu'à maintenant`, (period) => `de maintenant à ${period}`);
 	if (Option.isSome(nowBounded)) return nowBounded;
 	const bounded = joinedPeriodCandidate(input, [
@@ -775,9 +876,12 @@ const staticPeriodPhrases = [
 	]),
 	...months.flatMap((month) => [
 		month,
+		`${month} dernier`,
+		`${month} prochain`,
 		`${month} de l'année dernière`,
 		`${month} de l'année prochaine`
-	])
+	]),
+	...nextWeekdayPhrases
 ];
 const staticPeriods = periodsFromPhrases(staticPeriodPhrases, parsePeriod);
 const boundaryPrefixes = [
@@ -826,6 +930,17 @@ const suggestFrench = (input, limit) => {
 	], limit);
 };
 const renderFrench = (range) => {
+	const shifted = decomposeShiftedPeriodRange(range);
+	if (Option.isSome(shifted)) {
+		const base = renderFrench(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;
+			const direction = shifted.value.amount < 0 ? "il y a" : "dans";
+			return Option.some(`${base.value} ${direction} ${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);
@@ -852,11 +967,12 @@ const renderFrench = (range) => {
 	];
 	return renderPeriodRange(range, [...units.map((entry) => candidate(periodToDateRange(entry.unit), entry.toDate)), ...units.map((entry) => candidate(remainingPeriodRange(entry.unit), entry.remaining))], periods, (period) => `depuis ${period}`, (period) => `avant ${period}`, untilLabel, (period) => `après ${period}`, rangeLabel, (period) => `depuis ${period} jusqu'à maintenant`, (period) => `de maintenant à ${period}`, () => "jusqu'à maintenant", () => "depuis maintenant");
 };
-const normalizeFrench = (input, locale) => normalizeNaturalText(input, locale).replaceAll("’", "'");
+const normalizeFrench = (input, locale) => normalizeFrenchCounts(normalizeNaturalText(input, locale).replaceAll("’", "'"));
 const FrenchContribution = new BaseLanguageContribution({
 	locale: "fr",
 	vocabulary: [
 		...months,
+		...weekdays,
 		...monthAbbreviations.flatMap((aliases) => aliases),
 		...units.flatMap((entry) => [
 			entry.singular,
@@ -887,7 +1003,7 @@ const FrenchContribution = new BaseLanguageContribution({
 		"jusqu'à"
 	],
 	normalize: normalizeFrench,
-	correct: correctWhitespaceSeparatedText,
+	correct: correctFrench,
 	parseExact: parseFrench,
 	suggest: suggestFrench,
 	render: renderFrench

package/dist/locales/nl.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 { absoluteDatePeriod, calendarPeriodOffset, candidate, currentYearDatePeriods, datedPeriods, datedQuarterPeriods, fixedDatePeriod, fixedMonthPeriod, fixedQuarterPeriod, fixedYearPeriod, fromNowRange, futurePeriod, futureRange, isoDate, joinedNowCandidate, joinedPeriodCandidate, monthOfRelativeYear, namedCurrentYearDatePeriod, namedDatePeriod, openBoundaryCandidate, parseTrailingCount, periodDay, periodEndDay, periodRange, periodStartDay, periodToDateRange, periodsFromPhrases, quarterOfRelativeYear, relativePeriod, relativeWeekend, remainingPeriodRange, renderPeriodRange, textAt, trailingPeriod, trailingRange, untilNowRange, validYear } from "./shared.mjs";
+import { absoluteDatePeriod, calendarPeriodOffset, candidate, compileCountAliasNormalizer, compoundCountAliases, countAliasVocabulary, currentYearDatePeriods, datedPeriods, datedQuarterPeriods, decimalTens, decomposeShiftedPeriodRange, fixedMonthPeriod, fixedQuarterPeriod, fixedYearPeriod, fromNowRange, futurePeriod, futureRange, joinedNowCandidate, joinedPeriodCandidate, monthOfRelativeYear, namedCurrentYearDatePeriod, namedDatePeriod, openBoundaryCandidate, parseTrailingCount, 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 +20,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"],
@@ -350,15 +397,7 @@ 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.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)));
-		}
-	}
+	if (Option.isSome(numeric)) return namedDatePeriod(textAt(numeric.value, 3), textAt(numeric.value, 2), textAt(numeric.value, 1), Number, dateLabel);
 	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);
@@ -395,13 +434,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) => {
-	const absoluteDate = absoluteDatePeriod(input, "nl");
-	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, "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));
@@ -413,6 +452,20 @@ const parseBasePeriod = (input) => {
 		const year = validYear(textAt(monthYear.value, 2));
 		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);
 	const relativeMatch = Option.firstSomeOf([relativeMonth, relativeMonthYearFirst]);
@@ -445,13 +498,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}`;
@@ -465,21 +538,20 @@ 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 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|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 calendarPastPattern = /^([1-9]\d*) ([^ ]+) geleden$/u;
+const calendarFuturePatterns = [/^(?:over|binnen) ([1-9]\d*) ([^ ]+)$/u, /^([1-9]\d*) ([^ ]+) later$/u];
+const rollingPastPatterns = [/^(?:(?:de|in de) )?(?:afgelopen|laatste|vorige) ([1-9]\d*) ([^ ]+)$/u, /^([1-9]\d*) (?:afgelopen|laatste|vorige) ([^ ]+)$/u];
+const rollingFuturePatterns = [/^(?:(?:de|in de|binnen de) )?(?:komende|volgende|aankomende) ([1-9]\d*) ([^ ]+)$/u, /^([1-9]\d*) (?:komende|volgende|aankomende) ([^ ]+)$/u];
+const rollingSincePattern = /^(?:sinds|gedurende) ([1-9]\d*) ([^ ]+)$/u;
+const rollingBarePattern = /^([1-9]\d*) ([^ ]+)$/u;
 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) => [
@@ -528,7 +600,7 @@ const singularCalendarOffsets = units.flatMap((entry) => [
 ]);
 const parseCalendarOffset = (input) => {
 	const singular = singularCalendarOffsets.find((entry) => entry.phrase === input);
-	if (singular !== void 0) return Option.some(candidate(periodRange(relativePeriod(singular.entry.unit, singular.direction, singular.phrase)), singular.phrase));
+	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]);
@@ -540,7 +612,7 @@ const parseCalendarOffset = (input) => {
 	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(entry.unit, direction, canonical)), canonical));
+	return Option.some(relativePeriod(entry.unit, direction, canonical));
 };
 const parseRollingPeriod = (input) => {
 	const singular = singularRollingPhrases.find((entry) => entry.phrase === input);
@@ -604,8 +676,6 @@ 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);
@@ -619,7 +689,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, [
@@ -670,9 +741,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 = [
@@ -719,6 +793,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);
@@ -749,6 +833,7 @@ const DutchContribution = new BaseLanguageContribution({
 	locale: "nl",
 	vocabulary: [
 		...months,
+		...weekdays,
 		...monthAbbreviations.flatMap((aliases) => aliases),
 		...units.flatMap((entry) => [
 			entry.singular,
@@ -763,10 +848,13 @@ const DutchContribution = new BaseLanguageContribution({
 		"begin",
 		"binnen",
 		"eind",
+		"en",
 		"geleden",
 		"komende",
 		"laatste",
+		"met",
 		"na",
+		"nu",
 		"over",
 		"rest",
 		"sinds",
@@ -776,8 +864,8 @@ const DutchContribution = new BaseLanguageContribution({
 		"volgend",
 		"voor"
 	],
-	normalize: normalizeNaturalText,
-	correct: correctWhitespaceSeparatedText,
+	normalize: normalizeDutch,
+	correct: correctDutch,
 	parseExact: parseDutch,
 	suggest: suggestDutch,
 	render: renderDutch