@mastra/cloudflare-d1 0.0.0-vnext-20251104230439 → 0.0.0-vnext-20251119160359

package/dist/index.js

@@ -1,5 +1,5 @@
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { MastraStorage, StoreOperations, ScoresStorage, TABLE_SCORERS, normalizePerPage, calculatePagination, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, ensureDate, MemoryStorage, TABLE_RESOURCES, TABLE_THREADS, TABLE_MESSAGES, resolveMessageLimit, serializeDate, safelyParseJSON } from '@mastra/core/storage';
+import { MastraStorage, StoreOperations, ScoresStorage, TABLE_SCORERS, normalizePerPage, calculatePagination, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, ensureDate, MemoryStorage, TABLE_RESOURCES, TABLE_THREADS, TABLE_MESSAGES, serializeDate, safelyParseJSON } from '@mastra/core/storage';
 import Cloudflare from 'cloudflare';
 import { MessageList } from '@mastra/core/agent';
 import { parseSqlIdentifier } from '@mastra/core/utils';
@@ -627,9 +627,8 @@ var MemoryStorageD1 = class extends MemoryStorage {
       );
     }
   }
-  async _getIncludedMessages(threadId, selectBy) {
+  async _getIncludedMessages(threadId, include) {
     if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
-    const include = selectBy?.include;
     if (!include) return null;
     const unionQueries = [];
     const params = [];
@@ -685,73 +684,6 @@ var MemoryStorageD1 = class extends MemoryStorage {
     });
     return processedMessages;
   }
-  /**
-   * @deprecated use listMessages instead
-   */
-  async getMessages({
-    threadId,
-    resourceId,
-    selectBy
-  }) {
-    try {
-      if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
-      const fullTableName = this.operations.getTableName(TABLE_MESSAGES);
-      const limit = resolveMessageLimit({
-        last: selectBy?.last,
-        defaultLimit: 40
-      });
-      const include = selectBy?.include || [];
-      const messages = [];
-      if (include.length) {
-        const includeResult = await this._getIncludedMessages(threadId, selectBy);
-        if (Array.isArray(includeResult)) messages.push(...includeResult);
-      }
-      const excludeIds = messages.map((m) => m.id);
-      const query = createSqlBuilder().select(["id", "content", "role", "type", "createdAt", "thread_id AS threadId"]).from(fullTableName).where("thread_id = ?", threadId);
-      if (resourceId) {
-        query.andWhere("resourceId = ?", resourceId);
-      }
-      if (excludeIds.length > 0) {
-        query.andWhere(`id NOT IN (${excludeIds.map(() => "?").join(",")})`, ...excludeIds);
-      }
-      query.orderBy("createdAt", "DESC").limit(limit);
-      const { sql, params } = query.build();
-      const result = await this.operations.executeQuery({ sql, params });
-      if (Array.isArray(result)) messages.push(...result);
-      messages.sort((a, b) => {
-        const aRecord = a;
-        const bRecord = b;
-        const timeA = new Date(aRecord.createdAt).getTime();
-        const timeB = new Date(bRecord.createdAt).getTime();
-        return timeA - timeB;
-      });
-      const processedMessages = messages.map((message) => {
-        const processedMsg = {};
-        for (const [key, value] of Object.entries(message)) {
-          if (key === `type` && value === `v2`) continue;
-          processedMsg[key] = deserializeValue(value);
-        }
-        return processedMsg;
-      });
-      this.logger.debug(`Retrieved ${messages.length} messages for thread ${threadId}`);
-      const list = new MessageList().add(processedMessages, "memory");
-      return { messages: list.get.all.db() };
-    } catch (error) {
-      const mastraError = new MastraError(
-        {
-          id: "CLOUDFLARE_D1_STORAGE_GET_MESSAGES_ERROR",
-          domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY,
-          text: `Failed to retrieve messages for thread ${threadId}: ${error instanceof Error ? error.message : String(error)}`,
-          details: { threadId, resourceId: resourceId ?? "" }
-        },
-        error
-      );
-      this.logger?.error(mastraError.toString());
-      this.logger?.trackException(mastraError);
-      throw mastraError;
-    }
-  }
   async listMessagesById({ messageIds }) {
     if (messageIds.length === 0) return { messages: [] };
     const fullTableName = this.operations.getTableName(TABLE_MESSAGES);
@@ -838,7 +770,7 @@ var MemoryStorageD1 = class extends MemoryStorage {
         query += ` AND createdAt <= ?`;
         queryParams.push(endDate);
       }
-      const { field, direction } = this.parseOrderBy(orderBy);
+      const { field, direction } = this.parseOrderBy(orderBy, "ASC");
       query += ` ORDER BY "${field}" ${direction}`;
       if (perPage !== Number.MAX_SAFE_INTEGER) {
         query += ` LIMIT ? OFFSET ?`;
@@ -884,8 +816,7 @@ var MemoryStorageD1 = class extends MemoryStorage {
       const messageIds = new Set(paginatedMessages.map((m) => m.id));
       let includeMessages = [];
       if (include && include.length > 0) {
-        const selectBy = { include };
-        const includeResult = await this._getIncludedMessages(threadId, selectBy);
+        const includeResult = await this._getIncludedMessages(threadId, include);
         if (Array.isArray(includeResult)) {
           includeMessages = includeResult;
           for (const includeMsg of includeMessages) {
@@ -1867,13 +1798,18 @@ var WorkflowsStorageD1 = class extends WorkflowsStorage {
     toDate,
     page,
     perPage,
-    resourceId
+    resourceId,
+    status
   } = {}) {
     const fullTableName = this.operations.getTableName(TABLE_WORKFLOW_SNAPSHOT);
     try {
       const builder = createSqlBuilder().select().from(fullTableName);
       const countBuilder = createSqlBuilder().count().from(fullTableName);
       if (workflowName) builder.whereAnd("workflow_name = ?", workflowName);
+      if (status) {
+        builder.whereAnd("json_extract(snapshot, '$.status') = ?", status);
+        countBuilder.whereAnd("json_extract(snapshot, '$.status') = ?", status);
+      }
       if (resourceId) {
         const hasResourceId = await this.operations.hasColumn(fullTableName, "resourceId");
         if (hasResourceId) {
@@ -1976,7 +1912,7 @@ var D1Store = class extends MastraStorage {
    */
   constructor(config) {
     try {
-      super({ name: "D1" });
+      super({ id: config.id, name: "D1" });
       if (config.tablePrefix && !/^[a-zA-Z0-9_]*$/.test(config.tablePrefix)) {
         throw new Error("Invalid tablePrefix: only letters, numbers, and underscores are allowed.");
       }
@@ -2106,12 +2042,6 @@ var D1Store = class extends MastraStorage {
   async saveMessages(args) {
     return this.stores.memory.saveMessages(args);
   }
-  /**
-   * @deprecated use listMessages instead
-   */
-  async getMessages({ threadId, selectBy }) {
-    return this.stores.memory.getMessages({ threadId, selectBy });
-  }
   async updateWorkflowResults({
     workflowName,
     runId,
@@ -2139,15 +2069,8 @@ var D1Store = class extends MastraStorage {
   async loadWorkflowSnapshot(params) {
     return this.stores.workflows.loadWorkflowSnapshot(params);
   }
-  async listWorkflowRuns({
-    workflowName,
-    fromDate,
-    toDate,
-    perPage,
-    page,
-    resourceId
-  } = {}) {
-    return this.stores.workflows.listWorkflowRuns({ workflowName, fromDate, toDate, perPage, page, resourceId });
+  async listWorkflowRuns(args = {}) {
+    return this.stores.workflows.listWorkflowRuns(args);
   }
   async getWorkflowRunById({
     runId,