@mastra/cloudflare-d1 1.0.2 → 1.0.3

package/dist/index.js

@@ -1203,12 +1203,28 @@ var MemoryStorageD1 = class extends MemoryStorage {
     const targetMap = new Map(
       targetResult.map((r) => [r.id, { threadId: r.thread_id, createdAt: r.createdAt }])
     );
+    const MAX_UNION_TERMS = 5;
     const unionQueries = [];
-    const params = [];
+    const unionParams = [];
+    const allMessages = [];
+    const flushBatch = async () => {
+      if (unionQueries.length === 0) return;
+      const sql = unionQueries.length === 1 ? unionQueries[0] : `${unionQueries.join(" UNION ALL ")} ORDER BY createdAt ASC, id ASC`;
+      const result = await this.#db.executeQuery({ sql, params: unionParams });
+      if (Array.isArray(result)) {
+        allMessages.push(...result);
+      }
+      unionQueries.length = 0;
+      unionParams.length = 0;
+    };
     for (const inc of include) {
       const { id, withPreviousMessages = 0, withNextMessages = 0 } = inc;
       const target = targetMap.get(id);
       if (!target) continue;
+      const termsNeeded = withNextMessages > 0 ? 2 : 1;
+      if (unionQueries.length + termsNeeded > MAX_UNION_TERMS) {
+        await flushBatch();
+      }
       unionQueries.push(`SELECT * FROM (
         SELECT id, content, role, type, createdAt, thread_id AS threadId, resourceId
         FROM ${tableName}
@@ -1217,7 +1233,7 @@ var MemoryStorageD1 = class extends MemoryStorage {
         ORDER BY createdAt DESC, id DESC
         LIMIT ?
       )`);
-      params.push(target.threadId, target.createdAt, withPreviousMessages + 1);
+      unionParams.push(target.threadId, target.createdAt, withPreviousMessages + 1);
       if (withNextMessages > 0) {
         unionQueries.push(`SELECT * FROM (
           SELECT id, content, role, type, createdAt, thread_id AS threadId, resourceId
@@ -1227,22 +1243,12 @@ var MemoryStorageD1 = class extends MemoryStorage {
           ORDER BY createdAt ASC, id ASC
           LIMIT ?
         )`);
-        params.push(target.threadId, target.createdAt, withNextMessages);
+        unionParams.push(target.threadId, target.createdAt, withNextMessages);
       }
     }
-    if (unionQueries.length === 0) return null;
-    let finalQuery;
-    if (unionQueries.length === 1) {
-      finalQuery = unionQueries[0];
-    } else {
-      finalQuery = `${unionQueries.join(" UNION ALL ")} ORDER BY createdAt ASC, id ASC`;
-    }
-    const messages = await this.#db.executeQuery({ sql: finalQuery, params });
-    if (!Array.isArray(messages)) {
-      return [];
-    }
+    await flushBatch();
     const seen = /* @__PURE__ */ new Set();
-    const processedMessages = messages.filter((message) => {
+    const processedMessages = allMessages.filter((message) => {
       const id = message.id;
       if (seen.has(id)) return false;
       seen.add(id);