@rebasepro/server-postgres 0.13.1-canary.g18cfeb7 → 0.13.1-canary.g249daa1

package/dist/index.es.js

@@ -2,7 +2,7 @@ import { createRequire as __createRequire } from "module";
 import process from "process";
 __createRequire(import.meta.url);
 import { a as guardPoolAgainstDirtyRelease, i as createReadReplicaConnection, n as createDirectDatabaseConnection, o as pinSearchPath, r as createPostgresDatabaseConnection } from "./connection-BuZ97wsr.js";
-import { A as generateForeignKeyName, B as hasForeignKeyOnTarget, C as getDeclaredPrimaryKeys, D as createRelationRefWithData, E as createRelationRef, F as camelCase, H as Vector, I as toSnakeCase, M as getPolicyNamesForRule, N as isPrototypePollutingKey, O as normalizeToEntityRelation, P as mergeDeep, S as buildCompositeId, T as parseIdValues, V as isManyToMany, _ as getColumnName, a as buildSdkData, b as getTableVarName, c as resolveStringColumnLength, d as resolveJunctionSpecs, f as getEffectiveSecurityRules, g as findRelation, h as findAnonymousGrants, j as legacyForeignKeyName, k as updateDateAutoValues, l as getJunctionCollectionConfig, m as securityRuleToConditions, o as CollectionRegistry, p as policyToPostgres, r as authUsersColumnSql, s as relationalCollections, t as AUTH_USERS_COLUMNS, u as getJunctionSecurityRules, v as getEnumVarName, w as isAddressableId, x as resolveCollectionRelations, y as getTableName$1, z as resolveClientListLimit } from "./auth-users-columns-Do9mw5Y5.js";
+import { A as resolveCollectionRelations, B as legacyForeignKeyName, C as securityRuleToConditions, D as getEnumVarName, E as getColumnName, F as createRelationRef, G as camelCase, H as getPolicyNamesForRule, I as createRelationRefWithData, K as toSnakeCase, L as normalizeToEntityRelation, M as getDeclaredPrimaryKeys, N as isAddressableId, O as getTableName$1, P as parseIdValues, Q as Vector, R as updateDateAutoValues, S as policyToPostgres, T as findRelation, U as isPrototypePollutingKey, W as mergeDeep, X as hasForeignKeyOnTarget, Y as resolveClientListLimit, Z as isManyToMany, _ as resolveStringColumnLength, b as resolveJunctionSpecs, c as buildSearchColumnSpec, g as relationalCollections, h as CollectionRegistry, j as buildCompositeId, k as getTableVarName, l as hiddenColumnsOption, m as buildSdkData, o as SEARCH_UNACCENT_FN, p as visibleColumnProjection, r as authUsersColumnSql, t as AUTH_USERS_COLUMNS, v as getJunctionCollectionConfig, w as findAnonymousGrants, x as getEffectiveSecurityRules, y as getJunctionSecurityRules, z as generateForeignKeyName } from "./auth-users-columns-Dt9g712t.js";
 import { c as isPostgresCollectionConfig, l as isRelationalCollectionConfig, n as REBASE_SCHEMA, o as usesLegacyRlsFunctions } from "./src-C_wvdMnl.js";
 import { t as ANONYMOUS_USER_ID } from "./policy-CPkCqVTz.js";
 import { t as createPostgresWebSocket } from "./websocket-D0TBU3ia.js";
@@ -554,6 +554,12 @@ function deriveRowAddress(row, collection, registry) {
 //#endregion
 //#region src/utils/drizzle-conditions.ts
 /**
+* Postgres's own default for `pg_trgm.word_similarity_threshold`. Named here
+* because the fuzzy predicate has to know when the index-backed operator agrees
+* with the collection's declared threshold and when it would narrow too far.
+*/
+var PG_TRGM_WORD_SIMILARITY_DEFAULT = .6;
+/**
 * Process-wide default, set once when the driver is constructed.
 *
 * The condition builder is a set of *static* methods reached from a dozen
@@ -611,7 +617,7 @@ function toMembershipList(value) {
 * @example
 * const builder: ConditionBuilderStatic<SQL> = DrizzleConditionBuilder;
 */
-var DrizzleConditionBuilder = class {
+var DrizzleConditionBuilder = class DrizzleConditionBuilder {
 	/**
 	* Express "reachable from this parent through this relation" as a plain
 	* `WHERE` condition on the target table.
@@ -1237,10 +1243,28 @@ var DrizzleConditionBuilder = class {
 		return or(...conditions);
 	}
 	/**
-	* Build search conditions for text fields
+	* Build search conditions for text fields.
+	*
+	* Two shapes, chosen by whether the collection declared a `search` block:
+	*
+	* - **Declared** — one `@@ websearch_to_tsquery` against the generated
+	*   `tsvector` column. Stems, drops stopwords, AND-es the terms, reaches
+	*   inside JSONB and arrays, and uses the GIN index.
+	* - **Not declared** — the original `ILIKE '%term%'` OR-ed across top-level
+	*   string properties, unchanged.
+	*
+	* The second is the default and stays the default. A collection that has
+	* not opted in compiles to exactly the SQL it compiled to before this
+	* branch existed, which is the only reason it is safe to have added it.
+	*
+	* `collection` is optional so that the callers which genuinely have no
+	* collection in hand — nested paths, derived views — keep working; without
+	* one there is no `search` block to read and the ILIKE path is correct.
 	*/
-	static buildSearchConditions(searchString, properties, table) {
+	static buildSearchConditions(searchString, properties, table, collection) {
 		const searchConditions = [];
+		const ftsCondition = collection ? DrizzleConditionBuilder.buildFullTextCondition(searchString, table, collection) : void 0;
+		if (ftsCondition) return [ftsCondition];
 		for (const [key, prop] of Object.entries(properties)) {
 			const p = prop;
 			if (p.type === "string" && !p.enum && p.isId !== "uuid") {
@@ -1253,6 +1277,117 @@ var DrizzleConditionBuilder = class {
 		return searchConditions;
 	}
 	/**
+	* The `@@` predicate for a collection that declared a `search` block, or
+	* undefined for one that did not.
+	*
+	* The query is normalized exactly as the indexed content was — same text
+	* search configuration, same accent folding. Skipping that on the query
+	* side is the subtle way to get a search that matches nothing: the column
+	* would hold `gestion` while the query asked for `gestión`.
+	*
+	* `websearch_to_tsquery` rather than `plainto_tsquery` because it is the
+	* one that behaves the way a search box looks like it should — quoted
+	* phrases, `or`, and a leading `-` to exclude — and because it never throws
+	* on user input, which `to_tsquery` does on so much as a stray parenthesis.
+	*/
+	static buildFullTextCondition(searchString, table, collection) {
+		let spec;
+		try {
+			spec = buildSearchColumnSpec(collection);
+		} catch {
+			return;
+		}
+		if (!spec) return void 0;
+		const column = table[spec.column];
+		if (!column) return;
+		const exact = sql`${column} @@ ${DrizzleConditionBuilder.normalizedTsQuery(searchString, spec)}`;
+		if (!spec.fuzzy) return exact;
+		const fuzzyColumn = table[spec.fuzzy.column];
+		if (!fuzzyColumn) return exact;
+		const needle = spec.unaccent ? sql`${sql.raw(SEARCH_UNACCENT_FN)}(${searchString})` : sql`${searchString}`;
+		const similar = sql`public.word_similarity(${needle}, ${fuzzyColumn}) >= ${spec.fuzzy.threshold}`;
+		return sql`(${exact} OR ${spec.fuzzy.threshold > PG_TRGM_WORD_SIMILARITY_DEFAULT ? sql`(${needle} OPERATOR(public.<%) ${fuzzyColumn} AND ${similar})` : similar})`;
+	}
+	/**
+	* `websearch_to_tsquery(<config>, <normalized search string>)`.
+	*
+	* Split out because the ranking expression needs the identical query — a
+	* row ranked against a different tsquery than it was matched against is a
+	* ranking of something else.
+	*/
+	static normalizedTsQuery(searchString, spec) {
+		const normalized = spec.unaccent ? sql`${sql.raw(SEARCH_UNACCENT_FN)}(${searchString})` : sql`${searchString}`;
+		return sql`websearch_to_tsquery(${spec.language}, ${normalized})`;
+	}
+	/**
+	* A JSONB array of `{ field, snippet }` naming which declared fields matched
+	* and showing the text around each hit — what backs `_matches`.
+	*
+	* A ranked list answers "which rows", never "why this row". For a talent
+	* pool that difference is the product: a candidate surfacing for
+	* "iso 14001" on a *certification* is a different candidate from one whose
+	* bio happens to mention the standard, and the score cannot tell them apart.
+	*
+	* Built as a correlated subquery over a `VALUES` list of the declared
+	* fields, rather than one `CASE` per field, so the shape does not change
+	* with the number of fields and the empty result is a plain `[]`.
+	*
+	* `ts_headline` runs over the same normalized text that was indexed. Over
+	* the *original* text it would find nothing to mark whenever `unaccent` is
+	* on — the query's lexemes are folded and the document's are not — and
+	* would return the text silently unhighlighted. Folded-but-marked beats
+	* pretty-but-inert.
+	*
+	* Undefined when the collection has not opted in, when the column is not on
+	* the table yet, or when the caller did not ask: this costs a `ts_headline`
+	* per field per row and `ts_headline` re-parses the document.
+	*/
+	static buildSearchMatchesExpression(searchString, table, collection) {
+		let spec;
+		try {
+			spec = buildSearchColumnSpec(collection);
+		} catch {
+			return;
+		}
+		if (!spec || spec.fields.length === 0) return void 0;
+		if (!table[spec.column]) return void 0;
+		const query = DrizzleConditionBuilder.normalizedTsQuery(searchString, spec);
+		const config = sql`${spec.language}`;
+		const rows = spec.fields.map((f, i) => sql`(${i}, ${f.path}, ${sql.raw(f.textSql)})`);
+		return sql`(
+            SELECT coalesce(jsonb_agg(s.m ORDER BY f.ord), '[]'::jsonb)
+            FROM (VALUES ${sql.join(rows, sql`, `)}) AS f(ord, path, txt)
+            CROSS JOIN LATERAL (
+                SELECT jsonb_build_object(
+                    'field', f.path,
+                    'snippet', ts_headline(${config}::regconfig, f.txt, ${query},
+                        'StartSel=<mark>,StopSel=</mark>,MaxWords=14,MinWords=1,MaxFragments=1,FragmentDelimiter= … ')
+                ) AS m
+                WHERE to_tsvector(${config}::regconfig, f.txt) @@ ${query}
+            ) s
+        )`;
+	}
+	/**
+	* `ts_rank(<column>, <query>)` for the collection, or undefined when it has
+	* not opted in. This is what backs `orderBy: ["_score", "desc"]`.
+	*/
+	static buildSearchRankExpression(searchString, table, collection) {
+		let spec;
+		try {
+			spec = buildSearchColumnSpec(collection);
+		} catch {
+			return;
+		}
+		if (!spec) return void 0;
+		const column = table[spec.column];
+		if (!column) return void 0;
+		const rank = sql`ts_rank(${column}, ${DrizzleConditionBuilder.normalizedTsQuery(searchString, spec)})`;
+		if (!spec.fuzzy) return rank;
+		const fuzzyColumn = table[spec.fuzzy.column];
+		if (!fuzzyColumn) return rank;
+		return sql`(${rank} + public.word_similarity(${spec.unaccent ? sql`${sql.raw(SEARCH_UNACCENT_FN)}(${searchString})` : sql`${searchString}`}, ${fuzzyColumn}))`;
+	}
+	/**
 	* Build a unique field check condition
 	*/
 	static buildUniqueFieldCondition(fieldColumn, value, idColumn, excludeId) {
@@ -1793,6 +1928,18 @@ function parsePropertyFromServer(value, property, collection, propertyKey) {
 *                       from the result (used by `normalizeDbValues` where
 *                       Drizzle's relational API already hydrates them).
 */
+/**
+* Keys a query computes and attaches to a row, rather than reads from a column.
+*
+* An explicit set rather than a `_` prefix rule: a user's column may perfectly
+* well be called `_internal`, and passing it through here would put a value on
+* the row that no property describes and nothing downstream knows how to type.
+*/
+var QUERY_METADATA_KEYS = /* @__PURE__ */ new Set([
+	"_score",
+	"_distance",
+	"_matches"
+]);
 function normalizeScalarValues(data, properties, collection, resolvedRelations, options) {
 	const result = {};
 	const internalFKColumns = /* @__PURE__ */ new Set();
@@ -1804,6 +1951,10 @@ function normalizeScalarValues(data, properties, collection, resolvedRelations,
 			result[key] = value === null ? null : typeof value === "number" ? value : String(value);
 			continue;
 		}
+		if (QUERY_METADATA_KEYS.has(key)) {
+			result[key] = value;
+			continue;
+		}
 		const property = properties[key];
 		if (!property) continue;
 		if (options.skipRelations && property.type === "relation") continue;
@@ -2056,7 +2207,7 @@ var RelationService = class {
 		let query = this.db.select().from(targetTable).$dynamic();
 		const additionalFilters = [];
 		if (options.searchString) {
-			const searchConditions = DrizzleConditionBuilder.buildSearchConditions(options.searchString, targetCollection.properties, targetTable);
+			const searchConditions = DrizzleConditionBuilder.buildSearchConditions(options.searchString, targetCollection.properties, targetTable, targetCollection);
 			if (searchConditions.length === 0) return [];
 			const searchCombined = DrizzleConditionBuilder.combineConditionsWithOr(searchConditions);
 			if (searchCombined) additionalFilters.push(searchCombined);
@@ -3162,7 +3313,7 @@ function sanitizeErrorForClient(error, context) {
 * Service for handling all row read operations.
 * Handles fetching, searching, counting, and filtering rows.
 */
-var FetchService = class {
+var FetchService = class FetchService {
 	db;
 	registry;
 	relationService;
@@ -3235,6 +3386,24 @@ var FetchService = class {
 	* and skips rows rather than erroring. The guesses stay, last, for a
 	* caller that hands over no collection to resolve against.
 	*/
+	/**
+	* The ORDER BY target, which may be relevance rather than a column.
+	*
+	* `_score` is only meaningful for a collection that declared a `search`
+	* block *and* for a request that carried a search string — ranking rows
+	* against no query ranks them all at zero. Outside those two conditions it
+	* is an unknown field and gets the same 400 as any other typo, which is the
+	* behaviour that matters: a sort that is silently dropped returns 200 with
+	* rows in arbitrary order, and paging over that repeats and skips rows.
+	*/
+	static SCORE_FIELD = "_score";
+	resolveOrderTarget(table, orderBy, collection, searchString) {
+		if (orderBy === FetchService.SCORE_FIELD && collection && searchString) {
+			const rank = DrizzleConditionBuilder.buildSearchRankExpression(searchString, table, collection);
+			if (rank) return rank;
+		}
+		return this.resolveOrderByField(table, orderBy, collection);
+	}
 	resolveOrderByField(table, orderBy, collection) {
 		const columnAt = (key) => (key in table ? table[key] : void 0) || void 0;
 		const direct = columnAt(orderBy);
@@ -3362,12 +3531,14 @@ var FetchService = class {
 	*/
 	buildDrizzleQueryOptions(table, idField, idInfo, options, collectionPath, withConfig, scopeCondition) {
 		const queryOpts = {};
+		const hidden = hiddenColumnsOption(getTableColumns(table), this.registry.getCollectionByPath(collectionPath) ?? void 0);
+		if (hidden) queryOpts.columns = hidden;
 		if (withConfig) queryOpts.with = withConfig;
 		const allConditions = [];
 		if (scopeCondition) allConditions.push(scopeCondition);
 		if (options.searchString) {
 			const collection = getCollectionByPath(collectionPath, this.registry);
-			const searchConditions = DrizzleConditionBuilder.buildSearchConditions(options.searchString, collection.properties, table);
+			const searchConditions = DrizzleConditionBuilder.buildSearchConditions(options.searchString, collection.properties, table, collection);
 			if (searchConditions.length === 0) {
 				queryOpts.where = and(eq(idField, -99999999));
 				return queryOpts;
@@ -3390,7 +3561,7 @@ var FetchService = class {
 		const orderExpressions = [];
 		if (options.orderBy) {
 			const collection = getCollectionByPath(collectionPath, this.registry);
-			const orderByField = this.resolveOrderByField(table, options.orderBy, collection);
+			const orderByField = this.resolveOrderTarget(table, options.orderBy, collection, options.searchString);
 			if (orderByField) orderExpressions.push(options.order === "asc" ? asc(orderByField) : desc(orderByField));
 		}
 		orderExpressions.push(desc(idField));
@@ -3407,6 +3578,7 @@ var FetchService = class {
 		if (!options.startAfter) return [];
 		const cursor = options.startAfter;
 		if (options.orderBy) {
+			if (options.orderBy === FetchService.SCORE_FIELD) throw ApiError.badRequest("Cursor pagination (`startAfter`) cannot be combined with `orderBy: \"_score\"`. Relevance is computed per query rather than stored, so it cannot key a cursor. Use `limit`/`offset` for relevance-ordered pages, or order by a column.", "SCORE_CURSOR_UNSUPPORTED", { field: FetchService.SCORE_FIELD });
 			const collection = collectionPath ? getCollectionByPath(collectionPath, this.registry) : void 0;
 			const orderByField = this.resolveOrderByField(table, options.orderBy, collection);
 			if (orderByField) {
@@ -3477,9 +3649,11 @@ var FetchService = class {
 		const qb = this.getQueryBuilder(tableName);
 		if (qb) try {
 			const withConfig = this.buildWithConfig(collection);
+			const hidden = hiddenColumnsOption(getTableColumns(table), collection);
 			const row = await qb.findFirst({
 				where: eq(idField, parsedId),
-				with: withConfig
+				with: withConfig,
+				...hidden ? { columns: hidden } : {}
 			});
 			if (!row) return void 0;
 			const flatRow = toFlatRow(row, collection, this.registry);
@@ -3493,7 +3667,8 @@ var FetchService = class {
 			if (reachedDatabase(e)) throw e;
 			logger.warn(`[FetchService] db.query.findFirst failed for ${collectionPath}, falling back to db.select`, { error: e });
 		}
-		const result = await this.db.select().from(table).where(eq(idField, parsedId)).limit(1);
+		const visibleOne = visibleColumnProjection(getTableColumns(table), collection);
+		const result = await this.db.select(visibleOne).from(table).where(eq(idField, parsedId)).limit(1);
 		if (result.length === 0) return void 0;
 		const raw = result[0];
 		const values = await parseDataFromServer(raw, collection, this.db, this.registry);
@@ -3549,14 +3724,21 @@ var FetchService = class {
 		}
 		let vectorMeta;
 		if (options.vectorSearch) vectorMeta = DrizzleConditionBuilder.buildVectorSearchConditions(table, options.vectorSearch);
+		const visible = visibleColumnProjection(getTableColumns(table), collection);
+		const rankSelect = options.searchString ? DrizzleConditionBuilder.buildSearchRankExpression(options.searchString, table, collection) : void 0;
+		const matchesSelect = options.searchString && options.searchExplain ? DrizzleConditionBuilder.buildSearchMatchesExpression(options.searchString, table, collection) : void 0;
 		let query = vectorMeta ? this.db.select({
-			table_row: table,
+			table_row: visible ?? table,
 			_distance: vectorMeta.distanceSelect
-		}).from(table).$dynamic() : this.db.select().from(table).$dynamic();
+		}).from(table).$dynamic() : rankSelect ? this.db.select({
+			table_row: visible ?? table,
+			_score: rankSelect,
+			...matchesSelect ? { _matches: matchesSelect } : {}
+		}).from(table).$dynamic() : visible ? this.db.select(visible).from(table).$dynamic() : this.db.select().from(table).$dynamic();
 		const allConditions = [];
 		if (scopeCondition) allConditions.push(scopeCondition);
 		if (options.searchString) {
-			const searchConditions = DrizzleConditionBuilder.buildSearchConditions(options.searchString, collection.properties, table);
+			const searchConditions = DrizzleConditionBuilder.buildSearchConditions(options.searchString, collection.properties, table, collection);
 			if (searchConditions.length === 0) return [];
 			allConditions.push(DrizzleConditionBuilder.combineConditionsWithOr(searchConditions));
 		}
@@ -3576,7 +3758,7 @@ var FetchService = class {
 		const orderExpressions = [];
 		if (vectorMeta) orderExpressions.push(asc(vectorMeta.orderBy));
 		else if (options.orderBy) {
-			const orderByField = this.resolveOrderByField(table, options.orderBy, collection);
+			const orderByField = this.resolveOrderTarget(table, options.orderBy, collection, options.searchString);
 			if (orderByField) orderExpressions.push(options.order === "asc" ? asc(orderByField) : desc(orderByField));
 		}
 		orderExpressions.push(desc(idField));
@@ -3596,6 +3778,10 @@ var FetchService = class {
 		const results = vectorMeta ? rawResults.map((r) => ({
 			...r.table_row,
 			_distance: typeof r._distance === "number" ? r._distance : parseFloat(String(r._distance))
+		})) : rankSelect ? rawResults.map((r) => ({
+			...r.table_row,
+			_score: typeof r._score === "number" ? r._score : parseFloat(String(r._score)),
+			...matchesSelect ? { _matches: r._matches ?? [] } : {}
 		})) : rawResults;
 		return this.processRowResults(results, collection, collectionPath, idInfo, options.databaseId, false, idInfoArray);
 	}
@@ -3687,7 +3873,7 @@ var FetchService = class {
 		const allConditions = [];
 		if (hop) allConditions.push(this.buildRelationScope(hop));
 		if (options.searchString) {
-			const searchConditions = DrizzleConditionBuilder.buildSearchConditions(options.searchString, collection.properties, table);
+			const searchConditions = DrizzleConditionBuilder.buildSearchConditions(options.searchString, collection.properties, table, collection);
 			if (searchConditions.length === 0) return 0;
 			allConditions.push(DrizzleConditionBuilder.combineConditionsWithOr(searchConditions));
 		}
@@ -3832,7 +4018,8 @@ var FetchService = class {
 			if (reachedDatabase(e)) throw e;
 			logger.warn(`[fetchOneForRest] db.query.findFirst failed for ${collectionPath}, falling back`, { error: e });
 		}
-		const result = await this.db.select().from(table).where(eq(idField, parsedId)).limit(1);
+		const visibleOne = visibleColumnProjection(getTableColumns(table), collection);
+		const result = await this.db.select(visibleOne).from(table).where(eq(idField, parsedId)).limit(1);
 		if (result.length === 0) return null;
 		const flatEntity = { ...result[0] };
 		if (!include || include.length === 0) return flatEntity;
@@ -3870,14 +4057,21 @@ var FetchService = class {
 		const idField = table[requirePrimaryKeys(collection, this.registry)[0].fieldName];
 		let vectorMeta;
 		if (options.vectorSearch) vectorMeta = DrizzleConditionBuilder.buildVectorSearchConditions(table, options.vectorSearch);
+		const visible = visibleColumnProjection(getTableColumns(table), collection);
+		const rankSelect = options.searchString ? DrizzleConditionBuilder.buildSearchRankExpression(options.searchString, table, collection) : void 0;
+		const matchesSelect = options.searchString && options.searchExplain ? DrizzleConditionBuilder.buildSearchMatchesExpression(options.searchString, table, collection) : void 0;
 		let query = vectorMeta ? this.db.select({
-			table_row: table,
+			table_row: visible ?? table,
 			_distance: vectorMeta.distanceSelect
-		}).from(table).$dynamic() : this.db.select().from(table).$dynamic();
+		}).from(table).$dynamic() : rankSelect ? this.db.select({
+			table_row: visible ?? table,
+			_score: rankSelect,
+			...matchesSelect ? { _matches: matchesSelect } : {}
+		}).from(table).$dynamic() : visible ? this.db.select(visible).from(table).$dynamic() : this.db.select().from(table).$dynamic();
 		const allConditions = [];
 		if (options.relatedTo) allConditions.push(this.buildRelationScope(options.relatedTo));
 		if (options.searchString) {
-			const searchConditions = DrizzleConditionBuilder.buildSearchConditions(options.searchString, collection.properties, table);
+			const searchConditions = DrizzleConditionBuilder.buildSearchConditions(options.searchString, collection.properties, table, collection);
 			if (searchConditions.length === 0) return [];
 			allConditions.push(DrizzleConditionBuilder.combineConditionsWithOr(searchConditions));
 		}
@@ -3893,7 +4087,7 @@ var FetchService = class {
 		const orderExpressions = [];
 		if (vectorMeta) orderExpressions.push(asc(vectorMeta.orderBy));
 		else if (options.orderBy) {
-			const orderByField = this.resolveOrderByField(table, options.orderBy, collection);
+			const orderByField = this.resolveOrderTarget(table, options.orderBy, collection, options.searchString);
 			if (orderByField) orderExpressions.push(options.order === "asc" ? asc(orderByField) : desc(orderByField));
 		}
 		orderExpressions.push(desc(idField));
@@ -3906,6 +4100,11 @@ var FetchService = class {
 			...r.table_row,
 			_distance: typeof r._distance === "number" ? r._distance : parseFloat(String(r._distance))
 		}));
+		if (rankSelect) return rawResults.map((r) => ({
+			...r.table_row,
+			_score: typeof r._score === "number" ? r._score : parseFloat(String(r._score)),
+			...matchesSelect ? { _matches: r._matches ?? [] } : {}
+		}));
 		return rawResults;
 	}
 	/**
@@ -6416,6 +6615,7 @@ var generateSchema = async (allCollections, stripPolicies = false) => {
 	const hasUuid = collections.some((c) => c.properties && Object.values(c.properties).some((p) => p.type === "string" && (p.autoValue === "uuid" || p.isId === "uuid")));
 	const hasVector = collections.some((c) => c.properties && Object.values(c.properties).some((p) => p.type === "vector"));
 	const hasBinary = collections.some((c) => c.properties && Object.values(c.properties).some((p) => p.type === "binary"));
+	const hasSearch = collections.some((c) => buildSearchColumnSpec(c) !== void 0);
 	const pgCoreImports = [
 		"primaryKey",
 		"pgTable",
@@ -6440,7 +6640,7 @@ var generateSchema = async (allCollections, stripPolicies = false) => {
 	];
 	if (hasUuid) pgCoreImports.push("uuid");
 	if (hasVector) pgCoreImports.push("vector");
-	if (hasBinary) pgCoreImports.push("customType");
+	if (hasBinary || hasSearch) pgCoreImports.push("customType");
 	const uniqueSchemas = Array.from(new Set(collections.map((c) => isPostgresCollectionConfig(c) ? c.schema : void 0).filter(Boolean)));
 	if (uniqueSchemas.length > 0) pgCoreImports.push("pgSchema");
 	schemaContent += `import { ${pgCoreImports.join(", ")} } from 'drizzle-orm/pg-core';\n`;
@@ -6522,6 +6722,11 @@ var generateSchema = async (allCollections, stripPolicies = false) => {
 				const columnString = getDrizzleColumn(propName, prop, collection, collections);
 				if (columnString) columns.add(columnString);
 			});
+			const searchSpec = buildSearchColumnSpec(collection);
+			if (searchSpec) {
+				columns.add(`    ${searchSpec.column}: customType({ dataType() { return 'tsvector'; } })("${searchSpec.column}").generatedAlwaysAs(sql\`${searchSpec.expression}\`)`);
+				if (searchSpec.fuzzy) columns.add(`    ${searchSpec.fuzzy.column}: text("${searchSpec.fuzzy.column}").generatedAlwaysAs(sql\`${searchSpec.fuzzy.expression}\`)`);
+			}
 			if (!Array.from(columns).some((col) => col.includes(".primaryKey()"))) columns.add("    id: text(\"id\").primaryKey()");
 			schemaContent += `${Array.from(columns).join(",\n")}`;
 			const securityRules = getEffectiveSecurityRules(collection);
@@ -7941,7 +8146,8 @@ var RealtimeService = class RealtimeService extends EventEmitter {
 				limit: config.limit,
 				startAfter: config.startAfter,
 				databaseId: config.databaseId,
-				searchString: config.searchString
+				searchString: config.searchString,
+				searchExplain: config.searchExplain
 			}
 		});
 		if (callback) this.subscriptionCallbacks.set(subscriptionId, callback);
@@ -8069,7 +8275,8 @@ var RealtimeService = class RealtimeService extends EventEmitter {
 					offset: request.offset,
 					startAfter: request.startAfter,
 					databaseId: request.collection?.databaseId,
-					searchString: request.searchString
+					searchString: request.searchString,
+					searchExplain: request.searchExplain
 				},
 				authContext
 			});
@@ -8253,7 +8460,8 @@ var RealtimeService = class RealtimeService extends EventEmitter {
 					orderBy: collectionRequest.orderBy,
 					order: collectionRequest.order,
 					limit: collectionRequest.limit,
-					databaseId: collectionRequest.databaseId
+					databaseId: collectionRequest.databaseId,
+					searchExplain: collectionRequest.searchExplain
 				});
 				else fetchedEntities = await txEntityService.fetchCollection(notifyPath, {
 					filter: collectionRequest.filter,
@@ -12611,7 +12819,7 @@ function createPostgresBootstrapper(pgConfig) {
 		*/
 		async ensureCollectionSchema(collections, driverResult, log) {
 			const internals = driverResult.internals;
-			const { ensureCollectionTables } = await import("./ensure-collection-tables-DSIxvLLD.js");
+			const { ensureCollectionTables } = await import("./ensure-collection-tables-DRxaUG96.js");
 			const plan = await ensureCollectionTables({ async query(text) {
 				const result = await internals.db.execute(sql.raw(text));
 				return { rows: result.rows ?? (Array.isArray(result) ? result : []) };
@@ -12636,7 +12844,7 @@ function createPostgresBootstrapper(pgConfig) {
 		*/
 		async ensureCollectionPolicies(collections, driverResult, log) {
 			const internals = driverResult.internals;
-			const { ensureCollectionPolicies } = await import("./ensure-collection-policies-DMUdRQdM.js");
+			const { ensureCollectionPolicies } = await import("./ensure-collection-policies-CwYUliAa.js");
 			const outcome = await ensureCollectionPolicies({ async query(text) {
 				const result = await internals.db.execute(sql.raw(text));
 				return { rows: result.rows ?? (Array.isArray(result) ? result : []) };