@m1212e/rumble 0.23.2 → 0.23.5

package/out/index.cjs

@@ -27,7 +27,6 @@ let graphql = require("graphql");
 let _escape_tech_graphql_armor = require("@escape.tech/graphql-armor");
 let _graphql_yoga_plugin_disable_introspection = require("@graphql-yoga/plugin-disable-introspection");
 let _opentelemetry_api = require("@opentelemetry/api");
-let _pothos_tracing_opentelemetry = require("@pothos/tracing-opentelemetry");
 let es_toolkit = require("es-toolkit");
 let graphql_yoga = require("graphql-yoga");
 let drizzle_orm = require("drizzle-orm");
@@ -36,6 +35,7 @@ let drizzle_orm_pg_core = require("drizzle-orm/pg-core");
 let drizzle_orm_mysql_core = require("drizzle-orm/mysql-core");
 let pluralize = require("pluralize");
 pluralize = __toESM(pluralize, 1);
+let _pothos_tracing_opentelemetry = require("@pothos/tracing-opentelemetry");
 let drizzle_orm_sqlite_core = require("drizzle-orm/sqlite-core");
 let _pothos_core = require("@pothos/core");
 _pothos_core = __toESM(_pothos_core, 1);
@@ -208,12 +208,25 @@ function mapNullFieldsToUndefined(obj) {
 }
 //#endregion
 //#region package.json
-var version = "0.23.2";
+var version = "0.23.5";
 //#endregion
 //#region lib/helpers/mergeFilters.ts
+const EmptyFilter$1 = Symbol.for("drizzle:EmptyFilter");
+/**
+* Normalizes drizzle-orm's `EmptyFilter` sentinel to `undefined` so it's
+* treated as "no filter" rather than a real filter value to combine with
+* AND/OR — otherwise merging an unrestricted (EmptyFilter) base filter with
+* a real `where` would needlessly wrap it as `{ AND: [EmptyFilter, where] }`
+* instead of just `where`.
+*/
+function realWhere(where) {
+	return where === EmptyFilter$1 ? void 0 : where;
+}
 function mergeFilters(filterA, filterB, mode = "AND") {
+	const filterAWhere = realWhere(filterA?.where);
+	const filterBWhere = realWhere(filterB?.where);
 	return {
-		where: filterA?.where && filterB?.where ? mode === "OR" ? { OR: [filterA.where, filterB.where] } : { AND: [filterA.where, filterB.where] } : filterA?.where ?? filterB?.where,
+		where: filterAWhere && filterBWhere ? mode === "OR" ? { OR: [filterAWhere, filterBWhere] } : { AND: [filterAWhere, filterBWhere] } : filterAWhere ?? filterBWhere,
 		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;
@@ -440,6 +453,21 @@ 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";
 }
@@ -608,7 +636,7 @@ by: (explicitFilter) => {
 									*/
 									single: {
 										extras: filters?.extras,
-										where: filters?.where,
+										where: filters?.where ?? EmptyFilter,
 										columns: filters?.columns
 									},
 									/**
@@ -616,7 +644,7 @@ by: (explicitFilter) => {
 									*/
 									many: {
 										extras: filters?.extras,
-										where: filters?.where,
+										where: filters?.where ?? EmptyFilter,
 										columns: filters?.columns,
 										get limit() {
 											return limit();
@@ -662,14 +690,14 @@ by: (explicitFilter) => {
 									*/
 									single: {
 										extras: filters?.extras,
-										where: filters?.where
+										where: filters?.where ?? EmptyFilter
 									},
 									/**
 									* For find many calls
 									*/
 									many: {
 										extras: filters?.extras,
-										where: filters?.where,
+										where: filters?.where ?? EmptyFilter,
 										get limit() {
 											return limit();
 										}
@@ -1300,6 +1328,165 @@ const sofaOpenAPIWebhookDocs = {
 	} }
 };
 //#endregion
+//#region lib/helpers/tracing.ts
+function isAsyncIterable(value) {
+	return typeof value === "object" && value !== null && Symbol.asyncIterator in value;
+}
+async function* wrapSubscriptionIterator(iterator, log, operationName) {
+	let eventCount = 0;
+	try {
+		for await (const event of iterator) {
+			eventCount++;
+			if (event.errors?.length) log.error({
+				"graphql.operation.name": operationName,
+				eventCount,
+				errors: event.errors.map((e) => e.message)
+			}, "graphql subscription event error");
+			yield event;
+		}
+		log.info({
+			"graphql.operation.name": operationName,
+			eventCount
+		}, "graphql subscription completed");
+	} catch (error) {
+		log.error({
+			"graphql.operation.name": operationName,
+			eventCount,
+			err: error
+		}, "graphql subscription threw");
+		throw error;
+	}
+}
+function buildTracedExecute(executeFn, rumbleInput) {
+	return async (options) => {
+		let log = rumbleInput.logger?.enabled ? rumbleInput.logger.logger : void 0;
+		const operationName = options.operationName ?? "anonymous";
+		const start = Date.now();
+		log?.info({ "graphql.operation.name": operationName }, "graphql execute start");
+		const run = async () => {
+			const result = await executeFn(options);
+			if (result && "errors" in result && result.errors?.length) log?.error({
+				"graphql.operation.name": operationName,
+				durationMs: Date.now() - start,
+				errors: result.errors.map((e) => e.message)
+			}, "graphql execute completed with errors");
+			else log?.info({
+				"graphql.operation.name": operationName,
+				durationMs: Date.now() - start
+			}, "graphql execute completed");
+			return result;
+		};
+		if (rumbleInput.otel?.enabled) return rumbleInput.otel.tracer.startActiveSpan(_pothos_tracing_opentelemetry.SpanNames.EXECUTE, { attributes: {
+			[_pothos_tracing_opentelemetry.AttributeNames.OPERATION_NAME]: operationName,
+			[_pothos_tracing_opentelemetry.AttributeNames.SOURCE]: options.document
+		} }, async (span) => {
+			if (log && rumbleInput.logger?.injectTraceId !== false) {
+				const { traceId, spanId } = span.spanContext();
+				log = log.child({
+					traceId,
+					spanId
+				});
+			}
+			try {
+				const result = await run();
+				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);
+				log?.error({
+					"graphql.operation.name": operationName,
+					durationMs: Date.now() - start,
+					err: error
+				}, "graphql execute threw");
+				span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
+				throw error;
+			} finally {
+				span.end();
+			}
+		});
+		try {
+			return await run();
+		} catch (error) {
+			log?.error({
+				"graphql.operation.name": operationName,
+				durationMs: Date.now() - start,
+				err: error
+			}, "graphql execute threw");
+			throw error;
+		}
+	};
+}
+function buildTracedSubscribe(subscribeFn, rumbleInput) {
+	return async (options) => {
+		let log = rumbleInput.logger?.enabled ? rumbleInput.logger.logger : void 0;
+		const operationName = options.operationName ?? "anonymous";
+		const start = Date.now();
+		const doSubscribe = async () => {
+			log?.info({ "graphql.operation.name": operationName }, "graphql subscribe start");
+			const result = await subscribeFn(options);
+			if (!isAsyncIterable(result)) {
+				const execResult = result;
+				if (execResult.errors?.length) log?.error({
+					"graphql.operation.name": operationName,
+					durationMs: Date.now() - start,
+					errors: execResult.errors.map((e) => e.message)
+				}, "graphql subscribe completed with errors");
+				return execResult;
+			}
+			log?.info({
+				"graphql.operation.name": operationName,
+				durationMs: Date.now() - start
+			}, "graphql subscription established");
+			if (log) return wrapSubscriptionIterator(result, log, operationName);
+			return result;
+		};
+		if (rumbleInput.otel?.enabled) return rumbleInput.otel.tracer.startActiveSpan("graphql.subscribe", async (span) => {
+			if (log && rumbleInput.logger?.injectTraceId !== false) {
+				const { traceId, spanId } = span.spanContext();
+				log = log.child({
+					traceId,
+					spanId
+				});
+			}
+			try {
+				const result = await doSubscribe();
+				if (!isAsyncIterable(result)) {
+					const execResult = result;
+					if (execResult.errors?.length) {
+						for (const error of execResult.errors) span.recordException(error);
+						span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
+					}
+				}
+				return result;
+			} catch (error) {
+				if (error instanceof Error) span.recordException(error);
+				log?.error({
+					"graphql.operation.name": operationName,
+					durationMs: Date.now() - start,
+					err: error
+				}, "graphql subscribe threw");
+				span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
+				throw error;
+			} finally {
+				span.end();
+			}
+		});
+		try {
+			return await doSubscribe();
+		} catch (error) {
+			log?.error({
+				"graphql.operation.name": operationName,
+				durationMs: Date.now() - start,
+				err: error
+			}, "graphql subscribe threw");
+			throw error;
+		}
+	};
+}
+//#endregion
 //#region lib/helpers/sqlTypes/mapDrizzleTypeToGraphQlType.ts
 function buildPothosResponseTypeFromGraphQLType({ builder, sqlType, fieldName, nullable, isArray }) {
 	const gqlType = mapSQLTypeToGraphQLType({
@@ -2337,59 +2524,7 @@ export const r = rumble({
 				...args?.plugins ?? [],
 				...enableApiDocs ? [] : [(0, _graphql_yoga_plugin_disable_introspection.useDisableIntrospection)(), (0, _escape_tech_graphql_armor.EnvelopArmorPlugin)(args?.armorConfig)],
 				rumbleInput.otel?.enabled || rumbleInput.logger?.enabled ? { onExecute: ({ setExecuteFn, executeFn }) => {
-					setExecuteFn(async (options) => {
-						const log = rumbleInput.logger?.enabled ? rumbleInput.logger.logger : void 0;
-						const operationName = options.operationName ?? "anonymous";
-						const start = Date.now();
-						log?.info({ "graphql.operation.name": operationName }, "graphql execute start");
-						const run = async () => {
-							const result = await executeFn(options);
-							if (result && "errors" in result && result.errors?.length) log?.error({
-								"graphql.operation.name": operationName,
-								durationMs: Date.now() - start,
-								errors: result.errors.map((e) => e.message)
-							}, "graphql execute completed with errors");
-							else log?.info({
-								"graphql.operation.name": operationName,
-								durationMs: Date.now() - start
-							}, "graphql execute completed");
-							return result;
-						};
-						if (rumbleInput.otel?.enabled) return rumbleInput.otel.tracer.startActiveSpan(_pothos_tracing_opentelemetry.SpanNames.EXECUTE, { attributes: {
-							[_pothos_tracing_opentelemetry.AttributeNames.OPERATION_NAME]: operationName,
-							[_pothos_tracing_opentelemetry.AttributeNames.SOURCE]: options.document
-						} }, async (span) => {
-							try {
-								const result = await run();
-								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);
-								log?.error({
-									"graphql.operation.name": operationName,
-									durationMs: Date.now() - start,
-									err: error
-								}, "graphql execute threw");
-								span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
-								throw error;
-							} finally {
-								span.end();
-							}
-						});
-						try {
-							return await run();
-						} catch (error) {
-							log?.error({
-								"graphql.operation.name": operationName,
-								durationMs: Date.now() - start,
-								err: error
-							}, "graphql execute threw");
-							throw error;
-						}
-					});
+					setExecuteFn(buildTracedExecute(executeFn, rumbleInput));
 				} } : false
 			].filter(Boolean)
 		});
@@ -2410,6 +2545,8 @@ export const r = rumble({
 			...args,
 			schema: builtSchema(),
 			context,
+			execute: buildTracedExecute(args.execute ?? graphql.execute, rumbleInput),
+			subscribe: buildTracedSubscribe(args.subscribe ?? graphql.subscribe, rumbleInput),
 			errorHandler(errors) {
 				const span = _opentelemetry_api.trace.getActiveSpan();
 				for (const error of errors) span?.recordException(error);
@@ -2422,7 +2559,9 @@ export const r = rumble({
 		return implementation({
 			...args,
 			schema: builtSchema(),
-			context
+			context,
+			execute: buildTracedExecute(args.execute ?? graphql.execute, rumbleInput),
+			subscribe: buildTracedSubscribe(args.subscribe ?? graphql.subscribe, rumbleInput)
 		}, ...rest);
 	};
 	return {