chronolizer 0.3.0 → 0.4.0

package/dist/locales/nl.mjs

@@ -4,7 +4,7 @@ import { normalizeNaturalText } from "../natural/text.mjs";
 import { defineLanguagePlugin, languagePluginsLayer } from "../language/registry.mjs";
 import { correctWhitespaceSeparatedText } from "../natural/correction.mjs";
 import { completeNaturalPhrases, fixedCalendarPeriodPhrases, naturalCount, prefixNaturalPhrases } from "../natural/suggestion.mjs";
-import { absoluteDatePeriod, calendarPeriodOffset, candidate, currentYearDatePeriods, datedPeriods, datedQuarterPeriods, fixedDatePeriod, fixedMonthPeriod, fixedQuarterPeriod, fixedYearPeriod, fromNowRange, futurePeriod, futureRange, isoDate, joinedNowCandidate, joinedPeriodCandidate, monthOfRelativeYear, namedCurrentYearDatePeriod, namedDatePeriod, openBoundaryCandidate, parseTrailingCount, periodDay, periodEndDay, periodRange, periodStartDay, periodToDateRange, periodsFromPhrases, quarterOfRelativeYear, relativePeriod, relativeWeekend, remainingPeriodRange, renderPeriodRange, textAt, trailingPeriod, trailingRange, untilNowRange, validYear } from "./shared.mjs";
+import { absoluteDatePeriod, calendarPeriodOffset, candidate, compileCountAliasNormalizer, compoundCountAliases, countAliasVocabulary, currentYearDatePeriods, datedPeriods, datedQuarterPeriods, decimalTens, decomposeShiftedPeriodRange, fixedDatePeriod, fixedMonthPeriod, fixedQuarterPeriod, fixedYearPeriod, fromNowRange, futurePeriod, futureRange, isoDate, joinedNowCandidate, joinedPeriodCandidate, monthOfRelativeYear, namedCurrentYearDatePeriod, namedDatePeriod, openBoundaryCandidate, parseTrailingCount, periodDay, periodEndDay, periodRange, periodStartDay, periodToDateRange, periodsFromPhrases, quarterOfRelativeYear, relativePeriod, relativeWeekday, relativeWeekend, remainingPeriodRange, renderPeriodRange, sequentialCountAliases, shiftPeriod, textAt, trailingPeriod, trailingRange, untilNowRange, validYear } from "./shared.mjs";
 import { Effect, Option, String as String$1 } from "effect";
 //#region src/locales/nl.ts
 const months = [
@@ -21,6 +21,54 @@ const months = [
 	"november",
 	"december"
 ];
+const weekdays = [
+	"maandag",
+	"dinsdag",
+	"woensdag",
+	"donderdag",
+	"vrijdag",
+	"zaterdag",
+	"zondag"
+];
+const nextWeekdayPhrases = weekdays.map((weekday) => `volgende ${weekday}`);
+const dutchCountWords = [
+	"twee",
+	"drie",
+	"vier",
+	"vijf",
+	"zes",
+	"zeven",
+	"acht",
+	"negen",
+	"tien",
+	"elf",
+	"twaalf",
+	"dertien",
+	"veertien",
+	"vijftien",
+	"zestien",
+	"zeventien",
+	"achttien",
+	"negentien",
+	"twintig"
+];
+const dutchCountOnes = [[1, "een"], ...dutchCountWords.slice(0, 8).map((word, index) => [index + 2, word])];
+const dutchCountAliases = [...sequentialCountAliases(dutchCountWords.map((word) => [word]), 2), ...compoundCountAliases(decimalTens([
+	"twintig",
+	"dertig",
+	"veertig",
+	"vijftig",
+	"zestig",
+	"zeventig",
+	"tachtig",
+	"negentig"
+]), dutchCountOnes, (ten, one) => {
+	return [`${one === "twee" || one === "drie" ? `${one}ën` : `${one}en`}${ten}`];
+})];
+const normalizeDutchCounts = compileCountAliasNormalizer(dutchCountAliases);
+const dutchCountVocabulary = new Set(countAliasVocabulary(dutchCountAliases));
+const correctDutch = (input, vocabulary) => correctWhitespaceSeparatedText(input, vocabulary, dutchCountVocabulary);
+const normalizeDutch = (input, locale) => normalizeDutchCounts(normalizeNaturalText(input, locale));
 const monthAbbreviations = [
 	["jan"],
 	["feb"],
@@ -395,13 +443,13 @@ const parseQuarter = (input) => {
 	const quarter = quarterNumber(textAt(standalone.value, 1));
 	return quarter === void 0 ? Option.none() : Option.some(quarterOfRelativeYear(quarter, 0, `K${quarter}`));
 };
-const parseBasePeriod = (input) => {
-	const absoluteDate = absoluteDatePeriod(input, "nl");
-	if (Option.isSome(absoluteDate)) return absoluteDate;
-	const namedDate = parseNamedDate(input);
-	if (Option.isSome(namedDate)) return namedDate;
-	const quarter = parseQuarter(input);
-	if (Option.isSome(quarter)) return quarter;
+const parseDatedPeriod = (input) => {
+	const knownPeriod = Option.firstSomeOf([
+		absoluteDatePeriod(input, "nl"),
+		parseNamedDate(input),
+		parseQuarter(input)
+	]);
+	if (Option.isSome(knownPeriod)) return knownPeriod;
 	const yearMatch = String$1.match(/^(?:het jaar |jaar )?(\d{4})$/u)(input);
 	if (Option.isSome(yearMatch)) {
 		const year = validYear(textAt(yearMatch.value, 1));
@@ -413,6 +461,20 @@ const parseBasePeriod = (input) => {
 		const year = validYear(textAt(monthYear.value, 2));
 		if (month !== void 0 && year !== void 0) return Option.some(fixedMonthPeriod(year, month, `${textAt(months, month - 1)} ${year}`));
 	}
+	return Option.none();
+};
+const parseBasePeriod = (input) => {
+	const datedPeriod = parseDatedPeriod(input);
+	if (Option.isSome(datedPeriod)) return datedPeriod;
+	const prefixedRelativeMonth = String$1.match(/^(vorige|deze|volgende) ([a-z]+\.?)$/u)(input);
+	if (Option.isSome(prefixedRelativeMonth)) {
+		const month = monthNumber(textAt(prefixedRelativeMonth.value, 2));
+		if (month !== void 0) {
+			const modifier = textAt(prefixedRelativeMonth.value, 1);
+			const direction = relativeYearDirection(modifier);
+			return Option.some(monthOfRelativeYear(month, direction, `${modifier} ${textAt(months, month - 1)}`));
+		}
+	}
 	const relativeMonth = String$1.match(/^([a-z]+\.?)(?: van)? (vorig jaar|volgend jaar|dit jaar)$/u)(input);
 	const relativeMonthYearFirst = String$1.match(/^(vorig jaar|volgend jaar|dit jaar) ([a-z]+\.?)$/u)(input);
 	const relativeMatch = Option.firstSomeOf([relativeMonth, relativeMonthYearFirst]);
@@ -445,13 +507,33 @@ const parseBasePeriod = (input) => {
 	].includes(input)) return Option.some(relativeWeekend(1, "volgend weekend"));
 	if (input === "het weekend voor het vorige") return Option.some(relativeWeekend(-2, input));
 	if (input === "het weekend na het volgende") return Option.some(relativeWeekend(2, input));
-	return Option.none();
+	const weekday = nextWeekdayPhrases.indexOf(input);
+	return weekday === -1 ? Option.none() : Option.some(relativeWeekday(weekday, 1, nextWeekdayPhrases[weekday] ?? input));
 };
 const parsePeriod = (input) => {
+	const shifted = String$1.match(/^(.+) (?:(?:over|binnen) ([1-9]\d*) (dag|dagen|week|weken|maand|maanden|kwartaal|kwartalen|jaar|jaren)|([1-9]\d*) (dag|dagen|week|weken|maand|maanden|kwartaal|kwartalen|jaar|jaren) (geleden|later))$/u)(input);
+	if (Option.isSome(shifted)) {
+		const suffixAmount = textAt(shifted.value, 4);
+		const amount = parseTrailingCount(suffixAmount || textAt(shifted.value, 2));
+		const unitText = textAt(shifted.value, suffixAmount.length > 0 ? 5 : 3);
+		const alias = unitAliases.find((unit) => unit[0] === unitText);
+		const entry = alias === void 0 ? void 0 : units.find((unit) => unit.unit === alias[1]);
+		const period = parsePeriod(textAt(shifted.value, 1));
+		if (Option.isSome(amount) && entry !== void 0 && Option.isSome(period)) {
+			const past = textAt(shifted.value, 6) === "geleden";
+			const direction = past ? -amount.value : amount.value;
+			const noun = amount.value === 1 ? entry.singular : entry.plural;
+			const canonical = past ? `${period.value.canonical} ${amount.value} ${noun} geleden` : `${period.value.canonical} over ${amount.value} ${noun}`;
+			return Option.some(shiftPeriod(period.value, direction, entry.unit, canonical));
+		}
+	}
 	const edge = String$1.match(/^(?:het )?(begin|eind|einde)(?: van)? (.+)$/u)(input);
 	if (Option.isSome(edge)) {
 		const edgeName = textAt(edge.value, 1);
-		const period = parseBasePeriod(textAt(edge.value, 2));
+		const periodText = textAt(edge.value, 2);
+		const basePeriod = parseBasePeriod(periodText);
+		const implicit = units.find((entry) => `${entry.article} ${entry.singular}` === periodText);
+		const period = Option.isSome(basePeriod) || implicit === void 0 ? basePeriod : Option.some(relativePeriod(implicit.unit, 0, implicit.current));
 		if (Option.isSome(period)) {
 			const isEnd = edgeName === "eind" || edgeName === "einde";
 			const canonical = `${isEnd ? "eind" : "begin"} van ${period.value.canonical}`;
@@ -465,7 +547,8 @@ const parsePeriod = (input) => {
 		"de hele ",
 		"het hele "
 	].find((prefix) => input.startsWith(prefix));
-	return parseBasePeriod(wrapper === void 0 ? input : input.slice(wrapper.length));
+	const base = parseBasePeriod(wrapper === void 0 ? input : input.slice(wrapper.length));
+	return Option.isSome(base) ? base : parseCalendarOffset(input);
 };
 const countedUnit = (value, amount) => {
 	const expected = amount === 1 ? "singular" : "plural";
@@ -528,7 +611,7 @@ const singularCalendarOffsets = units.flatMap((entry) => [
 ]);
 const parseCalendarOffset = (input) => {
 	const singular = singularCalendarOffsets.find((entry) => entry.phrase === input);
-	if (singular !== void 0) return Option.some(candidate(periodRange(relativePeriod(singular.entry.unit, singular.direction, singular.phrase)), singular.phrase));
+	if (singular !== void 0) return Option.some(relativePeriod(singular.entry.unit, singular.direction, singular.phrase));
 	const past = String$1.match(calendarPastPattern)(input);
 	const future = firstPatternMatch(input, calendarFuturePatterns);
 	const match = Option.firstSomeOf([past, future]);
@@ -540,7 +623,7 @@ const parseCalendarOffset = (input) => {
 	const direction = Option.isSome(past) ? -amount.value : amount.value;
 	const noun = amount.value === 1 ? entry.singular : entry.plural;
 	const canonical = direction < 0 ? `${amount.value} ${noun} geleden` : `over ${amount.value} ${noun}`;
-	return Option.some(candidate(periodRange(relativePeriod(entry.unit, direction, canonical)), canonical));
+	return Option.some(relativePeriod(entry.unit, direction, canonical));
 };
 const parseRollingPeriod = (input) => {
 	const singular = singularRollingPhrases.find((entry) => entry.phrase === input);
@@ -604,8 +687,6 @@ const parseDutch = (input) => {
 		"sinds nu",
 		"voortaan"
 	].includes(input)) return Option.some(candidate(fromNowRange(), "vanaf nu"));
-	const offset = parseCalendarOffset(input);
-	if (Option.isSome(offset)) return offset;
 	const rolling = parseRollingPeriod(input);
 	if (Option.isSome(rolling)) return rolling;
 	const toDate = toDatePhrases.find((entry) => entry.phrase === input);
@@ -619,7 +700,8 @@ const parseDutch = (input) => {
 	], [
 		"vanaf nu tot en met ",
 		"van vandaag tot en met ",
-		"tussen vandaag en "
+		"tussen vandaag en ",
+		"nu tot en met "
 	], parsePeriod, (period) => `vanaf ${period} tot nu toe`, (period) => `vanaf nu tot en met ${period}`);
 	if (Option.isSome(nowBounded)) return nowBounded;
 	const bounded = joinedPeriodCandidate(input, [
@@ -670,9 +752,12 @@ const staticPeriodPhrases = [
 	]),
 	...months.flatMap((month) => [
 		month,
+		`vorige ${month}`,
+		`volgende ${month}`,
 		`${month} vorig jaar`,
 		`${month} volgend jaar`
-	])
+	]),
+	...nextWeekdayPhrases
 ];
 const staticPeriods = periodsFromPhrases(staticPeriodPhrases, parsePeriod);
 const boundaryPrefixes = [
@@ -719,6 +804,16 @@ const suggestDutch = (input, limit) => {
 	], limit);
 };
 const renderDutch = (range) => {
+	const shifted = decomposeShiftedPeriodRange(range);
+	if (Option.isSome(shifted)) {
+		const base = renderDutch(shifted.value.baseRange);
+		const entry = units.find((unit) => unit.unit === shifted.value.unit);
+		if (Option.isSome(base) && entry !== void 0) {
+			const amount = Math.abs(shifted.value.amount);
+			const noun = amount === 1 ? entry.singular : entry.plural;
+			return Option.some(shifted.value.amount < 0 ? `${base.value} ${amount} ${noun} geleden` : `${base.value} over ${amount} ${noun}`);
+		}
+	}
 	const offset = calendarPeriodOffset(range);
 	if (Option.isSome(offset) && Math.abs(offset.value.amount) > 1) {
 		const entry = units.find((unit) => unit.unit === offset.value.unit);
@@ -749,6 +844,7 @@ const DutchContribution = new BaseLanguageContribution({
 	locale: "nl",
 	vocabulary: [
 		...months,
+		...weekdays,
 		...monthAbbreviations.flatMap((aliases) => aliases),
 		...units.flatMap((entry) => [
 			entry.singular,
@@ -763,10 +859,13 @@ const DutchContribution = new BaseLanguageContribution({
 		"begin",
 		"binnen",
 		"eind",
+		"en",
 		"geleden",
 		"komende",
 		"laatste",
+		"met",
 		"na",
+		"nu",
 		"over",
 		"rest",
 		"sinds",
@@ -776,8 +875,8 @@ const DutchContribution = new BaseLanguageContribution({
 		"volgend",
 		"voor"
 	],
-	normalize: normalizeNaturalText,
-	correct: correctWhitespaceSeparatedText,
+	normalize: normalizeDutch,
+	correct: correctDutch,
 	parseExact: parseDutch,
 	suggest: suggestDutch,
 	render: renderDutch

package/dist/locales/pl.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 } from "../natural/suggestion.mjs";
-import { absoluteDatePeriod, calendarPeriodOffset, candidate, currentYearDatePeriods, datedPeriods, datedQuarterPeriods, fixedDatePeriod, fixedMonthPeriod, fixedQuarterPeriod, fixedYearPeriod, fromNowRange, futurePeriod, futureRange, isoDate, joinedNowCandidate, joinedPeriodCandidate, monthOfRelativeYear, namedCurrentYearDatePeriod, namedDatePeriod, parseTrailingCount, periodBoundaryCandidate, 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, 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 = [
@@ -21,6 +21,95 @@ const months = [
 	"listopad",
 	"grudzień"
 ];
+const weekdays = [
+	"poniedziałek",
+	"wtorek",
+	"środa",
+	"czwartek",
+	"piątek",
+	"sobota",
+	"niedziela"
+];
+const weekdayGenitives = [
+	"poniedziałku",
+	"wtorku",
+	"środy",
+	"czwartku",
+	"piątku",
+	"soboty",
+	"niedzieli"
+];
+const nextWeekdays = weekdays.flatMap((weekday, day) => {
+	const feminine = day === 2 || day >= 5;
+	const canonical = `${feminine ? "następna" : "następny"} ${weekday}`;
+	return [{
+		phrase: canonical,
+		day,
+		canonical
+	}, {
+		phrase: `${feminine ? "następnej" : "następnego"} ${textAt(weekdayGenitives, day)}`,
+		day,
+		canonical
+	}];
+});
+const polishCountWords = [
+	[
+		"dwa",
+		"dwie",
+		"dwóch"
+	],
+	["trzy"],
+	["cztery"],
+	["pięć"],
+	["sześć"],
+	["siedem"],
+	["osiem"],
+	["dziewięć"],
+	["dziesięć"],
+	["jedenaście"],
+	["dwanaście"],
+	["trzynaście"],
+	["czternaście"],
+	["piętnaście"],
+	["szesnaście"],
+	["siedemnaście"],
+	["osiemnaście"],
+	["dziewiętnaście"],
+	["dwadzieścia"]
+];
+const polishCountOnes = [
+	[1, "jeden"],
+	[2, "dwa"],
+	[3, "trzy"],
+	[4, "cztery"],
+	[5, "pięć"],
+	[6, "sześć"],
+	[7, "siedem"],
+	[8, "osiem"],
+	[9, "dziewięć"]
+];
+const polishCountAliases = [
+	...sequentialCountAliases([[
+		"jeden",
+		"jedna",
+		"jedno"
+	]], 1),
+	...sequentialCountAliases(polishCountWords, 2),
+	...compoundCountAliases(decimalTens([
+		"dwadzieścia",
+		"trzydzieści",
+		"czterdzieści",
+		"pięćdziesiąt",
+		"sześćdziesiąt",
+		"siedemdziesiąt",
+		"osiemdziesiąt",
+		"dziewięćdziesiąt"
+	]), polishCountOnes, (ten, one) => [`${ten} ${one}`])
+];
+const normalizePolishCounts = compileCountAliasNormalizer(polishCountAliases);
+const polishCountVocabulary = new Set(countAliasVocabulary(polishCountAliases));
+const correctPolish = (input, vocabulary) => correctWhitespaceSeparatedText(input, vocabulary, polishCountVocabulary);
+const normalizePolish = (input, locale) => normalizePolishCounts(normalizeNaturalText(input, locale));
 const monthGenitives = [
 	"stycznia",
 	"lutego",
@@ -484,13 +573,13 @@ const parseQuarter = (input) => {
 	const quarter = quarterNumber(textAt(standalone.value, 1));
 	return quarter === void 0 ? Option.none() : Option.some(quarterOfRelativeYear(quarter, 0, `Q${quarter}`));
 };
-const parseBasePeriod = (input) => {
-	const absoluteDate = absoluteDatePeriod(input, "pl");
-	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, "pl"),
+		parseNamedDate(input),
+		parseQuarter(input)
+	]);
+	if (Option.isSome(knownPeriod)) return knownPeriod;
 	const yearMatch = String$1.match(/^(?:rok |roku )?(\d{4})$/u)(input);
 	if (Option.isSome(yearMatch)) {
 		const year = validYear(textAt(yearMatch.value, 1));
@@ -502,6 +591,20 @@ const parseBasePeriod = (input) => {
 		const year = validYear(textAt(monthYear.value, 2));
 		if (month !== void 0 && year !== void 0) return Option.some(fixedMonthPeriod(year, month, `${title(textAt(months, month - 1))} ${year}`));
 	}
+	return Option.none();
+};
+const parseBasePeriod = (input) => {
+	const datedPeriod = parseDatedPeriod(input);
+	if (Option.isSome(datedPeriod)) return datedPeriod;
+	const prefixedRelativeMonth = String$1.match(/^(poprzedni|ten|następny) ([a-ząćęłńóśźż]+\.?)$/u)(input);
+	if (Option.isSome(prefixedRelativeMonth)) {
+		const month = monthNumber(textAt(prefixedRelativeMonth.value, 2));
+		if (month !== void 0) {
+			const modifier = textAt(prefixedRelativeMonth.value, 1);
+			const direction = relativeYearDirection(modifier);
+			return Option.some(monthOfRelativeYear(month, direction, `${modifier} ${textAt(months, month - 1)}`));
+		}
+	}
 	const relativeMonth = String$1.match(/^([a-ząćęłńóśźż]+\.?) (poprzedniego roku|następnego roku|tego roku)$/u)(input);
 	const relativeMonthYearFirst = String$1.match(/^(poprzedniego roku|następnego roku|tego roku) ([a-ząćęłńóśźż]+\.?)$/u)(input);
 	const relativeMatch = Option.firstSomeOf([relativeMonth, relativeMonthYearFirst]);
@@ -522,12 +625,31 @@ const parseBasePeriod = (input) => {
 	if (["następny weekend", "przyszły weekend"].includes(input)) return Option.some(relativeWeekend(1, "następny weekend"));
 	if (input === "weekend przed poprzednim") return Option.some(relativeWeekend(-2, input));
 	if (input === "weekend po następnym") 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(/^(.+) (?:([1-9]\d*) (dzień|dni|tydzień|tygodnie|tygodni|miesiąc|miesiące|miesięcy|kwartał|kwartały|kwartałów|rok|lata|lat) (temu)|za ([1-9]\d*) (dzień|dni|tydzień|tygodnie|tygodni|miesiąc|miesiące|miesięcy|kwartał|kwartały|kwartałów|rok|lata|lat))$/u)(input);
+	if (Option.isSome(shifted)) {
+		const past = textAt(shifted.value, 4) === "temu";
+		const amount = parseTrailingCount(textAt(shifted.value, past ? 2 : 5));
+		const alias = unitAliases.find((unit) => unit[0] === textAt(shifted.value, past ? 3 : 6));
+		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 direction = past ? -amount.value : amount.value;
+			const noun = countNoun(amount.value, entry);
+			const canonical = past ? `${period.value.canonical} ${amount.value} ${noun} temu` : `${period.value.canonical} za ${amount.value} ${noun}`;
+			return Option.some(shiftPeriod(period.value, direction, entry.unit, canonical));
+		}
+	}
 	const edge = String$1.match(/^(początek|koniec) (.+)$/u)(input);
 	if (Option.isSome(edge)) {
-		const period = parseBasePeriod(textAt(edge.value, 2));
+		const periodText = textAt(edge.value, 2);
+		const basePeriod = parseBasePeriod(periodText);
+		const implicitUnit = declinedUnits.find((entry) => entry[2] === periodText)?.[0];
+		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 = textAt(edge.value, 1) === "koniec";
 			const canonical = `${isEnd ? "koniec" : "początek"} ${withPeriodCase(period.value.canonical, "genitive")}`;
@@ -541,7 +663,8 @@ const parsePeriod = (input) => {
 		"cały ",
 		"całe "
 	].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) => 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";
@@ -573,7 +696,7 @@ const parseCalendarOffset = (input) => {
 	const direction = Option.isSome(past) ? -amount.value : amount.value;
 	const noun = countNoun(amount.value, entry);
 	const canonical = direction < 0 ? `${amount.value} ${noun} temu` : `za ${amount.value} ${noun}`;
-	return Option.some(candidate(periodRange(relativePeriod(unit, direction, canonical)), canonical));
+	return Option.some(relativePeriod(unit, direction, canonical));
 };
 const rollingModifier = (amount, future) => {
 	if (amount === 1) return future ? "następny" : "ostatni";
@@ -635,6 +758,7 @@ const boundaries = [
 	]
 ];
 const boundaryCandidate = (input) => {
+	if (input.startsWith("do koniec ")) return Option.none();
 	const included = String$1.match(/^do (.+) włącznie$/u)(input);
 	if (Option.isSome(included)) return parsePeriod(textAt(included.value, 1)).pipe(Option.map((value) => periodBoundaryCandidate(value, "through", `do ${withPeriodCase(value.canonical, "genitive")} włącznie`)));
 	for (const [prefix, boundary, canonical] of boundaries) {
@@ -653,8 +777,6 @@ const parsePolish = (input) => {
 		"do teraz"
 	].includes(input)) return Option.some(candidate(untilNowRange(), "do dziś"));
 	if (["od teraz", "od dziś"].includes(input)) return Option.some(candidate(fromNowRange(), "od teraz"));
-	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);
@@ -677,7 +799,8 @@ const parsePolish = (input) => {
 	], [
 		"od dziś do ",
 		"między dziś a ",
-		"pomiędzy dziś a "
+		"pomiędzy dziś a ",
+		"teraz do "
 	], parsePeriod, (period) => `od ${period} do dziś`, (period) => `od dziś do ${period}`);
 	if (Option.isSome(nowBounded)) return nowBounded;
 	const bounded = joinedPeriodCandidate(input, [
@@ -731,9 +854,12 @@ const staticPeriodPhrases = [
 	]),
 	...months.flatMap((month) => [
 		month,
+		`poprzedni ${month}`,
+		`następny ${month}`,
 		`${month} poprzedniego roku`,
 		`${month} następnego roku`
-	])
+	]),
+	...nextWeekdays.map((entry) => entry.phrase)
 ];
 const staticPeriods = periodsFromPhrases(staticPeriodPhrases, parsePeriod);
 const monthBoundaryPhrases = months.flatMap((_, index) => {
@@ -800,6 +926,16 @@ const suggestPolish = (input, limit) => {
 	], limit);
 };
 const renderPolish = (range) => {
+	const shifted = decomposeShiftedPeriodRange(range);
+	if (Option.isSome(shifted)) {
+		const base = renderPolish(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 = countNoun(amount, entry);
+			return Option.some(shifted.value.amount < 0 ? `${base.value} ${amount} ${noun} temu` : `${base.value} za ${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);
@@ -830,6 +966,8 @@ const PolishContribution = new BaseLanguageContribution({
 	locale: "pl",
 	vocabulary: [
 		...months,
+		...weekdays,
+		...weekdayGenitives,
 		...monthGenitives,
 		...monthInstrumentals,
 		...monthLocatives,
@@ -870,8 +1008,8 @@ const PolishContribution = new BaseLanguageContribution({
 		"we",
 		"za"
 	],
-	normalize: normalizeNaturalText,
-	correct: correctWhitespaceSeparatedText,
+	normalize: normalizePolish,
+	correct: correctPolish,
 	parseExact: parsePolish,
 	suggest: suggestPolish,
 	render: renderPolish

package/dist/locales/shared.mjs

@@ -6,6 +6,43 @@ import { NaturalCandidate } from "../language/model.mjs";
 import { Match, Option, RegExp as RegExp$1, Schema, String as String$1 } from "effect";
 //#region src/locales/shared.ts
 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 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();
+	for (const [phrase, amount] of aliases) if (!distinct.has(phrase)) distinct.set(phrase, amount);
+	const byFirstWord = /* @__PURE__ */ new Map();
+	for (const [phrase, amount] of distinct) {
+		const parts = phrase.split(" ");
+		const first = parts[0] ?? "";
+		const entries = byFirstWord.get(first) ?? [];
+		byFirstWord.set(first, [...entries, {
+			amount,
+			parts
+		}]);
+	}
+	for (const [first, entries] of byFirstWord) byFirstWord.set(first, [...entries].sort((left, right) => right.parts.length - left.parts.length));
+	return (input) => {
+		const words = input.split(" ");
+		const output = [];
+		for (let index = 0; index < words.length;) {
+			const alias = (byFirstWord.get(words[index] ?? "") ?? []).find((entry) => entry.parts.every((part, offset) => words[index + offset] === part));
+			if (alias === void 0) {
+				output.push(words[index] ?? "");
+				index += 1;
+			} else {
+				output.push(String(alias.amount));
+				index += alias.parts.length;
+			}
+		}
+		return output.join(" ");
+	};
+};
 const Period = Schema.Struct({
 	start: InstantExpr,
 	end: InstantExpr,
@@ -18,6 +55,22 @@ const isNow = Schema.is(Now);
 const isShift = Schema.is(Shift);
 const isStartOf = Schema.is(StartOf);
 const periodRange = (period) => boundedRange(greaterThanOrEqual(period.start), lessThan(period.end));
+const shiftPeriod = (period, amount, unit, canonical) => Period.make({
+	start: shift(period.start, amount, unit),
+	end: shift(period.end, amount, unit),
+	canonical
+});
+const decomposeShiftedPeriodRange = (range) => {
+	if (!isGreaterThanOrEqual(range.lower) || !isLessThan(range.upper)) return Option.none();
+	const start = range.lower.value;
+	const end = range.upper.value;
+	if (!isShift(start) || !isShift(end) || start.amount === 0 || start.amount !== end.amount || start.unit !== end.unit) return Option.none();
+	return Option.some({
+		amount: start.amount,
+		unit: start.unit,
+		baseRange: boundedRange(greaterThanOrEqual(start.base), lessThan(end.base))
+	});
+};
 const periodToDateRange = (unit) => boundedRange(greaterThanOrEqual(startOf(now(), unit)), lessThanOrEqual(now()));
 const fromNowRange = () => lowerOpenRange(greaterThanOrEqual(now()));
 const untilNowRange = () => upperOpenRange(lessThanOrEqual(now()));
@@ -49,6 +102,16 @@ const periodPreviousDay = (period, canonical) => Period.make({
 	end: period.start,
 	canonical
 });
+const relativeWeekday = (day, direction, canonical) => {
+	const weekBase = direction === 0 ? now() : shift(now(), direction, "week");
+	const weekStart = startOf(weekBase, "week");
+	const start = day === 0 ? weekStart : shift(weekStart, day, "day");
+	return Period.make({
+		start,
+		end: shift(start, 1, "day"),
+		canonical
+	});
+};
 const relativeWeekend = (direction, canonical) => {
 	const weekBase = direction === 0 ? now() : shift(now(), direction, "week");
 	const weekStart = startOf(weekBase, "week");
@@ -392,4 +455,4 @@ const renderPeriodRange = (range, toDate, periods, since, before, through, after
 	return Option.none();
 };
 //#endregion
-export { Period, absoluteDatePeriod, calendarPeriodOffset, candidate, currentYearDatePeriods, datedPeriods, datedQuarterPeriods, fixedDatePeriod, fixedMonthPeriod, fixedQuarterPeriod, fixedYearPeriod, formatAbsoluteDate, fromNowRange, futurePeriod, futureRange, isoDate, joinedNowCandidate, joinedPeriodCandidate, monthOfRelativeYear, namedCurrentYearDatePeriod, namedDatePeriod, openBoundaryCandidate, parseTrailingCount, periodBoundaryCandidate, periodDay, periodEndDay, periodPreviousDay, periodRange, periodStartDay, periodToDateRange, periodsFromPhrases, quarterOfRelativeYear, relativePeriod, relativeWeekend, remainingPeriodRange, renderPeriodRange, textAt, trailingPeriod, trailingRange, untilNowRange, validYear };
+export { Period, absoluteDatePeriod, calendarPeriodOffset, candidate, compileCountAliasNormalizer, compoundCountAliases, countAliasVocabulary, currentYearDatePeriods, datedPeriods, datedQuarterPeriods, decimalTens, decomposeShiftedPeriodRange, fixedDatePeriod, fixedMonthPeriod, fixedQuarterPeriod, fixedYearPeriod, formatAbsoluteDate, fromNowRange, futurePeriod, futureRange, isoDate, joinedNowCandidate, joinedPeriodCandidate, monthOfRelativeYear, namedCurrentYearDatePeriod, namedDatePeriod, openBoundaryCandidate, parseTrailingCount, periodBoundaryCandidate, periodDay, periodEndDay, periodPreviousDay, periodRange, periodStartDay, periodToDateRange, periodsFromPhrases, quarterOfRelativeYear, relativePeriod, relativeWeekday, relativeWeekend, remainingPeriodRange, renderPeriodRange, sequentialCountAliases, shiftPeriod, textAt, trailingPeriod, trailingRange, untilNowRange, validYear };