chronolizer 0.3.0 → 0.4.1

package/dist/natural/suggestion.mjs

@@ -1,36 +1,46 @@
 import { damerauLevenshteinDistance } from "./correction.mjs";
-import { Array as Array$1, Option, String } from "effect";
+import { Option, String } from "effect";
 //#region src/natural/suggestion.ts
-const fuzzyPrefixDistance = (input, target) => {
-	const lengths = Array$1.dedupe([
+const completionCost = (input, target, targetStart, targetEnd, workspace) => {
+	const targetLength = targetEnd - targetStart;
+	if (input.length <= targetLength && target.startsWith(input, targetStart)) return 0;
+	if (input.length < 3 || input.charCodeAt(0) !== target.charCodeAt(targetStart)) return void 0;
+	const maximum = input.length >= 5 ? 2 : 1;
+	let minimum = maximum + 1;
+	let previousLength = -1;
+	for (const length of [
 		Math.max(1, input.length - 1),
 		input.length,
-		Math.min(target.length, input.length + 1)
-	]);
-	return Math.min(...lengths.map((length) => damerauLevenshteinDistance(input, target.slice(0, length))));
-};
-const completionCost = (input, target) => {
-	if (input === target || target.startsWith(input)) return 0;
-	if (input.length < 3 || input[0] !== target[0]) return void 0;
-	const maximum = input.length >= 5 ? 2 : 1;
-	const distance = fuzzyPrefixDistance(input, target);
-	return distance <= maximum ? distance : void 0;
+		Math.min(targetLength, input.length + 1)
+	]) {
+		if (length === previousLength) continue;
+		previousLength = length;
+		minimum = Math.min(minimum, damerauLevenshteinDistance(input, target.slice(targetStart, targetStart + length), maximum, workspace));
+	}
+	return minimum <= maximum ? minimum : void 0;
 };
-const phraseScore = (input, phrase) => {
+const phraseScore = (input, inputWords, phrase, workspace) => {
 	if (input === phrase) return 0;
 	if (phrase.startsWith(input)) return 1;
-	const inputWords = input.split(" ");
-	const phraseWords = phrase.split(" ");
-	if (inputWords.length > phraseWords.length) return void 0;
 	let cost = 0;
-	for (const [index, inputWord] of inputWords.entries()) {
-		const targetWord = phraseWords[index];
-		if (targetWord === void 0) return void 0;
-		const wordCost = completionCost(inputWord, targetWord);
+	let addedWords = 0;
+	let phraseStart = 0;
+	for (const inputWord of inputWords) {
+		let phraseEnd = phrase.indexOf(" ", phraseStart);
+		if (phraseEnd === -1) phraseEnd = phrase.length;
+		let wordCost = completionCost(inputWord, phrase, phraseStart, phraseEnd, workspace);
+		while (wordCost === void 0 && addedWords < 3) {
+			phraseStart = phraseEnd + 1;
+			phraseEnd = phrase.indexOf(" ", phraseStart);
+			if (phraseEnd === -1) phraseEnd = phrase.length;
+			addedWords += 1;
+			wordCost = completionCost(inputWord, phrase, phraseStart, phraseEnd, workspace);
+		}
 		if (wordCost === void 0) return void 0;
 		cost += wordCost;
+		phraseStart = phraseEnd + 1;
 	}
-	return cost === 0 ? 2 : 2 + cost;
+	return 2 + cost + addedWords;
 };
 const completeYearPrefix = (input) => {
 	const match = String.match(/(?:^| )(\d{3,4})$/u)(input);
@@ -64,16 +74,30 @@ const naturalCount = (input) => {
 };
 const completeNaturalPhrases = (input, phrases, limit) => {
 	const ranked = [];
-	for (const [index, phrase] of Array$1.dedupe(phrases).entries()) {
-		const score = phraseScore(input, phrase);
+	const inputWords = input.split(" ");
+	const workspace = [
+		[],
+		[],
+		[]
+	];
+	let index = 0;
+	for (const phrase of new Set(phrases)) {
+		const score = phraseScore(input, inputWords, phrase, workspace);
 		if (score !== void 0) ranked.push({
 			phrase,
 			score,
 			index
 		});
+		index += 1;
+	}
+	ranked.sort((left, right) => left.score - right.score || left.index - right.index);
+	const maximumScore = (ranked[0]?.score ?? 2) <= 1 ? 1 : Number.POSITIVE_INFINITY;
+	const matches = [];
+	for (const entry of ranked) {
+		if (entry.score > maximumScore || matches.length >= limit) break;
+		matches.push(entry.phrase);
 	}
-	const sorted = ranked.sort((left, right) => left.score - right.score || left.index - right.index);
-	return (sorted.some((entry) => entry.score <= 1) ? sorted.filter((entry) => entry.score <= 1) : sorted).slice(0, limit).map((entry) => entry.phrase);
+	return matches;
 };
 //#endregion
 export { completeNaturalPhrases, fixedCalendarPeriodPhrases, naturalCount, prefixNaturalPhrases };

package/dist/resolve/resolve.mjs

@@ -6,8 +6,7 @@ const shiftDateTime = (value, amount, unit) => Match.value(unit).pipe(Match.when
 const startOfDateTime = (value, unit) => {
 	if (unit === "quarter") {
 		const month = DateTime.getPart(value, "month");
-		const quarterMonth = Math.floor((month - 1) / 3) * 3 + 1;
-		return DateTime.startOf(DateTime.setParts(value, { month: quarterMonth }), "month");
+		return DateTime.startOf(DateTime.subtract(value, { months: (month - 1) % 3 }), "month");
 	}
 	return DateTime.startOf(value, unit, { weekStartsOn: 1 });
 };
@@ -45,7 +44,7 @@ const resolve = Effect.fn("chronolizer.resolve")(function* (range) {
 	if (range.lower !== void 0 && range.upper !== void 0) {
 		const lower = yield* resolveLower(range.lower, reference, zone);
 		const upper = yield* resolveUpper(range.upper, reference, zone);
-		if (DateTime.toEpochMillis(lower.value) >= DateTime.toEpochMillis(upper.value)) return yield* new ResolutionError({ message: "The lower range endpoint must be before the upper endpoint" });
+		if (DateTime.toEpochMillis(lower.value) >= DateTime.toEpochMillis(upper.value)) return yield* new ResolutionError({ message: "The range start must be before the range end" });
 		return ResolvedDateRange.make({
 			lower,
 			upper

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chronolizer",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "Bidirectional natural-language date ranges for Effect.",
   "homepage": "https://github.com/tobimori/chronolizer#readme",
   "bugs": "https://github.com/tobimori/chronolizer/issues",
@@ -54,6 +54,7 @@
     }
   },
   "scripts": {
+    "benchmark": "pnpm build && node tools/benchmark.mjs",
     "build": "vp pack",
     "check:bundle-size": "node tools/check-bundle-size.mjs",
     "check:tree-shaking": "node tools/check-tree-shaking.mjs",