@m1212e/rumble 0.18.3 → 0.18.7

package/out/index.cjs

@@ -208,20 +208,20 @@ function mapNullFieldsToUndefined(obj) {
 }
 //#endregion
 //#region package.json
-var version = "0.18.3";
+var version = "0.18.7";
 //#endregion
 //#region lib/helpers/mergeFilters.ts
-function mergeFilters(filterA, filterB) {
+function mergeFilters(filterA, filterB, mode = "AND") {
 	return {
-		where: filterA?.where && filterB?.where ? { AND: [filterA?.where, filterB?.where] } : filterA?.where ?? filterB?.where,
+		where: filterA?.where && filterB?.where ? mode === "OR" ? { OR: [filterA.where, filterB.where] } : { AND: [filterA.where, filterB.where] } : filterA?.where ?? filterB?.where,
 		columns: filterA?.columns || filterB?.columns ? new Set([Object.entries(filterA?.columns ?? {}), Object.entries(filterB?.columns ?? {})].flat().filter(([, v]) => v === true).map(([k]) => k)).entries().reduce((acc, [key]) => {
 			acc[key] = true;
 			return acc;
 		}, {}) : void 0,
 		extras: filterA?.extras || filterB?.extras ? (0, es_toolkit.toMerged)(filterA?.extras ?? {}, filterB?.extras ?? {}) : void 0,
 		orderBy: filterA?.orderBy || filterB?.orderBy ? (0, es_toolkit.toMerged)(filterA?.orderBy ?? {}, filterB?.orderBy ?? {}) : void 0,
-		limit: filterA?.limit || filterB?.limit ? Math.min(filterA?.limit ?? Infinity, filterB?.limit ?? Infinity) : void 0,
-		offset: filterA?.offset || filterB?.offset ? Math.min(filterA?.offset ?? Infinity, filterB?.offset ?? Infinity) : void 0,
+		limit: mode === "OR" ? filterA?.limit === void 0 || filterB?.limit === void 0 ? void 0 : Math.max(filterA.limit, filterB.limit) : filterA?.limit || filterB?.limit ? Math.min(filterA?.limit ?? Infinity, filterB?.limit ?? Infinity) : void 0,
+		offset: mode === "OR" ? filterA?.offset === void 0 || filterB?.offset === void 0 ? void 0 : Math.min(filterA.offset, filterB.offset) : filterA?.offset || filterB?.offset ? Math.min(filterA?.offset ?? Infinity, filterB?.offset ?? Infinity) : void 0,
 		with: filterA?.with || filterB?.with ? (0, es_toolkit.toMerged)(filterA?.with ?? {}, filterB?.with ?? {}) : void 0
 	};
 }
@@ -380,11 +380,13 @@ const createAbilityBuilder = ({ db, actions, defaultLimit, otel }) => {
 			allow: (action) => {
 				if (hasBeenBuilt) throw new RumbleError("You can't call allow() after the ability builder has been built. Please ensure that you register all abilities before accessing them.");
 				const actions = Array.isArray(action) ? action : [action];
+				const setUnrestrictedByThisCall = /* @__PURE__ */ new Set();
 				for (const action of actions) {
 					let filters = queryFilters.get(action);
 					if (!filters) {
 						filters = "unrestricted";
 						queryFilters.set(action, filters);
+						setUnrestrictedByThisCall.add(action);
 					}
 				}
 				return { 
@@ -401,7 +403,8 @@ const createAbilityBuilder = ({ db, actions, defaultLimit, otel }) => {
 				*/
 when: (queryFilter) => {
 					for (const action of actions) {
-						if (queryFilters.get(action) === "unrestricted") queryFilters.set(action, []);
+						if (queryFilters.get(action) === "unrestricted") if (setUnrestrictedByThisCall.has(action)) queryFilters.set(action, []);
+						else continue;
 						queryFilters.get(action).push(queryFilter);
 					}
 				} };
@@ -649,8 +652,8 @@ by: (explicitFilter) => {
 									return transformToResponse(blockEverythingFilter);
 								}
 								const mergedFilters = allQueryFilters.length === 1 ? allQueryFilters[0] : allQueryFilters.reduce((a, b) => {
-									return mergeFilters(a, b);
-								}, {});
+									return mergeFilters(a, b, "OR");
+								});
 								span?.setAttribute("abilities.status", "applied");
 								return transformToResponse(mergedFilters);
 							};