@m1212e/rumble 0.12.22 → 0.13.2

package/out/index.cjs

@@ -887,10 +887,12 @@ const createAbilityBuilder = ({ db, actions, defaultLimit }) => {
 							if (filters?.columns) return {
 								query: {
 									single: {
+										extras: filters?.extras,
 										where: filters?.where,
 										columns: filters?.columns
 									},
 									many: {
+										extras: filters?.extras,
 										where: filters?.where,
 										columns: filters?.columns,
 										get limit() {
@@ -904,8 +906,12 @@ const createAbilityBuilder = ({ db, actions, defaultLimit }) => {
 							};
 							else return {
 								query: {
-									single: { where: filters?.where },
+									single: {
+										extras: filters?.extras,
+										where: filters?.where
+									},
 									many: {
+										extras: filters?.extras,
 										where: filters?.where,
 										get limit() {
 											return limit();
@@ -1135,7 +1141,6 @@ const createWhereArgImplementer = ({ db, schemaBuilder, enumImplementer }) => {
 //#endregion
 //#region lib/client/client.ts
 const clientCreatorImplementer = ({ builtSchema }) => {
-	if (process.env.NODE_ENV !== "development") console.warn("Running rumble client generation in non development mode. Are you sure this is correct?");
 	const clientCreator = async ({ apiUrl, outputPath, rumbleImportPath, useExternalUrqlClient, removeExisting }) => {
 		if (process.env.NODE_ENV !== "development") console.warn("Running rumble client generation in non development mode. Are you sure this is correct?");
 		await generateFromSchema({
@@ -1365,6 +1370,14 @@ 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 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 };
 		const originalOrderBy = (0, es_toolkit.cloneDeep)(args.orderBy);
 		args.orderBy = (table) => {
 			const argsOrderBySQL = drizzle_orm.sql.join(Object.entries(originalOrderBy ?? {}).map(([key, value]) => {
@@ -1372,16 +1385,11 @@ 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 columnsToSearch = abilities.query.many.columns ? Object.entries(tableSchema.columns).filter(([key]) => abilities.query.many.columns[key]) : Object.entries(tableSchema.columns);
-			const searchSQL = drizzle_orm.sql`GREATEST(${drizzle_orm.sql.join(columnsToSearch.map(([key]) => {
-				return drizzle_orm.sql`similarity(${table[key]}::TEXT, ${args.search})`;
-			}), drizzle_orm.sql.raw(", "))}) DESC`;
+			const searchSQL = drizzle_orm.sql`search_score DESC`;
 			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`GREATEST(${drizzle_orm.sql.join(Object.entries(tableSchema.columns).map(([key]) => {
-				return drizzle_orm.sql`similarity(${table[key]}::TEXT, ${args.search})`;
-			}), drizzle_orm.sql.raw(", "))}) > ${search.threshold ?? .1}`;
+			return drizzle_orm.sql`${scoring(table)} > ${search.threshold ?? .15}`;
 		} }] };
 	}
 }
@@ -1532,7 +1540,8 @@ const createObjectImplementer = ({ db, search, schemaBuilder, makePubSubInstance
 							});
 							const filter = ctx.abilities[relationSchema.tsName].filter(readAction).merge({
 								where: args$1.where,
-								limit: args$1.limit
+								limit: args$1.limit,
+								extras: args$1.extras
 							}).query[filterSpecifier];
 							if (args$1.offset) filter.offset = args$1.offset;
 							if (args$1.orderBy) filter.orderBy = args$1.orderBy;
@@ -1541,6 +1550,14 @@ 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.",
+						nullable: true,
+						resolve: (parent, args, ctx, info) => parent.search_score
+					});
+				}
 				return {
 					...fields,
 					...relations,