chronolizer 0.2.0 → 0.4.0

package/dist/locales/cs.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, 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/cs.ts
 const months = [
@@ -21,6 +21,123 @@ const months = [
 	"listopad",
 	"prosinec"
 ];
+const weekdays = [
+	"pondělí",
+	"úterý",
+	"středa",
+	"čtvrtek",
+	"pátek",
+	"sobota",
+	"neděle"
+];
+const weekdayGenitives = [
+	"pondělí",
+	"úterý",
+	"středy",
+	"čtvrtka",
+	"pátku",
+	"soboty",
+	"neděle"
+];
+const nextWeekdays = weekdays.flatMap((weekday, day) => [{
+	phrase: `příští ${weekday}`,
+	day,
+	canonical: `příští ${weekday}`
+}, {
+	phrase: `příštího ${textAt(weekdayGenitives, day)}`,
+	day,
+	canonical: `příští ${weekday}`
+}]);
+const czechCountWords = [
+	[
+		"dva",
+		"dvě",
+		"dvou",
+		"dvěma"
+	],
+	[
+		"tři",
+		"tří",
+		"třemi"
+	],
+	[
+		"čtyři",
+		"čtyř",
+		"čtyřmi"
+	],
+	["pět", "pěti"],
+	["šest", "šesti"],
+	["sedm", "sedmi"],
+	["osm", "osmi"],
+	["devět", "devíti"],
+	["deset", "deseti"],
+	["jedenáct", "jedenácti"],
+	["dvanáct", "dvanácti"],
+	["třináct", "třinácti"],
+	["čtrnáct", "čtrnácti"],
+	["patnáct", "patnácti"],
+	["šestnáct", "šestnácti"],
+	["sedmnáct", "sedmnácti"],
+	["osmnáct", "osmnácti"],
+	["devatenáct", "devatenácti"],
+	["dvacet", "dvaceti"]
+];
+const czechCountOnes = [
+	[1, "jedna"],
+	[2, "dva"],
+	[3, "tři"],
+	[4, "čtyři"],
+	[5, "pět"],
+	[6, "šest"],
+	[7, "sedm"],
+	[8, "osm"],
+	[9, "devět"]
+];
+const czechObliqueCountOnes = [
+	[1, "jedním"],
+	[2, "dvěma"],
+	[3, "třemi"],
+	[4, "čtyřmi"],
+	[5, "pěti"],
+	[6, "šesti"],
+	[7, "sedmi"],
+	[8, "osmi"],
+	[9, "devíti"]
+];
+const czechCountAliases = [
+	...sequentialCountAliases([[
+		"jeden",
+		"jedna",
+		"jedno",
+		"jedním",
+		"jednou"
+	]], 1),
+	...sequentialCountAliases(czechCountWords, 2),
+	...compoundCountAliases(decimalTens([
+		"dvacet",
+		"třicet",
+		"čtyřicet",
+		"padesát",
+		"šedesát",
+		"sedmdesát",
+		"osmdesát",
+		"devadesát"
+	]), czechCountOnes, (ten, one) => [`${ten} ${one}`]),
+	...compoundCountAliases(decimalTens([
+		"dvaceti",
+		"třiceti",
+		"čtyřiceti",
+		"padesáti",
+		"šedesáti",
+		"sedmdesáti",
+		"osmdesáti",
+		"devadesáti"
+	]), czechObliqueCountOnes, (ten, one) => [`${ten} ${one}`])
+];
+const normalizeCzechCounts = compileCountAliasNormalizer(czechCountAliases);
+const czechCountVocabulary = new Set(countAliasVocabulary(czechCountAliases));
+const correctCzech = (input, vocabulary) => correctWhitespaceSeparatedText(input, vocabulary, czechCountVocabulary);
+const normalizeCzech = (input, locale) => normalizeCzechCounts(normalizeNaturalText(input, locale));
 const monthGenitives = [
 	"ledna",
 	"února",
@@ -85,6 +202,7 @@ const units = [
 		many: "dnů",
 		pastSingular: "dnem",
 		pastPlural: "dny",
+		durationGenitive: "dne",
 		current: "dnes",
 		previous: "včera",
 		next: "zítra",
@@ -98,6 +216,7 @@ const units = [
 		many: "týdnů",
 		pastSingular: "týdnem",
 		pastPlural: "týdny",
+		durationGenitive: "týdne",
 		current: "tento týden",
 		previous: "minulý týden",
 		next: "příští týden",
@@ -111,6 +230,7 @@ const units = [
 		many: "měsíců",
 		pastSingular: "měsícem",
 		pastPlural: "měsíci",
+		durationGenitive: "měsíce",
 		current: "tento měsíc",
 		previous: "minulý měsíc",
 		next: "příští měsíc",
@@ -124,6 +244,7 @@ const units = [
 		many: "čtvrtletí",
 		pastSingular: "čtvrtletím",
 		pastPlural: "čtvrtletími",
+		durationGenitive: "čtvrtletí",
 		current: "toto čtvrtletí",
 		previous: "minulé čtvrtletí",
 		next: "příští čtvrtletí",
@@ -137,6 +258,7 @@ const units = [
 		many: "let",
 		pastSingular: "rokem",
 		pastPlural: "lety",
+		durationGenitive: "roku",
 		current: "tento rok",
 		previous: "minulý rok",
 		next: "příští rok",
@@ -144,7 +266,6 @@ const units = [
 		remaining: "zbytek roku"
 	}
 ];
-const title = (value) => `${value.slice(0, 1).toLocaleUpperCase("cs")}${value.slice(1)}`;
 const unitAliases = [
 	["den", "day"],
 	["dny", "day"],
@@ -360,17 +481,22 @@ const monthNumber = (value) => {
 	return short === -1 ? void 0 : short + 1;
 };
 const dateLabel = (day, month, year) => `${day}. ${textAt(monthGenitives, month - 1)} ${year}`;
+const currentDateLabel = (day, month) => `${day}. ${textAt(monthGenitives, month - 1)}`;
 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.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, dateLabel(day, month, 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, dateLabel(day, month, year)));
+		}
+	}
+	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();
 };
 const quarterNumber = (value) => {
 	if (value.startsWith("q") && value.length === 2) return Number(value.slice(1));
@@ -397,12 +523,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) => {
-	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, "cs"),
+		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));
@@ -412,7 +539,21 @@ 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))} ${year}`));
+		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(/^(minulý|tento|příští) ([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áčďéěíňóřšťúůýž]+\.?) (minulého roku|příštího roku|tohoto roku)$/u)(input);
 	const relativeMonthYearFirst = String$1.match(/^(minulého roku|příštího roku|tohoto roku) ([a-záčďéěíňóřšťúůýž]+\.?)$/u)(input);
@@ -423,10 +564,10 @@ const parseBasePeriod = (input) => {
 		const yearText = textAt(relativeMatch.value, yearFirst ? 1 : 2);
 		const month = monthNumber(monthText);
 		const direction = relativeYearDirection(yearText);
-		if (month !== void 0) return Option.some(monthOfRelativeYear(month, direction, `${title(textAt(months, month - 1))} ${relativeYearName(direction)}`));
+		if (month !== void 0) return Option.some(monthOfRelativeYear(month, direction, `${textAt(months, month - 1)} ${relativeYearName(direction)}`));
 	}
 	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 (["víkend", "tento víkend"].includes(input)) return Option.some(relativeWeekend(0, "tento víkend"));
@@ -434,12 +575,31 @@ const parseBasePeriod = (input) => {
 	if (["příští víkend", "následující víkend"].includes(input)) return Option.some(relativeWeekend(1, "příští víkend"));
 	if (input === "předminulý víkend") return Option.some(relativeWeekend(-2, input));
 	if (input === "přespříští víkend") 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(/^(.+) (před|za) ([1-9]\d*) (den|dny|dnů|dnem|týden|týdny|týdnů|týdnem|měsíc|měsíce|měsíců|měsícem|měsíci|čtvrtletí|čtvrtletím|čtvrtletími|rok|roky|let|rokem|lety)$/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) === "před";
+			const direction = past ? -amount.value : amount.value;
+			const pastNoun = amount.value === 1 ? entry.pastSingular : entry.pastPlural;
+			const noun = past ? pastNoun : countNoun(amount.value, entry);
+			const canonical = `${period.value.canonical} ${past ? "před" : "za"} ${amount.value} ${noun}`;
+			return Option.some(shiftPeriod(period.value, direction, entry.unit, canonical));
+		}
+	}
 	const edge = String$1.match(/^(začátek|počátek|konec) (.+)$/u)(input);
 	if (Option.isSome(edge)) {
-		const period = parseBasePeriod(textAt(edge.value, 2));
+		const periodText = textAt(edge.value, 2);
+		const basePeriod = parseBasePeriod(periodText);
+		const implicit = units.find((entry) => entry.durationGenitive === periodText);
+		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) === "konec";
 			const canonical = `${isEnd ? "konec" : "začátek"} ${period.value.canonical}`;
@@ -452,7 +612,8 @@ const parsePeriod = (input) => {
 		"celý ",
 		"celé "
 	].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 = "den|dny|dnů|dnem|týden|týdny|týdnů|týdnem|měsíc|měsíce|měsíců|měsícem|měsíci|čtvrtletí|čtvrtletím|čtvrtletími|rok|roky|let|rokem|lety";
@@ -464,6 +625,24 @@ const rollingFuturePatterns = [countedPattern("^(?:příští|následující) ([
 const rollingSincePattern = countedPattern("^za poslední ([1-9]\\d*) (UNIT)$");
 const rollingBarePattern = countedPattern("^([1-9]\\d*) (UNIT)$");
 const firstPatternMatch = (input, patterns) => Option.firstSomeOf(patterns.map((pattern) => String$1.match(pattern)(input)));
+const singularRollingPhrases = units.flatMap((entry) => [
+	{
+		phrase: `poslední ${entry.singular}`,
+		entry,
+		future: false
+	},
+	{
+		phrase: `během posledního ${entry.durationGenitive}`,
+		entry,
+		future: false
+	},
+	{
+		phrase: `během následujícího ${entry.durationGenitive}`,
+		entry,
+		future: true
+	}
+]);
+const singularRollingCanonical = (entry, future) => `během ${future ? "následujícího" : "posledního"} ${entry.durationGenitive}`;
 const countNoun = (amount, entry) => {
 	if (amount === 1) return entry.singular;
 	const lastTwo = amount % 100;
@@ -484,9 +663,14 @@ const parseCalendarOffset = (input) => {
 	const futureNoun = countNoun(amount.value, entry);
 	const pastNoun = amount.value === 1 ? entry.pastSingular : entry.pastPlural;
 	const canonical = direction < 0 ? `před ${amount.value} ${pastNoun}` : `za ${amount.value} ${futureNoun}`;
-	return Option.some(candidate(periodRange(relativePeriod(unit, direction, canonical)), canonical));
+	return Option.some(relativePeriod(unit, direction, canonical));
 };
 const parseRollingPeriod = (input) => {
+	const singular = singularRollingPhrases.find((entry) => entry.phrase === input);
+	if (singular !== void 0) {
+		const range = singular.future ? futureRange(1, singular.entry.unit) : trailingRange(1, singular.entry.unit);
+		return Option.some(candidate(range, singularRollingCanonical(singular.entry, singular.future)));
+	}
 	const since = String$1.match(rollingSincePattern)(input);
 	const past = firstPatternMatch(input, rollingPastPatterns);
 	const bare = String$1.match(rollingBarePattern)(input);
@@ -505,9 +689,22 @@ const parseRollingPeriod = (input) => {
 	if (entry === void 0) return Option.none();
 	const isFuture = Option.isSome(future);
 	const range = isFuture ? futureRange(amount.value, unit) : trailingRange(amount.value, unit);
+	if (amount.value === 1) return Option.some(candidate(range, singularRollingCanonical(entry, isFuture)));
 	const modifier = isFuture ? "příští" : "poslední";
 	return Option.some(candidate(range, `${modifier} ${amount.value} ${countNoun(amount.value, entry)}`));
 };
+const parseElidedDateRange = (input) => {
+	const joined = String$1.match(/^od ([0-3]?\d)\.?(?: do) ([0-3]?\d)\.? ([a-záčďéěíňóřšťúůýž]+\.?)(?: (\d{4}))?$/u)(input);
+	const dashed = String$1.match(/^([0-3]?\d)\.?[–—-]([0-3]?\d)\.? ([a-záčďéěíňóřšťúůýž]+\.?)(?: (\d{4}))?$/u)(input);
+	const match = Option.firstSomeOf([joined, dashed]);
+	if (Option.isNone(match)) return Option.none();
+	const lowerDay = textAt(match.value, 1);
+	const upperDay = textAt(match.value, 2);
+	const month = textAt(match.value, 3);
+	const year = textAt(match.value, 4);
+	const suffix = year.length === 0 ? "" : ` ${year}`;
+	return joinedPeriodCandidate(`od ${lowerDay}. ${month}${suffix} do ${upperDay}. ${month}${suffix}`, [["od ", " do "]], parsePeriod, (lower, upper) => `od ${lower} do ${upper} včetně`);
+};
 const boundaryCandidate = (input) => {
 	const included = String$1.match(/^do (.+) včetně$/u)(input);
 	if (Option.isSome(included)) return openBoundaryCandidate(`do ${textAt(included.value, 1)}`, [["do ", "through"]], parsePeriod);
@@ -533,13 +730,17 @@ const parseCzech = (input) => {
 		"ode dneška",
 		"od teď"
 	].includes(input)) return Option.some(candidate(fromNowRange(), "od nynějška"));
-	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 nowBounded = joinedNowCandidate(input, [["od ", " do dneška"], ["mezi ", " a dneškem"]], ["od dneška do ", "mezi dneškem a "], parsePeriod, (period) => `od ${period} do dneška`, (period) => `od dneška do ${period}`);
+	const elided = parseElidedDateRange(input);
+	if (Option.isSome(elided)) return elided;
+	const nowBounded = joinedNowCandidate(input, [["od ", " do dneška"], ["mezi ", " a dneškem"]], [
+		"od dneška do ",
+		"mezi dneškem a ",
+		"dnešek až "
+	], parsePeriod, (period) => `od ${period} do dneška`, (period) => `od dneška do ${period}`);
 	if (Option.isSome(nowBounded)) return nowBounded;
 	const bounded = joinedPeriodCandidate(input, [
 		["od ", " do "],
@@ -551,7 +752,7 @@ const parseCzech = (input) => {
 	if (Option.isSome(bounded)) return bounded;
 	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]),
@@ -561,6 +762,8 @@ const staticPeriodPhrases = [
 	"předminulý víkend",
 	"přespříští víkend",
 	...periodAliases.flatMap((entry) => [`začátek ${entry[0]}`, `konec ${entry[0]}`]),
+	...nextWeekdays.map((entry) => entry.phrase),
+	...months.flatMap((month) => [`minulý ${month}`, `příští ${month}`]),
 	...[
 		1,
 		2,
@@ -606,6 +809,7 @@ const countedSuggestions = (input) => {
 const czechSuggestionPhrases = [
 	...units.map((entry) => entry.toDate),
 	...units.map((entry) => entry.remaining),
+	...singularRollingPhrases.map((entry) => entry.phrase),
 	...staticPeriodPhrases,
 	...prefixNaturalPhrases(staticPeriodPhrases, boundaryPrefixes),
 	"dosud",
@@ -621,6 +825,18 @@ const suggestCzech = (input, limit) => {
 	], limit);
 };
 const renderCzech = (range) => {
+	const shifted = decomposeShiftedPeriodRange(range);
+	if (Option.isSome(shifted)) {
+		const base = renderCzech(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 pastNoun = amount === 1 ? entry.pastSingular : entry.pastPlural;
+			const noun = shifted.value.amount < 0 ? pastNoun : countNoun(amount, entry);
+			const direction = shifted.value.amount < 0 ? "před" : "za";
+			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);
@@ -634,20 +850,26 @@ const renderCzech = (range) => {
 	const future = futurePeriod(range);
 	if (Option.isSome(future)) {
 		const entry = units.find((unit) => unit.unit === future.value.unit);
-		if (entry !== void 0) return Option.some(`příští ${future.value.amount} ${countNoun(future.value.amount, entry)}`);
+		if (entry !== void 0) return Option.some(future.value.amount === 1 ? singularRollingCanonical(entry, true) : `příští ${future.value.amount} ${countNoun(future.value.amount, entry)}`);
 	}
 	const trailing = trailingPeriod(range);
 	if (Option.isSome(trailing)) {
 		const entry = units.find((unit) => unit.unit === trailing.value.unit);
-		if (entry !== void 0) return Option.some(`poslední ${trailing.value.amount} ${countNoun(trailing.value.amount, entry)}`);
+		if (entry !== void 0) return Option.some(trailing.value.amount === 1 ? singularRollingCanonical(entry, false) : `poslední ${trailing.value.amount} ${countNoun(trailing.value.amount, entry)}`);
 	}
-	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) => `od ${period}`, (period) => `před ${period}`, (period) => `do ${period} včetně`, (period) => `po ${period}`, (lower, upper) => `od ${lower} do ${upper} včetně`, (period) => `od ${period} do dneška`, (period) => `od dneška do ${period}`, () => "dosud", () => "od nynějška");
 };
 const CzechContribution = new BaseLanguageContribution({
 	locale: "cs",
 	vocabulary: [
 		...months,
+		...weekdays,
+		...weekdayGenitives,
 		...monthAbbreviations.flatMap((aliases) => aliases),
 		...units.flatMap((entry) => [
 			entry.singular,
@@ -678,8 +900,8 @@ const CzechContribution = new BaseLanguageContribution({
 		"začátek",
 		"zbytek"
 	],
-	normalize: normalizeNaturalText,
-	correct: correctWhitespaceSeparatedText,
+	normalize: normalizeCzech,
+	correct: correctCzech,
 	parseExact: parseCzech,
 	suggest: suggestCzech,
 	render: renderCzech