@mastra/cloudflare-d1 0.10.1-alpha.0 → 0.10.1-alpha.2

package/dist/_tsup-dts-rollup.d.cts

@@ -1,8 +1,9 @@
 import type { D1Database as D1Database_2 } from '@cloudflare/workers-types';
 import type { EvalRow } from '@mastra/core/storage';
+import type { MastraMessageV1 } from '@mastra/core/memory';
+import type { MastraMessageV2 } from '@mastra/core/memory';
+import type { MastraMessageV2 as MastraMessageV2_2 } from '@mastra/core';
 import { MastraStorage } from '@mastra/core/storage';
-import type { MessageType } from '@mastra/core/memory';
-import type { MessageType as MessageType_2 } from '@mastra/core';
 import type { StorageColumn } from '@mastra/core/storage';
 import type { StorageGetMessagesArg } from '@mastra/core/storage';
 import type { StorageThreadType } from '@mastra/core/memory';
@@ -14,7 +15,7 @@ import type { WorkflowRunState as WorkflowRunState_2 } from '@mastra/core';
 
 export declare const checkWorkflowSnapshot: (snapshot: WorkflowRunState_2 | string, stepId: string, status: string) => void;
 
-export declare const createSampleMessage: (threadId: string) => MessageType_2;
+export declare const createSampleMessage: (threadId: string, parts?: MastraMessageV2_2["content"]["parts"]) => MastraMessageV2_2;
 
 export declare const createSampleThread: () => {
     id: string;
@@ -92,7 +93,6 @@ declare class D1Store extends MastraStorage {
     constructor(config: D1StoreConfig);
     private getTableName;
     private formatSqlParams;
-    private createIndexIfNotExists;
     private executeWorkersBindingQuery;
     private executeRestQuery;
     /**
@@ -139,10 +139,20 @@ declare class D1Store extends MastraStorage {
     deleteThread({ threadId }: {
         threadId: string;
     }): Promise<void>;
-    saveMessages({ messages }: {
-        messages: MessageType[];
-    }): Promise<MessageType[]>;
-    getMessages<T = MessageType>({ threadId, selectBy }: StorageGetMessagesArg): Promise<T[]>;
+    saveMessages(args: {
+        messages: MastraMessageV1[];
+        format?: undefined | 'v1';
+    }): Promise<MastraMessageV1[]>;
+    saveMessages(args: {
+        messages: MastraMessageV2[];
+        format: 'v2';
+    }): Promise<MastraMessageV2[]>;
+    getMessages(args: StorageGetMessagesArg & {
+        format?: 'v1';
+    }): Promise<MastraMessageV1[]>;
+    getMessages(args: StorageGetMessagesArg & {
+        format: 'v2';
+    }): Promise<MastraMessageV2[]>;
     persistWorkflowSnapshot({ workflowName, runId, snapshot, }: {
         workflowName: string;
         runId: string;

package/dist/_tsup-dts-rollup.d.ts

@@ -1,8 +1,9 @@
 import type { D1Database as D1Database_2 } from '@cloudflare/workers-types';
 import type { EvalRow } from '@mastra/core/storage';
+import type { MastraMessageV1 } from '@mastra/core/memory';
+import type { MastraMessageV2 } from '@mastra/core/memory';
+import type { MastraMessageV2 as MastraMessageV2_2 } from '@mastra/core';
 import { MastraStorage } from '@mastra/core/storage';
-import type { MessageType } from '@mastra/core/memory';
-import type { MessageType as MessageType_2 } from '@mastra/core';
 import type { StorageColumn } from '@mastra/core/storage';
 import type { StorageGetMessagesArg } from '@mastra/core/storage';
 import type { StorageThreadType } from '@mastra/core/memory';
@@ -14,7 +15,7 @@ import type { WorkflowRunState as WorkflowRunState_2 } from '@mastra/core';
 
 export declare const checkWorkflowSnapshot: (snapshot: WorkflowRunState_2 | string, stepId: string, status: string) => void;
 
-export declare const createSampleMessage: (threadId: string) => MessageType_2;
+export declare const createSampleMessage: (threadId: string, parts?: MastraMessageV2_2["content"]["parts"]) => MastraMessageV2_2;
 
 export declare const createSampleThread: () => {
     id: string;
@@ -92,7 +93,6 @@ declare class D1Store extends MastraStorage {
     constructor(config: D1StoreConfig);
     private getTableName;
     private formatSqlParams;
-    private createIndexIfNotExists;
     private executeWorkersBindingQuery;
     private executeRestQuery;
     /**
@@ -139,10 +139,20 @@ declare class D1Store extends MastraStorage {
     deleteThread({ threadId }: {
         threadId: string;
     }): Promise<void>;
-    saveMessages({ messages }: {
-        messages: MessageType[];
-    }): Promise<MessageType[]>;
-    getMessages<T = MessageType>({ threadId, selectBy }: StorageGetMessagesArg): Promise<T[]>;
+    saveMessages(args: {
+        messages: MastraMessageV1[];
+        format?: undefined | 'v1';
+    }): Promise<MastraMessageV1[]>;
+    saveMessages(args: {
+        messages: MastraMessageV2[];
+        format: 'v2';
+    }): Promise<MastraMessageV2[]>;
+    getMessages(args: StorageGetMessagesArg & {
+        format?: 'v1';
+    }): Promise<MastraMessageV1[]>;
+    getMessages(args: StorageGetMessagesArg & {
+        format: 'v2';
+    }): Promise<MastraMessageV2[]>;
     persistWorkflowSnapshot({ workflowName, runId, snapshot, }: {
         workflowName: string;
         runId: string;

package/dist/index.cjs

@@ -1,5 +1,6 @@
 'use strict';
 
+var agent = require('@mastra/core/agent');
 var storage = require('@mastra/core/storage');
 var Cloudflare = require('cloudflare');
 var utils = require('@mastra/core/utils');
@@ -285,30 +286,6 @@ var D1Store = class extends storage.MastraStorage {
   formatSqlParams(params) {
     return params.map((p) => p === void 0 || p === null ? null : p);
   }
-  // Helper method to create SQL indexes for better query performance
-  async createIndexIfNotExists(tableName, columnName, indexType = "") {
-    const fullTableName = this.getTableName(tableName);
-    const indexName = `idx_${tableName}_${columnName}`;
-    try {
-      const checkQuery = createSqlBuilder().checkIndexExists(indexName, fullTableName);
-      const { sql: checkSql, params: checkParams } = checkQuery.build();
-      const indexExists = await this.executeQuery({
-        sql: checkSql,
-        params: checkParams,
-        first: true
-      });
-      if (!indexExists) {
-        const createQuery = createSqlBuilder().createIndex(indexName, fullTableName, columnName, indexType);
-        const { sql: createSql, params: createParams } = createQuery.build();
-        await this.executeQuery({ sql: createSql, params: createParams });
-        this.logger.debug(`Created index ${indexName} on ${fullTableName}(${columnName})`);
-      }
-    } catch (error) {
-      this.logger.error(`Error creating index on ${fullTableName}(${columnName}):`, {
-        message: error instanceof Error ? error.message : String(error)
-      });
-    }
-  }
   async executeWorkersBindingQuery({
     sql,
     params = [],
@@ -687,8 +664,8 @@ var D1Store = class extends storage.MastraStorage {
       throw new Error(`Failed to delete thread ${threadId}: ${error}`);
     }
   }
-  // Thread and message management methods
-  async saveMessages({ messages }) {
+  async saveMessages(args) {
+    const { messages, format = "v1" } = args;
     if (messages.length === 0) return [];
     try {
       const now = /* @__PURE__ */ new Date();
@@ -718,13 +695,19 @@ var D1Store = class extends storage.MastraStorage {
         records: messagesToInsert
       });
       this.logger.debug(`Saved ${messages.length} messages`);
-      return messages;
+      const list = new agent.MessageList().add(messages, "memory");
+      if (format === `v2`) return list.get.all.v2();
+      return list.get.all.v1();
     } catch (error) {
       this.logger.error("Error saving messages:", { message: error instanceof Error ? error.message : String(error) });
       throw error;
     }
   }
-  async getMessages({ threadId, selectBy }) {
+  async getMessages({
+    threadId,
+    selectBy,
+    format
+  }) {
     const fullTableName = this.getTableName(storage.TABLE_MESSAGES);
     const limit = typeof selectBy?.last === "number" ? selectBy.last : 40;
     const include = selectBy?.include || [];
@@ -795,7 +778,9 @@ var D1Store = class extends storage.MastraStorage {
         return processedMsg;
       });
       this.logger.debug(`Retrieved ${messages.length} messages for thread ${threadId}`);
-      return processedMessages;
+      const list = new agent.MessageList().add(processedMessages, "memory");
+      if (format === `v2`) return list.get.all.v2();
+      return list.get.all.v1();
     } catch (error) {
       this.logger.error("Error retrieving messages for thread", {
         threadId,

package/dist/index.js

@@ -1,3 +1,4 @@
+import { MessageList } from '@mastra/core/agent';
 import { MastraStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_WORKFLOW_SNAPSHOT, TABLE_TRACES, TABLE_EVALS } from '@mastra/core/storage';
 import Cloudflare from 'cloudflare';
 import { parseSqlIdentifier } from '@mastra/core/utils';
@@ -279,30 +280,6 @@ var D1Store = class extends MastraStorage {
   formatSqlParams(params) {
     return params.map((p) => p === void 0 || p === null ? null : p);
   }
-  // Helper method to create SQL indexes for better query performance
-  async createIndexIfNotExists(tableName, columnName, indexType = "") {
-    const fullTableName = this.getTableName(tableName);
-    const indexName = `idx_${tableName}_${columnName}`;
-    try {
-      const checkQuery = createSqlBuilder().checkIndexExists(indexName, fullTableName);
-      const { sql: checkSql, params: checkParams } = checkQuery.build();
-      const indexExists = await this.executeQuery({
-        sql: checkSql,
-        params: checkParams,
-        first: true
-      });
-      if (!indexExists) {
-        const createQuery = createSqlBuilder().createIndex(indexName, fullTableName, columnName, indexType);
-        const { sql: createSql, params: createParams } = createQuery.build();
-        await this.executeQuery({ sql: createSql, params: createParams });
-        this.logger.debug(`Created index ${indexName} on ${fullTableName}(${columnName})`);
-      }
-    } catch (error) {
-      this.logger.error(`Error creating index on ${fullTableName}(${columnName}):`, {
-        message: error instanceof Error ? error.message : String(error)
-      });
-    }
-  }
   async executeWorkersBindingQuery({
     sql,
     params = [],
@@ -681,8 +658,8 @@ var D1Store = class extends MastraStorage {
       throw new Error(`Failed to delete thread ${threadId}: ${error}`);
     }
   }
-  // Thread and message management methods
-  async saveMessages({ messages }) {
+  async saveMessages(args) {
+    const { messages, format = "v1" } = args;
     if (messages.length === 0) return [];
     try {
       const now = /* @__PURE__ */ new Date();
@@ -712,13 +689,19 @@ var D1Store = class extends MastraStorage {
         records: messagesToInsert
       });
       this.logger.debug(`Saved ${messages.length} messages`);
-      return messages;
+      const list = new MessageList().add(messages, "memory");
+      if (format === `v2`) return list.get.all.v2();
+      return list.get.all.v1();
     } catch (error) {
       this.logger.error("Error saving messages:", { message: error instanceof Error ? error.message : String(error) });
       throw error;
     }
   }
-  async getMessages({ threadId, selectBy }) {
+  async getMessages({
+    threadId,
+    selectBy,
+    format
+  }) {
     const fullTableName = this.getTableName(TABLE_MESSAGES);
     const limit = typeof selectBy?.last === "number" ? selectBy.last : 40;
     const include = selectBy?.include || [];
@@ -789,7 +772,9 @@ var D1Store = class extends MastraStorage {
         return processedMsg;
       });
       this.logger.debug(`Retrieved ${messages.length} messages for thread ${threadId}`);
-      return processedMessages;
+      const list = new MessageList().add(processedMessages, "memory");
+      if (format === `v2`) return list.get.all.v2();
+      return list.get.all.v1();
     } catch (error) {
       this.logger.error("Error retrieving messages for thread", {
         threadId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/cloudflare-d1",
-  "version": "0.10.1-alpha.0",
+  "version": "0.10.1-alpha.2",
   "description": "D1 provider for Mastra - includes db storage capabilities",
   "type": "module",
   "files": [
@@ -35,10 +35,10 @@
     "typescript": "^5.8.2",
     "vitest": "^3.1.2",
     "@internal/lint": "0.0.7",
-    "@mastra/core": "0.10.2-alpha.0"
+    "@mastra/core": "0.10.2-alpha.4"
   },
   "peerDependencies": {
-    "@mastra/core": "^0.10.0"
+    "@mastra/core": "^0.10.0-alpha.0"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting",