@mastra/cloudflare-d1 0.0.0-switch-to-core-20250424015131 → 0.0.0-vnext-inngest-20250506123700

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

@@ -2,15 +2,19 @@ import type { D1Database as D1Database_2 } from '@cloudflare/workers-types';
 import type { EvalRow } from '@mastra/core/storage';
 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';
 import type { TABLE_NAMES } from '@mastra/core/storage';
+import type { WorkflowRun } from '@mastra/core/storage';
 import type { WorkflowRuns } from '@mastra/core/storage';
 import type { WorkflowRunState } from '@mastra/core/workflows';
 import type { WorkflowRunState as WorkflowRunState_2 } from '@mastra/core';
 
-export declare const createSampleMessage: (threadId: string) => any;
+export declare const checkWorkflowSnapshot: (snapshot: WorkflowRunState_2 | string, stepId: string, status: string) => void;
+
+export declare const createSampleMessage: (threadId: string) => MessageType_2;
 
 export declare const createSampleThread: () => {
     id: string;
@@ -51,7 +55,11 @@ export declare const createSampleTrace: (name: string, scope?: string, attribute
     createdAt: string;
 };
 
-export declare const createSampleWorkflowSnapshot: (threadId: string) => WorkflowRunState_2;
+export declare const createSampleWorkflowSnapshot: (threadId: string, status: string, createdAt?: Date) => {
+    snapshot: WorkflowRunState_2;
+    runId: string;
+    stepId: string;
+};
 
 export declare function createSqlBuilder(): SqlBuilder;
 
@@ -153,21 +161,30 @@ declare class D1Store extends MastraStorage {
         tableName: TABLE_NAMES;
         records: Record<string, any>[];
     }): Promise<void>;
-    getTraces({ name, scope, page, perPage, attributes, }: {
+    getTraces({ name, scope, page, perPage, attributes, fromDate, toDate, }: {
         name?: string;
         scope?: string;
         page: number;
         perPage: number;
         attributes?: Record<string, string>;
+        fromDate?: Date;
+        toDate?: Date;
     }): Promise<Record<string, any>[]>;
     getEvalsByAgentName(agentName: string, type?: 'test' | 'live'): Promise<EvalRow[]>;
-    getWorkflowRuns(_args?: {
+    private parseWorkflowRun;
+    private hasColumn;
+    getWorkflowRuns({ workflowName, fromDate, toDate, limit, offset, resourceId, }?: {
         workflowName?: string;
         fromDate?: Date;
         toDate?: Date;
         limit?: number;
         offset?: number;
+        resourceId?: string;
     }): Promise<WorkflowRuns>;
+    getWorkflowRunById({ runId, workflowName, }: {
+        runId: string;
+        workflowName?: string;
+    }): Promise<WorkflowRun | null>;
     /**
      * Close the database connection
      * No explicit cleanup needed for D1 in either REST or Workers Binding mode
@@ -226,6 +243,7 @@ export declare class SqlBuilder {
     orderBy(column: string, direction?: 'ASC' | 'DESC'): SqlBuilder;
     limit(count: number): SqlBuilder;
     offset(count: number): SqlBuilder;
+    count(): SqlBuilder;
     /**
      * Insert a row, or update specific columns on conflict (upsert).
      * @param table Table name

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

@@ -2,15 +2,19 @@ import type { D1Database as D1Database_2 } from '@cloudflare/workers-types';
 import type { EvalRow } from '@mastra/core/storage';
 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';
 import type { TABLE_NAMES } from '@mastra/core/storage';
+import type { WorkflowRun } from '@mastra/core/storage';
 import type { WorkflowRuns } from '@mastra/core/storage';
 import type { WorkflowRunState } from '@mastra/core/workflows';
 import type { WorkflowRunState as WorkflowRunState_2 } from '@mastra/core';
 
-export declare const createSampleMessage: (threadId: string) => any;
+export declare const checkWorkflowSnapshot: (snapshot: WorkflowRunState_2 | string, stepId: string, status: string) => void;
+
+export declare const createSampleMessage: (threadId: string) => MessageType_2;
 
 export declare const createSampleThread: () => {
     id: string;
@@ -51,7 +55,11 @@ export declare const createSampleTrace: (name: string, scope?: string, attribute
     createdAt: string;
 };
 
-export declare const createSampleWorkflowSnapshot: (threadId: string) => WorkflowRunState_2;
+export declare const createSampleWorkflowSnapshot: (threadId: string, status: string, createdAt?: Date) => {
+    snapshot: WorkflowRunState_2;
+    runId: string;
+    stepId: string;
+};
 
 export declare function createSqlBuilder(): SqlBuilder;
 
@@ -153,21 +161,30 @@ declare class D1Store extends MastraStorage {
         tableName: TABLE_NAMES;
         records: Record<string, any>[];
     }): Promise<void>;
-    getTraces({ name, scope, page, perPage, attributes, }: {
+    getTraces({ name, scope, page, perPage, attributes, fromDate, toDate, }: {
         name?: string;
         scope?: string;
         page: number;
         perPage: number;
         attributes?: Record<string, string>;
+        fromDate?: Date;
+        toDate?: Date;
     }): Promise<Record<string, any>[]>;
     getEvalsByAgentName(agentName: string, type?: 'test' | 'live'): Promise<EvalRow[]>;
-    getWorkflowRuns(_args?: {
+    private parseWorkflowRun;
+    private hasColumn;
+    getWorkflowRuns({ workflowName, fromDate, toDate, limit, offset, resourceId, }?: {
         workflowName?: string;
         fromDate?: Date;
         toDate?: Date;
         limit?: number;
         offset?: number;
+        resourceId?: string;
     }): Promise<WorkflowRuns>;
+    getWorkflowRunById({ runId, workflowName, }: {
+        runId: string;
+        workflowName?: string;
+    }): Promise<WorkflowRun | null>;
     /**
      * Close the database connection
      * No explicit cleanup needed for D1 in either REST or Workers Binding mode
@@ -226,6 +243,7 @@ export declare class SqlBuilder {
     orderBy(column: string, direction?: 'ASC' | 'DESC'): SqlBuilder;
     limit(count: number): SqlBuilder;
     offset(count: number): SqlBuilder;
+    count(): SqlBuilder;
     /**
      * Insert a row, or update specific columns on conflict (upsert).
      * @param table Table name

package/dist/index.cjs

@@ -74,6 +74,10 @@ var SqlBuilder = class {
     this.params.push(count);
     return this;
   }
+  count() {
+    this.sql += "SELECT COUNT(*) AS count";
+    return this;
+  }
   /**
    * Insert a row, or update specific columns on conflict (upsert).
    * @param table Table name
@@ -496,7 +500,8 @@ var D1Store = class extends storage.MastraStorage {
     try {
       await this.executeQuery({ sql, params });
     } catch (error) {
-      this.logger.error(`Error inserting into ${fullTableName}:`, { error });
+      const message = error instanceof Error ? error.message : String(error);
+      this.logger.error(`Error inserting into ${fullTableName}:`, { message });
       throw new Error(`Failed to insert into ${fullTableName}: ${error}`);
     }
   }
@@ -594,7 +599,8 @@ var D1Store = class extends storage.MastraStorage {
       await this.executeQuery({ sql, params });
       return thread;
     } catch (error) {
-      this.logger.error(`Error saving thread to ${fullTableName}:`, { error });
+      const message = error instanceof Error ? error.message : String(error);
+      this.logger.error(`Error saving thread to ${fullTableName}:`, { message });
       throw error;
     }
   }
@@ -628,7 +634,8 @@ var D1Store = class extends storage.MastraStorage {
         updatedAt: /* @__PURE__ */ new Date()
       };
     } catch (error) {
-      this.logger.error("Error updating thread:", { error });
+      const message = error instanceof Error ? error.message : String(error);
+      this.logger.error("Error updating thread:", { message });
       throw error;
     }
   }
@@ -862,7 +869,9 @@ var D1Store = class extends storage.MastraStorage {
     scope,
     page,
     perPage,
-    attributes
+    attributes,
+    fromDate,
+    toDate
   }) {
     const fullTableName = this.getTableName(storage.TABLE_TRACES);
     try {
@@ -878,6 +887,12 @@ var D1Store = class extends storage.MastraStorage {
           query.jsonLike("attributes", key, value);
         }
       }
+      if (fromDate) {
+        query.andWhere("createdAt >= ?", fromDate instanceof Date ? fromDate.toISOString() : fromDate);
+      }
+      if (toDate) {
+        query.andWhere("createdAt <= ?", toDate instanceof Date ? toDate.toISOString() : toDate);
+      }
       query.orderBy("startTime", "DESC").limit(perPage).offset((page - 1) * perPage);
       const { sql, params } = query.build();
       const results = await this.executeQuery({ sql, params });
@@ -929,8 +944,107 @@ var D1Store = class extends storage.MastraStorage {
       return [];
     }
   }
-  getWorkflowRuns(_args) {
-    throw new Error("Method not implemented.");
+  parseWorkflowRun(row) {
+    let parsedSnapshot = row.snapshot;
+    if (typeof parsedSnapshot === "string") {
+      try {
+        parsedSnapshot = JSON.parse(row.snapshot);
+      } catch (e) {
+        console.warn(`Failed to parse snapshot for workflow ${row.workflow_name}: ${e}`);
+      }
+    }
+    return {
+      workflowName: row.workflow_name,
+      runId: row.run_id,
+      snapshot: parsedSnapshot,
+      createdAt: this.ensureDate(row.createdAt),
+      updatedAt: this.ensureDate(row.updatedAt),
+      resourceId: row.resourceId
+    };
+  }
+  async hasColumn(table, column) {
+    const sql = `PRAGMA table_info(${table});`;
+    const result = await this.executeQuery({ sql, params: [] });
+    if (!result || !Array.isArray(result)) return false;
+    return result.some((col) => col.name === column || col.name === column.toLowerCase());
+  }
+  async getWorkflowRuns({
+    workflowName,
+    fromDate,
+    toDate,
+    limit,
+    offset,
+    resourceId
+  } = {}) {
+    const fullTableName = this.getTableName(storage.TABLE_WORKFLOW_SNAPSHOT);
+    try {
+      const builder = createSqlBuilder().select().from(fullTableName);
+      const countBuilder = createSqlBuilder().count().from(fullTableName);
+      if (workflowName) builder.whereAnd("workflow_name = ?", workflowName);
+      if (resourceId) {
+        const hasResourceId = await this.hasColumn(fullTableName, "resourceId");
+        if (hasResourceId) {
+          builder.whereAnd("resourceId = ?", resourceId);
+          countBuilder.whereAnd("resourceId = ?", resourceId);
+        } else {
+          console.warn(`[${fullTableName}] resourceId column not found. Skipping resourceId filter.`);
+        }
+      }
+      if (fromDate) {
+        builder.whereAnd("createdAt >= ?", fromDate instanceof Date ? fromDate.toISOString() : fromDate);
+        countBuilder.whereAnd("createdAt >= ?", fromDate instanceof Date ? fromDate.toISOString() : fromDate);
+      }
+      if (toDate) {
+        builder.whereAnd("createdAt <= ?", toDate instanceof Date ? toDate.toISOString() : toDate);
+        countBuilder.whereAnd("createdAt <= ?", toDate instanceof Date ? toDate.toISOString() : toDate);
+      }
+      builder.orderBy("createdAt", "DESC");
+      if (typeof limit === "number") builder.limit(limit);
+      if (typeof offset === "number") builder.offset(offset);
+      const { sql, params } = builder.build();
+      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 });
+        total = Number(countResult?.count ?? 0);
+      }
+      const results = await this.executeQuery({ sql, params });
+      const runs = (isArrayOfRecords(results) ? results : []).map((row) => this.parseWorkflowRun(row));
+      return { runs, total: total || runs.length };
+    } catch (error) {
+      this.logger.error("Error getting workflow runs:", {
+        message: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
+  async getWorkflowRunById({
+    runId,
+    workflowName
+  }) {
+    const fullTableName = this.getTableName(storage.TABLE_WORKFLOW_SNAPSHOT);
+    try {
+      const conditions = [];
+      const params = [];
+      if (runId) {
+        conditions.push("run_id = ?");
+        params.push(runId);
+      }
+      if (workflowName) {
+        conditions.push("workflow_name = ?");
+        params.push(workflowName);
+      }
+      const whereClause = conditions.length > 0 ? "WHERE " + conditions.join(" AND ") : "";
+      const sql = `SELECT * FROM ${fullTableName} ${whereClause} ORDER BY createdAt DESC LIMIT 1`;
+      const result = await this.executeQuery({ sql, params, first: true });
+      if (!result) return null;
+      return this.parseWorkflowRun(result);
+    } catch (error) {
+      this.logger.error("Error getting workflow run by ID:", {
+        message: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
   }
   /**
    * Close the database connection

package/dist/index.js

@@ -68,6 +68,10 @@ var SqlBuilder = class {
     this.params.push(count);
     return this;
   }
+  count() {
+    this.sql += "SELECT COUNT(*) AS count";
+    return this;
+  }
   /**
    * Insert a row, or update specific columns on conflict (upsert).
    * @param table Table name
@@ -490,7 +494,8 @@ var D1Store = class extends MastraStorage {
     try {
       await this.executeQuery({ sql, params });
     } catch (error) {
-      this.logger.error(`Error inserting into ${fullTableName}:`, { error });
+      const message = error instanceof Error ? error.message : String(error);
+      this.logger.error(`Error inserting into ${fullTableName}:`, { message });
       throw new Error(`Failed to insert into ${fullTableName}: ${error}`);
     }
   }
@@ -588,7 +593,8 @@ var D1Store = class extends MastraStorage {
       await this.executeQuery({ sql, params });
       return thread;
     } catch (error) {
-      this.logger.error(`Error saving thread to ${fullTableName}:`, { error });
+      const message = error instanceof Error ? error.message : String(error);
+      this.logger.error(`Error saving thread to ${fullTableName}:`, { message });
       throw error;
     }
   }
@@ -622,7 +628,8 @@ var D1Store = class extends MastraStorage {
         updatedAt: /* @__PURE__ */ new Date()
       };
     } catch (error) {
-      this.logger.error("Error updating thread:", { error });
+      const message = error instanceof Error ? error.message : String(error);
+      this.logger.error("Error updating thread:", { message });
       throw error;
     }
   }
@@ -856,7 +863,9 @@ var D1Store = class extends MastraStorage {
     scope,
     page,
     perPage,
-    attributes
+    attributes,
+    fromDate,
+    toDate
   }) {
     const fullTableName = this.getTableName(TABLE_TRACES);
     try {
@@ -872,6 +881,12 @@ var D1Store = class extends MastraStorage {
           query.jsonLike("attributes", key, value);
         }
       }
+      if (fromDate) {
+        query.andWhere("createdAt >= ?", fromDate instanceof Date ? fromDate.toISOString() : fromDate);
+      }
+      if (toDate) {
+        query.andWhere("createdAt <= ?", toDate instanceof Date ? toDate.toISOString() : toDate);
+      }
       query.orderBy("startTime", "DESC").limit(perPage).offset((page - 1) * perPage);
       const { sql, params } = query.build();
       const results = await this.executeQuery({ sql, params });
@@ -923,8 +938,107 @@ var D1Store = class extends MastraStorage {
       return [];
     }
   }
-  getWorkflowRuns(_args) {
-    throw new Error("Method not implemented.");
+  parseWorkflowRun(row) {
+    let parsedSnapshot = row.snapshot;
+    if (typeof parsedSnapshot === "string") {
+      try {
+        parsedSnapshot = JSON.parse(row.snapshot);
+      } catch (e) {
+        console.warn(`Failed to parse snapshot for workflow ${row.workflow_name}: ${e}`);
+      }
+    }
+    return {
+      workflowName: row.workflow_name,
+      runId: row.run_id,
+      snapshot: parsedSnapshot,
+      createdAt: this.ensureDate(row.createdAt),
+      updatedAt: this.ensureDate(row.updatedAt),
+      resourceId: row.resourceId
+    };
+  }
+  async hasColumn(table, column) {
+    const sql = `PRAGMA table_info(${table});`;
+    const result = await this.executeQuery({ sql, params: [] });
+    if (!result || !Array.isArray(result)) return false;
+    return result.some((col) => col.name === column || col.name === column.toLowerCase());
+  }
+  async getWorkflowRuns({
+    workflowName,
+    fromDate,
+    toDate,
+    limit,
+    offset,
+    resourceId
+  } = {}) {
+    const fullTableName = this.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 (resourceId) {
+        const hasResourceId = await this.hasColumn(fullTableName, "resourceId");
+        if (hasResourceId) {
+          builder.whereAnd("resourceId = ?", resourceId);
+          countBuilder.whereAnd("resourceId = ?", resourceId);
+        } else {
+          console.warn(`[${fullTableName}] resourceId column not found. Skipping resourceId filter.`);
+        }
+      }
+      if (fromDate) {
+        builder.whereAnd("createdAt >= ?", fromDate instanceof Date ? fromDate.toISOString() : fromDate);
+        countBuilder.whereAnd("createdAt >= ?", fromDate instanceof Date ? fromDate.toISOString() : fromDate);
+      }
+      if (toDate) {
+        builder.whereAnd("createdAt <= ?", toDate instanceof Date ? toDate.toISOString() : toDate);
+        countBuilder.whereAnd("createdAt <= ?", toDate instanceof Date ? toDate.toISOString() : toDate);
+      }
+      builder.orderBy("createdAt", "DESC");
+      if (typeof limit === "number") builder.limit(limit);
+      if (typeof offset === "number") builder.offset(offset);
+      const { sql, params } = builder.build();
+      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 });
+        total = Number(countResult?.count ?? 0);
+      }
+      const results = await this.executeQuery({ sql, params });
+      const runs = (isArrayOfRecords(results) ? results : []).map((row) => this.parseWorkflowRun(row));
+      return { runs, total: total || runs.length };
+    } catch (error) {
+      this.logger.error("Error getting workflow runs:", {
+        message: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
+  async getWorkflowRunById({
+    runId,
+    workflowName
+  }) {
+    const fullTableName = this.getTableName(TABLE_WORKFLOW_SNAPSHOT);
+    try {
+      const conditions = [];
+      const params = [];
+      if (runId) {
+        conditions.push("run_id = ?");
+        params.push(runId);
+      }
+      if (workflowName) {
+        conditions.push("workflow_name = ?");
+        params.push(workflowName);
+      }
+      const whereClause = conditions.length > 0 ? "WHERE " + conditions.join(" AND ") : "";
+      const sql = `SELECT * FROM ${fullTableName} ${whereClause} ORDER BY createdAt DESC LIMIT 1`;
+      const result = await this.executeQuery({ sql, params, first: true });
+      if (!result) return null;
+      return this.parseWorkflowRun(result);
+    } catch (error) {
+      this.logger.error("Error getting workflow run by ID:", {
+        message: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
   }
   /**
    * Close the database connection

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/cloudflare-d1",
-  "version": "0.0.0-switch-to-core-20250424015131",
+  "version": "0.0.0-vnext-inngest-20250506123700",
   "description": "D1 provider for Mastra - includes db storage capabilities",
   "type": "module",
   "files": [
@@ -23,19 +23,19 @@
   },
   "dependencies": {
     "cloudflare": "^4.1.0",
-    "@mastra/core": "0.0.0-switch-to-core-20250424015131"
+    "@mastra/core": "0.0.0-vnext-inngest-20250506123700"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250417.0",
-    "@microsoft/api-extractor": "^7.52.1",
+    "@microsoft/api-extractor": "^7.52.5",
     "@types/node": "^20.17.27",
     "dotenv": "^16.4.7",
     "eslint": "^9.23.0",
     "miniflare": "^4.20250410.1",
     "tsup": "^8.4.0",
     "typescript": "^5.8.2",
-    "vitest": "^3.0.9",
-    "@internal/lint": "0.0.2"
+    "vitest": "^3.1.2",
+    "@internal/lint": "0.0.0-vnext-inngest-20250506123700"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting",