@vibeorm/extensions 2.2.1 → 2.3.0

package/README.md

@@ -37,9 +37,9 @@ Each extension declares its schema attributes, the DDL artifacts `db push` / `mi
 
 ## Search
 
-Declare the searched fields with `@@search`. Optional named arguments: `name` (artifact base name, a plain identifier), `weights` (one finite number per field, **tsvector only**), `language` (a text-search config name, tsvector engine only).
+Declare the searched fields with `@@search`. Optional named arguments: `name` (artifact base name, a plain identifier), `weights` (one finite number per field, tsvector and bm25 engines), `language` (a text-search config name, tsvector engine only), plus the [bm25 index options](#paradedb-bm25-index-options) below.
 
-Weights express ordinal priority, not numeric multipliers: distinct values descending map to PostgreSQL's A, B, C, D classes, with further classes capped at D. Equal weights share a class. FTS5, MySQL FULLTEXT and ParadeDB BM25 refuse declared weights with `VIBE_UNSUPPORTED_CAPABILITY`; omit `weights` on those engines.
+On tsvector, weights express ordinal priority, not numeric multipliers: distinct values descending map to PostgreSQL's A, B, C, D classes, with further classes capped at D. Equal weights share a class. On bm25 they are used verbatim as per-field `pdb.boost` factors (multiplicative, within ±2048; `1` emits nothing). FTS5 and MySQL FULLTEXT refuse declared weights with `VIBE_UNSUPPORTED_CAPABILITY`; omit `weights` on those engines.
 
 ```prisma
 model Post {
@@ -80,7 +80,7 @@ const hits = await db.post.search({
 | Dialect | Engine | SQL used | Highlights |
 |---|---|---|---|
 | postgres / pglite | `tsvector` | generated `STORED` tsvector column + GIN index, `websearch_to_tsquery` / `ts_rank_cd` / `ts_headline` | yes |
-| postgres (ParadeDB `pg_search`, opt in with `search({ engine: "bm25" })`) | `bm25` | bm25 index, `@@@`, `paradedb.score` / `paradedb.snippet` | yes |
+| postgres (ParadeDB `pg_search`, opt in with `search({ engine: "bm25" })`) | `bm25` | bm25 index with declared tokenizer casts, `@@@` (or `&&&` with `pdb.fuzzy` for prefix/fuzzy), `pdb.boost` per field, `paradedb.score` / `paradedb.snippet` | yes |
 | sqlite | `fts5` | external-content virtual table + sync triggers, `MATCH` / `bm25()` / `snippet()` | yes |
 | mysql | `fulltext` | `FULLTEXT` index, `MATCH … AGAINST` in natural language mode | no, typed `null` |
 
@@ -104,9 +104,56 @@ const hits = await db.post.search({ query: "piz", prefix: true, take: 8 });
 The query is split into unicode letter/number tokens (punctuation separates and never matches) and every token matches as a prefix. Per engine: tsvector builds `to_tsquery('lang', 'piz:*')` (still one bound parameter — `websearch_to_tsquery` has no prefix syntax), fts5 uses `"piz"*` in the MATCH string, mysql switches to `+piz*` in BOOLEAN MODE. A query with no tokens resolves to `[]` without touching the database. Three caveats:
 
 - tsvector prefixes run against **stemmed** lexemes, so a stemming `language` ("english", "norwegian") can miss mid-stem prefixes. Declare `language: "simple"` on models meant for type-ahead.
-- `engine: "bm25"` refuses `prefix` (`VIBE_UNSUPPORTED_CAPABILITY`) — ParadeDB prefix behavior is decided by the index tokenizer, which this extension does not configure.
+- On `engine: "bm25"` the index decides: declare `tokenizer: "edge_ngram"` (below) and every token of the raw query matches as a prefix through `&&&`; without that index, `prefix` needs `fuzzy` (`pdb.fuzzy(n, t)`) or is refused with `VIBE_UNSUPPORTED_CAPABILITY`.
 - mysql InnoDB ignores tokens shorter than `innodb_ft_min_token_size` (default 3), so one- and two-letter prefixes match nothing there.
 
+### ParadeDB bm25 index options
+
+The bm25 engine is the one engine whose index configuration decides matching behavior, so `@@search` carries it (every key below is bm25-only and refused on other engines). The address-picker shape — type-ahead over Norwegian street names typed without `ø`, scoped to a municipality:
+
+```prisma
+model Address {
+  id                 Int     @id @default(autoincrement())
+  street             String
+  city               String
+  municipalityNumber String
+  active             Boolean @default(true)
+
+  @@search([street, city], weights: [2, 1],
+           tokenizer: "edge_ngram", minGram: 1, maxGram: 12, asciiFolding: true,
+           filterFields: [municipalityNumber, active])
+}
+```
+
+```sql
+CREATE INDEX IF NOT EXISTS "Address_search_idx" ON "Address" USING bm25 ("id",
+  ("street"::pdb.edge_ngram(1, 12, 'ascii_folding=true')), ("city"::pdb.edge_ngram(1, 12, 'ascii_folding=true')),
+  ("municipalityNumber"::pdb.literal), "active")
+WITH (key_field='id', search_tokenizer='unicode_words(ascii_folding=true)');
+```
+
+- `tokenizer`: `unicode_words` (ParadeDB's default), `simple`, `whitespace`, `ngram`, `edge_ngram`, `icu`, `literal_normalized`, `source_code`, `chinese_compatible`, `jieba`. One tokenizer per model, applied to every searched field. `ngram` / `edge_ngram` require integer `minGram` and `maxGram`; words shorter than `minGram` are never indexed (`minGram: 1` if house numbers must match).
+- Token filters, appended to the tokenizer: `asciiFolding: true` (`ø` → `o`, `é` → `e`), `stemmer: "norwegian"` (a Snowball language), `lowercase: false`, `stopwordsLanguage: "english"` (one language). Filters alone imply `unicode_words`.
+- For `edge_ngram` the extension also sets `search_tokenizer = unicode_words(<same filters>)`, so a query is tokenized into whole words while the index holds prefixes — without it `"sho"` would become `s`, `sh`, `sho` and match every s-word.
+- `filterFields`: non-searched scalar columns added to the index so `where` filters on them are pushed into the ParadeDB scan instead of filtering the heap afterwards. `String` columns are indexed with `pdb.literal` (exact equality and `in`), `Boolean`/`Int`/`BigInt`/`Float`/`Decimal`/`DateTime` and `@db.Uuid` columns as-is; enums, JSON and list columns are refused. ParadeDB allows one index per table, so this is the index any hand-written `$querySql` over the table uses too.
+- Column storage: searched fields must be `text` or `varchar` (`String`, `@db.Text`, `@db.VarChar(n)`); `filterFields` additionally accept `@db.Uuid`. `@db.Char(n)` (ParadeDB 0.25: "Type 1042 is not yet supported"), `@db.Inet`, `@db.Xml`, `@db.Citext`, `@db.Bit` and `Unsupported(…)` columns are refused with `VIBE_UNSUPPORTED_CAPABILITY` by `vibeorm generate` and by migrate alike.
+- Changing any of these options (or the searched/filter field lists) after the index exists **rebuilds the index**: `migrate generate` lets the shadow server compare the replayed index with the declared one and emits `DROP INDEX` + `CREATE INDEX` (the down migration restores the previous definition); `db push` does the same when the migration history carries a desired-state snapshot. A bm25 rebuild re-tokenizes the whole table — budget for it in the migration window. A `db push` on a project without migration snapshots checks the index for presence by name only — pass `db push --rebuild-artifacts` (PostgreSQL) to drop and re-create every extension object from the current declarations, or drop the index by hand. `weights` are query-time boosts and never touch the index.
+
+Query-time arguments on bm25:
+
+```ts
+const hits = await db.address.search({
+  query: "stro",
+  prefix: true,   // edge_ngram index: every token is a prefix
+  fuzzy: 1,       // and may carry one typo (pdb.fuzzy(1, t)); ParadeDB caps it at 2
+  where: { municipalityNumber: "3005", active: true },
+  minScore: 0.5,  // paradedb.score(id) >= 0.5 inside the index scan, before LIMIT
+  take: 8,
+});
+```
+
+`fuzzy` (1 or 2) is the Levenshtein edit distance per token; it switches the match from the `@@@` query parser (OR between words) to `&&&` (every token must match). It exists only on bm25 — on the other engines the typed `search` signature does not offer it and the runtime refuses it; use the trgm extension's `similarTo` there. `@@@` without `prefix`/`fuzzy` keeps ParadeDB's query-parser syntax (quoted phrases, `AND`/`OR`), exactly as before.
+
 ### Filtering hits: `where` composes with the core filter language
 
 `search({ where })` compiles through the same filter compiler as every core query — scalar
@@ -142,7 +189,7 @@ const hits = await db.menuItem.search({
 });
 ```
 
-For typo tolerance ("piza") declare `@@trgm([name])` too and fall back to
+For typo tolerance ("piza") on bm25 pass `fuzzy: 1`; on the other postgres engines declare `@@trgm([name])` too and fall back to
 `findMany({ where: { name: { similarTo: query } } })` when a prefix search returns nothing
 (postgres/pglite only).
 

package/dist/index.js

@@ -1,6 +1,6 @@
 // @bun
 // packages/extensions/src/search/index.ts
-import { VibeError as VibeError2, defineExtension, unsupportedCapability } from "@vibeorm/schema";
+import { VibeError as VibeError2, assertIdentifierFits, defineExtension, fitDefaultName, unsupportedCapability } from "@vibeorm/schema";
 
 // packages/extensions/src/shared.ts
 import { VibeError } from "@vibeorm/schema";
@@ -85,10 +85,198 @@ async function pgExtensionCheck(params) {
 
 // packages/extensions/src/search/index.ts
 import { ParamCollector, getSqlDialect, renderExpr } from "@vibeorm/sql";
-var VERSION = "2.0.0-alpha.1";
+var VERSION = "2.0.0-alpha.2";
 var SCORE_ALIAS = "_vibe_score";
 var HIGHLIGHT_ALIAS = "_vibe_highlight";
 var WEIGHT_LETTERS = ["A", "B", "C", "D"];
+var BM25_TOKENIZERS = Object.freeze([
+  "unicode_words",
+  "simple",
+  "whitespace",
+  "ngram",
+  "edge_ngram",
+  "icu",
+  "literal_normalized",
+  "source_code",
+  "chinese_compatible",
+  "jieba"
+]);
+var STEMMER_LANGUAGES = Object.freeze([
+  "arabic",
+  "czech",
+  "danish",
+  "dutch",
+  "english",
+  "finnish",
+  "french",
+  "german",
+  "greek",
+  "hungarian",
+  "italian",
+  "norwegian",
+  "polish",
+  "portuguese",
+  "romanian",
+  "russian",
+  "spanish",
+  "swedish",
+  "tamil",
+  "turkish"
+]);
+var STOPWORD_LANGUAGES = Object.freeze([
+  "czech",
+  "danish",
+  "dutch",
+  "english",
+  "finnish",
+  "french",
+  "german",
+  "hungarian",
+  "italian",
+  "norwegian",
+  "polish",
+  "portuguese",
+  "russian",
+  "spanish",
+  "swedish"
+]);
+var TOKENIZER_KEYS = ["tokenizer", "minGram", "maxGram", "stemmer", "asciiFolding", "lowercase", "stopwordsLanguage"];
+function isPositiveInteger(value) {
+  return typeof value === "number" && Number.isSafeInteger(value) && value >= 1;
+}
+function readBm25Tokenizer(declaration) {
+  if (TOKENIZER_KEYS.every((key) => declaration[key] === undefined))
+    return { tokenizer: undefined };
+  const name = declaration["tokenizer"] ?? "unicode_words";
+  if (typeof name !== "string" || !BM25_TOKENIZERS.includes(name)) {
+    return { error: `tokenizer must be one of ${BM25_TOKENIZERS.join(", ")}` };
+  }
+  const grams = name === "ngram" || name === "edge_ngram";
+  const minGram = declaration["minGram"];
+  const maxGram = declaration["maxGram"];
+  if (grams) {
+    if (!isPositiveInteger(minGram) || !isPositiveInteger(maxGram) || minGram > maxGram) {
+      return { error: `${name} needs integer minGram and maxGram with 1 <= minGram <= maxGram` };
+    }
+  } else if (minGram !== undefined || maxGram !== undefined) {
+    return { error: "minGram/maxGram apply only to the ngram and edge_ngram tokenizers" };
+  }
+  const filters = [];
+  const lowercase = declaration["lowercase"];
+  if (lowercase !== undefined && typeof lowercase !== "boolean")
+    return { error: "lowercase must be a boolean" };
+  if (lowercase === false)
+    filters.push("lowercase=false");
+  const folding = declaration["asciiFolding"];
+  if (folding !== undefined && typeof folding !== "boolean")
+    return { error: "asciiFolding must be a boolean" };
+  if (folding === true)
+    filters.push("ascii_folding=true");
+  const stemmer = declaration["stemmer"];
+  if (stemmer !== undefined) {
+    if (typeof stemmer !== "string" || !STEMMER_LANGUAGES.includes(stemmer.toLowerCase())) {
+      return { error: `stemmer must be one of ${STEMMER_LANGUAGES.join(", ")}` };
+    }
+    filters.push(`stemmer=${stemmer.toLowerCase()}`);
+  }
+  const stopwords = declaration["stopwordsLanguage"];
+  if (stopwords !== undefined) {
+    if (typeof stopwords !== "string" || !STOPWORD_LANGUAGES.includes(stopwords.toLowerCase())) {
+      return { error: `stopwordsLanguage must be one of ${STOPWORD_LANGUAGES.join(", ")}` };
+    }
+    filters.push(`stopwords_language=${stopwords.toLowerCase()}`);
+  }
+  return {
+    tokenizer: {
+      name,
+      ...grams ? { minGram, maxGram } : {},
+      filters
+    }
+  };
+}
+function bm25TokenizerArguments(params) {
+  const { dialect, tokenizer } = params;
+  const args = [
+    ...tokenizer.minGram === undefined ? [] : [String(tokenizer.minGram), String(tokenizer.maxGram)],
+    ...tokenizer.filters.map((filter) => dialect.quoteStringLiteral({ value: filter }))
+  ];
+  return args.length === 0 ? "" : `(${args.join(", ")})`;
+}
+function bm25TokenizedColumn(params) {
+  const { dialect, column, tokenizer } = params;
+  const quoted = dialect.quoteIdent({ name: column });
+  if (tokenizer === undefined)
+    return quoted;
+  return `(${quoted}::pdb.${tokenizer.name}${bm25TokenizerArguments({ dialect, tokenizer })})`;
+}
+function bm25SearchTokenizer(params) {
+  const { tokenizer } = params;
+  if (tokenizer === undefined || tokenizer.name !== "edge_ngram")
+    return;
+  return tokenizer.filters.length === 0 ? "unicode_words" : `unicode_words(${tokenizer.filters.join(",")})`;
+}
+var BM25_FILTER_SCALARS = Object.freeze(["Boolean", "Int", "BigInt", "Float", "Decimal", "DateTime"]);
+var BM25_BOOST_LIMIT = 2048;
+function bm25StringStorage(field) {
+  if (field.isUnsupported === true || field.isList || field.type !== "String")
+    return null;
+  const native = (field.nativeType ?? "").toLowerCase();
+  if (native === "" || native === "text" || native.startsWith("varchar"))
+    return "text";
+  if (native === "uuid")
+    return "uuid";
+  return null;
+}
+function describeField(field) {
+  const scalar = typeof field.type === "string" ? field.type : `enum ${field.type.enum}`;
+  return `${scalar}${field.isList ? "[]" : ""}${field.nativeType === undefined ? "" : ` @db.${field.nativeType}`}`;
+}
+function bm25IndexColumns(params) {
+  const { model, decl } = params;
+  const pkField = primaryKeyFieldOf({ model });
+  if (pkField === null) {
+    throw new VibeError2({
+      code: "VIBE_SCHEMA_INVALID",
+      message: `@@search with engine "bm25" needs a single-column primary key on "${model.name}" (key_field)`,
+      meta: { model: model.name }
+    });
+  }
+  const searched = decl.fields.map((name) => {
+    const field = model.fields.find((candidate) => candidate.name === name);
+    if (field === undefined)
+      return columnNameOf({ model, field: name });
+    if (bm25StringStorage(field) !== "text") {
+      throw unsupportedCapability({
+        dialect: "postgres",
+        feature: `@@search field "${name}" (${describeField(field)}) on the bm25 index`,
+        hint: "ParadeDB tokenizes text and varchar columns; search another column or store this one as text"
+      });
+    }
+    return field.dbName ?? field.name;
+  });
+  const filters = (decl.filterFields ?? []).map((name) => {
+    const field = model.fields.find((candidate) => candidate.name === name);
+    if (field === undefined || name === pkField || decl.fields.includes(name)) {
+      throw new VibeError2({
+        code: "VIBE_SCHEMA_INVALID",
+        message: `@@search filterFields on "${model.name}": "${name}" must be a scalar field that is neither the primary key nor a searched field`,
+        meta: { model: model.name, field: name }
+      });
+    }
+    const column = field.dbName ?? field.name;
+    const storage = bm25StringStorage(field);
+    if (storage !== null)
+      return { column, literal: storage === "text" };
+    if (!field.isList && typeof field.type === "string" && BM25_FILTER_SCALARS.includes(field.type))
+      return { column, literal: false };
+    throw unsupportedCapability({
+      dialect: "postgres",
+      feature: `@@search filterFields entry "${name}" (${describeField(field)}) on the bm25 index`,
+      hint: "ParadeDB pushes filters into the index for text/varchar (exact match / IN), uuid, Boolean, Int, BigInt, Float, Decimal and DateTime columns \u2014 filter other columns outside the index"
+    });
+  });
+  return { pkColumn: columnNameOf({ model, field: pkField }), searched, filters };
+}
 function resolveSearchEngine(params) {
   const { dialect, provider, requested } = params;
   const native = dialect === "postgres" ? "tsvector" : dialect === "sqlite" ? "fts5" : "fulltext";
@@ -123,6 +311,10 @@ function readDeclaration(params) {
   if (params.declaration["weights"] !== undefined && (!Array.isArray(params.declaration["weights"]) || params.declaration["weights"].length !== fields.length || params.declaration["weights"].some((weight) => typeof weight !== "number" || !Number.isFinite(weight)))) {
     throw new VibeError2({ code: "VIBE_SCHEMA_INVALID", message: "weights must be a finite number list matching the field list", meta: { model: params.model.name } });
   }
+  const tokenizer = readBm25Tokenizer(params.declaration);
+  if ("error" in tokenizer) {
+    throw new VibeError2({ code: "VIBE_SCHEMA_INVALID", message: `@@search on "${params.model.name}": ${tokenizer.error}`, meta: { model: params.model.name } });
+  }
   return {
     fields,
     weights: declNumberArray(params.declaration, "weights"),
@@ -130,7 +322,9 @@ function readDeclaration(params) {
     language: declString(params.declaration, "language"),
     columnName: declString(params.declaration, "columnName"),
     indexName: declString(params.declaration, "indexName"),
-    rank: declRank(params.declaration)
+    rank: declRank(params.declaration),
+    tokenizer: tokenizer.tokenizer,
+    filterFields: declStringArray(params.declaration, "filterFields")
   };
 }
 function weightLetters(params) {
@@ -156,18 +350,30 @@ function resolveArtifactNames(params) {
       hint: "only the tsvector engine materializes a generated column \u2014 drop columnName or target tsvector"
     });
   }
+  const remedy = "Shorten it, or set a shorter `name:` on the @@search declaration.";
+  if (decl.columnName !== undefined)
+    assertIdentifierFits({ name: decl.columnName, dialect, what: "@@search columnName", remedy });
+  if (decl.indexName !== undefined)
+    assertIdentifierFits({ name: decl.indexName, dialect, what: "@@search indexName", remedy });
   return {
-    tsvColumn: decl.columnName ?? `${decl.base}_tsv`,
-    indexName: decl.indexName ?? `${decl.base}_idx`
+    tsvColumn: decl.columnName ?? fitDefaultName({ prefix: decl.base, suffix: "_tsv", dialect }),
+    indexName: decl.indexName ?? fitDefaultName({ prefix: decl.base, suffix: "_idx", dialect })
   };
 }
 function resolveRank(params) {
   const { decl, options, engine, dialect } = params;
-  if (decl.weights !== undefined && engine !== "tsvector") {
+  if (decl.weights !== undefined && engine !== "tsvector" && engine !== "bm25") {
     throw unsupportedCapability({
       dialect,
       feature: `@@search weights on the ${engine} engine`,
-      hint: "weights are supported only by tsvector; omit weights for this engine"
+      hint: "weights are supported by tsvector (setweight classes) and bm25 (pdb.boost factors); omit weights for this engine"
+    });
+  }
+  if (decl.weights !== undefined && engine === "bm25" && decl.weights.some((weight) => Math.abs(weight) > BM25_BOOST_LIMIT)) {
+    throw new VibeError2({
+      code: "VIBE_SCHEMA_INVALID",
+      message: `@@search weights on the bm25 engine are pdb.boost factors and must stay within \xB1${BM25_BOOST_LIMIT}`,
+      meta: { weights: decl.weights }
     });
   }
   if (decl.rank !== undefined && engine !== "tsvector") {
@@ -182,6 +388,25 @@ function resolveRank(params) {
   const fallback = options["rank"];
   return decl.rank ?? (fallback === "ts_rank" || fallback === "ts_rank_cd" ? fallback : undefined);
 }
+function assertBm25Declarations(params) {
+  const { decl, engine, dialect } = params;
+  if (engine === "bm25")
+    return;
+  if (decl.tokenizer !== undefined) {
+    throw unsupportedCapability({
+      dialect,
+      feature: `@@search tokenizer options on the ${engine} engine`,
+      hint: 'tokenizer, minGram, maxGram, stemmer, asciiFolding, lowercase and stopwordsLanguage configure a ParadeDB bm25 index \u2014 drop them, or opt in with search({ engine: "bm25" })'
+    });
+  }
+  if (decl.filterFields !== undefined) {
+    throw unsupportedCapability({
+      dialect,
+      feature: `@@search filterFields on the ${engine} engine`,
+      hint: 'filterFields add columns to a ParadeDB bm25 index for filter pushdown \u2014 drop them, or opt in with search({ engine: "bm25" })'
+    });
+  }
+}
 function tsvectorExpression(params) {
   const { dialect, model, decl, language } = params;
   const quote = (name) => dialect.quoteIdent({ name });
@@ -202,7 +427,7 @@ function searchArtifacts(ctx) {
     artifacts.push({
       id: "search:extension:pg_search",
       owns: { kind: "postgresExtension", name: "pg_search" },
-      create: ["CREATE EXTENSION IF NOT EXISTS pg_search;"],
+      create: ["CREATE EXTENSION IF NOT EXISTS pg_search CASCADE;"],
       drop: ["DROP EXTENSION IF EXISTS pg_search;"]
     });
   }
@@ -216,6 +441,7 @@ function searchArtifacts(ctx) {
     const table = tableNameOf({ model });
     const columns = decl.fields.map((field) => columnNameOf({ model, field }));
     resolveRank({ decl, options: ctx.options, engine, dialect: ctx.dialect });
+    assertBm25Declarations({ decl, engine, dialect: ctx.dialect });
     if (engine === "tsvector") {
       const language = decl.language ?? ctx.options["language"] ?? "english";
       const { tsvColumn, indexName } = resolveArtifactNames({ decl, engine, dialect: ctx.dialect });
@@ -238,21 +464,22 @@ function searchArtifacts(ctx) {
       continue;
     }
     if (engine === "bm25") {
-      const pkField = primaryKeyFieldOf({ model });
-      if (pkField === null) {
-        throw new VibeError2({
-          code: "VIBE_SCHEMA_INVALID",
-          message: `@@search with engine "bm25" needs a single-column primary key on "${modelName}" (key_field)`,
-          meta: { model: modelName }
-        });
-      }
-      const pkColumn = columnNameOf({ model, field: pkField });
+      const { pkColumn, searched, filters } = bm25IndexColumns({ model, decl });
       const bm25Names = resolveArtifactNames({ decl, engine, dialect: ctx.dialect });
+      const indexed = [
+        quote(pkColumn),
+        ...searched.map((column) => bm25TokenizedColumn({ dialect, column, tokenizer: decl.tokenizer })),
+        ...filters.map((filter) => filter.literal ? `(${quote(filter.column)}::pdb.literal)` : quote(filter.column))
+      ];
+      const withOptions = [`key_field=${dialect.quoteStringLiteral({ value: pkColumn })}`];
+      const searchTokenizer = bm25SearchTokenizer({ tokenizer: decl.tokenizer });
+      if (searchTokenizer !== undefined)
+        withOptions.push(`search_tokenizer=${dialect.quoteStringLiteral({ value: searchTokenizer })}`);
       artifacts.push({
         id: `search:${modelName}:index`,
         owns: { kind: "index", table, name: bm25Names.indexName },
         create: [
-          `CREATE INDEX IF NOT EXISTS ${quote(bm25Names.indexName)} ON ${quote(table)} USING bm25 (${[pkColumn, ...columns].map((column) => quote(column)).join(", ")}) WITH (key_field='${pkColumn}');`
+          `CREATE INDEX IF NOT EXISTS ${quote(bm25Names.indexName)} ON ${quote(table)} USING bm25 (${indexed.join(", ")}) WITH (${withOptions.join(", ")});`
         ],
         drop: [`DROP INDEX IF EXISTS ${quote(bm25Names.indexName)};`]
       });
@@ -282,7 +509,7 @@ function searchArtifacts(ctx) {
           auxiliaryPrefixes: [`${fts}_`]
         },
         create: [
-          `CREATE VIRTUAL TABLE IF NOT EXISTS ${quote(fts)} USING fts5(${columnList}, content='${table}');`
+          `CREATE VIRTUAL TABLE IF NOT EXISTS ${quote(fts)} USING fts5(${columnList}, content=${dialect.quoteStringLiteral({ value: table })});`
         ],
         drop: [`DROP TABLE IF EXISTS ${quote(fts)};`]
       }, {
@@ -367,11 +594,26 @@ function createSearchDelegate(config) {
       if (args.minScore !== undefined)
         finiteNumber({ value: args.minScore, name: "minScore" });
       const prefix = args.prefix === true;
-      if (prefix && config.engine === "bm25") {
+      const fuzzy = args.fuzzy;
+      if (fuzzy !== undefined && fuzzy !== 1 && fuzzy !== 2) {
+        throw new VibeError2({
+          code: "VIBE_VALIDATION",
+          message: "fuzzy must be 1 or 2 (ParadeDB caps the edit distance at 2)",
+          meta: { argument: "fuzzy" }
+        });
+      }
+      if (fuzzy !== undefined && config.engine !== "bm25") {
+        throw unsupportedCapability({
+          dialect: dialect.name,
+          feature: `search fuzzy matching on the "${config.engine}" engine`,
+          hint: "only the bm25 engine (ParadeDB pdb.fuzzy) matches within an edit distance \u2014 on postgres/pglite declare @@trgm and filter with similarTo"
+        });
+      }
+      if (prefix && config.engine === "bm25" && config.prefixIndex !== true && fuzzy === undefined) {
         throw unsupportedCapability({
           dialect: "postgres",
-          feature: 'search prefix mode on the "bm25" engine',
-          hint: "ParadeDB prefix behavior is decided by the index tokenizer (ngram/edge-ngram) \u2014 configure the index instead, or use the tsvector engine"
+          feature: 'search prefix mode on the "bm25" engine without an edge_ngram index',
+          hint: 'declare @@search(\u2026, tokenizer: "edge_ngram", minGram: 1, maxGram: 12) so every token is indexed as a prefix, or pass fuzzy: 1 | 2 for fuzzy prefix matching (pdb.fuzzy(n, t))'
         });
       }
       let matchText = args.query;
@@ -379,7 +621,7 @@ function createSearchDelegate(config) {
         const tokens = args.query.match(/[\p{L}\p{N}]+/gu) ?? [];
         if (tokens.length === 0)
           return [];
-        matchText = config.engine === "tsvector" ? tokens.map((token) => `${token}:*`).join(" & ") : config.engine === "fts5" ? tokens.map((token) => `"${token}"*`).join(" ") : tokens.map((token) => `+${token}*`).join(" ");
+        matchText = config.engine === "tsvector" ? tokens.map((token) => `${token}:*`).join(" & ") : config.engine === "fts5" ? tokens.map((token) => `"${token}"*`).join(" ") : config.engine === "bm25" ? args.query : tokens.map((token) => `+${token}*`).join(" ");
       }
       const hlColumn = highlightColumn({ config, args });
       const idOnly = args.select === "id";
@@ -450,31 +692,35 @@ function createSearchDelegate(config) {
         text += ` ORDER BY ${quote(SCORE_ALIAS)} DESC`;
       } else {
         const pk = `${t}.${quote(config.pkColumn ?? "")}`;
+        const operator = prefix || fuzzy !== undefined ? "&&&" : "@@@";
+        const fuzzyCast = fuzzy === undefined ? "" : `::pdb.fuzzy(${fuzzy}${prefix ? ", t" : ""})`;
         text = `SELECT ${projection}, paradedb.score(${pk}) AS ${quote(SCORE_ALIAS)}`;
         if (hlColumn !== null) {
           text += `, paradedb.snippet(${t}.${quote(hlColumn)}) AS ${quote(HIGHLIGHT_ALIAS)}`;
         }
-        text += ` FROM ${quote(config.table)} AS ${t} WHERE (${config.fields.map((field) => `${t}.${quote(field.column)} @@@ ${collector.add(args.query)}`).join(" OR ")})`;
+        text += ` FROM ${quote(config.table)} AS ${t} WHERE (${config.fields.map((field, index) => {
+          const boost = config.boosts?.[index];
+          const boostCast = boost === undefined || boost === 1 ? "" : `::pdb.boost(${boost})`;
+          return `${t}.${quote(field.column)} ${operator} ${collector.add(matchText)}${fuzzyCast}${boostCast}`;
+        }).join(" OR ")})`;
         const where = userWhere("t");
         if (where !== null)
           text += ` AND (${where})`;
+        if (args.minScore !== undefined) {
+          text += ` AND paradedb.score(${pk}) >= ${collector.add(args.minScore)}`;
+        }
         text += ` ORDER BY ${quote(SCORE_ALIAS)} DESC`;
       }
       text += ` LIMIT ${take}`;
       if (skip !== null)
         text += ` OFFSET ${skip}`;
       const rows = await ctx.executeRows({ text, values: collector.values, method: "search" });
-      let hits = shapeHits({
+      return shapeHits({
         rows,
         strip,
         highlightsRequested: args.highlight !== undefined,
         engineHasHighlights
       });
-      if (config.engine === "bm25" && args.minScore !== undefined) {
-        const min = args.minScore;
-        hits = hits.filter((hit) => hit.score >= min);
-      }
-      return hits;
     };
   };
 }
@@ -521,6 +767,19 @@ function search(options = {}) {
             if (rank !== undefined && rank !== "ts_rank" && rank !== "ts_rank_cd") {
               return { error: `rank must be "ts_rank" or "ts_rank_cd"` };
             }
+            const tokenizer = readBm25Tokenizer(args.named);
+            if ("error" in tokenizer)
+              return { error: tokenizer.error };
+            const filterFields = args.named["filterFields"];
+            if (filterFields !== undefined) {
+              if (!Array.isArray(filterFields) || filterFields.length === 0 || filterFields.some((name) => typeof name !== "string")) {
+                return { error: "filterFields must be a non-empty field list, e.g. filterFields: [municipalityNumber, active]" };
+              }
+              const invalid = filterFields.find((name) => !fieldNames.includes(String(name)) || fields.includes(String(name)));
+              if (invalid !== undefined) {
+                return { error: `filterFields entry "${String(invalid)}" must be a field on the model that is not also searched` };
+              }
+            }
             return { declaration: { fields, ...args.named } };
           }
         }
@@ -545,6 +804,9 @@ function search(options = {}) {
         }
         const pkField = primaryKeyFieldOf({ model });
         const rank = resolveRank({ decl, options: extOptions, engine, dialect });
+        assertBm25Declarations({ decl, engine, dialect });
+        if (engine === "bm25")
+          bm25IndexColumns({ model, decl });
         const names = resolveArtifactNames({ decl, engine, dialect });
         const config = {
           engine,
@@ -555,7 +817,9 @@ function search(options = {}) {
           })),
           ...engine === "tsvector" ? { tsvColumn: names.tsvColumn, language, ...rank === undefined ? {} : { rank } } : {},
           ...engine === "fts5" ? { ftsTable: `${decl.base}_fts` } : {},
-          ...pkField !== null ? { pkColumn: columnNameOf({ model, field: pkField }) } : {}
+          ...pkField !== null ? { pkColumn: columnNameOf({ model, field: pkField }) } : {},
+          ...engine === "bm25" && decl.weights !== undefined ? { boosts: decl.weights } : {},
+          ...engine === "bm25" && decl.tokenizer?.name === "edge_ngram" ? { prefixIndex: true } : {}
         };
         const fieldUnion = decl.fields.map((field) => JSON.stringify(field)).join(" | ");
         const argLines = [
@@ -565,7 +829,8 @@ function search(options = {}) {
           `  readonly skip?: number;`,
           `  readonly minScore?: number;`,
           `  readonly highlight?: { readonly field: ${fieldUnion} };`,
-          `  readonly prefix?: boolean;`
+          `  readonly prefix?: boolean;`,
+          ...engine === "bm25" ? [`  readonly fuzzy?: 1 | 2;`] : []
         ];
         const dts = pkField === null ? [
           `readonly search: (args: {`,
@@ -628,7 +893,7 @@ function search(options = {}) {
   });
 }
 // packages/extensions/src/vector/index.ts
-import { VibeError as VibeError3, defineExtension as defineExtension2, unsupportedCapability as unsupportedCapability2 } from "@vibeorm/schema";
+import { VibeError as VibeError3, assertIdentifierFits as assertIdentifierFits2, defineExtension as defineExtension2, fitDefaultName as fitDefaultName2, unsupportedCapability as unsupportedCapability2 } from "@vibeorm/schema";
 import { ParamCollector as ParamCollector2, getSqlDialect as getSqlDialect2, renderExpr as renderExpr2 } from "@vibeorm/sql";
 var VERSION2 = "2.0.0-alpha.0";
 var METRIC_OPERATOR = {
@@ -702,6 +967,13 @@ function vectorArtifacts(ctx) {
     const columns = vectorColumnsOf({ declaration });
     const indexFields = declStringArray(declaration, "fields") ?? [];
     const kindRaw = declString(declaration, "index") ?? "hnsw";
+    if (!INDEX_KINDS.includes(kindRaw)) {
+      throw new VibeError3({
+        code: "VIBE_SCHEMA_INVALID",
+        message: `@@vector on "${modelName}" declares index kind "${kindRaw}" \u2014 expected one of ${INDEX_KINDS.join(", ")}`,
+        meta: { model: modelName, index: kindRaw }
+      });
+    }
     const metricRaw = declString(declaration, "metric") ?? "cosine";
     const metric = METRICS.find((candidate) => candidate === metricRaw) ?? "cosine";
     for (const field of indexFields) {
@@ -714,7 +986,9 @@ function vectorArtifacts(ctx) {
       }
       const column = columnNameOf({ model, field });
       const nameOverride = indexFields.length === 1 ? declString(declaration, "indexName") : undefined;
-      const indexName = nameOverride ?? `${table}_${column}_${kindRaw}_idx`;
+      if (nameOverride !== undefined)
+        assertIdentifierFits2({ name: nameOverride, dialect: ctx.dialect, what: "@@vector indexName", remedy: "Shorten it." });
+      const indexName = nameOverride ?? fitDefaultName2({ prefix: `${table}_${column}_${kindRaw}`, suffix: "_idx", dialect: ctx.dialect });
       const withOptions = [];
       const m = declaration["m"];
       const efConstruction = declaration["efConstruction"];
@@ -939,7 +1213,7 @@ function vector(options = {}) {
   });
 }
 // packages/extensions/src/trgm/index.ts
-import { VibeError as VibeError4, defineExtension as defineExtension3, unsupportedCapability as unsupportedCapability3 } from "@vibeorm/schema";
+import { VibeError as VibeError4, defineExtension as defineExtension3, fitDefaultName as fitDefaultName3, unsupportedCapability as unsupportedCapability3 } from "@vibeorm/schema";
 import { getSqlDialect as getSqlDialect3 } from "@vibeorm/sql";
 var DEFAULT_THRESHOLD = 0.3;
 var VERSION3 = "2.0.0-alpha.0";
@@ -971,7 +1245,7 @@ function trgmArtifacts(ctx) {
     const table = tableNameOf({ model });
     for (const field of declStringArray(declaration, "fields") ?? []) {
       const column = columnNameOf({ model, field });
-      const indexName = `${table}_${column}_trgm_idx`;
+      const indexName = fitDefaultName3({ prefix: `${table}_${column}_trgm`, suffix: "_idx", dialect: ctx.dialect });
       artifacts.push({
         id: `trgm:${modelName}:${field}`,
         owns: { kind: "index", table, name: indexName },
@@ -1126,4 +1400,4 @@ export {
   vector
 };
 
-//# debugId=CB654FBC580AA6A164756E2164756E21
+//# debugId=8FC9F7443F3A892664756E2164756E21