@m1212e/rumble 0.16.23 → 0.16.27

package/README.md

@@ -113,7 +113,6 @@ const PostRef = schemaBuilder.drizzleObject("posts", {
 	fields: (t) => ({
 ...
 ```
-To apply filters in a custom handler implementation, like e.g. your mutations, you can use the `applyFilters` helper exported by rumble to easily filter a list of entities.
 
 ## Context & Configuration
 The `rumble` initiator offers various configuration options which you can pass. Most importantly, the `context` provider function which creates the request context that is passed to your abilities and resolvers.

package/out/index.cjs

@@ -218,7 +218,7 @@ function mapNullFieldsToUndefined(obj) {
 
 //#endregion
 //#region package.json
-var version = "0.16.23";
+var version = "0.16.27";
 
 //#endregion
 //#region lib/helpers/mergeFilters.ts
@@ -408,9 +408,19 @@ const createAbilityBuilder = ({ db, actions, defaultLimit, otel }) => {
 			},
 			filter: (action) => {
 				const actions = Array.isArray(action) ? action : [action];
-				return { by: (explicitFilter) => {
-					for (const action of actions) runtimeFilters.get(action).push(explicitFilter);
-				} };
+				return {
+					prefetch: (prefetch) => {
+						return { by: (explicitFilter) => {
+							for (const action of actions) runtimeFilters.get(action).push({
+								filter: explicitFilter,
+								prefetch
+							});
+						} };
+					},
+					by: (explicitFilter) => {
+						for (const action of actions) runtimeFilters.get(action).push({ filter: explicitFilter });
+					}
+				};
 			},
 			_: {
 				runtimeFilters,
@@ -461,7 +471,8 @@ const createAbilityBuilder = ({ db, actions, defaultLimit, otel }) => {
 								return limit ?? void 0;
 							});
 							const sqlTransformedWhere = require_lazy.lazy(() => {
-								return filters?.where ? (0, drizzle_orm.relationsFilterToSQL)(tableSchema.foundRelation.table, filters.where) : void 0;
+								const casing = db._.session?.dialect?.casing ?? new drizzle_orm_casing.CasingCache();
+								return filters?.where ? (0, drizzle_orm.relationsFilterToSQL)(tableSchema.foundRelation.table, filters.where, tableSchema.relations, db._.relations, casing) : void 0;
 							});
 							if (filters?.columns) return {
 								query: {
@@ -1432,31 +1443,6 @@ function implementDefaultWhereInputArgs(schemaBuilder) {
 //#region lib/runtimeFiltersPlugin/filterTypes.ts
 const pluginName = "RuntimeFiltersPlugin";
 
-//#endregion
-//#region lib/helpers/applyFilters.ts
-/**
-* A helper to apply a list of filters to a given list of entities.
-* 
-* @example
-* 
-* ```ts
-* const filtered = await applyFilters({
-filters: abilityBuilder.registeredFilters.posts.update,
-entities: entitiesToFilter,
-context: ctx,
-});
-* ```
-*/
-const applyFilters = async ({ filters, entities, context }) => {
-	return Array.from((await Promise.all(filters.map((f) => f({
-		context,
-		entities
-	})))).reduce((acc, val) => {
-		for (const element of val) acc.add(element);
-		return acc;
-	}, /* @__PURE__ */ new Set()));
-};
-
 //#endregion
 //#region lib/runtimeFiltersPlugin/runtimeFiltersPlugin.ts
 const applyFiltersKey = "applyFilters";
@@ -1476,15 +1462,30 @@ var RuntimeFiltersPlugin = class extends _pothos_core.BasePlugin {
 			else if (fieldType.kind === "Object") filters = fieldType.ref.currentConfig.pothosOptions[applyFiltersKey];
 			if (!filters || !Array.isArray(filters) || filters.length === 0) return resolver(parent, args, context, info);
 			const runFilters = async (span) => {
-				const resolved = await resolver(parent, args, context, info);
-				const allResolvedValues = Array.isArray(resolved) ? resolved : [resolved];
 				const allFilters = Array.isArray(filters) ? filters : [filters];
 				span?.setAttribute("filters.total", allFilters.length);
-				const allowed = await applyFilters({
-					filters: allFilters,
-					entities: allResolvedValues,
-					context
-				});
+				const prefetchedFiltersPromises = Promise.all(allFilters.map(async (filter) => {
+					if (filter.prefetch) {
+						const prefetched = await filter.prefetch({ context });
+						return ({ context, entities }) => filter.filter({
+							context,
+							entities,
+							prefetched
+						});
+					}
+					return ({ context, entities }) => filter.filter({
+						context,
+						entities
+					});
+				}));
+				const [resolved, prefetchedFilters] = await Promise.all([resolver(parent, args, context, info), prefetchedFiltersPromises]);
+				const allowed = Array.from((await Promise.all(prefetchedFilters.map((f) => f({
+					context,
+					entities: Array.isArray(resolved) ? resolved : [resolved]
+				})))).reduce((acc, val) => {
+					for (const element of val) acc.add(element);
+					return acc;
+				}, /* @__PURE__ */ new Set()));
 				span?.setAttribute("filters.allowed", allowed.length);
 				if (Array.isArray(resolved)) return allowed;
 				return allowed[0] ?? null;
@@ -1645,76 +1646,27 @@ export const db = drizzle(
 			plugins: [
 				...args?.plugins ?? [],
 				...enableApiDocs ? [] : [(0, _graphql_yoga_plugin_disable_introspection.useDisableIntrospection)(), (0, _escape_tech_graphql_armor.EnvelopArmorPlugin)()],
-				rumbleInput.otel?.enabled ? {
-					onExecute: ({ setExecuteFn, executeFn }) => {
-						setExecuteFn((options) => rumbleInput.otel.tracer.startActiveSpan(_pothos_tracing_opentelemetry.SpanNames.EXECUTE, { attributes: {
-							[_pothos_tracing_opentelemetry.AttributeNames.OPERATION_NAME]: options.operationName ?? "anonymous",
-							[_pothos_tracing_opentelemetry.AttributeNames.SOURCE]: options.document
-						} }, async (span) => {
-							try {
-								const result = await executeFn(options);
-								if (result && "errors" in result && result.errors?.length) {
-									for (const error of result.errors) span.recordException(error);
-									span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
-								}
-								return result;
-							} catch (error) {
-								if (error instanceof Error) span.recordException(error);
+				rumbleInput.otel?.enabled ? { onExecute: ({ setExecuteFn, executeFn }) => {
+					setExecuteFn((options) => rumbleInput.otel.tracer.startActiveSpan(_pothos_tracing_opentelemetry.SpanNames.EXECUTE, { attributes: {
+						[_pothos_tracing_opentelemetry.AttributeNames.OPERATION_NAME]: options.operationName ?? "anonymous",
+						[_pothos_tracing_opentelemetry.AttributeNames.SOURCE]: options.document
+					} }, async (span) => {
+						try {
+							const result = await executeFn(options);
+							if (result && "errors" in result && result.errors?.length) {
+								for (const error of result.errors) span.recordException(error);
 								span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
-								throw error;
-							} finally {
-								span.end();
 							}
-						}));
-					},
-					onParse: ({ setParseFn, parseFn }) => {
-						setParseFn((...args) => rumbleInput.otel.tracer.startActiveSpan(_pothos_tracing_opentelemetry.SpanNames.PARSE, (span) => {
-							try {
-								return parseFn(...args);
-							} catch (error) {
-								if (error instanceof Error) span.recordException(error);
-								span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
-								throw error;
-							} finally {
-								span.end();
-							}
-						}));
-					},
-					onValidate: ({ setValidationFn, validateFn }) => {
-						setValidationFn((...args) => rumbleInput.otel.tracer.startActiveSpan(_pothos_tracing_opentelemetry.SpanNames.VALIDATE, (span) => {
-							try {
-								const errors = validateFn(...args);
-								if (errors.length > 0) {
-									for (const error of errors) span.recordException(error);
-									span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
-								}
-								return errors;
-							} catch (error) {
-								if (error instanceof Error) span.recordException(error);
-								span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
-								throw error;
-							} finally {
-								span.end();
-							}
-						}));
-					},
-					onSubscribe: ({ setSubscribeFn, subscribeFn }) => {
-						setSubscribeFn((options) => rumbleInput.otel.tracer.startActiveSpan("graphql.subscribe", { attributes: {
-							[_pothos_tracing_opentelemetry.AttributeNames.OPERATION_NAME]: options.operationName ?? "anonymous",
-							[_pothos_tracing_opentelemetry.AttributeNames.SOURCE]: options.document
-						} }, async (span) => {
-							try {
-								return await subscribeFn(options);
-							} catch (error) {
-								if (error instanceof Error) span.recordException(error);
-								span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
-								throw error;
-							} finally {
-								span.end();
-							}
-						}));
-					}
-				} : false
+							return result;
+						} catch (error) {
+							if (error instanceof Error) span.recordException(error);
+							span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
+							throw error;
+						} finally {
+							span.end();
+						}
+					}));
+				} } : false
 			].filter(Boolean)
 		});
 	};