@m1212e/rumble 0.23.5 → 0.23.8

package/out/index.mjs

@@ -180,7 +180,7 @@ function mapNullFieldsToUndefined(obj) {
 }
 //#endregion
 //#region package.json
-var version = "0.23.5";
+var version = "0.23.8";
 //#endregion
 //#region lib/helpers/mergeFilters.ts
 const EmptyFilter$1 = Symbol.for("drizzle:EmptyFilter");
@@ -211,6 +211,20 @@ function mergeFilters(filterA, filterB, mode = "AND") {
 	};
 }
 //#endregion
+//#region lib/helpers/sanitizeFilterValue.ts
+const EmptyFilter = Symbol.for("drizzle:EmptyFilter");
+function isPlainObject(value) {
+	if (typeof value !== "object" || value === null) return false;
+	const proto = Object.getPrototypeOf(value);
+	return proto === Object.prototype || proto === null;
+}
+function sanitizeFilterValue(value) {
+	if (value === void 0) return EmptyFilter;
+	if (Array.isArray(value)) return value.map(sanitizeFilterValue);
+	if (isPlainObject(value)) return Object.fromEntries(Object.entries(value).map(([key, entry]) => [key, sanitizeFilterValue(entry)]));
+	return value;
+}
+//#endregion
 //#region lib/helpers/sqlTypes/types.ts
 /**
 * Strips parameter suffixes like `(256)`, `(10,2)` and timezone modifiers
@@ -425,21 +439,6 @@ function tableHelper({ db, table }) {
 }
 //#endregion
 //#region lib/abilityBuilder.ts
-/**
-* drizzle-orm's sentinel value for "this filter field is deliberately
-* skipped", as opposed to `undefined`, which some drizzle-orm versions
-* reject when it ends up as an explicit (present but `undefined`) `where`
-* property nested inside a relational `with` query.
-*
-* drizzle-orm defines this via `Symbol.for("drizzle:EmptyFilter")` — a
-* globally registered symbol — so recreating it the same way here yields
-* the exact same value drizzle-orm's relational query engine checks for,
-* without importing it directly: not every drizzle-orm version rumble
-* supports exports it as a named export, and older versions that don't know
-* about it at all still handle it safely (`Object.entries` on a symbol
-* yields no entries, i.e. "no filter").
-*/
-const EmptyFilter = Symbol.for("drizzle:EmptyFilter");
 function isDynamicQueryFilter(filter) {
 	return typeof filter === "function" && filter.constructor.name !== "AsyncFunction";
 }
@@ -590,7 +589,7 @@ by: (explicitFilter) => {
 							});
 							const sqlTransformedWhere = lazy(() => {
 								const casing = db._.session?.dialect?.casing;
-								return filters?.where ? relationsFilterToSQL(tableSchema.foundRelation.table, filters.where, tableSchema.relations, db._.relations, casing) : void 0;
+								return filters?.where ? relationsFilterToSQL(tableSchema.foundRelation.table, sanitizeFilterValue(filters.where), tableSchema.relations, db._.relations, casing) : void 0;
 							});
 							if (filters?.columns) return {
 								/**
@@ -608,7 +607,7 @@ by: (explicitFilter) => {
 									*/
 									single: {
 										extras: filters?.extras,
-										where: filters?.where ?? EmptyFilter,
+										where: sanitizeFilterValue(filters?.where),
 										columns: filters?.columns
 									},
 									/**
@@ -616,7 +615,7 @@ by: (explicitFilter) => {
 									*/
 									many: {
 										extras: filters?.extras,
-										where: filters?.where ?? EmptyFilter,
+										where: sanitizeFilterValue(filters?.where),
 										columns: filters?.columns,
 										get limit() {
 											return limit();
@@ -662,14 +661,14 @@ by: (explicitFilter) => {
 									*/
 									single: {
 										extras: filters?.extras,
-										where: filters?.where ?? EmptyFilter
+										where: sanitizeFilterValue(filters?.where)
 									},
 									/**
 									* For find many calls
 									*/
 									many: {
 										extras: filters?.extras,
-										where: filters?.where ?? EmptyFilter,
+										where: sanitizeFilterValue(filters?.where),
 										get limit() {
 											return limit();
 										}
@@ -1862,7 +1861,7 @@ const createPubSubInstance = ({ subscriptions }) => {
 //#region lib/query.ts
 const createQueryImplementer = ({ db, schemaBuilder, search, logger: loggerConfig, whereArgImplementer, orderArgImplementer, makePubSubInstance }) => {
 	const registeredQueryFieldNames = /* @__PURE__ */ new Set();
-	return ({ table, readAction = "read", listAction = "read" }) => {
+	return ({ table, readAction = "read", listAction = "read", findFirst, findMany }) => {
 		const WhereArg = whereArgImplementer({ table });
 		const OrderArg = orderArgImplementer({ table });
 		const tableSchema = tableHelper({
@@ -1921,8 +1920,13 @@ const createQueryImplementer = ({ db, schemaBuilder, search, logger: loggerConfi
 						const filter = ctx.abilities[table].filter(listAction).merge(mappedArgs).query.many;
 						if (mappedArgs.offset) filter.offset = mappedArgs.offset;
 						if (mappedArgs.orderBy) filter.orderBy = mappedArgs.orderBy;
-						const queryInstance = query(filter);
-						if (filter.columns) queryInstance.columns = filter.columns;
+						const queryArgs = query(filter);
+						if (filter.columns) queryArgs.columns = filter.columns;
+						const run = findMany ? (tx) => findMany({
+							tx,
+							filter,
+							queryArgs
+						}) : (tx) => tx.query[table].findMany(queryArgs);
 						if (search?.enabled && args.search && args.search.length > 0 && search?.cpu_operator_cost) return db.transaction(async (tx) => {
 							if (isPostgresDB(tx)) await tx.execute(sql.raw(`SET cpu_operator_cost = ${search.cpu_operator_cost};`));
 							else {
@@ -1930,9 +1934,9 @@ const createQueryImplementer = ({ db, schemaBuilder, search, logger: loggerConfi
 								const log = loggerConfig?.enabled ? loggerConfig.logger : void 0;
 								log ? log.info({}, msg) : console.info(msg);
 							}
-							return tx.query[table].findMany(queryInstance);
+							return run(tx);
 						});
-						return db.query[table].findMany(queryInstance);
+						return run(db);
 					}
 				}),
 				[singularName]: t.drizzleField({
@@ -1944,9 +1948,13 @@ const createQueryImplementer = ({ db, schemaBuilder, search, logger: loggerConfi
 					resolve: (query, _root, args, ctx, _info) => {
 						deepSetProto(args);
 						const filter = ctx.abilities[table].filter(readAction).merge({ where: { [primaryKeyField.name]: args.id } }).query.single;
-						const q = query(filter);
-						if (filter.columns) q.columns = filter.columns;
-						return db.query[table].findFirst(q).then(assertFindFirstExists);
+						const queryArgs = query(filter);
+						if (filter.columns) queryArgs.columns = filter.columns;
+						return findFirst ? findFirst({
+							tx: db,
+							filter,
+							queryArgs
+						}) : db.query[table].findFirst(queryArgs).then(assertFindFirstExists);
 					}
 				})
 			};