@harperfast/harper 5.3.0-beta.4 → 5.3.0

package/resources/indexes/fullTextQueryProtocol.ts

@@ -0,0 +1,35 @@
+import type { NativeFullTextSearchMode } from './fullTextNativeBinding.ts';
+
+export const FULL_TEXT_QUERY_PAUSE_OPERATION = 'pause-full-text-query-readers';
+export const FULL_TEXT_QUERY_RESUME_OPERATION = 'resume-full-text-query-readers';
+
+export const FULL_TEXT_POSITIVE_COMPARATORS = [
+	'matches',
+	'matches_all',
+	'matches_phrase',
+	'matches_prefix',
+	'matches_fuzzy',
+	'matches_fuzzy_prefix',
+] as const;
+
+type PositiveFullTextComparator = (typeof FULL_TEXT_POSITIVE_COMPARATORS)[number];
+
+const FULL_TEXT_MODES: Record<PositiveFullTextComparator, NativeFullTextSearchMode> = {
+	matches: 'any',
+	matches_all: 'all',
+	matches_phrase: 'phrase',
+	matches_prefix: 'prefix',
+	matches_fuzzy: 'fuzzy',
+	matches_fuzzy_prefix: 'fuzzy-prefix',
+};
+
+export const FULL_TEXT_COMPARATORS = [
+	...FULL_TEXT_POSITIVE_COMPARATORS,
+	...FULL_TEXT_POSITIVE_COMPARATORS.map((comparator) => `not_${comparator}` as const),
+] as const;
+
+export function fullTextComparatorMode(comparator: string | undefined): NativeFullTextSearchMode | undefined {
+	return comparator !== undefined && Object.hasOwn(FULL_TEXT_MODES, comparator)
+		? FULL_TEXT_MODES[comparator as PositiveFullTextComparator]
+		: undefined;
+}

package/resources/indexes/nativeFullTextDerivedIndexLifecycle.ts

@@ -25,6 +25,8 @@ export type NativeFullTextDerivedIndexLifecycleOptions = NativeFullTextIndexConf
 	indexId: string;
 	sourceGeneration: string;
 	binding?: NativeFullTextModule | (() => Promise<NativeFullTextModule>);
+	beforeReset?: (ownerEpoch: bigint) => Promise<void>;
+	afterReset?: (ownerEpoch: bigint) => void | Promise<void>;
 };
 
 export type NativeFullTextDerivedIndexBackendOptions = Omit<FullTextDerivedIndexBackendOptions, 'lifecycle'> &
@@ -64,11 +66,12 @@ export class NativeFullTextDerivedIndexLifecycle {
 
 	async initialize(options: { reclaimRetired?: boolean } = {}): Promise<void> {
 		const binding = await this.#getBinding();
+		const runtimeInfo = getValidatedFullTextRuntimeInfo(binding);
 		binding.validateNativeFullTextIndexOptions({
 			...this.#nativeOptions(),
 			limits: this.#options.limits,
 		});
-		this.#maxCommitPayloadBytes = getValidatedFullTextRuntimeInfo(binding).limits.maxCommitPayloadBytes;
+		this.#maxCommitPayloadBytes = runtimeInfo.limits.maxCommitPayloadBytes;
 		if (options.reclaimRetired !== false) this.#queueReclaimRetired();
 	}
 
@@ -94,12 +97,25 @@ export class NativeFullTextDerivedIndexLifecycle {
 		});
 	}
 
-	async reset(): Promise<void> {
-		const result = await this.#requireBinding().resetNativeFullTextIndex({
-			path: this.#path,
-			indexId: this.#options.indexId,
-		});
-		this.#queueReclaimRetired(result.state === 'reset' ? result.retiredPath : undefined);
+	async reset(ownerEpoch: bigint): Promise<void> {
+		let resetError: unknown;
+		try {
+			await this.#options.beforeReset?.(ownerEpoch);
+			const result = await this.#requireBinding().resetNativeFullTextIndex({
+				path: this.#path,
+				indexId: this.#options.indexId,
+			});
+			this.#queueReclaimRetired(result.state === 'reset' ? result.retiredPath : undefined);
+		} catch (error) {
+			resetError = error;
+		}
+		try {
+			await this.#options.afterReset?.(ownerEpoch);
+		} catch (resumeError) {
+			if (resetError) throw new AggregateError([resetError, resumeError], 'Full-text reset and reader resume failed');
+			throw resumeError;
+		}
+		if (resetError) throw resetError;
 	}
 
 	#queueReclaimRetired(retiredPath?: string): void {
@@ -136,6 +152,10 @@ export class NativeFullTextDerivedIndexLifecycle {
 			stopWords: this.#options.stopWords,
 			positions: this.#options.positions,
 			surfaceTerms: this.#options.surfaceTerms,
+			synonyms: this.#options.synonyms?.map(({ source, replacements }) => ({
+				source,
+				replacements: [...replacements],
+			})),
 		};
 	}
 
@@ -219,7 +239,7 @@ export async function createNativeFullTextDerivedIndexBackend(
 	return backend;
 }
 
-function nativeFullTextIndexPath(storePath: string, storeName: string): string {
+export function nativeFullTextIndexPath(storePath: string, storeName: string): string {
 	return join(resolve(storePath), `${digest(storeName)}.fulltext`);
 }