@mastra/pg 1.20.0-alpha.0 → 1.20.0-alpha.1

package/dist/index.js

@@ -9389,6 +9389,38 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 			throw mastraError;
 		}
 	}
+	/**
+	* Reads one page of messages together with the total row count.
+	*
+	* `COUNT(*) OVER ()` reports the count over the whole WHERE result on the same
+	* statement as the page, so the page costs one database round-trip instead of
+	* two. The page and the count also come from one snapshot, so the count always
+	* describes the returned rows. A separate `COUNT(*)` runs only when the page is
+	* empty and the caller asked for a page after the last row, because a window
+	* function has no row to carry the count on.
+	*/
+	async #fetchMessagePage({ selectStatement, tableName, whereClause, orderByStatement, queryParams, perPageInput, perPage, offset }) {
+		const limitClause = perPageInput === false ? "" : ` LIMIT $${queryParams.length + 1} OFFSET $${queryParams.length + 2}`;
+		const dataParams = perPageInput === false ? queryParams : [
+			...queryParams,
+			perPage,
+			offset
+		];
+		const rows = await this.#db.client.manyOrNone(`${selectStatement}, COUNT(*) OVER () AS "__total" FROM ${tableName} ${whereClause} ${orderByStatement}${limitClause}`, dataParams) || [];
+		if (rows.length > 0) return {
+			total: Number(rows[0].__total),
+			messages: rows
+		};
+		if (offset === 0) return {
+			total: 0,
+			messages: []
+		};
+		const countResult = await this.#db.client.one(`SELECT COUNT(*) FROM ${tableName} ${whereClause}`, queryParams);
+		return {
+			total: parseInt(countResult.count, 10),
+			messages: []
+		};
+	}
 	async listMessages(args) {
 		const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
 		const threadIds = (Array.isArray(threadId) ? threadId : [threadId]).filter((id) => typeof id === "string");
@@ -9463,23 +9495,27 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 					hasMore: false
 				};
 			}
+			let includeFailure;
+			const includePromise = include && include.length > 0 ? this._getIncludedMessages({ include }).catch((error) => {
+				includeFailure = error;
+				return null;
+			}) : null;
 			let total;
 			let messages;
 			if (metadataFilter) {
 				const filteredRows = (await this.#db.client.manyOrNone(`${selectStatement} FROM ${tableName} ${whereClause} ${orderByStatement}`, queryParams) || []).filter((row) => storageMessageMatchesMetadataFilter(row.content, metadataFilter));
 				total = filteredRows.length;
 				messages = perPageInput === false ? filteredRows : filteredRows.slice(offset, offset + perPage);
-			} else {
-				const countResult = await this.#db.client.one(`SELECT COUNT(*) FROM ${tableName} ${whereClause}`, queryParams);
-				total = parseInt(countResult.count, 10);
-				const limitValue = perPageInput === false ? total : perPage;
-				const dataQuery = `${selectStatement} FROM ${tableName} ${whereClause} ${orderByStatement} LIMIT $${paramIndex++} OFFSET $${paramIndex++}`;
-				messages = [...await this.#db.client.manyOrNone(dataQuery, [
-					...queryParams,
-					limitValue,
-					offset
-				]) || []];
-			}
+			} else ({total, messages} = await this.#fetchMessagePage({
+				selectStatement,
+				tableName,
+				whereClause,
+				orderByStatement,
+				queryParams,
+				perPageInput,
+				perPage,
+				offset
+			}));
 			const primaryPageCount = messages.length;
 			if (total === 0 && messages.length === 0 && (!include || include.length === 0)) return {
 				messages: [],
@@ -9490,7 +9526,8 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 			};
 			const messageIds = new Set(messages.map((m) => m.id));
 			if (include && include.length > 0) {
-				const includeMessages = await this._getIncludedMessages({ include });
+				const includeMessages = await includePromise;
+				if (includeFailure) throw includeFailure;
 				if (includeMessages) {
 					for (const includeMsg of includeMessages) if (!messageIds.has(includeMsg.id)) {
 						messages.push(includeMsg);
@@ -9598,23 +9635,27 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 					hasMore: false
 				};
 			}
+			let includeFailure;
+			const includePromise = include && include.length > 0 ? this._getIncludedMessages({ include }).catch((error) => {
+				includeFailure = error;
+				return null;
+			}) : null;
 			let total;
 			let messages;
 			if (metadataFilter) {
 				const filteredRows = (await this.#db.client.manyOrNone(`${selectStatement} FROM ${tableName} ${whereClause} ${orderByStatement}`, queryParams) || []).filter((row) => storageMessageMatchesMetadataFilter(row.content, metadataFilter));
 				total = filteredRows.length;
 				messages = perPageInput === false ? filteredRows : filteredRows.slice(offset, offset + perPage);
-			} else {
-				const countResult = await this.#db.client.one(`SELECT COUNT(*) FROM ${tableName} ${whereClause}`, queryParams);
-				total = parseInt(countResult.count, 10);
-				const limitValue = perPageInput === false ? total : perPage;
-				const dataQuery = `${selectStatement} FROM ${tableName} ${whereClause} ${orderByStatement} LIMIT $${paramIndex++} OFFSET $${paramIndex++}`;
-				messages = [...await this.#db.client.manyOrNone(dataQuery, [
-					...queryParams,
-					limitValue,
-					offset
-				]) || []];
-			}
+			} else ({total, messages} = await this.#fetchMessagePage({
+				selectStatement,
+				tableName,
+				whereClause,
+				orderByStatement,
+				queryParams,
+				perPageInput,
+				perPage,
+				offset
+			}));
 			if (total === 0 && messages.length === 0 && (!include || include.length === 0)) return {
 				messages: [],
 				total: 0,
@@ -9624,7 +9665,8 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 			};
 			const messageIds = new Set(messages.map((m) => m.id));
 			if (include && include.length > 0) {
-				const includeMessages = await this._getIncludedMessages({ include });
+				const includeMessages = await includePromise;
+				if (includeFailure) throw includeFailure;
 				if (includeMessages) {
 					for (const includeMsg of includeMessages) if (!messageIds.has(includeMsg.id)) {
 						messages.push(includeMsg);