chronolizer 0.3.0 → 0.4.0

package/dist/locales/es.mjs

@@ -4,7 +4,7 @@ import { normalizeNaturalText } from "../natural/text.mjs";
 import { defineLanguagePlugin, languagePluginsLayer } from "../language/registry.mjs";
 import { correctWhitespaceSeparatedText } from "../natural/correction.mjs";
 import { completeNaturalPhrases, fixedCalendarPeriodPhrases, naturalCount, prefixNaturalPhrases } from "../natural/suggestion.mjs";
-import { absoluteDatePeriod, calendarPeriodOffset, candidate, currentYearDatePeriods, datedPeriods, datedQuarterPeriods, fixedDatePeriod, fixedMonthPeriod, fixedQuarterPeriod, fixedYearPeriod, fromNowRange, futurePeriod, futureRange, isoDate, joinedNowCandidate, joinedPeriodCandidate, monthOfRelativeYear, namedCurrentYearDatePeriod, namedDatePeriod, openBoundaryCandidate, parseTrailingCount, periodBoundaryCandidate, 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, fixedDatePeriod, fixedMonthPeriod, fixedQuarterPeriod, fixedYearPeriod, fromNowRange, futurePeriod, futureRange, isoDate, 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/es.ts
 const months = [
@@ -21,6 +21,99 @@ const months = [
 	"noviembre",
 	"diciembre"
 ];
+const weekdays = [
+	"lunes",
+	"martes",
+	"miércoles",
+	"jueves",
+	"viernes",
+	"sábado",
+	"domingo"
+];
+const nextWeekdays = weekdays.flatMap((weekday, day) => [
+	{
+		phrase: `próximo ${weekday}`,
+		day,
+		canonical: `el próximo ${weekday}`
+	},
+	{
+		phrase: `el próximo ${weekday}`,
+		day,
+		canonical: `el próximo ${weekday}`
+	},
+	{
+		phrase: `proximo ${weekday}`,
+		day,
+		canonical: `el próximo ${weekday}`
+	},
+	{
+		phrase: `el proximo ${weekday}`,
+		day,
+		canonical: `el próximo ${weekday}`
+	}
+]);
+const spanishCountWords = [
+	["dos"],
+	["tres"],
+	["cuatro"],
+	["cinco"],
+	["seis"],
+	["siete"],
+	["ocho"],
+	["nueve"],
+	["diez"],
+	["once"],
+	["doce"],
+	["trece"],
+	["catorce"],
+	["quince"],
+	["dieciséis", "dieciseis"],
+	["diecisiete"],
+	["dieciocho"],
+	["diecinueve"],
+	["veinte"]
+];
+const spanishCountOnes = [
+	[1, "uno"],
+	[2, "dos"],
+	[3, "tres"],
+	[4, "cuatro"],
+	[5, "cinco"],
+	[6, "seis"],
+	[7, "siete"],
+	[8, "ocho"],
+	[9, "nueve"]
+];
+const spanishCountAliases = [...sequentialCountAliases(spanishCountWords, 2), ...compoundCountAliases(decimalTens([
+	"veinte",
+	"treinta",
+	"cuarenta",
+	"cincuenta",
+	"sesenta",
+	"setenta",
+	"ochenta",
+	"noventa"
+]), spanishCountOnes, (ten, one, amount) => {
+	if (amount === 21) return [
+		"veintiuno",
+		"veintiún",
+		"veintiun",
+		"veintiuna"
+	];
+	if (amount === 22) return ["veintidós", "veintidos"];
+	if (amount === 23) return ["veintitrés", "veintitres"];
+	if (amount === 26) return ["veintiséis", "veintiseis"];
+	if (amount < 30) return [`veinti${one}`];
+	return (one === "uno" ? [
+		one,
+		"un",
+		"una"
+	] : [one]).map((variant) => `${ten} y ${variant}`);
+})];
+const normalizeSpanishCounts = compileCountAliasNormalizer(spanishCountAliases);
+const spanishCountVocabulary = new Set(countAliasVocabulary(spanishCountAliases));
+const correctSpanish = (input, vocabulary) => correctWhitespaceSeparatedText(input, vocabulary, spanishCountVocabulary);
+const normalizeSpanish = (input, locale) => normalizeSpanishCounts(normalizeNaturalText(input, locale));
 const monthAbbreviations = [
 	["ene"],
 	["feb"],
@@ -513,13 +606,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, "es");
-	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, "es"),
+		parseNamedDate(input),
+		parseQuarter(input)
+	]);
+	if (Option.isSome(knownPeriod)) return knownPeriod;
 	const yearMatch = String$1.match(/^(?:(?:el )?año )?(\d{4})$/u)(input);
 	if (Option.isSome(yearMatch)) {
 		const year = validYear(textAt(yearMatch.value, 1));
@@ -531,6 +624,26 @@ 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)} de ${year}`));
 	}
+	return Option.none();
+};
+const parseBasePeriod = (input) => {
+	const datedPeriod = parseDatedPeriod(input);
+	if (Option.isSome(datedPeriod)) return datedPeriod;
+	const prefixedRelativeMonth = String$1.match(/^(pasado|próximo|proximo|este) ([a-záéíóúñ]+\.?)$/u)(input);
+	const suffixedRelativeMonth = String$1.match(/^([a-záéíóúñ]+\.?) (pasado|próximo|proximo)$/u)(input);
+	const shortRelativeMonth = Option.firstSomeOf([prefixedRelativeMonth, suffixedRelativeMonth]);
+	if (Option.isSome(shortRelativeMonth)) {
+		const prefixed = Option.isSome(prefixedRelativeMonth);
+		const month = monthNumber(textAt(shortRelativeMonth.value, prefixed ? 2 : 1));
+		if (month !== void 0) {
+			const modifier = textAt(shortRelativeMonth.value, prefixed ? 1 : 2);
+			const direction = relativeYearDirection(modifier);
+			let canonicalModifier = "este";
+			if (direction < 0) canonicalModifier = "pasado";
+			if (direction > 0) canonicalModifier = "próximo";
+			return Option.some(monthOfRelativeYear(month, direction, `${canonicalModifier} ${textAt(months, month - 1)}`));
+		}
+	}
 	const relativeMonth = String$1.match(/^([a-záéíóúñ]+\.?) (del año pasado|del ano pasado|del próximo año|del proximo año|de este año|de este ano)$/u)(input);
 	if (Option.isSome(relativeMonth)) {
 		const month = monthNumber(textAt(relativeMonth.value, 1));
@@ -554,13 +667,31 @@ const parseBasePeriod = (input) => {
 	if (["el próximo fin de semana", "el proximo fin de semana"].includes(input)) return Option.some(relativeWeekend(1, "el próximo fin de semana"));
 	if (input === "el fin de semana anterior al pasado") return Option.some(relativeWeekend(-2, input));
 	if (input === "el fin de semana después del próximo") return Option.some(relativeWeekend(2, input));
-	return Option.none();
+	const weekday = nextWeekdays.find((entry) => entry.phrase === input);
+	return weekday === void 0 ? Option.none() : Option.some(relativeWeekday(weekday.day, 1, weekday.canonical));
 };
 const parsePeriod = (input) => {
+	const shifted = String$1.match(/^(.+) (hace|dentro de|en) ([1-9]\d*) (día|dia|días|dias|semana|semanas|mes|meses|trimestre|trimestres|año|años|ano|anos)$/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) === "hace";
+			const direction = past ? -amount.value : amount.value;
+			const noun = amount.value === 1 ? entry.singular : entry.plural;
+			const canonical = `${period.value.canonical} ${past ? "hace" : "dentro de"} ${amount.value} ${noun}`;
+			return Option.some(shiftPeriod(period.value, direction, entry.unit, canonical));
+		}
+	}
 	const edge = String$1.match(/^(?:el )?(inicio|comienzo|principio|fin|final)(?: de| del) (.+)$/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.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 === "fin" || edgeName === "final";
 			const canonical = `${isEnd ? "final" : "inicio"} ${withDe(period.value.canonical)}`;
@@ -574,7 +705,8 @@ const parsePeriod = (input) => {
 		"todo el ",
 		"toda 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 alias = unitAliases.find((entry) => entry[0] === value && entry[2] === (amount !== 1));
@@ -609,7 +741,7 @@ const parseCalendarOffset = (input) => {
 	const noun = amount.value === 1 ? entry.singular : entry.plural;
 	const canonical = `${isPast ? "hace" : "dentro de"} ${quantity} ${noun}`;
 	const direction = isPast ? -amount.value : amount.value;
-	return Option.some(candidate(periodRange(relativePeriod(entry.unit, direction, canonical)), canonical));
+	return Option.some(relativePeriod(entry.unit, direction, canonical));
 };
 const rollingCanonical = (entry, amount, future) => {
 	if (amount > 1) return `${rollingAdjective(entry, future, true)} ${amount} ${entry.plural}`;
@@ -617,7 +749,7 @@ const rollingCanonical = (entry, amount, future) => {
 	return future ? `desde ahora durante ${article} ${entry.singular}` : `desde hace ${article} ${entry.singular}`;
 };
 const rollingCandidate = (entry, amount, future) => candidate(future ? futureRange(amount, entry.unit) : trailingRange(amount, entry.unit), rollingCanonical(entry, amount, future));
-const parseRollingPeriod = (input) => {
+const parseRollingSince = (input) => {
 	const since = String$1.match(/^desde hace ([1-9]\d*|un|una) (día|dia|días|dias|semana|semanas|mes|meses|trimestre|trimestres|año|años|ano|anos)$/u)(input);
 	if (Option.isSome(since)) {
 		const amount = writtenAmount(textAt(since.value, 1));
@@ -627,6 +759,9 @@ const parseRollingPeriod = (input) => {
 			if (entry !== void 0 && (amountText !== "un" && amountText !== "una" || agreesWithIndefiniteArticle(entry, amountText))) return Option.some(rollingCandidate(entry, amount.value, false));
 		}
 	}
+	return Option.none();
+};
+const parseSingularRolling = (input) => {
 	const futureSingular = String$1.match(/^desde ahora durante (un|una) (día|dia|semana|mes|trimestre|año|ano)$/u)(input);
 	if (Option.isSome(futureSingular)) {
 		const entry = countedUnit(textAt(futureSingular.value, 2), 1);
@@ -644,6 +779,9 @@ const parseRollingPeriod = (input) => {
 		const modifier = textAt(nextSingular.value, 2);
 		if (entry !== void 0 && agreesWithArticle(entry, textAt(nextSingular.value, 1)) && agreesWithSingularModifier(entry, modifier, true)) return Option.some(rollingCandidate(entry, 1, true));
 	}
+	return Option.none();
+};
+const parseCountedRolling = (input) => {
 	const counted = String$1.match(/^(?:(?:durante|en) )?(?:(los|las) )?(últimos|ultimos|últimas|ultimas|pasados|pasadas|anteriores|próximos|proximos|próximas|proximas|siguientes) ([1-9]\d*) (día|dia|días|dias|semana|semanas|mes|meses|trimestre|trimestres|año|años|ano|anos)$/u)(input);
 	if (Option.isSome(counted)) {
 		const amount = parseTrailingCount(textAt(counted.value, 3));
@@ -661,6 +799,11 @@ const parseRollingPeriod = (input) => {
 	const entry = countedUnit(textAt(bare.value, 2), amount.value);
 	return entry === void 0 ? Option.none() : Option.some(rollingCandidate(entry, amount.value, false));
 };
+const parseRollingPeriod = (input) => Option.firstSomeOf([
+	parseRollingSince(input),
+	parseSingularRolling(input),
+	parseCountedRolling(input)
+]);
 const parseElidedDateRange = (input) => {
 	const joined = String$1.match(/^(?:(?:del|desde(?: el)?) ([0-3]?\d) (?:al|hasta(?: el)?)|entre(?: el)? ([0-3]?\d) y(?: el)?) ([0-3]?\d) (.+)$/u)(input);
 	const dashed = String$1.match(/^([0-3]?\d)[–—-]([0-3]?\d) (.+)$/u)(input);
@@ -698,8 +841,6 @@ const parseSpanish = (input) => {
 		"a partir de ahora",
 		"de ahora en adelante"
 	].includes(input)) return Option.some(candidate(fromNowRange(), "desde ahora"));
-	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);
@@ -714,7 +855,8 @@ const parseSpanish = (input) => {
 		"desde ahora hasta ",
 		"desde hoy hasta ",
 		"entre hoy y ",
-		"entre hoy y el "
+		"entre hoy y el ",
+		"ahora hasta "
 	], parsePeriod, (period) => `desde ${period} hasta ahora`, (period) => `desde ahora hasta ${period}`);
 	if (Option.isSome(nowBounded)) return nowBounded;
 	const bounded = joinedPeriodCandidate(input, [
@@ -769,9 +911,14 @@ const staticPeriodPhrases = [
 	]),
 	...months.flatMap((month) => [
 		month,
+		`pasado ${month}`,
+		`próximo ${month}`,
+		`${month} pasado`,
+		`${month} próximo`,
 		`${month} del año pasado`,
 		`${month} del próximo año`
-	])
+	]),
+	...nextWeekdays.map((entry) => entry.phrase)
 ];
 const staticPeriods = periodsFromPhrases(staticPeriodPhrases, parsePeriod);
 const boundaryPrefixes = [
@@ -830,6 +977,17 @@ const suggestSpanish = (input, limit) => {
 	], limit);
 };
 const renderSpanish = (range) => {
+	const shifted = decomposeShiftedPeriodRange(range);
+	if (Option.isSome(shifted)) {
+		const base = renderSpanish(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 ? "hace" : "dentro de";
+			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);
@@ -860,6 +1018,7 @@ const SpanishContribution = new BaseLanguageContribution({
 	locale: "es",
 	vocabulary: [
 		...months,
+		...weekdays,
 		...monthAbbreviations.flatMap((aliases) => aliases),
 		...units.flatMap((entry) => [
 			entry.singular,
@@ -893,8 +1052,8 @@ const SpanishContribution = new BaseLanguageContribution({
 		"resto",
 		"últimos"
 	],
-	normalize: normalizeNaturalText,
-	correct: correctWhitespaceSeparatedText,
+	normalize: normalizeSpanish,
+	correct: correctSpanish,
 	parseExact: parseSpanish,
 	suggest: suggestSpanish,
 	render: renderSpanish

package/dist/locales/fr.mjs

@@ -4,7 +4,7 @@ import { normalizeNaturalText } from "../natural/text.mjs";
 import { defineLanguagePlugin, languagePluginsLayer } from "../language/registry.mjs";
 import { correctWhitespaceSeparatedText } from "../natural/correction.mjs";
 import { completeNaturalPhrases, fixedCalendarPeriodPhrases, naturalCount, prefixNaturalPhrases } from "../natural/suggestion.mjs";
-import { absoluteDatePeriod, calendarPeriodOffset, candidate, currentYearDatePeriods, datedPeriods, datedQuarterPeriods, fixedDatePeriod, fixedMonthPeriod, fixedQuarterPeriod, fixedYearPeriod, fromNowRange, futurePeriod, futureRange, isoDate, joinedNowCandidate, joinedPeriodCandidate, monthOfRelativeYear, namedCurrentYearDatePeriod, namedDatePeriod, openBoundaryCandidate, parseTrailingCount, periodBoundaryCandidate, 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, fixedDatePeriod, fixedMonthPeriod, fixedQuarterPeriod, fixedYearPeriod, fromNowRange, futurePeriod, futureRange, isoDate, 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 +21,89 @@ 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;
+			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"],
 	[
@@ -461,13 +544,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 +562,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 +606,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 +645,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");
@@ -623,7 +740,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 +752,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 +825,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 +838,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 +891,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 +945,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 +982,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 +1018,7 @@ const FrenchContribution = new BaseLanguageContribution({
 		"jusqu'à"
 	],
 	normalize: normalizeFrench,
-	correct: correctWhitespaceSeparatedText,
+	correct: correctFrench,
 	parseExact: parseFrench,
 	suggest: suggestFrench,
 	render: renderFrench