chronolizer 0.2.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 { 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, 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"],
@@ -45,6 +138,7 @@ const units = [
 		unit: "day",
 		singular: "día",
 		plural: "días",
+		gender: "masculine",
 		current: "hoy",
 		previous: "ayer",
 		next: "mañana",
@@ -55,6 +149,7 @@ const units = [
 		unit: "week",
 		singular: "semana",
 		plural: "semanas",
+		gender: "feminine",
 		current: "esta semana",
 		previous: "la semana pasada",
 		next: "la próxima semana",
@@ -65,6 +160,7 @@ const units = [
 		unit: "month",
 		singular: "mes",
 		plural: "meses",
+		gender: "masculine",
 		current: "este mes",
 		previous: "el mes pasado",
 		next: "el próximo mes",
@@ -75,6 +171,7 @@ const units = [
 		unit: "quarter",
 		singular: "trimestre",
 		plural: "trimestres",
+		gender: "masculine",
 		current: "este trimestre",
 		previous: "el trimestre pasado",
 		next: "el próximo trimestre",
@@ -85,6 +182,7 @@ const units = [
 		unit: "year",
 		singular: "año",
 		plural: "años",
+		gender: "masculine",
 		current: "este año",
 		previous: "el año pasado",
 		next: "el próximo año",
@@ -92,21 +190,89 @@ const units = [
 		remaining: "resto del año"
 	}
 ];
-const title = (value) => `${value.slice(0, 1).toLocaleUpperCase("es")}${value.slice(1)}`;
+const gendered = (entry, masculine, feminine) => entry.gender === "feminine" ? feminine : masculine;
+const definiteArticle = (entry, plural = false) => gendered(entry, plural ? "los" : "el", plural ? "las" : "la");
+const indefiniteArticle = (entry) => gendered(entry, "un", "una");
+const withDe = (period) => period.startsWith("el ") ? `del ${period.slice(3)}` : `de ${period}`;
+const afterDe = (period) => {
+	if (period.startsWith("del ")) return `el ${period.slice(4)}`;
+	return period.startsWith("de ") ? period.slice(3) : period;
+};
+const rollingAdjective = (entry, future, plural) => {
+	if (future) return gendered(entry, plural ? "próximos" : "próximo", plural ? "próximas" : "próxima");
+	return gendered(entry, plural ? "últimos" : "último", plural ? "últimas" : "última");
+};
 const unitAliases = [
-	["día", "day"],
-	["dias", "day"],
-	["días", "day"],
-	["semana", "week"],
-	["semanas", "week"],
-	["mes", "month"],
-	["meses", "month"],
-	["trimestre", "quarter"],
-	["trimestres", "quarter"],
-	["año", "year"],
-	["ano", "year"],
-	["años", "year"],
-	["anos", "year"]
+	[
+		"día",
+		"day",
+		false
+	],
+	[
+		"dia",
+		"day",
+		false
+	],
+	[
+		"días",
+		"day",
+		true
+	],
+	[
+		"dias",
+		"day",
+		true
+	],
+	[
+		"semana",
+		"week",
+		false
+	],
+	[
+		"semanas",
+		"week",
+		true
+	],
+	[
+		"mes",
+		"month",
+		false
+	],
+	[
+		"meses",
+		"month",
+		true
+	],
+	[
+		"trimestre",
+		"quarter",
+		false
+	],
+	[
+		"trimestres",
+		"quarter",
+		true
+	],
+	[
+		"año",
+		"year",
+		false
+	],
+	[
+		"ano",
+		"year",
+		false
+	],
+	[
+		"años",
+		"year",
+		true
+	],
+	[
+		"anos",
+		"year",
+		true
+	]
 ];
 const periodAliases = [
 	...units.flatMap((entry) => [
@@ -129,6 +295,44 @@ const periodAliases = [
 			entry.next
 		]
 	]),
+	...units.filter((entry) => entry.unit !== "day").flatMap((entry) => [
+		[
+			`${entry.singular} actual`,
+			entry.unit,
+			0,
+			entry.current
+		],
+		[
+			`${definiteArticle(entry)} ${entry.singular} anterior`,
+			entry.unit,
+			-1,
+			entry.previous
+		],
+		[
+			`${entry.singular} anterior`,
+			entry.unit,
+			-1,
+			entry.previous
+		],
+		[
+			`${definiteArticle(entry)} ${entry.singular} siguiente`,
+			entry.unit,
+			1,
+			entry.next
+		],
+		[
+			`${entry.singular} siguiente`,
+			entry.unit,
+			1,
+			entry.next
+		],
+		[
+			`${rollingAdjective(entry, true, false)} ${entry.singular}`,
+			entry.unit,
+			1,
+			entry.next
+		]
+	]),
 	[
 		"semana pasada",
 		"week",
@@ -237,12 +441,36 @@ const periodAliases = [
 		-2,
 		"anteayer"
 	],
+	[
+		"día antes de ayer",
+		"day",
+		-2,
+		"anteayer"
+	],
+	[
+		"el día antes de ayer",
+		"day",
+		-2,
+		"anteayer"
+	],
 	[
 		"pasado mañana",
 		"day",
 		2,
 		"pasado mañana"
 	],
+	[
+		"día después de mañana",
+		"day",
+		2,
+		"pasado mañana"
+	],
+	[
+		"el día después de mañana",
+		"day",
+		2,
+		"pasado mañana"
+	],
 	[
 		"la semana anterior a la pasada",
 		"week",
@@ -327,17 +555,30 @@ const monthNumber = (value) => {
 	const short = monthAbbreviations.findIndex((aliases) => aliases.some((alias) => alias === normalized));
 	return short === -1 ? void 0 : short + 1;
 };
+const currentDateLabel = (day, month) => `${day} de ${textAt(months, month - 1)}`;
 const parseNamedDate = (input) => {
-	const named = String$1.match(/^([0-3]?\d)(?: de)? ([a-záéíóúñ]+\.?)(?: de)? (\d{4})$/u)(input);
+	const named = String$1.match(/^(?:el (?:día )?)?([0-3]?\d)(?: de)? ([a-záéíóúñ]+\.?)(?:(?: de| del)? (\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} de ${textAt(months, month - 1)} de ${year}`);
 	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, `${day} de ${textAt(months, month - 1)} de ${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, `${day} de ${textAt(months, month - 1)} de ${year}`));
+		}
+	}
+	const current = String$1.match(/^(?:el (?:día )?)?([0-3]?\d)(?: de)? ([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(/^(?:el (?:día )?)?([0-3]?\d) (de .+|del .+)$/u)(input);
+	if (Option.isNone(relative)) return Option.none();
+	const periodText = afterDe(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} ${withDe(alias[3])}`);
 };
 const quarterNumber = (value) => {
 	if ((value.startsWith("q") || value.startsWith("t")) && value.length === 2) return Number(value.slice(1));
@@ -365,12 +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) => {
-	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, "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));
@@ -380,7 +622,27 @@ 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))} de ${year}`));
+		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)) {
@@ -389,11 +651,11 @@ const parseBasePeriod = (input) => {
 		const direction = relativeYearDirection(yearText);
 		if (month !== void 0) {
 			const canonicalYear = relativeYearName(direction);
-			return Option.some(monthOfRelativeYear(month, direction, `${title(textAt(months, month - 1))} del ${canonicalYear}`));
+			return Option.some(monthOfRelativeYear(month, direction, `${textAt(months, month - 1)} del ${canonicalYear}`));
 		}
 	}
 	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 ([
@@ -405,16 +667,34 @@ 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"} de ${period.value.canonical}`;
+			const canonical = `${isEnd ? "final" : "inicio"} ${withDe(period.value.canonical)}`;
 			return Option.some(isEnd ? periodEndDay(period.value, canonical) : periodStartDay(period.value, canonical));
 		}
 	}
@@ -425,45 +705,120 @@ 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));
+	return alias === void 0 ? void 0 : units.find((entry) => entry.unit === alias[1]);
+};
+const writtenAmount = (value) => value === "un" || value === "una" ? Option.some(1) : parseTrailingCount(value);
+const agreesWithArticle = (entry, article, plural = false) => article.length === 0 || article === definiteArticle(entry, plural);
+const agreesWithIndefiniteArticle = (entry, article) => article === indefiniteArticle(entry);
+const withoutAcute = (value) => value.normalize("NFD").replaceAll("́", "");
+const agreesWithRollingModifier = (entry, modifier, future) => {
+	if (modifier === "anteriores" || modifier === "siguientes") return true;
+	if (!future && modifier === gendered(entry, "pasados", "pasadas")) return true;
+	const expected = rollingAdjective(entry, future, true);
+	return modifier === expected || modifier === withoutAcute(expected);
+};
+const agreesWithSingularModifier = (entry, modifier, future) => {
+	if (entry === void 0) return false;
+	if (future && modifier === "siguiente") return true;
+	const expected = rollingAdjective(entry, future, false);
+	return modifier === expected || modifier === withoutAcute(expected);
 };
-const countedUnit = (value) => unitAliases.find((entry) => entry[0] === value)?.[1];
 const parseCalendarOffset = (input) => {
-	const past = String$1.match(/^hace ([1-9]\d*) (día|días|dias|semana|semanas|mes|meses|trimestre|trimestres|año|años|ano|anos)$/u)(input);
-	const future = String$1.match(/^(?:dentro de|en) ([1-9]\d*) (día|días|dias|semana|semanas|mes|meses|trimestre|trimestres|año|años|ano|anos)$/u)(input);
-	const match = Option.firstSomeOf([past, future]);
+	const match = String$1.match(/^(hace|dentro de|en) ([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.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 (entry === void 0) return Option.none();
-	const direction = Option.isSome(past) ? -amount.value : amount.value;
-	const canonical = direction < 0 ? `hace ${amount.value} ${amount.value === 1 ? entry.singular : entry.plural}` : `dentro de ${amount.value} ${amount.value === 1 ? entry.singular : entry.plural}`;
-	return Option.some(candidate(periodRange(relativePeriod(unit, direction, canonical)), canonical));
+	const amount = writtenAmount(textAt(match.value, 2));
+	if (Option.isNone(amount)) return Option.none();
+	const entry = countedUnit(textAt(match.value, 3), amount.value);
+	const amountText = textAt(match.value, 2);
+	if (entry === void 0 || (amountText === "un" || amountText === "una") && !agreesWithIndefiniteArticle(entry, amountText)) return Option.none();
+	const isPast = textAt(match.value, 1) === "hace";
+	const quantity = amount.value === 1 ? indefiniteArticle(entry) : String(amount.value);
+	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(relativePeriod(entry.unit, direction, canonical));
 };
-const parseRollingPeriod = (input) => {
-	const sinceAgo = String$1.match(/^desde hace ([1-9]\d*) (día|días|dias|semana|semanas|mes|meses|trimestre|trimestres|año|años|ano|anos)$/u)(input);
-	const past = String$1.match(/^(?:(?:los|las) )?(?:últimos|ultimos|últimas|ultimas|pasados|pasadas|anteriores) ([1-9]\d*) (día|días|dias|semana|semanas|mes|meses|trimestre|trimestres|año|años|ano|anos)$/u)(input);
-	const bare = String$1.match(/^([1-9]\d*) (día|días|dias|semana|semanas|mes|meses|trimestre|trimestres|año|años|ano|anos)$/u)(input);
-	const future = String$1.match(/^(?:(?:los|las) )?(?:próximos|proximos|próximas|proximas|siguientes) ([1-9]\d*) (día|días|dias|semana|semanas|mes|meses|trimestre|trimestres|año|años|ano|anos)$/u)(input);
-	const match = Option.firstSomeOf([
-		sinceAgo,
-		past,
-		bare,
-		future
-	]);
+const rollingCanonical = (entry, amount, future) => {
+	if (amount > 1) return `${rollingAdjective(entry, future, true)} ${amount} ${entry.plural}`;
+	const article = indefiniteArticle(entry);
+	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 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));
+		if (Option.isSome(amount)) {
+			const entry = countedUnit(textAt(since.value, 2), amount.value);
+			const amountText = textAt(since.value, 1);
+			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);
+		if (entry !== void 0 && agreesWithIndefiniteArticle(entry, textAt(futureSingular.value, 1))) return Option.some(rollingCandidate(entry, 1, true));
+	}
+	const lastSingular = String$1.match(/^(?:(?:durante|en) )?(?:este )?(?:(el|la) )?(último|ultimo|última|ultima) (día|dia|semana|mes|trimestre|año|ano)$/u)(input);
+	if (Option.isSome(lastSingular)) {
+		const entry = countedUnit(textAt(lastSingular.value, 3), 1);
+		const modifier = textAt(lastSingular.value, 2);
+		if (entry !== void 0 && agreesWithArticle(entry, textAt(lastSingular.value, 1)) && agreesWithSingularModifier(entry, modifier, false)) return Option.some(rollingCandidate(entry, 1, false));
+	}
+	const nextSingular = String$1.match(/^durante (el|la) (próximo|proximo|próxima|proxima|siguiente) (día|dia|semana|mes|trimestre|año|ano)$/u)(input);
+	if (Option.isSome(nextSingular)) {
+		const entry = countedUnit(textAt(nextSingular.value, 3), 1);
+		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));
+		if (Option.isSome(amount) && amount.value > 1) {
+			const entry = countedUnit(textAt(counted.value, 4), amount.value);
+			const modifier = textAt(counted.value, 2);
+			const future = modifier.startsWith("próxim") || modifier.startsWith("proxim") || modifier === "siguientes";
+			if (entry !== void 0 && agreesWithArticle(entry, textAt(counted.value, 1), true) && agreesWithRollingModifier(entry, modifier, future)) return Option.some(rollingCandidate(entry, amount.value, future));
+		}
+	}
+	const bare = String$1.match(/^([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.isNone(bare)) return Option.none();
+	const amount = parseTrailingCount(textAt(bare.value, 1));
+	if (Option.isNone(amount)) return Option.none();
+	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);
+	const match = Option.firstSomeOf([joined, dashed]);
 	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 (entry === void 0) return Option.none();
-	const isFuture = Option.isSome(future);
-	const range = isFuture ? futureRange(amount.value, unit) : trailingRange(amount.value, unit);
-	const direction = isFuture ? "próximos" : "últimos";
-	const noun = amount.value === 1 ? entry.singular : entry.plural;
-	return Option.some(candidate(range, `${direction} ${amount.value} ${noun}`));
+	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 = afterDe(textAt(match.value, isJoined ? 4 : 3));
+	return joinedPeriodCandidate(`desde ${lowerDay} ${withDe(period)} hasta ${upperDay} ${withDe(period)}`, [["desde ", " hasta "]], parsePeriod, (lower, upper) => `desde ${lower} hasta ${upper}`);
+};
+const inclusiveBoundaryCandidate = (input) => {
+	const match = String$1.match(/^hasta (.+) inclusive$/u)(input);
+	if (Option.isNone(match)) return Option.none();
+	return parsePeriod(textAt(match.value, 1)).pipe(Option.map((value) => periodBoundaryCandidate(value, "through", `hasta ${value.canonical} inclusive`)));
 };
 const boundaryCandidate = (input) => openBoundaryCandidate(input, [
 	["hasta antes de ", "before"],
@@ -486,12 +841,12 @@ 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);
 	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, [
 		["desde ", " hasta ahora"],
 		["desde ", " hasta hoy"],
@@ -499,12 +854,17 @@ const parseSpanish = (input) => {
 	], [
 		"desde ahora hasta ",
 		"desde hoy hasta ",
-		"entre hoy y "
+		"entre hoy y ",
+		"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, [
+		["desde el ", " hasta el "],
 		["desde ", " hasta "],
+		["del ", " al "],
 		["de ", " a "],
+		["entre el ", " y el "],
 		["entre ", " y "],
 		["", " - "],
 		["", " – "],
@@ -512,18 +872,32 @@ const parseSpanish = (input) => {
 		["", " hasta "]
 	], parsePeriod, (lower, upper) => `desde ${lower} hasta ${upper}`);
 	if (Option.isSome(bounded)) return bounded;
+	const inclusive = inclusiveBoundaryCandidate(input);
+	if (Option.isSome(inclusive)) return inclusive;
 	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 = [
 	"este fin de semana",
 	"el fin de semana pasado",
 	"el próximo fin de semana",
 	"el fin de semana anterior al pasado",
-	"el fin de semana después del próximo",
-	...periodAliases.flatMap((entry) => [`inicio de ${entry[0]}`, `final de ${entry[0]}`]),
+	"el fin de semana después del próximo"
+];
+const edgePeriodPhrases = [
+	...units.filter((entry) => entry.unit !== "day").flatMap((entry) => [
+		entry.current,
+		entry.previous,
+		entry.next
+	]),
+	...weekendPhrases,
+	...months
+].flatMap((period) => [`inicio ${withDe(period)}`, `final ${withDe(period)}`]);
+const staticPeriodPhrases = [
+	...periodAliases.map((entry) => entry[0]),
+	...weekendPhrases,
+	...edgePeriodPhrases,
 	...[
 		1,
 		2,
@@ -537,13 +911,19 @@ 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 = [
 	"desde ",
+	"a partir de ",
 	"antes de ",
 	"hasta ",
 	"después de "
@@ -553,10 +933,21 @@ const countedSuggestions = (input) => {
 	if (amount === void 0) return [];
 	return units.flatMap((entry) => {
 		const noun = amount === 1 ? entry.singular : entry.plural;
+		if (amount === 1) {
+			const article = indefiniteArticle(entry);
+			return [
+				`${amount} ${noun}`,
+				`${rollingAdjective(entry, false, false)} ${noun}`,
+				`desde hace ${article} ${noun}`,
+				`desde ahora durante ${article} ${noun}`,
+				`hace ${article} ${noun}`,
+				`dentro de ${article} ${noun}`
+			];
+		}
 		return [
-			`últimos ${amount} ${noun}`,
+			`${rollingAdjective(entry, false, true)} ${amount} ${noun}`,
 			`${amount} ${noun}`,
-			`próximos ${amount} ${noun}`,
+			`${rollingAdjective(entry, true, true)} ${amount} ${noun}`,
 			`hace ${amount} ${noun}`,
 			`dentro de ${amount} ${noun}`
 		];
@@ -565,6 +956,12 @@ const countedSuggestions = (input) => {
 const spanishSuggestionPhrases = [
 	...units.map((entry) => entry.toDate),
 	...units.map((entry) => entry.remaining),
+	...units.flatMap((entry) => [
+		`${rollingAdjective(entry, false, false)} ${entry.singular}`,
+		`desde hace ${indefiniteArticle(entry)} ${entry.singular}`,
+		`desde ahora durante ${indefiniteArticle(entry)} ${entry.singular}`,
+		`durante ${definiteArticle(entry)} ${rollingAdjective(entry, true, false)} ${entry.singular}`
+	]),
 	...staticPeriodPhrases,
 	...prefixNaturalPhrases(staticPeriodPhrases, boundaryPrefixes),
 	"hasta ahora",
@@ -580,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);
@@ -592,26 +1000,25 @@ const renderSpanish = (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(`próximos ${future.value.amount} ${noun}`);
-		}
+		if (entry !== void 0) return Option.some(rollingCanonical(entry, future.value.amount, true));
 	}
 	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(`últimos ${trailing.value.amount} ${noun}`);
-		}
+		if (entry !== void 0) return Option.some(rollingCanonical(entry, trailing.value.amount, false));
 	}
-	const periods = [...staticPeriods, ...periodsFromPhrases([...datedPeriods(range, months), ...datedQuarterPeriods(range)], parsePeriod)];
+	const periods = [
+		...staticPeriods,
+		...currentYearDatePeriods(range, currentDateLabel),
+		...periodsFromPhrases([...datedPeriods(range, months), ...datedQuarterPeriods(range)], parsePeriod)
+	];
 	return renderPeriodRange(range, [...units.map((entry) => candidate(periodToDateRange(entry.unit), entry.toDate)), ...units.map((entry) => candidate(remainingPeriodRange(entry.unit), entry.remaining))], periods, (period) => `desde ${period}`, (period) => `antes de ${period}`, (period) => `hasta ${period}`, (period) => `después de ${period}`, (lower, upper) => `desde ${lower} hasta ${upper}`, (period) => `desde ${period} hasta ahora`, (period) => `desde ahora hasta ${period}`, () => "hasta ahora", () => "desde ahora");
 };
 const SpanishContribution = new BaseLanguageContribution({
 	locale: "es",
 	vocabulary: [
 		...months,
+		...weekdays,
 		...monthAbbreviations.flatMap((aliases) => aliases),
 		...units.flatMap((entry) => [
 			entry.singular,
@@ -645,8 +1052,8 @@ const SpanishContribution = new BaseLanguageContribution({
 		"resto",
 		"últimos"
 	],
-	normalize: normalizeNaturalText,
-	correct: correctWhitespaceSeparatedText,
+	normalize: normalizeSpanish,
+	correct: correctSpanish,
 	parseExact: parseSpanish,
 	suggest: suggestSpanish,
 	render: renderSpanish