@mastra/cloudflare-d1 0.12.5 → 0.12.6

package/dist/index.js

@@ -1,5 +1,5 @@
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { MastraStorage, StoreOperations, ScoresStorage, TABLE_SCORERS, LegacyEvalsStorage, TABLE_EVALS, serializeDate, TracesStorage, TABLE_TRACES, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, ensureDate, MemoryStorage, TABLE_RESOURCES, TABLE_THREADS, TABLE_MESSAGES, resolveMessageLimit } from '@mastra/core/storage';
+import { MastraStorage, StoreOperations, ScoresStorage, TABLE_SCORERS, LegacyEvalsStorage, TABLE_EVALS, serializeDate, TracesStorage, TABLE_TRACES, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, ensureDate, MemoryStorage, TABLE_RESOURCES, TABLE_THREADS, TABLE_MESSAGES, resolveMessageLimit, safelyParseJSON } from '@mastra/core/storage';
 import Cloudflare from 'cloudflare';
 import { parseSqlIdentifier } from '@mastra/core/utils';
 import { MessageList } from '@mastra/core/agent';
@@ -1437,6 +1437,7 @@ var StoreOperationsD1 = class extends StoreOperations {
           query.andWhere(`${key} = ?`, value);
         }
       }
+      query.orderBy("createdAt", "DESC");
       query.limit(1);
       const { sql, params } = query.build();
       const result = await this.executeQuery({ sql, params, first: true });
@@ -1521,20 +1522,19 @@ var StoreOperationsD1 = class extends StoreOperations {
   }
 };
 function transformScoreRow(row) {
-  let input = void 0;
-  if (row.input) {
-    try {
-      input = JSON.parse(row.input);
-    } catch {
-      input = row.input;
-    }
-  }
-  return {
-    ...row,
-    input,
-    createdAt: row.createdAtZ || row.createdAt,
-    updatedAt: row.updatedAtZ || row.updatedAt
-  };
+  const deserialized = { ...row };
+  deserialized.input = safelyParseJSON(row.input);
+  deserialized.output = safelyParseJSON(row.output);
+  deserialized.scorer = safelyParseJSON(row.scorer);
+  deserialized.preprocessStepResult = safelyParseJSON(row.preprocessStepResult);
+  deserialized.analyzeStepResult = safelyParseJSON(row.analyzeStepResult);
+  deserialized.metadata = safelyParseJSON(row.metadata);
+  deserialized.additionalContext = safelyParseJSON(row.additionalContext);
+  deserialized.runtimeContext = safelyParseJSON(row.runtimeContext);
+  deserialized.entity = safelyParseJSON(row.entity);
+  deserialized.createdAt = row.createdAtZ || row.createdAt;
+  deserialized.updatedAt = row.updatedAtZ || row.updatedAt;
+  return deserialized;
 }
 var ScoresStorageD1 = class extends ScoresStorage {
   operations;
@@ -1565,6 +1565,7 @@ var ScoresStorageD1 = class extends ScoresStorage {
   }
   async saveScore(score) {
     try {
+      const id = crypto.randomUUID();
       const fullTableName = this.operations.getTableName(TABLE_SCORERS);
       const { input, ...rest } = score;
       const serializedRecord = {};
@@ -1579,6 +1580,7 @@ var ScoresStorageD1 = class extends ScoresStorage {
           serializedRecord[key] = null;
         }
       }
+      serializedRecord.id = id;
       serializedRecord.input = JSON.stringify(input);
       serializedRecord.createdAt = (/* @__PURE__ */ new Date()).toISOString();
       serializedRecord.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -1587,7 +1589,7 @@ var ScoresStorageD1 = class extends ScoresStorage {
       const query = createSqlBuilder().insert(fullTableName, columns, values);
       const { sql, params } = query.build();
       await this.operations.executeQuery({ sql, params });
-      const scoreFromDb = await this.getScoreById({ id: score.id });
+      const scoreFromDb = await this.getScoreById({ id });
       return { score: scoreFromDb };
     } catch (error) {
       throw new MastraError(
@@ -1602,11 +1604,23 @@ var ScoresStorageD1 = class extends ScoresStorage {
   }
   async getScoresByScorerId({
     scorerId,
+    entityId,
+    entityType,
+    source,
     pagination
   }) {
     try {
       const fullTableName = this.operations.getTableName(TABLE_SCORERS);
       const countQuery = createSqlBuilder().count().from(fullTableName).where("scorerId = ?", scorerId);
+      if (entityId) {
+        countQuery.andWhere("entityId = ?", entityId);
+      }
+      if (entityType) {
+        countQuery.andWhere("entityType = ?", entityType);
+      }
+      if (source) {
+        countQuery.andWhere("source = ?", source);
+      }
       const countResult = await this.operations.executeQuery(countQuery.build());
       const total = Array.isArray(countResult) ? Number(countResult?.[0]?.count ?? 0) : Number(countResult?.count ?? 0);
       if (total === 0) {
@@ -1620,7 +1634,17 @@ var ScoresStorageD1 = class extends ScoresStorage {
           scores: []
         };
       }
-      const selectQuery = createSqlBuilder().select("*").from(fullTableName).where("scorerId = ?", scorerId).limit(pagination.perPage).offset(pagination.page * pagination.perPage);
+      const selectQuery = createSqlBuilder().select("*").from(fullTableName).where("scorerId = ?", scorerId);
+      if (entityId) {
+        selectQuery.andWhere("entityId = ?", entityId);
+      }
+      if (entityType) {
+        selectQuery.andWhere("entityType = ?", entityType);
+      }
+      if (source) {
+        selectQuery.andWhere("source = ?", source);
+      }
+      selectQuery.limit(pagination.perPage).offset(pagination.page * pagination.perPage);
       const { sql, params } = selectQuery.build();
       const results = await this.operations.executeQuery({ sql, params });
       const scores = Array.isArray(results) ? results.map(transformScoreRow) : [];
@@ -2316,10 +2340,13 @@ var D1Store = class extends MastraStorage {
     });
   }
   async getScoresByScorerId({
-    scorerId: _scorerId,
-    pagination: _pagination
+    scorerId,
+    pagination,
+    entityId,
+    entityType,
+    source
   }) {
-    return this.stores.scores.getScoresByScorerId({ scorerId: _scorerId, pagination: _pagination });
+    return this.stores.scores.getScoresByScorerId({ scorerId, pagination, entityId, entityType, source });
   }
   /**
    * Close the database connection