@mastra/pg 1.23.0 → 1.23.1-alpha.0

package/dist/index.js

@@ -11040,13 +11040,36 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 	* asked for a page after the last row, because there is then no row to carry the
 	* count on.
 	*/
-	async #fetchMessagePage({ selectStatement, tableName, whereClause, orderByStatement, queryParams, perPageInput, perPage, offset }) {
+	async #fetchMessagePage({ selectStatement, tableName, whereClause, orderByStatement, queryParams, perPageInput, perPage, offset, includeTotal = true }) {
+		if (includeTotal === false && perPageInput !== false) {
+			const peekLimit = perPage + 1;
+			const rows = await this.#db.readClient.manyOrNone(`${selectStatement} FROM ${tableName} ${whereClause} ${orderByStatement} LIMIT $${queryParams.length + 1} OFFSET $${queryParams.length + 2}`, [
+				...queryParams,
+				peekLimit,
+				offset
+			]) || [];
+			const hasMore = rows.length > perPage;
+			const messages = hasMore ? rows.slice(0, perPage) : rows;
+			return {
+				total: offset + messages.length,
+				messages,
+				hasMore
+			};
+		}
 		const limitClause = perPageInput === false ? "" : ` LIMIT $${queryParams.length + 1} OFFSET $${queryParams.length + 2}`;
 		const dataParams = perPageInput === false ? queryParams : [
 			...queryParams,
 			perPage,
 			offset
 		];
+		if (includeTotal === false) {
+			const rows = await this.#db.readClient.manyOrNone(`${selectStatement} FROM ${tableName} ${whereClause} ${orderByStatement}`, dataParams) || [];
+			return {
+				total: rows.length,
+				messages: rows,
+				hasMore: false
+			};
+		}
 		const rows = await this.#db.readClient.manyOrNone(`${selectStatement}, (SELECT COUNT(*) FROM ${tableName} ${whereClause}) AS "__total" FROM ${tableName} ${whereClause} ${orderByStatement}${limitClause}`, dataParams) || [];
 		if (rows.length > 0) return {
 			total: Number(rows[0].__total),
@@ -11063,7 +11086,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 		};
 	}
 	async listMessages(args) {
-		const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
+		const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy, includeTotal = true } = args;
 		const threadIds = (Array.isArray(threadId) ? threadId : [threadId]).filter((id) => typeof id === "string");
 		if (threadIds.length === 0 || threadIds.some((id) => !id.trim())) throw new MastraError({
 			id: createStorageErrorId("PG", "LIST_MESSAGES", "INVALID_THREAD_ID"),
@@ -11149,20 +11172,27 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 			}) : null;
 			let total;
 			let messages;
+			let peekedHasMore;
 			if (metadataFilter) {
 				const filteredRows = (await this.#db.readClient.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 ({total, messages} = await this.#fetchMessagePage({
-				selectStatement,
-				tableName,
-				whereClause,
-				orderByStatement,
-				queryParams,
-				perPageInput,
-				perPage,
-				offset
-			}));
+			} else {
+				const pageResult = await this.#fetchMessagePage({
+					selectStatement,
+					tableName,
+					whereClause,
+					orderByStatement,
+					queryParams,
+					perPageInput,
+					perPage,
+					offset,
+					includeTotal
+				});
+				total = pageResult.total;
+				messages = pageResult.messages;
+				peekedHasMore = pageResult.hasMore;
+			}
 			const primaryPageCount = messages.length;
 			if (total === 0 && messages.length === 0 && (!include || include.length === 0)) return {
 				messages: [],
@@ -11187,7 +11217,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 			const finalMessages = this._sortMessages(list.get.all.db(), field, direction);
 			const threadIdSet = new Set(threadIds);
 			const allThreadMessagesReturned = new Set(finalMessages.filter((m) => m.threadId && threadIdSet.has(m.threadId)).map((m) => m.id)).size >= total;
-			const hasMore = metadataFilter ? perPageInput !== false && offset + primaryPageCount < total : perPageInput !== false && !allThreadMessagesReturned && offset + perPage < total;
+			const hasMore = peekedHasMore !== void 0 ? peekedHasMore : metadataFilter ? perPageInput !== false && offset + primaryPageCount < total : perPageInput !== false && !allThreadMessagesReturned && offset + perPage < total;
 			return {
 				messages: finalMessages,
 				total,
@@ -11212,7 +11242,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 		}
 	}
 	async listMessagesByResourceId(args) {
-		const { resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
+		const { resourceId, include, filter, perPage: perPageInput, page = 0, orderBy, includeTotal = true } = args;
 		if (!(resourceId !== void 0 && resourceId !== null && resourceId.trim() !== "")) throw new MastraError({
 			id: createStorageErrorId("PG", "LIST_MESSAGES_BY_RESOURCE_ID", "INVALID_QUERY"),
 			domain: ErrorDomain.STORAGE,
@@ -11295,20 +11325,27 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 			}) : null;
 			let total;
 			let messages;
+			let peekedHasMore;
 			if (metadataFilter) {
 				const filteredRows = (await this.#db.readClient.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 ({total, messages} = await this.#fetchMessagePage({
-				selectStatement,
-				tableName,
-				whereClause,
-				orderByStatement,
-				queryParams,
-				perPageInput,
-				perPage,
-				offset
-			}));
+			} else {
+				const pageResult = await this.#fetchMessagePage({
+					selectStatement,
+					tableName,
+					whereClause,
+					orderByStatement,
+					queryParams,
+					perPageInput,
+					perPage,
+					offset,
+					includeTotal
+				});
+				total = pageResult.total;
+				messages = pageResult.messages;
+				peekedHasMore = pageResult.hasMore;
+			}
 			if (total === 0 && messages.length === 0 && (!include || include.length === 0)) return {
 				messages: [],
 				total: 0,
@@ -11330,7 +11367,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 			const messagesWithParsedContent = messages.map((row) => this.parseRow(row));
 			const list = new MessageList().add(messagesWithParsedContent, "memory");
 			const finalMessages = this._sortMessages(list.get.all.db(), field, direction);
-			const hasMore = perPageInput !== false && offset + perPage < total;
+			const hasMore = peekedHasMore !== void 0 ? peekedHasMore : perPageInput !== false && offset + perPage < total;
 			return {
 				messages: finalMessages,
 				total,