@mastra/cloudflare-d1 0.12.0 → 0.12.1

package/LICENSE.md

@@ -1,46 +1,15 @@
-# Elastic License 2.0 (ELv2)
+# Apache License 2.0
 
-Copyright (c) 2025 Mastra AI, Inc.
+Copyright (c) 2025 Kepler Software, Inc.
 
-**Acceptance**
-By using the software, you agree to all of the terms and conditions below.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-**Copyright License**
-The licensor grants you a non-exclusive, royalty-free, worldwide, non-sublicensable, non-transferable license to use, copy, distribute, make available, and prepare derivative works of the software, in each case subject to the limitations and conditions below
+    http://www.apache.org/licenses/LICENSE-2.0
 
-**Limitations**
-You may not provide the software to third parties as a hosted or managed service, where the service provides users with access to any substantial set of the features or functionality of the software.
-
-You may not move, change, disable, or circumvent the license key functionality in the software, and you may not remove or obscure any functionality in the software that is protected by the license key.
-
-You may not alter, remove, or obscure any licensing, copyright, or other notices of the licensor in the software. Any use of the licensor’s trademarks is subject to applicable law.
-
-**Patents**
-The licensor grants you a license, under any patent claims the licensor can license, or becomes able to license, to make, have made, use, sell, offer for sale, import and have imported the software, in each case subject to the limitations and conditions in this license. This license does not cover any patent claims that you cause to be infringed by modifications or additions to the software. If you or your company make any written claim that the software infringes or contributes to infringement of any patent, your patent license for the software granted under these terms ends immediately. If your company makes such a claim, your patent license ends immediately for work on behalf of your company.
-
-**Notices**
-You must ensure that anyone who gets a copy of any part of the software from you also gets a copy of these terms.
-
-If you modify the software, you must include in any modified copies of the software prominent notices stating that you have modified the software.
-
-**No Other Rights**
-These terms do not imply any licenses other than those expressly granted in these terms.
-
-**Termination**
-If you use the software in violation of these terms, such use is not licensed, and your licenses will automatically terminate. If the licensor provides you with a notice of your violation, and you cease all violation of this license no later than 30 days after you receive that notice, your licenses will be reinstated retroactively. However, if you violate these terms after such reinstatement, any additional violation of these terms will cause your licenses to terminate automatically and permanently.
-
-**No Liability**
-As far as the law allows, the software comes as is, without any warranty or condition, and the licensor will not be liable to you for any damages arising out of these terms or the use or nature of the software, under any kind of legal claim.
-
-**Definitions**
-The _licensor_ is the entity offering these terms, and the _software_ is the software the licensor makes available under these terms, including any portion of it.
-
-_you_ refers to the individual or entity agreeing to these terms.
-
-_your company_ is any legal entity, sole proprietorship, or other kind of organization that you work for, plus all organizations that have control over, are under the control of, or are under common control with that organization. _control_ means ownership of substantially all the assets of an entity, or the power to direct its management and policies by vote, contract, or otherwise. Control can be direct or indirect.
-
-_your licenses_ are all the licenses granted to you for the software under these terms.
-
-_use_ means anything you do with the software requiring one of your licenses.
-
-_trademark_ means trademarks, service marks, and similar rights.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

package/README.md

@@ -54,6 +54,21 @@ const store = new D1Store({
 });
 ```
 
+### Or you can pass any client implementation you want
+
+```typescript
+import { D1Store } from '@mastra/cloudflare-d1';
+
+const store = new D1Store({
+  client: {
+    query: ({ sql, params }) => {
+      // do something
+    },
+  },
+  tablePrefix: 'mastra_', // optional
+});
+```
+
 ## Supported Methods
 
 ### Thread Operations

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

@@ -1,3 +1,4 @@
+import { default as Cloudflare_2 } from 'cloudflare';
 import type { D1Database as D1Database_2 } from '@cloudflare/workers-types';
 import type { EvalRow } from '@mastra/core/storage';
 import type { MastraMessageContentV2 } from '@mastra/core/agent';
@@ -33,6 +34,26 @@ export declare const createSampleTrace: (name: string, scope?: string, attribute
 
 export declare function createSqlBuilder(): SqlBuilder;
 
+declare interface D1Client {
+    query(args: {
+        sql: string;
+        params: string[];
+    }): Promise<{
+        result: D1QueryResult;
+    }>;
+}
+export { D1Client }
+export { D1Client as D1Client_alias_1 }
+
+declare interface D1ClientConfig {
+    /** Optional prefix for table names */
+    tablePrefix?: string;
+    /** D1 Client */
+    client: D1Client;
+}
+export { D1ClientConfig }
+export { D1ClientConfig as D1ClientConfig_alias_1 }
+
 /**
  * Configuration for D1 using the REST API
  */
@@ -49,10 +70,12 @@ declare interface D1Config {
 export { D1Config }
 export { D1Config as D1Config_alias_1 }
 
+declare type D1QueryResult = Awaited<ReturnType<Cloudflare_2['d1']['database']['query']>>['result'];
+export { D1QueryResult }
+export { D1QueryResult as D1QueryResult_alias_1 }
+
 declare class D1Store extends MastraStorage {
     private client?;
-    private accountId?;
-    private databaseId?;
     private binding?;
     private tablePrefix;
     /**
@@ -247,7 +270,7 @@ export { D1Store as D1Store_alias_1 }
 /**
  * Combined configuration type supporting both REST API and Workers Binding API
  */
-declare type D1StoreConfig = D1Config | D1WorkersConfig;
+declare type D1StoreConfig = D1Config | D1WorkersConfig | D1ClientConfig;
 export { D1StoreConfig }
 export { D1StoreConfig as D1StoreConfig_alias_1 }
 

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

@@ -1,3 +1,4 @@
+import { default as Cloudflare_2 } from 'cloudflare';
 import type { D1Database as D1Database_2 } from '@cloudflare/workers-types';
 import type { EvalRow } from '@mastra/core/storage';
 import type { MastraMessageContentV2 } from '@mastra/core/agent';
@@ -33,6 +34,26 @@ export declare const createSampleTrace: (name: string, scope?: string, attribute
 
 export declare function createSqlBuilder(): SqlBuilder;
 
+declare interface D1Client {
+    query(args: {
+        sql: string;
+        params: string[];
+    }): Promise<{
+        result: D1QueryResult;
+    }>;
+}
+export { D1Client }
+export { D1Client as D1Client_alias_1 }
+
+declare interface D1ClientConfig {
+    /** Optional prefix for table names */
+    tablePrefix?: string;
+    /** D1 Client */
+    client: D1Client;
+}
+export { D1ClientConfig }
+export { D1ClientConfig as D1ClientConfig_alias_1 }
+
 /**
  * Configuration for D1 using the REST API
  */
@@ -49,10 +70,12 @@ declare interface D1Config {
 export { D1Config }
 export { D1Config as D1Config_alias_1 }
 
+declare type D1QueryResult = Awaited<ReturnType<Cloudflare_2['d1']['database']['query']>>['result'];
+export { D1QueryResult }
+export { D1QueryResult as D1QueryResult_alias_1 }
+
 declare class D1Store extends MastraStorage {
     private client?;
-    private accountId?;
-    private databaseId?;
     private binding?;
     private tablePrefix;
     /**
@@ -247,7 +270,7 @@ export { D1Store as D1Store_alias_1 }
 /**
  * Combined configuration type supporting both REST API and Workers Binding API
  */
-declare type D1StoreConfig = D1Config | D1WorkersConfig;
+declare type D1StoreConfig = D1Config | D1WorkersConfig | D1ClientConfig;
 export { D1StoreConfig }
 export { D1StoreConfig as D1StoreConfig_alias_1 }
 

package/dist/index.cjs

@@ -247,8 +247,6 @@ function isArrayOfRecords(value) {
 }
 var D1Store = class extends storage.MastraStorage {
   client;
-  accountId;
-  databaseId;
   binding;
   // D1Database binding
   tablePrefix;
@@ -269,15 +267,28 @@ var D1Store = class extends storage.MastraStorage {
         }
         this.binding = config.binding;
         this.logger.info("Using D1 Workers Binding API");
+      } else if ("client" in config) {
+        if (!config.client) {
+          throw new Error("D1 client is required when using D1ClientConfig");
+        }
+        this.client = config.client;
+        this.logger.info("Using D1 Client");
       } else {
         if (!config.accountId || !config.databaseId || !config.apiToken) {
           throw new Error("accountId, databaseId, and apiToken are required when using REST API");
         }
-        this.accountId = config.accountId;
-        this.databaseId = config.databaseId;
-        this.client = new Cloudflare__default.default({
+        const cfClient = new Cloudflare__default.default({
           apiToken: config.apiToken
         });
+        this.client = {
+          query: ({ sql, params }) => {
+            return cfClient.d1.database.query(config.databaseId, {
+              account_id: config.accountId,
+              sql,
+              params
+            });
+          }
+        };
         this.logger.info("Using D1 REST API");
       }
     } catch (error$1) {
@@ -351,12 +362,11 @@ var D1Store = class extends storage.MastraStorage {
     params = [],
     first = false
   }) {
-    if (!this.client || !this.accountId || !this.databaseId) {
+    if (!this.client) {
       throw new Error("Missing required REST API configuration");
     }
     try {
-      const response = await this.client.d1.database.query(this.databaseId, {
-        account_id: this.accountId,
+      const response = await this.client.query({
         sql,
         params: this.formatSqlParams(params)
       });
@@ -387,7 +397,7 @@ var D1Store = class extends storage.MastraStorage {
       this.logger.debug("Executing SQL query", { sql, params, first });
       if (this.binding) {
         return this.executeWorkersBindingQuery({ sql, params, first });
-      } else if (this.client && this.accountId && this.databaseId) {
+      } else if (this.client) {
         return this.executeRestQuery({ sql, params, first });
       } else {
         throw new Error("No valid D1 configuration provided");
@@ -841,9 +851,15 @@ var D1Store = class extends storage.MastraStorage {
       const threadId = messages[0]?.threadId;
       for (const [i, message] of messages.entries()) {
         if (!message.id) throw new Error(`Message at index ${i} missing id`);
-        if (!message.threadId) throw new Error(`Message at index ${i} missing threadId`);
-        if (!message.content) throw new Error(`Message at index ${i} missing content`);
-        if (!message.role) throw new Error(`Message at index ${i} missing role`);
+        if (!message.threadId) {
+          throw new Error(`Message at index ${i} missing threadId`);
+        }
+        if (!message.content) {
+          throw new Error(`Message at index ${i} missing content`);
+        }
+        if (!message.role) {
+          throw new Error(`Message at index ${i} missing role`);
+        }
         const thread = await this.getThreadById({ threadId: message.threadId });
         if (!thread) {
           throw new Error(`Thread ${message.threadId} not found`);
@@ -940,7 +956,10 @@ var D1Store = class extends storage.MastraStorage {
     format
   }) {
     const fullTableName = this.getTableName(storage.TABLE_MESSAGES);
-    const limit = this.resolveMessageLimit({ last: selectBy?.last, defaultLimit: 40 });
+    const limit = this.resolveMessageLimit({
+      last: selectBy?.last,
+      defaultLimit: 40
+    });
     const include = selectBy?.include || [];
     const messages = [];
     try {
@@ -1433,7 +1452,11 @@ var D1Store = class extends storage.MastraStorage {
     }
     const { sql: countSql, params: countParams } = countQueryBuilder.build();
     try {
-      const countResult = await this.executeQuery({ sql: countSql, params: countParams, first: true });
+      const countResult = await this.executeQuery({
+        sql: countSql,
+        params: countParams,
+        first: true
+      });
       const total = Number(countResult?.count || 0);
       const currentOffset = page * perPage;
       if (total === 0) {
@@ -1451,7 +1474,10 @@ var D1Store = class extends storage.MastraStorage {
       }
       dataQueryBuilder.orderBy("createdAt", "DESC").limit(perPage).offset(currentOffset);
       const { sql: dataSql, params: dataParams } = dataQueryBuilder.build();
-      const rows = await this.executeQuery({ sql: dataSql, params: dataParams });
+      const rows = await this.executeQuery({
+        sql: dataSql,
+        params: dataParams
+      });
       const evals = (isArrayOfRecords(rows) ? rows : []).map((row) => {
         const result = this.deserializeValue(row.result);
         const testInfo = row.test_info ? this.deserializeValue(row.test_info) : void 0;
@@ -1553,7 +1579,11 @@ var D1Store = class extends storage.MastraStorage {
       let total = 0;
       if (limit !== void 0 && offset !== void 0) {
         const { sql: countSql, params: countParams } = countBuilder.build();
-        const countResult = await this.executeQuery({ sql: countSql, params: countParams, first: true });
+        const countResult = await this.executeQuery({
+          sql: countSql,
+          params: countParams,
+          first: true
+        });
         total = Number(countResult?.count ?? 0);
       }
       const results = await this.executeQuery({ sql, params });
@@ -1566,7 +1596,10 @@ var D1Store = class extends storage.MastraStorage {
           domain: error.ErrorDomain.STORAGE,
           category: error.ErrorCategory.THIRD_PARTY,
           text: `Failed to retrieve workflow runs: ${error$1 instanceof Error ? error$1.message : String(error$1)}`,
-          details: { workflowName: workflowName ?? "", resourceId: resourceId ?? "" }
+          details: {
+            workflowName: workflowName ?? "",
+            resourceId: resourceId ?? ""
+          }
         },
         error$1
       );

package/dist/index.d.cts

@@ -1,4 +1,7 @@
 export { D1Config } from './_tsup-dts-rollup.cjs';
+export { D1ClientConfig } from './_tsup-dts-rollup.cjs';
 export { D1WorkersConfig } from './_tsup-dts-rollup.cjs';
 export { D1StoreConfig } from './_tsup-dts-rollup.cjs';
+export { D1QueryResult } from './_tsup-dts-rollup.cjs';
+export { D1Client } from './_tsup-dts-rollup.cjs';
 export { D1Store } from './_tsup-dts-rollup.cjs';

package/dist/index.d.ts

@@ -1,4 +1,7 @@
 export { D1Config } from './_tsup-dts-rollup.js';
+export { D1ClientConfig } from './_tsup-dts-rollup.js';
 export { D1WorkersConfig } from './_tsup-dts-rollup.js';
 export { D1StoreConfig } from './_tsup-dts-rollup.js';
+export { D1QueryResult } from './_tsup-dts-rollup.js';
+export { D1Client } from './_tsup-dts-rollup.js';
 export { D1Store } from './_tsup-dts-rollup.js';

package/dist/index.js

@@ -241,8 +241,6 @@ function isArrayOfRecords(value) {
 }
 var D1Store = class extends MastraStorage {
   client;
-  accountId;
-  databaseId;
   binding;
   // D1Database binding
   tablePrefix;
@@ -263,15 +261,28 @@ var D1Store = class extends MastraStorage {
         }
         this.binding = config.binding;
         this.logger.info("Using D1 Workers Binding API");
+      } else if ("client" in config) {
+        if (!config.client) {
+          throw new Error("D1 client is required when using D1ClientConfig");
+        }
+        this.client = config.client;
+        this.logger.info("Using D1 Client");
       } else {
         if (!config.accountId || !config.databaseId || !config.apiToken) {
           throw new Error("accountId, databaseId, and apiToken are required when using REST API");
         }
-        this.accountId = config.accountId;
-        this.databaseId = config.databaseId;
-        this.client = new Cloudflare({
+        const cfClient = new Cloudflare({
           apiToken: config.apiToken
         });
+        this.client = {
+          query: ({ sql, params }) => {
+            return cfClient.d1.database.query(config.databaseId, {
+              account_id: config.accountId,
+              sql,
+              params
+            });
+          }
+        };
         this.logger.info("Using D1 REST API");
       }
     } catch (error) {
@@ -345,12 +356,11 @@ var D1Store = class extends MastraStorage {
     params = [],
     first = false
   }) {
-    if (!this.client || !this.accountId || !this.databaseId) {
+    if (!this.client) {
       throw new Error("Missing required REST API configuration");
     }
     try {
-      const response = await this.client.d1.database.query(this.databaseId, {
-        account_id: this.accountId,
+      const response = await this.client.query({
         sql,
         params: this.formatSqlParams(params)
       });
@@ -381,7 +391,7 @@ var D1Store = class extends MastraStorage {
       this.logger.debug("Executing SQL query", { sql, params, first });
       if (this.binding) {
         return this.executeWorkersBindingQuery({ sql, params, first });
-      } else if (this.client && this.accountId && this.databaseId) {
+      } else if (this.client) {
         return this.executeRestQuery({ sql, params, first });
       } else {
         throw new Error("No valid D1 configuration provided");
@@ -835,9 +845,15 @@ var D1Store = class extends MastraStorage {
       const threadId = messages[0]?.threadId;
       for (const [i, message] of messages.entries()) {
         if (!message.id) throw new Error(`Message at index ${i} missing id`);
-        if (!message.threadId) throw new Error(`Message at index ${i} missing threadId`);
-        if (!message.content) throw new Error(`Message at index ${i} missing content`);
-        if (!message.role) throw new Error(`Message at index ${i} missing role`);
+        if (!message.threadId) {
+          throw new Error(`Message at index ${i} missing threadId`);
+        }
+        if (!message.content) {
+          throw new Error(`Message at index ${i} missing content`);
+        }
+        if (!message.role) {
+          throw new Error(`Message at index ${i} missing role`);
+        }
         const thread = await this.getThreadById({ threadId: message.threadId });
         if (!thread) {
           throw new Error(`Thread ${message.threadId} not found`);
@@ -934,7 +950,10 @@ var D1Store = class extends MastraStorage {
     format
   }) {
     const fullTableName = this.getTableName(TABLE_MESSAGES);
-    const limit = this.resolveMessageLimit({ last: selectBy?.last, defaultLimit: 40 });
+    const limit = this.resolveMessageLimit({
+      last: selectBy?.last,
+      defaultLimit: 40
+    });
     const include = selectBy?.include || [];
     const messages = [];
     try {
@@ -1427,7 +1446,11 @@ var D1Store = class extends MastraStorage {
     }
     const { sql: countSql, params: countParams } = countQueryBuilder.build();
     try {
-      const countResult = await this.executeQuery({ sql: countSql, params: countParams, first: true });
+      const countResult = await this.executeQuery({
+        sql: countSql,
+        params: countParams,
+        first: true
+      });
       const total = Number(countResult?.count || 0);
       const currentOffset = page * perPage;
       if (total === 0) {
@@ -1445,7 +1468,10 @@ var D1Store = class extends MastraStorage {
       }
       dataQueryBuilder.orderBy("createdAt", "DESC").limit(perPage).offset(currentOffset);
       const { sql: dataSql, params: dataParams } = dataQueryBuilder.build();
-      const rows = await this.executeQuery({ sql: dataSql, params: dataParams });
+      const rows = await this.executeQuery({
+        sql: dataSql,
+        params: dataParams
+      });
       const evals = (isArrayOfRecords(rows) ? rows : []).map((row) => {
         const result = this.deserializeValue(row.result);
         const testInfo = row.test_info ? this.deserializeValue(row.test_info) : void 0;
@@ -1547,7 +1573,11 @@ var D1Store = class extends MastraStorage {
       let total = 0;
       if (limit !== void 0 && offset !== void 0) {
         const { sql: countSql, params: countParams } = countBuilder.build();
-        const countResult = await this.executeQuery({ sql: countSql, params: countParams, first: true });
+        const countResult = await this.executeQuery({
+          sql: countSql,
+          params: countParams,
+          first: true
+        });
         total = Number(countResult?.count ?? 0);
       }
       const results = await this.executeQuery({ sql, params });
@@ -1560,7 +1590,10 @@ var D1Store = class extends MastraStorage {
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           text: `Failed to retrieve workflow runs: ${error instanceof Error ? error.message : String(error)}`,
-          details: { workflowName: workflowName ?? "", resourceId: resourceId ?? "" }
+          details: {
+            workflowName: workflowName ?? "",
+            resourceId: resourceId ?? ""
+          }
         },
         error
       );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/cloudflare-d1",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "D1 provider for Mastra - includes db storage capabilities",
   "type": "module",
   "files": [
@@ -25,18 +25,18 @@
     "cloudflare": "^4.4.1"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250620.0",
+    "@cloudflare/workers-types": "^4.20250705.0",
     "@microsoft/api-extractor": "^7.52.8",
     "@types/node": "^20.19.0",
-    "dotenv": "^16.5.0",
+    "dotenv": "^17.0.0",
     "eslint": "^9.29.0",
-    "miniflare": "^4.20250617.3",
+    "miniflare": "^4.20250617.5",
     "tsup": "^8.5.0",
     "typescript": "^5.8.3",
-    "vitest": "^3.2.3",
-    "@internal/storage-test-utils": "0.0.10",
-    "@internal/lint": "0.0.14",
-    "@mastra/core": "0.10.7"
+    "vitest": "^3.2.4",
+    "@internal/storage-test-utils": "0.0.14",
+    "@internal/lint": "0.0.18",
+    "@mastra/core": "0.10.11"
   },
   "peerDependencies": {
     "@mastra/core": ">=0.10.7-0 <0.11.0-0"