chronolizer 0.4.0 → 0.4.1

package/dist/locales/en.mjs

@@ -256,12 +256,12 @@ const parseRelativeMonth = (input) => {
 	return Option.none();
 };
 const parseRelativeUnit = (input) => {
-	const articlePeriod = String$1.match(/^the (day|week|month|quarter|year)$/u)(input);
+	const articlePeriod = String$1.match(/^the ([^ ]+)$/u)(input);
 	if (Option.isSome(articlePeriod)) {
 		const entry = units.find((unit) => unit[0] === textAt(articlePeriod.value, 1));
 		if (entry !== void 0) return Option.some(relativePeriod(entry[1], 0, currentPeriod(entry[0])));
 	}
-	const outerRelative = String$1.match(/^(?:the )?(day|week|month|quarter|year) (before last|after next)$/u)(input);
+	const outerRelative = String$1.match(/^(?:the )?([^ ]+) (before last|after next)$/u)(input);
 	if (Option.isSome(outerRelative)) {
 		const entry = units.find((unit) => unit[0] === textAt(outerRelative.value, 1));
 		if (entry !== void 0) {
@@ -310,7 +310,7 @@ const parsePeriodEdge = (input) => {
 	return Option.some(name === "end" ? periodEndDay(period.value, canonical) : periodStartDay(period.value, canonical));
 };
 const parsePeriod = (input) => {
-	const shifted = String$1.match(/^(.+) ([1-9]\d*) (day|days|week|weeks|month|months|quarter|quarters|year|years) (ago|prior|from now)$/u)(input);
+	const shifted = String$1.match(/^(.+) ([1-9]\d*) ([^ ]+) (ago|prior|from now)$/u)(input);
 	if (Option.isSome(shifted)) {
 		const amount = parseTrailingCount(textAt(shifted.value, 2));
 		const unitText = textAt(shifted.value, 3);
@@ -326,7 +326,7 @@ const parsePeriod = (input) => {
 			}
 		}
 	}
-	const relativeShift = String$1.match(/^([1-9]\d*) (day|days|week|weeks|month|months|quarter|quarters|year|years) (before|after) (.+)$/u)(input);
+	const relativeShift = String$1.match(/^([1-9]\d*) ([^ ]+) (before|after) (.+)$/u)(input);
 	if (Option.isSome(relativeShift)) {
 		const amount = parseTrailingCount(textAt(relativeShift.value, 1));
 		const unitText = textAt(relativeShift.value, 2);
@@ -389,7 +389,7 @@ const boundaryCandidate = (input) => openBoundaryCandidate(input, [
 ], parsePeriod);
 const countedUnit = (value, amount) => units.find((entry) => value === (amount === 1 ? entry[0] : entry[2]));
 const parseCalendarOffset = (input) => {
-	const singular = String$1.match(/^(?:(?:a|one) (day|week|month|quarter|year) (ago|prior|from now)|in (?:a|one) (day|week|month|quarter|year))$/u)(input);
+	const singular = String$1.match(/^(?:(?:a|one) ([^ ]+) (ago|prior|from now)|in (?:a|one) ([^ ]+))$/u)(input);
 	if (Option.isSome(singular)) {
 		const unitText = textAt(singular.value, 1) || textAt(singular.value, 3);
 		const entry = units.find((unit) => unit[0] === unitText);
@@ -401,9 +401,9 @@ const parseCalendarOffset = (input) => {
 			return Option.some(relativePeriod(entry[1], direction, canonical));
 		}
 	}
-	const past = String$1.match(/^([1-9]\d*) (day|days|week|weeks|month|months|quarter|quarters|year|years) (?:ago|prior)$/u)(input);
-	const futureIn = String$1.match(/^in ([1-9]\d*) (day|days|week|weeks|month|months|quarter|quarters|year|years)$/u)(input);
-	const futureFromNow = String$1.match(/^([1-9]\d*) (day|days|week|weeks|month|months|quarter|quarters|year|years) from now$/u)(input);
+	const past = String$1.match(/^([1-9]\d*) ([^ ]+) (?:ago|prior)$/u)(input);
+	const futureIn = String$1.match(/^in ([1-9]\d*) ([^ ]+)$/u)(input);
+	const futureFromNow = String$1.match(/^([1-9]\d*) ([^ ]+) from now$/u)(input);
 	const match = Option.firstSomeOf([
 		past,
 		futureIn,
@@ -420,10 +420,10 @@ const parseCalendarOffset = (input) => {
 	return Option.some(relativePeriod(entry[1], direction, canonical));
 };
 const parseRollingPeriod = (input) => {
-	const past = String$1.match(/^(?:(?:last|previous|past) |(?:in|over) the (?:last|previous|past) )?([1-9]\d*) (day|days|week|weeks|month|months|quarter|quarters|year|years)$/u)(input);
-	const singularPast = String$1.match(/^(?:past|the past|in the past|over the past|this past) (day|week|month|quarter|year)$/u)(input);
-	const future = String$1.match(/^(?:(?:next|coming|within) |(?:in|over|within) the (?:next|coming) )([1-9]\d*) (day|days|week|weeks|month|months|quarter|quarters|year|years)$/u)(input);
-	const singularFuture = String$1.match(/^(?:in|over|within) the (?:next|coming) (day|week|month|quarter|year)$/u)(input);
+	const past = String$1.match(/^(?:(?:last|previous|past) |(?:in|over) the (?:last|previous|past) )?([1-9]\d*) ([^ ]+)$/u)(input);
+	const singularPast = String$1.match(/^(?:past|the past|in the past|over the past|this past) ([^ ]+)$/u)(input);
+	const future = String$1.match(/^(?:(?:next|coming|within) |(?:in|over|within) the (?:next|coming) )([1-9]\d*) ([^ ]+)$/u)(input);
+	const singularFuture = String$1.match(/^(?:in|over|within) the (?:next|coming) ([^ ]+)$/u)(input);
 	const match = Option.firstSomeOf([
 		past,
 		singularPast,
@@ -639,7 +639,7 @@ const renderEnglish = (range) => {
 		...currentYearDatePeriods(range, currentDateLabel),
 		...periodsFromPhrases([...datedPeriods(range, months), ...datedQuarterPeriods(range)], parsePeriod)
 	];
-	return renderPeriodRange(range, [...units.map((entry) => candidate(periodToDateRange(entry[1]), `${entry[0]} to date`)), ...units.map((entry) => candidate(remainingPeriodRange(entry[1]), `rest of the ${entry[0]}`))], periods, (period) => `since ${period}`, (period) => `before ${period}`, (period) => `through ${period}`, (period) => `after ${period}`, (lower, upper) => `from ${lower} to ${upper}`, (period) => `from ${period} to now`, (period) => `from now to ${period}`, () => "until now", () => "from now");
+	return renderPeriodRange(range, [...units.map((entry) => candidate(periodToDateRange(entry[1]), `${entry[0]} to date`)), ...units.map((entry) => candidate(remainingPeriodRange(entry[1]), `rest of the ${entry[0]}`))], [...periods, ...periods.map((period) => periodPreviousDay(period, `the day before ${period.canonical}`))], (period) => `since ${period}`, (period) => `before ${period}`, (period) => `through ${period}`, (period) => `after ${period}`, (lower, upper) => `from ${lower} to ${upper}`, (period) => `from ${period} to now`, (period) => `from now to ${period}`, () => "until now", () => "from now");
 };
 const EnglishContribution = new BaseLanguageContribution({
 	locale: "en",

package/dist/locales/es.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, 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 { absoluteDatePeriod, calendarPeriodOffset, candidate, compileCountAliasNormalizer, compoundCountAliases, countAliasVocabulary, currentYearDatePeriods, datedPeriods, datedQuarterPeriods, decimalTens, 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/es.ts
 const months = [
@@ -560,15 +559,7 @@ const parseNamedDate = (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.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}`));
-		}
-	}
+	if (Option.isSome(numeric)) return namedDatePeriod(textAt(numeric.value, 3), textAt(numeric.value, 2), textAt(numeric.value, 1), Number, (day, month, year) => `${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);
@@ -729,7 +720,7 @@ const agreesWithSingularModifier = (entry, modifier, future) => {
 	return modifier === expected || modifier === withoutAcute(expected);
 };
 const parseCalendarOffset = (input) => {
-	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);
+	const match = String$1.match(/^(hace|dentro de|en) ([1-9]\d*|un|una) ([^ ]+)$/u)(input);
 	if (Option.isNone(match)) return Option.none();
 	const amount = writtenAmount(textAt(match.value, 2));
 	if (Option.isNone(amount)) return Option.none();
@@ -750,7 +741,7 @@ const rollingCanonical = (entry, amount, future) => {
 };
 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);
+	const since = String$1.match(/^desde hace ([1-9]\d*|un|una) ([^ ]+)$/u)(input);
 	if (Option.isSome(since)) {
 		const amount = writtenAmount(textAt(since.value, 1));
 		if (Option.isSome(amount)) {
@@ -762,18 +753,18 @@ const parseRollingSince = (input) => {
 	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);
+	const futureSingular = String$1.match(/^desde ahora durante (un|una) ([^ ]+)$/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);
+	const lastSingular = String$1.match(/^(?:(?:durante|en) )?(?:este )?(?:(el|la) )?([uú]ltim[oa]) ([^ ]+)$/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);
+	const nextSingular = String$1.match(/^durante (el|la) (pr[oó]xim[oa]|siguiente) ([^ ]+)$/u)(input);
 	if (Option.isSome(nextSingular)) {
 		const entry = countedUnit(textAt(nextSingular.value, 3), 1);
 		const modifier = textAt(nextSingular.value, 2);
@@ -782,17 +773,17 @@ const parseSingularRolling = (input) => {
 	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);
+	const counted = String$1.match(/^(?:(?:durante|en) )?(?:(los|las) )?([uú]ltim(?:os|as)|pasad(?:os|as)|anteriores|pr[oó]xim(?:os|as)|siguientes) ([1-9]\d*) ([^ ]+)$/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";
+			const future = modifier.includes("xim") || 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);
+	const bare = String$1.match(/^([1-9]\d*) ([^ ]+)$/u)(input);
 	if (Option.isNone(bare)) return Option.none();
 	const amount = parseTrailingCount(textAt(bare.value, 1));
 	if (Option.isNone(amount)) return Option.none();

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, 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 { 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 = [
@@ -91,7 +90,8 @@ const frenchCompoundCountAliases = () => {
 				"soixante"
 			][tens];
 			if (tensWord === void 0) continue;
-			phrase = remainder === 1 ? `${tensWord} et un` : `${tensWord}-${words[remainder] ?? ""}`;
+			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] ?? ""}`;
@@ -499,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);
@@ -654,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) => {

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, compileCountAliasNormalizer, compoundCountAliases, countAliasVocabulary, currentYearDatePeriods, datedPeriods, datedQuarterPeriods, decimalTens, decomposeShiftedPeriodRange, fixedDatePeriod, fixedMonthPeriod, fixedQuarterPeriod, fixedYearPeriod, fromNowRange, futurePeriod, futureRange, isoDate, joinedNowCandidate, joinedPeriodCandidate, monthOfRelativeYear, namedCurrentYearDatePeriod, namedDatePeriod, openBoundaryCandidate, parseTrailingCount, periodDay, periodEndDay, periodRange, periodStartDay, periodToDateRange, periodsFromPhrases, quarterOfRelativeYear, relativePeriod, relativeWeekday, relativeWeekend, remainingPeriodRange, renderPeriodRange, sequentialCountAliases, shiftPeriod, textAt, trailingPeriod, trailingRange, untilNowRange, validYear } from "./shared.mjs";
+import { 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 = [
@@ -398,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);
@@ -555,14 +546,12 @@ const countedUnit = (value, amount) => {
 	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) => [

package/dist/locales/pl.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 } from "../natural/suggestion.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, parseTrailingCount, periodBoundaryCandidate, periodEndDay, periodRange, periodStartDay, periodToDateRange, periodsFromPhrases, quarterOfRelativeYear, relativePeriod, relativeWeekday, relativeWeekend, remainingPeriodRange, renderPeriodRange, sequentialCountAliases, shiftPeriod, 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, parseTrailingCount, periodBoundaryCandidate, periodEndDay, periodRange, periodStartDay, periodToDateRange, periodsFromPhrases, quarterOfRelativeYear, relativePeriod, relativeWeekday, relativeWeekend, remainingPeriodRange, renderPeriodRange, sequentialCountAliases, shiftPeriod, textAt, trailingPeriod, trailingRange, untilNowRange, validYear } from "./shared.mjs";
 import { Effect, Option, String as String$1 } from "effect";
 //#region src/locales/pl.ts
 const months = [
@@ -536,15 +535,7 @@ const parseNamedDate = (input) => {
 	const named = String$1.match(/^([0-3]?\d)\.?(?: )([a-ząćęłńóśźż]+\.?) (\d{4})$/u)(input);
 	if (Option.isSome(named)) return namedDatePeriod(textAt(named.value, 3), textAt(named.value, 2), textAt(named.value, 1), monthNumber, 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(/^([0-3]?\d)\.? ([a-ząćęłńóśźż]+\.?)$/u)(input);
 	return Option.isSome(current) ? namedCurrentYearDatePeriod(textAt(current.value, 2), textAt(current.value, 1), monthNumber, currentDateLabel) : Option.none();
 };
@@ -667,13 +658,11 @@ const parsePeriod = (input) => {
 	return Option.isSome(base) ? base : parseCalendarOffset(input);
 };
 const countedUnit = (value) => unitAliases.find((entry) => entry[0] === value)?.[1];
-const countedUnitPattern = "dzień|dni|tydzień|tygodnie|tygodni|miesiąc|miesiące|miesięcy|kwartał|kwartały|kwartałów|rok|lata|lat";
-const countedPattern = (source) => new RegExp(source.replace("UNIT", countedUnitPattern), "u");
-const calendarPastPattern = countedPattern("^(?:dokładnie )?(?:([1-9]\\d*) )?(UNIT) temu$");
-const calendarFuturePattern = countedPattern("^za (?:([1-9]\\d*) )?(UNIT)$");
-const rollingPastPatterns = [countedPattern("^(?:ostatni|ostatnie|ostatnich|miniony|minione|minionych) ([1-9]\\d*) (UNIT)$"), countedPattern("^w ciągu (?:ostatniego|ostatnich|minionego|minionych) ([1-9]\\d*) (UNIT)$")];
-const rollingFuturePatterns = [countedPattern("^(?:następny|następne|następnych|kolejny|kolejne|kolejnych) ([1-9]\\d*) (UNIT)$"), countedPattern("^w ciągu (?:najbliższego|najbliższych) ([1-9]\\d*) (UNIT)$")];
-const rollingBarePattern = countedPattern("^([1-9]\\d*) (UNIT)$");
+const calendarPastPattern = /^(?:dokładnie )?(?:([1-9]\d*) )?([^ ]+) temu$/u;
+const calendarFuturePattern = /^za (?:([1-9]\d*) )?([^ ]+)$/u;
+const rollingPastPatterns = [/^(?:ostatni|ostatnie|ostatnich|miniony|minione|minionych) ([1-9]\d*) ([^ ]+)$/u, /^w ciągu (?:ostatniego|ostatnich|minionego|minionych) ([1-9]\d*) ([^ ]+)$/u];
+const rollingFuturePatterns = [/^(?:następny|następne|następnych|kolejny|kolejne|kolejnych) ([1-9]\d*) ([^ ]+)$/u, /^w ciągu (?:najbliższego|najbliższych) ([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 countNoun = (amount, entry) => {
 	if (amount === 1) return entry.singular;
@@ -803,7 +792,7 @@ const parsePolish = (input) => {
 		"teraz do "
 	], parsePeriod, (period) => `od ${period} do dziś`, (period) => `od dziś do ${period}`);
 	if (Option.isSome(nowBounded)) return nowBounded;
-	const bounded = joinedPeriodCandidate(input, [
+	const bounded = joinedPeriodCandidate(input.replace(/ włącznie$/u, ""), [
 		["od ", " do "],
 		["między ", " a "],
 		["pomiędzy ", " a "],

package/dist/locales/shared.mjs

@@ -8,10 +8,10 @@ import { Match, Option, RegExp as RegExp$1, Schema, String as String$1 } from "e
 const textAt = (values, index) => values[index] ?? "";
 const sequentialCountAliases = (words, start) => words.flatMap((aliases, index) => aliases.map((phrase) => [phrase, start + index]));
 const decimalTens = (words) => words.map((word, index) => [20 + index * 10, word]);
-const compoundCountAliases = (tens, ones, join) => tens.flatMap(([tensAmount, tensWord]) => ones.flatMap(([oneAmount, oneWord]) => {
+const compoundCountAliases = (tens, ones, join) => tens.flatMap(([tensAmount, tensWord]) => [[tensWord, tensAmount], ...ones.flatMap(([oneAmount, oneWord]) => {
 	const amount = tensAmount + oneAmount;
 	return join(tensWord, oneWord, amount).map((phrase) => [phrase, amount]);
-}));
+})]);
 const countAliasVocabulary = (aliases) => [...new Set(aliases.flatMap(([phrase]) => phrase.split(" ")))];
 const compileCountAliasNormalizer = (aliases) => {
 	const distinct = /* @__PURE__ */ new Map();
@@ -93,7 +93,7 @@ const periodDay = (period, day, canonical) => {
 	const start = day === 1 ? period.start : shift(period.start, day - 1, "day");
 	return Option.some(Period.make({
 		start,
-		end: shift(start, 1, "day"),
+		end: shift(period.start, day, "day"),
 		canonical
 	}));
 };
@@ -108,7 +108,7 @@ const relativeWeekday = (day, direction, canonical) => {
 	const start = day === 0 ? weekStart : shift(weekStart, day, "day");
 	return Period.make({
 		start,
-		end: shift(start, 1, "day"),
+		end: shift(weekStart, day + 1, "day"),
 		canonical
 	});
 };
@@ -118,7 +118,7 @@ const relativeWeekend = (direction, canonical) => {
 	const start = shift(weekStart, 5, "day");
 	return Period.make({
 		start,
-		end: shift(start, 2, "day"),
+		end: shift(weekStart, 7, "day"),
 		canonical
 	});
 };
@@ -254,7 +254,7 @@ const currentYearDatePeriod = (month, day, canonical) => {
 	const start = day === 1 ? monthStart : shift(monthStart, day - 1, "day");
 	return Period.make({
 		start,
-		end: shift(start, 1, "day"),
+		end: shift(monthStart, day, "day"),
 		canonical
 	});
 };
@@ -332,7 +332,7 @@ const monthOfRelativeYear = (month, direction, canonical) => {
 	const start = month === 1 ? yearStart : shift(yearStart, month - 1, "month");
 	return Period.make({
 		start,
-		end: shift(start, 1, "month"),
+		end: shift(yearStart, month, "month"),
 		canonical
 	});
 };

package/dist/locales/tr.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, compileCountAliasNormalizer, compoundCountAliases, countAliasVocabulary, currentYearDatePeriods, datedPeriods, datedQuarterPeriods, decimalTens, decomposeShiftedPeriodRange, fixedDatePeriod, fixedMonthPeriod, fixedQuarterPeriod, fixedYearPeriod, fromNowRange, futurePeriod, futureRange, isoDate, joinedNowCandidate, joinedPeriodCandidate, monthOfRelativeYear, namedCurrentYearDatePeriod, namedDatePeriod, openBoundaryCandidate, parseTrailingCount, periodBoundaryCandidate, periodEndDay, periodRange, periodStartDay, periodToDateRange, periodsFromPhrases, quarterOfRelativeYear, relativePeriod, relativeWeekday, relativeWeekend, remainingPeriodRange, renderPeriodRange, sequentialCountAliases, shiftPeriod, textAt, trailingPeriod, trailingRange, untilNowRange, validYear } from "./shared.mjs";
+import { absoluteDatePeriod, calendarPeriodOffset, candidate, compileCountAliasNormalizer, compoundCountAliases, countAliasVocabulary, currentYearDatePeriods, datedPeriods, datedQuarterPeriods, decimalTens, decomposeShiftedPeriodRange, fixedMonthPeriod, fixedQuarterPeriod, fixedYearPeriod, fromNowRange, futurePeriod, futureRange, joinedNowCandidate, joinedPeriodCandidate, monthOfRelativeYear, namedCurrentYearDatePeriod, namedDatePeriod, openBoundaryCandidate, parseTrailingCount, periodBoundaryCandidate, periodEndDay, periodRange, periodStartDay, periodToDateRange, periodsFromPhrases, quarterOfRelativeYear, relativePeriod, relativeWeekday, relativeWeekend, remainingPeriodRange, renderPeriodRange, sequentialCountAliases, shiftPeriod, textAt, trailingPeriod, trailingRange, untilNowRange, validYear } from "./shared.mjs";
 import { Effect, Option, String as String$1 } from "effect";
 //#region src/locales/tr.ts
 const months = [
@@ -358,15 +357,7 @@ const parseNamedDate = (input) => {
 	const named = String$1.match(/^([0-3]?\d)(?:\.)? ([a-zçğıöşü]+\.?)(?:,)? (\d{4})$/u)(input);
 	if (Option.isSome(named)) return namedDatePeriod(textAt(named.value, 3), textAt(named.value, 2), textAt(named.value, 1), monthNumber, 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(/^([0-3]?\d)(?:\.)? ([a-zçğıöşü]+\.?)$/u)(input);
 	return Option.isSome(current) ? namedCurrentYearDatePeriod(textAt(current.value, 2), textAt(current.value, 1), monthNumber, currentDateLabel) : Option.none();
 };
@@ -460,8 +451,7 @@ const parsePeriodEdge = (input) => {
 	const period = Option.isSome(basePeriod) || implicit === void 0 ? basePeriod : Option.some(relativePeriod(implicit.unit, 0, implicit.current));
 	if (Option.isNone(period)) return Option.none();
 	const isEnd = textAt(edge.value, 2) === "sonu";
-	const canonical = `${period.value.canonical} ${isEnd ? "sonu" : "başı"}`;
-	return Option.some(isEnd ? periodEndDay(period.value, canonical) : periodStartDay(period.value, canonical));
+	return Option.some(isEnd ? periodEndDay(period.value, input) : periodStartDay(period.value, input));
 };
 const parsePeriod = (input) => {
 	const prefix = String$1.match(/^([1-9]\d*) (gün|gun|hafta|ay|çeyrek|ceyrek|yıl|yil|sene) (önce|sonra) (.+)$/u)(input);
@@ -493,14 +483,12 @@ const parsePeriod = (input) => {
 	]);
 };
 const countedUnit = (value) => unitAliases.find((entry) => entry[0] === value)?.[1];
-const countedUnitPattern = "gün|gun|hafta|ay|çeyrek|ceyrek|yıl|yil|sene";
-const countedPattern = (source) => new RegExp(source.replace("UNIT", countedUnitPattern), "u");
-const calendarPastPattern = countedPattern("^([1-9]\\d*) (UNIT) önce$");
-const calendarFuturePatterns = [countedPattern("^([1-9]\\d*) (UNIT) sonra$"), countedPattern("^([1-9]\\d*) (UNIT) içinde$")];
-const rollingPastPatterns = [countedPattern("^(?:son|geçen|önceki|geçtiğimiz) ([1-9]\\d*) (UNIT)$"), countedPattern("^([1-9]\\d*) (?:son|geçen|önceki) (UNIT)$")];
-const rollingFuturePatterns = [countedPattern("^(?:gelecek|önümüzdeki|sonraki) ([1-9]\\d*) (UNIT)$"), countedPattern("^([1-9]\\d*) (?:gelecek|sonraki) (UNIT)$")];
-const rollingSincePattern = countedPattern("^([1-9]\\d*) (UNIT) boyunca$");
-const rollingBarePattern = countedPattern("^([1-9]\\d*) (UNIT)$");
+const calendarPastPattern = /^([1-9]\d*) ([^ ]+) önce$/u;
+const calendarFuturePatterns = [/^([1-9]\d*) ([^ ]+) sonra$/u, /^([1-9]\d*) ([^ ]+) içinde$/u];
+const rollingPastPatterns = [/^(?:son|geçen|önceki|geçtiğimiz) ([1-9]\d*) ([^ ]+)$/u, /^([1-9]\d*) (?:son|geçen|önceki) ([^ ]+)$/u];
+const rollingFuturePatterns = [/^(?:gelecek|önümüzdeki|sonraki) ([1-9]\d*) ([^ ]+)$/u, /^([1-9]\d*) (?:gelecek|sonraki) ([^ ]+)$/u];
+const rollingSincePattern = /^([1-9]\d*) ([^ ]+) boyunca$/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 ? `önümüzdeki bir ${entry.singular}` : `son bir ${entry.singular}`;
 const singularRollingPhrases = units.flatMap((entry) => [