@mastra/cloudflare-d1 1.0.0-beta.8 → 1.0.0

package/dist/index.js

@@ -1,5 +1,5 @@
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { MemoryStorage, TABLE_SCHEMAS, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, ensureDate, createStorageErrorId, normalizePerPage, calculatePagination, serializeDate, ScoresStorage, TABLE_SCORERS, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, MastraStorage, getSqlType, getDefaultValue, transformScoreRow as transformScoreRow$1 } from '@mastra/core/storage';
+import { MemoryStorage, TABLE_SCHEMAS, 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 Cloudflare from 'cloudflare';
 import { MessageList } from '@mastra/core/agent';
 import { MastraBase } from '@mastra/core/base';
@@ -840,18 +840,33 @@ var MemoryStorageD1 = class extends MemoryStorage {
       return null;
     }
   }
-  async listThreadsByResourceId(args) {
-    const { resourceId, page = 0, perPage: perPageInput, orderBy } = args;
+  async listThreads(args) {
+    const { page = 0, perPage: perPageInput, orderBy, filter } = args;
+    try {
+      this.validatePaginationInput(page, perPageInput ?? 100);
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: createStorageErrorId("CLOUDFLARE_D1", "LIST_THREADS", "INVALID_PAGE"),
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: { page, ...perPageInput !== void 0 && { perPage: perPageInput } }
+        },
+        error instanceof Error ? error : new Error("Invalid pagination parameters")
+      );
+    }
     const perPage = normalizePerPage(perPageInput, 100);
-    if (page < 0) {
+    try {
+      this.validateMetadataKeys(filter?.metadata);
+    } catch (error) {
       throw new MastraError(
         {
-          id: createStorageErrorId("CLOUDFLARE_D1", "LIST_THREADS_BY_RESOURCE_ID", "INVALID_PAGE"),
+          id: createStorageErrorId("CLOUDFLARE_D1", "LIST_THREADS", "INVALID_METADATA_KEY"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
-          details: { page }
+          details: { metadataKeys: filter?.metadata ? Object.keys(filter.metadata).join(", ") : "" }
         },
-        new Error("page must be >= 0")
+        error instanceof Error ? error : new Error("Invalid metadata key")
       );
     }
     const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
@@ -864,11 +879,51 @@ var MemoryStorageD1 = class extends MemoryStorage {
       metadata: typeof row.metadata === "string" ? JSON.parse(row.metadata || "{}") : row.metadata || {}
     });
     try {
-      const countQuery = createSqlBuilder().count().from(fullTableName).where("resourceId = ?", resourceId);
+      let countQuery = createSqlBuilder().count().from(fullTableName);
+      let selectQuery = createSqlBuilder().select("*").from(fullTableName);
+      if (filter?.resourceId) {
+        countQuery = countQuery.whereAnd("resourceId = ?", filter.resourceId);
+        selectQuery = selectQuery.whereAnd("resourceId = ?", filter.resourceId);
+      }
+      if (filter?.metadata && Object.keys(filter.metadata).length > 0) {
+        for (const [key, value] of Object.entries(filter.metadata)) {
+          if (value !== null && typeof value === "object") {
+            throw new MastraError(
+              {
+                id: createStorageErrorId("CLOUDFLARE_D1", "LIST_THREADS", "INVALID_METADATA_VALUE"),
+                domain: ErrorDomain.STORAGE,
+                category: ErrorCategory.USER,
+                text: `Metadata filter value for key "${key}" must be a scalar type (string, number, boolean, or null), got ${Array.isArray(value) ? "array" : "object"}`,
+                details: { key, valueType: Array.isArray(value) ? "array" : "object" }
+              },
+              new Error("Invalid metadata filter value type")
+            );
+          }
+          if (value === null) {
+            const condition = `json_extract(metadata, '$.${key}') IS NULL`;
+            countQuery = countQuery.whereAnd(condition);
+            selectQuery = selectQuery.whereAnd(condition);
+          } else {
+            const condition = `json_extract(metadata, '$.${key}') = ?`;
+            const filterValue = value;
+            countQuery = countQuery.whereAnd(condition, filterValue);
+            selectQuery = selectQuery.whereAnd(condition, filterValue);
+          }
+        }
+      }
       const countResult = await this.#db.executeQuery(countQuery.build());
       const total = Number(countResult?.[0]?.count ?? 0);
+      if (total === 0) {
+        return {
+          threads: [],
+          total: 0,
+          page,
+          perPage: perPageForResponse,
+          hasMore: false
+        };
+      }
       const limitValue = perPageInput === false ? total : perPage;
-      const selectQuery = createSqlBuilder().select("*").from(fullTableName).where("resourceId = ?", resourceId).orderBy(field, direction).limit(limitValue).offset(offset);
+      selectQuery = selectQuery.orderBy(field, direction).limit(limitValue).offset(offset);
       const results = await this.#db.executeQuery(selectQuery.build());
       const threads = results.map(mapRowToStorageThreadType);
       return {
@@ -879,13 +934,19 @@ var MemoryStorageD1 = class extends MemoryStorage {
         hasMore: perPageInput === false ? false : offset + perPage < total
       };
     } catch (error) {
+      if (error instanceof MastraError && error.category === ErrorCategory.USER) {
+        throw error;
+      }
       const mastraError = new MastraError(
         {
-          id: createStorageErrorId("CLOUDFLARE_D1", "LIST_THREADS_BY_RESOURCE_ID", "FAILED"),
+          id: createStorageErrorId("CLOUDFLARE_D1", "LIST_THREADS", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          text: `Error getting threads by resourceId ${resourceId}: ${error instanceof Error ? error.message : String(error)}`,
-          details: { resourceId }
+          text: `Error listing threads: ${error instanceof Error ? error.message : String(error)}`,
+          details: {
+            ...filter?.resourceId && { resourceId: filter.resourceId },
+            hasMetadataFilter: !!filter?.metadata
+          }
         },
         error
       );
@@ -1205,12 +1266,14 @@ var MemoryStorageD1 = class extends MemoryStorage {
       const dateRange = filter?.dateRange;
       if (dateRange?.start) {
         const startDate = dateRange.start instanceof Date ? serializeDate(dateRange.start) : serializeDate(new Date(dateRange.start));
-        query += ` AND createdAt >= ?`;
+        const startOp = dateRange.startExclusive ? ">" : ">=";
+        query += ` AND createdAt ${startOp} ?`;
         queryParams.push(startDate);
       }
       if (dateRange?.end) {
         const endDate = dateRange.end instanceof Date ? serializeDate(dateRange.end) : serializeDate(new Date(dateRange.end));
-        query += ` AND createdAt <= ?`;
+        const endOp = dateRange.endExclusive ? "<" : "<=";
+        query += ` AND createdAt ${endOp} ?`;
         queryParams.push(endDate);
       }
       const { field, direction } = this.parseOrderBy(orderBy, "ASC");
@@ -1237,12 +1300,14 @@ var MemoryStorageD1 = class extends MemoryStorage {
       }
       if (dateRange?.start) {
         const startDate = dateRange.start instanceof Date ? serializeDate(dateRange.start) : serializeDate(new Date(dateRange.start));
-        countQuery += ` AND createdAt >= ?`;
+        const startOp = dateRange.startExclusive ? ">" : ">=";
+        countQuery += ` AND createdAt ${startOp} ?`;
         countParams.push(startDate);
       }
       if (dateRange?.end) {
         const endDate = dateRange.end instanceof Date ? serializeDate(dateRange.end) : serializeDate(new Date(dateRange.end));
-        countQuery += ` AND createdAt <= ?`;
+        const endOp = dateRange.endExclusive ? "<" : "<=";
+        countQuery += ` AND createdAt ${endOp} ?`;
         countParams.push(endDate);
       }
       const countResult = await this.#db.executeQuery({ sql: countQuery, params: countParams });
@@ -1881,7 +1946,7 @@ var WorkflowsStorageD1 = class extends WorkflowsStorage {
       try {
         parsedSnapshot = JSON.parse(row.snapshot);
       } catch (e) {
-        console.warn(`Failed to parse snapshot for workflow ${row.workflow_name}: ${e}`);
+        this.logger.warn(`Failed to parse snapshot for workflow ${row.workflow_name}: ${e}`);
       }
     }
     return {
@@ -1917,7 +1982,7 @@ var WorkflowsStorageD1 = class extends WorkflowsStorage {
           builder.whereAnd("resourceId = ?", resourceId);
           countBuilder.whereAnd("resourceId = ?", resourceId);
         } else {
-          console.warn(`[${fullTableName}] resourceId column not found. Skipping resourceId filter.`);
+          this.logger.warn(`[${fullTableName}] resourceId column not found. Skipping resourceId filter.`);
         }
       }
       if (fromDate) {
@@ -2020,7 +2085,7 @@ var WorkflowsStorageD1 = class extends WorkflowsStorage {
 };
 
 // src/storage/index.ts
-var D1Store = class extends MastraStorage {
+var D1Store = class extends MastraCompositeStore {
   client;
   binding;
   tablePrefix;