@rpcbase/server 0.531.0 → 0.532.0

package/dist/index.js

@@ -1,5 +1,5 @@
 import { n as __commonJSMin, r as __toESM, t as sendEmail } from "./email-Dzauaq11.js";
-import { a as normalizeRtsQueryOptions, c as runRtsQuery, i as isRtsRequestAuthorized, l as getDerivedKey, r as buildRtsAbilityFromRequest, s as resolveRtsRequestTenantId } from "./queryExecutor-DYVlCvns.js";
+import { a as normalizeRtsQueryOptions, c as runRtsCount, i as isRtsRequestAuthorized, l as runRtsQuery, r as buildRtsAbilityFromRequest, s as resolveRtsRequestTenantId, u as getDerivedKey } from "./queryExecutor-JadZcQSQ.js";
 import session from "express-session";
 import { RedisStore } from "connect-redis";
 import MongoStore from "connect-mongo";
@@ -4611,9 +4611,11 @@ var createRtsSsrCollector = (req, opts) => {
 	const maxDocsPerQuery = typeof opts?.maxDocsPerQuery === "number" && opts.maxDocsPerQuery > 0 ? Math.floor(opts.maxDocsPerQuery) : DEFAULT_MAX_DOCS_PER_QUERY;
 	const maxSerializedBytes = typeof opts?.maxSerializedBytes === "number" && opts.maxSerializedBytes > 0 ? Math.floor(opts.maxSerializedBytes) : DEFAULT_MAX_SERIALIZED_BYTES;
 	const registrations = /* @__PURE__ */ new Map();
+	const countRegistrations = /* @__PURE__ */ new Map();
 	const resolved = /* @__PURE__ */ new Map();
 	const resolvedPageInfo = /* @__PURE__ */ new Map();
 	const resolvedTotalCount = /* @__PURE__ */ new Map();
+	const resolvedCounts = /* @__PURE__ */ new Map();
 	const runtime = {
 		registerQuery(query) {
 			const modelName = typeof query.modelName === "string" ? query.modelName.trim() : "";
@@ -4621,7 +4623,7 @@ var createRtsSsrCollector = (req, opts) => {
 			if (!modelName || !queryKey) return;
 			const key = makeRegistrationKey(modelName, queryKey);
 			if (registrations.has(key)) return;
-			if (registrations.size >= maxQueries) return;
+			if (registrations.size + countRegistrations.size >= maxQueries) return;
 			registrations.set(key, {
 				modelName,
 				queryKey,
@@ -4629,6 +4631,20 @@ var createRtsSsrCollector = (req, opts) => {
 				options: query.options ?? {}
 			});
 		},
+		registerCount(query) {
+			const modelName = typeof query.modelName === "string" ? query.modelName.trim() : "";
+			const queryKey = typeof query.queryKey === "string" ? query.queryKey.trim() : "";
+			if (!modelName || !queryKey) return;
+			const key = makeRegistrationKey(modelName, queryKey);
+			if (countRegistrations.has(key)) return;
+			if (registrations.size + countRegistrations.size >= maxQueries) return;
+			countRegistrations.set(key, {
+				modelName,
+				queryKey,
+				query: query.query ?? {},
+				options: query.options ?? {}
+			});
+		},
 		getQueryData(modelName, queryKey) {
 			return resolved.get(makeRegistrationKey(modelName, queryKey));
 		},
@@ -4637,15 +4653,19 @@ var createRtsSsrCollector = (req, opts) => {
 		},
 		getQueryTotalCount(modelName, queryKey) {
 			return resolvedTotalCount.get(makeRegistrationKey(modelName, queryKey));
+		},
+		getCount(modelName, queryKey) {
+			return resolvedCounts.get(makeRegistrationKey(modelName, queryKey));
 		}
 	};
 	const resolve = async () => {
-		if (!registrations.size) return null;
+		if (!registrations.size && !countRegistrations.size) return null;
 		const tenantId = resolveRtsRequestTenantId(req);
 		if (!tenantId) return null;
 		if (hasSessionUser(req) && !isRtsRequestAuthorized(req, tenantId)) return null;
 		const { ability, userId } = await buildRtsAbilityFromRequest(req, tenantId);
 		const queryEntries = [];
+		const countEntries = [];
 		for (const registration of registrations.values()) {
 			const options = normalizeRtsQueryOptions(registration.options);
 			try {
@@ -4668,12 +4688,28 @@ var createRtsSsrCollector = (req, opts) => {
 				continue;
 			}
 		}
-		if (!queryEntries.length) return null;
+		for (const registration of countRegistrations.values()) try {
+			const count = await runRtsCount({
+				tenantId,
+				ability,
+				modelName: registration.modelName,
+				query: registration.query
+			});
+			countEntries.push({
+				modelName: registration.modelName,
+				queryKey: registration.queryKey,
+				count
+			});
+		} catch {
+			continue;
+		}
+		if (!queryEntries.length && !countEntries.length) return null;
 		const payload = {
 			v: 1,
 			tenantId,
 			uid: userId,
-			queries: []
+			queries: [],
+			counts: []
 		};
 		for (const entry of queryEntries) {
 			payload.queries.push(entry);
@@ -4682,19 +4718,28 @@ var createRtsSsrCollector = (req, opts) => {
 				break;
 			}
 		}
+		for (const entry of countEntries) {
+			payload.counts.push(entry);
+			if (Buffer.byteLength(JSON.stringify(payload), "utf8") > maxSerializedBytes) {
+				payload.counts.pop();
+				break;
+			}
+		}
 		const serializedPayload = toSerializedHydrationPayload(payload);
-		if (!serializedPayload?.queries.length) return null;
+		if (!serializedPayload || !serializedPayload.queries.length && !serializedPayload.counts.length) return null;
 		resolved.clear();
 		resolvedPageInfo.clear();
 		resolvedTotalCount.clear();
+		resolvedCounts.clear();
 		for (const entry of serializedPayload.queries) {
 			resolved.set(makeRegistrationKey(entry.modelName, entry.queryKey), entry.data);
 			resolvedPageInfo.set(makeRegistrationKey(entry.modelName, entry.queryKey), entry.pageInfo);
 			resolvedTotalCount.set(makeRegistrationKey(entry.modelName, entry.queryKey), entry.totalCount);
 		}
+		for (const entry of serializedPayload.counts) resolvedCounts.set(makeRegistrationKey(entry.modelName, entry.queryKey), entry.count);
 		return serializedPayload;
 	};
-	const hasRegistrations = () => registrations.size > 0;
+	const hasRegistrations = () => registrations.size > 0 || countRegistrations.size > 0;
 	return {
 		runtime,
 		hasRegistrations,