chronolizer 0.4.0 → 0.4.1

package/README.md

@@ -230,10 +230,12 @@ A date filter has at least one bound. It can have one lower bound and one upper
 | `lte` | On or before the value      |
 
 An expression starts with `now` or an ISO date. Operations run from left to right.
+Calendar shifts are not combined or canceled. For example, `2025-01-31||+1M+1M`
+resolves to March 28, not March 31. Each month shift clamps the day to the last
+valid day of that month. Time-zone gaps can also affect intermediate dates.
 
 ```text
-expression := anchor operation*
-anchor     := "now" | YYYY-MM-DD | YYYY-MM-DD "||"
+expression := "now" operation* | YYYY-MM-DD | YYYY-MM-DD "||" operation+
 operation  := ("+" | "-") positiveInteger unit | "/" unit
 unit       := "d" | "w" | "M" | "q" | "y"
 ```

package/dist/ast/fold.mjs

@@ -1,19 +1,17 @@
-import { DateLiteral, GreaterThanOrEqual, LessThan, Now, Shift, StartOf } from "./schemas.mjs";
-import { Match, Schema, absurd } from "effect";
+import { GreaterThanOrEqual, LessThan, Now, Shift, StartOf } from "./schemas.mjs";
+import { Match, Schema } from "effect";
 //#region src/ast/fold.ts
-const isDateLiteral = Schema.is(DateLiteral);
 const isGreaterThanOrEqual = Schema.is(GreaterThanOrEqual);
 const isLessThan = Schema.is(LessThan);
 const isNow = Schema.is(Now);
 const isShift = Schema.is(Shift);
 const isStartOf = Schema.is(StartOf);
-const foldInstant = (expression, algebra) => {
-	if (isNow(expression)) return algebra.now();
-	if (isDateLiteral(expression)) return algebra.dateLiteral(expression.value);
-	if (isShift(expression)) return algebra.shift(foldInstant(expression.base, algebra), expression.amount, expression.unit);
-	if (isStartOf(expression)) return algebra.startOf(foldInstant(expression.base, algebra), expression.unit);
-	return absurd(expression);
-};
+const foldInstant = (expression, algebra) => Match.typeTags()({
+	Now: () => algebra.now(),
+	DateLiteral: (literal) => algebra.dateLiteral(literal.value),
+	Shift: (operation) => algebra.shift(foldInstant(operation.base, algebra), operation.amount, operation.unit),
+	StartOf: (operation) => algebra.startOf(foldInstant(operation.base, algebra), operation.unit)
+})(expression);
 const shiftOffset = (base, amount, unit) => Match.value(unit).pipe(Match.when("year", () => ({
 	...base,
 	months: base.months + amount * 12

package/dist/ast/normalize.mjs

@@ -1,21 +1,12 @@
-import { Shift } from "./schemas.mjs";
 import { boundedRange, dateLiteral, greaterThan, greaterThanOrEqual, lessThan, lessThanOrEqual, lowerOpenRange, now, shift, startOf, upperOpenRange } from "./constructors.mjs";
-import { Match, Schema } from "effect";
+import { foldInstant } from "./fold.mjs";
+import { Match } from "effect";
 //#region src/ast/normalize.ts
-const isShift = Schema.is(Shift);
-const normalizeInstant = (expression) => Match.valueTags(expression, {
-	Now: () => now(),
-	DateLiteral: (literal) => dateLiteral(literal.value),
-	StartOf: (operation) => startOf(normalizeInstant(operation.base), operation.unit),
-	Shift: (operation) => {
-		const base = normalizeInstant(operation.base);
-		if (operation.amount === 0) return base;
-		if (isShift(base) && base.unit === operation.unit) {
-			const amount = base.amount + operation.amount;
-			if (Number.isSafeInteger(amount)) return normalizeInstant(shift(base.base, amount, operation.unit));
-		}
-		return shift(base, operation.amount, operation.unit);
-	}
+const normalizeInstant = (expression) => foldInstant(expression, {
+	now,
+	dateLiteral,
+	startOf,
+	shift: (base, amount, unit) => amount === 0 ? base : shift(base, amount, unit)
 });
 const normalizeLower = (bound) => Match.valueTags(bound, {
 	GreaterThan: (value) => greaterThan(normalizeInstant(value.value)),

package/dist/filter/codec.mjs

@@ -31,13 +31,12 @@ const formatUpper = Match.typeTags()({
 	LessThanOrEqual: (bound) => DateFilter.make({ lte: formatInstantExpression(bound.value) })
 });
 const formatFilter = (range) => {
-	const normalized = normalizeRange(range);
-	if (normalized.lower !== void 0 && normalized.upper !== void 0) return DateFilter.make({
-		...formatLower(normalized.lower),
-		...formatUpper(normalized.upper)
+	if (range.lower !== void 0 && range.upper !== void 0) return DateFilter.make({
+		...formatLower(range.lower),
+		...formatUpper(range.upper)
 	});
-	if (normalized.lower !== void 0) return formatLower(normalized.lower);
-	return formatUpper(normalized.upper);
+	if (range.lower !== void 0) return formatLower(range.lower);
+	return formatUpper(range.upper);
 };
 const rangeKey = (range) => {
 	const filter = formatFilter(range);

package/dist/filter/expression.mjs

@@ -1,7 +1,6 @@
 import { isIsoDate } from "../ast/schemas.mjs";
 import { dateLiteral, now, shift, startOf } from "../ast/constructors.mjs";
 import { foldInstant } from "../ast/fold.mjs";
-import { normalizeInstant } from "../ast/normalize.mjs";
 import { FilterExpressionParseError } from "./errors.mjs";
 import { Effect, Match } from "effect";
 //#region src/filter/expression.ts
@@ -66,7 +65,7 @@ const appendOperation = (base, operation) => ({
 	text: `${base.text}${base.fixedAnchor ? "||" : ""}${operation}`,
 	fixedAnchor: false
 });
-const formatInstantExpression = (expression) => foldInstant(normalizeInstant(expression), {
+const formatInstantExpression = (expression) => foldInstant(expression, {
 	now: () => ({
 		text: "now",
 		fixedAnchor: false
@@ -75,7 +74,7 @@ const formatInstantExpression = (expression) => foldInstant(normalizeInstant(exp
 		text: value,
 		fixedAnchor: true
 	}),
-	shift: (base, amount, unit) => appendOperation(base, `${amount < 0 ? "-" : "+"}${Math.abs(amount)}${symbolFromUnit(unit)}`),
+	shift: (base, amount, unit) => amount === 0 ? base : appendOperation(base, `${amount < 0 ? "-" : "+"}${Math.abs(amount)}${symbolFromUnit(unit)}`),
 	startOf: (base, unit) => appendOperation(base, `/${symbolFromUnit(unit)}`)
 }).text;
 //#endregion

package/dist/language/registry.mjs

@@ -86,11 +86,13 @@ const createRegistry = Effect.fn(function* () {
 		})));
 	});
 	const resolve = Effect.fn(function* (locale) {
+		const cached = (yield* Ref.get(state)).compiledLanguages.get(locale);
+		if (cached !== void 0) return cached;
 		const canonical = canonicalBaseLocale(locale);
 		if (Option.isSome(canonical)) {
 			const compiled = yield* Ref.modify(state, (current) => {
-				const cached = current.compiledLanguages.get(canonical.value);
-				if (cached !== void 0) return [Option.some(cached), current];
+				const canonicalCached = current.compiledLanguages.get(canonical.value);
+				if (canonicalCached !== void 0) return [Option.some(canonicalCached), current];
 				const language = compileLanguage(canonical.value, current.entries);
 				if (Option.isNone(language)) return [language, current];
 				const cache = new Map(current.compiledLanguages);

package/dist/locales/cs.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, 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, 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 = [
@@ -486,15 +485,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();
 };
@@ -616,14 +607,12 @@ const parsePeriod = (input) => {
 	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";
-const countedPattern = (source) => new RegExp(source.replace("UNIT", countedUnitPattern), "u");
-const calendarPastPattern = countedPattern("^před ([1-9]\\d*) (UNIT)$");
-const calendarFuturePatterns = [countedPattern("^za ([1-9]\\d*) (UNIT)$")];
-const rollingPastPatterns = [countedPattern("^(?:poslední|posledních|uplynulé|uplynulých) ([1-9]\\d*) (UNIT)$")];
-const rollingFuturePatterns = [countedPattern("^(?:příští|následující) ([1-9]\\d*) (UNIT)$")];
-const rollingSincePattern = countedPattern("^za poslední ([1-9]\\d*) (UNIT)$");
-const rollingBarePattern = countedPattern("^([1-9]\\d*) (UNIT)$");
+const calendarPastPattern = /^před ([1-9]\d*) ([^ ]+)$/u;
+const calendarFuturePatterns = [/^za ([1-9]\d*) ([^ ]+)$/u];
+const rollingPastPatterns = [/^(?:poslední|posledních|uplynulé|uplynulých) ([1-9]\d*) ([^ ]+)$/u];
+const rollingFuturePatterns = [/^(?:příští|následující) ([1-9]\d*) ([^ ]+)$/u];
+const rollingSincePattern = /^za poslední ([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 singularRollingPhrases = units.flatMap((entry) => [
 	{
@@ -742,7 +731,7 @@ const parseCzech = (input) => {
 		"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, [
+	const bounded = joinedPeriodCandidate(input.replace(/ včetně$/u, ""), [
 		["od ", " do "],
 		["mezi ", " a "],
 		["", " - "],