@mastra/cloudflare 1.7.5-alpha.0 → 1.7.6-alpha.0

package/dist/do/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_do = require("../do-CjtUyEjN.cjs");
+const require_do = require("../do-DLpNbVvV.cjs");
 exports.BackgroundTasksStorageDO = require_do.BackgroundTasksStorageDO;
 exports.CloudflareDOStorage = require_do.CloudflareDOStorage;
 exports.DODB = require_do.DODB;

package/dist/do/index.js

@@ -1,2 +1 @@
-import { a as MemoryStorageDO, i as ScoresStorageDO, n as DOStore, o as BackgroundTasksStorageDO, r as WorkflowsStorageDO, s as DODB, t as CloudflareDOStorage } from "../do-D4lAj_Bf.js";
-export { BackgroundTasksStorageDO, CloudflareDOStorage, DODB, DOStore, MemoryStorageDO, ScoresStorageDO, WorkflowsStorageDO };
+export { o as BackgroundTasksStorageDO, t as CloudflareDOStorage, s as DODB, n as DOStore, a as MemoryStorageDO, i as ScoresStorageDO, r as WorkflowsStorageDO } from "../do-BWVFzDmS.js";

package/dist/do/storage/db/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/do/storage/db/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/do/storage/db/index.ts"],"names":[],"mappings":"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"}

package/dist/{do-D4lAj_Bf.js → do-BWVFzDmS.js}

@@ -4,7 +4,7 @@ import { MessageList } from "@mastra/core/agent";
 import { MastraBase } from "@mastra/core/base";
 import { saveScorePayloadSchema } from "@mastra/core/evals";
 import { parseSqlIdentifier } from "@mastra/core/utils";
-//#region src/do/storage/domains/utils.ts
+// src/do/storage/domains/utils.ts
 function isArrayOfRecords(value) {
 	return value !== null && value !== void 0 && Array.isArray(value);
 }
@@ -23,8 +23,7 @@ function deserializeValue(value, type) {
 	}
 	return value;
 }
-//#endregion
-//#region src/do/storage/sql-builder.ts
+// src/do/storage/sql-builder.ts
 /**
 * SQL Builder class for constructing type-safe SQL queries
 * This helps create maintainable and secure SQL queries with proper parameter handling
@@ -267,8 +266,7 @@ function parseSelectIdentifier(column) {
 	if (column !== "*" && !SQL_IDENTIFIER_PATTERN.test(column)) throw new Error(`Invalid column name: "${column}". Must be "*" or a valid identifier (letters, numbers, underscores), optionally with "AS alias".`);
 	return column;
 }
-//#endregion
-//#region src/do/storage/db/run-fencing.ts
+// src/do/storage/db/run-fencing.ts
 /**
 * Epoch milliseconds on the database clock. `julianday('now')` rather than
 * `unixepoch('subsec')`, which needs SQLite 3.42.
@@ -299,10 +297,11 @@ async function assertRunFence(db, { claimsTable, fence, operation }) {
 		params: [fence.runId],
 		first: true
 	});
-	if (!matchesRunFence(row ? {
+	const current = row ? {
 		generation: Number(row.generation),
 		ownerId: String(row.ownerId)
-	} : null, fence)) throw new RunFenceConflictError(fence, operation);
+	} : null;
+	if (!matchesRunFence(current, fence)) throw new RunFenceConflictError(fence, operation);
 }
 /**
 * Runs one statement of a fenced write. With a check, `statement` must carry
@@ -328,8 +327,7 @@ async function executeFenced(db, check, { sql, params }) {
 	});
 	if (Array.isArray(rows) && rows.length === 0) await assertRunFence(db, check);
 }
-//#endregion
-//#region src/do/storage/db/index.ts
+// src/do/storage/db/index.ts
 var DODB = class extends MastraBase {
 	sql;
 	tablePrefix;
@@ -635,8 +633,7 @@ var DODB = class extends MastraBase {
 		}
 	}
 };
-//#endregion
-//#region src/do/storage/domains/background-tasks/index.ts
+// src/do/storage/domains/background-tasks/index.ts
 function serializeJson(v) {
 	if (typeof v === "object" && v != null) return JSON.stringify(v);
 	return v ?? void 0;
@@ -941,8 +938,7 @@ var BackgroundTasksStorageDO = class extends BackgroundTasksStorage {
 		return total;
 	}
 };
-//#endregion
-//#region src/do/storage/domains/memory/index.ts
+// src/do/storage/domains/memory/index.ts
 function addSqliteMetadataFilter(conditions, params, metadataFilter) {
 	if (!metadataFilter) return;
 	for (const [key, value] of Object.entries(metadataFilter)) {
@@ -1013,13 +1009,14 @@ var MemoryStorageDO = class MemoryStorageDO extends MemoryStorage {
 		});
 	}
 	async prune(policies, options) {
+		const targets = resolveRetentionTargets({
+			policies,
+			descriptor: MemoryStorageDO.retentionTables,
+			order: ["runFences"]
+		});
 		return executeRetentionPrune({
 			domain: "memory",
-			targets: resolveRetentionTargets({
-				policies,
-				descriptor: MemoryStorageDO.retentionTables,
-				order: ["runFences"]
-			}),
+			targets,
 			options,
 			cutoffFor: (target, now) => retentionCutoffMs(target.policy, now),
 			deleteBatch: (_target, cutoff, limit) => this.#db.pruneRunRows({
@@ -1794,15 +1791,17 @@ var MemoryStorageDO = class MemoryStorageDO extends MemoryStorage {
 				const existing = existingMessagesMap.get(update.id);
 				if (!existing) continue;
 				let mergedContent = existing.content;
-				if (update.content) if (typeof mergedContent === "object" && mergedContent !== null) mergedContent = {
-					...mergedContent,
-					...update.content,
-					metadata: {
-						...mergedContent.metadata,
-						...update.content.metadata
-					}
-				};
-				else mergedContent = update.content;
+				if (update.content) {
+					if (typeof mergedContent === "object" && mergedContent !== null) mergedContent = {
+						...mergedContent,
+						...update.content,
+						metadata: {
+							...mergedContent.metadata,
+							...update.content.metadata
+						}
+					};
+					else mergedContent = update.content;
+				}
 				updatedMessages.push({
 					...existing,
 					...update,
@@ -1867,8 +1866,7 @@ var MemoryStorageDO = class MemoryStorageDO extends MemoryStorage {
 		}
 	}
 };
-//#endregion
-//#region src/do/storage/domains/scores/index.ts
+// src/do/storage/domains/scores/index.ts
 /** Appends multi-tenant scope conditions to a SQL builder query (no-op when no filters). */
 function applyTenancyFilters(query, filters) {
 	if (filters?.organizationId !== void 0) query.andWhere("organizationId = ?", filters.organizationId);
@@ -1942,9 +1940,10 @@ var ScoresStorageDO = class extends ScoresStorage {
 		try {
 			const fullTableName = this.#db.getTableName(TABLE_SCORERS);
 			const serializedRecord = {};
-			for (const [key, value] of Object.entries(parsedScore)) if (value !== null && value !== void 0) if (typeof value === "object") serializedRecord[key] = JSON.stringify(value);
-			else serializedRecord[key] = value;
-			else serializedRecord[key] = null;
+			for (const [key, value] of Object.entries(parsedScore)) if (value !== null && value !== void 0) {
+				if (typeof value === "object") serializedRecord[key] = JSON.stringify(value);
+				else serializedRecord[key] = value;
+			} else serializedRecord[key] = null;
 			const now = /* @__PURE__ */ new Date();
 			serializedRecord.id = id;
 			serializedRecord.createdAt = now.toISOString();
@@ -2166,8 +2165,7 @@ var ScoresStorageDO = class extends ScoresStorage {
 		}
 	}
 };
-//#endregion
-//#region src/do/storage/domains/workflows/index.ts
+// src/do/storage/domains/workflows/index.ts
 const RUN_OWNER_COLUMNS = `generation, ownerId, leaseExpiresAt, ${DB_NOW_MS} AS nowMs`;
 /**
 * A run's first generation is the database clock, so a run claimed again after
@@ -2215,13 +2213,14 @@ var WorkflowsStorageDO = class WorkflowsStorageDO extends WorkflowsStorage {
 		});
 	}
 	async prune(policies, options) {
+		const targets = resolveRetentionTargets({
+			policies,
+			descriptor: WorkflowsStorageDO.retentionTables,
+			order: ["runOwnership"]
+		});
 		return executeRetentionPrune({
 			domain: "workflows",
-			targets: resolveRetentionTargets({
-				policies,
-				descriptor: WorkflowsStorageDO.retentionTables,
-				order: ["runOwnership"]
-			}),
+			targets,
 			options,
 			cutoffFor: (target, now) => retentionCutoffMs(target.policy, now),
 			deleteBatch: (_target, cutoff, limit) => this.#db.pruneRunRows({
@@ -2486,10 +2485,12 @@ var WorkflowsStorageDO = class WorkflowsStorageDO extends WorkflowsStorage {
 				builder.whereAnd("CASE WHEN json_valid(snapshot) THEN json_extract(snapshot, '$.status') END = ?", status);
 				countBuilder.whereAnd("CASE WHEN json_valid(snapshot) THEN json_extract(snapshot, '$.status') END = ?", status);
 			}
-			if (resourceId) if (await this.#db.hasColumn(fullTableName, "resourceId")) {
-				builder.whereAnd("resourceId = ?", resourceId);
-				countBuilder.whereAnd("resourceId = ?", resourceId);
-			} else this.logger.warn(`[${fullTableName}] resourceId column not found. Skipping resourceId filter.`);
+			if (resourceId) {
+				if (await this.#db.hasColumn(fullTableName, "resourceId")) {
+					builder.whereAnd("resourceId = ?", resourceId);
+					countBuilder.whereAnd("resourceId = ?", resourceId);
+				} else this.logger.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);
@@ -2594,8 +2595,7 @@ var WorkflowsStorageDO = class WorkflowsStorageDO extends WorkflowsStorage {
 		}
 	}
 };
-//#endregion
-//#region src/do/index.ts
+// src/do/index.ts
 /**
 * Cloudflare Durable Objects storage adapter for Mastra.
 *
@@ -2673,7 +2673,6 @@ var CloudflareDOStorage = class extends MastraCompositeStore {
 * @deprecated Use CloudflareDOStorage instead
 */
 const DOStore = CloudflareDOStorage;
-//#endregion
 export { MemoryStorageDO as a, ScoresStorageDO as i, DOStore as n, BackgroundTasksStorageDO as o, WorkflowsStorageDO as r, DODB as s, CloudflareDOStorage as t };
 
-//# sourceMappingURL=do-D4lAj_Bf.js.map
+//# sourceMappingURL=do-BWVFzDmS.js.map