@m1212e/rumble 0.13.2 → 0.13.3

package/out/index.cjs

@@ -1357,12 +1357,18 @@ function isPostgresDB(db) {
 
 //#endregion
 //#region lib/search.ts
-async function initSearchIfApplicable(db) {
-	if (!isPostgresDB(db)) {
-		console.info("Database dialect is not compatible with search, skipping search initialization.");
+async function initSearchIfApplicable(input) {
+	if (!isPostgresDB(input.db)) {
+		console.info("Database dialect is not compatible with search, skipping search initialization. Only PostgreSQL is supported.");
 		return;
 	}
-	await db.execute(drizzle_orm.sql`CREATE EXTENSION IF NOT EXISTS pg_trgm;`);
+	await input.db.execute(drizzle_orm.sql`CREATE EXTENSION IF NOT EXISTS pg_trgm;`);
+	if (input.search?.threshold) {
+		const threshold = Number(input.search.threshold);
+		if (threshold < 0 || threshold > 1) throw new Error(`Search threshold must be between 0 and 1`);
+		const dbName = (await input.db.execute(drizzle_orm.sql`SELECT current_database()`)).rows[0].current_database;
+		await input.db.execute(drizzle_orm.sql.raw(`ALTER DATABASE ${dbName} SET pg_trgm.similarity_threshold = ${threshold};`));
+	}
 }
 /**
 * Performs adjustments to the query args to issue a full text search in case the
@@ -1370,14 +1376,11 @@ async function initSearchIfApplicable(db) {
 */
 function adjustQueryArgsForSearch({ search, args, tableSchema, abilities }) {
 	if (search?.enabled && args.search && args.search.length > 0) {
-		const columnsToSearch = abilities.query.many.columns ? Object.entries(tableSchema.columns).filter(([key]) => abilities.query.many.columns[key]) : Object.entries(tableSchema.columns);
+		const columnsToSearch = (abilities.query.many.columns ? Object.entries(tableSchema.columns).filter(([key]) => abilities.query.many.columns[key]) : Object.entries(tableSchema.columns)).filter(([key, col]) => isStringLikeSQLTypeString(col.getSQLType()) || isIDLikeSQLTypeString(col.getSQLType()));
 		const searchParam = drizzle_orm.sql`${args.search}`;
-		const scoring = (table) => (search?.score ?? "sum") === "sum" ? drizzle_orm.sql`(${drizzle_orm.sql.join(columnsToSearch.map(([key]) => {
-			return drizzle_orm.sql`COALESCE(similarity(${table[key]}::TEXT, ${searchParam}), 0)`;
-		}), drizzle_orm.sql.raw(" + "))})` : drizzle_orm.sql`GREATEST(${drizzle_orm.sql.join(columnsToSearch.map(([key]) => {
-			return drizzle_orm.sql`similarity(${table[key]}::TEXT, ${searchParam})`;
-		}), drizzle_orm.sql.raw(", "))})`;
-		args.extras = { search_score: scoring };
+		args.extras = { search_distance: (table) => drizzle_orm.sql`${drizzle_orm.sql.join(columnsToSearch.map(([key]) => {
+			return drizzle_orm.sql`COALESCE((${table[key]}::TEXT <-> ${searchParam}), 1)`;
+		}), drizzle_orm.sql.raw(" + "))}` };
 		const originalOrderBy = (0, es_toolkit.cloneDeep)(args.orderBy);
 		args.orderBy = (table) => {
 			const argsOrderBySQL = drizzle_orm.sql.join(Object.entries(originalOrderBy ?? {}).map(([key, value]) => {
@@ -1385,12 +1388,12 @@ function adjustQueryArgsForSearch({ search, args, tableSchema, abilities }) {
 				else if (value === "desc") return drizzle_orm.sql`${table[key]} DESC`;
 				else throw new Error(`Invalid value ${value} for orderBy`);
 			}), drizzle_orm.sql.raw(", "));
-			const searchSQL = drizzle_orm.sql`search_score DESC`;
+			const searchSQL = drizzle_orm.sql`search_distance ASC`;
 			return originalOrderBy ? drizzle_orm.sql.join([argsOrderBySQL, searchSQL], drizzle_orm.sql.raw(", ")) : searchSQL;
 		};
-		args.where = { AND: [(0, es_toolkit.cloneDeep)(args.where) ?? {}, { RAW: (table) => {
-			return drizzle_orm.sql`${scoring(table)} > ${search.threshold ?? .15}`;
-		} }] };
+		args.where = { AND: [(0, es_toolkit.cloneDeep)(args.where) ?? {}, { RAW: (table) => drizzle_orm.sql`(${drizzle_orm.sql.join(columnsToSearch.map(([key]) => {
+			return drizzle_orm.sql`${table[key]} % ${searchParam}`;
+		}), drizzle_orm.sql.raw(" OR "))})` }] };
 	}
 }
 
@@ -1551,11 +1554,11 @@ const createObjectImplementer = ({ db, search, schemaBuilder, makePubSubInstance
 					return acc;
 				}, {});
 				if (search?.enabled) {
-					if (fields.search_score) throw new Error("Reserved field name 'search_score' found on " + tableSchema.tsName + ". If search is enabled, the 'search_score' field is automatically added and cannot be defined manually.");
-					fields.search_score = t.float({
-						description: "The search score of the object. If a search is provided, this field will be populated with the search score.",
+					if (fields.search_distance) throw new Error("Reserved field name 'search_distance' found on " + tableSchema.tsName + ". If search is enabled, the 'search_distance' field is automatically added and cannot be defined manually.");
+					fields.search_distance = t.float({
+						description: "The search distance of the object. If a search is provided, this field will be populated with the search distance.",
 						nullable: true,
-						resolve: (parent, args, ctx, info) => parent.search_score
+						resolve: (parent, args, ctx, info) => parent.search_distance
 					});
 				}
 				return {
@@ -1937,7 +1940,7 @@ export const db = drizzle(
 		"delete"
 	];
 	if (rumbleInput.defaultLimit === void 0) rumbleInput.defaultLimit = 100;
-	if (rumbleInput.search?.enabled) initSearchIfApplicable(rumbleInput.db);
+	if (rumbleInput.search?.enabled) initSearchIfApplicable(rumbleInput);
 	const abilityBuilder = createAbilityBuilder(rumbleInput);
 	const context = createContextFunction({
 		...rumbleInput,