@mastra/convex 1.0.5 → 1.0.6-alpha.0

package/dist/index.js

@@ -318,6 +318,20 @@ var MemoryConvex = class extends MemoryStorage {
     const perPage = normalizePerPage(perPageInput, 40);
     const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
     const { field, direction } = this.parseOrderBy(orderBy, "ASC");
+    if (perPage === 0 && (!include || include.length === 0)) {
+      return { messages: [], total: 0, page, perPage: perPageForResponse, hasMore: false };
+    }
+    if (perPage === 0 && include && include.length > 0) {
+      const messages2 = await this._getIncludedMessages(include);
+      const list = new MessageList().add(messages2, "memory");
+      return {
+        messages: this._sortMessages(list.get.all.db(), field, direction),
+        total: 0,
+        page,
+        perPage: perPageForResponse,
+        hasMore: false
+      };
+    }
     let rows = [];
     for (const tid of threadIds) {
       const threadRows = await this.#db.queryTable(TABLE_MESSAGES, [{ field: "thread_id", value: tid }]);
@@ -337,62 +351,27 @@ var MemoryConvex = class extends MemoryStorage {
     });
     const totalThreadMessages = rows.length;
     const paginatedRows = perPageInput === false ? rows : rows.slice(offset, offset + perPage);
-    const messages = paginatedRows.map((row) => this.parseStoredMessage(row));
+    let messages = paginatedRows.map((row) => this.parseStoredMessage(row));
     const messageIds = new Set(messages.map((msg) => msg.id));
     if (include && include.length > 0) {
-      const threadMessagesCache = /* @__PURE__ */ new Map();
-      for (const tid of threadIds) {
-        const tidRows = rows.filter((r) => r.thread_id === tid);
-        threadMessagesCache.set(tid, tidRows);
-      }
-      for (const includeItem of include) {
-        let targetThreadId;
-        let target;
-        for (const [tid, cachedRows] of threadMessagesCache) {
-          target = cachedRows.find((row) => row.id === includeItem.id);
-          if (target) {
-            targetThreadId = tid;
-            break;
-          }
-        }
-        if (!target) {
-          const messageRows = await this.#db.queryTable(TABLE_MESSAGES, [
-            { field: "id", value: includeItem.id }
-          ]);
-          if (messageRows.length > 0) {
-            target = messageRows[0];
-            targetThreadId = target.thread_id;
-            if (targetThreadId && !threadMessagesCache.has(targetThreadId)) {
-              const otherThreadRows = await this.#db.queryTable(TABLE_MESSAGES, [
-                { field: "thread_id", value: targetThreadId }
-              ]);
-              threadMessagesCache.set(targetThreadId, otherThreadRows);
-            }
-          }
+      const preloadedThreads = /* @__PURE__ */ new Map();
+      if (!resourceId && !filter?.dateRange) {
+        for (const tid of threadIds) {
+          preloadedThreads.set(
+            tid,
+            rows.filter((r) => r.thread_id === tid)
+          );
         }
-        if (!target || !targetThreadId) continue;
-        if (!messageIds.has(target.id)) {
-          messages.push(this.parseStoredMessage(target));
-          messageIds.add(target.id);
+      }
+      const includedMessages = await this._getIncludedMessages(include, preloadedThreads);
+      for (const msg of includedMessages) {
+        if (!messageIds.has(msg.id)) {
+          messages.push(msg);
+          messageIds.add(msg.id);
         }
-        const targetThreadRows = threadMessagesCache.get(targetThreadId) || [];
-        await this.addContextMessages({
-          includeItem,
-          allMessages: targetThreadRows,
-          targetThreadId,
-          messageIds,
-          messages
-        });
       }
     }
-    messages.sort((a, b) => {
-      const aValue = field === "createdAt" || field === "updatedAt" ? new Date(a[field]).getTime() : a[field];
-      const bValue = field === "createdAt" || field === "updatedAt" ? new Date(b[field]).getTime() : b[field];
-      if (typeof aValue === "number" && typeof bValue === "number") {
-        return direction === "ASC" ? aValue - bValue : bValue - aValue;
-      }
-      return direction === "ASC" ? String(aValue).localeCompare(String(bValue)) : String(bValue).localeCompare(String(aValue));
-    });
+    messages = this._sortMessages(messages, field, direction);
     const hasMore = include && include.length > 0 ? new Set(messages.filter((m) => m.threadId === threadId).map((m) => m.id)).size < totalThreadMessages : perPageInput === false ? false : offset + perPage < totalThreadMessages;
     return {
       messages,
@@ -572,6 +551,69 @@ var MemoryConvex = class extends MemoryStorage {
     await this.saveResource({ resource: updated });
     return updated;
   }
+  _sortMessages(messages, field, direction) {
+    return messages.sort((a, b) => {
+      const aValue = field === "createdAt" || field === "updatedAt" ? new Date(a[field]).getTime() : a[field];
+      const bValue = field === "createdAt" || field === "updatedAt" ? new Date(b[field]).getTime() : b[field];
+      if (typeof aValue === "number" && typeof bValue === "number") {
+        return direction === "ASC" ? aValue - bValue : bValue - aValue;
+      }
+      return direction === "ASC" ? String(aValue).localeCompare(String(bValue)) : String(bValue).localeCompare(String(aValue));
+    });
+  }
+  async _getIncludedMessages(include, preloadedThreads) {
+    if (include.length === 0) return [];
+    const messages = [];
+    const messageIds = /* @__PURE__ */ new Set();
+    const threadMessagesCache = new Map(preloadedThreads ?? []);
+    const cachedTargets = /* @__PURE__ */ new Map();
+    for (const [threadId, rows] of threadMessagesCache) {
+      for (const row of rows) {
+        cachedTargets.set(row.id, { threadId, row });
+      }
+    }
+    for (const includeItem of include) {
+      let targetThreadId;
+      let target;
+      const cached = cachedTargets.get(includeItem.id);
+      if (cached) {
+        target = cached.row;
+        targetThreadId = cached.threadId;
+      }
+      if (!target) {
+        const messageRows = await this.#db.queryTable(TABLE_MESSAGES, [
+          { field: "id", value: includeItem.id }
+        ]);
+        if (messageRows.length > 0) {
+          target = messageRows[0];
+          targetThreadId = target.thread_id;
+          if (targetThreadId && !threadMessagesCache.has(targetThreadId)) {
+            const otherThreadRows = await this.#db.queryTable(TABLE_MESSAGES, [
+              { field: "thread_id", value: targetThreadId }
+            ]);
+            threadMessagesCache.set(targetThreadId, otherThreadRows);
+            for (const row of otherThreadRows) {
+              cachedTargets.set(row.id, { threadId: targetThreadId, row });
+            }
+          }
+        }
+      }
+      if (!target || !targetThreadId) continue;
+      if (!messageIds.has(target.id)) {
+        messages.push(this.parseStoredMessage(target));
+        messageIds.add(target.id);
+      }
+      const targetThreadRows = threadMessagesCache.get(targetThreadId) || [];
+      await this.addContextMessages({
+        includeItem,
+        allMessages: targetThreadRows,
+        targetThreadId,
+        messageIds,
+        messages
+      });
+    }
+    return messages;
+  }
   parseStoredMessage(message) {
     const content = safelyParseJSON(message.content);
     return {