@mastra/upstash 1.0.3 → 1.0.4

package/dist/index.js

@@ -502,6 +502,22 @@ var StoreMemoryUpstash = class extends MemoryStorage {
     }
     return messageData.threadId || null;
   }
+  _sortMessages(messages, field, direction) {
+    return messages.sort((a, b) => {
+      const getVal = (msg) => {
+        if (field === "createdAt") {
+          return new Date(msg.createdAt).getTime();
+        }
+        const value = msg[field];
+        if (typeof value === "number") return value;
+        if (value instanceof Date) return value.getTime();
+        return 0;
+      };
+      const aValue = getVal(a);
+      const bValue = getVal(b);
+      return direction === "ASC" ? aValue - bValue : bValue - aValue;
+    });
+  }
   async _getIncludedMessages(include) {
     if (!include?.length) return [];
     const messageIds = /* @__PURE__ */ new Set();
@@ -638,11 +654,25 @@ var StoreMemoryUpstash = class extends MemoryStorage {
           new Error("page must be >= 0")
         );
       }
+      const { field, direction } = this.parseOrderBy(orderBy, "ASC");
+      if (perPage === 0 && (!include || include.length === 0)) {
+        return { messages: [], total: 0, page, perPage: perPageForResponse, hasMore: false };
+      }
       let includedMessages = [];
       if (include && include.length > 0) {
         const included = await this._getIncludedMessages(include);
         includedMessages = included.map(this.parseStoredMessage);
       }
+      if (perPage === 0 && include && include.length > 0) {
+        const list2 = new MessageList().add(includedMessages, "memory");
+        return {
+          messages: this._sortMessages(list2.get.all.db(), field, direction),
+          total: 0,
+          page,
+          perPage: perPageForResponse,
+          hasMore: false
+        };
+      }
       const allMessageIdsWithThreads = [];
       for (const tid of threadIds) {
         const threadMessagesKey = getThreadMessagesKey(tid);
@@ -672,25 +702,7 @@ var StoreMemoryUpstash = class extends MemoryStorage {
         (msg) => new Date(msg.createdAt),
         filter?.dateRange
       );
-      const { field, direction } = this.parseOrderBy(orderBy, "ASC");
-      const getFieldValue = (msg) => {
-        if (field === "createdAt") {
-          return new Date(msg.createdAt).getTime();
-        }
-        const value = msg[field];
-        if (typeof value === "number") {
-          return value;
-        }
-        if (value instanceof Date) {
-          return value.getTime();
-        }
-        return 0;
-      };
-      messagesData.sort((a, b) => {
-        const aValue = getFieldValue(a);
-        const bValue = getFieldValue(b);
-        return direction === "ASC" ? aValue - bValue : bValue - aValue;
-      });
+      messagesData = this._sortMessages(messagesData, field, direction);
       const total = messagesData.length;
       const start = offset;
       const end = perPageInput === false ? total : start + perPage;
@@ -711,11 +723,7 @@ var StoreMemoryUpstash = class extends MemoryStorage {
       }
       const list = new MessageList().add(allMessages, "memory");
       let finalMessages = list.get.all.db();
-      finalMessages = finalMessages.sort((a, b) => {
-        const aValue = getFieldValue(a);
-        const bValue = getFieldValue(b);
-        return direction === "ASC" ? aValue - bValue : bValue - aValue;
-      });
+      finalMessages = this._sortMessages(finalMessages, field, direction);
       const returnedThreadMessageIds = new Set(finalMessages.filter((m) => m.threadId === threadId).map((m) => m.id));
       const allThreadMessagesReturned = returnedThreadMessageIds.size >= total;
       const hasMore = perPageInput !== false && !allThreadMessagesReturned && end < total;