@mastra/cloudflare-d1 1.1.1 → 1.2.0-alpha.0

package/dist/index.js

@@ -1,5 +1,5 @@
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { BackgroundTasksStorage, TABLE_SCHEMAS, TABLE_BACKGROUND_TASKS, MemoryStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, ensureDate, createStorageErrorId, normalizePerPage, calculatePagination, serializeDate, ScoresStorage, TABLE_SCORERS, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, MastraCompositeStore, getSqlType, getDefaultValue, transformScoreRow as transformScoreRow$1 } from '@mastra/core/storage';
+import { BackgroundTasksStorage, TABLE_SCHEMAS, TABLE_BACKGROUND_TASKS, MemoryStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, ensureDate, createStorageErrorId, normalizePerPage, calculatePagination, validateStorageMetadataFilter, serializeDate, ScoresStorage, TABLE_SCORERS, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, MastraCompositeStore, getSqlType, getDefaultValue, transformScoreRow as transformScoreRow$1 } from '@mastra/core/storage';
 import Cloudflare from 'cloudflare';
 import { MastraBase } from '@mastra/core/base';
 import { parseSqlIdentifier } from '@mastra/core/utils';
@@ -991,6 +991,40 @@ var BackgroundTasksStorageD1 = class extends BackgroundTasksStorage {
     return Number(row?.count ?? 0);
   }
 };
+function addSqliteMetadataFilter(conditions, params, metadataFilter) {
+  if (!metadataFilter) return;
+  for (const [key, value] of Object.entries(metadataFilter)) {
+    const path = `$.metadata.${key}`;
+    conditions.push(`CASE WHEN json_valid(content) THEN json_type(content, ?) IS NOT NULL ELSE 0 END`);
+    params.push(path);
+    addSqliteMetadataValuePredicate(conditions, params, path, value);
+  }
+}
+function addSqliteMetadataValuePredicate(conditions, params, path, value) {
+  if (value === null) {
+    conditions.push(`CASE WHEN json_valid(content) THEN json_type(content, ?) = 'null' ELSE 0 END`);
+    params.push(path);
+    return;
+  }
+  if (typeof value === "string") {
+    conditions.push(
+      `CASE WHEN json_valid(content) THEN json_type(content, ?) = 'text' AND json_extract(content, ?) = ? ELSE 0 END`
+    );
+    params.push(path, path, value);
+    return;
+  }
+  if (typeof value === "number") {
+    conditions.push(
+      `CASE WHEN json_valid(content) THEN json_type(content, ?) IN ('integer', 'real') AND json_extract(content, ?) = ? ELSE 0 END`
+    );
+    params.push(path, path, value);
+    return;
+  }
+  conditions.push(
+    `CASE WHEN json_valid(content) THEN json_type(content, ?) = ? AND json_extract(content, ?) = ? ELSE 0 END`
+  );
+  params.push(path, value ? "true" : "false", path, value ? 1 : 0);
+}
 var MemoryStorageD1 = class extends MemoryStorage {
   #db;
   constructor(config) {
@@ -1596,6 +1630,7 @@ var MemoryStorageD1 = class extends MemoryStorage {
     }
     const perPage = normalizePerPage(perPageInput, 40);
     const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
+    const metadataFilter = validateStorageMetadataFilter(filter?.metadata);
     try {
       const fullTableName = this.#db.getTableName(TABLE_MESSAGES);
       let query = `
@@ -1621,6 +1656,11 @@ var MemoryStorageD1 = class extends MemoryStorage {
         query += ` AND createdAt ${endOp} ?`;
         queryParams.push(endDate);
       }
+      const metadataConditions = [];
+      addSqliteMetadataFilter(metadataConditions, queryParams, metadataFilter);
+      if (metadataConditions.length > 0) {
+        query += ` AND ${metadataConditions.join(" AND ")}`;
+      }
       const { field, direction } = this.parseOrderBy(orderBy, "ASC");
       if (perPage === 0 && (!include || include.length === 0)) {
         return { messages: [], total: 0, page, perPage: perPageForResponse, hasMore: false };
@@ -1672,6 +1712,11 @@ var MemoryStorageD1 = class extends MemoryStorage {
         countQuery += ` AND createdAt ${endOp} ?`;
         countParams.push(endDate);
       }
+      const countMetadataConditions = [];
+      addSqliteMetadataFilter(countMetadataConditions, countParams, metadataFilter);
+      if (countMetadataConditions.length > 0) {
+        countQuery += ` AND ${countMetadataConditions.join(" AND ")}`;
+      }
       const countResult = await this.#db.executeQuery({ sql: countQuery, params: countParams });
       const total = Number(countResult[0]?.count ?? 0);
       if (total === 0 && paginatedCount === 0 && (!include || include.length === 0)) {
@@ -1700,8 +1745,7 @@ var MemoryStorageD1 = class extends MemoryStorage {
       const list = new MessageList().add(paginatedMessages, "memory");
       const finalMessages = this._sortMessages(list.get.all.db(), 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 ? false : allThreadMessagesReturned ? false : offset + paginatedCount < total;
+      const hasMore = perPageInput !== false && (metadataFilter || returnedThreadMessageIds.size < total) && offset + paginatedCount < total;
       return {
         messages: finalMessages,
         total,