@mastra/cloudflare 1.2.2 → 1.2.3

package/dist/index.js

@@ -1028,6 +1028,22 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
    * @param include - Array of message IDs to include, optionally with context windows
    * @param messageIds - Set to accumulate the message IDs that should be fetched
    */
+  _sortMessages(messages, field, direction) {
+    return messages.sort((a, b) => {
+      const isDateField = field === "createdAt" || field === "updatedAt";
+      const aVal = isDateField ? new Date(a[field]).getTime() : a[field];
+      const bVal = isDateField ? new Date(b[field]).getTime() : b[field];
+      if (aVal == null && bVal == null) return a.id.localeCompare(b.id);
+      if (aVal == null) return 1;
+      if (bVal == null) return -1;
+      if (typeof aVal === "number" && typeof bVal === "number") {
+        const cmp2 = direction === "ASC" ? aVal - bVal : bVal - aVal;
+        return cmp2 !== 0 ? cmp2 : a.id.localeCompare(b.id);
+      }
+      const cmp = direction === "ASC" ? String(aVal).localeCompare(String(bVal)) : String(bVal).localeCompare(String(aVal));
+      return cmp !== 0 ? cmp : a.id.localeCompare(b.id);
+    });
+  }
   async getIncludedMessagesWithContext(include, messageIds) {
     await Promise.all(
       include.map(async (item) => {
@@ -1186,6 +1202,26 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
         );
       }
       const { field, direction } = this.parseOrderBy(orderBy, "ASC");
+      if (perPage === 0 && include && include.length > 0) {
+        const includedMessageIds = /* @__PURE__ */ new Set();
+        await this.getIncludedMessagesWithContext(include, includedMessageIds);
+        const includedMessages2 = await this.fetchAndParseMessagesFromMultipleThreads(
+          Array.from(includedMessageIds),
+          include,
+          void 0
+        );
+        const list2 = new MessageList().add(includedMessages2, "memory");
+        return {
+          messages: this._sortMessages(list2.get.all.db(), field, direction),
+          total: 0,
+          page,
+          perPage: perPageForResponse,
+          hasMore: false
+        };
+      }
+      if (perPage === 0 && (!include || include.length === 0)) {
+        return { messages: [], total: 0, page, perPage: perPageForResponse, hasMore: false };
+      }
       const threadMessageIds = /* @__PURE__ */ new Set();
       for (const tid of threadIds) {
         try {
@@ -1210,15 +1246,6 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
         filter?.dateRange
       );
       const total = filteredThreadMessages.length;
-      if (perPage === 0 && (!include || include.length === 0)) {
-        return {
-          messages: [],
-          total,
-          page,
-          perPage: perPageForResponse,
-          hasMore: offset < total
-        };
-      }
       filteredThreadMessages.sort((a, b) => {
         const timeA = new Date(a.createdAt).getTime();
         const timeB = new Date(b.createdAt).getTime();
@@ -1290,21 +1317,7 @@ var MemoryStorageCloudflare = class extends MemoryStorage {
         prepared,
         "memory"
       );
-      let finalMessages = list.get.all.db();
-      finalMessages = finalMessages.sort((a, b) => {
-        const isDateField = field === "createdAt" || field === "updatedAt";
-        const aVal = isDateField ? new Date(a[field]).getTime() : a[field];
-        const bVal = isDateField ? new Date(b[field]).getTime() : b[field];
-        if (aVal == null && bVal == null) return a.id.localeCompare(b.id);
-        if (aVal == null) return 1;
-        if (bVal == null) return -1;
-        if (typeof aVal === "number" && typeof bVal === "number") {
-          const cmp2 = direction === "ASC" ? aVal - bVal : bVal - aVal;
-          return cmp2 !== 0 ? cmp2 : a.id.localeCompare(b.id);
-        }
-        const cmp = direction === "ASC" ? String(aVal).localeCompare(String(bVal)) : String(bVal).localeCompare(String(aVal));
-        return cmp !== 0 ? cmp : a.id.localeCompare(b.id);
-      });
+      const finalMessages = this._sortMessages(list.get.all.db(), field, direction);
       const threadIdSet = new Set(threadIds);
       const returnedThreadMessageIds = new Set(
         finalMessages.filter((m) => m.threadId && threadIdSet.has(m.threadId)).map((m) => m.id)