@m1212e/rumble 0.23.11 → 0.23.14

package/out/index.mjs

@@ -18,6 +18,7 @@ import DrizzlePlugin from "@pothos/plugin-drizzle";
 import SmartSubscriptionsPlugin, { subscribeOptionsFromIterator } from "@pothos/plugin-smart-subscriptions";
 import TracingPlugin, { isRootField, wrapResolver } from "@pothos/plugin-tracing";
 import { BigIntResolver, ByteResolver, DateResolver, DateTimeISOResolver, JSONResolver } from "graphql-scalars";
+import DataLoader from "dataloader";
 //#region lib/types/rumbleError.ts
 /**
 * An error that gets raised by rumble whenever something does not go according to plan.
@@ -180,7 +181,7 @@ function mapNullFieldsToUndefined(obj) {
 }
 //#endregion
 //#region package.json
-var version = "0.23.11";
+var version = "0.23.14";
 //#endregion
 //#region lib/helpers/mergeFilters.ts
 const EmptyFilter$1 = Symbol.for("drizzle:EmptyFilter");
@@ -390,6 +391,7 @@ function buildIndex(db) {
 			columns,
 			primaryKey,
 			relations: entry.relations ?? {},
+			isTable: isTable(tableObj),
 			foundRelation: entry
 		};
 		byTsName.set(resolved.name, resolved);
@@ -434,6 +436,7 @@ function tableHelper({ db, table }) {
 		dbName: entry.dbName,
 		tsName: entry.name,
 		table: entry.table,
+		isTable: entry.isTable,
 		foundRelation: entry.foundRelation
 	};
 }
@@ -456,6 +459,10 @@ const makeNothingRegisteredWarner = (logger) => debounce((model, action) => {
 const createAbilityBuilder = ({ db, actions, defaultLimit, otel, logger: loggerConfig }) => {
 	const log = loggerConfig?.enabled ? loggerConfig.logger : void 0;
 	const nothingRegisteredWarningLogger = makeNothingRegisteredWarner(log);
+	const tableRelationNames = Object.keys(db.query).filter((name) => tableHelper({
+		db,
+		table: name
+	}).isTable);
 	let hasBeenBuilt = false;
 	const createBuilderForTable = () => {
 		const queryFilters = /* @__PURE__ */ new Map();
@@ -541,7 +548,7 @@ by: (explicitFilter) => {
 			}
 		};
 	};
-	const buildersPerTable = Object.fromEntries(Object.keys(db.query).map((tableName) => [tableName, createBuilderForTable()]));
+	const buildersPerTable = Object.fromEntries(tableRelationNames.map((tableName) => [tableName, createBuilderForTable()]));
 	return {
 		...buildersPerTable,
 		/**
@@ -569,7 +576,7 @@ by: (explicitFilter) => {
 						db,
 						table: tableName
 					});
-					if (Object.keys(tableSchema.primaryKey).length === 0) throw new RumbleError(`No primary key found for entity ${tableName.toString()}`);
+					if (Object.keys(tableSchema.primaryKey).length === 0) throw new RumbleError(`No primary key found for entity ${String(tableName)}`);
 					const primaryKeyField = Object.values(tableSchema.primaryKey)[0];
 					const distinctValues = createDistinctValuesFromSQLType(primaryKeyField.getSQLType());
 					const blockEverythingFilter = { where: { AND: [{ [primaryKeyField.name]: distinctValues.value1 }, { [primaryKeyField.name]: distinctValues.value2 }] } };
@@ -719,7 +726,7 @@ by: (explicitFilter) => {
 								}
 								if (!filters) {
 									span?.setAttribute("abilities.status", "blocked_everything");
-									nothingRegisteredWarningLogger(tableName.toString(), action);
+									nothingRegisteredWarningLogger(String(tableName), action);
 									return transformToResponse(blockEverythingFilter);
 								}
 								const dynamicResults = new Array(dynamicQueryFilters[action].length);
@@ -748,10 +755,10 @@ by: (explicitFilter) => {
 							};
 							if (otel?.enabled && otel.tracer) return otel.tracer.startActiveSpan(`rumble.abilities.prepare`, (span) => {
 								span.setAttribute("rumble.action", action);
-								span.setAttribute("rumble.table", tableName.toString());
+								span.setAttribute("rumble.table", String(tableName));
 								try {
 									const attrs = {
-										"rumble.table": tableName.toString(),
+										"rumble.table": String(tableName),
 										"rumble.action": action
 									};
 									const proxy = new Proxy(span, { get(target, prop) {
@@ -770,7 +777,7 @@ by: (explicitFilter) => {
 							});
 							else {
 								const attrs = {
-									"rumble.table": tableName.toString(),
+									"rumble.table": String(tableName),
 									"rumble.action": action
 								};
 								const result = assembleAbilities(log ? { setAttribute: (k, v) => {
@@ -782,10 +789,10 @@ by: (explicitFilter) => {
 						} };
 					} };
 				};
-				const abilitiesPerTable = Object.fromEntries(Object.keys(db.query).map((tableName) => [tableName, createFilterForTable(tableName)]));
+				const abilitiesPerTable = Object.fromEntries(tableRelationNames.map((tableName) => [tableName, createFilterForTable(tableName)]));
 				hasBeenBuilt = true;
 				return (ctx) => {
-					return Object.fromEntries(Object.keys(abilitiesPerTable).map((tableName) => [tableName, abilitiesPerTable[tableName].withContext(ctx)]));
+					return Object.fromEntries(tableRelationNames.map((tableName) => [tableName, abilitiesPerTable[tableName].withContext(ctx)]));
 				};
 			}
 		}
@@ -1191,11 +1198,11 @@ const createCountQueryImplementer = ({ db, schemaBuilder, whereArgImplementer, m
 			table
 		});
 		return schemaBuilder.queryFields((t) => {
-			return { [`${pluralize.plural(table.toString())}Count`]: t.field({
+			return { [`${pluralize.plural(String(table))}Count`]: t.field({
 				type: "Int",
 				nullable: false,
 				smartSubscription: true,
-				description: `Count all ${pluralize.plural(table.toString())}`,
+				description: `Count all ${pluralize.plural(String(table))}`,
 				subscribe: (subscriptions, _root, _args, _ctx, _info) => {
 					registerOnInstance({
 						instance: subscriptions,
@@ -1662,20 +1669,20 @@ const createObjectImplementer = ({ db, search, logger: loggerConfig, schemaBuild
 		});
 		if (Object.keys(tableSchema.primaryKey).length === 0) {
 			const log = loggerConfig?.enabled ? loggerConfig.logger : void 0;
-			const msg = `Could not find primary key for ${table.toString()}. Cannot register subscriptions!`;
-			log ? log.warn({ "rumble.table": table.toString() }, msg) : console.warn(msg);
+			const msg = `Could not find primary key for ${String(table)}. Cannot register subscriptions!`;
+			log ? log.warn({ "rumble.table": String(table) }, msg) : console.warn(msg);
 		}
 		const primaryKey = Object.values(tableSchema.primaryKey)[0];
 		const { registerOnInstance } = makePubSubInstance({ table });
 		return schemaBuilder.drizzleObject(table, {
-			name: refName ?? capitalize(table.toString()),
+			name: refName ?? capitalize(String(table)),
 			subscribe: (subscriptions, element, _context) => {
 				if (!primaryKey) return;
 				const primaryKeyValue = element[primaryKey.name];
 				if (!primaryKeyValue) {
 					const log = loggerConfig?.enabled ? loggerConfig.logger : void 0;
-					const msg = `Could not find primary key value for element on ${table.toString()}. Cannot register subscription!`;
-					log ? log.warn({ "rumble.table": table.toString() }, msg) : console.warn(msg);
+					const msg = `Could not find primary key value for element on ${String(table)}. Cannot register subscription!`;
+					log ? log.warn({ "rumble.table": String(table) }, msg) : console.warn(msg);
 					return;
 				}
 				registerOnInstance({
@@ -1921,10 +1928,10 @@ const createQueryImplementer = ({ db, schemaBuilder, search, logger: loggerConfi
 		});
 		const primaryKeyField = Object.values(tableSchema.primaryKey)[0];
 		const { registerOnInstance } = makePubSubInstance({ table });
-		const pluralName = pluralize.plural(table.toString());
-		const singularName = pluralize.singular(table.toString());
+		const pluralName = pluralize.plural(String(table));
+		const singularName = pluralize.singular(String(table));
 		for (const name of [pluralName, singularName]) {
-			if (registeredQueryFieldNames.has(name)) throw new RumbleError(`Duplicate query field "${name}": the table "${table.toString()}" generates a query field that collides with one already registered. Use unique table names (or refNames) to avoid plural/singular collisions (e.g. "post" and "posts").`);
+			if (registeredQueryFieldNames.has(name)) throw new RumbleError(`Duplicate query field "${name}": the table "${String(table)}" generates a query field that collides with one already registered. Use unique table names (or refNames) to avoid plural/singular collisions (e.g. "post" and "posts").`);
 			registeredQueryFieldNames.add(name);
 		}
 		return schemaBuilder.queryFields((t) => {
@@ -2275,6 +2282,30 @@ var RuntimeFiltersPlugin = class extends BasePlugin {
 	tracer;
 	tracerEnabled;
 	logger;
+	filterLoaders = /* @__PURE__ */ new WeakMap();
+	getLoader(context, filter) {
+		let perContext = this.filterLoaders.get(context);
+		if (!perContext) {
+			perContext = /* @__PURE__ */ new Map();
+			this.filterLoaders.set(context, perContext);
+		}
+		let loader = perContext.get(filter);
+		if (!loader) {
+			const prefetchPromise = filter.prefetch ? filter.prefetch({ context }) : void 0;
+			loader = new DataLoader(async (entities) => {
+				const prefetched = prefetchPromise ? await prefetchPromise : void 0;
+				const allowed = await filter.filter({
+					context,
+					entities,
+					prefetched
+				});
+				const allowedSet = new Set(allowed);
+				return entities.map((entity) => allowedSet.has(entity) ? entity : null);
+			}, { cache: false });
+			perContext.set(filter, loader);
+		}
+		return loader;
+	}
 	onTypeConfig(typeConfig) {
 		this.tracer = this.builder.options.otel?.tracer;
 		this.tracerEnabled = this.builder.options.otel?.enabled;
@@ -2291,44 +2322,20 @@ var RuntimeFiltersPlugin = class extends BasePlugin {
 			const runFilters = async (span) => {
 				const allFilters = Array.isArray(filters) ? filters : [filters];
 				span?.setAttribute("filters.total", allFilters.length);
-				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
-						});
+				const loaders = allFilters.map((filter) => this.getLoader(context, filter));
+				let resolved;
+				if (this.tracer && this.tracerEnabled) resolved = await this.tracer.startActiveSpan(`rumble.filter.resolve`, async (span) => {
+					span.setAttribute("graphql.field.name", fieldConfig.name);
+					try {
+						return await resolver(parent, args, context, info);
+					} finally {
+						span.end();
 					}
-					return ({ context, entities }) => filter.filter({
-						context,
-						entities
-					});
-				}));
-				let resolved, prefetchedFilters;
-				if (this.tracer && this.tracerEnabled) {
-					const o = await this.tracer.startActiveSpan(`rumble.filter.resolve`, async (span) => {
-						span.setAttribute("graphql.field.name", fieldConfig.name);
-						try {
-							return await Promise.all([resolver(parent, args, context, info), prefetchedFiltersPromises]);
-						} finally {
-							span.end();
-						}
-					});
-					resolved = o[0];
-					prefetchedFilters = o[1];
-				} else {
-					const o = await Promise.all([resolver(parent, args, context, info), prefetchedFiltersPromises]);
-					resolved = o[0];
-					prefetchedFilters = o[1];
-				}
-				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()));
+				});
+				else resolved = await resolver(parent, args, context, info);
+				const entities = Array.isArray(resolved) ? resolved : [resolved];
+				const perFilterResults = await Promise.all(loaders.map((loader) => Promise.all(entities.map((entity) => loader.load(entity)))));
+				const allowed = entities.filter((_, index) => perFilterResults.some((results) => results[index] != null));
 				span?.setAttribute("filters.allowed", allowed.length);
 				this.logger?.debug({
 					"graphql.field.name": fieldConfig.name,